This commit was manufactured by cvs2svn to create tag 'v20051029_0100'.

commit: fa36f04a22387ce07db219930815a95af8d66a1f [log] [tgz]
author: kchong <kchong> Sat Oct 29 04:55:55 2005 +0000
committer: kchong <kchong> Sat Oct 29 04:55:55 2005 +0000
tree: a75afd27d1c1d52cf1eb527074684fc61b0e5ea7
parent: 4bfa64fb98ce2a8d1486f656dc4a23051623b92b [diff]
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
deleted file mode 100644
index e93bbd8..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis.jar
-@dot

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project b/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
deleted file mode 100644
index 846a394..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
+++ /dev/null

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.consumption.core</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env.core</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 57f3505..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.internal.axis.consumption.core.command,
- org.eclipse.jst.ws.internal.axis.consumption.core.common
-Require-Bundle: org.apache.ant,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.j2ee.web,
- org.apache.axis,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.wst.common.environment

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html b/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
deleted file mode 100644
index 5da3122..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               readme.html,\
-               META-INF/,\
-               about.html

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
deleted file mode 100644
index 5e9ff7c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web service Axis Consumption Core
-PLUGIN_PROVIDER=Eclipse.org

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
deleted file mode 100644
index c911fbf..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
+++ /dev/null

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension point="org.eclipse.jst.ws.consumption.wsfinder">
-      <wsfinder
-            id="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
-            name="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
-            description="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
-            class="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis">
-      </wsfinder>
-   </extension>
-
-</plugin>
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties
deleted file mode 100644
index 0038ec5..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties
+++ /dev/null

@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages for AxisDeployCommand
-#
-MSG_ERROR_PROJECT_URL_PARAM_NOT_SET=IWAB0054E Web project URL for deployment of Web service is not set in AxisDeployCommand
-MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET=IWAB0488E Location of Axis deployment file is not set in AxisDeployCommand
-MSG_ERROR_AXIS_DEPLOY=IWAB0489E Error when deploying Web service to Axis runtime
-MSG_AXIS_DEPLOY=Deploying Web service to Axis run-time environment
-MSG_AXIS_DEPLOY_OK=Web service successfuly deployed to Axis run-time environment
-
-TASK_LABEL_WSDL_JAVA_COMMAND=WSDL2JavaCommand
-TASK_DESC_WSDL_JAVA_COMMAND=Calls to AXIS WSDL2JavaCommand.
-#
-# Messages for Java2WSDLCommand
-#
-TASK_LABEL_JAVA_WSDL_COMMAND=Java2WSDLCommand
-TASK_DESC_JAVA_WSDL_COMMAND=Calls to AXIS Java2WSDLCommand.
-MSG_GENERATE_WSDL=Generating WSDL file: {0}
-MSG_ERROR_JAVA_WSDL_GENERATE=IWAB0398E Error in generating WSDL from Java
-
-#
-# Messages for WSDL2JavaCommand
-#
-TASK_LABEL_WSDL_JAVA_COMMAND=WSDL2JavaCommand
-TASK_DESC_WSDL_JAVA_COMMAND=Calls to AXIS WSDL2JavaCommand.
-MSG_PARSING_WSDL=Parsing WSDL file: {0}
-MSG_ERROR_WSDL_JAVA_GENERATE=IWAB0399E Error in generating Java from WSDL
-
-#
-# Messages common for all
-#
-MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET=IWAB0397E JavaWSDLParam not set
-
-#
-# Messages common for Java2WSDLCommand and  WSDL2JavaCommand
-#

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
deleted file mode 100644
index 4881f14..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.util.ResourceBundle;
-import org.apache.axis.tools.ant.axis.AdminClientTask;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class AxisDeployCommand extends AbstractDataModelOperation
-{
-  protected static final String SERVICE_EXT = "/services/AdminService"; //$NON-NLS-1$
-
-  private JavaWSDLParameter javaWSDLParam;
-  private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
-  /**
-   * Constructor for AxisDeployCommand.
-   * @param String description
-   * @param String name
-   * 
-   */
-  public AxisDeployCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-    if (javaWSDLParam == null)
-    {     
-      return StatusUtils.errorStatus(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-    }
-
-    if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
-    { //$NON-NLS-1$
-      return StatusUtils.errorStatus(getMessage("MSG_ERROR_PROJECT_URL_PARAM_NOT_SET"));
-    }
-
-    if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
-    {
-      return StatusUtils.errorStatus(getMessage("MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET"));
-    }
-
-    ProgressUtils.report(monitor, getMessage("MSG_AXIS_DEPLOY"));
-
-    IStatus status = executeAntTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-    	environment.getStatusHandler().reportError(status);
-    }
-    
-    return status;
-  }
-
-  protected IStatus executeAntTask()
-  {
-    final class DeployTask extends AdminClientTask
-    {
-      public DeployTask()
-      {
-		super.setProject(new Project());
-		super.getProject().init();
-		super.setTaskType("axis"); //$NON-NLS-1$
-		super.setTaskName("axis-admin"); //$NON-NLS-1$
-		super.setOwningTarget(new Target());
-      }
-    }
-
-    DeployTask adminClient = new DeployTask();
-    String url = javaWSDLParam.getProjectURL() + SERVICE_EXT;
-    adminClient.setUrl(url);
-    adminClient.setXmlFile(new File(javaWSDLParam.getDeploymentFiles()[0]));
-
-    // Since the admin server may not be available right away we will try
-    // several times to execute it.
-    try
-    {
-      BuildException lastException = null;
-      
-      for( int index = 0; index < 20; index++ )
-      {
-        try
-        {
-          lastException = null;
-          adminClient.execute();
-        }
-        catch( BuildException exc )
-        {
-          lastException = exc;
-          
-          try
-          {
-            Thread.sleep( 200 );
-          }
-          catch( InterruptedException threadException  )
-          {
-          }
-        }
-        
-        // If no exception occured then we should break out of the loop.
-        if( lastException == null ) break;
-      }
-      
-      // If after many tries we still get an exception, then we will re throw it.
-      if( lastException != null ) throw lastException;
-    }
-    catch (BuildException e)
-    {
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-      
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-    }
-    return Status.OK_STATUS; 
-  }
-
-  /**
-   * Returns the message string identified by the given key from plugin.properties.
-   * 
-   * @return The String message.
-   */
-  public String getMessage(String key)
-  {
-    return resource.getString(key);
-  }
-
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-  {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-}

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java
deleted file mode 100644
index 218ed4c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.ResourceBundle;
-import org.apache.axis.AxisEngine;
-import org.apache.axis.server.AxisServer;
-import org.apache.axis.tools.ant.axis.AdminClientTask;
-import org.apache.axis.utils.ClassUtils;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class GeronimoAxisDeployCommand extends AbstractDataModelOperation
-{
-
-  private JavaWSDLParameter javaWSDLParam;
-  private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
-  private String projectName_;
-  private static final String AXIS_SERVER_CONFIG_FILE = "axis.ServerConfigFile";
-  
-  IFolder outputRoot;
-  
-  /**
-   * Constructor for GeronimoAxisDeployCommand.
- * @param String projectName
-   * 
-   */
-  public GeronimoAxisDeployCommand(String projectName)
-  {
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	IEnvironment environment = getEnvironment();
-    if (javaWSDLParam == null)
-    {
-      return StatusUtils.errorStatus(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-    }
-
-    if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
-    { //$NON-NLS-1$
-      return StatusUtils.errorStatus(getMessage("MSG_ERROR_PROJECT_URL_PARAM_NOT_SET"));
-    }
-
-    if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
-    {
-      return StatusUtils.errorStatus(
-      getMessage("MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET"));
-    }
-
-    ProgressUtils.report(monitor, getMessage("MSG_AXIS_DEPLOY"));
-
-    IStatus status = executeAdminTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-        environment.getStatusHandler().reportError(status);
-    }    
-    
-    status = executeAntTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-        environment.getStatusHandler().reportError(status);
-    }    
-    return status;
-  }
-  
-  protected IStatus executeAntTask()
-  {
-    final class DeployTask extends AdminClientTask
-    {
-      public DeployTask()
-      {
-        super.setProject(new Project());
-		super.getProject().init();
-		super.setTaskType("axis"); //$NON-NLS-1$
-		super.setTaskName("axis-admin"); //$NON-NLS-1$
-		super.setOwningTarget(new Target());
-      }
-    }
-
-    DeployTask adminClient = new DeployTask();
-    String url = javaWSDLParam.getProjectURL() + AxisDeployCommand.SERVICE_EXT;
-    adminClient.setUrl(url);
-    adminClient.setXmlFile(new File(javaWSDLParam.getDeploymentFiles()[0]));
-
-    // Since the admin server may not be available right away we will try
-    // several times to execute it.
-    try
-    {
-      BuildException lastException = null;
-      
-      for( int index = 0; index < 20; index++ )
-      {
-        try
-        {
-          lastException = null;
-          adminClient.execute();
-        }
-        catch( BuildException exc )
-        {
-          lastException = exc;
-          
-          try
-          {
-            Thread.sleep( 200 );
-          }
-          catch( InterruptedException threadException  )
-          {
-          }
-        }
-        
-        // If no exception occured then we should break out of the loop.
-        if( lastException == null ) break;
-      }
-      
-      // If after many tries we still get an exception, then we will re throw it.
-      if( lastException != null ) throw lastException;
-    }
-    catch (BuildException e)
-    {
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-      
-//      Status[] childStatus = new Status[1];
-//      childStatus[0] = new SimpleStatus("AxisDeployCommand", message, Status.ERROR);
-//      return new SimpleStatus("AxisDeployCommand", //$NON-NLS-1$
-//      getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-//    }
-//    return new SimpleStatus("AxisDeployCommand", //$NON-NLS-1$
-//    getMessage("MSG_AXIS_DEPLOY_OK"), Status.OK);
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-    }
-    return Status.OK_STATUS; 
-
-  }
-  
-  protected IStatus executeAdminTask(){
-    
-    IStatus status = Status.OK_STATUS;
-    // check if server-config.wsdd exists
-    IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_ );
-    outputRoot = J2EEUtils.getOutputContainerRoot( component );
-    IPath path = new Path( "WEB-INF" ).append( "server-config.wsdd" );    
-    IFile descriptorFile = outputRoot.getFile( path );
-    
-    if (!descriptorFile.exists()){
-      status = createServerConfigFile();
-      if (status.getSeverity()==Status.ERROR)
-        return status;
-    }
-    
-    // check if deploy.wsdd exists
-    String deployWSDD = javaWSDLParam.getDeploymentFiles()[0];
-    File deployFile = new File(deployWSDD);
-    if (deployFile==null || !deployFile.exists()){
-      return status;
-    }
-    
-    try {
-      // get Classpath
-      String jarsCP = new String();
-      // classes dir
-      IPath classesPath = new Path("WEB-INF").append("classes");
-      IFile classesDir = outputRoot.getFile(classesPath);
-      jarsCP = "\""+classesDir.getRawLocation().toOSString()+"\"";
-      
-      // lib JARs
-      IPath libPath = new Path("WEB-INF").append("lib");
-      IFile libEntry = outputRoot.getFile(libPath);
-      IFolder libFolder = (IFolder)ResourceUtils.findResource(libEntry.getFullPath());
-      IResource[] JARfiles = libFolder.members();
-      for (int i=0;i<JARfiles.length;i++){
-        IResource res = JARfiles[i];
-        if (res.getFileExtension().equals("jar")){
-          jarsCP = jarsCP + ";\""+ res.getRawLocation().toOSString()+"\"";
-        }
-      }
-
-      // form and run utils.Admin command
-      String adminCommand = new String("java -Daxis.ServerConfigFile="+ descriptorFile.getRawLocation().toOSString() 
-          +" -cp "+jarsCP+" org.apache.axis.utils.Admin server "+deployFile.getCanonicalPath());
-      Runtime.getRuntime().exec(adminCommand);
-
-    }
-    catch(Exception e){
-      System.setProperty(AXIS_SERVER_CONFIG_FILE,"server-conifg.wsdd");      
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-      
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-    }
-    
-    return status;
-  }
-  
-  /**t
-   * Creates the initial server-config.wsdd file from a template in Axis
-   * @return
-   */
-  private IStatus createServerConfigFile(){
-    try{
-
-      // server-config.wsdd file
-      IPath             path           = new Path( "WEB-INF" ).append( "server-config.wsdd" );    
-      IFile             descriptorFile = outputRoot.getFile( path );      
-
-      // create the initial server-config.wsdd file
-      AxisEngine preEngine = new AxisServer();
-      InputStream is = ClassUtils.getResourceAsStream(preEngine.getClass(), "server-config.wsdd");
-      FileOutputStream fos = new FileOutputStream(descriptorFile.getRawLocation().toOSString());
-      ResourceUtils.copyStream(is, fos);
-      fos.close();
-      
-      return Status.OK_STATUS;
-    }
-    catch(Exception e){
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-
-    }
-  }
-
-  /**
-   * Returns the message string identified by the given key from plugin.properties.
-   * 
-   * @return The String message.
-   */
-  public String getMessage(String key)
-  {
-    return resource.getString(key);
-  }
-
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-  {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-}

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
deleted file mode 100644
index a5127b2..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.ResourceBundle;
-import org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask;
-import org.apache.axis.tools.ant.wsdl.NamespaceMapping;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Commands are executable, undoable, redoable objects.
- * Every Command has a name and a description.
- */
-
-public class Java2WSDLCommand extends AbstractDataModelOperation
-{
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
-	public Java2WSDLCommand() {
-	}	
-	/**
-	 * Constructor for Java2WSDLCommand.
-	 */
-	public Java2WSDLCommand(JavaWSDLParameter javaWSDLParam) {
-		super();
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IEnvironment environment = getEnvironment();
-		IStatus status;
-		if (javaWSDLParam_ == null) {
-			status = StatusUtils.errorStatus(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		if (javaWSDLParam_.getBeanName() == null) {
-			status = StatusUtils.errorStatus(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		ProgressUtils.report(monitor, getMessage("MSG_GENERATE_WSDL", javaWSDLParam_.getBeanName() ));
-
-		return executeAntTask(environment);
-	}
-
-	protected IStatus executeAntTask(IEnvironment environment) {
-
-		final class Emitter extends Java2WsdlAntTask {
-			public Emitter() {
-				super.setProject(new Project());
-				super.getProject().init();
-				super.setTaskType("axis"); //$NON-NLS-1$
-				super.setTaskName("axis-java2wsdl"); //$NON-NLS-1$
-				super.setOwningTarget(new Target());
-			}
-		}
-
-		Emitter emitter = new Emitter();
-		emitter.createClasspath().setPath(javaWSDLParam_.getClasspath());
-		environment.getLog().log(ILog.INFO, 5008, this, "executeAntTask", "Class Path = "+ javaWSDLParam_.getClasspath());
-		
-		emitter.setPortTypeName(javaWSDLParam_.getPortTypeName());
-		environment.getLog().log(ILog.INFO, 5009, this, "executeAntTask", "Port Type Name = "+ javaWSDLParam_.getPortTypeName());
-		
-		emitter.setServiceElementName(javaWSDLParam_.getServiceName());
-		environment.getLog().log(ILog.INFO, 5010, this, "executeAntTask", "Service Name = "+ javaWSDLParam_.getServiceName());
-		
-		emitter.setLocation(javaWSDLParam_.getUrlLocation());
-		environment.getLog().log(ILog.INFO, 5011, this, "executeAntTask", "URL Location = "+ javaWSDLParam_.getUrlLocation());
-		
-		emitter.setMethods(javaWSDLParam_.getMethodString());
-		environment.getLog().log(ILog.INFO, 5012, this, "executeAntTask", "Methods = "+ javaWSDLParam_.getMethodString());
-		
-		emitter.setStyle(javaWSDLParam_.getStyle());
-		environment.getLog().log(ILog.INFO, 5013, this, "executeAntTask", "Style = "+ javaWSDLParam_.getStyle());
-		
-		emitter.setUse(javaWSDLParam_.getUse());
-		environment.getLog().log(ILog.INFO, 5014, this, "executeAntTask", "Use = "+ javaWSDLParam_.getUse());
-		
-		emitter.setOutput(new File(javaWSDLParam_.getOutputWsdlLocation()));
-		environment.getLog().log(ILog.INFO, 5015, this, "executeAntTask", "WSDL Location = "+ javaWSDLParam_.getOutputWsdlLocation());
-		
-		emitter.setNamespace(javaWSDLParam_.getNamespace());
-		environment.getLog().log(ILog.INFO, 5016, this, "executeAntTask", "Name Space = "+ javaWSDLParam_.getNamespace());
-		
-		emitter.setClassName(javaWSDLParam_.getBeanName());
-		environment.getLog().log(ILog.INFO, 5017, this, "executeAntTask", "Bean name = "+ javaWSDLParam_.getBeanName());
-		
-		emitter.setImplClass(javaWSDLParam_.getBeanName());
-		
-		HashMap mappings = javaWSDLParam_.getMappings();
-		if(mappings != null){
-			Iterator keys = mappings.keySet().iterator();
-			while(keys.hasNext()){
-				String pakage = (String)keys.next();
-				String namespace = (String)mappings.get(pakage);
-				NamespaceMapping map = new NamespaceMapping();
-				map.setPackage(pakage);
-				map.setNamespace(namespace);
-				emitter.addMapping(map);		
-			}
-		}
-		
-	
-		try {
-			emitter.execute();
-		} catch (BuildException e) {
-			environment.getLog().log(ILog.ERROR, 5018, this, "executeAntTask", e);
-			IStatus status = StatusUtils.errorStatus(
-			getMessage("MSG_ERROR_JAVA_WSDL_GENERATE") + " " //$NON-NLS-1$
-			+e.getCause().toString());
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		return Status.OK_STATUS;
-
-	}
-	
-	public Status undo(IEnvironment environment) {
-		return null;
-	}
-
-	public Status redo(IEnvironment environment) {
-		return null;
-	}
-
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	private String getMessage(String messageId, String parm1) {
-		String message = resource.getString(messageId);
-		return MessageFormat.format(message, new String[] { parm1 });
-	}
-
-	/**
-	* Returns the message string identified by the given key from
-	* plugin.properties.
-	* @return The String message.
-	*/
-	public String getMessage(String key) {
-		return resource.getString(key);
-	}
-
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParm) {
-		this.javaWSDLParam_ = javaWSDLParm;
-	}
-	
-	public String getWsdlURI()
-	{
-	  File file = new File(getJavaWSDLParam().getOutputWsdlLocation()); 
-	    String url = "";
-		  try {
-	    	url = file.toURL().toString();
-	    }
-		  catch(MalformedURLException mue){}
-		return url;
-	}
-}

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
deleted file mode 100644
index 541d3ee..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.GeneratedFileInfo;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class WSDL2JavaCommand extends AbstractDataModelOperation {
-
-	private final String DEPLOY_TYPE = "deploy"; //$NON-NLS-1$
-	private final String UNDEPLOY_TYPE = "undeploy"; //$NON-NLS-1$
-	private JavaWSDLParameter javaWSDLParam;
-	private String wsdlURI;
-	private String httpBasicAuthUsername;
-	private String httpBasicAuthPassword;
-	private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-	
-
-	public WSDL2JavaCommand() {
-	}
-
-	  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-	  {
-	    IEnvironment environment = getEnvironment();
-		IStatus status;
-		if (javaWSDLParam == null) {
-			status = StatusUtils.errorStatus(
-					getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		if (wsdlURI != null) //bottom up case has already has the correct WSDL on javaWSDLParam
-		{
-			javaWSDLParam.setInputWsdlLocation(wsdlURI);
-		}
-		javaWSDLParam.setHTTPUsername(httpBasicAuthUsername);
-		javaWSDLParam.setHTTPPassword(httpBasicAuthPassword);
-		
-		Emitter wsdl2Java = new Emitter();
-		if (environment.getLog().isEnabled("emitter")) {
-			wsdl2Java.setVerbose(true);
-		} else {
-			wsdl2Java.setVerbose(false);
-		}
-		boolean serverSide = javaWSDLParam.getServerSide() == JavaWSDLParameter.SERVER_SIDE_BEAN;
-		wsdl2Java.setServerSide(serverSide);
-		if (serverSide) {
-			wsdl2Java.setSkeletonWanted(javaWSDLParam.isSkeletonDeploy());
-		}
-		if (javaWSDLParam.isMetaInfOnly()) {
-			// for the case Java2WSDL-WSDL2Java
-			wsdl2Java.setOutputDir(removeFileProtocol(javaWSDLParam.getOutput()));
-			HashMap pck2nsMap = javaWSDLParam.getMappings();
-			if (pck2nsMap != null) {
-				HashMap ns2pckMap = new HashMap();
-				Iterator keys = pck2nsMap.keySet().iterator();
-				while (keys.hasNext()) {
-					String pakage = (String) keys.next();
-					String namespace = (String) pck2nsMap.get(pakage);
-					ns2pckMap.put(namespace, pakage);
-				}
-				wsdl2Java.setNamespaceMap(ns2pckMap);
-			}
-		} else {
-			//  for the case WSDL2Java
-			wsdl2Java.setOutputDir(removeFileProtocol(javaWSDLParam.getJavaOutput()));
-			if (javaWSDLParam.getMappings() != null) {
-				wsdl2Java.setNamespaceMap(javaWSDLParam.getMappings());
-			}
-		}
-		environment.getLog().log(ILog.INFO, 5019, this, "execute", "Java output = " + javaWSDLParam.getJavaOutput());
-		if (javaWSDLParam.getHTTPPassword() != null) {
-			wsdl2Java.setPassword(javaWSDLParam.getHTTPPassword());
-			environment.getLog().log(ILog.INFO, 5081, this, "execute", "password: " + javaWSDLParam.getHTTPPassword());
-		}
-		if (javaWSDLParam.getHTTPUsername() != null) {
-			wsdl2Java.setUsername(javaWSDLParam.getHTTPUsername());
-			environment.getLog().log(ILog.INFO, 5082, this, "execute", "username: " + javaWSDLParam.getHTTPUsername());
-		}
-		environment.getLog().log(ILog.INFO, 5020, this, "execute", "WSDL Location = " + javaWSDLParam.getInputWsdlLocation());
-		ProgressUtils.report(monitor, getMessage("MSG_PARSING_WSDL", javaWSDLParam.getInputWsdlLocation() ) );
-		try {
-			wsdl2Java.run(javaWSDLParam.getInputWsdlLocation());
-			if (serverSide) {
-				// set deployment files
-				List deploymentFiles1 = wsdl2Java.getGeneratedFileInfo().findType(DEPLOY_TYPE);
-				List deploymentFiles2 = wsdl2Java.getGeneratedFileInfo().findType(UNDEPLOY_TYPE);
-				ArrayList deplFiles = new ArrayList();
-				if (deploymentFiles1 != null && deploymentFiles2 != null) {
-					deploymentFiles1.addAll(deploymentFiles2);
-					for (int i = 0; i < deploymentFiles1.size(); i++) {
-						GeneratedFileInfo.Entry entry = (GeneratedFileInfo.Entry) deploymentFiles1.get(i);
-						deplFiles.add(entry.fileName);
-					}
-					String[] deplFilesArray = new String[deplFiles.size()];
-					deplFiles.toArray(deplFilesArray);
-					javaWSDLParam.setDeploymentFiles(deplFilesArray);
-				}
-				// set java files
-				List javaFiles = wsdl2Java.getGeneratedFileNames();
-				javaFiles.removeAll(deplFiles);
-				String[] javaFileNames = new String[javaFiles.size()];
-				javaFiles.toArray(javaFileNames);
-				javaWSDLParam.setJavaFiles(javaFileNames);
-			}
-			
-		} catch (Exception e) {
-			environment.getLog().log(ILog.ERROR, 5021, this, "execute", e);
-			status = StatusUtils.errorStatus(
-					getMessage("MSG_ERROR_WSDL_JAVA_GENERATE") + " " //$NON-NLS-1$
-							+ e.toString());
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		return Status.OK_STATUS;
-	}
-
-	/*
-	 * Hack: Axis doesn't like file URLs
-	 */
-	private String removeFileProtocol(String s) {
-		if (s.startsWith("file:")) {
-			String newS = s.substring(5, s.length());
-			int i = newS.indexOf(':');
-			if (i != -1) {
-				String protocol = newS.substring(0, i);
-				int j = protocol.indexOf('/');
-				int k = protocol.indexOf('\\');
-				int max = Math.max(j, k);
-				if (max != -1)
-					newS = newS.substring(max + 1, newS.length());
-			}
-			return newS;
-		}
-		return s;
-	}
-
-	public Status undo(IEnvironment environment) {
-		return null;
-	}
-
-	public Status redo(IEnvironment environment) {
-		return null;
-	}
-
-	private String getMessage(String messageId, String parm1) {
-		String message = resource.getString(messageId);
-		return MessageFormat.format(message, new String[]{parm1});
-	}
-
-	/**
-	 * Returns the message string identified by the given key from
-	 * plugin.properties.
-	 * 
-	 * @return The String message.
-	 */
-	public String getMessage(String key) {
-		return resource.getString(key);
-	}
-
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam = javaWSDLParam;
-	}
-
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam;
-	}
-
-	/**
-	 * @param httpBasicAuthPassword
-	 *            The httpBasicAuthPassword to set.
-	 */
-	public void setHttpBasicAuthPassword(String httpBasicAuthPassword) {
-		this.httpBasicAuthPassword = httpBasicAuthPassword;
-	}
-
-	/**
-	 * @param httpBasicAuthUsername
-	 *            The httpBasicAuthUsername to set.
-	 */
-	public void setHttpBasicAuthUsername(String httpBasicAuthUsername) {
-		this.httpBasicAuthUsername = httpBasicAuthUsername;
-	}
-
-	public void setWsdlURI(String wsdlURI) {
-		this.wsdlURI = wsdlURI;
-	}
-
-}

diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
deleted file mode 100644
index c3da781..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
+++ /dev/null

@@ -1,448 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.common;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-
-public class JavaWSDLParameter {
-
-	public static final byte SERVER_SIDE_NONE = 0;
-	public static final byte SERVER_SIDE_BEAN = 1;
-	public static final byte SERVER_SIDE_EJB = 2;
-
-	public static final String STYLE_RPC = "RPC"; //$NON-NLS-1$
-	public static final String STYLE_DOCUMENT = "DOCUMENT"; //$NON-NLS-1$
-	public static final String STYLE_WRAPPED = "WRAPPED"; //$NON-NLS-1$
-
-	public static final String USE_LITERAL = "LITERAL"; //$NON-NLS-1$
-	public static final String USE_ENCODED = "ENCODED"; //$NON-NLS-1$
-
-	private String beanName = null; // The name of the Java bean
-	private String classpath = null;
-	// The class path for loading the bean and command execution
-	private String beanPackage = null; // The package location of the bean
-	private String portTypeName = null; // The name of the port type element
-	private String serviceName = null; // The name of the service element
-	private String outputWsdlLocation = null;
-	// The output location of the WSDL file
-	private String inputWsdlLocation = null;
-	// The input location of the WSDL file
-	private String urlLocation = null; // The URL location of the web service
-	private Hashtable methods = null; // The array of method names
-	private String style = null;
-	// The style (RPC | DOCUMENT | WRAPPED) attribute for the generated WSDL
-	private String use = null;
-	// The use (LITERAL | ENCODED) attribtue for the generated WSDL
-	private String output = null;
-	// The output location for deployment descriptors & Java code (output from WSDL2Java command)
-	private String javaOutput = null;
-	// The output location for Java code (output from WSDL2Java command)
-	private boolean metaInfOnly = false; // META-INF-ONLY flag
-	private byte serverSide = SERVER_SIDE_NONE;
-	// server-side flag (SERVER_SIDE_NONE | SERVER_SIDE_BEAN | SERVER_SIDE_EJB)
-	private String namespace = null;
-	private boolean skeletonDeploy = true;
-	private String container = null;
-	private String[] deploymentFiles = null;
-	private String[] javaFiles = null;
-	private String projectURL = null;
-	private HashMap mappingPairs;
-	private String httpUsername_ = null;
-	private String httpPassword_ = null;
-
-	public void setContainer(String container) {
-		this.container = container;
-	}
-
-	public String getContainer() {
-		return container;
-	}
-
-	/**
-	 * Constructor for JavaWSDLParameter.
-	 */
-	public JavaWSDLParameter() {
-	}
-
-	/**
-	 * Returns the beanName.
-	 * @return String
-	 */
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public String getBeanPackage() {
-		return beanPackage;
-	}
-
-	/**
-	 * Returns the portTypeName.
-	 * @return String
-	 */
-	public String getPortTypeName() {
-		return portTypeName;
-	}
-
-	/**
-	 * Returns the serviceName.
-	 * @return String
-	 */
-	public String getServiceName() {
-		return serviceName;
-	}
-
-	/**
-	 * Returns the output.
-	 * @return String
-	 */
-	public String getOutput() {
-		return output;
-	}
-
-	/**
-	 * Returns the methods.
-	 * @return String[]
-	 */
-	public Hashtable getMethods() {
-		return methods;
-	}
-
-	/**
-	 * Returns the comma seperated string represetation of the methods.
-	 * @return String
-	 */
-	public String getMethodString() {
-		String methodString = ""; //$NON-NLS-1$
-		Enumeration e = methods.keys();
- 		for (int i=0; e.hasMoreElements(); i++)
-    	{
-
-			String signature = (String) e.nextElement();
-			if (((Boolean) methods.get(signature)).booleanValue()){
-							int index = signature.indexOf('(');
-							String name = signature.substring(0, index);
-							methodString += name;
-			}
-	    	if (i != methods.size() -1) // this is not the last array item	
-			{
-				methodString += ",";
-			}
-		}
-		return methodString;
-	}
-
-	/**
-	 * Returns the style attribute.
-	 * @return String
-	 */
-	public String getStyle() {
-		return style;
-	}
-
-	/**
-	 * Returns the urlLocation.
-	 * @return String
-	 */
-	public String getUrlLocation() {
-		return urlLocation;
-	}
-
-	/**
-	 * Returns the use attribute.
-	 * @return String
-	 */
-	public String getUse() {
-		return use;
-	}
-
-	/**
-	 * Returns the outputWsdlLocation.
-	 * @return String
-	 */
-	public String getOutputWsdlLocation() {
-		return outputWsdlLocation;
-	}
-
-	/**
-	 * Sets the beanName.
-	 * @param beanName The beanName to set
-	 */
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public void setBeanPackage(String beanPackage) {
-		this.beanPackage = beanPackage;
-	}
-
-	/**
-	 * Sets the portTypeName.
-	 * @param portTypeName The portTypeName to set
-	 */
-	public void setPortTypeName(String portTypeName) {
-		this.portTypeName = portTypeName;
-	}
-
-	/**
-	 * Sets the serviceName.
-	 * @param serviceName The serviceName to set
-	 */
-	public void setServiceName(String serviceName) {
-		this.serviceName = serviceName;
-	}
-
-	/**
-	 * Sets the output.
-	 * @param output The output to set
-	 */
-	public void setOutput(String output) {
-		this.output = output;
-	}
-
-	/**
-	 * Sets the methods.
-	 * @param methods The methods to set
-	 */
-	public void setMethods(Hashtable methods) {
-		this.methods = methods;
-	}
-
-	/**
-	 * Sets the style.
-	 * @param style The style to set
-	 */
-	public void setStyle(String style) {
-		this.style = style;
-	}
-
-	/**
-	 * Sets the urlLocation.
-	 * @param urlLocation The urlLocation to set
-	 */
-	public void setUrlLocation(String urlLocation) {
-		this.urlLocation = urlLocation;
-	}
-
-	/**
-	 * Sets the use.
-	 * @param use The use to set
-	 */
-	public void setUse(String use) {
-		this.use = use;
-	}
-
-	/**
-	 * Sets the outputWsdlLocation.
-	 * @param outputWsdlLocation The outputWsdlLocation to set
-	 */
-	public void setOutputWsdlLocation(String wsdlLocation) {
-		this.outputWsdlLocation = wsdlLocation;
-	}
-
-	/**
-	 * Returns the metaInfOnly.
-	 * @return boolean
-	 */
-	public boolean isMetaInfOnly() {
-		return metaInfOnly;
-	}
-
-	/**
-	 * Sets the metaInfOnly.
-	 * @param metaInfOnly The metaInfOnly to set
-	 */
-	public void setMetaInfOnly(boolean metaInfOnly) {
-		this.metaInfOnly = metaInfOnly;
-	}
-
-	/**
-	 * Returns the serverSide.
-	 * @return byte
-	 */
-	public byte getServerSide() {
-		return serverSide;
-	}
-
-	/**
-	 * Sets the serverSide.
-	 * @param serverSide The serverSide to set
-	 */
-	public void setServerSide(byte serverSide) {
-		this.serverSide = serverSide;
-	}
-
-	/**
-	 * Returns the inputWsdlLocation.
-	 * @return String
-	 */
-	public String getInputWsdlLocation() {
-		return inputWsdlLocation;
-	}
-
-	/**
-	 * Sets the inputWsdlLocation.
-	 * @param inputWsdlLocation The inputWsdlLocation to set
-	 */
-	public void setInputWsdlLocation(String inputWsdlLocation) {
-		this.inputWsdlLocation = inputWsdlLocation;
-	}
-
-	/**
-	 * Returns the namespace.
-	 * @return String
-	 */
-	public String getNamespace() {
-		return namespace;
-	}
-
-	/**
-	 * Sets the namespace.
-	 * @param namespace The namespace to set
-	 */
-	public void setNamespace(String namespace) {
-		this.namespace = namespace;
-	}
-
-	/**
-	 * Returns the Java output.
-	 * @return String
-	 */
-	public String getJavaOutput() {
-		return javaOutput;
-	}
-
-	/**
-	 * Sets the javaOutput.
-	 * @param javaOutput The Java output to set
-	 */
-	public void setJavaOutput(String javaOutput) {
-		this.javaOutput = javaOutput;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getClasspath() {
-		return classpath;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setClasspath(String string) {
-		classpath = string;
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean isSkeletonDeploy() {
-		return skeletonDeploy;
-	}
-
-	/**
-	 * @param b
-	 */
-	public void setSkeletonDeploy(boolean b) {
-		skeletonDeploy = b;
-	}
-
-	/**
-	 * @return
-	 */
-	public String[] getDeploymentFiles() {
-		return deploymentFiles;
-	}
-
-	/**
-	 * @param strings
-	 */
-	public void setDeploymentFiles(String[] strings) {
-		deploymentFiles = strings;
-	}
-
-	/**
-	 * @return
-	 */
-	public String[] getJavaFiles() {
-		return javaFiles;
-	}
-
-	/**
-	 * @param strings
-	 */
-	public void setJavaFiles(String[] strings) {
-		javaFiles = strings;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getProjectURL() {
-		return projectURL;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setProjectURL(String string) {
-		projectURL = string;
-	}
-	
-	public HashMap getMappings()
-	{
-			return mappingPairs;
-	}
-
-	public void setMappings(HashMap map)
-	{
-			mappingPairs = map;
-	}
-	
-	/**
-	 * Returns the user name for HTTP basic authentication
-	 * @return String
-	 */
-	public String getHTTPUsername()
-	{
-	  return httpUsername_;
-	}
-
-	/**
-	 * Sets the user name for HTTP basic authentication
-	 * @param String
-	 */
-	public void setHTTPUsername(String httpUsername)
-	{
-	  httpUsername_ = httpUsername;
-	}
-
-	/**
-	 * Returns the password for HTTP basic authentication
-	 * @return String
-	 */
-	public String getHTTPPassword()
-	{
-	  return httpPassword_;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setHTTPPassword(String httpPassword) {
-		httpPassword_ = httpPassword;
-	}
-
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-build.xml

diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project
deleted file mode 100644
index 8023461..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.creation.ejb.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9dad884..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ejb.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.ui,
- org.eclipse.wst.command.env.ui

diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
deleted file mode 100644
index 6e2940f..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               about.html

diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
deleted file mode 100644
index 13fe654..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
+++ /dev/null

@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Creation EJB Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-#
-# Web service types
-#
-WEBSERVICETYPE_NAME_EJB_TP=EJB Web Service
-WEBSERVICETYPE_NAME_WSDL_EJB_TP=Skeleton EJB Web Service
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-

diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
deleted file mode 100644
index 4a8659f..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
+++ /dev/null

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-    <!-- EJB Web Service Types -->
-<!--   
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
-      <webServiceType
-            label="%WEBSERVICETYPE_NAME_WSDL_EJB_TP"
-            resourceTypeMetadata="File IResource"
-            extensionMetadata=".wsdl"
-            objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
-            includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
-            excludeNatures=""
-            id="org.eclipse.jst.ws.type.wsdl.ejb">
-      </webServiceType>
-
-      <webServiceType
-		    label="%WEBSERVICETYPE_NAME_EJB_TP"
-		    resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
-		    extensionMetadata=".java .class .SessionImpl"
-		    objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
-		    includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
-		    excludeNatures=""
-		    id="org.eclipse.jst.ws.type.ejb">
-  	 </webServiceType>
-	</extension>
--->
-
-   <!-- Popups -->
-      
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-   </extension>
-
-
-<!-- EJB stuff -->
-     <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
-     <webServiceImpl
-            id="org.eclipse.jst.ws.wsImpl.ejb"
-            label="%WEBSERVICETYPE_NAME_EJB_TP"
-            resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
-            extensionMetadata=".java .class .SessionImpl"
-            objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
-     </webServiceImpl>
-    </extension>    
-    
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
-  <serviceType
-            id="org.eclipse.jst.ws.serviceType.ejb"
-            implId="org.eclipse.jst.ws.wsImpl.ejb"
-            buModuleTypesInclude="jst.ejb"
-            buModuleTypesExclude=""
-            tdModuleTypesInclude="jst.ejb"
-            tdModuleTypesExclude="">
-  </serviceType>
-</extension>   
-
-            
-   
-</plugin>
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.creation.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
deleted file mode 100644
index af1d581..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-ui.jar
-@dot

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.project b/bundles/org.eclipse.jst.ws.creation.ui/.project
deleted file mode 100644
index ef454e4..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.creation.ui</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env</project>
-		<project>org.eclipse.wst.command.env.core</project>
-		<project>org.eclipse.jst.ws</project>
-		<project>org.eclipse.jst.ws.consumption</project>
-		<project>org.eclipse.jst.ws.consumption.ui</project>
-		<project>org.eclipse.jst.ws.ui</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 38da0d1..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,44 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true
-Bundle-Version: 0.7.1
-Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.creation.ui,
- org.eclipse.jst.ws.internal.creation.ui.extension,
- org.eclipse.jst.ws.internal.creation.ui.plugin,
- org.eclipse.jst.ws.internal.creation.ui.preferences,
- org.eclipse.jst.ws.internal.creation.ui.server,
- org.eclipse.jst.ws.internal.creation.ui.widgets,
- org.eclipse.jst.ws.internal.creation.ui.widgets.binding,
- org.eclipse.jst.ws.internal.creation.ui.widgets.runtime,
- org.eclipse.jst.ws.internal.creation.ui.widgets.test
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.wst.server.core,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.wsdl4j,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.project.facet.core
-Eclipse-AutoStart: true

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ui/build.properties
deleted file mode 100644
index e1dec33..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
deleted file mode 100644
index ca44ef8..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif
deleted file mode 100644
index 74fcd77..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
deleted file mode 100644
index 2d737f0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif
deleted file mode 100644
index abd1f9c..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
deleted file mode 100644
index c124705..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
+++ /dev/null

@@ -1,62 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Creation Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-PLUGIN_NEW_WIZARD_NAME_WS_SERVICE=Web Service
-PLUGIN_EXPORT_WIZARD_NAME_WS=Web Service
-PLUGIN_NEW_WIZARD_DESC_WS_SERVICE=Create a new XML web service.
-PLUGIN_EXPORT_WIZARD_DESC_WS=A wizard for exporting a web service.
-
-#
-#	Web Services Preferance Pages
-#
-# Dialogs
-CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG=Hide Create Web service Dialog
-CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG=Hide Generate Java Bean Skeleton Dialog
-CHECKBOX_SHOW_GENERATE_WSDL_FILES_DIALOG=Hide Generate WSDL Files Dialog
-CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG=Hide Publish WSDL Dialog
-
-PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults
-
-
-#
-# Preferences Tooltips
-#
-#Action Dialogs
-TOOLTIP_PPAD_CHECKBOX_DEPLOY=Hides the dialog for deploying a Web service action
-TOOLTIP_PPAD_CHECKBOX_SKELETON=Hides the dialog for generating Java bean Skeleton action
-TOOLTIP_PPAD_CHECKBOX_WSDL=Hides the dialog for generating WSDL files action
-TOOLTIP_PPAD_CHECKBOX_PUBLISH=Hides the dialog for publishing the WSDL action
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-ACTION_GENERATE_JAVA_SKELETON=Generate Java bean skeleton
-ACTION_PUBLISH_WSDL=Publish WSDL file
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSS=Web Service
-
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
deleted file mode 100644
index 99bdf01..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
+++ /dev/null

@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <!-- Wizards -->
-
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%PLUGIN_NEW_CATEGORY_NAME_WS"
-            id="org.eclipse.jst.ws.ui.new">
-      </category>
-      <wizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_SERVICE"
-            icon="icons/full/ctool16/new_webserv_wiz.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         <description>
-            %PLUGIN_NEW_WIZARD_DESC_WS_SERVICE
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/full/wizban/webservices_wiz.gif"
-            title="%WIZARD_TITLE_WSS"
-            class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ServerWidgetBinding"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            icon="icons/export_ws.gif"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="wsexport">
-         <description>
-            %PLUGIN_EXPORT_WIZARD_DESC_WS
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/export_ws_wiz.gif"
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
-            id="wsexport">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/export_ws_wiz.gif"
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-      </dynamicWizard>
-   </extension>
-
-   <!-- "Don't Show Me" Preferences -->
-
-   <extension
-         point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_DEPLOY"
-            infopop="org.eclipse.jst.ws.creation.ui.PPAD0006"
-            category="org.eclipse.jst.wss.popup.category"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_SKELETON"
-            infopop="org.eclipse.jst.ws.creation.ui.PPAD0008"
-            category="org.eclipse.jst.wss.popup.category"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_PUBLISH"
-            infopop="org.eclipse.jst.ws.creation.ui.PPAD0009"
-            category="org.eclipse.jst.wss.popup.category"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-      </actionDialogPreferenceType>
-
-   </extension>
-
-   <!-- Popups -->
-   
-   <extension
-         point="org.eclipse.ui.popupMenus">
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.java"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
-            nameFilter="*.java"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-      
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>       
-      
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsil"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-         <action
-               label="%ACTION_PUBLISH_WSDL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-         </action>
-      </objectContribution>
-
-   </extension>
-   
-   <!-- Preference Pages -->
-
-   <extension point="org.eclipse.ui.preferencePages">
-      <page
-            name="%PREFERENCE_CATEGORY_SCENARIO_DEFAULTS"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage"
-            id="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage">
-      </page>
-   </extension>
-   
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="StartServiceServer"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand"
-             class="org.eclipse.jst.ws.internal.creation.ui.server.StartServerWidgetFactory"/>
-    </extension> 
-
-</plugin>

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties
deleted file mode 100644
index 6a4c47a..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# WSDL Test Errors
-#
-MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST=IWAB0361E An error occurred. Unable to launch WSDL test facility.
-
-
-#
-# Wizard pages
-#
-PAGE_TITLE_OBJECT_SELECTION=Object Selection Page
-PAGE_DESC_OBJECT_SELECTION=Object Selection Page
-
-
-

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
deleted file mode 100644
index 5ed4a28..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceAssembleCommand extends AbstractDataModelOperation 
-{
-	private IWebService				webService_;
-	private String						project_;
-  private String            module_;
-	private String						earProject_;
-  private String            ear_;
-	private String            j2eeLevel_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-    
-	  System.out.println( "In Pre service assemble command." );
-    
-		// Check if EAR module is req'd, ie. !=null
-		if (earProject_==null)
-			return Status.OK_STATUS;
-	  
-	  
-		//Create the service EAR module
-		CreateModuleCommand command = new CreateModuleCommand();
-		command.setProjectName(earProject_);
-		command.setModuleName(ear_);
-		command.setModuleType(CreateModuleCommand.EAR);
-		command.setServerFactoryId(webService_.getWebServiceInfo().getServerFactoryId());
-		command.setServerInstanceId( webService_.getWebServiceInfo().getServerInstanceId() );
-		command.setJ2eeLevel(j2eeLevel_);
-    command.setEnvironment( environment );
-		IStatus status = command.execute( monitor, null );
-		if (status.getSeverity()==Status.ERROR)
-		{
-			environment.getStatusHandler().reportError(status);
-		  return status;
-		}			
-		
-		
-		//Associate the service module and service EAR
-		AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
-		associateCommand.setProject(project_);
-		associateCommand.setModule(module_);
-		associateCommand.setEARProject(earProject_);
-		associateCommand.setEar(ear_);
-    associateCommand.setEnvironment( environment );
-		status = associateCommand.execute( monitor, null );
-		if (status.getSeverity()==Status.ERROR)
-		{
-			environment.getStatusHandler().reportError(status);		  
-		}			
-		
-		return status;	  
-  }
-	
-  public void setProject( String project )
-  {
-	  project_ = project;
-  }
-	  
-  public void setModule( String module )
-  {
-	  module_ = module;
-  }	
-	
-  public void setEarProject( String earProject )
-  {
-	  earProject_ = earProject;
-  }
-  
-  public void setEar( String ear )
-  {
-	  ear_ = ear;  
-  }
-	
- 
-  public void setJ2eeLevel( String j2eeLevel )
-  {
-	  j2eeLevel_ = j2eeLevel;  
-  }
-	
-  public void setWebService( IWebService webService )
-  {
-	  webService_ = webService;  
-  }	
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
deleted file mode 100644
index e0adbe6..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class PreServiceDeployCommand extends AbstractDataModelOperation
-{
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  System.out.println( "In Pre service deploy command." );
-
-	  return Status.OK_STATUS;
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
deleted file mode 100644
index 4e694c7..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
+++ /dev/null

@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-public class PreServiceDevelopCommand extends AbstractDataModelOperation 
-{
-  private TypeRuntimeServer typeRuntimeServer_;
-  private String            serviceRuntimeId_;
-  private IContext          context_;
-  private ISelection        selection_;
-	private String						project_;
-  private String            module_;
-  private String			      moduleType_;
-	private String						earProject_;
-  private String            ear_;
-	
-  private IWebService       webService_;
-  private String            j2eeLevel_;
-  private ResourceContext   resourceContext_;
-  
-  private boolean run_;
-  private boolean client_;
-  private boolean test_;
-  private boolean publish_;
-  
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment environment = getEnvironment();
-	  
-    // Split up the project and module
-    int index = module_.indexOf("/");
-    if (index!=-1){
-      project_ = module_.substring(0,index);
-      module_ = module_.substring(index+1);
-    }
-
-    if (ear_!=null && ear_.length()>0)
-    {
-      int earIndex = ear_.indexOf("/");
-      if (earIndex!=-1) {
-        earProject_ = ear_.substring(0,earIndex);
-        ear_ = ear_.substring(earIndex+1);
-      }
-    }
-    
-    
-	  IWebServiceRuntime wsrt   = WebServiceRuntimeExtensionUtils2.getServiceRuntime( serviceRuntimeId_ );
-	  WebServiceInfo     wsInfo = new WebServiceInfo();
-
-	  System.out.println( "In Pre service develop command." );
-	
-      j2eeLevel_ = getJ2EELevelFromExistingProject();
-	  wsInfo.setJ2eeLevel( j2eeLevel_ );
-	  wsInfo.setServerFactoryId( typeRuntimeServer_.getServerId() );
-      wsInfo.setServerInstanceId( typeRuntimeServer_.getServerInstanceId());
-	  wsInfo.setState( WebServiceState.UNKNOWN_LITERAL );
-	  wsInfo.setWebServiceRuntimeId( typeRuntimeServer_.getRuntimeId() );
-    
-		webService_  = wsrt.getWebService( wsInfo );
-	
-		//Set up the IContext
-		WebServiceScenario scenario = null;
-    int scenarioInt = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeRuntimeServer_.getTypeId());
-    if (scenarioInt == WebServiceScenario.BOTTOMUP)
-		{
-			scenario = WebServiceScenario.BOTTOMUP_LITERAL;
-      String impl = (String)(selection_.getSelection())[0];
-      wsInfo.setImplURL(impl);
-		}
-    else if (scenarioInt == WebServiceScenario.TOPDOWN)
-		{
-		  scenario = WebServiceScenario.TOPDOWN_LITERAL;
-      String wsdlURL = (String)(selection_.getSelection())[0];
-      wsInfo.setWsdlURL(wsdlURL);      
-		}
-	
-		context_     = new SimpleContext(true, true, true, true, run_, client_, test_, publish_, 
-																		scenario, 
-																		resourceContext_.isOverwriteFilesEnabled(),
-																		resourceContext_.isCreateFoldersEnabled(),
-																		resourceContext_.isCheckoutFilesEnabled());
-
-    //Create the service module
-
-		//rsk todo -- pick the correct module type based on the Web service type, it's hard coded to WEB for now.
-		int intModuleType = convertModuleType(moduleType_);
-		
-
-	      CreateModuleCommand command = new CreateModuleCommand();
-		  command.setProjectName(project_);
-		  command.setModuleName(module_);			
-		  command.setModuleType(intModuleType);
-		  command.setServerFactoryId(typeRuntimeServer_.getServerId());
-		  command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-		  command.setJ2eeLevel(j2eeLevel_);
-      command.setEnvironment(environment);
-		  IStatus status = command.execute( monitor, null);
-
-		
-		if (status.getSeverity()==Status.ERROR)
-		{
-			environment.getStatusHandler().reportError(status);
-		}			
-	  return status;				
-  }
-  
-  private String getJ2EELevelFromExistingProject()
-  {
-    IProject project = ProjectUtilities.getProject(project_);
-    if (project != null && project.exists())
-    {
-          //If the project has the "jst.web", "jst.ejb", or "jst.appclient" facet, deduce a J2EE version.
-          int j2eeLevelInt = J2EEUtils.getJ2EEVersion(project);
-          if (j2eeLevelInt != -1)
-          {
-            return String.valueOf(j2eeLevelInt);                    
-          }
-    }
-    
-    //TODO Figure out the J2EE version from the facets to add to a project.
-    return String.valueOf(J2EEVersionConstants.J2EE_1_4_ID); //for now, just return something
-  }
-  
-  private int convertModuleType(String type)
-  {
-	  if (type.equals(IModuleConstants.JST_WEB_MODULE))
-	  {
-		  return CreateModuleCommand.WEB;
-	  }
-	  else if (type.equals(IModuleConstants.JST_EJB_MODULE))
-	  {
-		  return CreateModuleCommand.EJB;
-	  }
-	  else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
-	  {
-		  return CreateModuleCommand.APPCLIENT;
-	  }
-	  else if (type.equals(IModuleConstants.JST_EAR_MODULE))
-	  {
-		  return CreateModuleCommand.EAR;
-	  }	  
-	  else
-	  {
-		  return -1;
-	  }
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
-  {
-	  typeRuntimeServer_ = typeRuntimeServer;  
-  }
-  
-  public void setServiceRuntimeId(String id)
-  {
-    serviceRuntimeId_ = id;
-  }
-	  
-  public void setServiceJ2EEVersion( String j2eeLevel )
-  {
-	j2eeLevel_ = j2eeLevel;  
-  }
-  
-  public String getJ2eeLevel()
-  {
-	  return j2eeLevel_;  
-  }
-	
-  public IWebService getWebService()
-  {
-	return webService_;  
-  }
-  
-  public IContext getContext()
-  {
-    return context_;
-  }
-  
-  public void setResourceContext( ResourceContext resourceContext )
-  {
-    resourceContext_ = resourceContext;	  
-  }
-  
-  public ISelection getSelection()
-  {
-    return selection_;	  
-  }
-  
-  public void setSelection( ISelection selection )
-  {
-	selection_ = selection;  
-  }
-  
-  public String getProject()
-  {
-    return project_;	  
-  }
-	 
-  public String getModule()
-  {
-    return module_;	  
-  }
-	
-  public void setModule( String module )
-  {
-	  module_ = module;
-  }
-  
-  public void setModuleType(String type)
-  {
-	  moduleType_ = type;
-  }
-	
-  public String getEarProject()
-  {
-    return earProject_;	  
-  }
-	
-  public String getEar()
-  {
-	  return ear_;  
-  }
-  
-  public void setEar( String ear )
-  {
-	  ear_ = ear;  
-  }
-  
-	public void setStartService(boolean startService)
-	{
-		run_ = startService;
-	}
-	
-	public void setTestService(boolean testService)
-	{
-		test_ = testService;
-	}	
-	
-  public void setPublishService(boolean publishService)
-  {
-    publish_ = publishService;
-  }
-	
-  public void setGenerateProxy(boolean genProxy)
-  {
-    client_ = genProxy;  
-  }	
-	
-
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
deleted file mode 100644
index 04b3f23..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceInstallCommand extends AbstractDataModelOperation 
-{
-	private IWebService				webService_;
-	private String						project_;
-  private String            module_;
-	private String						earProject_;
-  private String            ear_;
-		
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-      IEnvironment environment = getEnvironment();
-      
-		  System.out.println( "In Pre service install command." );
-			
-			if (webService_.getWebServiceInfo().getServerInstanceId()==null)
-			{
-				CreateServerCommand createServerCommand = new CreateServerCommand();
-				createServerCommand.setServerFactoryid(webService_.getWebServiceInfo().getServerFactoryId());
-        createServerCommand.setEnvironment( environment );
-				IStatus createServerStatus = createServerCommand.execute( monitor, null);
-				if (createServerStatus.getSeverity()==Status.OK)
-				{
-					webService_.getWebServiceInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
-				}
-				else
-				{
-					if (createServerStatus.getSeverity()==Status.ERROR)
-					{
-						environment.getStatusHandler().reportError(createServerStatus);
-					}								
-					return createServerStatus;
-				}
-			}
-			  
-			
-			
-			AddModuleToServerCommand command = new AddModuleToServerCommand();
-			command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
-			if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
-			{
-				command.setProject(earProject_);
-				command.setModule(ear_);
-			}
-			else
-			{
-				command.setProject(project_);
-				command.setModule(module_);				
-			}
-
-      command.setEnvironment( environment );
-			IStatus status = command.execute( monitor, null );
-			if (status.getSeverity()==Status.ERROR)
-			{
-				environment.getStatusHandler().reportError(status);
-			}			
-		  return status;
-	  }
-
-	  public void setProject( String project )
-	  {
-		  project_ = project;
-	  }
-		  
-	  public void setModule( String module )
-	  {
-		  module_ = module;
-	  }	
-		
-	  public void setEarProject( String earProject )
-	  {
-		  earProject_ = earProject;
-	  }
-	  
-	  public void setEar( String ear )
-	  {
-		  ear_ = ear;  
-	  }
-		
-	  public void setWebService( IWebService webService )
-	  {
-		  webService_ = webService;  
-	  }
-		
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
deleted file mode 100644
index b0f876d..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceRunCommand extends AbstractDataModelOperation 
-{
-	private IWebService				webService_;
-	
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-      IEnvironment environment = getEnvironment();
-      
-		  System.out.println( "In Pre service run command." );
-			
-			StartServerCommand command = new StartServerCommand();
-			command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
-      command.setEnvironment( environment );
-			IStatus status = command.execute( monitor, null );
-			if (status.getSeverity()==Status.ERROR)
-			{
-				environment.getStatusHandler().reportError(status);			  
-			}			
-			return status;
-			
-	  }
-		
-	  public void setWebService( IWebService webService )
-	  {
-		  webService_ = webService;  
-	  }
-
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
deleted file mode 100644
index e2b3e0a..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand;
-import org.eclipse.wst.ws.internal.extensions.AssembleServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.RunServiceFragment;
-
-public class ServiceRootFragment extends SequenceFragment 
-{
-  public ServiceRootFragment()
-  {
-    add( new SimpleFragment( new PreServiceDevelopCommand(), "" ) );
-    add( new DevelopServiceFragment() );
-    add( new SimpleFragment( new PreServiceAssembleCommand(), "" ) );
-    add( new AssembleServiceFragment() );
-    add( new SimpleFragment( new PreServiceDeployCommand(), "" ) );
-    add( new DeployServiceFragment() );
-    add( new SimpleFragment( new PreServiceInstallCommand(), "" ) );
-    add( new InstallServiceFragment() );
-    add( new SimpleFragment( new PreServiceRunCommand(), 
-    	 "org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand" ) );
-    add( new RunServiceFragment() );
-  }
-
-  public void registerDataMappings(DataMappingRegistry registry) 
-  {
-		//Mappings from framework to extension fragments
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", DevelopServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", DevelopServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", DevelopServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", DevelopServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", DevelopServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", DevelopServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DevelopServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", DevelopServiceFragment.class );
-	
-	// Map the PreServiceDevelopCommand into the dataObject and the PreClientDevelopCommand.
-	registry.addMapping( PreServiceDevelopCommand.class, "WebService", DataObjectCommand.class, "DataObject", null );
-	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreClientDevelopCommand.class, "DataObject", null );
-		
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", AssembleServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", AssembleServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", AssembleServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", AssembleServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", AssembleServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", AssembleServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", AssembleServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", AssembleServiceFragment.class );
-	
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", DeployServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", DeployServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", DeployServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", DeployServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", DeployServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", DeployServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DeployServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", DeployServiceFragment.class );
-	
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", InstallServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", InstallServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", InstallServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", InstallServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", InstallServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", InstallServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", InstallServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", InstallServiceFragment.class );
-	
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", RunServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", RunServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", RunServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", RunServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", RunServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", RunServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", RunServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", RunServiceFragment.class );
-		
-		//Mappings from framework to framework commands
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );		
-		registry.addMapping( PreServiceDevelopCommand.class, "J2eeLevel", PreServiceAssembleCommand.class );
-		
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceInstallCommand.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceInstallCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceInstallCommand.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceInstallCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceInstallCommand.class );		
-
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceRunCommand.class );
-	
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
deleted file mode 100644
index 4c6869b..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-/**
-* This is the plugin class for the Web Services Creation UI plugin.
-* <p>
-* The Web Services Creation UI plugin's sole function is to add 
-* user interface of the Web Services Creation Wizard, contained in  
-* the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceCreationUIPlugin extends Plugin
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.creation.ui";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceCreationUIPlugin instance_;
-
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  * The "plugin" element in plugin.xml should include the attribute
-  * class = "org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin".
-  * @param descriptor The descriptor of this plugin.
-  */
-  public WebServiceCreationUIPlugin ()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.creation.ui");
-  * @return The WebServiceCreationUIPlugin singleton.
-  */
-  public static WebServiceCreationUIPlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties.
-  * @return The String message.
-  */
-  public static String getMessage ( String key )
-  {
-    MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.creation.ui.plugin", instance_ );
-    
-    if( key.startsWith("%"))
-    {
-      key = key.substring( 1, key.length() );
-    }
-    
-    return msgUtils.getMessage(key);
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties. Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See the JDK's
-  * {@link java.text.MessageFormat java.text.MessageFormat}
-  * class for further details on substitution.
-  * @return The String message.
-  */
-  public static String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format(getMessage(key),args);
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-  public static ImageDescriptor getImageDescriptor ( String name )
-  {
-    try
-    {
-      URL installURL = instance_.getBundle().getEntry("/");
-      URL imageURL = new URL(installURL,name);
-      return ImageDescriptor.createFromURL(imageURL);
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
deleted file mode 100644
index d0ab4aa..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-
-/**
- *
- */
-public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage 
-{
-	private ServerWizardWidget serverWidget_ = null;
-	
-	public void init(IWorkbench workbench)   { }	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	
-	protected Control createContents(Composite parent) 
-	{
-	  UIUtils utils = new UIUtils(null, null);
-	  
-	  Composite page = utils.createComposite( parent, 1 );
-	  
-      serverWidget_ = new ServerWizardWidget( false );
-      serverWidget_.addControls( page, new Listener()
-                                       {
-                                         public void handleEvent( Event evt ){}
-                                       } );
-	  initializeValues();
-	  return page;
-	}
-
-	private void initializeValues()
-	{
-	  ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
-      // Set values from context.
-	  TypeRuntimeServer serverIds = new TypeRuntimeServer();
-	  TypeRuntimeServer clientIds = new TypeRuntimeServer();
-		
-	  serverIds.setTypeId( context.getWebServiceType() );
-	  clientIds.setTypeId( context.getClientWebServiceType() );
-		
-      serverWidget_.setServiceTypeRuntimeServer( serverIds );
-      serverWidget_.setClientTypeRuntimeServer( clientIds );
-      serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxy()) );
-      serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorer()) );
-      serverWidget_.setStartService( new Boolean(context.getStartWebService()) );
-      serverWidget_.setTestService( new Boolean(context.getTestWebService()) );
-      serverWidget_.setMonitorService(new Boolean(context.getMonitorWebService()));
-      serverWidget_.internalize();
-	}
-	
-    /**
-	 * Does anything necessary because the default button has been pressed.
-	*/
-	protected void performDefaults()
-	{
-	  super.performDefaults();
-	  setToDefaults();
-	}
-	
-	private void setToDefaults()
-	{
-	  ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
-      // Set values from context.
-	  TypeRuntimeServer serverIds = new TypeRuntimeServer();
-	  TypeRuntimeServer clientIds = new TypeRuntimeServer();
-		
-	  serverIds.setTypeId( context.getWebServiceTypeDefault() );
-	  clientIds.setTypeId( context.getClientWebServiceTypeDefault() );
-		
-      serverWidget_.setServiceTypeRuntimeServer( serverIds );
-      serverWidget_.setClientTypeRuntimeServer( clientIds );
-      serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxyDefault()) );
-      serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorerDefault()) );
-      serverWidget_.setStartService( new Boolean(context.getStartWebServiceDefault()) );
-      serverWidget_.setTestService( new Boolean(context.getTestWebServiceDefault()) );
-      serverWidget_.setMonitorService(new Boolean(context.getMonitorWebServiceDefault()));
-      serverWidget_.internalize();
-	}
-
-	/**
-	 * Do anything necessary because the OK button has been pressed.
-	 *  @return whether it is okay to close the preference page
-	 */
-	public boolean performOk()
-	{
-	  storeValues();
-	  return true;
-	}
-
-	private void storeValues()
-	{
-	  ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-	  
-	  TypeRuntimeServer serverIds = serverWidget_.getServiceTypeRuntimeServer();
-	  TypeRuntimeServer clientIds = serverWidget_.getClientTypeRuntimeServer();
-	  
-      context.setWebServiceType( serverIds.getTypeId() );
-      context.setClientWebServiceType( clientIds.getTypeId() );
-      context.setGenerateProxy( serverWidget_.getGenerateProxy().booleanValue() );
-      context.setLaunchWebServiceExplorer( serverWidget_.getPublishService().booleanValue() );
-      context.setStartWebService( serverWidget_.getStartService().booleanValue() );
-      context.setTestWebService( serverWidget_.getTestService().booleanValue() );
-      context.setMonitorWebService(serverWidget_.getMonitorService().booleanValue());
-	}
-	
-	protected void performApply()
-	{
-	  performOk();
-	}
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
deleted file mode 100644
index e2d2872..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.server;
-
-import org.eclipse.jst.ws.internal.consumption.ui.server.StartServerWidget;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartServerWidgetContributor implements INamedWidgetContributor 
-{
-  private IServer      server_;
-  private MessageUtils msgUtils_;
-	  
-  public StartServerWidgetContributor( IServer server )
-  {
-	server_ = server;
-	msgUtils_ = new  MessageUtils( "org.eclipse.jst.ws.consumption.ui.plugin", this );
-  }
-  
-  public String getDescription() 
-  {
-	return msgUtils_.getMessage( "PAGE_DESC_WS_START_SERVER" );
-  }
-
-  public String getName() 
-  {
-	return "";
-  }
-
-  public String getTitle() 
-  {
-	return msgUtils_.getMessage( "PAGE_TITLE_WS_START_SERVER" );
-  }
-
-  public WidgetContributorFactory getWidgetContributorFactory() 
-  {
-	return new WidgetContributorFactory()
-	       {
-			 public WidgetContributor create() 
-			 {
-				return new StartServerWidget( server_ );
- 			 }
-	       };
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
deleted file mode 100644
index 8f7d443..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.server;
-
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class StartServerWidgetFactory implements INamedWidgetContributorFactory 
-{
-  private IWebService webservice_;
-  
-  public INamedWidgetContributor getFirstNamedWidget() 
-  {
-    IServer server = null;
-    
-    if( webservice_ != null )
-    {
-      server = ServerCore.findServer(webservice_.getWebServiceInfo().getServerInstanceId() );
-    }
-    
-    if( server != null && server.getServerState() != IServer.STATE_STARTED )
-    {
-      return new StartServerWidgetContributor( server );
-    }
-    
-	return null;
-  }
-
-  public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-  {
-	return null;
-  }
-
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-	dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", StartServerWidgetFactory.class );
-  }
-  
-  public void setWebService( IWebService webservice )
-  {
-    webservice_ = webservice;  
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
deleted file mode 100644
index 7550253..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
+++ /dev/null

@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PreferencesSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class ServerWizardWidget extends SimpleWidgetDataContributor
-{   
-  private WebServiceClientTypeWidget clientWidget_;
-  private PreferencesSelectionWidget preferencesWidget_;
-  private Listener                   statusListener_;
-  private TypeRuntimeServer          ids_;
-  private LabelsAndIds               labelIds_;
-  private boolean                    displayPreferences_;
-  
-  /*CONTEXT_ID PWPR0001 for the Project Page*/
-  private String INFOPOP_PWPR_PAGE = "PWPR0001";
-  
-  /*CONTEXT_ID PWPR0005 for the Generate Proxy check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY = "PWPR0005";
-  private Button  generateProxy_;
-  
-  /*CONTEXT_ID PWPR0010 for the Web Service Type combo box of the Project Page*/
-  private String INFOPOP_PWPR_COMBO_TYPE = "PWPR0010";
-  private Combo  webserviceType_;
-  
-  /*CONTEXT_ID PWPR0011 for the Wizard Scenario Service group of the Project Page*/
-  private String INFOPOP_PWPR_GROUP_SCENARIO_SERVICE = "PWPR0011";
-  private Button startService_;
-  
-  /*CONTEXT_ID PWPR0009 for the Start Web Project check box check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_START_WEB_PROJECT = "PWPR0009";
-  
-  /*CONTEXT_ID PWPR0013 for the test service checkbox of the project page*/  
-  private String INFOPOP_PWPR_CHECKBOX_TEST_SERVICE = "PWPR0013";
-  private Button testService_;
-  
-  /*CONTEXT_ID PWPR0014 for the monitor service checkbox of the projec page*/
-  private String INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE = "PWPR0014";
-  private Button monitorService;
-  
-  /*CONTEXT_ID PWPR0012 for the Launch UDDI check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_LAUNCH_WS = "PWPR0012";
-  private Button launchUddi_;
-  
-  public ServerWizardWidget( boolean displayPreferences )
-  {
-    displayPreferences_ = displayPreferences;  
-  }
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    String       createPluginId = "org.eclipse.jst.ws.creation.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    UIUtils      utils    = new UIUtils( msgUtils, createPluginId );
-    
-    statusListener_ = statusListener;
-    
-  	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." +  INFOPOP_PWPR_PAGE );
-  	
-  	Composite serverComposite = utils.createComposite( parent, 1 );
-  	
-  	Group serviceGroup = utils.createGroup( serverComposite, "GROUP_SCENARIO_SERVICE",
-  	                                        "TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE", 
-  	                                        INFOPOP_PWPR_GROUP_SCENARIO_SERVICE,
-											2, 10, 10);
-  	
-  	
-  	// Create webservice combo box.
-    webserviceType_ = utils.createCombo( serviceGroup, "LABEL_WEBSERVICETYPE",
-                                         "TOOLTIP_PWPR_COMBO_TYPE",
-                                         INFOPOP_PWPR_COMBO_TYPE, 
-										 SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    webserviceType_.addListener( SWT.Modify, statusListener );
-    
-    Composite buttonsGroup = utils.createComposite( serviceGroup, 1 );
-    GridData  buttonGrid   = new GridData();
-    buttonGrid.horizontalSpan = 2;
-    buttonsGroup.setLayoutData( buttonGrid );
-    
-    // Create start service check box.
-    startService_ = utils.createCheckbox( buttonsGroup, "BUTTON_START_WEB_PROJECT",
-                                          "TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT",
-                                          INFOPOP_PWPR_CHECKBOX_START_WEB_PROJECT );
-    startService_.addSelectionListener( new SelectionAdapter()
-                                        {
-                                          public void widgetSelected( SelectionEvent evt )
-                                          {
-                                            handleStartPressed();
-                                          }
-                                        });
-    
-    launchUddi_ = utils.createCheckbox( buttonsGroup, "BUTTON_WS_PUBLISH",
-                                        "TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS",
-                                        INFOPOP_PWPR_CHECKBOX_LAUNCH_WS );
-    
-    Composite proxyComposite = utils.createComposite( serverComposite, 1, 5, 0 );
-    
-    // Create generate proxy check box.
-    generateProxy_ = utils.createCheckbox( proxyComposite, "BUTTON_GENERATE_PROXY",
-                                           "TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY",
-                                           INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY );
-    generateProxy_.addSelectionListener( new SelectionAdapter()
-                                         {
-                                           public void widgetSelected( SelectionEvent evt )
-                                           {
-                                             clientWidget_.enableWidget( generateProxy_.getSelection() );
-                                           }
-                                         });
-    
-    // Create client selection widget.
-    clientWidget_ = new WebServiceClientTypeWidget();
-    clientWidget_.addControls( serverComposite, statusListener );
-    
-    Composite testGroup = utils.createComposite(serverComposite,1);
-    
-    //  Create test service check box.
-    testService_ = utils.createCheckbox( testGroup, "CHECKBOX_TEST_WEBSERVICE",
-                                         "TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE",
-                                         INFOPOP_PWPR_CHECKBOX_TEST_SERVICE );
-
-    monitorService = utils.createCheckbox( testGroup, "CHECKBOX_MONITOR_WEBSERVICE",
-                                         "TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE",
-                                         INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE );
-    
-    if( displayPreferences_ )
-    {
-      // Create the preferences widgets.
-      preferencesWidget_ = new PreferencesSelectionWidget();
-      preferencesWidget_.addControls( serverComposite, statusListener );
-    }
-    
-    return this;
-  }
-
-  private void handleStartPressed()
-  {
-    boolean enabled = startService_.getSelection();
-    
-    testService_.setEnabled( enabled );
-    monitorService.setEnabled(enabled);
-    launchUddi_.setEnabled( enabled );
-    generateProxy_.setEnabled( enabled );
-    clientWidget_.enableWidget( getGenerateProxy().booleanValue() );
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    clientWidget_.setTypeRuntimeServer( ids );
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientWidget_.getTypeRuntimeServer();  
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    LabelsAndIds                        labelIds   = WebServiceRuntimeExtensionUtils2.getServiceTypeLabels();
-	//rskreg
-    int                                 selection  = 0;
-    String[]                            serviceIds = labelIds.getIds_();
-    String                              selectedId = ids.getTypeId();
-    
-    webserviceType_.removeListener( SWT.Modify, statusListener_ );
-    webserviceType_.setItems( labelIds.getLabels_() );
-        
-    // Now find the selected one.
-    for( int index = 0; index < serviceIds.length; index++ )
-    {
-      if( selectedId.equals( serviceIds[index ]) )
-      {
-        selection = index;
-        break;
-      }
-    }
-    
-    webserviceType_.select( selection );
-    webserviceType_.addListener( SWT.Modify, statusListener_ );
-    ids_      = ids;  
-    labelIds_ = labelIds;
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    int selectionIndex = webserviceType_.getSelectionIndex();
-    
-    ids_.setTypeId( labelIds_.getIds_()[selectionIndex] );
-    
-    return ids_;  
-  }
-  
-  public Boolean getStartService()
-  {
-    return new Boolean( startService_.getSelection() );  
-  }
-  
-  public void setStartService( Boolean value )
-  {
-    startService_.setSelection( value.booleanValue() );
-  }
-
-  public Boolean getTestService()
-  {
-    return new Boolean( testService_.getSelection() && startService_.getSelection() );
-  }
-  
-  public void setTestService( Boolean value )
-  {
-    testService_.setSelection( value.booleanValue() );  
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean(monitorService.getSelection() && startService_.getSelection());
-  }
-  
-  public void setMonitorService(Boolean value)
-  {
-    monitorService.setSelection(value.booleanValue());
-  }
-
-  public Boolean getPublishService()
-  {
-    return new Boolean( launchUddi_.getSelection() && startService_.getSelection() );
-  }
-  
-  public void setPublishService( Boolean value )
-  {
-    launchUddi_.setSelection( value.booleanValue() );  
-  }
-
-  public Boolean getGenerateProxy()
-  {
-    return new Boolean( generateProxy_.getSelection() && startService_.getSelection() );
-  }
-  
-  public void setGenerateProxy( Boolean value )
-  {
-    generateProxy_.setSelection( value.booleanValue() );  
-  }
-
-  public ResourceContext getResourceContext()
-  {
-    return preferencesWidget_.getResourceContext(); 
-  }
-
-  public void setResourceContext( ResourceContext context )
-  {
-    preferencesWidget_.setResourceContext( context );
-  }
-
-  public void internalize()
-  {
-    handleStartPressed();  
-  }
-  
-  public IStatus getStatus()
-  {
-    IStatus status = Status.OK_STATUS;
-    
-    // If the webservice has not been selected then user can not move
-    // forward to the next page.
-    if( webserviceType_.getText().equals("") )
-    {
-      status = StatusUtils.errorStatus( "" );
-    }
-    
-    return status;
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
deleted file mode 100644
index 95f0e3e..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-
-public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefaultingCommand
-{    
-  private TypeRuntimeServer typeRuntimeServer_;
-  private IStructuredSelection initialSelection_;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    String type      = getScenarioContext().getWebServiceType();
-    String runtime   = WebServiceRuntimeExtensionUtils2.getDefaultRuntimeValueFor( type );
-	
-    String factoryID = WebServiceRuntimeExtensionUtils2.getDefaultServerValueFor(type);    
-    typeRuntimeServer_ = new TypeRuntimeServer();
-    
-    typeRuntimeServer_.setTypeId( type );
-    typeRuntimeServer_.setRuntimeId( runtime );
-    typeRuntimeServer_.setServerId( factoryID );
-    
-    //Default the typeId from the initial selection
-    String[] typeIds = WebServiceRuntimeExtensionUtils2.getWebServiceTypeBySelection(initialSelection_);
-
-    if (typeIds!=null && typeIds.length>0)
-    {
-      typeRuntimeServer_.setTypeId(typeIds[0]);
-    }
-    
-    return Status.OK_STATUS;
-  }
-  
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-    initialSelection_ = selection;
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  { 
-    return typeRuntimeServer_;
-  }
-
-  public Boolean getStartService()
-  {
-    return new Boolean( getScenarioContext().getStartWebService() );  
-  }
-  
-  public Boolean getPublishService()
-  {
-    return new Boolean( getScenarioContext().getLaunchWebServiceExplorer() );
-  }
-
-  public Boolean getGenerateProxy()
-  {
-    return new Boolean( getScenarioContext().getGenerateProxy() );  
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean(getScenarioContext().getMonitorWebService());
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
deleted file mode 100644
index c2811f8..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-
-
-public class ServerWizardWidgetOutputCommand extends ClientWizardWidgetOutputCommand
-{    
-  private TypeRuntimeServer typeRuntimeServer_;
-  private boolean           startService_;
-  private boolean           testService_;
-  private boolean           publishService_;
-  private boolean           generateProxy_;
-	private ResourceContext   resourceContext_;
-    
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  { 
-    return typeRuntimeServer_;
-  }
-
-  public boolean getStartService()
-  {
-    return startService_;  
-  }
-
-  public boolean getTestService()
-  {
-    return testService_;
-  }
-  
-  public boolean getPublishService()
-  {
-    return publishService_;
-  }
-
-  public boolean getGenerateProxy()
-  {
-    return generateProxy_;  
-  }
-	
-	public ResourceContext getResourceContext()
-	{
-		return resourceContext_;
-	}
-  
-  /**
-   * @param generateProxy_ The generateProxy_ to set.
-   */
-  public void setGenerateProxy(boolean generateProxy_)
-  {
-    this.generateProxy_ = generateProxy_;
-  }
-  /**
-   * @param publishService_ The publishService_ to set.
-   */
-  public void setPublishService(boolean publishService_)
-  {
-    this.publishService_ = publishService_;
-  }
-  /**
-   * @param startService_ The startService_ to set.
-   */
-  public void setStartService(boolean startService_)
-  {
-    this.startService_ = startService_;
-  }
-  /**
-   * @param testService_ The testService_ to set.
-   */
-  public void setTestService(boolean testService_)
-  {
-    this.testService_ = testService_;
-  }
-  /**
-   * @param typeRuntimeServer_ The typeRuntimeServer_ to set.
-   */
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer_)
-  {
-    this.typeRuntimeServer_ = typeRuntimeServer_;
-  }
-	
-	public void setResourceContext(ResourceContext rc)
-	{
-		resourceContext_ = rc;
-	}
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
deleted file mode 100644
index c79280f..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class ExportWSWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry;
-  private WidgetRegistry      widgetRegistry;
-  private DataMappingRegistry dataMappingRegistry;
-  private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
-  public ExportWSWidgetBinding()
-  {
-    publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               SequenceFragment root = new SequenceFragment();
-               root.add(new SimpleFragment("WSExport"));
-               root.add(publishToPrivateUDDICmdFrag);
-               root.add(new SimpleFragment(new WSExplorerLauncherCommand(), ""));
-               return root;  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-    publishToPrivateUDDICmdFrag.registerCanFinish(this.canFinishRegistry);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    this.dataMappingRegistry = dataRegistry;
-    publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry);
-    
-    // PublishToPrivateUDDICommandFragment
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-    
-    // LaunchWebServicesExplorerCommand
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    String       pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    this.widgetRegistry = widgetRegistry;
-    publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry);
-
-    widgetRegistry.add("WSExport", 
-      msgUtils.getMessage("PAGE_TITLE_WS_PUBLISH"),
-      msgUtils.getMessage("PAGE_DESC_WS_PUBLISH"),
-      new WidgetContributorFactory()
-      {
-        public WidgetContributor create()
-        {
-          return new PublishWSWidget(true);
-        }
-      }
-    );
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
deleted file mode 100644
index 37d7576..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PublishWSDLWidgetBinding implements CommandWidgetBinding
-{
-  public PublishWSDLWidgetBinding()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new SimpleFragment();  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-  }
-
-  /* (non-Javadoc), 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
deleted file mode 100644
index 74581ce..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
+++ /dev/null

@@ -1,580 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ManageServerStartUpCommand;
-import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerInstToIServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.CheckWSDLValidationCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.LaunchFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.WebServiceTestDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-public class ServerWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry_;
-  private WidgetRegistry      widgetRegistry_;
-  private DataMappingRegistry dataMappingRegistry_;
-  private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
-  public ServerWidgetBinding()
-  {
-    publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new ServiceRootCommandFragment();  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    canFinishRegistry_ = canFinishRegistry;
-    publishToPrivateUDDICmdFrag.registerCanFinish(canFinishRegistry_);
-  }
-
-  /* (non-Javadoc), 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    dataMappingRegistry_ = dataRegistry;
-    
-    // Before ServerWizardWidget
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", CreateMonitorCommand.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidget.class);
-    
-    // After ServerWizardWidget
-    dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class );
-    dataRegistry.addMapping(ServerWizardWidget.class, "StartService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "TestService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", CreateMonitorCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "PublishService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
-    
-    // Before ObjectSelectionWidget
-    dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ClientTestWidget.class );
-    dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService",FinishTestFragment.class);
-    
-    // Before ServerRuntimeSelectionWidget
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ServerRuntimeSelectionWidget.class);    
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerRuntimeSelectionWidget.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerRuntimeSelectionWidget.class);
-    
-            
-    // After ServerRuntimeSelectionWidget    
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);    
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class );
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class );
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-    
-
-    // Map fragments that depend on data.   
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-    
-    // CreateMonitorCommand
-    dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeEndpointCommand.class);
-    
-    // ComputeEndpointCommand
-    dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ServiceTestWidget.class);
-    dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class);
-
-    //ServiceTestWidget mappings    
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", CreateMonitorCommand.class);
-    dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ServiceTestWidget.class);
-	dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WebServicesParser", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ServiceTestFacilities", ServiceTestWidget.class);    
-    dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "Environment", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", FinishTestFragment.class);
-    dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", TestDefaultingFragment.class);
-        
-    // Before Client Test widget.
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
-    
-    // Before ClientTestWidget
-        
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
-    dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
-    
-    
-    // After ClientTestWidget    
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",FinishDefaultCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",FinishDefaultCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "RunClientTest",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "Methods",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class);
-    // PublishWSWidget
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
-    
-    // PublishToPrivateUDDICommandFragment
-    dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-    
-    // LaunchWebServicesExplorerCommand
-    dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", LaunchFragment.class);
-    dataRegistry.addMapping(PublishWSWidget.class, "PublishToPublicUDDI", LaunchFragment.class);
-    // TODO Need defaults for these properties.
-    dataRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
-    dataRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-  
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    String       pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    
-    widgetRegistry_ = widgetRegistry;
-    publishToPrivateUDDICmdFrag.registerWidgetMappings(widgetRegistry_);
-
-    widgetRegistry.add( "ServerWizardWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_PROJECT"),
-                        msgUtils.getMessage("PAGE_DESC_WS_PROJECT"),
-				        new WidgetContributorFactory()
-				        {
-				          public WidgetContributor create()
-				          {
-				            return new ServerWizardWidget( true );
-				          }
-				        } );
-
-    MessageUtils creationUIMessageUtils = new MessageUtils("org.eclipse.jst.ws.creation.ui.plugin", this);
-    widgetRegistry.add( "ObjectSelectionWidget", 
-                        creationUIMessageUtils.getMessage("PAGE_TITLE_OBJECT_SELECTION"),
-                        creationUIMessageUtils.getMessage("PAGE_DESC_OBJECT_SELECTION"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ObjectSelectionWidget();
-                          }
-                        });
-
-    widgetRegistry.add( "ServerRuntimeSelectionWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_RUNTIME_SELECTION"),
-                        msgUtils.getMessage("PAGE_DESC_WS_RUNTIME_SELECTION"),
-						new WidgetContributorFactory()
-                        {
-						  public WidgetContributor create()
-						  {
-						    return new ServerRuntimeSelectionWidget();
-						  }
-						} ); 
-    
-    widgetRegistry.add( "TestService", 
-                        msgUtils.getMessage("PAGE_TITLE_WSTEST"),
-                        msgUtils.getMessage("PAGE_DESC_WSTEST"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ServiceTestWidget();
-                          }
-                        } );
-    
-    widgetRegistry.add( "ClientTestWidget", 
-            msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
-            msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
-            new WidgetContributorFactory()
-            {
-              public WidgetContributor create()
-              {
-                return new ClientTestWidget(); 
-              }
-            });
-    
-    widgetRegistry.add( "Publish", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_PUBLISH"),
-                        msgUtils.getMessage("PAGE_DESC_WS_PUBLISH"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new PublishWSWidget(true);
-                          }
-                        } );
-  }
-      
-  private class ClientFragment extends BooleanFragment
-  {
-    boolean genProxy_ = false;
-    
-    public ClientFragment()
-    {      
-      setCondition( new Condition() 
-                    {
-                      public boolean evaluate()
-                      {
-                        return genProxy_;
-                      }
-                    });
-      
-      SequenceFragment clientRoot = new SequenceFragment();
-      
-      clientRoot.add( new SimpleFragment( new ClientExtensionDefaultingCommand( false ), ""));
-      //clientRoot.add(new SimpleFragment(new ClientServerDeployableConfigCommand(), "")); //Note: added here for client     
-      //clientRoot.add( new ClientExtensionFragment() );
-      clientRoot.add( new ClientRootFragment() );
-      clientRoot.add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ));
-      
-      setTrueFragment( clientRoot );
-    }
-    
-    public void setGenerateProxy( boolean genProxy )
-    {
-      genProxy_ = genProxy;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      // Map the output of the service scenario to the client scenario.
-      dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class );
-	  dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerFactoryId", ClientExtensionDefaultingCommand.class );
-	  dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ClientExtensionDefaultingCommand.class );
-	  
-      
-      // Setup the PreClientDevelopCommand.
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "TestService", PreClientDevelopCommand.class);           
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);            
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", PreClientDevelopCommand.class );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", PreClientDevelopCommand.class );      
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", PreClientDevelopCommand.class, "Module", null );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", PreClientDevelopCommand.class, "ModuleType", null);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", PreClientDevelopCommand.class, "Ear", null );      
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );      
-    }
-  }
-  
-  private class ServiceRootCommandFragment extends SequenceFragment
-  {
-    public ServiceRootCommandFragment()
-    {
-      add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-      
-      add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( "ServerWizardWidget" ) );
-      add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));
-      add( new ObjectSelectionFragment() );
-      add( new SimpleFragment( new CheckWSDLValidationCommand(), ""));
-      add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( "ServerRuntimeSelectionWidget" ) );
-      add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));
-      //add(new SimpleFragment(new ServerDeployableConfigurationCommand(), "")); //Note: added here            
-      //add( new ServerExtensionFragment() );
-	  add( new ServiceRootFragment() );
-      add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
-      add(new SimpleFragment(new CreateMonitorCommand(), ""));
-      add(new SimpleFragment(new ComputeEndpointCommand(), ""));
-      add( new ServiceTestFragment( "TestService") );
-      add( new SimpleFragment(new TestDefaultingFragment(),""));
-      add( new ClientFragment() );
-//      add( new SimpleFragment(new ManageServerStartUpCommand(),""));
-      add( new ClientTestFragment( "ClientTestWidget") );
-      add( new SimpleFragment( "Publish") );
-      add(publishToPrivateUDDICmdFrag);
-      add(new LaunchFragment());
-      add(new FinishFragment());
-      
-      add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      publishToPrivateUDDICmdFrag.registerDataMappings(dataMappingRegistry_);   
-      
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerWizardWidgetDefaultingCommand.class );
-
-      //dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
-      //dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
-
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialComponentName", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);      
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "WebServicesParser", ServerExtensionDefaultingCommand.class );
-      
-      // Map ServerWizardWidgetDefaultingCommand
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);    
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
-      	  
-      // Map ServerWizardWidgetOutputCommand.
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ObjectSelectionFragment.class, "TypeRuntimeServer", null);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "PublishService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-      
-      //to the test wizard
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServiceTestFragment.class);
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", WSDLTestLaunchCommand.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSDLTestLaunchCommand.class);
-      
-	  
-      
-      // Map ServerRuntimeSelectionWidgetDefaultingCommand
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);      
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);      
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);      
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientFragment.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-      
-      
-      // Map ServerExtensionDefaultingCommand
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ServiceTestFragment.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "Publish", PublishToPrivateUDDICommandFragment.class);      
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer",WSDLTestLaunchCommand.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ClientTestDelegateCommand.class);
-	  
-	    // Setup the PreServiceDevelopCommand.
-			//
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "TestService", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "PublishService", PreServiceDevelopCommand.class);      
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class);      
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class);			
-			//
-	  dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null);
-	    dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class );
-        dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class );
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
-      //
-	    dataRegistry.addMapping( ObjectSelectionOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() );
-			
-			dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
- 
-      // Map ClientExtensionDefaultingCommand
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", FinishDefaultCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarComponentName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "LaunchedServiceTestName", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
-
-      
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-           
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", CreateMonitorCommand.class);
-
-      // Map ServerExtensionOutputCommand for ServerStart()
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null);
-
-      // MAP post server config call
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-      
-      // Map ClientExtensionOutputCommand
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-	  
-      // Map ManageServerStartUpCommand
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "IsWebProjectStartupRequested", ManageServerStartUpCommand.class);
-      
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ManageServerStartUpCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ManageServerStartUpCommand.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ManageServerStartUpCommand.class, "ServiceProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", ManageServerStartUpCommand.class,"ServiceServerTypeId", null);
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ManageServerStartUpCommand.class, "SampleProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ManageServerStartUpCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer());      
-      
-      // Map WebServiceClientTestArrivalCommand
-      dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);    
-    
-    
-      //Map Finish Command 
-      
-      
-    }
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java
deleted file mode 100644
index 4d632f7..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java
+++ /dev/null

@@ -1,403 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.RuntimeServerSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-/*
- *
- * ServerRuntimeSelectionWidget
- * This widget is the parent widget for server and client deployment/environment settings 
- * 
- */
-public class ServerRuntimeSelectionWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private String createPluginId_ = "org.eclipse.jst.ws.creation.ui";
-  
-  /* CONTEXT_ID PWRS0002 for the Wizard Scenario Service configuration of the Runtime Selection Page */
-  private String INFOPOP_PWRS_GROUP_SERVICE =  "PWRS0002";
-  
-  private RuntimeServerSelectionWidget runtimeWidget_;
-  private ProjectSelectionWidget       projectWidget_;
-  private ClientRuntimeSelectionWidget clientWidget_;
-  private TextModifyListener           textListener_;
-  private MessageUtils msgUtils_;
-  private String serviceRuntimeId_;
-  
-  private boolean isClientWidgetVisible_ = true;
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils_, createPluginId_ ); 
-    
-    ScrolledComposite scroller = new ScrolledComposite( parent, SWT.H_SCROLL | SWT.V_SCROLL );
-    scroller.setExpandHorizontal(true);
-    scroller.setExpandVertical(true);
-    
-    Composite root = uiUtils.createComposite( scroller, 1 );
-    scroller.setContent( root );
-    
-    Composite textComposite = uiUtils.createComposite( root, 1, 0, 0 );
-    createMessageText( textComposite, msgUtils_.getMessage("MSG_GENERAL_PROJECT_AND_EAR", new String[] { msgUtils_.getMessage("MSG_SERVICE_SUB")}));
-    createMessageText( textComposite, msgUtils_.getMessage("MSG_EAR_PROJECT_WILL_BE_CREATED") );
-    
-    Composite serverComp = uiUtils.createComposite( root, 1, 5, 0 );
-    
-    Group serverGroup = uiUtils.createGroup( serverComp, "LABEL_SELECTION_VIEW_TITLE",
-                                             null, INFOPOP_PWRS_GROUP_SERVICE,
-											 2, 5, 5);
-    
-    runtimeWidget_ = new RuntimeServerSelectionWidget( false );
-    runtimeWidget_.addControls( serverGroup, statusListener );
-    textListener_ = new TextModifyListener();
-    runtimeWidget_.addModifyListener( textListener_ );
-             
-    projectWidget_ = new ProjectSelectionWidget();
-    projectWidget_.addControls( serverGroup, statusListener );
-    
-    clientWidget_ = new ClientRuntimeSelectionWidget();
-    clientWidget_.addControls( root, statusListener );
-    
-    Point size = root.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    scroller.setMinSize( size ); 
-    root.setSize( size );
-     
-    scroller.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-    
-    return this;
-  }
-  
-  //If generate proxy is not selected, don't show the client portion of the page.
-  public void setGenerateProxy( Boolean value )
-  {
-    clientWidget_.setVisible( value.booleanValue() ); 
-    isClientWidgetVisible_ = value.booleanValue();
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    return runtimeWidget_.getTypeRuntimeServer();  
-  }
-   
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    runtimeWidget_.removeModifyListener( textListener_ );
-    runtimeWidget_.setTypeRuntimeServer( ids );  
-    projectWidget_.setTypeRuntimeServer(ids);
-    runtimeWidget_.addModifyListener( textListener_ );
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientWidget_.getClientTypeRuntimeServer();  
-  }
-   
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    clientWidget_.setClientTypeRuntimeServer( ids );  
-  }
-  
-  public void setServiceRuntimeId(String id)
-  {
-    serviceRuntimeId_ = id;
-  }
-  
-  public String getServiceRuntimeId()
-  {
-    //calculate the most appropriate clientRuntimeId based on current settings.
-    String projectName = projectWidget_.getProjectName();
-    String templateId = projectWidget_.getComponentType();
-    
-    //Find the service runtime that fits this profile best.
-    return WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(runtimeWidget_.getTypeRuntimeServer(), projectName, templateId);    
-  }  
-  
-  public void setClientRuntimeId(String id)
-  {
-    clientWidget_.setClientRuntimeId(id);
-  }
-  
-  public String getClientRuntimeId()
-  {
-    //calculate the most appropriate clientRuntimeId based on current settings.
-    return clientWidget_.getClientRuntimeId();
-  } 
-  
-  public boolean getServiceNeedEAR()
-  {
-    return projectWidget_.getNeedEAR();
-  }
-  
-  public void setServiceNeedEAR(boolean b)
-  {
-    projectWidget_.setNeedEAR(b);
-  }
-  
-  public boolean getClientNeedEAR()
-  {
-    return clientWidget_.getClientNeedEAR();
-  }
-  
-  public void setClientNeedEAR(boolean b)
-  {
-    clientWidget_.setClientNeedEAR(b);
-  }  
-  
-  public void setServiceComponentType( String type )
-  {
-	projectWidget_.setComponentType( type );  
-  }
-  
-  public String getClientComponentType()
-  {
-    return clientWidget_.getClientComponentType();
-  }  
-  
-  public void setClientComponentType( String type )
-  {
-	clientWidget_.setClientComponentType( type );  
-  }
-  
-  public String getServiceProjectName()
-  {
-    return projectWidget_.getProjectName();  
-  }
-  
-  public void setServiceProjectName(String name)
-  {
-    projectWidget_.setProjectName(name);  
-  }
-  
-  public String getServiceEarProjectName()
-  {
-	return projectWidget_.getEarProjectName();  
-  }
-  
-  public void setServiceEarProjectName(String name)
-  {
-    projectWidget_.setEarProjectName(name);  
-  }  
-  
-  public String getClientProjectName()
-  {
-    return clientWidget_.getClientProjectName();  
-  }
-  
-  public void setClientProjectName(String name)
-  {
-    clientWidget_.setClientProjectName(name);  
-  }  
-  
-  public String getClientEarProjectName()
-  {
-	return clientWidget_.getClientEarProjectName();  
-  }
-  
-  public void setClientEarProjectName(String name)
-  {
-    clientWidget_.setClientEarProjectName(name);  
-  }    
-  
-  private class TextModifyListener implements ModifyListener 
-  {
-  	public void modifyText(ModifyEvent e)
-  	{
-		if( clientWidget_.isVisible() )
-  		{  	  
-		  TypeRuntimeServer serviceIds = runtimeWidget_.getTypeRuntimeServer();
-  		  TypeRuntimeServer clientIds  = clientWidget_.getClientTypeRuntimeServer();
-  		
-  		  clientIds.setRuntimeId( serviceIds.getRuntimeId() );
-  		  clientIds.setServerId( serviceIds.getServerId() );
-  		  clientIds.setServerInstanceId( serviceIds.getServerInstanceId() );
-
-  		  clientWidget_.setClientTypeRuntimeServer( clientIds );
-  		  //clientWidget_.setJ2EEVersion(runtimeWidget_.getJ2EEVersion());  	
-  		}
-		
-		//Set the current server selection and J2EE level on the ProjectSelectionWidget
-		projectWidget_.setTypeRuntimeServer(runtimeWidget_.getTypeRuntimeServer());
-  	}
-  }
- 
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() 
-  {
-    IStatus serviceStatus = runtimeWidget_.getStatus();
-    IStatus projectStatus = projectWidget_.getStatus();
-    IStatus clientStatus  = clientWidget_.getStatus();    
-    IStatus finalStatus   = Status.OK_STATUS;
-    /*
-    
-    // call child widgets' getStatus()
-    if( serviceStatus.getSeverity() == Status.ERROR )
-    {
-      finalStatus = serviceStatus;
-    }
-    else if( clientStatus.getSeverity() == Status.ERROR )
-    {
-      if (isClientWidgetVisible_)
-        finalStatus = clientStatus;
-    }
-    else if ( projectStatus.getSeverity()== Status.ERROR) {
-      finalStatus = projectStatus;
-    }
-    
-    //Validate service side server target and J2EE level
-	ValidationUtils valUtils = new ValidationUtils();
-	String serviceEARName  = projectWidget_.getEarProjectName();
-	String serviceProjName = projectWidget_.getProjectName();
-	String serviceServerFactoryId = runtimeWidget_.getTypeRuntimeServer().getServerId();
-	String serviceJ2EElevel = runtimeWidget_.getJ2EEVersion();
-  String serviceComponentName = projectWidget_.getComponentName();
-  String serviceEARComponentName = projectWidget_.getEarComponentName();
-	IStatus serviceProjectStatus = valUtils.validateProjectTargetAndJ2EE(serviceProjName,serviceComponentName, serviceEARName, serviceEARComponentName, serviceServerFactoryId, serviceJ2EElevel);
-	if(serviceProjectStatus.getSeverity()==Status.ERROR)
-	{
-		finalStatus = serviceProjectStatus;
-	}
-    
-    //Ensure the service project type (Web/EJB) is valid
-    if (serviceProjName!=null && serviceProjName.length()>0)
-    {
-      IProject serviceProj = ProjectUtilities.getProject(serviceProjName);
-      if (serviceProj.exists())
-      {
-        if (serviceComponentName!=null && serviceComponentName.length()>0)
-        {
-          String compTypeId = J2EEUtils.getComponentTypeId(serviceProj);
-          if (!compTypeId.equals(projectWidget_.getComponentType()))
-          {
-        	//Construct the error message
-        	String compTypeLabel = getCompTypeLabel(projectWidget_.getComponentType()); 
-        	finalStatus = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_INVALID_PROJECT_TYPE",new String[]{serviceProjName, compTypeLabel}) );        	        	
-          }
-        }
-      }
-    }
-    
-    if (isClientWidgetVisible_) 
-    {
-	    String clientEARName   = clientWidget_.getClientEarProjectName();
-	    String clientProjName  = clientWidget_.getClientProjectName();
-	
-  		String clientComponentName = clientWidget_.getClientComponentName();
-		
-	    // check same EAR-ness -----
-	    String warning_msg = getEARProjectWarningMessage(serviceEARName, clientEARName);
-	    
-		if (serviceComponentName.equalsIgnoreCase(clientComponentName)){
-			  String err_msg = msgUtils_.getMessage( "MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS", new String[]{ "WEB" } );
-			  finalStatus = StatusUtils.errorStatus( err_msg );				
-		}
-		
-	    if( clientProjName != null && serviceProjName != null && 
-	        clientProjName.equalsIgnoreCase( serviceProjName ))
-	    {
-		  String error_msg = msgUtils_.getMessage("MSG_SAME_CLIENT_AND_SERVICE_PROJECTS");
-		  finalStatus = StatusUtils.errorStatus( error_msg );
-	    }
-	    
-		if (warning_msg != null)
-	    {
-	      if (finalStatus.getSeverity()!=Status.ERROR)
-	      	return StatusUtils.warningStatus( warning_msg );          
-	    }         
-      
-    }
-    */
-    return finalStatus;
-  }
-  
-  private void createMessageText( Composite parent, String value )
-  {
-    Text     messageText = new Text( parent, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY );    
-	GridData gridData    = new GridData( GridData.FILL_BOTH );
-	
-	gridData.horizontalIndent = 10;    
-	messageText.setLayoutData( gridData );
-	messageText.setText( value );
-  }
-  
-  private String getEARProjectWarningMessage(String serviceEARName, String clientEARName ) {
-
-    // check if service and client share the same EAR
-    if (serviceEARName!=null && clientEARName!=null) {
-    
-      if (clientEARName.equalsIgnoreCase(serviceEARName) && clientEARName.length()>0) {
-        return msgUtils_.getMessage("MSG_SAME_CLIENT_AND_SERVICE_EARS", new String[]{ "EAR" });
-      }
-    }
-
-    return null;
-
-  }
-  
-  //Returns a label corresponding to the componentTypeId. This is hard-coded for now.
-  //This is something the flexible project framework should provide. Enhancement 106785 has been
-  //opened.
-  private String getCompTypeLabel(String typeId)
-  {
-	  if (typeId.equals(IModuleConstants.JST_WEB_MODULE))
-	  {
-		  return msgUtils_.getMessage("LABEL_CLIENT_COMP_TYPE_WEB");
-	  }
-	  else if (typeId.equals(IModuleConstants.JST_EJB_MODULE))
-	  {
-		  return msgUtils_.getMessage("LABEL_CLIENT_COMP_TYPE_EJB");
-	  }
-	  else if (typeId.equals(IModuleConstants.JST_APPCLIENT_MODULE))
-	  {
-		  return msgUtils_.getMessage("LABEL_CLIENT_COMP_TYPE_APP_CLIENT");
-	  }
-	  else if (typeId.equals(IModuleConstants.JST_UTILITY_MODULE))
-	  {
-		  return msgUtils_.getMessage("LABEL_CLIENT_COMP_TYPE_CONTAINERLESS");
-	  }
-	  else
-	  {
-		  //No known label, return the typeId itself. 
-		  return typeId;
-	  }	  
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 71d4911..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null

@@ -1,1250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
-
-import java.util.Set;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ClientRuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceType;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand
-{
-  private String DEFAULT_CLIENT_EAR_PROJECT_EXT = "EAR";	
-  private boolean           generateProxy_;
-  
-  // webServiceRuntimeJ2EEType contains the default Web service runtime and J2EE level based on the initial selection.
-  // If the initialSeleciton does not result in a valid Web service runtime and J2EE level, webServiceRuntimeJ2EEType
-  // should remain null for the life of this instance.
-  private WSRuntimeJ2EEType webServiceRuntimeJ2EEType = null;
-  
-  private TypeRuntimeServer serviceIds_;
-  private String serviceRuntimeId_;
-  private String serviceProjectName_;
-  private String serviceEarProjectName_;
-  private String serviceComponentType_;
-  private IProject initialProject_;
-  private String initialComponentName_;
-  //private String serviceJ2EEVersion_;
-  private boolean serviceNeedEAR_ = true;
-  private FacetMatcher serviceFacetMatcher_;
-
-  public ServerRuntimeSelectionWidgetDefaultingCommand()
-  {
-    super();
-  }
-  
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-    
-    try
-    {
-     IStatus clientSideStatus = super.execute(monitor, null);
-     if (clientSideStatus.getSeverity()==Status.ERROR)
-     {
-       return clientSideStatus;
-     }
-     IStatus status = Status.OK_STATUS;
-     
-     // Set the runtime based on the initial selection
-     serviceRuntimeId_ = getDefaultServiceRuntime(initialProject_);
-     if (serviceRuntimeId_ == null)
-     {
-       // return and error.
-     }
-     serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime()
-         .getId());
-
-     // Set the project
-     if (serviceProjectName_ == null)
-     {
-       // Project name did not get set when the runtime was set, so set it now
-       serviceProjectName_ = getDefaultServiceProjectName();
-     }
-
-     IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_);
-     if (!serviceProject.exists())
-     {
-       // Set the project template
-       serviceComponentType_ = getDefaultServiceProjectTemplate();
-     }
-     else
-     {
-       //Set it to an empty String
-       serviceComponentType_ = "";
-     }
-
-     updateClientProject(serviceProjectName_, serviceIds_.getTypeId());
-     
-     // Set the EAR
-     //serviceEarProjectName_ = ""; // TODO fix this!
-     //serviceEarProjectName_ = getDefaultServiceEarProjectName();
-     //serviceNeedEAR_ = false;
-
-     // Set the server
-     IStatus serverStatus = setServiceDefaultServer();
-     if (serverStatus.getSeverity() == Status.ERROR)
-     {
-       env.getStatusHandler().reportError(serverStatus);
-       return serverStatus;
-     }
-     
-     setDefaultServiceEarProject();
-          
-     return Status.OK_STATUS;
-     
-    } catch (Exception e)
-    {
-      // Catch all Exceptions in order to give some feedback to the user
-      IStatus errorStatus = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED",
-          new String[] { e.getMessage() }), e);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-  }
-
-  private void setDefaultServiceEarProject()
-  {
-    
-    //Determine if an ear selection is needed based on the server type.
-    boolean serviceNeedEAR_ = true;
-    String serverId = serviceIds_.getServerId();
-    if (serverId != null)
-    {
-        //Use the server type
-        String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId);
-        if (serverTargetId!=null && serverTargetId.length()>0)
-        {
-          if (!ServerUtils.isTargetValidForEAR(serverTargetId,"13"))
-          {
-            //Default the EAR selection to be empty
-            serviceNeedEAR_ = false;
-          }
-        }
-    }    
-    
-    if (serviceNeedEAR_)
-    {
-      serviceEarProjectName_ = getDefaultServiceEarProjectName();
-
-      
-      //Client side
-      if (getClientNeedEAR())
-      {
-        String defaultClientEarProjectName = getDefaultClientEarProjectName();
-        IProject clientProject = ProjectUtilities.getProject(getClientProjectName());
-        if(clientProject!=null && clientProject.exists() 
-          && defaultClientEarProjectName.equalsIgnoreCase(serviceEarProjectName_))
-        {
-          setClientEarProjectName(defaultClientEarProjectName);
-        }
-        else
-        { 
-          ProjectTopologyContext ptc= WebServicePlugin.getInstance().getProjectTopologyContext();         
-          if (!ptc.isUseTwoEARs()) 
-          {
-            setClientEarProjectName(serviceEarProjectName_);
-          }
-          else 
-          {
-            IProject proxyEARProject = getUniqueClientEAR(defaultClientEarProjectName, serviceEarProjectName_, getClientProjectName());
-            setClientEarProjectName(proxyEARProject.getName());
-          }     
-        }
-      }
-    }
-    else
-    {
-      serviceEarProjectName_ = "";
-    }   
-  }
-
-  private String getDefaultServiceEarProjectName()
-  {
-    //Choose an appropriate default.
-    
-    IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_);
-    if (serviceProject != null && serviceProject.exists())
-    {
-      IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(serviceProject);
-      if (earComps.length > 0)
-      {
-        //pick the first one.
-        return earComps[0].getName();
-
-      }
-    }
-    
-
-    IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
-      
-    //TODO Choose an existing EAR that can be added to the server and who's J2EE level in consistent with 
-    //that of the selected project, if applicable. Picking the first one for now.
-    if (allEarComps.length > 0)
-    {
-      return allEarComps[0].getName();
-    }
-
-
-    
-    // there are no suitable existing EARs
-    return ResourceUtils.getDefaultServiceEARProjectName();
-    
-  }
-  
-  private IStatus setServiceDefaultServer()
-  {
-    //Choose an existing server the module is already associated with if possible
-    IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_);
-    IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null);
-    IServer firstSupportedServer = getFirstSupportedServer(configuredServers, serviceRuntimeId_, serviceProject);
-    if (firstSupportedServer != null)
-    {
-      serviceIds_.setServerId(firstSupportedServer.getServerType().getId());
-      serviceIds_.setServerInstanceId(firstSupportedServer.getId());
-      return Status.OK_STATUS;        
-    }    
-    
-    
-    //Choose any suitable existing server
-    IServer[] servers = ServerCore.getServers();
-    IServer supportedServer = getFirstSupportedServer(servers, serviceRuntimeId_, serviceProject);
-    if (supportedServer != null)
-    {
-      serviceIds_.setServerId(supportedServer.getServerType().getId());
-      serviceIds_.setServerInstanceId(supportedServer.getId());
-      return Status.OK_STATUS;        
-    }        
-    
-    //No suitable existing server was found. Choose a suitable server type
-    String[] serverTypes = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByServiceRuntime(serviceRuntimeId_);
-    if (serverTypes!=null && serverTypes.length>0)
-    {
-      //TODO give priority to a server type that corresponds to the runtime associated with
-      //this project, if any.
-      serviceIds_.setServerId(serverTypes[0]);
-      return Status.OK_STATUS;
-    }
-    
-    //No suitable server was found. Popup an error.
-    String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(serviceIds_.getRuntimeId());
-    String serverLabels = getServerLabels(serviceIds_.getRuntimeId());    
-    IStatus status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_NO_SERVER_RUNTIME", new String[]{runtimeLabel, serverLabels}) );
-    return status;
-  }  
-  
-  private IServer getFirstSupportedServer(IServer[] servers, String serviceRuntimeId, IProject serviceProject)
-  {
-    if (servers != null && servers.length > 0) {
-      for (int i = 0; i < servers.length; i++)
-      {
-        String serverFactoryId = servers[i].getServerType().getId();
-        if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(serviceRuntimeId, serverFactoryId))
-        {
-          //TODO check if the server type supports the project before returning.
-          return servers[i];
-        }
-      }
-    }
-    return null;
-  }      
-  
-  private String getDefaultServiceProjectTemplate()
-  {
-    String[] templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(serviceIds_.getTypeId(), serviceIds_.getRuntimeId());
-    return templates[0];
-  }  
-  
-  private String getDefaultServiceProjectName()
-  {
-    IProject[] projects = FacetUtils.getAllProjects();
-    ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_);
-    RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
-    
-    //Check each project for compatibility with the serviceRuntime
-    for (int i=0; i<projects.length; i++)
-    {
-      try
-      {
-        IFacetedProject fproject = ProjectFacetsManager.create(projects[i]);
-        if (fproject != null)
-        {
-          Set facetVersions = fproject.getProjectFacets();
-          FacetMatcher fm = FacetUtils.match(rfvs, facetVersions);
-          if (fm.isMatch())
-          {
-            serviceFacetMatcher_ = fm;
-            return projects[i].getName();
-          }            
-        }
-        else
-        {
-          //TODO Handle the plain-old Java projects            
-        }
-      } catch (CoreException ce)
-      {
-        
-      }
-    }
-    
-    //No project was suitable, return a new project name
-    return ResourceUtils.getDefaultWebProjectName();
-    
-  }  
-  
-  private String getDefaultServiceRuntime(IProject project)
-  {
-    //If possible, pick a Web service runtime that works with the initially selected project.
-    //If the initially selected project does not work with any of the Web service runtimes, pick the 
-    //preferred Web service runtime.
-    
-    String[] serviceRuntimes = WebServiceRuntimeExtensionUtils2.getServiceRuntimesByServiceType(serviceIds_.getTypeId());
-    if (project != null && project.exists())
-    {
-      for (int i=0; i<serviceRuntimes.length; i++)
-      {
-        RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimes[i]).getRequiredFacetVersions();
-        try
-        {
-          IFacetedProject fproject = ProjectFacetsManager.create(project);
-          if (fproject != null)
-          {
-            Set facetVersions = fproject.getProjectFacets();
-            FacetMatcher fm = FacetUtils.match(rfv, facetVersions);
-            if (fm.isMatch())
-            {
-              serviceFacetMatcher_ = fm;
-              serviceProjectName_ = project.getName();
-              return serviceRuntimes[i];
-            }            
-          }
-          else
-          {
-            //TODO Handle the plain-old Java projects            
-          }
-        } catch (CoreException ce)
-        {
-          
-        }
-      }
-    }
-    
-    //Haven't returned yet so this means that the intitially selected project cannot be used
-    //to influence the selection of the runtime. Pick the preferred Web service runtime.
-    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-    String runtimeId = context.getRuntimeId();
-    for (int j=0; j<serviceRuntimes.length; j++ )
-    {
-      ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimes[j]);
-      if (desc.getRuntime().getId().equals(runtimeId))
-      {
-        return desc.getId();
-      }
-    }
-    
-    if (serviceRuntimes.length > 0)
-      return WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimes[0]).getId();
-    else
-      return null;
-  }  
-  /*
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-    
-    try
-    {
-     IStatus clientSideStatus = super.execute(monitor, null);
-     if (clientSideStatus.getSeverity()==Status.ERROR)
-     {
-       return clientSideStatus;
-     }
-     IStatus status = Status.OK_STATUS;
-
-
-    setDefaultServiceRuntimeFromPreference();
-    setDefaultServiceJ2EEVersionFromPreference();      
-    webServiceRuntimeJ2EEType = getWSRuntimeAndJ2EEFromProject(initialProject_, initialComponentName_);
-    if (webServiceRuntimeJ2EEType != null)
-    {
-      serviceJ2EEVersion_ = webServiceRuntimeJ2EEType.getJ2eeVersionId();
-      serviceIds_.setRuntimeId(webServiceRuntimeJ2EEType.getWsrId()); 
-    }	 
-     
-     setServiceComponentType();
-     // Default projects EARs and servers.
-     //setDefaultProjects();
-     setDefaultEARs();
-     IStatus serverStatus = setDefaultServer();
-     if (serverStatus.getSeverity()== Status.ERROR)
-     {
-         env.getStatusHandler().reportError(serverStatus);
-         return serverStatus;
-     }
-     updateServiceEARs();
-     //updateClientProject(getServiceProject2EARProject().getList().getSelection(), serviceComponentName_, serviceIds_.getTypeId());
-     //updateClientEARs();
-	 	 
-     return status;
-    } catch (Exception e)
-    {
-      //Catch all Exceptions in order to give some feedback to the user
-      IStatus errorStatus = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED",new String[]{e.getMessage()}), e);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-    
-  }
-  */
-
-  private void setServiceComponentType()
-  {
-    ServiceType st = WebServiceRuntimeExtensionUtils.getServiceType(serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
-    int scenario = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(serviceIds_.getTypeId());
-    String[] includeComponentTypes = null;
-    switch (scenario)
-    {
-    case WebServiceScenario.BOTTOMUP:
-		includeComponentTypes = st.getBottomUpModuleTypesInclude();
-      break;
-    case WebServiceScenario.TOPDOWN:
-		includeComponentTypes = st.getTopDownModuleTypesInclude();
-    }
-    
-    if (includeComponentTypes == null || includeComponentTypes.length==0)
-    {
-      serviceComponentType_ = IModuleConstants.JST_WEB_MODULE;
-    }
-    else
-    {
-	  serviceComponentType_ = includeComponentTypes[0];
-    }
-  }
-  
-  /*
-  private void setWebClientType()
-  {
-    SelectionListChoices choices = getRuntime2ClientTypes();
-    String               webId   = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Web";
-    
-    if( choices != null )
-    {
-      choices.getChoice().getList().setSelectionValue( webId );   
-    }
-  }
-  */
-  
-  /**
-   * Returns an object with target Runtime and J2EE value
-   * @param project
-   * @return
-   */
-
-  private WSRuntimeJ2EEType getWSRuntimeAndJ2EEFromProject(IProject project, String componentName)
-  {
-    WSRuntimeJ2EEType wsrJ2EE = null;
-    //If there is a valid initial selection, use it to determine
-    //reasonable J2EE version and Web service runtime values
-
-    if (project != null && project.exists())
-    {
-      boolean isValidComponentType = false;
-      if (componentName != null && componentName.length()>0)
-      {
-        isValidComponentType = J2EEUtils.isWebComponent(project) ||
-                                     J2EEUtils.isEJBComponent(project);
-      }
-      if (isValidComponentType)
-      {
-        //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
-        
-        //Get the J2EE level
-        int versionId = J2EEUtils.getJ2EEVersion(project);
-        String versionString = String.valueOf(versionId);
-        
-        //Get the runtime target of the project
-        IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
-        String runtimeTargetId = null;
-        if (runtimeTarget != null) 
-          runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-        
-        //If the preferred Web service runtime supports this J2EE level and this server target, keep it
-        if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, serviceIds_.getRuntimeId()) &&
-            ((runtimeTarget == null) || 
-             (runtimeTarget != null && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, serviceIds_.getRuntimeId()))
-            )
-           )
-          
-        {
-            //Set the J2EE level and Web service runtime
-            wsrJ2EE = new WSRuntimeJ2EEType();
-            wsrJ2EE.setWsrId(serviceIds_.getRuntimeId());
-            wsrJ2EE.setJ2eeVersionId(versionString);
-            return wsrJ2EE;
-
-        } else
-        {
-          //Look for a runtime that matches both the J2EE level and the server target.
-          String[] validRuntimes = WebServiceRuntimeExtensionUtils.getRuntimesByType(serviceIds_.getTypeId());
-          for (int i = 0; i < validRuntimes.length; i++)
-          {
-            if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, validRuntimes[i]) &&
-                ((runtimeTarget == null) ||
-                 (runtimeTarget!=null && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, validRuntimes[i]))
-                )
-                )
-            {
-              wsrJ2EE = new WSRuntimeJ2EEType();
-              wsrJ2EE.setWsrId(validRuntimes[i]);
-              wsrJ2EE.setJ2eeVersionId(versionString);
-              return wsrJ2EE;
-            }
-          }
-        }
-      }
-    }    
-    return wsrJ2EE;
-  }
-  
-  private void setDefaultServiceRuntimeFromPreference()
-  {
-  	
-    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-    String pRuntimeId = context.getRuntimeId();
-    //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
-    //if the preferred runtime in compatible with the type, select it.
-    if (WebServiceRuntimeExtensionUtils.isRuntimeSupportedForType(serviceIds_.getTypeId(), pRuntimeId))
-    {
-      serviceIds_.setRuntimeId(pRuntimeId);
-    }
-    else
-    {
-      //Set the Web service runtime to one that is supported by the selected type.
-      String[] validRuntimes = WebServiceRuntimeExtensionUtils.getRuntimesByType(serviceIds_.getTypeId());
-      if (validRuntimes != null && validRuntimes.length>0)
-      {
-        serviceIds_.setRuntimeId(validRuntimes[0]);
-      }
-    }
-  }
-
-  
-
-  /*
-  private void setDefaultServiceJ2EEVersionFromPreference()
-  {
-    if (serviceIds_ != null)
-    {
-      String runtimeId = serviceIds_.getRuntimeId();
-      if (runtimeId != null)
-      {
-        //IWebServiceRuntime wsr = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId);
-        WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(runtimeId);
-        if (wsrt != null)
-        {
-          String[] versions = wsrt.getJ2eeLevels();          
-          //If the preferred J2EE version is in versions, pick the preferred one. 
-          //Otherwise, pick the first one.
-          if (versions != null && versions.length > 0)
-          {
-          	PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-          	String pJ2EE = context.getJ2EEVersion();
-          	if (pJ2EE!=null && pJ2EE.length()>0)
-          	{
-              for (int i=0;i<versions.length;i++)
-          	  {
-          		  if (versions[i].equals(pJ2EE))
-          		  {
-          			  serviceJ2EEVersion_ = versions[i];
-          		    return;
-          		  }
-          	  }
-          	}
-          	serviceJ2EEVersion_ = versions[0];
-          	return;
-          }
-            
-        }
-      }
-    }
-  } 
-  */
-  
-  /**
-   * This method needs a lot of work. It does not take into account the component types supported by the
-   * selected Web service type or the fact that there are multiple components in a project.
-   */
-  //rskrem93309
-  /*
-  private void setDefaultProjectsNew()
-  {
-    if (initialProject_ != null)
-    {
-      getServiceProject2EARProject().getList().setSelectionValue(initialProject_.getName());
-      String moduleName = null;
-      if (initialComponentName_!=null && initialComponentName_.length()>0)
-      {
-        moduleName = initialComponentName_;
-      }
-      else
-      {
-        moduleName = J2EEUtils.getFirstWebModuleName(initialProject_);
-      }
-      
-      serviceComponentName_ = moduleName;
-      String version = String.valueOf(J2EEUtils.getJ2EEVersion(initialProject_, moduleName));
-      String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getJ2eeLevels();
-      for (int i=0; i< validVersions.length; i++)
-      {
-        if (validVersions[i].equals(version))
-        {
-          serviceJ2EEVersion_ = validVersions[i];
-        }
-      }
-    }
-    else
-    {
-      //Pick the first one
-      IProject[] projects = WebServiceRuntimeExtensionUtils.getAllProjects();
-      if (projects.length>0)
-      {
-        getServiceProject2EARProject().getList().setSelectionValue(projects[0].getName());
-        String moduleName = J2EEUtils.getFirstWebModuleName(projects[0]);
-        serviceComponentName_ = moduleName;
-        String version = String.valueOf(J2EEUtils.getJ2EEVersion(projects[0], moduleName));
-        String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getJ2eeLevels();
-        for (int i=0; i< validVersions.length; i++)
-        {
-          if (validVersions[i].equals(version))
-          {
-            serviceJ2EEVersion_ = validVersions[i];
-          }
-        }        
-        
-      }
-      else
-      {
-        //there are no projects in the workspace. Pass the default names for new projects.
-        
-        if (serviceComponentType_.equals(IModuleConstants.JST_EJB_MODULE))
-        {
-          getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultEJBProjectName());
-          serviceComponentName_ = ResourceUtils.getDefaultEJBComponentName();
-        }
-        else
-        {
-          getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
-          serviceComponentName_ = ResourceUtils.getDefaultWebComponentName();
-        }
-      }
-      
-      
-    }
-  }
-  */
-  //
-
-  /*
-  private void setDefaultProjects()
-  {
-	
-	//Handle the case where no valid initial selection exists
-    if (initialProject_== null || (initialProject_!=null && webServiceRuntimeJ2EEType==null))
-    {
-      //Select the first existing project that is valid.
-      setServiceProjectToFirstValid();
-      String serviceProjectName = getServiceProject2EARProject().getList().getSelection();
-     
-      //Select a client project with "client" added to the above project name.
-      //updateClientProject(serviceProjectName, serviceComponentName_, serviceIds_.getTypeId());
-      //String clientProjectName = ResourceUtils.getClientWebProjectName(serviceProjectName, serviceIds_.getTypeId() );
-      //getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientProjectName);
-      
-      return;
-    }    
-	    
-
-	//Set the service project selection to this initialProject
-	getServiceProject2EARProject().getList().setSelectionValue(initialProject_.getName());
-  serviceComponentName_ = initialComponentName_;
-  //updateClientProject(initialProject_.getName(), serviceComponentName_, serviceIds_.getTypeId());
-	//String clientProjectName = ResourceUtils.getClientWebProjectName(initialProject_.getName(), serviceIds_.getTypeId() ); 
-	//Set the client project selection to clientProject
-	//getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientProjectName);
-		      	    
-  }
-  */
-  
-
-  /*
-  private void setServiceProjectToFirstValid()
-  {
-    //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
-    String[] projectNames = getServiceProject2EARProject().getList().getList();
-    for (int i=0;i<projectNames.length; i++)
-    {
-      IProject project = ProjectUtilities.getProject(projectNames[i]);
-      IVirtualComponent[] vcs = J2EEUtils.getComponentsByType(project, serviceComponentType_);
-      if (project.isOpen() && vcs!=null && vcs.length>0)
-      {
-        //Get the runtime target of the project
-        IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
-        String runtimeTargetId = null;
-        if (runtimeTarget != null) 
-          runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-        
-        for (int j=0; j < vcs.length; j++)
-        {  
-          //Get the J2EE level
-          int versionId = J2EEUtils.getJ2EEVersion(vcs[j]);
-          String versionString = String.valueOf(versionId);
-        
-        
-          if (serviceJ2EEVersion_!=null && serviceJ2EEVersion_.length()>0 && serviceJ2EEVersion_.equals(versionString))
-          {
-            if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, serviceIds_.getRuntimeId()) &&
-               ((runtimeTarget == null) || 
-               ((runtimeTarget!=null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, serviceIds_.getRuntimeId()))) 
-               )
-            {
-              serviceProjectName_ = projectNames[i];              
-              return;
-            }
-          }
-        }
-      }
-    }
-    
-    //Didn't find a single project that worked. Default to a new project name.    
-    //getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
-    //serviceComponentName_ = ResourceUtils.getDefaultWebProjectName();
-    if (serviceComponentType_.equals(IModuleConstants.JST_EJB_MODULE))
-    {
-      serviceProjectName_ = ResourceUtils.getDefaultEJBProjectName();
-    }
-    else
-    {
-      serviceProjectName_ = ResourceUtils.getDefaultWebProjectName();
-    }    
-  }
-  */
-
-
-  /*
-  private void setDefaultEARs()
-  { 
-    //Service side
-    String initialProjectName = serviceProjectName_;
-    IProject initialProject =   FileResourceUtils.getWorkspaceRoot().getProject(initialProjectName);
-    boolean earIsSet = false;
-    if (initialProject != null && initialProject.exists())
-    {
-      IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(initialProject);
-      if (earComps.length > 0)
-      {
-        // Pick the first one
-        IVirtualComponent earComp = earComps[0];
-        String earProjectName = earComp.getProject().getName();
-        String earComponentName = earComp.getName();
-        serviceEarProjectName_ = earProjectName;        
-        earIsSet = true;
-      }
-    }
-     
-    if (!earIsSet)
-    {
-      // Either the component is not associated with any EARs or the project
-      // does not exist,
-      // so pick the first EAR yousee with the correct J2EE version.
-      IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
-      if (allEarComps.length > 0)
-      {
-        for (int i = 0; i < allEarComps.length; i++)
-        {
-          IRuntime runtime = ServerSelectionUtils.getRuntimeTarget(allEarComps[i].getProject().getName());
-          if (runtime != null && serviceIds_.getRuntimeId() != null && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtime.getRuntimeType().getId(), serviceIds_.getRuntimeId()) && serviceJ2EEVersion_.equals(String.valueOf(J2EEUtils.getJ2EEVersion(allEarComps[i]))))
-          {
-            String earProjectName = allEarComps[i].getProject().getName();
-            serviceEarProjectName_ = earProjectName;
-            earIsSet = true;
-          }
-
-        }
-      }
-    }
-      
-    if (!earIsSet)
-    {
-        // there are no suitable existing EARs
-        serviceEarProjectName_ = ResourceUtils.getDefaultServiceEARProjectName();
-    }
-
-    //Client side    
-    String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection(); 
-    IProject initialClientProject = ProjectUtilities.getProject(initialClientProjectName);
-    String[] clientEARInfo = getDefaultEARFromClientProject(initialClientProject, getClientComponentName());
-
-    //If the client project exists and the default EAR is the same as that of the service project, 
-    //pick the defaultClientEAR
-    if(initialClientProject!=null && initialClientProject.exists() 
-       && clientEARInfo[1].equalsIgnoreCase(serviceEarComponentName_))
-    {
-      getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(clientEARInfo[0]);
-      setClientEARComponentName(clientEARInfo[1]);
-    }
-    else
-    { 
-      ProjectTopologyContext ptc= WebServicePlugin.getInstance().getProjectTopologyContext();
-      String serviceEARName = getServiceProject2EARProject().getChoice().getList().getSelection();
-      if (!ptc.isUseTwoEARs()) {        
-        getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(serviceEARName);
-        setClientEARComponentName(serviceEarComponentName_);
-      }
-      else {
-        //I am here
-        IProject proxyEARProject = getUniqueClientEAR(clientEARInfo[0], serviceEARName, initialClientProjectName);
-        getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(proxyEARProject.getName());
-        setClientEARComponentName(proxyEARProject.getName());
-      }     
-    }    
-    
-  }
-  */
-  
-/*  
-    private void setDefaultEARs() { 
-      // Service-side 
-      String initialProjectName = getServiceProject2EARProject().getList().getSelection(); 
-      IProject initialProject = FileResourceUtils.getWorkspaceRoot().getProject(initialProjectName);
-    IProject defaultServiceEAR = getDefaultEARFromServiceProject(initialProject);
-    getServiceProject2EARProject().getChoice().getList().setSelectionValue(defaultServiceEAR.getName());
-    // Client-side 
-    String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
-   IProject initialClientProject = (IProject)((new StringToIProjectTransformer()).transform(initialClientProjectName));
-    IProject defaultClientEAR = getDefaultEARFromClientProject(initialClientProject); // If the client project exists and the default EAR is the same as that of the service
-    project, // pick the defaultClientEAR 
-    if(initialClientProject!=null && initialClientProject.exists() && defaultClientEAR.getName().equalsIgnoreCase(defaultServiceEAR.getName())) {
-    getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(defaultClientEAR.getName()); }
-    else { ProjectTopologyContext ptc=
-    WebServicePlugin.getInstance().getProjectTopologyContext(); if
-    (!ptc.isUseTwoEARs()) {
-    getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(defaultServiceEAR.getName()); }
-    else { IProject proxyEARProject =
-    getUniqueClientEAR(defaultClientEAR.getName(), defaultServiceEAR.getName(),
-    initialClientProjectName);
-    getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(proxyEARProject.getName()); } } }
-  */ 
-  
-  private IProject getUniqueClientEAR(String earProject, String serviceProject, String clientProjectName) {
-
-    String projectName = new String();
-    if (!earProject.equalsIgnoreCase(serviceProject)) {
-      projectName = earProject;
-    }
-    else {
-      projectName = clientProjectName+DEFAULT_CLIENT_EAR_PROJECT_EXT;
-      int i=1;      
-      while (projectName.equalsIgnoreCase(serviceProject)) {
-        projectName = projectName+i;
-        i++;
-      }
-    }
-    return projectName.equals("") ? null : ResourceUtils.getWorkspaceRoot().getProject(projectName);
-    
-  }
-  
-  /*
-  private void setDefaultServer()
-  {
-    String initialProjectName = getServiceProject2EARProject().getList().getSelection();
-	  IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(initialProjectName);
-    String runtimeTargetId = null;
-    if (runtimeTarget != null)
-    {
-      runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-      //Pick a compatible existing server if one exists.
-      IServer[] servers = ServerSelectionUtils.getCompatibleExistingServers(runtimeTarget);
-      if (servers!=null && servers.length>0)
-      {
-        for (int i=0; i<servers.length; i++)
-        {
-          String thisFactoryId = servers[0].getServerType().getId();
-          //if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportServer(serviceIds_.getRuntimeId(), thisFactoryId))
-          //{
-            //Pick this server and return.
-            serviceIds_.setServerId(thisFactoryId);
-            serviceIds_.setServerInstanceId(servers[0].getId());
-            return;
-          //}			  
-        }
-      }
-      
-      //No compatible existing server, set the factory id to something the runtime supports
-      String[] factoryIds = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getServerFactoryIds();
-      if (factoryIds!=null && factoryIds.length>0)
-      {
-        for (int i=0; i<factoryIds.length; i++)
-        {
-          IServerType serverType = ServerCore.findServerType(factoryIds[i]);
-          if (serverType != null)
-          {
-            String serverRuntimeTypeId = serverType.getRuntimeType().getId();            
-            if (serverRuntimeTypeId.equals(runtimeTargetId))
-            {
-              //Found a match
-              serviceIds_.setServerId(factoryIds[i]);
-              return;
-            }
-          }
-        }        
-      }
-      else
-      {
-        //Runtime does not specify any server factory ids
-        IServerType[] serverTypes = ServerCore.getServerTypes();
-        serviceIds_.setServerId(serverTypes[0].getId());
-      }
-      
-    }
-    else
-    {
-      // The project has no server target so pick a server factory id that is supported by the runtime
-      String[] fids = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getServerFactoryIds();
-      if (fids!=null && fids.length>0)
-      {
-        serviceIds_.setServerId(fids[0]);  
-      }
-      else
-      {
-        //Runtime does not specify any server factory ids
-        IServerType[] serverTypes = ServerCore.getServerTypes();
-        serviceIds_.setServerId(serverTypes[0].getId());        
-      }
-            
-    }        
-  }
-  */
-  /*
-  private IStatus setDefaultServer()
-  {
-	  IStatus status = Status.OK_STATUS;
-    //Calculate reasonable default server based on the default project selection. 
-
-    String initialProjectName = serviceProjectName_; 
-    IProject initialProject = ProjectUtilities.getProject(initialProjectName);
-    if (initialProject.exists())
-    {
-      String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialProject, initialProject.getName(), serviceIds_.getRuntimeId(), true);
-      if (serverInfo!=null)
-      {
-        if (serverInfo[0]!=null && serverInfo[0].length()>0)
-        {
-          serviceIds_.setServerId(serverInfo[0]);
-        }
-        if (serverInfo[1]!=null && serverInfo[1].length()>0)
-        {
-          serviceIds_.setServerInstanceId(serverInfo[1]);
-        }        
-      }      
-    }
-    else //the project does not exist.
-    {
-      //Does the EAR exist?
-      String initialEARProjectName = serviceEarProjectName_;
-      IProject initialEARProject = ProjectUtilities.getProject(initialEARProjectName);
-      if (initialEARProject.exists())
-      {
-        String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialEARProject, serviceEarProjectName_, serviceIds_.getRuntimeId(), false);
-        if (serverInfo!=null)
-        {
-          if (serverInfo[0]!=null && serverInfo[0].length()>0)
-          {
-            serviceIds_.setServerId(serverInfo[0]);
-          }
-          if (serverInfo[1]!=null && serverInfo[1].length()>0)
-          {
-            serviceIds_.setServerInstanceId(serverInfo[1]);
-          }        
-        }              
-      }
-      else
-      {
-        //We have a new project and EAR. Use the runtime/server selection 
-        //preferences to set the default server/server type.
-        //Pick a server type that is compatible with the Web service runtime
-        //If there is an existing server that works, pick that one.
-        
-        String[] serverInfo = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(serviceIds_.getRuntimeId(), serviceJ2EEVersion_);
-        if (serverInfo!=null)
-        {
-          if (serverInfo[0]!=null && serverInfo[0].length()>0)
-          {
-            serviceIds_.setServerId(serverInfo[0]);
-          }
-          if (serverInfo[1]!=null && serverInfo[1].length()>0)
-          {
-            serviceIds_.setServerInstanceId(serverInfo[1]);
-          }        
-        }
-        else
-        {
-        	//Since the project and the EAR are both new, try changing the J2EE level
-        	boolean foundServer = false;
-        	WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId());
-            if (wsrt != null)
-            {
-              String[] versions = wsrt.getJ2eeLevels();
-              if (versions != null && versions.length > 0)
-              {
-            	  for (int k=0; k<versions.length; k++)
-            	  {
-            		  //If this J2EE version is different from the current one, see if there is
-            		  //a server available.
-            		  if (serviceJ2EEVersion_!=versions[k])
-            		  {
-            			  String[] si = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(serviceIds_.getRuntimeId(), versions[k]);
-             		      if (si!=null)
-            		      {
-            		        if (si[0]!=null && si[0].length()>0)
-            		        {
-            		          serviceIds_.setServerId(si[0]);
-            		        }
-            		        if (si[1]!=null && si[1].length()>0)
-            		        {
-            		          serviceIds_.setServerInstanceId(si[1]);
-            		        }             
-            		        serviceJ2EEVersion_ = versions[k];
-            		        foundServer = true;
-            		        break;
-            		      }
-            		  
-            	      }
-                  }
-               }
-            }
-        	//No valid server runtimes appear to be configured, this is an error condition.
-            if (!foundServer)
-            {
-              String runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById(serviceIds_.getRuntimeId());
-              String serverLabels = getServerLabels(serviceIds_.getRuntimeId());            	
-        	    status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_NO_SERVER_RUNTIME", new String[]{runtimeLabel, serverLabels}) );
-            }
-        	
-        }
-      }
-      
-    }
-    
-    return status;
-  }
-  */
-  
-  /*
-  private void updateServiceEARs()
-  {
-  	//Set EAR selection to null if the project/server defaults imply an EAR should not be created
-  	IProject serviceProject = FileResourceUtils.getWorkspaceRoot().getProject(serviceProjectName_);
-  	if (serviceProject != null && serviceProject.exists())
-  	{
-  	  //Get the runtime target on the serviceProject
-  	  IRuntime serviceTarget = ServerSelectionUtils.getRuntimeTarget(serviceProjectName_);
-  	  String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(serviceProject));
-  	  if (serviceTarget != null)
-  	  {
-  	  	if (!ServerUtils.isTargetValidForEAR(serviceTarget.getRuntimeType().getId(),j2eeVersion))
-  	  	{
-  	      //Default the EAR selection to be empty
-  	  	  serviceEarProjectName_="";
-  	  	  serviceNeedEAR_ = false;
-  	  	}
-  	  		
-  	  }
-  	}
-  	else
-  	{
-      String serverId = serviceIds_.getServerId();
-      if (serverId != null)
-      {
-  		//Use the server type
-  		String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId);
-  		if (serverTargetId!=null && serverTargetId.length()>0)
-  		{
-  		  if (!ServerUtils.isTargetValidForEAR(serverTargetId,serviceJ2EEVersion_))
-  	  	  {
-  	        //Default the EAR selection to be empty
-  	  	    serviceEarProjectName_ = "";
-  	  	    serviceNeedEAR_ = false;
-  	  	  }
-  		}
-      }
-  	}
-  	
-  		
-  }
-  */
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-  }
-  
-  public void setInitialProject(IProject initialProject)
-  {
-    initialProject_ = initialProject;
-  }
-  
-  public void setInitialComponentName(String name)
-  {
-    initialComponentName_ = name;  
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    serviceIds_ = ids;
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    return serviceIds_; 
-  }
-
-  public String getServiceRuntimeId()
-  {
-    return serviceRuntimeId_;
-  }
-  /*
-  public SelectionListChoices getServiceProject2EARProject()
-  {
-    if (serviceProject2EARProject_ == null)
-    {
-	  // rskreg
-      //IProject[] projects = WebServiceServerRuntimeTypeRegistry.getInstance().getProjectsByWebServiceType(serviceIds_.getTypeId());
-      //Populate the list with all the projects in the workspace except Servers and ones that start with "."
-	  // rskreg
-	  String[] projectNames = getAllFlexibleProjects();
-	  SelectionList list = new SelectionList(projectNames, 0);
-	  Vector choices = new Vector();
-	  for (int i = 0; i < projectNames.length; i++) {
-      IProject project = ProjectUtilities.getProject(projectNames[i]);
-	    choices.add(getProjectEARChoice(project));
-	  }
-	  serviceProject2EARProject_ = new SelectionListChoices(list, choices, getEARProjects());
-    }
-    return serviceProject2EARProject_; 
-  }
-  */  
-  /**
-   * @return Returns the generateProxy_.
-   */
-  public boolean getGenerateProxy()
-  {
-    return generateProxy_;
-  }
-  /**
-   * @param generateProxy_ The generateProxy_ to set.
-   */
-  public void setGenerateProxy(boolean generateProxy_)
-  {
-    this.generateProxy_ = generateProxy_;
-  }
-  
-  public String getServiceProjectName()
-  {
-    return serviceProjectName_;  
-  }
-  
-  public String getServiceEarProjectName()
-  {
-    return serviceEarProjectName_;
-  }
-  
-  public String getServiceComponentType()
-  {
-    return serviceComponentType_;
-  }
-  
-  public boolean getServiceNeedEAR()
-  {
-    return serviceNeedEAR_;
-  }
-  
-  /**
-   * Returns the first EAR for a given project
-   * @param project
-   * @return
-   */
-  /*
-  private IProject getDefaultEARFromServiceProject(IProject project)
-  {
-    if (project!=null && project.exists()) 
-    {
-      IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-      IServer firstSupportedServer = ServerSelectionUtils.getFirstSupportedServer(configuredServers, serviceIds_.getTypeId() );
-      
-      EARNatureRuntime[] earProjects = J2EEUtils.getEARProjects(project, firstSupportedServer);
-      if (earProjects!=null && earProjects[0] instanceof EARNatureRuntime) 
-        return earProjects[0].getProject();
-    }
-    
-    int versionId = -1;
-    if (serviceJ2EEVersion_ != null && serviceJ2EEVersion_.length()>0)
-    {
-      versionId = Integer.parseInt(serviceJ2EEVersion_);
-    }
-    EARNatureRuntime newEAR = J2EEUtils.getEAR(versionId);
-    IProject earProject = ResourceUtils.getWorkspaceRoot().getProject(ResourceUtils.getDefaultServiceEARProjectName());
-      
-    if (newEAR!=null)
-      earProject = newEAR.getProject();
-
-    return earProject;  	
-  }
-  */
-  
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
deleted file mode 100644
index a00645b..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class LaunchFragment extends BooleanFragment
-{
-  private boolean publishToPublicUDDI_;  
-  private boolean publishToPrivateUDDI_;
-  
-  public LaunchFragment()
-  {
-    Condition condition = new Condition()
-    {
-      public boolean evaluate()
-      {
-        return (publishToPublicUDDI_ || publishToPrivateUDDI_);
-      }
-    };
-    setCondition( condition );
-    setTrueFragment( new SimpleFragment( new WSExplorerLauncherCommand(), "" ) );
-  }
-  
-  public void setPublishToPublicUDDI(boolean publishToPublicUDDI)
-  {
-    publishToPublicUDDI_ = publishToPublicUDDI;
-  }
-  
-  public void setPublishToPrivateUDDI(boolean publishToPrivateUDDI)
-  {
-  	publishToPrivateUDDI_ = publishToPrivateUDDI;
-  }
-   
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
deleted file mode 100644
index 196ed36..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-public class ServiceTestFragment extends BooleanFragment
-{
-  private boolean testService;
-  private boolean generateProxy;
-  
-  
-  public ServiceTestFragment( String id )
-  {
-  	SequenceFragment testRoot = new SequenceFragment();
-  	Condition condition = new Condition()
-                          {
-                            public boolean evaluate()
-                            {
-                              return testService;
-                            }
-                          };
-    setCondition( condition );
-    
-    testRoot.add( new SimpleFragment( new WebServiceTestDefaultingCommand(), "" ) );
-    testRoot.add( new SimpleFragment( id ) );
-    setTrueFragment( testRoot );
-      
-  }
- 
-  
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-  	
-  	dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "TestID",WSDLTestLaunchCommand.class);
-  	
-  	//from the wizard 
-  	dataRegistry.addMapping(ServiceTestWidget.class, "TestID",WSDLTestLaunchCommand.class);
-  	dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ExternalBrowser",WSDLTestLaunchCommand.class);
-  }
-  
-  public void setGenerateProxy(boolean generateProxy)
-  {
-  	this.generateProxy = generateProxy;
-  }
-  
-  public boolean getGenerateProxy()
-  {
-  	return generateProxy;
-  }
-  
-  /**
-   * @return Returns the testService.
-   */
-  public void setTestService( boolean testService )
-  {
-    this.testService = testService;
-  }
-
-  
-  
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
deleted file mode 100644
index 2ae4df2..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
+++ /dev/null

@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-public class ServiceTestWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private String createPluginId_ = "org.eclipse.jst.ws.creation.ui";
-
-  private Combo testTypeCombo_;
-  /*CONTEXT_ID PSTP0001 for the Test Type Combo box of the Service Test Page*/
-  private final String INFOPOP_PSTP_COMBOBOX_TEST = "PSTP0001";
-  private final String TOOLTIP_PSTP_COMBOBOX_TEST = "TOOLTIP_PSTP_COMBOBOX_TEST";
-
-  private Button launchButton_;
-  /*CONTEXT_ID PSTP0002 for the launch button of the Service Test Page*/
-  private final String INFOPOP_PSTP_LAUNCH_BUTTON = "PSTP0002";
-  private final String TOOLTIP_PSTP_LAUNCH_BUTTON = "TOOLTIP_PSTP_LAUNCH_BUTTON";
-  
-  private SelectionList facilities_;
-  
-  private String serviceServerInstanceId = null;
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, createPluginId_ );
-        
-    Composite testComposite = uiUtils.createComposite( parent, 3, 0, 0 );
-    
-    testTypeCombo_ = uiUtils.createCombo( testComposite, "LABEL_TEST_TYPES",
-                                          TOOLTIP_PSTP_COMBOBOX_TEST,
-                                          INFOPOP_PSTP_COMBOBOX_TEST,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    launchButton_ = uiUtils.createPushButton( testComposite, "BUTTON_LAUNCH_SERVICE_TEST",
-                                          TOOLTIP_PSTP_LAUNCH_BUTTON,
-                                          INFOPOP_PSTP_LAUNCH_BUTTON );
-    launchButton_.addSelectionListener( new SelectionAdapter()
-                                        {
-                                          public void widgetSelected( SelectionEvent event )
-                                          {
-                                            handleLaunchButton();
-                                          }
-                                        });
-    
-     
-    return this;
-  }
-  
-  private TypeRuntimeServer serviceids;
-  private String serverProject;
-  private String module;
-  private String wsdlURI;
-  private String launchedServiceTestName = "";
-  private IEnvironment env;
-  private List endpoints;
-  
-  private void handleLaunchButton()
-  {
-	// Split up the project and module
-	int p = serverProject.indexOf("/");
-	if (p != -1){
-		module = serverProject.substring(p+1);
-		serverProject = serverProject.substring(0,p);
-	}
-  	
-  	String testID = testTypeCombo_.getText();
-  	launchedServiceTestName = testID;
-  	WSDLTestLaunchCommand wtlc = new WSDLTestLaunchCommand();
-  	wtlc.setTestID(testID);
-  	wtlc.setServiceTypeRuntimeServer(serviceids);
-	  wtlc.setServiceServerInstanceId(serviceServerInstanceId);
-  	wtlc.setServerProject(serverProject);
-	  wtlc.setServerModule(module);
-  	wtlc.setWsdlURI(wsdlURI);
-  	wtlc.setExternalBrowser(true);
-  	wtlc.setEndpoint(endpoints);
-  	wtlc.setEnvironment( env );
-  	wtlc.execute( null, null );
-  }
-  
-  public void setServiceTestFacilities( SelectionList facilities )
-  {
-    facilities_ = facilities;
-    testTypeCombo_.setItems( facilities.getList() );
-    testTypeCombo_.select( facilities.getIndex() );
-  }
-  
-  public SelectionList getServiceTestFacilities()
-  {
-    facilities_.setIndex( testTypeCombo_.getSelectionIndex() );
-    return facilities_;
-  }
-
-  public String getTestID()
-  {
-  	return testTypeCombo_.getText();
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-  	this.wsdlURI = wsdlURI;
-  }
-    
-  public void setServerProject(String serverProject)
-  {
-    this.serverProject = serverProject;
-  }
-
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer serviceids)
-  {
-    this.serviceids = serviceids;
-  }
-  
-  public String getLaunchedServiceTestName()
-  {
-    return launchedServiceTestName;
-  }
-
-  public void setEnvironment(IEnvironment env)
-  {
-  	this.env = env;
-  }
-
-  public void setEndpoint(String endpoint)
-  {
-    if (endpoint != null && endpoint.length() > 0)
-    {
-      Vector v = new Vector();
-      v.add(endpoint);
-      setEndpoints(v);
-    }
-  }
-  
-  public void setEndpoints(List endpoints)
-  {
-    this.endpoints = endpoints;
-  }
-  
-  public void setServiceServerInstanceId(String ssInstanceId){
-	  this.serviceServerInstanceId = ssInstanceId;
-  }
-  
-}

diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
deleted file mode 100644
index 3d23aa1..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestDefaultingCommand extends AbstractDataModelOperation 
-{
-  
-  private SelectionList serviceTestFacilities;	
-  private IEnvironment environment;
-  private String testID;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-  	ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-  	testID = scenarioContext.getNonJavaTestService();
-  	String[] testTypes = scenarioContext.getWebServiceTestTypes();
-  	
-  	
-  	environment = env;
-  	IStatus status = Status.OK_STATUS;
-  	WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-  	
-    
-  	Vector wsdlNames = new Vector();
-  	for(int i =0 ;i<testTypes.length;i++){
-  	  WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[i]);  	
-  	  if(wscte.testWSDL()){
-  	    wsdlNames.addElement(testTypes[i]);
-  	  }
-  	}
-    
-  	String javaNamesArray[] = new String[wsdlNames.size()];
-  	Enumeration e = wsdlNames.elements();
-  	int i = 0;
-  	while(e.hasMoreElements()){
-      javaNamesArray[i] = (String)e.nextElement();
-  	  i++;
-  	}
-  	
-  	
-  	serviceTestFacilities = new SelectionList(javaNamesArray,0);  	
-  	
- 	return status;
-  }
-
-  public SelectionList getServiceTestFacilities()
-  {
-  	return serviceTestFacilities;
-  }
-
-  public String getTestID()
-  {
-  	return testID;
-  }
-  
-  public IEnvironment getEnvironment()
-  {
-  	return environment;
-  }
-
-  public boolean getExternalBrowser()
-  {
-  	return false;
-  }
-
-
-}

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.classpath b/bundles/org.eclipse.jst.ws.uddiregistry/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore b/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
deleted file mode 100644
index e15b00d..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-uddiregistry.jar
-@dot

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.project b/bundles/org.eclipse.jst.ws.uddiregistry/.project
deleted file mode 100644
index cd999f6..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.uddiregistry</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env</project>
-		<project>org.eclipse.wst.command.env.core</project>
-		<project>org.eclipse.jst.ws</project>
-		<project>org.eclipse.jst.ws.consumption</project>
-		<project>org.eclipse.jst.ws.consumption.ui</project>
-		<project>org.eclipse.jst.ws.ui</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
deleted file mode 100644
index 665da29..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.uddiregistry; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.uddiregistry.plugin,
- org.eclipse.jst.ws.internal.uddiregistry.widgets,
- org.eclipse.jst.ws.internal.uddiregistry.widgets.binding,
- org.eclipse.jst.ws.internal.uddiregistry.wizard,
- org.eclipse.jst.ws.uddiregistry
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.common.frameworks
-Eclipse-AutoStart: true

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/about.html b/bundles/org.eclipse.jst.ws.uddiregistry/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties b/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
deleted file mode 100644
index e1dec33..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif b/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
deleted file mode 100644
index 5b43cae..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif b/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif
deleted file mode 100644
index 31611ec..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
deleted file mode 100644
index d8cfbff..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Universal Description Discovery and Integration Registry
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI=Unit Test UDDI
-
-XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
deleted file mode 100644
index 77a2c48..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
+++ /dev/null

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   
-<!--
-  <description>
-  %PLUGIN_DESC
-  </description>
-  -->
-    <extension-point id="privateUDDIRegistryType" name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.privateUDDIRegistryType">
-      <privateUDDIRegistryType
-            name="%PRIVATE_UDDI_REGISTRY_TYPE_IMPL"
-            class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl"
-            id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl">
-      </privateUDDIRegistryType>
-   </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
-            icon="icons/registry.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
-            class="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding"
-            iconbanner="icons/uddiprivateconfig_wiz.gif"
-            id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
-      </dynamicWizard>
-   </extension>
-   <!--
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
-            icon="icons/registry.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard"
-            id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard">
-         <description>
-            %PLUGIN_NEW_WIZARD_DESC_WS_UNIT_TEST_UDDI
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-   </extension>
-   -->
-</plugin>

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
deleted file mode 100644
index 81df413..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
-* This is the plugin class for the Web Services UDDI Registry plugin.
-* <p>
-* The Web Services UDDI Registry plugin's is to add the
-* option to create a unit test UDDI registry 
-*/
-public class WebServiceUDDIRegistryPlugin extends Plugin
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.uddiregistry";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceUDDIRegistryPlugin instance_;
-  
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  */
-  public WebServiceUDDIRegistryPlugin ()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceUDDIRegistryPlugin)Platform.getPlugin("org.eclipse.jst.ws.uddiregistry");
-  * @return The WebServiceUDDIRegistryPlugin singleton.
-  */
-  public static WebServiceUDDIRegistryPlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-  public static ImageDescriptor getImageDescriptor ( String name )
-  {
-    try
-    {
-      URL installURL = instance_.getBundle().getEntry("/");
-      URL imageURL = new URL(installURL,name);
-      return ImageDescriptor.createFromURL(imageURL);
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties.
-  * @return The String message.
-  */
-  public static String getMessage ( String key )
-  {
-    return Platform.getResourceString(instance_.getBundle(),key);
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties. Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See the JDK's
-  * {@link java.text.MessageFormat java.text.MessageFormat}
-  * class for further details on substitution.
-  * @return The String message.
-  */
-  public static String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format(getMessage(key),args);
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
deleted file mode 100644
index 7fb402c..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-/*
-import org.eclipse.wst.command.internal.env.core.common.Environment;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.env.core.common.Status;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-*/
-
-public class PrivateUDDISelectionCommand extends AbstractDataModelOperation
-{
-  private byte operationType;
-  private PrivateUDDIRegistryType registryType;
-  
-  /*
-  public Status execute(Environment env)
-  {
-    MessageUtils msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this);
-  	if (registryType != null)
-  	{
-  	  switch (operationType)
-  	  {
-  	  	case PrivateUDDIRegistryType.OP_DEPLOY:
-  	      return registryType.deploy(env);
-  	  	case PrivateUDDIRegistryType.OP_UPDATE:
-  	  	  return registryType.update(env);
-  	  	case PrivateUDDIRegistryType.OP_REMOVE:
-  	  	  return registryType.remove(env);
-  	  	default:
-  	  }
-  	}
-  	return new SimpleStatus("");
-  }
-  */
-
-  public PrivateUDDIRegistryType getRegistryType()
-  {
-    return getPrivateUDDIRegistryType();
-  }
-  
-  public byte getOperationType()
-  {
-    return operationType;
-  }
-  
-  public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
-  {
-  	return registryType;
-  }
-
-  public void setRegistryType(PrivateUDDIRegistryType regType)
-  {
-  	setPrivateUDDIRegistryType(regType);
-  }
-  
-  public void setOperationType(byte type)
-  {
-    operationType = type;
-  }
-  
-  public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType regType)
-  {
-  	registryType = regType;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
deleted file mode 100644
index b408b68..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PrivateUDDISelectionCommandFragment extends AbstractCommandFragment
-{
-  private PrivateUDDIRegistryType registryType;
-  private DataMappingRegistry dataMappingRegistry;
-  private CanFinishRegistry canFinishRegistry;
-  private WidgetRegistry widgetRegistry;
-  
-  public PrivateUDDISelectionCommandFragment()
-  {
-  	super(null, "");
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {
-  	if (registryType != null)
-  	{
-      registryType.registerCanFinish(canFinishRegistry);
-      registryType.registerDataMappings(dataMappingRegistry);
-      registryType.registerWidgetMappings(widgetRegistry);
-      return registryType.create().create();
-  	}
-    else
-      return null;
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment(CommandFragment fragment)
-  {
-  	return null;
-  }
-  
-  /*
-   * This method is called to retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings(DataMappingRegistry registry)
-  {
-  	dataMappingRegistry = registry;
-  }
-
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-  }
-
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    this.widgetRegistry = widgetRegistry;
-  }
-
-  /**
-    * All wizard fragments need to be cloneable.
-  **/
-  public Object clone()
-  {
-  	PrivateUDDISelectionCommandFragment fragment = new PrivateUDDISelectionCommandFragment();
-  	fragment.registerDataMappings(dataMappingRegistry);
-  	fragment.registerCanFinish(canFinishRegistry);
-  	fragment.registerWidgetMappings(widgetRegistry);
-  	fragment.setPrivateUDDIRegistryType(registryType);
-  	return fragment;
-  }
-  
-  public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType registryType)
-  {
-  	this.registryType = registryType;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
deleted file mode 100644
index 1c2b8e2..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
+++ /dev/null

@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-/**
-* This UDDI configuration page prompts the user
-* for the information required to configure the
-* unit test UDDI registry.
-*/
-public class PrivateUDDISelectionWidget extends SimpleWidgetDataContributor
-{
-  private MessageUtils msgUtils;
-  private Listener statusListener;
-
-  private Button deployRadio_;
-  private Label typesLabel_;
-  private Combo typesCombo_;
-  private Button updateRadio_;
-  private Button removeRadio_;
-  private PrivateUDDIRegistryType[] types_;
-  private PrivateUDDIRegistryType installedType_;
-
-  // Infopop
-  private final String INFOPOP_PUPR_PRIVATE_UDDI_PAGE = WebServiceUDDIRegistryPlugin.ID + ".pupr0001";
-  private final String INFOPOP_PUPR_PRIVATE_UDDI_TYPE = WebServiceUDDIRegistryPlugin.ID + ".pupr0002";
-  private final String INFOPOP_PUPR_DEPLOY_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0003";
-  private final String INFOPOP_PUPR_UPDATE_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0005";
-  private final String INFOPOP_PUPR_REMOVE_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0004";
-
-  public PrivateUDDISelectionWidget()
-  {
-    msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this );
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-  	this.statusListener = statusListener;
-    parent.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_PAGE"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, INFOPOP_PUPR_PRIVATE_UDDI_PAGE);
-
-    GridLayout gl;
-    GridData gd;
-    
-    Listener listener = new Listener()
-    {
-      public void handleEvent(Event event)
-      {
-      	handleWidgetEvent(event);
-      }
-    };
-
-    IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-    
-    deployRadio_ = new Button(parent, SWT.RADIO);
-    deployRadio_.setText(msgUtils.getMessage("BUTTON_DEPLOY_UDDI_REGISTRY"));
-    deployRadio_.setSelection(true);
-    deployRadio_.addListener(SWT.Selection, listener);
-    deployRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI"));
-    helpSystem.setHelp(deployRadio_, INFOPOP_PUPR_DEPLOY_PRIVATE_UDDI);
-
-    Composite typeComposite = new Composite(parent,SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 5;
-    gl.verticalSpacing = 15;
-    gl.marginWidth = 20;
-    typeComposite.setLayout(gl);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    typeComposite.setLayoutData(gd);
-
-    typesLabel_ = new Label(typeComposite, SWT.WRAP);
-    typesLabel_.setText(msgUtils.getMessage("LABEL_PRIVATE_UDDI_REGISTRY_TYPES"));
-    typesLabel_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_TYPE"));
-    helpSystem.setHelp(typesLabel_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
-    typesCombo_ = new Combo(typeComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    typesCombo_.setLayoutData(gd);
-    typesCombo_.addListener(SWT.Selection, listener);
-    typesCombo_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_TYPE"));
-    helpSystem.setHelp(typesCombo_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
-    updateRadio_ = new Button(parent,SWT.RADIO);
-    updateRadio_.setText(msgUtils.getMessage("BUTTON_UPDATE_UDDI_REGISTRY"));
-    updateRadio_.setSelection(false);
-    updateRadio_.addListener(SWT.Selection,listener);
-    updateRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI"));
-    helpSystem.setHelp(updateRadio_, INFOPOP_PUPR_UPDATE_PRIVATE_UDDI);
-
-    removeRadio_ = new Button(parent, SWT.RADIO);
-    removeRadio_.setText(msgUtils.getMessage("BUTTON_REMOVE_UDDI_REGISTRY"));
-    removeRadio_.setSelection(false);
-    removeRadio_.addListener(SWT.Selection, listener);
-    removeRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI"));
-    helpSystem.setHelp(removeRadio_, INFOPOP_PUPR_REMOVE_PRIVATE_UDDI);                
-
-    loadTypes();
-    init();
-    return this;
-  }
-
-  private final void loadTypes()
-  {
-    types_ = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-  }
-
-  private final void init()
-  {
-    for (int i = 0; i < types_.length; i++)
-    {
-      if (types_[i] != null)
-      {
-        typesCombo_.add(types_[i].getName());
-        if (types_[i].isPrivateUDDIRegistryInstalled())
-          installedType_ = types_[i];
-      }
-    }
-    if (typesCombo_.getItemCount() > 0)
-      typesCombo_.setText(typesCombo_.getItem(0));
-    if (installedType_ != null)
-    {
-      updateRadio_.setEnabled(true);
-      removeRadio_.setEnabled(true);                
-    }
-    else
-    {
-      updateRadio_.setEnabled(false);
-      removeRadio_.setEnabled(false);
-    }
-  }
-
-  private void handleWidgetEvent(Event event)
-  {
-    if (event.widget == removeRadio_ || event.widget == updateRadio_)
-    {
-      boolean isUpdateOrRemoveSelected = ((Button)event.widget).getSelection();
-      typesLabel_.setEnabled(!isUpdateOrRemoveSelected);
-      typesCombo_.setEnabled(!isUpdateOrRemoveSelected);
-    }
-    else if (event.widget == deployRadio_)
-    {
-      boolean isDeploySelected = ((Button)event.widget).getSelection();
-      typesLabel_.setEnabled(isDeploySelected);
-      typesCombo_.setEnabled(isDeploySelected);
-    }
-    statusListener.handleEvent(event);
-  }
-  
-  public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
-  {
-  	if (deployRadio_.getSelection())
-  	{
-  	  String selectedRegistryName = typesCombo_.getText();
-  	  for (int i = 0; i < types_.length; i++)
-        if (selectedRegistryName.equals(types_[i].getName()))
-  	  	  return types_[i];
-      return null;
-  	}
-  	else
-  	  return installedType_;
-  }
-  
-  public byte getOperationType()
-  {
-  	if (deployRadio_.getSelection())
-  	  return PrivateUDDIRegistryType.OP_DEPLOY;
-  	else if (updateRadio_.getSelection())
-      return PrivateUDDIRegistryType.OP_UPDATE;
-  	else if (removeRadio_.getSelection())
-      return PrivateUDDIRegistryType.OP_REMOVE;
-  	else
-  	  return PrivateUDDIRegistryType.OP_DEPLOY;
-  }
-
-  public IStatus getStatus()
-  {
-    PrivateUDDIRegistryType privateUDDIRegistryType = getPrivateUDDIRegistryType();
-    if (privateUDDIRegistryType != null)
-      return privateUDDIRegistryType.getOperationStatus(getOperationType());
-    else
-      return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE") );
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
deleted file mode 100644
index 3141b63..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class PrivateUDDISelectionWidgetConditionCommand extends AbstractDataModelOperation implements Condition
-{
-  private boolean condition;
-
-  public PrivateUDDISelectionWidgetConditionCommand()
-  {
-    condition = true;
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    condition = !condition;
-    return Status.OK_STATUS;
-  }
-  
-  public IStatus undo( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    condition = !condition;
-    return Status.OK_STATUS;
-  }
-  
-  public boolean evaluate()
-  {
-    return condition;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
deleted file mode 100644
index 6b09827..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets.binding;
-
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommand;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommandFragment;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidget;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidgetConditionCommand;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PrivateUDDIWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry;
-  private WidgetRegistry      widgetRegistry;
-  private DataMappingRegistry dataMappingRegistry;
-  private PrivateUDDISelectionCommandFragment privateUDDISelFragment;
-  private PrivateUDDISelectionWidgetConditionCommand conditionCommand;
-  
-  public PrivateUDDIWidgetBinding()
-  {
-    privateUDDISelFragment = new PrivateUDDISelectionCommandFragment();
-    conditionCommand = new PrivateUDDISelectionWidgetConditionCommand();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-    {
-      public CommandFragment create()
-      {
-        SequenceFragment root = new SequenceFragment();
-        root.add(new SimpleFragment(conditionCommand, ""));
-        root.add(new SimpleFragment("PrivateUDDISelectionWidget"));
-        root.add(new SimpleFragment(conditionCommand, ""));
-        root.add(new SimpleFragment(new PrivateUDDISelectionCommand(), ""));
-        root.add(privateUDDISelFragment);
-        return root;
-      }
-    };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-    privateUDDISelFragment.registerCanFinish(this.canFinishRegistry);
-    
-    canFinishRegistry.addCondition(conditionCommand);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    dataMappingRegistry = dataRegistry;
-    privateUDDISelFragment.registerDataMappings(dataMappingRegistry);
-    
-    // PrivateUDDISelectionCommand
-    dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommand.class);
-    dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "OperationType", PrivateUDDISelectionCommand.class);
-    
-    // PrivateUDDISelectionCommandFragment
-    dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommandFragment.class);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    MessageUtils msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this);
-    this.widgetRegistry = widgetRegistry;
-    privateUDDISelFragment.registerWidgetMappings(this.widgetRegistry);
-
-    widgetRegistry.add("PrivateUDDISelectionWidget", 
-      msgUtils.getMessage("PAGE_TITLE_PRIVATE_UDDI_CONFIG"),
-      msgUtils.getMessage("PAGE_DESC_PRIVATE_UDDI_CONFIG"),
-	  new WidgetContributorFactory()
-      {
-	    public WidgetContributor create()
-	    {
-	      return new PrivateUDDISelectionWidget();
-	    }
-	  }
-    );
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java
deleted file mode 100644
index 7e48cf0..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public interface PrivateUDDIRegistryType extends CommandWidgetBinding
-{
-  // operation types
-  public static byte OP_DEPLOY = 0x0;
-  public static byte OP_UPDATE = 0x1;
-  public static byte OP_REMOVE = 0x2;
-
-  // general information
-  public String getID();
-  public String getName();
-  public boolean isPrivateUDDIRegistryInstalled();
-  public IStatus getOperationStatus(byte operation);
-
-  // registry URLs
-  public String getInquiryAPI();
-  public String getPublishAPI();
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
deleted file mode 100644
index 79d0921..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public class PrivateUDDIRegistryTypeImpl implements org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType
-{
-    public PrivateUDDIRegistryTypeImpl() {
-    }
-
-    public boolean isPrivateUDDIRegistryInstalled() {
-        PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-        for (int i = 0; i < types.length; i++) {
-            if (types[i].isPrivateUDDIRegistryInstalled())
-                return true;
-        }
-        return false;
-    }
-
-    public String[] getPrivateUDDIRegistryInquiryAPI() {
-        Vector inquiryAPIVector = new Vector();
-        PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-        for (int i = 0; i < types.length; i++) {
-            if (types[i].isPrivateUDDIRegistryInstalled()) {
-                String inquiryAPI = types[i].getInquiryAPI();
-                if (inquiryAPI != null && inquiryAPI.startsWith("http"))
-                    inquiryAPIVector.add(inquiryAPI);
-            }
-        }
-
-        String[] inquiryAPIArray = new String[inquiryAPIVector.size()];
-        Enumeration e = inquiryAPIVector.elements();
-        int j = 0;
-        while(e.hasMoreElements()) {
-            inquiryAPIArray[j] = (String)e.nextElement();
-            j++;
-        }
-        return inquiryAPIArray;
-    }
-
-    public String[] getPrivateUDDIRegistryPublishAPI() {
-        Vector publishAPIVector = new Vector();
-        PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-        for (int i = 0; i < types.length; i++) {
-            if (types[i].isPrivateUDDIRegistryInstalled()) {
-                String publishAPI = types[i].getPublishAPI();
-                if (publishAPI != null && publishAPI.startsWith("http"))
-                    publishAPIVector.add(publishAPI);
-            }
-        }
-
-        String[] publishAPIArray = new String[publishAPIVector.size()];
-        Enumeration e = publishAPIVector.elements();
-        int j = 0;
-        while(e.hasMoreElements()) {
-            publishAPIArray[j] = (String)e.nextElement();
-            j++;
-        }
-        return publishAPIArray;
-    }
-    
-    public CommandWidgetBinding getBinding()
-    {
-      return new PrivateUDDIWidgetBinding();
-    }
-}

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 5fd441e..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import java.util.StringTokenizer;
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class PrivateUDDIRegistryTypeRegistry {
-
-    private static PrivateUDDIRegistryTypeRegistry instance_;
-    private IConfigurationElement[] configElements_;
-
-    private PrivateUDDIRegistryTypeRegistry() {
-    }
-  
-    /**
-    * Returns a singleton instance of this class.
-    * @return A singleton WebServiceClientTypeRegistry object.
-    */
-    public static PrivateUDDIRegistryTypeRegistry getInstance() {
-        if (instance_ == null) {
-            instance_ = new PrivateUDDIRegistryTypeRegistry();
-            instance_.getConfigElements();
-        }
-        return instance_;
-    }
-  
-    public IConfigurationElement[] getConfigElements() {
-        IExtensionRegistry reg = Platform.getExtensionRegistry();
-        configElements_ = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.uddiregistry",
-                                     "privateUDDIRegistryType");
-        Vector v = new Vector();
-        for (int i = 0; i < configElements_.length; i++)
-        {
-          int weight = getWeight(configElements_[i]);
-          int index = -1;
-          for (int j = v.size()-1; j >= 0; j--)
-          {
-            if (weight > getWeight((IConfigurationElement)v.get(j)))
-              index = j;
-            else
-              break;
-          }
-          if (index != -1)
-            v.add(index, configElements_[i]);
-          else
-            v.add(configElements_[i]);
-        }
-        v.copyInto(configElements_);
-        return configElements_;
-    }
-
-    private int getWeight(IConfigurationElement e)
-    {
-      try
-      {
-        return Integer.parseInt(e.getAttribute("weight"));
-      }
-      catch (NumberFormatException nfe)
-      {
-        return -1;
-      }
-    }
-
-    private IConfigurationElement getConfigElementByID(String id) {
-        for (int i = 0; i <configElements_.length; i++) {
-            if (configElements_[i].getAttribute("id").equals(id))
-                return configElements_[i];
-        }
-        return null;
-    }
-
-    public PrivateUDDIRegistryType[] getTypes() {
-        Vector types = new Vector();
-        for (int i = 0; i < configElements_.length; i++) {
-            try {
-                Object typeObj = configElements_[i].createExecutableExtension("class");
-                if (typeObj instanceof PrivateUDDIRegistryType)
-                    types.add(typeObj);
-            }
-            catch (Exception e) {}
-        }
-
-        PrivateUDDIRegistryType[] typesArray = new PrivateUDDIRegistryType[types.size()];
-        for (int j = 0; j < types.size(); j++) {
-            typesArray[j] = (PrivateUDDIRegistryType)types.elementAt(j);
-        }
-        return typesArray;
-    }
-
-    public PrivateUDDIRegistryType getTypeByID(String id) {
-        try {
-            Object typeObj = getConfigElementByID(id).createExecutableExtension("class");
-            if (typeObj instanceof PrivateUDDIRegistryType)
-                return (PrivateUDDIRegistryType)typeObj; 
-        }
-        catch (Exception e) {}
-        return null;
-    }
-
-    public String[] getSupportedServerFactoryIDByID(String id) {
-        IConfigurationElement configElement = getConfigElementByID(id);
-        if (configElement == null)
-            return new String[0];
-        Vector idVector = new Vector();
-        StringTokenizer st = new StringTokenizer(configElement.getAttribute("serverFactoryID"), ",");
-        while (st.hasMoreTokens()) {
-            idVector.add(st.nextToken());
-        }
-        String[] ids = new String[idVector.size()];
-        for (int i = 0; i < idVector.size(); i++) {
-            ids[i] = (String)idVector.elementAt(i);
-        }
-        return ids;
-    }
-
-}

diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties
deleted file mode 100644
index c4d8af3..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties
+++ /dev/null

@@ -1,55 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# PrivateUDDIConfigPage
-#
-PAGE_TITLE_PRIVATE_UDDI_CONFIG=Unit Test UDDI Registry Configuration
-PAGE_DESC_PRIVATE_UDDI_CONFIG=Configure the unit test UDDI registry.
-
-#
-# Tooltip for PrivateUDDIConfigPage
-#
-TOOLTIP_PUPR_PRIVATE_UDDI_PAGE=Deploy or remove a Unit Test UDDI Registry
-TOOLTIP_PUPR_PRIVATE_UDDI_TYPE=Choose the type of Unit Test UDDI Registry you want to deploy
-TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI=Deploy a Unit Test UDDI Registry
-TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI=Update the existing Unit Test UDDI Registry
-TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI=Remove the existing Unit Test UDDI Registry
-
-#
-# Common wizard strings.
-#
-LABEL_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry type:
-BUTTON_DEPLOY_UDDI_REGISTRY=Deploy the Unit Test UDDI Registry
-BUTTON_UPDATE_UDDI_REGISTRY=Update the previously deployed UDDI registry
-BUTTON_REMOVE_UDDI_REGISTRY=Remove the previously deployed UDDI registry
-
-#
-# Wizard page task labels and descriptions
-# (used only for progress indication).
-#
-
-#
-# Dialog messages
-#
-
-#
-# Progress messages
-#
-
-#
-# Warning messages
-#
-
-#
-# Error messages
-#
-MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE=IWAB0363E No UDDI registry available.

diff --git a/bundles/org.eclipse.jst.ws.ui/.classpath b/bundles/org.eclipse.jst.ws.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.jst.ws.ui/.cvsignore b/bundles/org.eclipse.jst.ws.ui/.cvsignore
deleted file mode 100644
index f8f79d4..0000000
--- a/bundles/org.eclipse.jst.ws.ui/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-ws-ui.jar
-@dot

diff --git a/bundles/org.eclipse.jst.ws.ui/.project b/bundles/org.eclipse.jst.ws.ui/.project
deleted file mode 100644
index 17ef9ac..0000000
--- a/bundles/org.eclipse.jst.ws.ui/.project
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.ui</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env</project>
-		<project>org.eclipse.wst.command.env.core</project>
-		<project>org.eclipse.jst.ws</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 974a078..0000000
--- a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.ui; singleton:=true
-Bundle-Version: 0.7.1
-Bundle-Activator: org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.ui.action,
- org.eclipse.jst.ws.internal.ui.common,
- org.eclipse.jst.ws.internal.ui.dialog,
- org.eclipse.jst.ws.internal.ui.plugin,
- org.eclipse.jst.ws.internal.ui.preferences,
- org.eclipse.jst.ws.internal.ui.uddi,
- org.eclipse.jst.ws.ui
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.jem.util,
- org.eclipse.wst.server.core,
- org.eclipse.jst.j2ee,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.j2ee.core
-Eclipse-AutoStart: true

diff --git a/bundles/org.eclipse.jst.ws.ui/about.html b/bundles/org.eclipse.jst.ws.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.ui/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.jst.ws.ui/build.properties b/bundles/org.eclipse.jst.ws.ui/build.properties
deleted file mode 100644
index e1dec33..0000000
--- a/bundles/org.eclipse.jst.ws.ui/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html

diff --git a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif b/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
deleted file mode 100644
index 152f4f2..0000000
--- a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.properties b/bundles/org.eclipse.jst.ws.ui/plugin.properties
deleted file mode 100644
index bf5d6cf..0000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.properties
+++ /dev/null

@@ -1,48 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-#	Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-
-#
-#  WS-I Preference pages
-#
-# WS-I Compliance Page
-#
-PREFERENCE_CATEGORY_WSI=WS-I Compliance
-
-#
-# Popup action Category
-#
-LABEL_POPUP_CATEGORY_WEB_SERVICES=Web Services
-
-#
-# Messages for popup action (Test with Web Services Explorer)
-#
-POPUP_TEST_WSDL=Test with Web Services Explorer
-
-
-
-
-
-
-

diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.xml b/bundles/org.eclipse.jst.ws.ui/plugin.xml
deleted file mode 100644
index 375662a..0000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%PLUGIN_NEW_CATEGORY_NAME_WS"
-            id="org.eclipse.jst.ws.ui.new">
-      </category>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      
-      <page
-            name="%PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage"
-            id="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage">
-      </page>
-
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.propertyPages">
-
-      
-
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.popupMenus">
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IResource"
-            adaptable="true"
-            id="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu">
-         <menu
-               label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
-               path="additions"
-               id="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu">
-            <separator
-                  name="popupActions">
-            </separator>
-         </menu>
-      </objectContribution>
-
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
-            adaptable="true"
-            id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
-         <menu
-               label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
-               path="additions"
-               id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
-            <separator
-                  name="popupActions">
-            </separator>
-         </menu>
-      </objectContribution>
-      
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
-         <action
-               label="%POPUP_TEST_WSDL"
-               class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
-               menubarPath="additions"
-               id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
-         </action>
-      </objectContribution>
-   </extension>
-   
-</plugin>

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
deleted file mode 100644
index 9597ab9..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-
-
-/**
- * This class launches the import wizard.
- */
-public class LaunchImportWizardAction implements IActionDelegate
-{
-    private IStructuredSelection selection_;
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
-    public void run(IAction action) 
-    {
-      DynamicWizard wizard = new DynamicWizard();
-      
-      try
-      {
-        wizard.setInitialData( "wsimport" );
-        wizard.init( PlatformUI.getWorkbench(), selection_ );
-      }
-      catch( CoreException exc )
-      {
-        // Do nothing.
-        return;
-      }
-      
-  	  WizardDialog dialog= new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
-	  dialog.setPageSize( 500, 400 );
-	  dialog.create();
-	  dialog.open();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-     */
-    public void selectionChanged(IAction action, ISelection selection) 
-    {
-      if( selection instanceof IStructuredSelection )
-      {
-        selection_ = (IStructuredSelection)selection;
-      }
-    }
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
deleted file mode 100644
index e8d48b7..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.action;
-import org.eclipse.core.resources.IResource;
-
-
-public interface WebServiceDeploy {
-	public void run(IResource selection); 
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
deleted file mode 100644
index a1db9cb..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-
-public class WebServiceDeployAction extends WindowActionDelegate {
-public void run(org.eclipse.jface.action.IAction action) {
-
-   IProject project = getSelectedResourceProject();
-
-   String [] typeIds = ServerUtils.getServerTypeIdsByModule(project);
-   Object theAction = null;
-
-   IExtensionRegistry reg = Platform.getExtensionRegistry();
-   IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.ui", "webservicedeploy");
-   try {
-   	
-   	if (typeIds == null || typeIds.length <= 0)
-   	{
-   	 	// that means the module is not attached to a server then pick the first extension found
-   	    theAction = elements[0].createExecutableExtension("class");
-   	}
-   	else if ( typeIds.length == 1)
-   	{
-   		// that means the module is attached to one server then finds it id and a matchin extension or give a message
-   		for (int i = 0; i < elements.length; i++)
-      	{
-		   	String id = elements[i].getAttribute("factoryId");
-    	   	if ( typeIds[0].equals(id))
-		   	{
-		   		theAction = elements[i].createExecutableExtension("class");
-		   		break;
-		   	}
-   		}
-   		if (theAction == null )
-   			{
-   				// give a message
-   			}
-   	}
-   	else
-   	{
-		// The module is attached to more than one server find the first server-extension couple
-		// TBD: add a dialog to choose the server for deployment
-		for (int i = 0; i < elements.length; i++)
-      	{
-		   	String id = elements[i].getAttribute("factoryId");
-		   	for ( int k=0; k< typeIds.length; k++)
-		   	{
-    	   		if ( typeIds[k].equals(id))
-		   		{
-		   			theAction = elements[i].createExecutableExtension("class");
-		   			break;
-		   		}
-		   	}
-		   if (theAction != null) break;
-   		 }
-		if (theAction == null) 
-			{
-				// give a Message
-			}
-   	}
-
-    if (theAction instanceof WebServiceDeploy)
-          ((WebServiceDeploy)theAction).run(project);   
-  }
-
-  catch (Exception e) {}
-} 
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
deleted file mode 100644
index 837e284..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-
-public abstract class WindowActionDelegate implements IWorkbenchWindowActionDelegate {
-protected IStructuredSelection fSelection;
-
-public WindowActionDelegate() {
-    super();
- }
-
-public void dispose() 
- {
- }
-
-public void init(org.eclipse.ui.IWorkbenchWindow window) { }
-
-public void selectionChanged(org.eclipse.jface.action.IAction action, 
-                                    org.eclipse.jface.viewers.ISelection selection) {
-   if (selection instanceof IStructuredSelection)                                 
-     fSelection = (IStructuredSelection) selection;
- }
-
-public void setSelection(IStructuredSelection selection) {
-	fSelection = selection;
-}
-public IStructuredSelection getSelection() {
-	return fSelection;
-}
-
-public IProject getSelectedResourceProject() {
- IProject project = null;
- IResource resource_ = null;
-   try {
-   		if (fSelection != null && fSelection.size() == 1)    {
-      		Object obj = fSelection.getFirstElement();
-
-      		if (obj != null)    {
-      			if ( obj instanceof IResource) 
-      				{
-      					resource_ = (IResource) obj;
-      				}
-      			else if (obj instanceof ICompilationUnit)
-      			{
-        			ICompilationUnit compUnit = (ICompilationUnit)obj;
-        			resource_= compUnit.getCorrespondingResource();
-      			}
-				else if (obj instanceof IJavaProject) {
-					project = ((IJavaProject) obj).getProject();
-				}
-
-				else if (obj instanceof EObject) {
-					project = ProjectUtilities.getProject((EObject) obj);
-				}
-
-      			if ( resource_ != null )
-   					project = resource_.getProject();
-         		
-    		}
-   		}
-   	}	
-   catch (Exception e) {}
-   return project;
- }
-
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
deleted file mode 100644
index 4545aca..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
+++ /dev/null

@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
-* This class provides a dialog for browsing workspace resources.
-*/
-public class DialogResourceBrowser extends Dialog
-{
-  private final String INFOPOP_RESOURCE_TREE = WebServiceUIPlugin.ID + ".DRES0001";
-
-  private IResource root_;
-  private IFilter[] filters_;
-  private boolean multipleSelectionEnabled_;
-  private IResource[] selection_;
-  private Tree resourceTree_;
-  private TreeViewer fileViewer_;
-
-  public DialogResourceBrowser(Shell shell, IResource root, IFilter filter)
-  {
-    this(shell, root, new IFilter[]{filter});
-  }
-
-  /**
-  * Constructs a new <code>DialogResourceBrowser</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code>
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param filters An array of java.lang.String
-  */
-  public DialogResourceBrowser(Shell shell, IResource root, IFilter[] filters)
-  {
-    super(shell);
-
-    IResource moduleRoot = root;
-    if (root instanceof IProject)
-    {
-      IProject p = (IProject)moduleRoot;
-     
-        moduleRoot = p;
-    
-    }
-
-    root_ = (moduleRoot == null) ? ResourcesPlugin.getWorkspace().getRoot() : moduleRoot;
-    filters_ = (filters == null) ? new IFilter[0] : filters;
-    multipleSelectionEnabled_ = false;
-    setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
-  }
-
-  /**
-  * Enables or disables multiple selection in the tree view.
-  * Multiple selection is disabled by default.
-  * @param multipleSelectionEnabled True to enabled or false to disable.
-  */
-  public void setMultipleSelectionEnabled(boolean multipleSelectionEnabled)
-  {
-    multipleSelectionEnabled_ = multipleSelectionEnabled;
-  }
-
-  /**
-  * Returns the selections made in the dialog if OK was pressed,
-  * or null if Cancel was pressed. Returns null if the dialog
-  * has never been opened.
-  * @return An array of selected resources, possibly empty, possibly null.
-  */
-  public IResource[] getSelection()
-  {
-    return selection_;
-  }
-
-  public IResource getFirstSelection()
-  {
-    if (selection_ != null && selection_.length > 0)
-      return selection_[0];
-    else
-      return null;
-  }
-
-   /**
-  * Called when the Cancel button is pressed.
-  * Insures that {@link #getResult} will return null.
-  */
-  protected void cancelPressed()
-  {
-    selection_ = null;
-    setReturnCode(Dialog.CANCEL);
-    super.cancelPressed();
-  }
-
-  /**
-  * Called when the OK button is pressed.
-  * Squirrels away the list of zero or more selected
-  * <code>IResource</code>s to be returned by {@link #getResult}.
-  */
-  protected void okPressed()
-  {
-    ISelection selection = fileViewer_.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-      selection_ = new IResource[structuredSelection.size()];
-      int i = 0;
-      Iterator it = structuredSelection.iterator();
-      while (it.hasNext())
-      {
-        Object object = it.next();
-        if (object instanceof IResource)
-          selection_[i++] = (IResource)object;
-      }
-    }
-    setReturnCode(Dialog.OK);
-    super.okPressed();
-  }
-
-  /**
-  * See {@link org.eclipse.jface.window.Window#configureShell}.
-  * @param shell The shell.
-  */
-  protected void configureShell(Shell shell)
-  {
-    super.configureShell(shell);
-    shell.setText(getMessage("%DIALOG_TITLE_RESOURCE_BROWSER"));
-  }
-
-  /** 
-  * Creates the dialog area.
-  * @param parent The parent composite.
-  * @return The control area.
-  */
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = (Composite)super.createDialogArea(parent);
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-    gd.widthHint = 400;
-    gd.heightHint = 300;
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(gd);
-
-    if (multipleSelectionEnabled_)
-    {
-      resourceTree_ = new Tree(composite,SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    }
-    else
-    {
-      resourceTree_ = new Tree(composite,SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    }
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    resourceTree_.setLayoutData(gd);
-    resourceTree_.setToolTipText(getMessage("%TOOLTIP_RESOURCE_TREE"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(resourceTree_, INFOPOP_RESOURCE_TREE);
-
-    fileViewer_ = new TreeViewer(resourceTree_);
-    fileViewer_.setContentProvider(new WorkbenchContentProvider());
-    fileViewer_.setLabelProvider(new DecoratingLabelProvider(new WorkbenchLabelProvider(), WebServiceUIPlugin.getInstance().getWorkbench().getDecoratorManager().getLabelDecorator()));
-    fileViewer_.addFilter(
-      new ViewerFilter()
-      {
-        public boolean select(Viewer viewer, Object parentObject, Object object)
-        {
-          if ((object instanceof IResource) && ((IResource)object).getType() != IResource.FILE)
-            return true;
-          else
-          {
-            for (int i = 0; i < filters_.length; i++)
-            {
-              if (filters_[i].accepts(object))
-                return true;
-            }
-            return false;
-          }
-        }
-      }
-    );
-    fileViewer_.setInput(root_);
-    return composite;
-  }
-
-  private String getMessage(String msgId)
-  {
-    return WebServiceUIPlugin.getMessage(msgId);
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java
deleted file mode 100644
index ed355c4..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-import org.eclipse.core.resources.IFile;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public class FileExtensionFilter implements IFilter
-{
-  private String[] extensions_;
-
-  public FileExtensionFilter(String[] extensions)
-  {
-    extensions_ = (extensions != null) ? extensions : new String[0];
-  }
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName()
-  {
-    return "org.eclipse.jst.ws.atk.ui.editor.common.FileExtensionFilter";
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription()
-  {
-    return "org.eclipse.jst.ws.atk.ui.editor.common.FileExtensionFilter";
-  }
-
-  /**
-  * Returns true if and only if this <code>Filter</code>
-  * accepts the given <code>object</code>. This method
-  * must return true if and only if {@link #statusOf}
-  * returns an <code>IStatus</code> with a severity of
-  * less than <code>IStatus.ERROR</code>.
-  * @param object The object to filter.
-  * @return True if and only if this <code>Filter</code>
-  * accepts the given <code>object</code>.
-  */
-  public boolean accepts(Object object)
-  {
-    if (object instanceof IFile)
-    {
-      IFile file = (IFile)object;
-      for (int i = 0; i < extensions_.length; i++)
-      {
-        if (file.getFileExtension() != null && file.getFileExtension().equals(extensions_[i]))
-          return true;
-      }
-    }
-    return false;
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java
deleted file mode 100644
index 2e5db8b..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public interface IFilter
-{
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName();
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription();
-
-  /**
-  * Returns true if and only if this <code>Filter</code>
-  * accepts the given <code>object</code>. This method
-  * must return true if and only if {@link #statusOf}
-  * returns an <code>IStatus</code> with a severity of
-  * less than <code>IStatus.ERROR</code>.
-  * @param object The object to filter.
-  * @return True if and only if this <code>Filter</code>
-  * accepts the given <code>object</code>.
-  */
-  public boolean accepts(Object object);
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java
deleted file mode 100644
index 3b493bd..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java
+++ /dev/null

@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.common;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-public class UIUtils 
-{
-  String       infoPopid_;
-  MessageUtils msgUtils_;
-  
-  public UIUtils( MessageUtils msgUtils, String infoPopid )
-  {
-    msgUtils_  = msgUtils;
-    infoPopid_ = infoPopid;
-  }
-  
-  public Button createRadioButton( Composite parent, String labelName, String tooltip, String infopop )
-  {
-    return createButton( SWT.RADIO, parent, labelName, tooltip, infopop );
-  }
-  
-  public Button createCheckbox( Composite parent, String labelName, String tooltip, String infopop )
-  {
-    return createButton( SWT.CHECK, parent, labelName, tooltip, infopop );
-  }
-  
-  public Button createPushButton( Composite parent, String labelName, String tooltip, String infopop )
-  {
-    return createButton( SWT.NONE, parent, labelName, tooltip, infopop );
-  }
-  
-  public Button createButton( int kind, Composite parent, String labelName, String tooltip, String infopop )
-  {
-    Button button = new Button( parent, kind );
-    
-    tooltip = tooltip == null ? labelName : tooltip;
-    button.setText( msgUtils_.getMessage( labelName ) );
-    button.setToolTipText( msgUtils_.getMessage( tooltip ) );
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( button, infoPopid_ + "." + infopop );
-    
-    return button;
-  }
-  
-  public Combo createCombo( Composite parent, String labelName, String tooltip, String infopop, int style )
-  {    
-    tooltip = tooltip == null ? labelName : tooltip;
-    
-    if( labelName != null )
-    {
-      Label label = new Label( parent, SWT.WRAP);
-      label.setText( msgUtils_.getMessage( labelName ) );
-      label.setToolTipText( msgUtils_.getMessage( tooltip ) );
-    }
-    
-    Combo combo = new Combo( parent, style );
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-     
-    combo.setLayoutData( griddata );
-    combo.setToolTipText( msgUtils_.getMessage(tooltip));
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( combo, infoPopid_ + "." + infopop );
-    
-    return combo;      
-  }
-  
-  public Text createText( Composite parent, String labelName, String tooltip, String infopop, int style )
-  {    
-    tooltip = tooltip == null ? labelName : tooltip;
-    
-    if( labelName != null )
-    {
-      Label label = new Label( parent, SWT.WRAP);
-      label.setText( msgUtils_.getMessage( labelName ) );
-      label.setToolTipText( msgUtils_.getMessage( tooltip ) );
-    }
-    
-    Text text = new Text( parent, style );
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    
-    text.setLayoutData( griddata );
-    text.setToolTipText( msgUtils_.getMessage(tooltip));
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( text, infoPopid_ + "." + infopop );
-    
-    return text;      
-  }
-  
-  public Composite createComposite( Composite parent, int columns )
-  {
-    return createComposite( parent, columns, -1, -1 );
-  }
-  
-  public Composite createComposite( Composite parent, int columns, int marginHeight, int marginWidth )
-  {
-    Composite composite = new Composite( parent, SWT.NONE );
-    
-    GridLayout gridlayout   = new GridLayout();
-    gridlayout.numColumns   = columns;
-  
-    if( marginHeight >= 0 ) gridlayout.marginHeight = marginHeight;
-    if( marginWidth >= 0 )  gridlayout.marginWidth  = marginWidth;
-    
-    composite.setLayout( gridlayout );
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    composite.setLayoutData( griddata );
-    
-    return composite;
-    
-  }
-  public Group createGroup( Composite parent, String groupName, String tooltip, String infopop )
-  {
-  	return createGroup( parent, groupName, tooltip, infopop, 1, -1, -1 );
-  }
-  
-  public Group createGroup( Composite parent, String groupName, String tooltip, String infopop, int columns, int marginHeight, int marginWidth )
-  {
-    Group      newGroup    = new Group( parent, SWT.NONE );
-    GridData   griddata    = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    GridLayout gridlayout  = new GridLayout();
-    
-    gridlayout.numColumns  = columns;
-  
-    if( marginHeight >= 0 ) gridlayout.marginHeight = marginHeight;
-    if( marginWidth >= 0 )  gridlayout.marginWidth  = marginWidth;
-        
-    tooltip = tooltip == null ? groupName : tooltip;
-    newGroup.setLayout( gridlayout );
-    newGroup.setText( msgUtils_.getMessage( groupName ) );
-    newGroup.setLayoutData( griddata );
-    newGroup.setToolTipText( msgUtils_.getMessage( tooltip ));
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp(newGroup, infoPopid_ + "." + infopop);
-    
-    return newGroup;
-  }
-  
-  public Tree createTree( Composite parent, String tooltip, String infopop, int style )
-  {
-    
-    tooltip = tooltip == null ? "" : tooltip;
-    
-    Tree tree = new Tree( parent, style );
-     
-    tree.setLayoutData( createFillAll() );
-    tree.setToolTipText( msgUtils_.getMessage(tooltip));
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( tree, infoPopid_ + "." + infopop );
-    
-    return tree;      
-    
-  }
-  
-  public Table createTable( Composite parent, String tooltip, String infopop, int style )
-  {
-    
-    tooltip = tooltip == null ? "" : tooltip;
-    
-    Table table = new Table( parent, style );
-     
-    //table.setLayoutData( createFillAll() );
-    table.setToolTipText( msgUtils_.getMessage(tooltip));
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( table, infoPopid_ + "." + infopop );
-    
-    return table;      
-    
-  }  
-  
-  public Label createHorizontalSeparator( Composite parent, int spacing )
-  {
-    Composite composite = createComposite( parent, 1, spacing, -1 );
-     
-	Label separator = new Label( composite, SWT.SEPARATOR | SWT.HORIZONTAL );
-	
-	GridData griddata  = new GridData( GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL );
-	separator.setLayoutData( griddata );
-   
-	return separator;
-  }
-  
-  public GridData createFillAll()
-  {
-	GridData data = new GridData( GridData.HORIZONTAL_ALIGN_FILL |
-			                      GridData.GRAB_HORIZONTAL |
-			                      GridData.VERTICAL_ALIGN_FILL |
-			                      GridData.GRAB_VERTICAL );
-    return data;
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
deleted file mode 100644
index 84eaf01..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
+++ /dev/null

@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.dialog;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jst.ws.internal.common.Filter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-
-/**
-* Contains utility methods for launching various common dialogs.
-*/
-public final class DialogUtils
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  /**
-  * Raises a dialog for browsing containers.
-  * @param parentShell The parent shell, optionally null.
-  * @param initialPathname The initial selection.
-  * @return The selected container or null if the dialog
-  * is cancelled, or there is no selection, or the selection
-  * is not a project or a folder.
-  */
-  public static String browseContainers ( Shell parentShell, String initialPathname )
-  {
-    String selectedPathname = null;
-    IPath initialPath = new Path(initialPathname);
-    IResource initialResource = ResourceUtils.getWorkspaceRoot().findMember(initialPath);
-    if (initialResource == null)
-    {
-      if (initialPath.segmentCount() == 1)
-      {
-        initialResource = ResourceUtils.getWorkspaceRoot().getProject(initialPath.segment(0));
-      }
-      else if (initialPath.segmentCount() > 1)
-      {
-        initialResource = ResourceUtils.getWorkspaceRoot().getFolder(initialPath);
-      }
-    }
-    else
-    {
-      if (initialResource.getType() == IResource.FILE)
-      {
-        initialResource = initialResource.getParent();
-      }
-    }
-    ContainerSelectionDialog dialog = new ContainerSelectionDialog(parentShell,(IContainer)initialResource,true,null);
-    dialog.open();
-    Object[] result = dialog.getResult();
-    if (result != null && result.length > 0)
-    {
-      if (result[0] instanceof IPath)
-      {
-        IPath path = (IPath)result[0];
-        selectedPathname = path.toString();
-      }
-    }
-    return selectedPathname;
-  }
-
-  /**
-  * Raises a dialog for browsing resources.
-  * @param parentShell The parent shell, optionally null.
-  * @param topResource The resource under which to browse.
-  * If null, all resources in the workspace are browsed.
-  * @param initialSelection The initial selection, or null for none.
-  * If the initial selection is not null and exists in the set of
-  * resources found by the browser, that resource is selected by default.
-  * @param filter The resource filter object.
-  * @return The selected resource.
-  */
-  public static IResource browseResources ( Shell parentShell, IResource topResource, IResource initialSelection, Filter filter)
-  {
-    ResourceSelectionDialog rds = new ResourceSelectionDialog(parentShell,topResource,initialSelection,filter);
-    rds.setMultipleSelectionEnabled(false);
-    if (rds.open() == Dialog.OK)
-    {
-      IResource[] resources = rds.getResult();
-      if (resources != null && resources.length > 0)
-      {
-        return resources[0];
-      }
-    }
-    return null;
-  }
-
-  /**
-  * <b>Implementation remains TBD.</b><br>
-  * Raises a dialog for browsing classes on a project's class path.
-  * @param parentShell The parent shell, optionally null.
-  * @param project The project.
-  * @return The qualified name of the selected java class.
-  */
-  public static String browseClasses ( Shell parentShell, IProject project )
-  {
-    return browseClasses(parentShell, project, (IRunnableContext)null);
-  }
-
-  public static String browseClasses ( Shell parentShell, IProject project, IWizardContainer container)
-  {
-    return browseClasses(parentShell, project, (IRunnableContext)container);
-  }
-
-  /**
-  * Raises a dialog for browsing classes on a project's class path.
-  * @param parentShell The parent shell, optionally null.
-  * @param project The project.
-  * @param container The container of the launching wizard.
-  * @return The qualified name of the selected java class.
-  */
-  public static String browseClasses ( Shell parentShell, 
-                                       IProject project, 
-                                       IRunnableContext ctxt) 
-  {
-    return browseClasses(parentShell, new IResource[] {project}, ctxt);
-  }
-  
-  public static String browseClasses(Shell parentShell, IResource[] resources, IRunnableContext ctxt)
-  {
-    IType itype = browseClassesAsIType(parentShell, resources, ctxt);
-    if (itype != null)
-      return itype.getFullyQualifiedName();
-    else
-      return null;
-  }
-  
-  public static IType browseClassesAsIType(Shell parentShell, IResource[] resources, IRunnableContext ctxt)
-  {
-	Vector javaElements = new Vector();
-	for (int i = 0; i < resources.length; i++)
-	{
-	  IJavaElement javaElement = JavaCore.create(resources[i]);
-	  if (javaElement != null)
-	    javaElements.add(javaElement);
-	}
-	IJavaElement[] elements = (IJavaElement[])javaElements.toArray(new IJavaElement[0]);
-	
-    IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
-    scope.setIncludesClasspaths(true);
-    scope.setIncludesBinaries(true);
-
-    //Creating and opening a TypeSelectionDialog
-    try
-	{
-      SelectionDialog dialog = JavaUI.createTypeDialog(parentShell, ctxt, scope, IJavaElementSearchConstants.CONSIDER_CLASSES, false);
-      dialog.setTitle(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_CLASS_BROWSE"));
-      dialog.setMessage(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_CLASS_BROWSE"));    
-      dialog.open();
-
-      //Getting the result and returning it
-      Object[] results = dialog.getResult();
-      if (results != null && results.length > 0)
-      {
-        if (results[0] instanceof IType)
-        {
-          return (IType)results[0];
-        }
-      }
-    }
-    catch (JavaModelException jme)
-	{
-    }
-    return null;
-  }
-
-  /**
-  * Raises a dialog for browsing interfaces on a project's class path.
-  * @param parentShell The parent shell, optionally null.
-  * @param project The project.
-  * @param container The container of the launching wizard.
-  * @return The qualified name of the selected java interface.
-  */
-  public static String browseInterfaces( Shell parentShell, 
-                                         IProject project, 
-                                         IWizardContainer container) 
-  									    
-  {
-    String interfaceName = null;
-
-    //Limiting search scope to the project
-    IResource[] resources = new IResource[1];
-    resources[0]=project;
-	IJavaElement[] elements = new IJavaElement[1];
-	elements[0] = JavaCore.create(resources[0]);
-    IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
-    scope.setIncludesClasspaths(true);
-    scope.setIncludesBinaries(true);
-
-    //Creating and opening a TypeSelectionDialog
-    try
-	{
-    	SelectionDialog dialog = JavaUI.createTypeDialog(parentShell, container, scope, IJavaElementSearchConstants.CONSIDER_TYPES, false);
-    	dialog.setTitle(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_INTERFACE_BROWSE"));
-    	dialog.setMessage(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_INTERFACE_BROWSE"));    
-    	dialog.open();
-
-    	//Getting the result and returning it
-    	Object[] results = dialog.getResult();
-    	if (results != null && results.length > 0)
-    	{
-    		if (results[0] instanceof IType)
-    		{
-    			IType resultInterface = (IType)results[0];
-    			interfaceName = resultInterface.getFullyQualifiedName();
-    		}
-    	}
-    }
-    catch (JavaModelException jme)
-	{
-    }
-    
-    return interfaceName;
-  } 
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
deleted file mode 100644
index 2a819c9..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
+++ /dev/null

@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.dialog;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.common.Filter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-
-/**
-* This class provides a dialog for browsing workspace resources.
-* See also {@link DialogUtils#browseResources}.
-*/
-public class ResourceSelectionDialog extends Dialog implements Listener
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  //
-  // Dialog controls.
-  //
-  private Label filterLabel_;
-  private Combo filterCombo_;
-  /*CONTEXT_ID DRES0001 for the Resource Type combo box of the Resource Selection Dialog*/
-  private static final String INFOPOP_DRES_COMBO_RESOURCE_TYPE = WebServiceUIPlugin.ID + ".DRES0001";
-  private static final String TOOLTIP_DRES_COMBO_RESOURCE_TYPE = "%TOOLTIP_DRES_COMBO_RESOURCE_TYPE";
-  //
-  private Tree resourceTree_;
-  private TreeViewer fileViewer_;
-  /*CONTEXT_ID DRES0002 for the Resource tree of the Resource Selection Dialog*/
-  private static final String INFOPOP_DRES_TREE_RESOURCE = WebServiceUIPlugin.ID + ".DRES0002";
-  private static final String TOOLTIP_DRES_TREE_RESOURCE = "%TOOLTIP_DRES_TREE_RESOURCE";
-
-  //
-  // Essential goodies.
-  //
-  private IResource root_;
-  private IResource initialSelection_;
-  private Filter[] filters_;
-  private Filter currentFilter_;
-  private IResource[] selection_;
-  private boolean multipleSelectionEnabled_;
-
-  /**
-  * Constructs a new <code>ResourceSelectionDialog</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code>.
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param initialSelection The initially selected object or null if none.
-  */
-  public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection )
-  {
-    this(parent,root,initialSelection,new Filter[] {new AnyFilter()});
-  }
-
-  /**
-  * Constructs a new <code>ResourceSelectionDialog</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code> that
-  * are accepted by the given filter.
-  * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param initialSelection The initially selected object or null if none.
-  * @param filter The {@link org.eclipse.jst.ws.internal.common.Filter},
-  * or null to default to all resources under the <code>root</code>.
-  */
-  public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter filter )
-  {
-    this(parent,root,initialSelection,new Filter[] {filter});
-  }
-
-  /**
-  * Constructs a new <code>ResourceSelectionDialog</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code> that
-  * are accepted by the given filters.
-  * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param initialSelection The initially selected object or null if none.
-  * @param filters An array of {@link org.eclipse.jst.ws.internal.common.Filter}
-  * objects.
-  * If the array is null or of length zero, then all resources are accepted
-  * (ie. equivalent to <code>ResourceSelectionDialog(parent,root)</code>.
-  * If the array is of length one, then the dialog will consist of a single
-  * control showing a list of all filtered resources.
-  * If the array is of length greater than one, then the dialog will
-  * consist of a combo box containing the names of the filters and with the
-  * first filter (ie. <code>filters[0]</code>) selected by default, followed
-  * by a control showing a list of all resources filtered by the selected filter. 
-  */
-  public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter[] filters )
-  {
-    super(parent);
-    root_ = root == null ? ResourceUtils.getWorkspaceRoot() : root;
-    initialSelection_ = initialSelection;
-    filters_ = (filters == null || filters.length == 0) ? new Filter[] {new AnyFilter()} : filters;
-    currentFilter_ = filters_[0];
-    multipleSelectionEnabled_ = false;
-    setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
-  }
-
-  /**
-  * Enables or disables multiple selection in the tree view.
-  * Multiple selection is disabled by default.
-  * @param multipleSelectionEnabled True to enabled or false to disable.
-  */
-  public void setMultipleSelectionEnabled ( boolean multipleSelectionEnabled )
-  {
-    multipleSelectionEnabled_ = multipleSelectionEnabled;
-  }
-
-  /**
-  * Returns the selections made in the dialog if OK was pressed,
-  * or null if Cancel was pressed. Returns null if the dialog
-  * has never been opened.
-  * @return An array of selected resources, possibly empty, possibly null.
-  */
-  public IResource[] getResult ()
-  {
-    return selection_;
-  }
-
-  /**
-  * Called when the Cancel button is pressed.
-  * Insures that {@link #getResult} will return null.
-  */
-  protected void cancelPressed ()
-  {
-    selection_ = null;
-    setReturnCode(Dialog.CANCEL);
-    super.cancelPressed();
-  }
-
-  /**
-  * Called when the OK button is pressed.
-  * Squirrels away the list of zero or more selected
-  * <code>IResource</code>s to be returned by {@link #getResult}.
-  */
-  protected void okPressed ()
-  {
-    ISelection selection = fileViewer_.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-      selection_ = new IResource[structuredSelection.size()];
-      int i=0;
-      Iterator iter = structuredSelection.iterator();
-      while (iter.hasNext())
-      {
-        Object object = iter.next();
-        if (object instanceof IResource)
-        {
-          selection_[i++] = (IResource)object;
-        }
-      }
-    }
-    setReturnCode(Dialog.OK);
-    super.okPressed();
-  }
-
-  /**
-  * See {@link org.eclipse.jface.window.Window#configureShell}.
-  * @param shell The shell.
-  */
-  protected void configureShell ( Shell shell )
-  {
-    super.configureShell(shell);
-    shell.setText(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_RESOURCE_BROWSE"));
-  }
-
-  /** 
-  * Creates the dialog area.
-  * @param parent The parent composite.
-  * @return The control area.
-  */
-  protected Control createDialogArea ( Composite parent )
-  {
-    GridLayout gl;
-    GridData gd;
-
-    Composite composite = (Composite)super.createDialogArea(parent);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-    gd.widthHint = 400;
-    gd.heightHint = 300;
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(gd);
-
-    if (filters_.length > 1)
-    {
-      Composite f = new Composite(composite,SWT.NONE);
-      gl = new GridLayout();
-      gl.numColumns = 2;
-      gl.marginHeight = 0;
-      gl.marginWidth = 0;
-      f.setLayout(gl);
-      gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-      f.setLayoutData(gd);
-
-      filterLabel_ = new Label(f,SWT.WRAP);
-      filterLabel_.setText(WebServiceUIPlugin.getMessage("%LABEL_RESOURCE_FILTER"));
-      filterLabel_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_COMBO_RESOURCE_TYPE));
-
-      filterCombo_ = new Combo(f,SWT.DROP_DOWN | SWT.READ_ONLY);
-      gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-      filterCombo_.setLayoutData(gd);
-      filterCombo_.addListener(SWT.Selection,this);
-      filterCombo_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_COMBO_RESOURCE_TYPE));
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(filterCombo_,INFOPOP_DRES_COMBO_RESOURCE_TYPE);
-    }
-
-    if (multipleSelectionEnabled_)
-    {
-      resourceTree_ = new Tree(composite,SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    }
-    else
-    {
-      resourceTree_ = new Tree(composite,SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    }
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    resourceTree_.setLayoutData(gd);
-//  resourceTree_.addListener(SWT.Selection,this);
-    resourceTree_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_TREE_RESOURCE));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(resourceTree_,INFOPOP_DRES_TREE_RESOURCE);
-
-    fileViewer_ = new TreeViewer(resourceTree_);
-    fileViewer_.setContentProvider(new WorkbenchContentProvider());
-    fileViewer_.setLabelProvider(
-                new DecoratingLabelProvider(
-				        new WorkbenchLabelProvider(), 
-				        WebServiceUIPlugin.getInstance().getWorkbench().getDecoratorManager().getLabelDecorator()));
-    fileViewer_.addFilter(
-      new ViewerFilter ()
-      {
-        public boolean select ( Viewer viewer, Object parentObject, Object object )
-        {
-          return
-          (
-            ((object instanceof IResource) && ((IResource)object).getType() != IResource.FILE)
-            || (ResourceSelectionDialog.this.currentFilter_.accepts(object))
-          );
-        }
-      }
-    );
-    fileViewer_.setInput(root_);
-    fileViewer_.addSelectionChangedListener(
-      new ISelectionChangedListener ()
-      {
-        public void selectionChanged ( SelectionChangedEvent event )
-        {
-//        ResourceSelectionDialog.this.validatePageToStatus();
-        }
-      }
-    );
-    if (initialSelection_ != null)
-    {
-      fileViewer_.setSelection(new StructuredSelection(ResourceSelectionDialog.this.initialSelection_),true);
-    }
-
-    return composite;
-  }
-
-  /**
-  * Called when an event occurs on the page.
-  * Handles the event and revalidates the page.
-  * @param event The event that occured.
-  */
-  public void handleEvent ( Event event )
-  {
-//  validatePageToStatus();
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
deleted file mode 100644
index 098180e..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.ui.preferences.PersistentActionDialogsContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceUIPlugin extends AbstractUIPlugin
-{
-	// Copyright
-	public static final String copyright =
-		"(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.ui";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceUIPlugin instance_;
-
-  private PersistentActionDialogsContext actionDialogsContext_;
-  
-  /**
-   * Constructs a runtime plugin object for this plugin.
-   */
-  public WebServiceUIPlugin() {
-	super();
-	instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
-  * @return The WebServiceUIPlugin singleton.
-  */
-  static public WebServiceUIPlugin getInstance() {
-    return instance_;
-  }
-
-
-  public PersistentActionDialogsContext getActionDialogsContext() 
-  	{
-  	  if (actionDialogsContext_ == null)
-  	  	{
-  	  		actionDialogsContext_ = new PersistentActionDialogsContext();
-  	  		actionDialogsContext_.load();
-  	  	}
-  	  return actionDialogsContext_;
-  	}
-		
-  /**
-  * Returns the message string identified by the given key from
-  * the plugin.properties file for the appropriate locale.
-  * @param key The message key string prefixed by a "%" symbol.
-  * That is, the string passed in must be of the form "%KEY"
-  * where the plugin.properties file contains a line of the
-  * form: "KEY = value".
-  * @return The locale-specific message.
-  */
-	public static String getMessage(String key) 
-	{
-	    MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.ui.plugin", instance_ );
-	    
-	    if( key.startsWith("%"))
-	    {
-	      key = key.substring( 1, key.length() );
-	    }
-	    
-	    return msgUtils.getMessage(key);
-    }
-
-  /**
-  * Returns the message string identified by the given key from
-  * the plugin.properties file for the appropriate locale.
-  * Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See java.text.MessageFormat for
-  * further details on substitution.
-  * @param key The message key string prefixed by a "%" symbol.
-  * That is, the string passed in must be of the form "%KEY"
-  * where the plugin.properties file contains a line of the
-  * form: "KEY = value".
-  * @param args The substitution values for the message
-  * as required by the message in plugin.properties and
-  * by the rules of class java.text.MessageFormat.
-  * @return The locale-specific message.
-  */
-	public static String getMessage(String key, Object[] args) {
-		return MessageFormat.format(getMessage(key), args);
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-	public static ImageDescriptor getImageDescriptor(String name) {
-		try {
-			URL installURL = instance_.getBundle().getEntry("/");
-			URL imageURL = new URL(installURL, name);
-			return ImageDescriptor.createFromURL(imageURL);
-		} catch (MalformedURLException e) {
-      return null;
-    }
-  }
-
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java
deleted file mode 100644
index 7e2ba9c..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-public class ActionDialogPreferenceType {
-
-    private String id_;
-	public void setId (String id) {
-		id_ = id;
-	}
-	public String getId() {
-    	return id_;
-	}
-
-	private String name_;
-	public void setName(String name) {
-		name_ = name;
-	}
-	public String getName() {
-    	return name_;
-	}
-
-	private String infopop_;
-    public void setInfopop (String infopop) {
-    	infopop_ = infopop;
-    	}
-    public String getInfopop () {
-    	return infopop_;
-    	}
-
-	private String tooltip_;
-    public void setTooltip (String tooltip) {
-    	tooltip_= tooltip;
-    	}
-    public String getTooltip () {
-    	return tooltip_;
-    	}
-
- }

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java
deleted file mode 100644
index e6a3a3f..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class ActionDialogPreferenceTypeRegistry
-{
-  private static ActionDialogPreferenceTypeRegistry instance_;
-
-  private Hashtable typesByName_;
-
-  //
-  // Loads WebServiceType objects into this registry.
-  // This is done by querying the plugin registry for all extensions
-  // hanging on the webServiceType extension point. Extensions
-  // must implement the org.eclipse.jst.ws.ui.wizard.WebServiceType
-  // interface.
-  //
-  private void loadDialogsPreferences ()
-  {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.ui",
-                                     "actionDialogPreferenceType");
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement elem = config[idx];
-      try 
-      {
-        Object actionDialogPreferenceType = elem.createExecutableExtension("class");
-        if (actionDialogPreferenceType instanceof ActionDialogPreferenceType) 
-        {
-          ActionDialogPreferenceType dialog = (ActionDialogPreferenceType) actionDialogPreferenceType;
-          dialog.setId((String)elem.getAttribute("id"));
-          dialog.setName((String)elem.getAttribute("name"));
-          dialog.setInfopop((String)elem.getAttribute("infopop"));
-          dialog.setTooltip((String)elem.getAttribute("tooltip"));
-          add(dialog);
-        }
-      } catch (CoreException e)
-      {
-      }
-    }
-  }
-
-  //
-  // Loads actionDialogPreferenceType objects into this registry.
-  // See method getInstance().
-  //
-  private void load ()
-  {
-    typesByName_ = new Hashtable();
-    loadDialogsPreferences();
-  }
-
-  //
-  // Add the given WebServiceType to this registry.
-  // See method load().
-  //
-  private void add ( ActionDialogPreferenceType dialog )
-  {
-    typesByName_.put(dialog.getId(),dialog);
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceTypeRegistry object.
-  */
-  public static ActionDialogPreferenceTypeRegistry getInstance ()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new ActionDialogPreferenceTypeRegistry();
-      instance_.load();
-    }
-    return instance_;
-  }
-
-  /**
-  * Returns all registered <code>WebServiceType</code> objects.
-  * @return All registered <code>WebServiceType</code> objects.
-  */
-  public ActionDialogPreferenceType[] getActionDialogsPrefrences ()
-  {
-    ActionDialogPreferenceType[] dialogs = new ActionDialogPreferenceType[typesByName_.size()];
-    Enumeration e = typesByName_.elements();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      dialogs[i] = (ActionDialogPreferenceType)e.nextElement();
-    }
-    return dialogs;
-  }
-
-  public ActionDialogPreferenceType getActionDialogPrefrenceTypeByName (String name)
-  {
-  	return (name == null ? null : (ActionDialogPreferenceType)typesByName_.get(name));
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java
deleted file mode 100644
index fa7bc4a..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-
-;
-
-public class ActionDialogsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener
-{
-  /*CONTEXT_ID PPAD0001 for the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_PAGE = WebServiceUIPlugin.ID + ".PPAD0001";
-  //
-  private Button showAll;
-  /*CONTEXT_ID PPAD0002 for the  show all check box on the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_BUTTON_SHOW_ALL = WebServiceUIPlugin.ID + ".PPAD0002";
-  //
-  private Button hideAll;
-  /*CONTEXT_ID PPAD0003 for the  hide all check box on the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_BUTTON_HIDE_ALL = WebServiceUIPlugin.ID + ".PPAD0003";
-
-  private Hashtable checkBoxes_;
-
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-    checkBoxes_ = new Hashtable();
-    addOptionalDialogsCheckBoxes (superparent);
-	new Label(superparent, SWT.HORIZONTAL);
-	
-	IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-	
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    parent.setLayout( layout );
-    parent.setToolTipText(getMessage("%TOOLTIP_PPAD_PAGE"));
-    helpSystem.setHelp(parent,INFOPOP_PPAD_PAGE);
-	
-    showAll = new Button(parent, SWT.NONE);
-    showAll.setText(getMessage("%BUTTON_SHOW_ALL_DIALOGS"));
-    showAll.addListener(SWT.Selection, this);
-    showAll.setToolTipText(getMessage("%TOOLTIP_PPAD_BUTTON_SHOW_ALL"));
-    helpSystem.setHelp(showAll,INFOPOP_PPAD_BUTTON_SHOW_ALL);
-   
-    hideAll = new Button(parent, SWT.NONE);
-    hideAll.setText(getMessage("%BUTTON_HIDE_ALL_DIALOGS"));
-    hideAll.addListener ( SWT.Selection, this);
-    hideAll.setToolTipText(getMessage("%TOOLTIP_PPAD_BUTTON_HIDE_ALL"));
-    helpSystem.setHelp(hideAll,INFOPOP_PPAD_BUTTON_HIDE_ALL);
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-    return parent;
-  }
-
-  private String getMessage(String key) 
-  {
-  		return WebServiceUIPlugin.getMessage(key);
-  }
-
- public void handleEvent (Event event) 
- {
-    if (showAll == event.widget)
-		handleShowAllEvent();
-    
-    else if ( hideAll == event.widget)
-    	handleHideAllEvent();
- }
-
- private void handleShowAllEvent ()
- {
-    Enumeration e = checkBoxes_.elements();
- 	for (int i=0; e.hasMoreElements(); i++)
-    	{
-    		Button dialog = (Button) e.nextElement();
-    		dialog.setSelection( true );
-    	}                      
- }
-
- private void handleHideAllEvent ()
- {
- 	Enumeration e = checkBoxes_.elements();
- 	for (int i=0; e.hasMoreElements(); i++)
-    	{
-    		Button dialog = (Button) e.nextElement();
-    		dialog.setSelection( false );
-    	}
- }
- 
- private void addOptionalDialogsCheckBoxes ( Composite parent)
-  {
-    PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
-    ActionDialogPreferenceType[] dialogs = context.getDialogs();
-    for (int i = 0; i < dialogs.length; i++) {
-    	Button checkBox = createCheckBox(parent , dialogs[i].getName());
-    	checkBox.setToolTipText(getMessage(dialogs[i].getTooltip()));
-    	PlatformUI.getWorkbench().getHelpSystem().setHelp(checkBox,dialogs[i].getInfopop());
-    	checkBoxes_.put(dialogs[i].getId(), checkBox);
-    }
-  }
-  
-  private Button createCheckBox( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.CHECK );
-    button.setText( text );
-    return button;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * The proxy information is stored in the preference store.
-   */
-  public IPreferenceStore getPreferenceStore()
-  {
-    return WebServiceUIPlugin.getInstance().getPreferenceStore();
-  }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults()
-  {
-    Enumeration e = checkBoxes_.elements();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      Button dialog = (Button) e.nextElement();
-      dialog.setSelection(true);
-    }
-  }
-
-  /**
-   * Initializes states of the controls from the preferences.
-   */
-  private void initializeValues()
-  {
-    PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
-    Enumeration e = checkBoxes_.keys();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      String id = (String) e.nextElement();
-      Button button = (Button) checkBoxes_.get(id);
-      button.setSelection(context.isActionDialogEnabled(id));
-    }
-  }
-
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-    PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
-
-    Enumeration e = checkBoxes_.keys();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      String id = (String) e.nextElement();
-      context.setActionDialogEnabled(id, ((Button)checkBoxes_.get(id)).getSelection());
-    }
-  }
-}
-

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java
deleted file mode 100644
index cabefe4..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentActionDialogsContext extends PersistentContext
-{
- private ActionDialogPreferenceType [] dialogs_;
-
-public PersistentActionDialogsContext () 
-{
-	super(  WebServiceUIPlugin.getInstance());
-}
-public void load() 
-{
-    ActionDialogPreferenceTypeRegistry reg = ActionDialogPreferenceTypeRegistry.getInstance();
-    dialogs_ = reg.getActionDialogsPrefrences();
-    for (int i = 0; i < dialogs_.length; i++) {
-    	setDefault(dialogs_[i].getId(), true);
-   }
-}
-
-public ActionDialogPreferenceType[] getDialogs()
-{
-  return dialogs_;
-}
-
-public void setActionDialogEnabled ( String id, boolean value)
-{
- 	setValue (id, value);
-}
-
-public boolean isActionDialogEnabled( String id)
-{
-     if (id == null ) 
-     	return true;
-	 return getValueAsBoolean(id);
-}
-
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java
deleted file mode 100644
index c4b0fdc..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java
+++ /dev/null

@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyDefaults;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class ProjectTopologyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
-  /*CONTEXT_ID PPSD0001 for the Project Topology Preference Page*/
-  private String INFOPOP_PTPP_PAGE = WebServiceUIPlugin.ID + ".PPTP0001";
-
-  private TableViewer clientTypeViewer_;
-  private Button moveUp_;
-  private Button moveDown_;
-  private Vector clientTypes_;
-
-  private Button twoEAR_;
-
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setToolTipText(getMessage("%TOOLTIP_PTPP_PAGE"));
-    parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PTPP_PAGE);    
-
-    Text clientTypeLabel = new Text(parent, SWT.READ_ONLY | SWT.WRAP);
-    clientTypeLabel.setText(getMessage("%LABEL_CLIENT_TYPE_NAME"));
-    clientTypeLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL));
-
-    Composite clientTypeComposite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    clientTypeComposite.setLayout(gl);
-    clientTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-
-    Table table= new Table(clientTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-    GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-    gd.widthHint = 256;
-    table.setLayoutData(gd);
-    table.setToolTipText(getMessage("%TOOLTIP_CLIENT_TYPE_TABLE_VIEWER"));
-
-    clientTypes_ = new Vector();
-    clientTypeViewer_ = new TableViewer(table);
-    clientTypeViewer_.setContentProvider(new ClientTypeContentProvider());
-    clientTypeViewer_.setLabelProvider(new ClientTypeLabelProvider());
-    clientTypeViewer_.setInput(clientTypes_);
-
-    TableLayout tableLayout = new TableLayout();
-    TableColumn tableColumn = new TableColumn(table, SWT.NONE);
-    tableColumn.setText(getMessage("%LABEL_CLIENT_TYPE"));
-    ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
-    tableLayout.addColumnData(columnData);
-    table.setLayout(tableLayout);
-
-    Composite c = new Composite(clientTypeComposite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.marginHeight = 10;
-    gl.marginWidth = 0;
-    c.setLayout(gl);
-
-    moveUp_ = new Button(c, SWT.PUSH);
-    moveUp_.setText(getMessage("%LABEL_MOVE_UP"));
-    moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveUp_.addSelectionListener(this);
-    moveUp_.setToolTipText(getMessage("%TOOLTIP_MOVE_UP"));
-
-    moveDown_ = new Button(c, SWT.PUSH);
-    moveDown_.setText(getMessage("%LABEL_MOVE_DOWN"));
-    moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveDown_.addSelectionListener(this);
-    moveDown_.setToolTipText(getMessage("%TOOLTIP_MOVE_DOWN"));
-
-    twoEAR_ = new Button(parent, SWT.CHECK | SWT.WRAP );
-    twoEAR_.setText(getMessage("%LABEL_ENABLE_TWO_EARS"));
-    twoEAR_.setToolTipText(getMessage("%TOOLTIP_ENABLE_TWO_EARS"));
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-
-    return parent;
-  }
-  
-  private String getMessage(String key) 
-  {
-      	return WebServiceUIPlugin.getMessage(key);
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * Initializes states of the controls to their burned-in defaults.
-   */
-  private void initializeDefaults()
-  {
-    clientTypes_.clear();
-    String[] types = ProjectTopologyDefaults.getClientTypes();
-    for (int i = 0; i < types.length; i++)
-      clientTypes_.add(types[i]);
-    clientTypeViewer_.refresh();
-    twoEAR_.setSelection(true);
-  }
-
-  /**
-   * Initializes states of the controls from the preference helper.
-   */
-  private void initializeValues()
-  {
-    ProjectTopologyContext context = WebServicePlugin.getInstance().getProjectTopologyContext();
-    String[] types = context.getClientTypes();
-    for (int i = 0; i < types.length; i++)
-      clientTypes_.add(types[i]);
-    // check whether we missed any types from the default list
-    boolean missed = false;
-    types = ProjectTopologyDefaults.getClientTypes();
-    for (int i = 0; i < types.length; i++)
-    {
-      if (clientTypes_.indexOf(types[i]) == -1)
-      {
-        clientTypes_.add(types[i]);
-        missed = true;
-      }
-    }
-    if (missed)
-    {
-      types = new String[clientTypes_.size()];
-      clientTypes_.copyInto(types);
-      context.setClientTypes(types);
-    }
-    // refresh viewer
-    clientTypeViewer_.refresh();
-    twoEAR_.setSelection(context.isUseTwoEARs());
-   }
-
-  /**
-   * Stores the values of the controls back to the preference helper.
-   */
-  private void storeValues()
-  {
-    ProjectTopologyContext context = WebServicePlugin.getInstance().getProjectTopologyContext();
-    String[] types = new String[clientTypes_.size()];
-    clientTypes_.copyInto(types);
-    context.setClientTypes(types);
-    context.setUseTwoEARs(twoEAR_.getSelection());
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-  }
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    int index = clientTypeViewer_.getTable().getSelectionIndex();
-    if (index != -1)
-    {
-      if (e.widget == moveUp_ && index > 0)
-      {
-        Object object = clientTypes_.remove(index);
-        clientTypes_.insertElementAt(object, index-1);
-        clientTypeViewer_.refresh();
-      }
-      else if (e.widget == moveDown_ && index < clientTypes_.size()-1)
-      {
-        Object object = clientTypes_.remove(index);
-        clientTypes_.insertElementAt(object, index+1);
-        clientTypeViewer_.refresh();
-      }
-    }
-  }
-
-  private class ClientTypeContentProvider implements IStructuredContentProvider
-  {
-    /**
-     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
-     */
-    public Object[] getElements(Object value) 
-    {
-      return ((Vector)value).toArray(new String[0]);
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-     */
-    public void dispose() 
-    {
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
-     */
-    public void inputChanged(Viewer arg0, Object arg1, Object arg2) 
-    {
-    }
-  }
-
-  private class ClientTypeLabelProvider extends LabelProvider
-  {
-    private IConfigurationElement[] configElements_;
-
-    public ClientTypeLabelProvider()
-    {
-      IExtensionRegistry reg = Platform.getExtensionRegistry();
-      configElements_ = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "clientProjectType");
-    }
-
-    private IConfigurationElement getElementByAttribute(String name, String value)
-    {
-      for (int i = 0; i < configElements_.length; i++)
-        if (configElements_[i].getAttribute(name).equals(value))
-          return configElements_[i];
-      return null;
-    }
-
-    /**
-    * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
-    */
-    public Image getImage(Object arg0) 
-    { 
-      return null;
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
-     */
-    public String getText(Object value) 
-    {
-      return getElementByAttribute("id", value.toString()).getAttribute("label"); 
-    }
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
deleted file mode 100644
index 92c17a0..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
+++ /dev/null

@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.ResourceDefaults;
-
-
-
-public class ResourceManagmentPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-  /*CONTEXT_ID PPRM0001 for the Resource Managment Preference Page*/
-  private String INFOPOP_PPRM_PAGE = WebServiceUIPlugin.ID + ".PPRM0001";
-  //
-  private Button overWriteFiles;
-  /*CONTEXT_ID PPRM0002 for the file overwrite check box on the Resource Management Preference Page*/
-  private String INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES = WebServiceUIPlugin.ID + ".PPRM0002";
-  //
-  private Button createFolders;
-  /*CONTEXT_ID PPRM0003 for the create folders check box on the Resource Management Preference Page*/
-  private String INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS = WebServiceUIPlugin.ID + ".PPRM0003";
-  //
-  private Button checkoutFiles;
-  /*CONTEXT_ID PPRM0004 for the checkout files check box on the Resource Management Preference Page*/
-  private String INFOPOP_PPRM_CHECKBOX_CHECK_OUT = WebServiceUIPlugin.ID + ".PPRM0004";
-
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-  	IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-  	
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setToolTipText(getMessage("%TOOLTIP_PPRM_PAGE"));
-    helpSystem.setHelp(parent, INFOPOP_PPRM_PAGE);
-
-    overWriteFiles = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_OVERWRITE_FILES" ));
-    overWriteFiles.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES"));
-    helpSystem.setHelp(overWriteFiles, INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES);
-
-    createFolders  = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_CREATE_FOLDERS" ));
-    createFolders.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS"));
-    helpSystem.setHelp(createFolders, INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS);
-
-    checkoutFiles = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_CHECKOUT_FILES" ));    
-    checkoutFiles.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_CHECK_OUT"));
-    helpSystem.setHelp(checkoutFiles, INFOPOP_PPRM_CHECKBOX_CHECK_OUT);
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-
-    return parent;
-  }
- 
-  private String getMessage(String key) 
-  {
-  		return WebServiceUIPlugin.getMessage(key);
-  }
-
-  private Button createCheckBox( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.CHECK );
-    button.setText( text );
-    return button;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults()
-  {
-    overWriteFiles.setSelection( ResourceDefaults.getOverwriteFilesDefault());
-    createFolders.setSelection( ResourceDefaults.getCreateFoldersDefault());
-    checkoutFiles.setSelection( ResourceDefaults.getCheckoutFilesDefault());
-  }
-
-  /**
-   * Initializes states of the controls from the preference store.
-   */
-  private void initializeValues()
-  {
-    // get the persistent context from the plugin
-    ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
-    overWriteFiles.setSelection( context.isOverwriteFilesEnabled());
-    createFolders.setSelection( context.isCreateFoldersEnabled());
-    checkoutFiles.setSelection( context.isCheckoutFilesEnabled());    
-   }
-
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-    // get the persistent context from the plugin
-    ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
-    context.setOverwriteFilesEnabled( overWriteFiles.getSelection() );
-    context.setCreateFoldersEnabled( createFolders.getSelection() );
-    context.setCheckoutFilesEnabled( checkoutFiles.getSelection() );    
-  }
-}
-

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java
deleted file mode 100644
index d08a8a7..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null

@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import java.util.Vector;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.ScenarioDefaults;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
-  
-  private TableViewer webServiceTestTypeViewer_; 
-  private Button moveUp_;
-  private Button moveDown_;
-  private Vector webServiceTestTypes_;
-  
-  /*CONTEXT_ID PPSD0001 for the Scenario Defaults Preference Page*/
-  private String INFOPOP_PPSD_PAGE = WebServiceUIPlugin.ID + ".PPSD0001";
-  //
-  private Button launchSample;
-  /*CONTEXT_ID PPSD0002 for the launch sample check box on the Scenario Defaults Preference Page*/
-  private final String INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE = WebServiceUIPlugin.ID + ".PPSD0002";
-  //
-
-  /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-    
-  	Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setToolTipText(getMessage("%TOOLTIP_PPSD_PAGE"));
-    parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PPSD_PAGE);    
-
-    launchSample = createCheckBox(parent, getMessage("%BUTTON_LAUNCH_SAMPLE"));
-    launchSample.setToolTipText(getMessage("%TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(launchSample, INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE);
-
-    
-    Text testServiceTypeLabel = new Text(parent, SWT.READ_ONLY | SWT.WRAP);
-    testServiceTypeLabel.setText(getMessage("%LABEL_SAMPLE_TYPES"));
-    testServiceTypeLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
-    Composite webServiceTestTypeComposite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    webServiceTestTypeComposite.setLayout(gl);
-    webServiceTestTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
-    Table table= new Table(webServiceTestTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-    GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-    gd.widthHint = 256;
-    table.setLayoutData(gd);
-    table.setToolTipText(getMessage("%TOOLTIP_CLIENT_TYPE_TABLE_VIEWER"));
-
-    webServiceTestTypes_ = new Vector();
-    webServiceTestTypeViewer_ = new TableViewer(table);
-    webServiceTestTypeViewer_.setContentProvider(new WebServiceTestTypeContentProvider());
-    webServiceTestTypeViewer_.setLabelProvider(new WebServiceTestTypeLabelProvider());
-    webServiceTestTypeViewer_.setInput(webServiceTestTypes_);
-
-    TableLayout tableLayout = new TableLayout();
-    TableColumn tableColumn = new TableColumn(table, SWT.NONE);
-    tableColumn.setText(getMessage("%LABEL_CLIENT_TYPE_NAME"));
-    ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
-    tableLayout.addColumnData(columnData);
-    table.setLayout(tableLayout);
-
-    Composite c = new Composite(webServiceTestTypeComposite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.marginHeight = 10;
-    gl.marginWidth = 0;
-    c.setLayout(gl);
-
-    moveUp_ = new Button(c, SWT.PUSH);
-    moveUp_.setText(getMessage("%LABEL_MOVE_UP"));
-    moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveUp_.addSelectionListener(this);
-    moveUp_.setToolTipText(getMessage("%TOOLTIP_MOVE_UP"));
-
-    moveDown_ = new Button(c, SWT.PUSH);
-    moveDown_.setText(getMessage("%LABEL_MOVE_DOWN"));
-    moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveDown_.addSelectionListener(this);
-    moveDown_.setToolTipText(getMessage("%TOOLTIP_MOVE_DOWN"));
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-
-    return parent;
-  }
-
-  private String getMessage(String key) 
-  {
-      	return WebServiceUIPlugin.getMessage(key);
-  }
- 
-  private Button createCheckBox( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.CHECK );
-    button.setText( text );
-    return button;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    try{
-      storeValues();
-    }catch (Exception exc){
-    	exc.printStackTrace();}
-    return true;
-  }
-
-  protected void performApply()
-  {
-    try{
-  	performOk();
-    }catch(NullPointerException exc){
-      exc.printStackTrace();
-    }
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * Initializes states of the controls to their burned-in defaults.
-   */
-  private void initializeDefaults()
-  {
-    ScenarioDefaults defaults = new ScenarioDefaults();
-    //pgm launchSample.setSelection( defaults.getLaunchSampleDefault());
-    
-    webServiceTestTypes_.clear();
-    String[] types = defaults.getWebServiceTestTypes();
-    for (int i = 0; i < types.length; i++)
-      webServiceTestTypes_.add(types[i]);
-    webServiceTestTypeViewer_.refresh();
-  }
-
-  /**
-   * Initializes states of the controls from the preference helper.
-   */
-  private void initializeValues()
-  {
-  	ScenarioContext  context  = WebServicePlugin.getInstance().getScenarioContext();
-    ScenarioDefaults defaults = new ScenarioDefaults();
-    //pgm launchSample.setSelection( context.isLaunchSampleEnabled());
-        
-    String[] types = context.getWebServiceTestTypes();
-    for (int i = 0; i < types.length; i++)
-      webServiceTestTypes_.add(types[i]);
-    // check whether we missed any types from the default list
-    boolean missed = false;
-    types = defaults.getWebServiceTestTypes();
-    for (int i = 0; i < types.length; i++)
-    {
-      if (webServiceTestTypes_.indexOf(types[i]) == -1)
-      {
-        webServiceTestTypes_.add(types[i]);
-        missed = true;
-      }
-    }
-    if (missed)
-    {
-      types = new String[webServiceTestTypes_.size()];
-      webServiceTestTypes_.copyInto(types);
-      context.setWebServiceTestTypes(types);
-    }
-    // refresh viewer
-    webServiceTestTypeViewer_.refresh();
-   }
-
-  /**
-   * Stores the values of the controls back to the preference helper.
-   */
-  private void storeValues()
-  {
-    ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-    String[] types = new String[webServiceTestTypes_.size()];
-    webServiceTestTypes_.copyInto(types);
-    context.setWebServiceTestTypes(types);
-    
-    //pgm context.setLaunchSampleEnabled(launchSample.getSelection());
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-  }
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    int index = webServiceTestTypeViewer_.getTable().getSelectionIndex();
-    if (index != -1)
-    {
-      if (e.widget == moveUp_ && index > 0)
-      {
-        Object object = webServiceTestTypes_.remove(index);
-        webServiceTestTypes_.insertElementAt(object, index-1);
-        webServiceTestTypeViewer_.refresh();
-      }
-      else if (e.widget == moveDown_ && index < webServiceTestTypes_.size()-1)
-      {
-        Object object = webServiceTestTypes_.remove(index);
-        webServiceTestTypes_.insertElementAt(object, index+1);
-        webServiceTestTypeViewer_.refresh();
-      }
-    }
-  }
-
-  private class WebServiceTestTypeContentProvider implements IStructuredContentProvider
-  {
-    /**
-     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
-     */
-    public Object[] getElements(Object value) 
-    {
-      return ((Vector)value).toArray(new String[0]);
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-     */
-    public void dispose() 
-    {
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
-     */
-    public void inputChanged(Viewer arg0, Object arg1, Object arg2) 
-    {
-    }
-  }
-
-  private class WebServiceTestTypeLabelProvider extends LabelProvider
-  {
-    public WebServiceTestTypeLabelProvider()
-    {
-    }
-
-    /**
-    * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
-    */
-    public Image getImage(Object arg0) 
-    { 
-      return null;
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
-     */
-    public String getText(Object value) 
-    {
-      //return getElementByAttribute("id", value.toString()).getAttribute("label"); 
-      return value.toString();
-    }
-  }
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
deleted file mode 100644
index e37abc3..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.uddi;
-
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-public interface PrivateUDDIRegistryType
-{
-    public boolean isPrivateUDDIRegistryInstalled();
-    public String[] getPrivateUDDIRegistryInquiryAPI();
-    public String[] getPrivateUDDIRegistryPublishAPI();
-    public CommandWidgetBinding getBinding();
-}

diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties
deleted file mode 100644
index 76e4e9a..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties
+++ /dev/null

@@ -1,143 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_VENDOR=International Business Machines Corp.
-PLUGIN_DESC=\
-The Web services GUI plugin delivers the graphical \
-user interface to the Web services function of the \
-Web services plugin.
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-#	Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-PREFERENCE_CATEGORY_CODE_GENERATION=Code Generation
-PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults
-PREFERENCE_CATEGORY_PROJECT_TOPOLOGY=Project Topology
-PREFERENCE_CATEGORY_DRIVER_JARS=JDBC drivers
-
-
-#
-#Scenario Defaults
-BUTTON_LAUNCH_SAMPLE=Launch the sample when generated
-LABEL_UDDI_CAT_DATA_COLUMN_DELIM=User defined UDDI Category data column delimiter:
-LABEL_UDDI_CAT_DATA_STRING_DELIM=User defined UDDI Category data string delimiter:
-MSG_ERROR_COLUMN_STRING_DELIMS_IDENTICAL=IWAB0481E UDDI column and string delimiters must not be identical.
-LABEL_MOVE_UP=Move up
-LABEL_MOVE_DOWN=Move down
-
-#
-# Preferences Tooltips
-#
-
-#Scenario Defaults
-TOOLTIP_PPSD_PAGE=Set the defaults for the Web service scenarios.
-TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE=Launch the sample application after generation.
-TOOLTIP_PPSD_COMBO_SAMPLE_GEN=Select the type of sample JSP to be generated.
-TOOLTIP_PPSD_COMBO_EXPLORER=Select the type of the Web services explorer to be used.
-TOOLTIP_PPSD_UDDI_CAT_DATA_COLUMN_DELIM=column delimiter for user defined UDDI category data
-TOOLTIP_PPSD_UDDI_CAT_DATA_STRING_DELIM=string delimiter for user defined UDDI category data
-TOOLTIP_CLIENT_TYPE_TABLE_VIEWER=Preferred order of the list of client types
-TOOLTIP_MOVE_UP=Move the selected client type up the list
-TOOLTIP_MOVE_DOWN=Move the selected client type down the list
-
-#
-# Resource Managment
-TOOLTIP_PPRM_PAGE=Set preferences that control resources used/generated by the Web service.
-TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES=Overwrite files without warning.
-TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS=Create folders when necessary.
-TOOLTIP_PPRM_CHECKBOX_CHECK_OUT=Check out files without warning.
-BUTTON_CREATE_FOLDERS=Create folders when necessary
-BUTTON_OVERWRITE_FILES=Overwrite files without warning
-BUTTON_CHECKOUT_FILES=Check out files without warning
-
-#
-# General messages.
-#
-ISTATUS_WITHOUT_EXCEPTION={0}
-ISTATUS_WITH_EXCEPTION={0}\nException: {1}
-MSG_INFO_SAVED_STATUS=IWAB0297I Press the Details button to see informational messages.
-
-#
-# TypeSelectionDialog
-#
-DIALOG_TITLE_CLASS_BROWSE=Browse Classes
-DIALOG_TITLE_INTERFACE_BROWSE=Browse Interfaces
-
-#
-# Common wizard strings.
-#
-LABEL_WSEXPLORER_TYPES=Web Services Explorer
-LABEL_SAMPLE_TYPES=Java proxy sample
-
-#
-# ResourceSelectionDialog
-#
-DIALOG_TITLE_RESOURCE_BROWSE=Browse Files
-LABEL_RESOURCE_FILTER=Filter:
-
-#
-# Tooltips for dialog.ResourceSelectionDialog
-# DRES=Dialog/RESources
-#
-TOOLTIP_DRES_COMBO_RESOURCE_TYPE=Type of resources to browse.
-TOOLTIP_DRES_TREE_RESOURCE=Resources available for selection.
-
-
-
-#
-# HTTP Basic Authentication
-#
-PREFERENCE_CATEGORY_HTTP_BASIC_AUTH=HTTP Basic Auth
-CHECKBOX_PREFERENCE_ENABLE_HTTP_BASIC_AUTH=Enable HTTP basic authentication
-LABEL_PREFERENCE_HTTP_BASIC_AUTH_USERNAME=HTTP basic auth user name:
-LABEL_PREFERENCE_HTTP_BASIC_AUTH_PASSWORD=HTTP basic auth password:
-
-TOOLTIP_ENABLE_HTTP_BASIC_AUTH=Specify HTTP basic authentication setting for Web services toolings.
-TOOLTIP_HTTP_BASIC_AUTH_USERNAME=User name for HTTP basic authentication.
-TOOLTIP_HTTP_BASIC_AUTH_PASSWORD=Password for HTTP basic authentication.
-
-
-#
-# Messages for project topology preference page
-#
-TOOLTIP_PTPP_PAGE=Preference that control the project topology of your Web service and client scenarios.
-TOOLTIP_ENABLE_TWO_EARS=Enable this option if you want to generate your Web service and Web service client in different EAR projects.
-
-LABEL_ENABLE_TWO_EARS=Generate Web service and Web service client in different EAR projects
-LABEL_CLIENT_TYPE_NAME=Client type:
-
-
-#
-#	ActionDialogs Page
-#
-PREFERENCE_CATEGORY_DIALOGS=Dialogs
-
-#
-# Resource Browser
-#
-DIALOG_TITLE_RESOURCE_BROWSER=Resource browser
-TOOLTIP_RESOURCE_TREE=Choose a resource.
-
-
-
-
-
-
-
-

diff --git a/bundles/org.eclipse.wst.command.env.core/.classpath b/bundles/org.eclipse.wst.command.env.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/bundles/org.eclipse.wst.command.env.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.wst.command.env.core/.cvsignore b/bundles/org.eclipse.wst.command.env.core/.cvsignore
deleted file mode 100644
index 34439a3..0000000
--- a/bundles/org.eclipse.wst.command.env.core/.cvsignore
+++ /dev/null

@@ -1,6 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-envcore.jar
-@dot

diff --git a/bundles/org.eclipse.wst.command.env.core/.project b/bundles/org.eclipse.wst.command.env.core/.project
deleted file mode 100644
index 6327dea..0000000
--- a/bundles/org.eclipse.wst.command.env.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.command.env.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 4ac6e7f..0000000
--- a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env.core
-Bundle-Version: 0.7.0
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.internal.env.core.data,
- org.eclipse.wst.command.internal.env.core.fragment,
- org.eclipse.wst.command.internal.env.core.registry,
- org.eclipse.wst.command.internal.env.core,
- org.eclipse.wst.command.internal.env.core.common,
- org.eclipse.wst.command.internal.env.core.context,
- org.eclipse.wst.command.internal.env.core.selection,
- org.eclipse.wst.command.internal.env.core.uri
-Require-Bundle: org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.environment

diff --git a/bundles/org.eclipse.wst.command.env.core/about.html b/bundles/org.eclipse.wst.command.env.core/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.command.env.core/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.command.env.core/build.properties b/bundles/org.eclipse.wst.command.env.core/build.properties
deleted file mode 100644
index 443347a..0000000
--- a/bundles/org.eclipse.wst.command.env.core/build.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html
-src.includes = component.xml
-source.. = src/
-output.. = bin/
-

diff --git a/bundles/org.eclipse.wst.command.env.core/component.xml b/bundles/org.eclipse.wst.command.env.core/component.xml
deleted file mode 100644
index 7c458f7..0000000
--- a/bundles/org.eclipse.wst.command.env.core/component.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.command">
-   <component-depends unrestricted="true">
-   </component-depends>
-   <plugin id="org.eclipse.wst.command.env" fragment="false"/>
-   <plugin id="org.eclipse.wst.command.env.core" fragment="false"/>
-   <plugin id="org.eclipse.wst.command.env.ui" fragment="false"/>
-</component>

diff --git a/bundles/org.eclipse.wst.command.env.core/plugin.properties b/bundles/org.eclipse.wst.command.env.core/plugin.properties
deleted file mode 100644
index c71709d..0000000
--- a/bundles/org.eclipse.wst.command.env.core/plugin.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Environment Command Framework (core)
-PLUGIN_PROVIDER=Eclipse.org

diff --git a/bundles/org.eclipse.wst.command.env.core/plugin.xml b/bundles/org.eclipse.wst.command.env.core/plugin.xml
deleted file mode 100644
index 80f279f..0000000
--- a/bundles/org.eclipse.wst.command.env.core/plugin.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   
-</plugin>

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/environment.properties b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/environment.properties
deleted file mode 100644
index b1d7769..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/environment.properties
+++ /dev/null

@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages for SimpleURIFactory
-#
-MSG_NULL_ARG_SPECIFIED=Null specified as argument to {0}.
-MSG_SCHEME_NOT_FOUND=Scheme not found for URI {0}.
-MSG_ABSOLUTE_PATH_WITHOUT_SCHEME=Absolute path specified without a scheme for URI {0}.
-
-#
-# Common Messages
-#
-MSG_URI_NOT_RELATIVE=URL: {0} is not relative.
-MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occured.
-

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java
deleted file mode 100644
index 0957e6d..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * This interface is used to create Command objects.
- *
- */
-public interface CommandFactory 
-{
-  /**
-   * 
-   * @return returns a created Command object.
-   */
-  public AbstractDataModelOperation create();
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java
deleted file mode 100644
index 19da219..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-/**
- * CommandManagers help manage the lifecycle of Commands.
- */
-public interface CommandManager
-{
-  /**
-   * Returns true if this CommandManager is capable of undoing
-   * Commands. Some CommandManagers and Environments may be of
-   * a sort that will never undo() Commands. Command.execute()
-   * methods should take advantage of this method to optimize
-   * out any caching logic whenever this method returns false.
-   */
-  public boolean isUndoEnabled ();
-
-  // There's probably more, like factory methods for creating
-  // Undo/Redo stacks and stuff like that.
-  
-  public DataMappingRegistry getMappingRegistry();
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java
deleted file mode 100644
index 182a28b..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core;
-
-import java.util.Iterator;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * 
- * This class is used to return a sequence of Commands.
- *
- */
-public interface ICommandFactory extends Iterator 
-{
-  /**
-   * 
-   * @return returns the next Command in the sequence.
-   */
-  public AbstractDataModelOperation getNextCommand();
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java
deleted file mode 100644
index 75fdc4a..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core;
-
-import java.util.Vector;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class SimpleCommandFactory implements ICommandFactory 
-{
-    private Vector commands_;
-	private int    index_;
-	
-	public SimpleCommandFactory( Vector commands )
-	{
-	  commands_ = commands;
-	  index_    = 0;
-	}
-	
-	public AbstractDataModelOperation getNextCommand() 
-	{
-		return (AbstractDataModelOperation)next();
-	}
-
-	public void remove() 
-	{
-      throw new UnsupportedOperationException();
-	}
-
-	public boolean hasNext() 
-	{
-		return index_ < commands_.size();
-	}
-
-	public Object next() 
-	{
-		return commands_.elementAt(index_++);
-	}
-
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java
deleted file mode 100644
index 6d5b180..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-/**
- * This interface defines a boolean condition that can be evaluated for any object.
- */
-public interface Condition
-{
-  /**
-   * This returns whether the given object passes this condition.
-   */
-  public boolean evaluate();
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java
deleted file mode 100644
index 0dcb74e..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-/**
-  * This interface can be used when a conditional object needs to be returned.
-**/
-public interface Evaluate
-{
-  /**
-    * @return returns an object based on some evaluated condition.
-  **/
-  public Object evaluate();
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java
deleted file mode 100644
index aa7bb59..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import java.text.MessageFormat;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-/**
- * This class provides a convienent way to access resource bundles and
- * retieve translated strings.
- *
- *
- */
-public class MessageUtils
-{
-  private ResourceBundle resource_;
-  
-  private static Hashtable bundles_ = new Hashtable();
-  
-  /**
-   * 
-   * @param bundleId the resource bundle ID.
-   * @param object the class loader for this object will be used to retrieve
-   *               the resource bundle.
-   */
-  public MessageUtils( String bundleId, Object object )
-  {
-    this( bundleId, object.getClass().getClassLoader() );
-  }
-  
-  /**
-   * 
-   * @param bundleId the resource bundle ID.
-   * @param loader the class loader that will be used to retrieve
-   *               the resource bundle.
-   */
-  public MessageUtils( String bundleId, ClassLoader loader )
-  {
-    resource_ = (ResourceBundle)bundles_.get( bundleId );
-    
-    if( resource_ == null )
-    {
-      resource_ = ResourceBundle.getBundle( bundleId, Locale.getDefault(), loader );
-      bundles_.put( bundleId, resource_ );
-    }
-  }
-  
-  /**
-   * 
-   * @param key the key for the string to retrieve.
-   * @return returns the translated string.
-   */
-  public String getMessage ( String key )
-  {
-    String value = key;
-    
-    try
-    {
-      value = resource_.getString( key ); 
-    }
-    catch( Throwable exc )
-    {
-    }
-    
-    return value;
-  }
-  
-  /**
-   * 
-   * @param key the key for the string to retrieve.
-   * @param args These arguments will be substituted into the translated string.
-   * @return returns the translated string with any substitutions.
-   */
-  public String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format( getMessage(key),args );
-  } 
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java
deleted file mode 100644
index 4028caa..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public class ProgressUtils
-{
-  static public void report( IProgressMonitor monitor, String message )
-  {
-    if( monitor != null ) 
-    {
-       monitor.beginTask( message, IProgressMonitor.UNKNOWN );
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java
deleted file mode 100644
index 2e98b4b..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import org.eclipse.wst.common.environment.uri.IURI;
-
-/**
- * Carries position information within a resource.
- */
-public interface Range
-{
-  public static final int UNKNOWN = -1;
-
-  /**
-   * Returns the identifier of the resource the range applies to.
-   */
-  public IURI getURI ();
-
-  /**
-   * Returns the index, zero-indexed, of the first line
-   * of the range.
-   */
-  public int getStartingLineNumber ();
-
-  /**
-   * Returns the index, zero-indexed, of the first character
-   * of the range relative to the beginning of the line.
-   */
-  public int getStartingCharNumberInLine ();
-
-  /**
-   * Returns the index, zero-indexed, of the first character
-   * of the range relative to the beginning of the file.
-   */
-  public int getStartingCharNumberInURI ();
-
-  /**
-   * Returns the index, zero-indexed, of the last line
-   * of the range.
-   */
-  public int getEndingLineNumber ();
-
-  /**
-   * Returns the offset, zero-indexed, of the last character
-   * of the range relative to the beginning of the line.
-   */
-  public int getEndingCharNumberInLine ();
-
-  /**
-   * Returns the index, zero-indexed, of the last character
-   * of the range relative to the beginning of the file.
-   */
-  public int getEndingCharNumberInURI ();
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java
deleted file mode 100644
index 3f86edf..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import java.util.Vector;
-
-/**
- * This Vector makes the protected method removeRange public.
- *
- */
-public class RangeVector extends Vector
-{
-  /**
-   * Comment for <code>serialVersionUID</code>
-   */
-  private static final long serialVersionUID = 4048793476659230773L;
-
-  public void removeRange( int start, int end )
-  {
-    super.removeRange( start, end );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java
deleted file mode 100644
index a03a572..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-public class StatusUtils
-{
-  public static IStatus errorStatus( String errorMessage )
-  {
-    return new Status( IStatus.ERROR, "id", 0, errorMessage, null );
-  }
-  
-  public static IStatus errorStatus( Throwable exc )
-  {
-    String message = exc.getMessage();
-    
-    return new Status( IStatus.ERROR, "id", 0, message == null ? "" : message, exc );
-  }
-  
-  public static IStatus errorStatus( String message, Throwable exc )
-  {
-    return new Status( IStatus.ERROR, "id", 0, message, exc );
-  }
-  
-  public static MultiStatus multiStatus( String message, IStatus[] children, Throwable exc )
-  {
-    return new MultiStatus( "id", 0, children, message, exc );  
-  }
-  
-  public static MultiStatus multiStatus( String message, IStatus[] children )
-  {
-    return new MultiStatus( "id", 0, children, message, null );  
-  }
-  
-  public static IStatus warningStatus( String warningMessage )
-  {
-    return new Status( IStatus.WARNING, "id", 0, warningMessage, null );
-  }
-  
-  public static IStatus warningStatus( String warningMessage, Throwable exc )
-  {
-    return new Status( IStatus.WARNING, "id", 0, warningMessage, exc );
-  }
-  
-  public static IStatus infoStatus( String infoMessage )
-  {
-    return new Status( IStatus.INFO, "id", 0, infoMessage, null );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java
deleted file mode 100644
index d38351b..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-/**
- * This interface provides a way to get and set preference information.
- *
- */
-public interface Context 
-{
- /**
-  * Loads the preference data into this Context object.
-  *
-  */
- public void load();
-
- /**
-  * Sets the default for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, boolean value); 
- 
- /**
-  * Sets the default for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, String value);
- 
- /**
-  * Sets the default for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, int value); 
-
- /**
-  * Sets the value for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, String value);
- 
- /**
-  * Sets the value for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, boolean value);
- 
- /**
-  * Sets the value for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, int value);   
-
- /**
-  * Gets the value for a string preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public String getValueAsString ( String name);
- 
- /**
-  * Gets the value for a boolean preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public boolean getValueAsBoolean ( String name);
- 
- /**
-  * Gets the value for a int preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public int getValueAsInt ( String name);  		
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java
deleted file mode 100644
index b36ecc2..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-public interface ResourceContext 
-{
- /**
-   * This constant string is used to lookup the overwrite files general preference from
-   * the plugins local preferences store.
- **/
- public static final String PREFERENCE_OVERWRITE = "filesOverwrite";
-
- /**
-   * This constant string is used to lookup the create folders general preference from
-   * the plugins local preferences store.
- **/
- public static final String PREFERENCE_CREATE_FOLDERS = "createFolders";
- 
- /**
-   * This constant string is used to lookup the checkout files general preference from
-   * the plugins local preferences store.
- **/
- public static final String PREFERENCE_CHECKOUT = "filesCheckout";
-
- /**
-  * 
-  * @param enable set whether overwriting of files is enabled.
-  */
- public void setOverwriteFilesEnabled ( boolean enable);
- 
- /**
-  * 
-  * @return returns whether overwriting of files is enabled.
-  */
- public boolean isOverwriteFilesEnabled();
- 
- /**
-  * 
-  * @param enable set whether creation of folders is enabled.
-  */
- public void setCreateFoldersEnabled( boolean enable);
- 
- /**
-  * 
-  * @return returns whether creation of folders is enabled.
-  */
- public boolean isCreateFoldersEnabled(); 
- 
- /**
-  * 
-  * @param enable sets whether automatic checkout of files is enabled.
-  */
- public void setCheckoutFilesEnabled( boolean enable);
- 
- /**
-  * 
-  * @return returns whether automatic checkout of files is enabled.
-  */
- public boolean isCheckoutFilesEnabled();
- 
- /**
-  * 
-  * @return returns a copy of this ResourceContext.
-  */
- public ResourceContext copy();
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java
deleted file mode 100644
index dad8026..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-public class ResourceDefaults
-{
- private static final boolean PREFERENCE_OVERWRITE_DEFAULT = false;
- private static final boolean PREFERENCE_CREATE_FOLDERS_DEFAULT = true;
- private static final boolean PREFERENCE_CHECKOUT_DEFAULT = false;
-
- /**
-  * 
-  * @return returns the default setting for overwriting files.
-  */
- public static boolean getOverwriteFilesDefault ()
- {
- 	return PREFERENCE_OVERWRITE_DEFAULT;
- }
- 
- /**
-  * 
-  * @return returns the default setting ofr creating folders.
-  */
- public static boolean getCreateFoldersDefault ()
- { 
-	return PREFERENCE_CREATE_FOLDERS_DEFAULT;
- }
-
- /**
-  * 
-  * @return returns the default setting for checking out files.
-  */
- public static boolean getCheckoutFilesDefault()
- {
-	return PREFERENCE_CHECKOUT_DEFAULT;
- }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java
deleted file mode 100644
index 1dffa02..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-/**
- * This class implements a ResourceContext interface where the state
- * of the context data is transient.
- *
- */
-public class TransientResourceContext implements ResourceContext 
-{
-  private boolean overWriteFiles;
-  private boolean createFolders;
-  private boolean checkOutFiles;
-
-  public TransientResourceContext() {
-    setOverwriteFilesEnabled(ResourceDefaults.getOverwriteFilesDefault());
-    setCreateFoldersEnabled(ResourceDefaults.getCreateFoldersDefault());
-    setCheckoutFilesEnabled(ResourceDefaults.getCheckoutFilesDefault());
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setOverwriteFilesEnabled(boolean)
-   */
-  public void setOverwriteFilesEnabled(boolean enable) {
-    overWriteFiles = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isOverwriteFilesEnabled()
-   */
-  public boolean isOverwriteFilesEnabled() {
-    return overWriteFiles;
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setCreateFoldersEnabled(boolean)
-   */
-  public void setCreateFoldersEnabled(boolean enable) {
-    createFolders = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isCreateFoldersEnabled()
-   */
-  public boolean isCreateFoldersEnabled() {
-    return createFolders;
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setCheckoutFilesEnabled(boolean)
-   */
-  public void setCheckoutFilesEnabled(boolean enable) {
-    checkOutFiles = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isCheckoutFilesEnabled()
-   */
-  public boolean isCheckoutFilesEnabled() {
-    return checkOutFiles;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#copy()
-   */
-  public ResourceContext copy() {
-    ResourceContext cc = new TransientResourceContext();
-    cc.setOverwriteFilesEnabled(isOverwriteFilesEnabled());
-    cc.setCreateFoldersEnabled(isCreateFoldersEnabled());
-    cc.setCheckoutFilesEnabled(isCheckoutFilesEnabled());
-    return cc;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/ClassEntry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/ClassEntry.java
deleted file mode 100644
index 0d08d10..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/ClassEntry.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core.data;
-
-import java.util.Vector;
-
-public class ClassEntry
-{
-  public Object lastObject_;
-  public Vector getterList_;
-  public Vector setterList_;
-  public int    order_;
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java
deleted file mode 100644
index 30ce90f..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java
+++ /dev/null

@@ -1,272 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-
-
-public class DataFlowManager 
-{
-  private DataMappingRegistryImpl registry_;
-  private Hashtable               classTable_;
-  private int                     order_;
-  private IEnvironment				environment_;
-  
-  public DataFlowManager( DataMappingRegistryImpl registry, IEnvironment environment )
-  {
-    registry_   = registry;
-    classTable_ = new Hashtable();
-    order_      = 0;
-    environment_ = environment;
-  }
-  
-  public DataMappingRegistry getMappingRegistry()
-  {
-    return registry_; 
-  }
-  
-  public void process( Object object )
-  {
-    // Add this object to the classTable_ if required.
-    String     objectType = object.getClass().getName();
-    ClassEntry classEntry = (ClassEntry)classTable_.get( objectType );
-	
-    environment_.getLog().log(ILog.INFO, "data", 5004, this, "process", "Processing: " + objectType );
-    
-    if( classEntry == null )
-    {
-      classEntry = new ClassEntry();
-      classTable_.put( objectType, classEntry );
-    }
-    
-    classEntry.lastObject_ = object;
-    classEntry.order_      = order_++;
-    
-    // Now process the setters for this object
-    Vector ruleEntries  = registry_.getRuleEntries( objectType );
-    
-    if( ruleEntries != null )
-    {
-      if( classEntry.setterList_ == null )
-      {
-        classEntry.setterList_ = getSetterList( object );  
-      }    
-      
-      // For each setter in this object try to find a rule.
-      for( int setterIndex = 0; setterIndex < classEntry.setterList_.size(); setterIndex++ )
-      {
-        ObjectMethod currentObjectMethod = new ObjectMethod();
-        Method       setterMethod        = (Method)classEntry.setterList_.elementAt( setterIndex );
-        RuleEntry    currentRuleEntry    = null;
-
-        currentObjectMethod.order = -1;
-        
-        // Find rules that match this setter.  Note: there can be more than one rule
-        // that matches this setter.  In this case we use the most recent, which is 
-        // defined by the order field.
-        for( int index = 0; index < ruleEntries.size(); index++ )
-        {
-          RuleEntry ruleEntry = (RuleEntry)ruleEntries.elementAt( index );       
-          
-          if( setterMethod.getName().equals( "set" + ruleEntry.targetProperty_ ) )
-          {
-            // We found a setter for this rule.  Now find the getter method.
-            // Note: getGetterMethod always returns a value, but if there is no
-            //       getters available it will set the order to -1.
-            ObjectMethod getter = getGetterMethod( ruleEntry.sourceType_, ruleEntry.sourceProperty_ );
-            
-            if( getter.order == -1 )
-            {
-            	environment_.getLog().log(ILog.INFO , "data", 5005, this, "process", "  >>No getter found for property: " + setterMethod.getName());
-            }
-            
-            if( currentObjectMethod.order < getter.order ) 
-            {
-              // We found a more recent getter.
-              currentObjectMethod = getter;
-              currentRuleEntry = ruleEntry;
-            }
-          }
-        } 
-        
-        if( currentObjectMethod.order != -1 )
-        {
-          invokeMethod( currentObjectMethod.object, 
-                        currentObjectMethod.method, 
-                        object, 
-                        setterMethod, 
-                        currentRuleEntry.transformer_ );
-        }
-        else
-        {
-        	environment_.getLog().log(ILog.INFO, "data", 5006, this, "process", "  >>No rule found for setter: " + setterMethod.getName() );
-        }
-      }
-    }   
-  }
-  
-  /**
-   * Find all the setters for this object and return a vector of them.
-   * 
-   * @param object
-   * @return
-   */
-  private Vector getSetterList( Object object )
-  {
-    Vector result = new Vector();
-    
-    Method[] methods = object.getClass().getMethods();
-    
-    for( int index = 0; index < methods.length; index++ )
-    {
-      Method  method     = methods[index];
-      boolean isPublic   = Modifier.isPublic( method.getModifiers() );
-      Class   returnType = method.getReturnType();
-    
-      if( isPublic && 
-          returnType == Void.TYPE && 
-          method.getParameterTypes().length == 1 &&
-          method.getName().startsWith( "set" ))
-      {
-        method.setAccessible( true );
-        result.add( method );
-      }
-    }
-    
-    return result;
-  }
-  
-  private ObjectMethod getGetterMethod( String sourceType, String sourceProperty )
-  {
-    ClassEntry   classEntry = (ClassEntry)classTable_.get( sourceType );
-    ObjectMethod getterFound = new ObjectMethod();
-    
-    // Indicate that there is no getter yet.
-    getterFound.order = -1;
-    
-    if( classEntry != null )
-    {
-      if( classEntry.getterList_ == null )
-      {
-        // Build the getter list.
-        classEntry.getterList_ = getGetterList( classEntry.lastObject_ );
-      }
-      
-      for( int index = 0; index < classEntry.getterList_.size(); index++ )
-      {
-        Method getter = (Method)classEntry.getterList_.elementAt( index );
-        
-        if( getter.getName().equals( "get" + sourceProperty ))
-        {
-          getterFound.order  = classEntry.order_;
-          getterFound.method = getter;
-          getterFound.object = classEntry.lastObject_;
-          break;
-        }
-      }
-    }
-    
-    return getterFound;
-  }
-  
-  private Vector getGetterList( Object object )
-  {
-    Vector result = new Vector();
-    
-    Method[] methods = object.getClass().getMethods();
-    
-    for( int index = 0; index < methods.length; index++ )
-    {
-      Method  method     = methods[index];
-      boolean isPublic   = Modifier.isPublic( method.getModifiers() );
-      Class   returnType = method.getReturnType();
-    
-      if( isPublic && 
-          returnType != Void.TYPE && 
-          method.getParameterTypes().length == 0 &&
-          method.getName().startsWith( "get" ))
-      {
-        method.setAccessible( true );
-        result.add( method );
-      }
-    }
-    
-    return result;
-  }
-    
-  private void invokeMethod( Object      sourceObject, 
-                             Method      sourceMethod , 
-                             Object      clientObject, 
-                             Method      clientMethod,
-                             Transformer transformer)
-  {  	
-  	Object data = null;
-  	  	  	
-  	try
-  	{
-  	  data = sourceMethod.invoke( sourceObject, new Object[0] );
-  	}
-  	catch( InvocationTargetException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Provider \"" + sourceObject.getClass().getName() +
-                                          "\" threw an exception." );
-  	}
-  	catch( IllegalAccessException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Provider \"" + sourceObject.getClass().getName() +
-                                        "\" threw an exception." );
-  	}
-  	
-  	environment_.getLog().log(ILog.INFO, "data", 5007, this, "invokeMethod ","  Setting prop: " + clientMethod.getName() + " data=" + data + " from: " + sourceObject.getClass().getName() );
-  	
-  	
-  	if( transformer != null )
-  	{
-  	  data = transformer.transform( data );  	    
-  	}
-  	
-  	try
-  	{  	  
-  	  clientMethod.invoke( clientObject, new Object[]{ data } );
-  	}
-  	catch( InvocationTargetException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Client \"" + clientObject.getClass().getName() +
-                                          "\" threw an exception." );
-  	}
-  	catch( IllegalAccessException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Client \"" + clientObject.getClass().getName() +
-                                          "\" threw an exception." );
-  	}
-  }
-  
-  private class ObjectMethod
-  {
-    public Object object;
-    public Method method;
-    public int    order;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java
deleted file mode 100644
index 99da37a..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-public interface DataMappingRegistry
-{
-  /**
-   * This method adds a data mapping from a source object to a target
-   * object.  When the sourceObject is encountered by the framework the
-   * sourceProperty will be called and the data will be passed to the
-   * targetProperty in the targetObject.  If a transformer object is
-   * specified the sourceObject is transformed before being passed to
-   * the target object.
-   * 
-   * @param sourceType      The source object.
-   * @param sourceProperty  The source property.
-   * @param targetType      The target object.
-   * @param targetProperty  The target property.
-   * @param transformer     The transformer object that transforms the
-   *                        the source object.
-   */
-  public void addMapping( Class       sourceType,
-						  String      sourceProperty,
-						  Class       targetType,
-						  String      targetProperty,
-						  Transformer transformer );
-  
-  /**
-   * This method is equivalent to the above with targetProperty the same
-   * as the sourceProperty and with the transformer set to null.
-   * 
-   * @param sourceType     The source object.
-   * @param sourceProperty The source property.
-   * @param targetType     The target object.
-   */
-  public void addMapping( Class       sourceType,
-	                      String      sourceProperty,
-	                      Class       targetType );
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java
deleted file mode 100644
index 7bea577..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-
-public class DataMappingRegistryImpl implements DataMappingRegistry
-{  
-  private Hashtable rulesTable_ = new Hashtable();
-
-  public Vector getRuleEntries( String targetType )
-  {
-    return (Vector)rulesTable_.get( targetType );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class, java.lang.String, org.eclipse.wst.command.internal.env.core.data.Transformer)
-   */
-  public void addMapping( Class sourceType, String sourceProperty,
-                          Class targetType, String targetProperty, 
-                          Transformer transformer) 
-  {
-    Vector    ruleEntries = (Vector)rulesTable_.get( targetType.getName() );
-    RuleEntry ruleEntry   = null;
-    
-    if( ruleEntries == null )
-    {
-      ruleEntries = new Vector();
-      rulesTable_.put( targetType.getName(), ruleEntries );
-    }
-    
-    // Find the rule entry
-    for( int index = 0; index < ruleEntries.size(); index++ )
-    {
-      RuleEntry newEntry = (RuleEntry)ruleEntries.elementAt( index );
-    
-      if( sourceProperty.equals( newEntry.sourceProperty_ ) &&
-          sourceType.equals( newEntry.sourceType_ ) &&
-          targetProperty.equals( newEntry.targetProperty_ ) )
-      {
-        // The entry already exists
-        ruleEntry = newEntry;
-        break;
-      }
-    }
-    
-    if( ruleEntry == null )
-    {
-      // The rule didn't exist already so we will create a new one.
-      ruleEntry = new RuleEntry(sourceType.getName(), sourceProperty, targetProperty, transformer );
-      ruleEntries.add( ruleEntry );
-    }
-    else
-    {
-      // Just update the transformer.
-      ruleEntry.transformer_ = transformer;  
-    }
-  }
-    
-    //ruleEntries_.
-//    String    sourceClass = sourceType.getName();
-//    String    targetClass = targetType.getName();
-//    Vector    entries     = (Vector)ruleEntries_.get( sourceClass ); 
-//    RuleEntry ruleEntry   = null;
-//    
-//    if( entries != null )
-//    {
-//      // Check to see if this mapping already exists.
-//      for( int index = 0; index < entries.size(); index++ )
-//      {
-//        RuleEntry foundEntry = (RuleEntry)entries.elementAt( index );
-//        
-//        if( sourceProperty.equals( foundEntry.sourceProperty_ ) &&
-//            targetType.equals( foundEntry.targetType_ ) &&
-//            targetProperty.equals( foundEntry.targetProperty_ ) )
-//        {
-//          ruleEntry = foundEntry;
-//          ruleEntry.transformer_ = transformer;
-//        }
-//      }
-//      
-//      // There is an existing vector for this sourceClass, but it didn't
-//      // contain this new rule so we will add it in.
-//      if( ruleEntry == null )
-//      {
-//        ruleEntry = new RuleEntry( sourceProperty, targetClass, targetProperty, transformer );
-//        entries.add( ruleEntry );
-//      }
-//    }
-//    else
-//    {
-//      // We need to create a new vector for this sourceClass.
-//      entries = new Vector();
-//      ruleEntry = new RuleEntry( sourceProperty, targetClass, targetProperty, transformer );
-//      entries.add( ruleEntry );
-//      ruleEntries_.put( sourceClass, entries );  
-//    }    
-//  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class)
-   */
-  public void addMapping(Class sourceType, String sourceProperty, Class targetType) 
-  {
-    addMapping( sourceType, sourceProperty, targetType, sourceProperty, null );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java
deleted file mode 100644
index df242c1..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-
-public class RuleEntry 
-{
-  public String      sourceType_;
-  public String      sourceProperty_;
-  public String      targetProperty_;
-  public Transformer transformer_;
-  
- 
-  public RuleEntry( String sourceType,
-                    String sourceProperty,
-                    String targetProperty, 
-                    Transformer transformer )
-  {
-    sourceType_     = sourceType;
-    sourceProperty_ = sourceProperty;
-    targetProperty_ = targetProperty;    
-    transformer_    = transformer;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java
deleted file mode 100644
index 19c3c01..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-/**
- * This interface is used to transform an object from one class to another.
- *
- */
-public interface Transformer
-{
-  /*
-   * @return returns a transformed object based on the input value.
-   */
-  public Object transform( Object value );
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java
deleted file mode 100644
index d18a2f2..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-
-/**
-  * This class is used as the base class for other standard fragment classes.
-  * 
-**/
-public abstract class AbstractCommandFragment implements CommandFragment
-{
-  private CommandFactory commandFactory_;
-  private String         id_;
-  private boolean        doNotRunInTransaction_ = false;
-
-  /**
-   * Copy constructor.
-   * @param fragment
-   */
-  protected AbstractCommandFragment( AbstractCommandFragment fragment )
-  {
-    commandFactory_ = fragment.commandFactory_;
-    id_             = fragment.id_;
-  }
-  
-  /**
-    * Creates a new AbstractCommandFragment.
-    *
-    * @param command the executable command for this fragment.
-  **/
-  public AbstractCommandFragment( CommandFactory commandFactory, String id )
-  {
-    commandFactory_ = commandFactory;  
-    id_      = id;
-  } 
-  
-  public String getId()
-  {
-    return id_;
-  }
-   
-  public void setId( String id )
-  {
-    id_ = id; 
-  }
-  
-  /** 
-    * Gets executable command associated with this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFactory getCommandFactory()
-  {
-    return commandFactory_;
-  }
-  
-  /**
-   *  This method is called retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings( DataMappingRegistry registry )
-  {
-    // The default behaviour is not to add any entries to the registry.
-  }
-  
-  /**
-   * 
-   * @return If the commands for this fragment should not be run within a transaction then
-   * this method should return true.  If the fragment does not care if it is run in a transaction
-   * or not it should return false.
-   */
-  public boolean doNotRunInTransaction()
-  {
-    return doNotRunInTransaction_;
-  }
-  
-  /**
-   * Sets the run in transaction property.
-   * @param doNotRunInTransaction
-   */
-  public void setDoNotRunInTransaction( boolean doNotRunInTransaction )
-  {
-    doNotRunInTransaction_ = doNotRunInTransaction;
-  }
-  
-  /**
-    * All fragments need to be cloneable.
-  **/
-  abstract public Object clone();  
-  
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java
deleted file mode 100644
index 571156d..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-
-
-/**
-  * This class returns either the true fragment or the false fragment
-  * based on the response from the condition object.
-**/
-public class BooleanFragment extends AbstractCommandFragment
-{
-  private CommandFragment trueFragment_;
-  private CommandFragment falseFragment_;
-  private Condition       condition_;
-
-  /**
-   * Create a BooleanFragment with default values.
-   *
-   */
-  public BooleanFragment()
-  {
-    this( null, null, new Condition()
-                      {
-                        public boolean evaluate()
-                        {
-                          return true;
-                        }
-                      }, 
-                      null, "" );  
-  }
-  
-  /**
-   * 
-   * @param trueFragment  The fragment chosen if the condition is true.
-   * @param falseFragment The fragment chosen if the condition is false.
-   * @param condition     The condition.
-   */
-  public BooleanFragment( CommandFragment trueFragment,
-                          CommandFragment falseFragment,
-                          Condition       condition )
-  {
-    this( trueFragment, falseFragment, condition, null, "" );
-  }                          
-
-  /**
-    * Creates a new BooleanFragment.
-    *
-    * @param trueFragment returned if condition is true.
-    * @param falseFragment returned if condition is false.
-    * @param condition the condition for this fragment.
-    * @param state the state passed to the condition.
-    * @param command the exectable command for this fragment.
-  **/
-  public BooleanFragment( CommandFragment  trueFragment,
-                           CommandFragment falseFragment,
-                           Condition       condition,
-                           CommandFactory  commandFactory,
-                           String          id )
-  {
-    super( commandFactory, id );
-
-    trueFragment_       = trueFragment;
-    falseFragment_      = falseFragment;
-    condition_          = condition; 
-  }
-
-  /**
-   * Copy constructor.
-   * @param frag
-   */
-  protected BooleanFragment( BooleanFragment frag )
-  {
-    this( null,
-    	  null,
-    	  frag.condition_,
-    	  frag.getCommandFactory(),
-    	  frag.getId() );
-
-    // Now we have to clone in the true and false
-    // fragments.
-    trueFragment_  = (CommandFragment)trueFragment_.clone();
-    falseFragment_ = (CommandFragment)falseFragment_.clone();
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new BooleanFragment( this );
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {    
-    return condition_.evaluate() ? trueFragment_ : falseFragment_;
-  }
-  
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-    return null;
-  }
-  
-  /**
-   * Sets the condition.
-   * @param condition
-   */
-  public void setCondition( Condition condition )
-  {
-    condition_ = condition;    
-  }
-  
-  /**
-   * Sets the true fragment.
-   * @param fragment
-   */
-  public void setTrueFragment( CommandFragment fragment )
-  {
-    trueFragment_ = fragment;
-  }
-  
-  /**
-   * Sets the false fragment.
-   * @param fragment
-   */
-  public void setFalseFragment( CommandFragment fragment )
-  {
-    falseFragment_ = fragment;
-  } 
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java
deleted file mode 100644
index 3982cbd..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.Evaluate;
-
-
-/**
-  * This class returns a fragment from a list of fragments based
-  * on the object returned from the Evaluate object.
-**/
-public class ChoiceFragment extends AbstractCommandFragment 
-{
-  private Hashtable      fragmentTable_;
-  private Evaluate       evaluate_;
-
-  /**
-    * Create a clone with new a new hashtable.
-  **/
-  protected ChoiceFragment( ChoiceFragment frag )
-  {
-    super( frag.getCommandFactory(), frag.getId() );
-    
-    evaluate_      = frag.evaluate_;
-    fragmentTable_ = new Hashtable();
-   
-    Enumeration keys = frag.fragmentTable_.keys();
-
-    // Clone the fragments in the table.
-    while( keys.hasMoreElements() )
-    {
-      Object key = keys.nextElement();
-      fragmentTable_.put( key, ((CommandFragment)frag.fragmentTable_.get(key)).clone() );
-    }
-  }
-  
-  public ChoiceFragment( Object[]          keys,
-                         CommandFragment[] fragments )
-  {
-  	this( keys, fragments, null, null, "" );    
-  }
-  
-  public ChoiceFragment( Object[]          keys,
-                         CommandFragment[] fragments,
-                         Evaluate          evaluate )
-  {
-  	this( keys, fragments, evaluate, null, "" );
-  }                         
-  
-  public void setEvaluate( Evaluate evaluate )
-  {
-    evaluate_ = evaluate;  
-  }
-  
-  /**
-    * Constructs a choice fragment.  The key at index X is mapped to 
-    * to the fragment at index X.
-    *
-    * @param keys these keys must be unique as determined by the equals method.
-    * They are used to identify which fragment to return.
-    * @param fragments these are the fragments to be returned.  Null is not allowed
-    * as an entry in the array.
-    * @param evaluate the object returned by this evaluate object is used
-    * as the key to locate a fragment.
-    * @param state the state passed to evaluate.
-  **/
-  public ChoiceFragment( Object[]          keys,
-                         CommandFragment[] fragments,
-                         Evaluate          evaluate,
-                         CommandFactory    commandFactory,
-                         String            id )
-  {
-    super( commandFactory, id );
-
-    evaluate_      = evaluate;
-    fragmentTable_ = new Hashtable();
-
-    if( keys == null || fragments == null || keys.length != fragments.length )
-    {
-      throw new IllegalArgumentException( "Bad keys or fragments." );
-    }
-    else
-    {
-      // Create the fragment table.
-      for( int index = 0; index < keys.length; index++ )
-      {
-        fragmentTable_.put( keys[index], fragments[index] );
-      }     
-    }
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new ChoiceFragment( this );
-  }
-  
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {    
-    Object key              = evaluate_.evaluate();
-    CommandFragment fragment = (CommandFragment)fragmentTable_.get(key);
-
-    if( fragment == null )
-    {
-      throw new IllegalArgumentException( "Key not found in table. Key=" + key );
-    }
-
-    return fragment;
-  }
-  
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-    return null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java
deleted file mode 100644
index 19075ac..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public abstract class CommandFactoryFragment implements CommandFragment 
-{
-  private Vector commands_;
-  
-  /**
-   * Subclasses should override this method and return
-   * an CommandFactory.
-   * @return
-   */
-  public abstract ICommandFactory getICommandFactory();
-  
-  /**
-   * All wizard fragments need to be cloneable.
-  **/
-  public abstract Object clone();
-  
-  protected CommandFactoryFragment( CommandFactoryFragment frag )
-  {
-    commands_ = frag.commands_;  
-  }
-  
-  public CommandFactoryFragment()
-  {
-  }
-  
-  /**
-   * 
-   * @return Returns a unique identifier for this fragment.
-   */
-  public String getId()
-  {
-    return "";
-  }
-  
-  /** 
-    * Gets executable command associated with this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFactory getCommandFactory()
-  {
-    return null;
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {
-	CommandFragment result = null;
-	
-    commands_ = createCommands();	
-
-	if( commands_.size() > 0 )
-	{
-	  result = (ChildFragment)commands_.elementAt(0);
-	}
-	
-	return result;
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-	CommandFragment result = null;
-		
-	if( commands_ != null && fragment instanceof ChildFragment ) 
-	{
-	  ChildFragment child = (ChildFragment)fragment;
-	  
-	  int index = child.index_;
-	
-      if( index != -1 )
-	  {
-	    index++;
-	  
-	    if( index < commands_.size() )
-		{
-		  result = (CommandFragment)commands_.elementAt( index );
-		}
-	  }
-	}
-	
-	return result;
-  }
-  
-  /*
-   * This method is called to retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings( DataMappingRegistry registry )
-  {
-  }
-
-  /**
-   * 
-   * @return If the commands for this fragment should not be run within a transaction then
-   * this method should return true.  If the fragment does not care if it is run in a transaction
-   * or not it should return false.
-   */
-  public boolean doNotRunInTransaction()
-  {
-    return false;
-  }  
-  
-  private Vector createCommands()
-  {
-	Vector          commands = new Vector();
-	ICommandFactory factory  = getICommandFactory();
-	int             index    = 0;
-		  
-	while( factory != null && factory.hasNext() )
-	{
-	  AbstractDataModelOperation command = factory.getNextCommand();
-			
-	  commands.add( new ChildFragment( command, index++ ) );
-	}
-	
-	return commands;
-  }
-  
-  private class ChildFragment extends SimpleFragment
-  {
-	  int index_;
-	
-	  public ChildFragment( AbstractDataModelOperation command, int index )
-	  {
-	    super( command, command.getID() );
-	    index_ = index;
-	  }
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java
deleted file mode 100644
index 03af35e..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-
-/**
-  * This interface describes a list of interruptable commands.  The
-  * order of this list of commands is defined by the getFirstSubFragment and
-  * getNextSubFragment methods.
-**/
-public interface CommandFragment extends Cloneable
-{ 
-  /**
-   * 
-   * @return Returns a unique identifier for this fragment.
-   */
-  public String getId();
-  
-  /** 
-    * Gets executable command associated with this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFactory getCommandFactory();
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment();
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment );
-  
-  /*
-   * This method is called to retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings( DataMappingRegistry registry );
-
-  /**
-   * 
-   * @return If the commands for this fragment should not be run within a transaction then
-   * this method should return true.  If the fragment does not care if it is run in a transaction
-   * or not it should return false.
-   */
-  public boolean doNotRunInTransaction();
-  
-  /**
-    * All wizard fragments need to be cloneable.
-  **/
-  public Object clone();  
-}  

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
deleted file mode 100644
index d4fce3d..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
+++ /dev/null

@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Stack;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-/**
- * The CommandFragmentEngine provides a convienent way to traverse CommandFragments
- * and possiblity execute its associate Command.
- */
-public class CommandFragmentEngine implements CommandManager
-{
-  private Stack            commandStack_;
-  private FragmentListener undoFragmentListener_;
-  private FragmentListener nextFragmentListener_;
-  private FragmentListener peekFragmentListener_;
-  private DataFlowManager  dataManager_;
-  private IEnvironment      environment_;
-  private IStatus          lastStatus_;
-  
-  /**
-   * Creates a CommandFragmentEngine.
-   * 
-   * @param startFragment the root fragment where traversal will begin.
-   * @param dataManager the data manager containing all of the data mappings.
-   * @param environment the environment.
-   */
-  public CommandFragmentEngine( CommandFragment startFragment, DataFlowManager dataManager, IEnvironment environment )
-  {
-  	SequenceFragment root = new SequenceFragment();
-  	root.add( startFragment );
-  	  	
-  	commandStack_ = new Stack();
-  	
-  	addToStack( root, -1 );
-  	addToStack( startFragment, 0 );
-  	
-  	dataManager_ = dataManager;
-  	environment_ = environment;
-  } 
-  
-  /**
-   * @return returns the Data mapping registry.
-   */
-  public DataMappingRegistry getMappingRegistry()
-  {
-	return dataManager_.getMappingRegistry();
-  }
-  
-  /**
-   * 
-   * @return the Status from the last Command executed.
-   */
-  public IStatus getLastStatus()
-  {
-    return lastStatus_;
-  }
-  
-  /**
-   */
-  public boolean isUndoEnabled()
-  {
-    return true;
-  }
-  
-  /**
-   * Sets the next fragment listener for this engine.  This listener will be
-   * called for each fragment that is traversed in moveForwardToNextStop operation.
-   * 
-   * @param listener the fragment listener.
-   */
-  public void setNextFragmentListener( FragmentListener listener )
-  {
-    nextFragmentListener_ = listener;
-  }
-  
-  /**
-   * Sets the next fragment listener for this engine.  This listener will be
-   * called for each fragment that is traversed in peekForwardToNextStop operation.
-   * 
-   * @param listener the fragment listener.
-   */
-  public void setPeekFragmentListener( FragmentListener listener )
-  {
-    peekFragmentListener_ = listener;
-  }
-  
-  /**
-   * Sets the peek fragment listener for this engine.  This listener will be
-   * called for each fragment that is traversed in undoToLastStop operation.
-   * 
-   * @param listener the fragment listener.
-   */
-  public void setUndoFragmentListener( FragmentListener listener )
-  {
-    undoFragmentListener_ = listener;
-  }
-  
-  /**
-   * Traverse the CommandFragments starting with the CommandFragment on the
-   * top of the command fragment stack.  The operation does NOT change the
-   * command fragment stack and does not execute any command associated with
-   * a CommandFragment.
-   */
-  public void peekForwardToNextStop()
-  {
-  	CommandListEntry topEntry      = (CommandListEntry)commandStack_.lastElement();  	
-  	int              parentIndex   = topEntry.parentIndex_;
-  	CommandFragment  childFragment = topEntry.fragment_; 
-  	boolean          continueLoop  = navigateChildFragments( childFragment, false );
-  	  	
-  	while( parentIndex != -1 && continueLoop )
-  	{  	
-  	  CommandListEntry parentEntry    = (CommandListEntry)commandStack_.elementAt( parentIndex );
-  	  CommandFragment  parentFragment = parentEntry.fragment_;
-  	  CommandFragment  nextFragment   = parentFragment.getNextSubFragment( childFragment );
-  	  
-  	  if( nextFragment == null )
-  	  {
-  	  	// There are no more sibling fragments to navigate so we will pop up to the parent
-  	  	// an continue navigation there.
-  	  	parentIndex   = parentEntry.parentIndex_;
-  	  	childFragment = parentFragment; 
-  	  }
-  	  else
-  	  {  	  	
-  	  	if( navigateChildFragments( nextFragment, true ) ) 
-  	  	{
-  	  	  // We are continuing to navigate.  This time we want to traverse the sibling
-  	  	  // of nextFragment. 
-  	  	  childFragment = nextFragment;
-  	  	}
-  	  	else
-  	  	{
-  	  	  // We are stopping our navigation.
-  	  	  continueLoop = false;
-  	  	}
-  	  }
-  	}
-  }
-  
-  
-  /**
-   * Traverse the CommandFragments starting with the CommandFragment on the
-   * top of the command fragment stack.  This operation does change the
-   * command fragment stack and does execute any command associated with
-   * a CommandFragment.
-   */
-  public void moveForwardToNextStop( IProgressMonitor monitor )
-  {
-  	CommandListEntry topEntry        = (CommandListEntry)commandStack_.lastElement();  	
-  	int              parentIndex     = topEntry.parentIndex_;
-  	CommandFragment  currentFragment = topEntry.fragment_;  
-  	boolean          continueExecute = visitTop( monitor );
-  	CommandFragment  childFragment    = currentFragment.getFirstSubFragment();
-  	    
-  	// If the current fragment has child fragments we need to traverse these children.
-  	while( childFragment != null && continueExecute )
-  	{
-  	  parentIndex = commandStack_.size() - 1;
-  	  addToStack( childFragment, parentIndex );
-  	  continueExecute = visitTop( monitor );
-  	  currentFragment = childFragment;
-  	  childFragment   = currentFragment.getFirstSubFragment();
-  	}
-  	
-  	// The previous while loop has guaranteed that currentFragment has no
-  	// child fragments. This while loop assumes this to be the case.
-  	while( parentIndex != -1 && continueExecute )
-  	{  	   	
-  	  CommandListEntry parentEntry    = (CommandListEntry)commandStack_.elementAt( parentIndex );
-  	  CommandFragment  parentFragment = parentEntry.fragment_;
-  	  CommandFragment  nextFragment   = null;
-  	  
-  	  if( currentFragment == null )
-  	  {
-  	    nextFragment = parentFragment.getFirstSubFragment();
-  	  }
-  	  else
-  	  {	
-  	    nextFragment = parentFragment.getNextSubFragment( currentFragment );
-  	  }
-  	  
-  	  if( nextFragment == null )
-  	  {
-  	  	// There are no more sibling fragments to navigate so we will pop up to the parent
-  	  	// and continue navigation there.
-  	  	parentIndex     = parentEntry.parentIndex_;
-  	  	currentFragment = parentFragment; 
-  	  }
-  	  else
-  	  {  	
-  	  	// We have a new fragment that we need to add to the top of the stack.
-  	  	addToStack( nextFragment, parentIndex );  	  	
-  	    parentIndex     = commandStack_.size() - 1;  	
-  	    continueExecute = visitTop( monitor );
-  	    currentFragment = null;  	  	
-  	  }
-  	}
-  }
-  
-  /**
-   * 
-   * @return returns true if the there is not longer any elements on the stack.  Note:
-   *                 that last two entries are always left on the stack.
-   */
-  public boolean undoToLastStop()
-  {    
-  	CommandListEntry topEntry = (CommandListEntry)commandStack_.lastElement();	
-  	
-	// Always undo the top element.
-  	performUndo( topEntry );
-  		
-    while( topEntry.parentIndex_ != 0 )
-  	{
-      commandStack_.pop();
-  	  topEntry = (CommandListEntry)commandStack_.lastElement();	  
-      
-  	  performUndo( topEntry );
-  	  
-  	  if( topEntry.fragmentStopped_ )
-  	  {
-  	    break;
-  	  }
-  	}
-  	
-  	return topEntry.parentIndex_ == 0;
-  }
-   
-  private void performUndo( CommandListEntry entry )
-  {
-    if( entry.parentIndex_ == 0 ) return;
-    
-	  AbstractDataModelOperation cmd = entry.command_;
-  	  
-  	if( cmd != null && cmd.canUndo() && !entry.beforeExecute_ )
-	{
-    try
-    {
-	    cmd.undo( null, null );
-    }
-    catch( Exception exc )
-    {
-      exc.printStackTrace();
-    }
-    
-	  entry.beforeExecute_ = true;
-	}
-  	  
-	undoFragmentListener_.notify( entry.fragment_ );  	
-  }
-  
-  private boolean navigateChildFragments( CommandFragment fragment, boolean visitCurrent )
-  {
-  	boolean         continueNavigate = true;
-  	CommandFragment childFrag        = null; 
-  	  
-  	if( visitCurrent )
-  	{
-  	  continueNavigate = peekFragmentListener_.notify( fragment );
-      dataManager_.process( fragment );
-  	}
-  	
-  	childFrag = fragment.getFirstSubFragment();
-   	
-  	while( childFrag != null && continueNavigate )
-  	{
-  	  continueNavigate = navigateChildFragments( childFrag, true );
-  	  childFrag        = fragment.getNextSubFragment( childFrag );
-  	}
-  	
-  	return continueNavigate;
-  }
-    
-  private boolean visitTop( IProgressMonitor monitor )
-  {  
-  	CommandListEntry entry           = (CommandListEntry)commandStack_.lastElement();
-  	boolean         continueNavigate = nextFragmentListener_.notify( entry.fragment_ );
-  	  
-  	if( continueNavigate )
-  	{
-  	  // Call the setters for this fragment.
-      dataManager_.process( entry.fragment_ );
-      
-      // Add any rules to the mapping registry before we execute the command.
-      entry.fragment_.registerDataMappings( dataManager_.getMappingRegistry() );
-   
-  	  lastStatus_ = runCommand( entry, monitor );
-  	  
-  	  if( lastStatus_.getSeverity() == IStatus.ERROR ) continueNavigate = false;
-  	}
-  	
-   	if( !continueNavigate ) entry.fragmentStopped_ = true;
-   	
-  	return continueNavigate;
-  }
-  
-  private void addToStack( CommandFragment fragment, int parentIndex )
-  {
-    CommandListEntry entry = new CommandListEntry( fragment, parentIndex );
-    commandStack_.push( entry );
-  }
-  
-  private IStatus runCommand( CommandListEntry entry, IProgressMonitor monitor )
-  {
-	CommandFactory factory  = entry.fragment_.getCommandFactory();
-  	IStatus      status   = Status.OK_STATUS;
-  	
-  	if( factory != null )
-  	{
-  	  AbstractDataModelOperation cmd  = factory.create();
-      
-  	  entry.command_ = cmd;
-  	    
-  	  if( cmd != null )
-  	  {
-  	    dataManager_.process( cmd );
-  	  	  
-  	    try
-  	    {
-  	      environment_.getLog().log(ILog.INFO, "command", 5001, this, "runCommand", "Executing: " + cmd.getClass().getName());
-  	  	    
- 	        cmd.setEnvironment( environment_ );
-          status = cmd.execute( monitor, null );
-          
-		      entry.beforeExecute_ = false;
-  	    }
-  	    catch( Throwable exc )
-  	    {
-  	      MessageUtils utils           = new MessageUtils( "org.eclipse.wst.command.env.core.environment", this );
-  	      IStatus      unexpectedError = StatusUtils.errorStatus( exc );
-          MultiStatus  parentStatus    = new MultiStatus( "id", 0, new IStatus[]{unexpectedError}, 
-                                                          utils.getMessage( "MSG_ERROR_UNEXPECTED_ERROR" ), null );
-  	      environment_.getStatusHandler().reportError( parentStatus );
-  	    }
-  	    finally
-  	    {
-  	      String message = "Ok";
-  	      
-  	      if( status.getSeverity() == Status.ERROR )
-  	      {
-  	        message = "Error: " + status.getMessage(); 
-  	      }
-  	      
-	      environment_.getLog().log(ILog.INFO, "command", 5001, this, "runCommand", "Execution status: " + message );
-  	    }
-  	  }
-  	}
-  	
-  	return status;
-  }
-    
-  private class CommandListEntry
-  {
-  	public CommandListEntry( CommandFragment fragment, int parentIndex )
-  	{
-  	  fragment_        = fragment;
-  	  parentIndex_     = parentIndex;
-  	  fragmentStopped_ = false;
-	  beforeExecute_   = true;
-  	}
-  	  	
-  	public AbstractDataModelOperation command_;
-  	public CommandFragment fragment_;
-  	public int             parentIndex_;
-  	public boolean         fragmentStopped_;
-	public boolean         beforeExecute_;
-  }    
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java
deleted file mode 100644
index a99be49..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-/**
- * This interface provides a way to create CommandFragments.
- *
- */
-public interface CommandFragmentFactory
-{
-  /**
-   * 
-   * @return returns a created CommandFragment object.
-   */
-  public CommandFragment create();
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java
deleted file mode 100644
index 0f1701c..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-public interface CommandFragmentFactoryFactory 
-{
-  /**
-   * The framework calls this method to get the CommandFragmentFactory
-   * for a particular extension.
-   * 
-   * @return Creates a CommandFragmentFactory.
-   */
-  public CommandFragmentFactory create();  
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java
deleted file mode 100644
index 7751ba6..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Hashtable;
-import org.eclipse.wst.command.internal.env.core.registry.CommandRegistry;
-
-
-public class ExtensionFragment extends AbstractCommandFragment 
-{
-  private String[]        ids_;;
-  private CommandRegistry extensionRegistry_;
-  private Hashtable       fragments_;
-  
-  /**
-   *  The default constructor
-   *
-   */
-  public ExtensionFragment()
-  {
-    super( null, "" );  
-    fragments_ = new Hashtable();
-  }
-    
-  /**
-   * Copy constructor.
-   * @param Fragment the fragment to copy
-   */
-  protected ExtensionFragment( ExtensionFragment fragment )
-  {
-    super( fragment );
-    
-    ids_               = fragment.ids_;
-    extensionRegistry_ = fragment.extensionRegistry_;
-    fragments_         = fragment.fragments_;
-  }
-  
-  /**
-   * 
-   * @param ids Sets the IDs for this extension fragment.
-   */
-  public void setExtensionIds( String[] ids )
-  {
-    ids_ = ids;
-  }
-  
-  /**
-   * 
-   * @param registry Sets the registry for this extension fragment.
-   */
-  public void setExtensionRegistry( CommandRegistry registry )
-  {
-    extensionRegistry_ = registry; 
-  }
-      
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#getFirstSubFragment()
-   */
-  public CommandFragment getFirstSubFragment() 
-  {
-    CommandFragmentFactoryFactory factory  = extensionRegistry_.getFactoryFactory( ids_ );
-    
-    if( factory == null ) return null;
-    
-    CommandFragment               fragment = (CommandFragment)fragments_.get( factory );
-    
-    if( fragment == null )
-    {
-      fragment = factory.create().create();
-      fragments_.put( factory, fragment );
-    }
-    
-    return  fragment;
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#getNextSubFragment(org.eclipse.wst.command.internal.env.core.fragment.CommandFragment)
-   */
-  public CommandFragment getNextSubFragment(CommandFragment fragment) 
-  {
-    return null;
-  }
-  
-  /**
-   * @see java.lang.Object#clone()
-   */
-  public Object clone() 
-  {
-    return new ExtensionFragment( this );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java
deleted file mode 100644
index 01cd7a1..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-/**
- * This interface should be implement for code that needs to listen to fragments
- * that are being traverse by the CommandFragmentEngine.
- *
- */
-public interface FragmentListener 
-{
-  /*
-   * Notifies this listener that a commandFragment is being visited during
-   * a traversal.
-   */
-  public boolean notify( CommandFragment commandFragment );
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java
deleted file mode 100644
index 8c3e4d4..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-/**
-  * This interface can be used when a conditional object needs to be returned.
-**/
-public interface LoopCondition
-{
-  /**
-    * Evaluates a loop condition.
-    *
-    * @param loop the loop fragment that is being evaluated.
-    * @param fragment the child fragment of the loop 
-    *        under evaluation.  Note: fragment can be null.
-    * @return returns an object based on some evaluated condition.
-  **/
-  public boolean evaluate( LoopFragment loop, CommandFragment fragment );
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java
deleted file mode 100644
index 60cdc9a..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.RangeVector;
-
-
-/**
-  * This class returns a dynamically determined number of
-  * fragments.  This loop will return the fragment parameter
-  * as long as the stopCondition evaluates to false.  Otherwise,
-  * null is returned.
-**/
-public class LoopFragment extends AbstractCommandFragment
-{
-  private LoopCondition   stopCondition_;
-  private CommandFragment fragment_;
-  private RangeVector     fragmentHistory_;
-
-  /**
-    * Copy contructor for this fragment.
-  **/
-  protected LoopFragment( LoopFragment fragment )
-  {
-    this( fragment.fragment_,
-    	  fragment.stopCondition_,
-    	  fragment.getCommandFactory(),
-    	  fragment.getId() );
-  }
-  
-  public LoopFragment( CommandFragment fragment,
-                        LoopCondition   stopCondition )
-  {
-    this( fragment, stopCondition, null, "" );
-  }                       
-  
-  /**
-    * @param fragment the fragment that will be returned by the loop.
-    * @param stopCondition when false the fragment will be returned, 
-    * otherwise null is returned.
-    * @param state the state passed to the condition.
-    * @param command the executable command for this fragment.
-  **/
-  public LoopFragment( CommandFragment fragment,
-                       LoopCondition   stopCondition,
-                       CommandFactory  commandFactory,
-                       String          id   )
-  {
-    super( commandFactory, id );
-
-    fragment_        = fragment;
-    stopCondition_   = stopCondition;
-    fragmentHistory_ = new RangeVector();
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new LoopFragment( this );
-  }
-
-  /**
-    * Returns the index of the fragment
-    *
-    * @param fragment the fragment to search.
-    * @return the index of this fragment.
-  **/
-  public int indexOf( CommandFragment fragment )
-  {
-    return fragmentHistory_.indexOf( fragment );
-  }
-
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {    
-    return getNextSubFragment( null );
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment frag )
-  {
-    CommandFragment nextFrag  = null;
-    
-    if( stopCondition_.evaluate( this, frag ) )
-    {
-      // The stop condition has been met.
-      // Do nothing.
-    }
-    else
-    {      
-      int fragIndex = indexOf( frag );
-
-      // Note: when fragment == null the fragIndex
-      //       should be -1.  Therefore, if there
-      //       is already a first fragment in
-      //       fragmentHistory that will be returned.
-      if( fragIndex + 1 < fragmentHistory_.size() )
-      {
-        // We have a copy of the fragment already.
-        nextFrag = (CommandFragment)(fragmentHistory_.elementAt( fragIndex + 1 )); 
-      }
-      else
-      {
-        nextFrag = (CommandFragment)(fragment_.clone());
-        fragmentHistory_.add( nextFrag );
-      }
-    }
-
-    return nextFrag;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java
deleted file mode 100644
index 1908712..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-
-
-/**
-  * This class implements a sequence of CommandFragments.
-**/
-public class SequenceFragment extends AbstractCommandFragment
-{
-  private List fragmentList_;
-
-  protected SequenceFragment( SequenceFragment frag )
-  {
-  	super( frag.getCommandFactory(), frag.getId() );
-  	
-    fragmentList_ = new Vector();
-    
-    for( int index = 0; index < frag.fragmentList_.size(); index++ )
-    {
-      Object newFrag = ((CommandFragment)frag.fragmentList_.get(index)).clone();
-      fragmentList_.add( newFrag );
-    }
-  }
-  
-  public SequenceFragment( CommandFragment[] fragments, 
-						   CommandFactory    commandFactory, 
-					       String            id  )
-  {
-  	super( commandFactory, id );
-  	
-    if( fragments != null )
-    {
-      fragmentList_ = Arrays.asList( fragments );
-    }
-    else
-    {
-      fragmentList_ = new Vector();
-    }
-  }
-  
-  public SequenceFragment()
-  {
-  	super( null, "" );
-  	
-  	fragmentList_ = new Vector();
-  }
-
-  /**
-    * Appends a fragment to the sequence. 
-  **/
-  public void add( CommandFragment fragment )
-  {
-    fragmentList_.add( fragment );
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new SequenceFragment( this );
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {
-    CommandFragment fragment = null;
-
-    if( fragmentList_ == null || fragmentList_.size() == 0 )
-    {
-      fragment = null;
-    }
-    else
-    {      
-      fragment = (CommandFragment)( fragmentList_.get(0) );
-    }
-
-    return fragment;    
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-    int index = fragmentList_.indexOf( fragment );
-
-    if( index == -1 )
-    {
-      throw new IllegalArgumentException( "Fragment not found in sequence.");
-    }
-    else
-    {
-      index++;
-
-      if( index >= fragmentList_.size() )
-      {
-        // There is nothing following this fragment so return null;
-        return null;
-      }
-      else
-      {
-        // Return the next fragment.
-        return (CommandFragment)(fragmentList_.get( index ));
-      }
-    }
-  }	
-}  

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java
deleted file mode 100644
index 0d1f1e4..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-  * This class implements an empty of WizardFragment.
-**/
-public class SimpleFragment extends AbstractCommandFragment
-{
-  public SimpleFragment()
-  {
-    this( (CommandFactory)null, "" );
-  }
-  
-  public SimpleFragment( String id )
-  {
-    this( (CommandFactory)null, id );  
-  }
-  
-  public SimpleFragment( final AbstractDataModelOperation operation, String id )
-  {
-    super( new CommandFactory()
-           {
-             public AbstractDataModelOperation create()
-             {
-               return operation;
-             }
-           }, id );  
-  }
-  
-  public SimpleFragment( CommandFactory commandFactory, String id )
-  {
-  	super( commandFactory, id );
-  }
-  
-  /**
-    * Copy constructor for fragment.
-  **/
-  protected SimpleFragment( SimpleFragment fragment )
-  {
-    super( fragment.getCommandFactory(), fragment.getId() );
-  }
-    
-  /**
-    * All wizard fragments need to be cloneable.
-  **/
-  public Object clone()
-  {
-    return new SimpleFragment( this );
-  }
-
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment(){ return null; }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    * Since this is a simple fragment, there is no next fragment
-    * so we will always return null. 
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/  
-  public CommandFragment getNextSubFragment( CommandFragment fragment ){ return null; }
-}  

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java
deleted file mode 100644
index 86f4829..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.registry;
-
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory;
-
-/**
- * This interface provides a way to create a CommandFragmentFactoryFactory
- * from an array of ids.
- *
- */
-public interface CommandRegistry 
-{  
-  /**
-   * Creates a CommandFragmentFactoryFactory from an array of ids.
-   * 
-   * @param ids the ids.
-   * @return the CommandFragmentFactoryFactory object.
-   */
-  public CommandFragmentFactoryFactory getFactoryFactory( String[] ids );
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java
deleted file mode 100644
index b2ee8b0..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * This class combines a string with a boolean value.  This is
- * useful for storing the state data for a boolean selection list.
- */
-package org.eclipse.wst.command.internal.env.core.selection;
-
-public class BooleanSelection
-{
-  private String  value_;
-  private boolean selected_;
-  
-  public BooleanSelection( String value, boolean selected )
-  {
-    value_    = value;
-    selected_ = selected;
-  }
-  
-  /**
-   * 
-   * @return Get the string value.
-   */
-  public String getValue()
-  {
-    return value_;
-  }
-  
-  /**
-   * 
-   * @return Get the boolean value for this string.
-   */
-  public boolean isSelected()
-  {
-    return selected_;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java
deleted file mode 100644
index 3453a02..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-/**
- * This transformer class selects a string at a particular level
- * in a SelectionListChoices class.
- */
-public class ChoicesToString implements Transformer
-{
-  private int level_;
-  
-  public ChoicesToString( int level )
-  {
-    level_ = level;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object)
-   */
-  public Object transform( Object value )
-  {
-    SelectionListChoices choices = (SelectionListChoices)value;
-    
-    for( int index = 0; index < level_; index++ )
-    {
-      choices = choices.getChoice();
-    }
-    
-    return choices.getList().getSelection();
-  }
-
-  public SelectionList transform( SelectionListChoices choices )
-  {
-    return (SelectionList)transform( (Object)choices );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java
deleted file mode 100644
index 937d38d..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-import java.util.Vector;
-
-/**
- * This is a Dynamic version of the SelectionListChoices class.
- */
-public class DynamicList 
-{
-  private Vector stringList_ = new Vector();
-  private Vector dynamicListVectorList_ = new Vector();
-  
-  /**
-   * Adds an entry into the dynamic list.
-   * 
-   * @param values the string values that lead to the target.
-   * @param target the target.
-   */
-  public void add( String[] values, Object target )
-  {
-    DynamicList currentList = this;
-    
-    for( int index = 0; index < values.length; index++ )
-    {
-      String value      = values[index];
-      int    length     = currentList.stringList_.size();
-      int    foundIndex = -1;
-      
-      // Find the string in the current list.
-      for( int searchIndex = 0; searchIndex < length; searchIndex++ )
-      {
-        String string = (String)currentList.stringList_.elementAt( searchIndex ); 
-        
-        if( string.equals( value ) ) 
-        {
-          foundIndex = searchIndex;
-          break;
-        }
-      }
-      
-      if( foundIndex == -1 )
-      {
-        // We have a new string so add it to the list.
-        currentList.stringList_.add( value );
-        currentList.dynamicListVectorList_.add( new DynamicList() );
-        foundIndex = length;
-      }
-      
-      currentList = (DynamicList)currentList.dynamicListVectorList_.elementAt( foundIndex );       
-    }
-    
-    currentList.dynamicListVectorList_.add( target );
-  }
-  
-  /**
-   * 
-   * @return returns a SelectionListChoices object from this DynamicList
-   * object.
-   */
-  public SelectionListChoices toListChoices()
-  {
-    SelectionList list   = new SelectionList( (String[])stringList_.toArray( new String[0] ), 0);
-    int           length = dynamicListVectorList_.size();
-    Vector        vector = new Vector(); 
-    
-    for( int index = 0; index < length; index++ )
-    {
-      Object obj = dynamicListVectorList_.elementAt(index);
-      
-      if( obj instanceof DynamicList )
-      {
-        vector.add( ((DynamicList)obj).toListChoices() );
-      }
-      else
-      {
-        vector.add( obj );
-      }
-    }
-    
-    return new SelectionListChoices( list, vector );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java
deleted file mode 100644
index e52ebdc..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-/**
- * This class stores a list strings along with a selectionIndex which
- * stores the current string that selected.  There is also a selection
- * value.  If this value is one of the strings in the the string list
- * then selectionIndex will contain the index of this string.  If it
- * is not in the list then the selectionValue string will contain this
- * value and selectionIndex will be set to -1.  This class can be
- * used to store the state data for a Combo box.
- */
-public class SelectionList
-{
-  private int      selectionIndex_;
-  private String[] list_;
-  private String   selectionValue_;
-  
-  public SelectionList( String[] list, int selectionIndex )
-  {
-    list_           = list;
-    selectionIndex_ = selectionIndex;
-  }
-  
-  /**
-   * Sets the selection value for this object.
-   * 
-   * @param value the value.
-   */
-  public void setSelectionValue( String value )
-  {
-    selectionValue_ = value;  
-    selectionIndex_ = -1;
-    
-    for( int index = 0; index < list_.length; index++ )
-    {
-      if( value.equals( list_[index] ) )
-      {
-        selectionIndex_ = index;
-        break;
-      }
-    }
-  } 
-  
-  /*
-   * @return returns the string list.
-   */
-  public String[] getList()
-  {
-    return list_;
-  }
-  
-  /*
-   * Sets the currently selected string in the list.
-   */
-  public void setIndex( int index )
-  {
-    selectionIndex_ = index;
-    selectionValue_ = null;
-  }
- 
-  /*
-   * @return returns the index of the current string.  The value
-   * will be -1 if the selection value is not in the string list.
-   */
-  public int getIndex()
-  {
-    return selectionIndex_;  
-  }
-  
-  /*
-   * @return returns the current string selection for this object.
-   */
-  public String getSelection()
-  {
-    if( selectionValue_ != null ) return selectionValue_;
-    
-    if( selectionIndex_ == -1 || selectionIndex_ > list_.length-1 )
-    {
-      return "";
-    }
-    else
-    {
-      return list_[ selectionIndex_ ];
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java
deleted file mode 100644
index 6c6aba8..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-import java.util.Vector;
-
-/*
- * This class can be used to store a hierarchy of SelectionList
- * objects.
- */
-public class SelectionListChoices
-{
-  private SelectionList selectionList_;
-  private Vector        choices_;
-  private SelectionList newValueSelectionList_;
-  
-  /**
-   * 
-   * @param list     The selection list.
-   * @param choices  This is a vector of SelectionListChoies and can be
-   *                 null if there are no choices.  This index of list
-   *                 is used to index into choices.  If index is -1 then
-   *                 the newValueSelectionList is used.
-   */
-  public SelectionListChoices( SelectionList list, Vector choices )
-  {
-    selectionList_ = list;
-    choices_       = choices;
-    
-    newValueSelectionList_ = new SelectionList( new String[0], -1 );
-  }
-  
-  public SelectionListChoices( SelectionList list, Vector choices, SelectionList newList )
-  {
-    this( list, choices );
-    newValueSelectionList_ = newList;
-  }
-  
-  /**
-   * @return returns the current Selection list.
-   */
-  public SelectionList getList()
-  {
-    return selectionList_;
-  }
-  
-  /**
-   * 
-   * @return returns the choices for this object.
-   */
-  public Vector getChoices()
-  {
-    return choices_;
-  }
-  
-  /**
-   * 
-   * @param level the level in the hierarchy where we want to get the choices.
-   * @return returns a vector of SelectionListChoices.
-   */
-  public Vector getChoicesAtLevel( int level )
-  {
-    SelectionListChoices choices = this;
-    
-    for( int index = 0; index < level; index++ )
-    {
-      choices = choices.getChoice();
-    }
-    
-    return choices.getChoices();
-  }
-  
-  /**
-   * 
-   * @return returns the current SelectionListChoice
-   */
-  public SelectionListChoices getChoice()
-  {
-    int                  selectionIndex = selectionList_.getIndex();
-    SelectionListChoices result         = null;
-    
-    if( selectionIndex == -1 )
-    {
-      result = new SelectionListChoices( newValueSelectionList_, null );
-    }
-    else if( choices_ != null && choices_.size() != 0 ) 
-    {
-      result = (SelectionListChoices)choices_.elementAt( selectionIndex );
-    }
-    
-    return result;
-  }
-  
-  /**
-   * 
-   * @param index the index of the choice we want.
-   * @return returns the SelectionListChoice at the index specified.
-   */
-  public SelectionListChoices getChoice(int index)
-  {
-    SelectionListChoices result = null;
-    if (index < 0 || index >= getList().getList().length)
-    {
-      result = new SelectionListChoices( newValueSelectionList_, null );      
-    }
-    else
-    {
-      result = (SelectionListChoices)choices_.elementAt( index );
-    }
-      
-    return result;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java
deleted file mode 100644
index ef51355..0000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.uri;
-
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.environment.uri.IURI;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public abstract class NativeFileCommand extends AbstractDataModelOperation
-{
-  protected String name;
-
-  protected String description;
-
-  protected IURI[] urisToRead;
-
-  protected IURI[] urisToWrite;
-
-  protected NativeFileCommand ()
-  {
-    this(null,null);
-  }
-
-  protected NativeFileCommand ( String name, String description )
-  {
-    this.name = name;
-    this.description = description;
-  }
-
-  public String getName ()
-  {
-    return name;
-  }
-
-  public String getDescription ()
-  {
-    return description;
-  }
-
-  public void setURIsToRead ( IURI[] urisToRead )
-  {
-    this.urisToRead = urisToRead;
-  }
-
-  public IURI[] getURIsToRead ()
-  {
-    return urisToRead;
-  }
-
-  public void setURIsToWrite ( IURI[] urisToWrite )
-  {
-    this.urisToWrite = urisToWrite;
-  }
-
-  public IURI[] getURIsToWrite ()
-  {
-    return urisToWrite;
-  }
-
-  public IStatus execute ( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    File[] filesToRead = getFiles(urisToRead);
-    File[] filesToWrite = getFiles(urisToWrite);
-    preProcess(filesToRead,filesToWrite);
-    IStatus status = execute(filesToRead,filesToWrite);
-    postProcess(filesToRead,filesToWrite);
-    return status;
-  }
-
-  public abstract IStatus execute ( File[] filesToRead, File[] filesToWrite );
-
-  private void preProcess ( File[] filesToRead, File[] filesToWrite )
-  {
-    // TBD.
-  }
-
-  private void postProcess ( File[] filesToRead, File[] filesToWrite )
-  {
-    // TBD.
-  }
-
-  private File[] getFiles ( IURI[] uris )
-  {
-    List list = new LinkedList();
-    if (uris != null)
-    {
-      for (int i=0; i<uris.length; i++)
-      {
-        if (uris[i].isAvailableAsFile())
-        {
-          try
-          {
-            list.add(uris[i].asFile());
-          }
-          catch (URIException e)
-          {
-          }
-        }
-      }
-    }
-    return (File[])list.toArray(new File[0]);
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/.classpath b/bundles/org.eclipse.wst.command.env.ui/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.wst.command.env.ui/.cvsignore b/bundles/org.eclipse.wst.command.env.ui/.cvsignore
deleted file mode 100644
index 53b2d4a..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/.cvsignore
+++ /dev/null

@@ -1,6 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-envui.jar
-@dot

diff --git a/bundles/org.eclipse.wst.command.env.ui/.project b/bundles/org.eclipse.wst.command.env.ui/.project
deleted file mode 100644
index ceb0b37..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.command.env.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 2eb4b84..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.command.internal.env.ui.plugin.EnvUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.ui.widgets,
- org.eclipse.wst.command.internal.env.ui.dialog,
- org.eclipse.wst.command.internal.env.ui.eclipse,
- org.eclipse.wst.command.internal.env.ui.plugin,
- org.eclipse.wst.command.internal.env.ui.preferences,
- org.eclipse.wst.command.internal.env.ui.registry,
- org.eclipse.wst.command.internal.env.ui.widgets,
- org.eclipse.wst.command.internal.env.ui.widgets.popup
-Require-Bundle: org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.osgi,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true

diff --git a/bundles/org.eclipse.wst.command.env.ui/about.html b/bundles/org.eclipse.wst.command.env.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.command.env.ui/build.properties b/bundles/org.eclipse.wst.command.env.ui/build.properties
deleted file mode 100644
index 4b75d28..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/build.properties
+++ /dev/null

@@ -1,9 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html
-source.. = src/
-output.. = bin/
-src.includes = schema/

diff --git a/bundles/org.eclipse.wst.command.env.ui/plugin.properties b/bundles/org.eclipse.wst.command.env.ui/plugin.properties
deleted file mode 100644
index ec15066..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/plugin.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Environment Command Framework (GUI)
-PLUGIN_PROVIDER=Eclipse.org
-
-WIDGET_REGISTRY_NAME=Widget contributor registry

diff --git a/bundles/org.eclipse.wst.command.env.ui/plugin.xml b/bundles/org.eclipse.wst.command.env.ui/plugin.xml
deleted file mode 100644
index edee0b8..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/plugin.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension-point id="widgetRegistry" name="%WIDGET_REGISTRY_NAME" schema="schema/widgetRegistry.exsd"/>   
-</plugin>

diff --git a/bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd b/bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd
deleted file mode 100644
index 8b59ca1..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd
+++ /dev/null

@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.command.env.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.command.env.ui" id="widgetRegistry" name="widgetRegistry"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="widgetFactory"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="widgetFactory">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="insertBeforeCommandId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/environmentui.properties b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/environmentui.properties
deleted file mode 100644
index bc1f403..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/environmentui.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-BUTTON_SHOW_ALL_DIALOGS=Show All
-BUTTON_HIDE_ALL_DIALOGS=Hide All
-CHECKBOX_DO_NOT_SHOW_DIALOG_AGAIN=Do not show me this dialog box again.
-
-TOOLTIP_PPAD_PAGE=Control to show/hide the dialogs that appear when a pop-up action is executed.
-TOOLTIP_DO_NOT_SHOW_DIALOG_AGAIN=To allow this dialog to show again, enable from preference - dialogs.
-TOOLTIP_PPAD_BUTTON_SHOW_ALL=Show all dialogs.
-TOOLTIP_PPAD_BUTTON_HIDE_ALL=Hide all dialogs and execute pop-up actions.

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/environment.properties b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/environment.properties
deleted file mode 100644
index 7a98e36..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/environment.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-MSG_ERROR_WIZARD_ID_NOT_FOUND=IWAB0013E Could not find wizard id: {0}
-

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java
deleted file mode 100644
index 16cc76a..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class ErrorDialog extends MessageDialog
-{
-
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public ErrorDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    if (status.isMultiStatus() || status.getException() != null )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_ERROR);
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java
deleted file mode 100644
index fa6c84f..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class InfoDialog extends MessageDialog
-{
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public InfoDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    if (status.isMultiStatus() )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java
deleted file mode 100644
index 8efb325..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java
+++ /dev/null

@@ -1,579 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.common.StringUtils;
-import org.eclipse.wst.common.environment.Choice;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class MessageDialog extends Dialog
-{
-  protected Composite parent;
-
-  /**
-   * Reserve room for this many list items.
-   */
-  protected static final int LIST_ITEM_COUNT = 7;
-
-  /**
-   * The Details button.
-   */
-  protected Button detailsButton;
-
-  /**
-   * The title of the dialog.
-   */
-  protected String title;
-
-  /**
-   * The message to display.
-   */
-  protected String message;
-
-  /**
-   * The SWT list control that displays the error details.
-   */
-  protected List list;
-  protected Text details;
-
-  /**
-   * Indicates whether the error details viewer is currently created.
-   */
-  protected boolean listCreated = false;
-  protected boolean detailsCreated = false;
-
-  /**
-   * Filter mask for determining which status items to display.
-   */
-  protected int displayMask = 0xFFFF;
-
-  /**
-   * The main status object.
-   */
-  protected IStatus status;
-  
-  private Point savedSize = null;
-
-  /**
-   * List of the main error object's detailed errors (element type: <code>Status</code>).
-   */
-  protected java.util.List statusList;
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public MessageDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell);
-      this.title = dialogTitle == null ? JFaceResources.getString("Problem_Occurred") : //$NON-NLS-1$
-  dialogTitle;
-    this.message = message == null ? status.getMessage() : JFaceResources.format("Reason", new Object[] { message, status.getMessage()}); //$NON-NLS-1$
-    this.status = status;
-    statusList = Arrays.asList(status.getChildren());
-    this.displayMask = displayMask;
-    setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
-  }
-  /*
-   * (non-Javadoc) Method declared on Dialog. Handles the pressing of the Ok or
-   * Details button in this dialog. If the Ok button was pressed then close
-   * this dialog. If the Details button was pressed then toggle the displaying
-   * of the error details area. Note that the Details button will only be
-   * visible if the error being displayed specifies child details.
-   */
-  protected void buttonPressed(int id)
-  {
-    if (id == StatusDialogConstants.DETAILS_ID)
-    { // was the details button pressed?
-      toggleDetailsArea();
-    }
-    else
-    {
-      super.buttonPressed(id);
-    }
-  }
-  /*
-   * (non-Javadoc) Method declared in Window.
-   */
-  protected void configureShell(Shell shell)
-  {
-    super.configureShell(shell);
-    shell.setText(title);
-  }
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    if (status.isMultiStatus() || status.getException() != null )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-    
-    parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
-  }
-
-  /*
-   * (non-Javadoc) Method declared on Dialog. Creates and returns the contents
-   * of the upper part of the dialog (above the button bar).
-   */
-  protected Control createDialogArea(Composite parent)
-  {
-    this.parent = parent;
-
-    // create composite
-    Composite composite = (Composite) super.createDialogArea(parent);
-    Composite imageAndLabel = new Composite(composite, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    imageAndLabel.setLayout(gl);
-    composite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-    
-    // create image
-    Image image = getDialogImage();
-    if (image != null)
-    {
-      Label label = new Label(imageAndLabel, 0);
-      image.setBackground(label.getBackground());
-      label.setImage(image);
-      label.setLayoutData(
-        new GridData(
-          GridData.HORIZONTAL_ALIGN_CENTER
-            | GridData.VERTICAL_ALIGN_BEGINNING));
-    }
-
-    // create message
-    if (message != null)
-    {
-      Text text = new Text(imageAndLabel, SWT.READ_ONLY|SWT.WRAP);
-      text.setText(message);
-      GridData data =
-        new GridData(
-          GridData.GRAB_HORIZONTAL
-            | GridData.GRAB_VERTICAL
-            | GridData.HORIZONTAL_ALIGN_FILL
-            | GridData.VERTICAL_ALIGN_CENTER);
-      data.widthHint =
-        convertHorizontalDLUsToPixels(
-          IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
-     
-      text.setLayoutData(data);
-      text.setFont(parent.getFont());
-    }
-
-    return composite;
-  }
-
-  protected List createDropDownList(Composite parent)
-  {
-    // create the list
-    list = new List(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
-    // fill the list
-    populateList(list);
-
-    GridData data =
-      new GridData(
-        GridData.HORIZONTAL_ALIGN_FILL
-          | GridData.GRAB_HORIZONTAL
-          | GridData.VERTICAL_ALIGN_FILL
-          | GridData.GRAB_VERTICAL);
-    data.heightHint = list.getItemHeight() * LIST_ITEM_COUNT;
-    list.setLayoutData(data);
-    listCreated = true;
-    return list;
-  }
-  protected Text createDropDownDetails(Composite parent)
-  {
-    details = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.READ_ONLY);
-    //details.setEditable(false);
-    Color color = new Color(parent.getShell().getDisplay(), 255, 255, 255);
-    details.setBackground(color);
-    populateDetails(details, status, 0);
-    GridData data =
-      new GridData(
-        GridData.HORIZONTAL_ALIGN_FILL
-          | GridData.GRAB_HORIZONTAL
-          | GridData.VERTICAL_ALIGN_FILL
-          | GridData.GRAB_VERTICAL);
-    details.setLayoutData(data);
-    details.setSelection(0);
-    detailsCreated = true;
-    return details;
-  }
-  /*
-   * (non-Javadoc) Method declared on Window.
-   */
-  /**
-   * Extends <code>Window.open()</code>. Opens an error dialog to display
-   * the error. If you specified a mask to filter the displaying of these
-   * children, the error dialog will only be displayed if there is at least one
-   * child status matching the mask.
-   */
-  public int open()
-  {
-    if (shouldDisplay(status, displayMask))
-    {
-      return super.open();
-    }
-    return 0;
-  }
-  /**
-   * This essentially does the work of a factory Opens an error dialog to
-   * display the given error. Use this method if the error object being
-   * displayed does not contain child items, or if you wish to display all such
-   * items without filtering.
-   * 
-   * @param parent
-   *            the parent shell of the dialog, or <code>null</code> if none
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @return the code of the button that was pressed that resulted in this
-   *         dialog closing. This will be <code>Dialog.OK</code> if the OK
-   *         button was pressed, or <code>Dialog.CANCEL</code> if this
-   *         dialog's close window decoration or the ESC key was used.
-   */
-  public static int openMessage(
-    Shell parent,
-    String dialogTitle,
-    String message,
-    IStatus status)
-  {
-
-    switch (status.getSeverity())
-    {
-      case IStatus.INFO :
-        return openInfo(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
-      case IStatus.WARNING :
-        return openWarning(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
-      default :
-        return openError(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
-    }
-
-  }
-
-  public static int openMessage(
-    Shell parent,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    Choice[] options)
-  {
-
-    return openOptions(
-      parent,
-      dialogTitle,
-      message,
-      status,
-      IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR,
-      options);
-  }
-
-  /**
-   * Opens an error dialog to display the given error. Use this method if the
-   * error object being displayed contains child items <it>and</it> you wish
-   * to specify a mask which will be used to filter the displaying of these
-   * children. The error dialog will only be displayed if there is at least one
-   * child status matching the mask.
-   * 
-   * @param parentShell
-   *            the parent shell of the dialog, or <code>null</code> if none
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   * @return the code of the button that was pressed that resulted in this
-   *         dialog closing. This will be <code>Dialog.OK</code> if the OK
-   *         button was pressed, or <code>Dialog.CANCEL</code> if this
-   *         dialog's close window decoration or the ESC key was used.
-   */
-  public static int openError(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    ErrorDialog dialog =
-      new ErrorDialog(parentShell, title, message, status, displayMask);
-    return dialog.open();
-  }
-
-  public static int openInfo(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    InfoDialog dialog =
-      new InfoDialog(parentShell, title, message, status, displayMask);
-    return dialog.open();
-  }
-
-  public static int openWarning(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    WarningDialog dialog =
-      new WarningDialog(parentShell, title, message, status, displayMask);
-    return dialog.open();
-  }
-
-  public static int openOptions(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask,
-    Choice[] options)
-  {
-    OptionsDialog dialog =
-      new OptionsDialog(
-        parentShell,
-        title,
-        message,
-        status,
-        displayMask,
-        options);
-    dialog.open();
-    return dialog.getReturnCode();
-  }
-
-  /**
-   * Populates the list using this error dialog's status object. This walks the
-   * child stati of the status object and displays them in a list. The format
-   * for each entry is status_path : status_message If the status's path was
-   * null then it (and the colon) are omitted.
-   */
-  private void populateList(List list)
-  {
-    Iterator enumeration = statusList.iterator();
-    while (enumeration.hasNext())
-    {
-      IStatus childStatus = (IStatus) enumeration.next();
-      populateList(list, childStatus, 0);
-    }
-  }
-  private void populateList(List list, IStatus status, int nesting)
-  {
-    if (!status.matches(displayMask))
-    {
-      return;
-    }
-    StringBuffer sb = new StringBuffer();
-    for (int i = 0; i < nesting; i++)
-    {
-      sb.append("  ");
-    }
-    sb.append(status.getMessage());
-    list.add(sb.toString());
-    IStatus[] children = status.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      populateList(list, children[i], nesting + 1);
-    }
-  }
-  private void populateDetails(Text text, IStatus status, int nesting)
-  {
-    if (!status.matches(displayMask))
-    {
-      return;
-    }
-        
-    String    tabChars    = StringUtils.repeat( ' ', nesting * 2 );
-    String    messageLine = tabChars + status.getMessage() + System.getProperty("line.separator");
-    Throwable except      = status.getException();
-    
-    text.append( messageLine );
-    
-    if( except != null )
-    {
-      String[] trace = StringUtils.getStackTrace( except );
-      
-      for( int index = 0; index < trace.length; index++ )
-      {
-        text.append( tabChars + "    " + trace[index] + System.getProperty("line.separator") );
-      }
-    }
-    
-    IStatus[] children = status.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      populateDetails(text, children[i], nesting + 1);
-    }
-  }
-  /**
-   * Returns whether the given status object should be displayed.
-   * 
-   * @param status
-   *            a status object
-   * @param mask
-   *            a mask as per <code>Status.matches</code>
-   * @return <code>true</code> if the given status should be displayed, and
-   *         <code>false</code> otherwise
-   */
-  protected static boolean shouldDisplay(IStatus status, int mask)
-  {
-    IStatus[] children = status.getChildren();
-    if (children == null || children.length == 0)
-    {
-      return status.matches(mask);
-    }
-    for (int i = 0; i < children.length; i++)
-    {
-      if (children[i].matches(mask))
-        return true;
-    }
-    return false;
-  }
-  /**
-   * Toggles the unfolding of the details area. This is triggered by the user
-   * pressing the details button.
-   */
-  private void toggleDetailsArea()
-  {
-    Point windowSize = getShell().getSize();
-    int   newHeight  = -1;
-    
-    if (detailsCreated)
-    {
-      details.dispose();
-      detailsCreated = false;
-      detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-      
-      // Without the following computeSize call the setSize call below throws an array out of bounds exception.
-      // Very weird.
-      getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-      
-      newHeight = savedSize.y;
-    }
-    else
-    {
-      if( savedSize == null ) savedSize = windowSize;
-        
-      details = createDropDownDetails((Composite) getContents());
-      detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
-      newHeight = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
-    }
-
-
-    newHeight = newHeight > 400 ? 400 : newHeight;
-    
-    getShell().setSize( new Point(windowSize.x, newHeight) );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java
deleted file mode 100644
index 24ceea3..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.environment.Choice;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class OptionsDialog extends MessageDialog
-{
-  private Choice[] choices;
-  private int returnCode_;
-
-  public OptionsDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask,
-    Choice[] choices)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-    this.choices = choices;
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create a button for each options
-    for (int i = 0; i < choices.length; i++)
-    {
-      createButton(parent, choices[i].getShortcut(), choices[i].getLabel(), true);
-    }
-    if (status.isMultiStatus() )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  protected void buttonPressed(int id)
-  {
-    if (id == StatusDialogConstants.DETAILS_ID)
-      // was the Details button pressed?
-      super.buttonPressed(id);
-    else
-    {
-      setReturnCode(id);
-      close();
-    }
-  }
-
-  protected void setReturnCode(int id)
-  {
-    returnCode_ = id;
-  }
-
-  public int getReturnCode()
-  {
-    return returnCode_;
-  }
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    switch (status.getSeverity())
-    {
-      case IStatus.INFO :
-        return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
-      case IStatus.WARNING :
-        return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_WARNING);
-      default :
-        return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_ERROR);
-    }
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java
deleted file mode 100644
index 4e56788..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-/**
-* Constants for status dialogs
-*/
-public interface StatusDialogConstants {
-
-  /*
-  * Button ID for the "Yes" button
-  */
-  public static final int YES_ID = 2;
-  /*
-  * Button ID for the "Yes to all" button
-  */
-  public static final int YES_TO_ALL_ID = 4;
-  /*
-  * Button ID for the "Cancel" button
-  */
-  public static final int CANCEL_ID = 1;
-  /*
-  * Button ID for the "OK" button
-  */
-  public static final int OK_ID = 0;
-  /*
-  * Button ID for the "Details" button
-  */
-  public static final int DETAILS_ID = 13;
-
-  /*
-  * Button label for the "Yes" button
-  */
- // public static final String YES_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_YES_LABEL");
-  /*
-  * Button label for the "Yes to all" button
-  */
- // public static final String YES_TO_ALL_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_YES_TO_ALL_LABEL");
-  /*
-  * Button label for the "Cancel" button
-  */
- // public static final String CANCEL_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_CANCEL_LABEL");
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java
deleted file mode 100644
index 9d28e3d..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class WarningDialog extends MessageDialog
-{
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public WarningDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK, Cancel and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    createButton(
-      parent,
-      StatusDialogConstants.CANCEL_ID,
-      IDialogConstants.CANCEL_LABEL,
-      false);
-    if (status.isMultiStatus())
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_WARNING);
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseEnvironment.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseEnvironment.java
deleted file mode 100644
index b8cadc2..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseEnvironment.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.eclipse;
-
-import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.uri.SimpleURIFactory;
-import org.eclipse.wst.common.environment.uri.IURIFactory;
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-
-
-/**
- * This class implements an IEnvironment class for the Eclipse IEnvironment.
- * This IEnvironment currently supports the "platform" protocol and the "file"
- * protocol.
- *
- */
-public class EclipseEnvironment implements BaseEclipseEnvironment
-{
-  private CommandManager   commandManager_  = null;
-  private SimpleURIFactory uriFactory_      = null;
-  private ResourceContext  resourceContext_ = null;
-  private IStatusHandler    statusHandler_   = null;
-  private ILog              logger_          = null;
-  
-  public EclipseEnvironment( CommandManager  commandManager, 
- 		                         ResourceContext resourceContext,
-						                 IStatusHandler   statusHandler )
-  {
-    IURIScheme eclipseScheme = EnvironmentService.getEclipseScheme( this );
-    IURIScheme fileScheme    = EnvironmentService.getFileScheme();
-    
-    commandManager_  = commandManager;
-    resourceContext_ = resourceContext;
-    uriFactory_      = new SimpleURIFactory();
-    statusHandler_   = statusHandler;
-    
-    uriFactory_.registerScheme( "platform", eclipseScheme );
-    uriFactory_.registerScheme( "file", fileScheme );
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getCommandManager()
-   */
-  public CommandManager getCommandManager()
-  {
-    return commandManager_;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getLog()
-   */
-  public ILog getLog()
-  {
-	  if( logger_ == null )
-    {  
-      logger_ = EnvironmentService.getEclipseLog(); 
-    };
-	
-    return logger_;
-  }
-
-  /**
-   * 
-   * @param logger the new logger for this environment.
-   */
-  public void setLog( ILog logger )
-  {
-	logger_ = logger;  
-  }
-   
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getStatusHandler()
-   */
-  public IStatusHandler getStatusHandler()
-  {
-    return statusHandler_;
-  }
-
-  /** (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getURIFactory()
-   */
-  public IURIFactory getURIFactory()
-  {
-    return uriFactory_;
-  }
-
-  /**
-   * @return returns a ResourceContext for this IEnvironment.
-   */
-  public ResourceContext getResourceContext()
-  {
-    return resourceContext_;
-  }
-  
-  public void setCommandManager( CommandManager manager )
-  {
-	commandManager_ = manager;  
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java
deleted file mode 100644
index dfe021d..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.eclipse;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.ui.dialog.MessageDialog;
-import org.eclipse.wst.command.internal.env.ui.dialog.StatusDialogConstants;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-
-/**
- * This is the Eclipse UI version of the IStatusHandler
- */
-public class EclipseStatusHandler implements IStatusHandler
-{
-  private Shell        shell_;
-  private MessageUtils msg_;
-  
-  public EclipseStatusHandler()
-  {
-    this( new Shell() );
-  }
-
-  public EclipseStatusHandler(Shell shell)
-  {
-    msg_   = new MessageUtils( "org.eclipse.wst.command.internal.env.common.environment", this );
-    shell_ = shell;
-  }
-  
-  /**
-   * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[])
-   */
-  public Choice report(IStatus status, Choice[] choices) 
-  {
-    int result =
-    MessageDialog.openMessage(
-        shell_,
-        msg_.getMessage("TITLE_WARNING"),
-				null,
-				status,
-				choices);
-    for (int i = 0; i < choices.length; i++)
-     {
-      if (choices[i].getShortcut() == result)
-        return choices[i];
-    }
-    
-    return null;
-  }
-
-  /**
-   * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status)
-   */
-  public void report(IStatus status) throws StatusException
-  {
-    boolean userOk = false;
-    
-    switch (status.getSeverity())
-    {
-      // an error has been reported and we need to stop executing the comming
-      // commands
-      case Status.ERROR :
-      {
-        userOk = reportErrorStatus(status);
-        break;
-      }
-      case Status.WARNING :
-      {
-        userOk = reportWarning(status);
-        break;
-      }     
-      case Status.INFO :
-      {
-        userOk = true;
-        reportInfo(status);
-        break;
-      }
-    }
-    
-    if( !userOk ) throw new StatusException( status );
-  }
-  
-  private boolean reportWarning(IStatus status)
-  {
-    int userResponse =
-      MessageDialog.openMessage(
-        shell_,
-        msg_.getMessage("TITLE_WARNING"),
-        null,
-        status);
-    return (userResponse == StatusDialogConstants.OK_ID);
-  }
-
-  private boolean reportErrorStatus(IStatus status)
-  {
-    MessageDialog.openMessage(
-      shell_,
-      msg_.getMessage("TITLE_ERROR"),
-      null,
-      status);
-    return false;
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.common.IStatusHandler#reportError(org.eclipse.wst.command.internal.env.core.common.Status)
-   */
-  public void reportError(IStatus status)
-  {
-    reportErrorStatus( status );
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.common.IStatusHandler#reportInfo(org.eclipse.wst.command.internal.env.core.common.Status)
-   */
-  public void reportInfo(IStatus status)
-  {
-    MessageDialog.openMessage(
-        shell_,
-        msg_.getMessage("TITLE_INFO"),
-        null,
-        status);
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java
deleted file mode 100644
index cef2bd0..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EnvUIPlugin extends Plugin {
-
-	//The shared instance.
-	private static EnvUIPlugin instance;
-
-	/**
-	 * The constructor.
-	 */
-	public EnvUIPlugin() {
-		super();
-		instance = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static EnvUIPlugin getInstance() {
-		return instance;
-	}
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java
deleted file mode 100644
index 6957197..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-
-
-/**
- * This class can be used to create a popup actions preference page for a 
- * particular category.  For example:
- *
- * <pre>
- *  &lt;extension
- *        point="org.eclipse.ui.preferencePages"&gt;
- *     &lt;page
- *           name="%PREFERENCE_CATEGORY_DIALOGS"
- *           category="org.eclipse.jst.ws.ui.preferences.name"
- *           class="org.eclipse.wst.command.internal.env.preferences.ActionDialogsPreferencePage"
- *           id="org.eclipse.jst.wss.popup.category"&gt;
- *     &lt;/page&gt;
- * * </pre>
- * This entry specifies that all popup actions that are associated with the
- * org.eclipse.jst.wss.popup.category will be displayed on this
- * preference page.
- */
-public class ActionDialogsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener, IExecutableExtension
-{
-  /*CONTEXT_ID PPAD0001 for the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_PAGE = "org.eclipse.wst.command.env.ui.PPAD0001";
-  //
-  private Button showAll;
-  /*CONTEXT_ID PPAD0002 for the  show all check box on the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_BUTTON_SHOW_ALL = "org.eclipse.wst.command.env.ui.PPAD0002";
-  //
-  private Button hideAll;
-  /*CONTEXT_ID PPAD0003 for the  hide all check box on the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_BUTTON_HIDE_ALL = "org.eclipse.wst.command.env.ui.PPAD0003";
-
-  private Hashtable checkBoxes_;
-  private String    categoryId_;
-  
-  public void setInitializationData( IConfigurationElement config,
-                                     String                propertyName,
-                                     Object                data )
-    throws CoreException
-  {
-    categoryId_   = config.getAttribute( "id" );
-  }
-
-  /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-    MessageUtils msgUtils = new MessageUtils( "org.eclipse.wst.command.env.ui.environmentui", this );
-    
-    checkBoxes_ = new Hashtable();
-    addOptionalDialogsCheckBoxes (superparent);
-	new Label(superparent, SWT.HORIZONTAL);
-	
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    parent.setLayout( layout );
-    parent.setToolTipText(msgUtils.getMessage("TOOLTIP_PPAD_PAGE"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, INFOPOP_PPAD_PAGE );
-	
-    showAll = new Button(parent, SWT.NONE);
-    showAll.setText(msgUtils.getMessage("BUTTON_SHOW_ALL_DIALOGS"));
-    showAll.addListener(SWT.Selection, this);
-    showAll.setToolTipText(msgUtils.getMessage("TOOLTIP_PPAD_BUTTON_SHOW_ALL"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(showAll, INFOPOP_PPAD_BUTTON_SHOW_ALL );
-   
-    hideAll = new Button(parent, SWT.NONE);
-    hideAll.setText(msgUtils.getMessage("BUTTON_HIDE_ALL_DIALOGS"));
-    hideAll.addListener ( SWT.Selection, this);
-    hideAll.setToolTipText(msgUtils.getMessage("TOOLTIP_PPAD_BUTTON_HIDE_ALL"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(hideAll, INFOPOP_PPAD_BUTTON_HIDE_ALL );
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-    return parent;
-  }
-
- public void handleEvent (Event event) 
- {
-    if (showAll == event.widget)
-		handleShowAllEvent();
-    
-    else if ( hideAll == event.widget)
-    	handleHideAllEvent();
- }
-
- private void handleShowAllEvent ()
- {
-    Enumeration e = checkBoxes_.elements();
- 	for (int i=0; e.hasMoreElements(); i++)
-    	{
-    		Button dialog = (Button) e.nextElement();
-    		dialog.setSelection( false );
-    	}                      
- }
-
- private void handleHideAllEvent ()
- {
- 	Enumeration e = checkBoxes_.elements();
- 	for (int i=0; e.hasMoreElements(); i++)
-    	{
-    		Button dialog = (Button) e.nextElement();
-    		dialog.setSelection( true );
-    	}
- }
- 
- private void addOptionalDialogsCheckBoxes ( Composite parent)
-  {
-    PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-    ActionDialogPreferenceType[] dialogs = context.getDialogs();
-    
-    for (int i = 0; i < dialogs.length; i++) 
-    {
-      ActionDialogPreferenceType dialog   = dialogs[i];
-      String                     category = dialog.getCategory();
-      
-      if( dialog.getShowCheckbox() &&  category != null && category.equals( categoryId_) )
-      {
-    	Button checkBox = createCheckBox(parent, dialog.getName());
-    	checkBox.setToolTipText( dialog.getTooltip() );
-    	PlatformUI.getWorkbench().getHelpSystem().setHelp(checkBox, dialog.getInfopop() );
-    	checkBoxes_.put(dialog.getId(), checkBox);
-      }
-    }
-  }
-  
-  private Button createCheckBox( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.CHECK );
-    button.setText( text );
-    return button;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults()
-  {
-    Enumeration e = checkBoxes_.elements();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      Button dialog = (Button) e.nextElement();
-      dialog.setSelection(true);
-    }
-  }
-
-  /**
-   * Initializes states of the controls from the preferences.
-   */
-  private void initializeValues()
-  {
-    PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-    Enumeration e = checkBoxes_.keys();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      String id = (String) e.nextElement();
-      Button button = (Button) checkBoxes_.get(id);
-      button.setSelection(context.isActionDialogEnabled(id));
-    }
-  }
-
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-    PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-
-    Enumeration e = checkBoxes_.keys();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      String id = (String) e.nextElement();
-      context.setActionDialogEnabled(id, ((Button)checkBoxes_.get(id)).getSelection());
-    }
-  }
-}
-

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java
deleted file mode 100644
index f55e12a..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.registry;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class WidgetRegistry 
-{
-  private static WidgetRegistry registry_;
-  
-  private Hashtable entries_;
-  
-  private WidgetRegistry()
-  {
-  }
-  
-  public static WidgetRegistry instance()
-  {
-    if( registry_ == null )
-	{
-	  registry_ = new WidgetRegistry();
-	  registry_.load();
-	}
-	
-	return registry_;
-  }
-  
-  /**
-   * 
-   * @param id the methodId that may have WidgetContributor associated with it.
-   * @return returns a INamedWidgetContributorFactory if one was defined in the registry.
-   * Otherwise null is returned.
-   */
-  public INamedWidgetContributorFactory getFactory( String id )
-  {
-	INamedWidgetContributorFactory factory = null;
-	Entry                          entry   = (Entry)entries_.get( id );
-	
-	if( entry != null )
-	{
-	  try
-	  {
-		if( entry.factory_ == null )
-		{
-		  entry.factory_ = (INamedWidgetContributorFactory)entry.element_.createExecutableExtension( "class" );
-		}
-		
-		factory = entry.factory_;
-	  }
-	  catch( CoreException exc )
-	  {
-	    exc.printStackTrace();
-	  }
-	  catch( Throwable exc )
-	  {
-		exc.printStackTrace();
-	  }
-	}
-	
-	return factory;
-  }
-  
-  private void load()
-  {
-	IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.wst.command.env.ui.widgetRegistry");
-	
-	entries_ = new Hashtable();
-	
-	for( int index = 0; index < elements.length; index++ )
-	{
-	  // If this is not an element that know about we will skip it.
-	  if( !elements[index].getName().equals("widgetFactory") ) continue;
-	  
-	  Entry                 entry    = new Entry();
-	  IConfigurationElement element  = elements[index];
-	  String                id       = element.getAttribute( "id" );
-	  String                methodId = element.getAttribute( "insertBeforeCommandId" );
-	  
-	  entry.element_ = element;
-	  entry.id_      = id;
-	  
-	  entries_.put( methodId, entry );
-	}
-  }
-  
-  private class Entry
-  {
-    String                         id_;
-	IConfigurationElement          element_;
-	INamedWidgetContributorFactory factory_;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java
deleted file mode 100644
index bfe0a0e..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-
-/**
- * This is an interface for an abstract can finish registry.
- * This registry is usually associate with an Eclipse wizard.  This
- * registry allow condition object to be added to it in order to
- * determine if the wizard can finish or not.
- *
- */
-public interface CanFinishRegistry
-{
-  /**
-   * Add a condition object to the registry.
-   * @param condition the condition.
-   */
-  public void addCondition( Condition condition );
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java
deleted file mode 100644
index afd591b..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory;
-
-
-public interface CommandWidgetBinding extends CommandFragmentFactoryFactory
-{
-  /**
-   * This method is used by extensions to register their widgets with
-   * CommandFragments
-   * 
-   * @param widgetRegistry
-   */
-  public void registerWidgetMappings( WidgetRegistry widgetRegistry );
-  
-  /**
-   * This method is used by extenions to register the data mappings
-   * that their widgets use.
-   * 
-   * @param dataRegistry
-   */
-  public void registerDataMappings( DataMappingRegistry dataRegistry );
-  
-  /**
-   * This method is used by extensions to register condition objects
-   * that control if the wizard can finish or not.
-   * 
-   * @param canFinishRegistry
-   */
-  public void registerCanFinish( CanFinishRegistry canFinishRegistry );
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java
deleted file mode 100644
index 7b87845..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java
+++ /dev/null

@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-
-public class CommandWidgetBindingList implements CommandWidgetBinding
-{
-  private Vector                 bindings_;
-  private Vector                 fragments_;
-  private CommandFragmentFactory factory_;
-  
-  /**
-   * This CommandWidgetBinding combines a list of CommandWidgetBindings.
-   * There should be the same number of entries in both the bindings
-   * parameter and the fragments parameter.  Entries in either of the
-   * bindings for fragments vectors are allowed to be null.
-   * 
-   * @param bindings   the bindings to combine.
-   * @param fragments  These fragments will be interspersed with the
-   *                   fragments associated with each binding.  The first
-   *                   fragment will be put before the fragment from the
-   *                   first binding.  Following this will be the second
-   *                   fragment from the fragments vector and then the
-   *                   second fragment from the bindings vector, etc.
-   */
-  public CommandWidgetBindingList( Vector bindings, Vector fragments )
-  {
-    bindings_  = bindings; 
-    fragments_ = fragments;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry) 
-  {
-    int length = bindings_.size();
-    
-    for( int index = 0; index < length; index++ )
-    {
-      CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-      
-      if( binding != null ) binding.registerCanFinish( canFinishRegistry );
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-    int length = bindings_.size();
-    
-    for( int index = 0; index < length; index++ )
-    {
-      CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-      if( binding != null ) binding.registerDataMappings( dataRegistry );
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry) 
-  {
-    int length = bindings_.size();
-    
-    for( int index = 0; index < length; index++ )
-    {
-      CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-      if( binding != null ) binding.registerWidgetMappings( widgetRegistry );
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    if( factory_ == null )
-    {
-      factory_ = new CommandFragmentFactory()
-        {
-          public CommandFragment create()
-          {
-            SequenceFragment fragmentList = new SequenceFragment();
-            int              length       = bindings_.size();
-            
-            for( int index = 0; index < length; index++ )
-            {
-              CommandFragment fragment = (CommandFragment)fragments_.elementAt( index );
-              
-              if( fragment != null )
-              {
-                fragmentList.add( fragment );
-              }
-              
-              CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-              
-              if( binding != null )
-              {
-                fragmentList.add( binding.create().create() );
-              }
-            }
-            
-            return fragmentList;
-          }
-        }; 
-    }
-    
-    return factory_;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java
deleted file mode 100644
index 6509401..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * This Command can be used to get the current page.
- * Use of this class is not recommended.
- *
- */
-public class CurrentPageCommand extends AbstractDataModelOperation
-{
-  private WizardPageManager pageManager_;
-  
-  public CurrentPageCommand( WizardPageManager pageManager )
-  {
-    pageManager_ = pageManager;
-  }
-  
-  public IWizardPage getCurrentPage()
-  {
-    return pageManager_.getCurrentPage();
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java
deleted file mode 100644
index 0450ad3..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * This Command can be use to get the resulting data object for
- * this wizard.
- *
- */
-public class DataObjectCommand extends AbstractDataModelOperation
-{
-  private Object dataObject_;
-  
-  public void setDataObject( Object object )
-  {
-    dataObject_ = object;
-  }
-  
-  public Object getDataObject()
-  {
-    return dataObject_;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java
deleted file mode 100644
index 3a9a205..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java
+++ /dev/null

@@ -1,389 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.osgi.framework.Bundle;
-
-
-/**
- * This class is used to add dynamic wizards into Eclipse.  When adding
- * a dynamic wizard into eclipse two entries need to be made in the plugin.xml
- * file.  This first entry tells Eclipse that a new wizard should be added
- * and it references this class.  The second entry specifies detailed information
- * that is specific to the wizard to be added.  These two plugin.xml entries
- * are linked together via their id attributes.  For example here is an
- * entry that registers a new wizard with eclipse.  Note the class attribute
- * references this class.
- * <pre>
- *   &lt;extension
- *        point="org.eclipse.ui.newWizards"&gt;
- *     &lt;wizard
- *           name="%PLUGIN_NEW_WIZARD_NAME_WS_CLIENT"
- *           icon="icons/full/ctool16/newclient_webserv_wiz.gif"
- *           category="org.eclipse.jst.ws.ui.new"
- *           class="org.eclipse.wst.command.env.ui.widgets.DynamicWizard"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *        &lt;description&gt;
- *           %PLUGIN_NEW_WIZARD_DESC_WS_CLIENT
- *        &lt;/description&gt;
- *        &lt;selection
- *              class="org.eclipse.core.resources.IResource"&gt;
- *        &lt;/selection&gt;
- *     &lt;/wizard&gt;
- *   &lt;/extension&gt;
- *
- * </pre>
- * Here is the dynamicWizard entry for this particular wizard.  This id attributes
- * link these two entries together.  The class attribute must specify a class that
- * implements the org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding interface.  This
- * interface specifies what the UI should look like and the commands the should
- * be executed in the wizard.
- * 
- * <pre>
- *   &lt;extension
- *        point="org.eclipse.wst.command.env.dynamicWizard"&gt;
- *     &lt;dynamicWizard
- *           iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
- *           class="org.eclipse.jst.ws.consumption.ui.widgets.binding.ClientWidgetBinding"
- *           title="%WIZARD_TITLE_WSC"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *     &lt;/dynamicWizard&gt;
- *   &lt;/extension&gt;
- * </pre>
- *
- */
-public class DynamicWizard extends Wizard implements INewWizard, IExecutableExtension
-{
-  private   String                  iconBannerName_;
-  private   Bundle                  bundle_;
-  private   SimpleCanFinishRegistry canFinishRegistry_; 
-  private   WizardPageManager       pageManager_;
-  private   String                  wizardTitle_;
-  private   DataObjectCommand       dataObjectCommand_ = null;
-
-  protected IWizardPage             startPage_ = null;
-  protected IConfigurationElement   wizardElement_;
-  protected IConfigurationElement   originalElement_;
-  protected CommandWidgetBinding    commandWidgetBinding_;
-  
-  public DynamicWizard()
-  {
-	setNeedsProgressMonitor(true);
-  }
-  
-  /**
-   * This method is called when the Dynamic wizard is created by eclipse.
-   * We need to find a dynamicWizard extension point that matches the id
-   * for this wizard.  Once the extension point is found it will contain
-   * a reference to a CommandWidgetBinding class which defines the widgets 
-   * and commands for this wizard.
-   * 
-   * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-   */
-  public void setInitializationData( IConfigurationElement config,
-			                         String                propertyName,
-			                         Object                data )
-    throws CoreException
-  {
-    String wizardId   = config.getAttribute( "id" );
-    
-    setInitialData( wizardId );
-    originalElement_ = config;
-  }
-  
-  /**
-   * This method should only be called if the Dynamic Wizard is being
-   * launched through some other mechanise other than the Eclipse New Wizard
-   * mechanism.
-   * 
-   * @param binding        the command widget binding for this wizard.
-   * @param descriptor     the plugin descriptor where the icon banner is
-   *                       located.
-   * @param iconBannerPath the icon banner path for this wizard.  The path
-   *                       is relative to the plugin specified by the 
-   *                       descriptor parameter.
-   * @param wizardTitle    the wizard title
-   */
-  public void setInitialData( CommandWidgetBinding binding,
-                              Bundle               bundle,
-                              String               iconBannerPath,
-                              String               wizardTitle )
-  {
-    commandWidgetBinding_ = binding;
-    bundle_               = bundle;
-    iconBannerName_       = iconBannerPath;
-    wizardTitle_          = wizardTitle;
-  }
-  
-  /**
-   * Sets the initial data based on the dynamic wizard id.
-   * 
-   * @param wizardId
-   */
-  public void setInitialData( String wizardId ) throws CoreException
-  {
-    IExtensionRegistry    registry      = Platform.getExtensionRegistry();
-    IExtensionPoint       point         = registry.getExtensionPoint("org.eclipse.wst.command.env.dynamicWizard");
-    IExtension[]          extensions    = point.getExtensions();
-    
-    for( int index = 0; index < extensions.length; index++) 
-    {
-      IConfigurationElement[] elements = extensions[index].getConfigurationElements();
-      
-      if( elements.length == 1 && elements[0].getName().equals( "dynamicWizard") ) 
-      {
-        String id = elements[0].getAttribute( "id" );
-        
-        if( id != null && id.equals( wizardId ) )
-        {
-          wizardElement_ = elements[0];
-          break;
-        }
-      }
-    }
-        
-    if( wizardElement_ == null )
-    {
-      MessageUtils msg = new MessageUtils( "org.eclipse.wst.command.env.ui.widgets.environment", this );
-      Status status = new Status( Status.ERROR, "id", 0, msg.getMessage( "MSG_ERROR_WIZARD_ID_NOT_FOUND", new String[]{ wizardId}) , null );
-      throw new CoreException( status );
-    }
-  }
-    
-  /**
-   * This method is called by the eclipse framework to initialize the
-   * wizard. 
-   * 
-   * @param workbench the eclipse workbench
-   * @param selection the initial selection that the user has made within
-   *                  eclipse.
-   */
-  public void init ( IWorkbench workbench, IStructuredSelection selection )
-  {    
-    PersistentResourceContext context        = PersistentResourceContext.getInstance();
-    EclipseStatusHandler      handler        = new EclipseStatusHandler();
-    EclipseEnvironment        environment    = new EclipseEnvironment( null, context, handler );
-    
-    DataMappingRegistryImpl dataRegistry_   = new DataMappingRegistryImpl();
-    SimpleWidgetRegistry    widgetRegistry_ = new SimpleWidgetRegistry();  
-    DataFlowManager         dataManager     = new DataFlowManager( dataRegistry_, environment );
-    
-    try
-    {
-      commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" );
-      bundle_               = Platform.getBundle( wizardElement_.getNamespace() );
-      iconBannerName_       = wizardElement_.getAttribute( "iconbanner" );
-      wizardTitle_          = wizardElement_.getAttribute( "title" );
-    }
-    catch( CoreException exc )
-    {
-      exc.printStackTrace();
-    }
-    
-	dataObjectCommand_ = new DataObjectCommand();
-    startPage_         = null;
-    canFinishRegistry_ = new SimpleCanFinishRegistry(); 
-    pageManager_       = new WizardPageManager( widgetRegistry_, 
-                                                getWizardPageFactory(), 
-				                                this,
-				                                dataManager,
-				                                environment );  
-    
-    pageManager_.setRootFragment( getRootFragment( selection, pageManager_ ) );
-    
-    commandWidgetBinding_.registerWidgetMappings( widgetRegistry_ );
-    commandWidgetBinding_.registerDataMappings( dataRegistry_ );
-    commandWidgetBinding_.registerCanFinish( canFinishRegistry_ );
-        
-    // If a page is not complete ensure that canFinish is false.
-    Condition canFinish = new Condition()
-                          {
-                            public boolean evaluate()
-                            {
-                              IWizardPage currentPage = pageManager_.getCurrentPage();
-                              
-                              return currentPage != null ? currentPage.isPageComplete() : true;
-                            }
-                          }; 
-    
-    canFinishRegistry_.add( canFinish );
-    
-    // Set that we need a progress monitor.
-    setNeedsProgressMonitor( true );
-    
-    // Ensure that the next/back buttons are enabled.
-	setForcePreviousAndNextButtons( true );
-    
-    // Set the icon banner if specified.
-    if( iconBannerName_ != null && iconBannerName_.length() > 0 )
-    {
-      try
-      {
-        URL installURL        = bundle_.getEntry("/");
-        URL imageURL          = new URL(installURL, iconBannerName_ );
-        ImageDescriptor image = ImageDescriptor.createFromURL(imageURL);
-        
-        if( image != null )
-        {
-          setDefaultPageImageDescriptor( image );
-        }
-      }
-      catch (MalformedURLException e)
-      {
-      }
-    }
-    
-    if( wizardTitle_ != null && wizardTitle_.length() > 0 )
-    {
-      setWindowTitle( wizardTitle_ );
-    }
-  }
-  
-  // Subclasses can override this.
-  protected WizardPageFactory getWizardPageFactory()
-  {
-    return new SimplePageFactory();
-  }
-  
-  /**
-  * Returns true if all pages are complete.
-  * @return True if all pages are complete.
-  */
-  public boolean canFinish ()
-  {
-  	int     length = canFinishRegistry_.size();
-  	boolean result = true;
-  	
-    for( int index = 0; index < length; index++ )
-    {
-      Condition condition = (Condition)canFinishRegistry_.elementAt( index );
-    
-      result = condition.evaluate();
-      
-      if( !result ) break;
-    }
-    
-    return result;
-  }
-
-  /**
-    * Returns the first page for this wizard.
-    *
-    * @return the first page for this wizard.
-  **/
-  public IWizardPage getStartingPage()
-  {
-  	if( startPage_ == null )
-  	{
-  		startPage_ = pageManager_.getNextPage();
-  	}
-  	
-    return startPage_;
-  }
-
-  /**
-    * Returns the next page after page and
-    * runs the appropriate tasks.
-    *
-    * @return the next page after page.
-  **/
-  public IWizardPage getNextPage( IWizardPage page )
-  {   
-    return pageManager_.getNextPage();
-  }
-  
-  /**
-  */
-  public boolean performFinish ()
-  { 
-    boolean result = pageManager_.performFinish();
-    
-    if( result ) cleanup();
-    
-    return result;
-  }
-
-  /**
-   * Undo fragments
-  */
-  public boolean performCancel ()
-  {
-  	boolean result = pageManager_.performCancel();
-  	
-  	if( result ) cleanup();
-  	
-  	return result;
-  }  
-      
-  public Object getDataObject()
-  {
-    return dataObjectCommand_.getDataObject();  
-  }
-  
-  protected CommandFragment getRootFragment( IStructuredSelection selection, WizardPageManager pageManager )
-  {
-    SequenceFragment root = new SequenceFragment();
-    
-    root.add( new SimpleFragment( new SelectionCommand( selection ), "" ) );
-    root.add( new SimpleFragment( new CurrentPageCommand( pageManager ), "" ) );
-    root.add( commandWidgetBinding_.create().create() );
-	root.add( new SimpleFragment( dataObjectCommand_, "" ));
-    
-    return root;
-  }
-  
-  protected IConfigurationElement getConfigElement()
-  {
-    return wizardElement_;
-  }
-  
-  /**
-   * This method frees up the memory held by this object.
-   *
-   */
-  private void cleanup()
-  {
-	iconBannerName_       = null;;
-	bundle_               = null;;
-	canFinishRegistry_    = null; 
-	pageManager_          = null;
-	wizardTitle_          = null;
-	dataObjectCommand_    = null;
-	startPage_            = null;
-	commandWidgetBinding_ = null;  
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java
deleted file mode 100644
index a5baf32..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-public interface INamedWidgetContributor 
-{
-  /**
-   * 
-   * @return returns the WidgetContributor for this Named widget.
-   */
-  public WidgetContributorFactory getWidgetContributorFactory();
-  
-  /**
-   * 
-   * @return returns the name.
-   */
-  public String getName ();
-  
-  /**
-   * 
-   * @return returns a description that might be displayed on
-   * a wizard page.
-   */
-  public String getDescription ();
-  
-  /**
-   * 
-   * @return returns title that may be displayed on 
-   * a wizard page.
-   */
-  public String getTitle();  
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java
deleted file mode 100644
index f14ff03..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-public interface INamedWidgetContributorFactory 
-{
-  /**
-   * 
-   * @return returns the first named widget.
-   */
-  INamedWidgetContributor getFirstNamedWidget();
-  
-  /**
-   * 
-   * @param widgetContributor
-   * @return returns the next named widget after the one specified.
-   */
-  INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor );
-  
-  /**
-   * This method is used by extenions to register the data mappings
-   * that their widgets use.
-   * 
-   * @param dataRegistry
-   */
-  public void registerDataMappings( DataMappingRegistry dataRegistry );
-  
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java
deleted file mode 100644
index cbad7b2..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-
-public class PageInfo 
-{
-  private String                   pageName_;
-  private String                   pageTitle_;
-  private WidgetContributorFactory widgetFactory_;
-  
-  public PageInfo( String                   pageName,
-                   String                   pageTitle,
-                   WidgetContributorFactory widgetFactory )
-  {
-    pageName_       = pageName;
-    pageTitle_      = pageTitle;
-    widgetFactory_  = widgetFactory;
-  }   
-  
-  public String getPageName()
-  {
-    return pageName_;
-  }
-  
-  public String getPageTitle()
-  {
-    return pageTitle_;
-  }
-  
-  public WidgetContributorFactory getWidgetFactory()
-  {
-    return widgetFactory_;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java
deleted file mode 100644
index b4c8589..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * Dynamic wizard implementations that want to create different
- * kinds of wizard pages need to implement this interface.
- * The WizardPageFactory returns a class of this type.
- *
- */
-public interface PageWizardDataEvents extends IWizardPage
-{
-  /**
-   * 
-   * @return returns the WidgetDataEvents object created by the addControls
-   * method of a WidgetContributor.
-   */
-  public WidgetDataEvents getDataEvents();
-  
-  /**
-   * Validates that this wizard page is complete. 
-   *
-   */
-  public void validatePageToStatus();
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java
deleted file mode 100644
index 1abb1e6..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * This SelectionCommand is execute at the very beginning of the
- * dynamic wizard.  Commands executed in the wizard that need
- * the initial selection can get it through a data mapping from 
- * this command to the command that needs it.
- *
- */
-public class SelectionCommand extends AbstractDataModelOperation
-{
-  private IStructuredSelection selection_;
-  
-  public SelectionCommand( IStructuredSelection selection )
-  {
-    selection_ = selection;  
-  }
-  
-  public IStructuredSelection getInitialSelection()
-  {
-    return selection_;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java
deleted file mode 100644
index 43d193f..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-
-
-
-public class SimpleCanFinishRegistry extends Vector implements CanFinishRegistry
-{
-
-  /**
-   * Comment for <code>serialVersionUID</code>
-   */
-  private static final long serialVersionUID = 3257285837870741305L;
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.widgets.CanFinishRegistry#addCondition(org.eclipse.env.command.fragment.Condition)
-   */
-  public void addCondition(Condition condition)
-  {
-    add( condition );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java
deleted file mode 100644
index 703b39c..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java
+++ /dev/null

@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentEngine;
-import org.eclipse.wst.command.internal.env.core.fragment.FragmentListener;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-
-
-/**
- * This class manages the execution of Commands in a flow of CommandFragments.
- * The bulk of this work is done by the CommandFragmentEngine.  The main job of
- * this class is run the fragments in a particular transactional environment.
- * A fragment has a method called doNotRunInTransaction which is used to determine
- * if its commands should be run in a transaction or not.  If this method returns
- * true(ie. not in a transaction) the Commands are wrapped in a IRunnableWithProgress.
- * If false( ie. in a transaction ) the Commands are wrapped in a WorkspaceModifyOperation. 
- *
- */
-public class SimpleCommandEngineManager
-{
-  protected CommandFragmentEngine engine_;
-  protected DataFlowManager       dataManager_;
-  private   EclipseEnvironment    environment_;
-  
-  private   boolean               foundStop_;
-  private   boolean               doNotRunInTransaction_;
-  
-  public SimpleCommandEngineManager( EclipseEnvironment environment, DataFlowManager dataManager )
-  {
-    environment_ = environment;
-    dataManager_ = dataManager;
-  }
-  
-  /**
-   * Sets the root fragment.  The execution engine will start executing commands
-   * at the beginning of this root fragment.
-   * 
-   * @param root the root fragment.
-   */
-  public void setRootFragment( CommandFragment root )
-  {
-  	engine_ = new CommandFragmentEngine( root, dataManager_, environment_ );
-	
-	environment_.setCommandManager( engine_ );
-  	
-    engine_.setPeekFragmentListener( 
-      new FragmentListener()
-      {
-        public  boolean notify( CommandFragment fragment )
-        {
-          return peekFragment( fragment );
-        }
-      } );  
-                  
-    engine_.setNextFragmentListener( 
-      new FragmentListener()
-      {
-        public  boolean notify( CommandFragment fragment )
-        {
-          return nextFragment( fragment );
-        }
-      } );  
-                                                             
-	engine_.setUndoFragmentListener(
-      new FragmentListener()
-      {
-        public boolean notify( CommandFragment fragment )
-        {
-          return undoFragment( fragment );
-        }
-      } );               
-  }
-  
-  /**
-   * The CommandFragmentEngine calls this method when it is peeking forward
-   * in the fragments.  When peeking forward the command stack state in the
-   * engine is not changes.
-   * 
-   * 
-   * @param fragment the fragment that it is peeking at.
-   * @return Indicates whether peeking should stop or not.
-   */
-  protected boolean peekFragment( CommandFragment fragment )
-  {     
-    return true;
-  }
-  
-  /**
-   * The CommandFragmentEngine calls this method when it is moving forward
-   * in the fragments.   When moving forward the command stack state is saved
-   * at each fragment is traversed.
-   * 
-   * @param fragment the fragment that is being traversed.
-   * @return indicates if the forward traversal should continue.  
-   */
-  protected boolean nextFragment( CommandFragment fragment )
-  {     
-    if( fragment.doNotRunInTransaction() != doNotRunInTransaction_ )
-    {
-      // The fragment is requesting a different transaction environment than
-      // the one that we are in so we must stop and change environments.
-      doNotRunInTransaction_ = fragment.doNotRunInTransaction();
-      foundStop_             = false;      
-    }
-    
-    return foundStop_;
-  }
-  
-  /**
-   * This method is called for each fragment when the command engine is unwinding
-   * its stack during an undo operation.
-   * 
-   * @param fragment  the fragment being undone.
-   * @return returns true if the undo process should continue.
-   */
-  protected boolean undoFragment( CommandFragment fragment )
-  {  	  	
-    return true;
-  }
-    
-  /**
-   * The method executes the CommandFragment commands in the context provided.
-   * 
-   * @param context the context
-   * @return returns the status of executing the commands.
-   */
-  public IStatus runForwardToNextStop( IRunnableContext context )
-  {
-    IRunnableWithProgress operation = null;
-    
-  	doNotRunInTransaction_ = false;
-  	
-  	do
-  	{
-  	  // We will stop unless we are changing transaction modes.
-      foundStop_ = true;
-      
-  	  if( doNotRunInTransaction_ )
-  	  {
-  	    operation = getNoTransactionOperation();
-  	  }
-  	  else
-  	  {
-  	    operation = getTransactionOperation();
-  	  }
-  	  
-   	  try
-  	  {  	   
-  	    if( context == null )
-  	    {
-  	   	  // We don't have a container yet so just run the operation.
-  	   	  operation.run( null );
-  	    }
-  	    else
-  	    {
-  	   	  // We have a container where this operation can run and have
-  	   	  // its progress displayed.
-  	      context.run( false, false, operation );
-  	    }
-  	  }
-  	  catch( InterruptedException exc )
-  	  {
-  	    //TODO should log these exceptions.
-  	    exc.printStackTrace();
-  	  }
-  	  catch( InvocationTargetException exc )
-  	  {
-  	    //TODO should log these exceptions.
-  	    exc.printStackTrace();
-  	  }
-  	}  
-  	while( !foundStop_ ); 
-  	
-  	return engine_.getLastStatus();
-  }
-  
-  private IRunnableWithProgress getTransactionOperation()
-  {
-    IRunnableWithProgress operation = new IRunnableWithProgress()
-    {
-      public void run( IProgressMonitor monitor )
-    //WorkspaceModifyOperation operation = new WorkspaceModifyOperation()
-    //{
-    //  public void execute( IProgressMonitor monitor )
-      {
-        environment_.getLog().log(ILog.INFO, "command", 5002, this, "getTransactionOperation", "Start of transaction");
-        engine_.moveForwardToNextStop( monitor );
-        environment_.getLog().log(ILog.INFO, "command", 5003, this, "getTransactionOperation", "End of transaction");
-      }
-    };
-    
-    return operation;
-  }
-  
-  private IRunnableWithProgress getNoTransactionOperation()
-  {
-    IRunnableWithProgress operation = new IRunnableWithProgress()
-    {
-      public void run( IProgressMonitor monitor )
-      {
-        environment_.getLog().log(ILog.INFO, "command", 5085, this, "getNoTransactionOperation", "Start of NON transaction");
-        engine_.moveForwardToNextStop( monitor );
-        environment_.getLog().log(ILog.INFO, "command", 5086, this, "getNoTransactionOperation", "End of NON transaction");
-      }
-    }; 
-    
-    return operation;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java
deleted file mode 100644
index 4c02e6b..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-public class SimplePageFactory implements WizardPageFactory
-{   
-  public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager )
-  {
-    return new SimpleWizardPage( pageInfo, manager );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java
deleted file mode 100644
index ada9688..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-public class SimplePopupPageFactory implements WizardPageFactory
-{   
-  private String id_;
-  
-  public SimplePopupPageFactory( String id )
-  {
-    id_ = id;  
-  }
-  
-  public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager )
-  {
-    return new SimplePopupWizardPage( pageInfo, manager, id_ );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java
deleted file mode 100644
index a943959..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-
-public class SimplePopupWizardPage extends SimpleWizardPage
-{  
-  private String id_;
-  
-  public SimplePopupWizardPage( PageInfo pageInfo, WizardPageManager pageManager, String id )
-  {
-  	super( pageInfo, pageManager );
-  	
-  	id_ = id;
-  } 	  
-  	
-  public void createControl( Composite parent ) 
-  {
-  	      Composite                      composite = new Composite( parent, SWT.NONE );
-  	      MessageUtils                   msgUtils  = new MessageUtils("org.eclipse.wst.command.env.ui.environmentui", this );
-  	final PersistentActionDialogsContext context   = PersistentActionDialogsContext.getInstance();
-  	
-    GridLayout gridlayout   = new GridLayout();
-    gridlayout.marginHeight = 0;
-    gridlayout.marginWidth  = 0;
-    
-    composite.setLayout( gridlayout );
-    GridData griddata = new GridData(GridData.FILL_BOTH );
-    composite.setLayoutData( griddata );
-      	
-  	super.createControl( composite );
-  	
-  	// If the current page is null then this must be the first page.
-  	if( pageManager_.getCurrentPage() == null && context.showCheckbox(id_) )
-  	{
-      final  Button button  = new Button( composite, SWT.CHECK );
-      String label   = msgUtils.getMessage( "CHECKBOX_DO_NOT_SHOW_DIALOG_AGAIN" );
-      
-      /*CONTEXT_ID TWP0001 for the show/hide check box*/
-      String infopop =	"org.eclipse.wst.command.env.ui.TWP0001";
-      String tooltip = msgUtils.getMessage( "TOOLTIP_DO_NOT_SHOW_DIALOG_AGAIN" );
-      
-      button.setText( label );
-      button.setToolTipText( tooltip );
-      button.addSelectionListener( new SelectionAdapter()
-                                   {
-                                     public void widgetSelected( SelectionEvent evt )
-                                     {
-                                       context.setActionDialogEnabled( id_, button.getSelection() );  
-                                     }
-                                   });
-      button.setSelection( false );
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp( button, infopop );  	
-  	}
-  	
-  	setControl( composite );
-  }  
-}  

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java
deleted file mode 100644
index 652acb1..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-public class SimpleWidgetContributor implements INamedWidgetContributor 
-{
-    private WidgetContributorFactory factory_;
-	private String                   name_;
-	private String                   description_;
-	private String                   title_;
-	
-	public void setDescription(String description) 
-	{
-		description_ = description;
-	}
-	
-
-	public void setFactory(WidgetContributorFactory factory) 
-	{
-		factory_ = factory;
-	}
-	
-
-	public void setName(String name) 
-	{
-		name_ = name;
-	}
-	
-
-	public void setTitle(String title) 
-	{
-		title_ = title;
-	}
-	
-
-	public WidgetContributorFactory getWidgetContributorFactory() 
-	{
-		return factory_;
-	}
-
-	public String getName() 
-	{
-		return name_;
-	}
-
-	public String getDescription() 
-	{
-		return description_;
-	}
-
-	public String getTitle() 
-	{
-		return title_;
-	}
-
-	/**
-	 * Subsclassers should override this method.
-	 */
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-
-	}
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java
deleted file mode 100644
index 5484c9e..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * This class provides a simple WidgetDataContributor class that concrete 
- * WidgetDataContributors can subclass.
- *
- */
-public class SimpleWidgetDataContributor implements WidgetDataContributor
-{  
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    return this;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus()
-  {
-    return null;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents#externalize()
-   */
-  public void externalize()
-  {
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents#internalize()
-   */
-  public void internalize()
-  {
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java
deleted file mode 100644
index 0489bca..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-
-
-
-public class SimpleWidgetRegistry implements WidgetRegistry
-{
-  private Hashtable table_ = new Hashtable();
-  
-  public void add( String fragmentId,
-                   String pageName,
-                   String pageTitle,
-                   WidgetContributorFactory widgetFactory )
-  {
-  	PageInfo entry = new PageInfo( pageName, pageTitle, widgetFactory );
-  	table_.put( fragmentId, entry );
-  }                   
-  
-  public PageInfo getPageInfo( String fragmentId )
-  {
-    return (PageInfo)table_.get( fragmentId );
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java
deleted file mode 100644
index 4d2bb59..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-
-
-public class SimpleWizardPage extends WizardPage implements PageWizardDataEvents
-{
-  private   WidgetContributor widget_;
-  private   WidgetDataEvents  dataEvents_;
-  private   Listener          statusListener_;
-  protected WizardPageManager pageManager_;
-  	
-  public SimpleWizardPage( PageInfo pageInfo, WizardPageManager pageManager )
-  {
-  	super( "" );
-  	
-  	setTitle( pageInfo.getPageName() );
-  	setDescription( pageInfo.getPageTitle());
-  	  
-  	widget_         = pageInfo.getWidgetFactory().create();
-  	statusListener_ = new StatusListener();
-  	pageManager_    = pageManager;
-  } 	  
-  	
-  public void createControl( Composite parent ) 
-  {
-  	Composite control = new Composite( parent, SWT.NONE );
-  	control.setLayout( new GridLayout() );
-  	control.setLayoutData( new GridData( GridData.FILL_BOTH ));
-  	
-	dataEvents_ = widget_.addControls( control, statusListener_ );
-	  
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(control);
-    setControl( control );
-  }
-  
-  public WidgetDataEvents getDataEvents()
-  {
-    return dataEvents_;
-  }
-  	  
-  public void validatePageToStatus()
-  {
-    IStatus status  = widget_.getStatus();
-    
-    if( status != null )
-    {
-      if( status.getSeverity() == IStatus.ERROR )
-      {
-        String message = status.getMessage();
-
-        if( message.length() == 0 )
-        {
-          setErrorMessage( null );
-          setMessage( getDescription() );
-        }
-        else
-        {
-          setErrorMessage( message );
-        }
-          
-        setPageComplete( false );
-      }
-      else if (status.getSeverity() == IStatus.WARNING )
-      {
-        setErrorMessage( null );
-        setMessage(status.getMessage(), IStatus.WARNING );
-        setPageComplete( true );
-      }
-      else if( status.getSeverity() == IStatus.INFO )
-      {
-        setErrorMessage( null );
-        setMessage( status.getMessage(), IStatus.INFO );
-        setPageComplete( true );
-      }
-      else
-      {
-        setErrorMessage( null );
-        setMessage( getDescription() );
-        setPageComplete( true );
-      }
-    }
-    else
-    {
-      setErrorMessage( null );
-      setMessage( getDescription() );
-      setPageComplete( true );
-    }
-    
-    getContainer().updateButtons();
-  }
-    
-  public boolean canFlipToNextPage() 
-  {
-	return isPageComplete() && pageManager_.hasNextPage();
-  }
-
-  public IWizardPage getNextPage() 
-  {
-	return pageManager_.getNextPage();
-  }
-  
-  public void setVisible(boolean value) 
-  {
-  	pageManager_.handlePageVisible( this, value );
-  	
-    super.setVisible(value);
-  }
-  
-  private class StatusListener implements Listener
-  {
-	public void handleEvent( Event evt ) 
-	{
-      validatePageToStatus();
-	}
-  }
-}  

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java
deleted file mode 100644
index 152f7c8..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-public class WidgetBindingToWidgetFactoryAdapter 
-{
-  private Hashtable            widgetContributor_;
-  private CommandWidgetBinding binding_;
-  
-  public WidgetBindingToWidgetFactoryAdapter( CommandWidgetBinding binding )
-  {
-    widgetContributor_ = new Hashtable(); 
-	binding_           = binding;
-	
-	binding.registerWidgetMappings( new MyWidgetRegistry() );
-  }
-  
-  public INamedWidgetContributor getWidget( String id )
-  {
-    return (INamedWidgetContributor)widgetContributor_.get( id );  
-  }
-  
-  public void registerDataMappings( DataMappingRegistry registry )
-  {
-    binding_.registerDataMappings( registry );  
-  }
-  
-  private class MyWidgetRegistry implements WidgetRegistry
-  {
-	public void add(String fragmentId, String pageName, String pageTitle, WidgetContributorFactory widgetFactory) 
-	{
-	  SimpleWidgetContributor widget = new SimpleWidgetContributor();
-	  widget.setTitle( pageName );
-	  widget.setDescription( pageTitle );
-	  widget.setFactory( new MyWidgetContributorFactory( widgetFactory ) );
-	  
-	  widgetContributor_.put( fragmentId, widget );
-	}	  
-  }
-  
-  private class MyWidgetContributorFactory implements WidgetContributorFactory
-  {
-	private WidgetContributorFactory factory_;
-	private WidgetContributor        widget_;
-	
-	public MyWidgetContributorFactory( WidgetContributorFactory factory )
-	{
-	  factory_ = factory;	
-	}
-	
-	public WidgetContributor create() 
-	{
-      if( widget_ == null )
-	  {
-	    widget_ = factory_.create();
-	  }
-	  
-	  return widget_;
-	}	  
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java
deleted file mode 100644
index b6db626..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * This interface provides a way for developers to create validatable widgets
- * that can be used in many different Eclipse UI contexts. (ie. in a Windows, Diaglogs,
- * wizard pages, etc)
- *
- * The main functionality this interface has over just a regular Eclipse Composite
- * is that it provides a mechanism for validating the Widget.  When validating
- * there are two aspects to keep in mind.  The first aspect deals with WHEN validation
- * occurs and the second aspect deals with WHAT to do for a validation event.
- * 
- * The first aspect of triggering validation events is handled by the statusListener
- * parameter of the addControls method.  If a particular control that is contributed can
- * affect the validity of this WidgetContributor then the statusListener object
- * should be added to the listener list of that control.  For example, if the text in
- * a Text widget can affect the validity of this WidgetContributor then you would
- * add the statusListener to the Text widgets Modify listener list:
- * 
- * 
- *   Text someText = new Text( parent, SWT.NONE );
- *   someText.addListener( SWT.Modify, statusListener );
- * 
- * Note: if you want to force validation of this widget you can call
- *       the statusListener.handleEvent(null) method directly.  This
- *       is not the prefered may to trigger validation, however.
- *       
- * The second aspect of valiation is what to do when the validation event occurs.
- * This is handled by getStatus method.  Any code that ensures that this widget is
- * valid should be put in the getStatus implementation. 
- * 
- * 
-*/
-public interface WidgetContributor 
-{
-  /**
-   * This method should be used to implement the UI contributions for this widget.
-   * 
-   * @param parent The composite parent that sub widgets should use.
-   * @param statusListener This listener should be added to any widget that can
-   *                       affect the validity of this WidgetContributor.
-   * @return returns a WidgetDataEvents object.  This object is used by the
-   *         framework to internalize and externalize data for this widget.
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener );
-  
-  /**
-   * This method should implement validation code for this WidgetContributor.
-   * 
-   * @return returns a status object indicating the validity of this widget.
-   *         If the status severity is ERROR then this widget is considered to
-   *         be invalid.  For any other status severity or if the status returned
-   *         is null this widget is considered to be valid.
-   */
-  public IStatus getStatus();
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java
deleted file mode 100644
index 65b5d0a..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface provide a way for creating WidgetContributors
- *
- *
- */
-public interface WidgetContributorFactory 
-{
-  public WidgetContributor create();
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java
deleted file mode 100644
index e9aa31d..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface is a combination of the WidgetContributor interface and
- * the WidgetDataEvents interface.
- *
- */
-public interface WidgetDataContributor extends WidgetContributor, WidgetDataEvents 
-{
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java
deleted file mode 100644
index 4cb03f0..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface provides a way for internalizing and externalizing state
- * data in a WidgetContributor.  The internalize method will be called
- * before the widget is displayed so that it can set the default data
- * for that widget.  The externalize method provides a way of getting data
- * from the widget after it is displayed.
- *
- */
-public interface WidgetDataEvents 
-{
-  /**
-   * Implementations should set widget state data here.
-   *
-   */
-  public void internalize();
-  
-  /**
-   * Implemenations should get widget state data here.
-   *
-   */
-  public void externalize();  
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java
deleted file mode 100644
index c01107c..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface defines how WidgetContributors are made known to the
- * dynamic wizard framework.  This widget will be displayed as a wizard page
- * with the name and title specified in the add method.  The fragmentId is 
- * used to associate this widget with a particular CommandFragment.  When
- * a CommandFragment with this fragmentId is traversed the corresponding
- * WidgetContributor will be displayed.
- *
- */
-public interface WidgetRegistry
-{
-  /**
-   * Adds a WidgetContributorFactory to the framework.  This factory
-   * is used to get the WidgetContributor.  This WidgetContributor
-   * will be used to render the wizard page.
-   * 
-   * @param fragmentId the CommandFragment id that this WidgetContributor is associated with.
-   * @param pageName the name of this wizard page.
-   * @param pageTitle the title of this wizard page.
-   * @param widgetFactory the factory which will create the WidgetContributor.
-   */
-  public void add( String fragmentId,
-				   String pageName,
-				   String pageTitle,
-				   WidgetContributorFactory widgetFactory );
-  
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java
deleted file mode 100644
index c520979..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-/**
- * 
- *
- *
- *
- */
-public interface WizardPageFactory 
-{
-  public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager ); 
-}

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java
deleted file mode 100644
index 726f9a9..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java
+++ /dev/null

@@ -1,469 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.Stack;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.registry.WidgetRegistry;
-
-
-
-public class WizardPageManager extends SimpleCommandEngineManager
-{
-  private   WizardPageFactory      pageFactory_;
-  private   Hashtable              pageTable_;
-  private   IWizard                wizard_;
-  protected SimpleWidgetRegistry   registry_;
-  
-  // These variables are used and set by our methods which is
-  // why they are not initialized in the constructor.
-  private PageWizardDataEvents currentPage_;
-  private PageWizardDataEvents nextPage_;
-  private PageWizardDataEvents firstPage_;
-  private CommandFragment      lastUndoFragment_;
-  private boolean              firstFragment_;
-  
-  private INamedWidgetContributorFactory widgetFactory_;
-  private Stack                          widgetStack_;
-  private Stack                          widgetStackStack_;
-  private Hashtable                      widgetTable_;
-  private WidgetRegistry                 widgetRegistry_;
-  private Hashtable                      widgetFactoryTable_;
-    
-  public WizardPageManager( SimpleWidgetRegistry  registry,
-                            WizardPageFactory     pageFactory,
-                            IWizard               wizard,
-                            DataFlowManager       dataManager,
-                            EclipseEnvironment    environment )
-  { 
-    super( environment, dataManager );  
-    
-  	pageFactory_        = pageFactory;
-  	pageTable_          = new Hashtable();  
-  	registry_           = registry;
-  	wizard_             = wizard;
-	widgetTable_        = new Hashtable();
-	widgetFactoryTable_ = new Hashtable();
-	widgetRegistry_     = WidgetRegistry.instance();
-	widgetStackStack_   = new Stack();
-  }
-  
-  public IStatus runForwardToNextStop()
-  {    
-  	firstFragment_  = true;
-  	nextPage_       = null;
- 
-  	IWizardContainer container = wizard_.getContainer();
-  	
-  	if( container == null || container.getCurrentPage() == null )
-  	{
-  	  container = null;
-  	}
-  	
-  	return super.runForwardToNextStop( container );
-  }
-    
-  public IWizardPage getCurrentPage()
-  {
-    return currentPage_;
-  }
-    
-  public boolean hasNextPage()
-  {	
-	 
-    nextPage_ = null;
-    
-	try
-	{
-  	  nextPage_ = getNextPageInGroup( widgetFactory_, false );
-		
-	  if( nextPage_ == null )
-	  {
-	    // If a page is found nextPage_ will be set to its value in the method below.
-  	    engine_.peekForwardToNextStop();
-	  }
-	}
-	catch( Throwable exc )
-	{
-	  exc.printStackTrace();
-	}
-  	
-    return nextPage_ != null;
-  }
-  
-  public IWizardPage getNextPage()
-  {  	
-	try
-	{
-  	  // Need to externalize the data for the current page so that
-  	  // when we move forward below the data is available.
-  	  if( currentPage_ != null ) currentPage_.getDataEvents().externalize();
-  	
-	  nextPage_ = getNextPageInGroup( widgetFactory_, true );
-	
-	  if( nextPage_ == null )
-	  {
-	    widgetFactory_ = null;
-	    widgetStack_   = null;
-		
-  	    IStatus status = runForwardToNextStop();
-  	
-  	    if( status.getSeverity() == IStatus.ERROR )
-  	    {
-  	      // An error has occured so we need undo to the previous stop point.
-  	      undoToLastPage();
-  	    }
-	  }
-	
-  	  if( nextPage_ != null ) nextPage_.setWizard( wizard_ );
-  	  	
-  	  return nextPage_;
-	}
-	catch( Throwable exc )
-	{
-	  exc.printStackTrace();	
-	}
-	
-	return null;
-  }
-    
-  public void handlePageVisible( PageWizardDataEvents page, boolean isPageVisible )
-  {
-    if( !isPageVisible && page == firstPage_ && page == currentPage_ )
-    {
-      // We are moving back one page from the first page.  This can't happen with popup wizards
-      // since the previous button would be greyed out.  But when the new wizard launches this wizard
-      // the previous button is not greyed out and brings the user back to the list wizards to select.
-      // Therefore, we must unwind the command engine and get ready for the user to invoke this wizard 
-      // again.  We are assuming here that the first page is never part of a widget group!
-  	  undoToLastPage();	  
-      currentPage_ = null;
-      firstPage_   = null;
-    }
-  	if( currentPage_ != null && page == currentPage_.getPreviousPage() && isPageVisible )
-  	{
-  	  // We are moving back one page.
-  	  // Note: we don't internalize the previous page and we do not externalize the current page.
-  	  //       we are basically just leaving the current page without retrieving its state and
-  	  //       moving to the previous page which already has its state set.
-	
-	  if( widgetFactory_ != null )
-	  {
-		if( widgetStack_.size() > 0 )
-		{
-		  widgetStack_.pop();
-		}
-		
-		if( widgetStack_.size() == 0 )
-		{
-		  widgetFactory_ = null;
-		  widgetStack_ = null;
-		  widgetStackStack_.pop();
-		}
-	  }
-	  
-	  if( widgetFactory_ == null )
-	  {
-  	    undoToLastPage();
-	  }
-	  
-  	  currentPage_ = page;
-  	}	
-  	else if( isPageVisible )
-  	{
-	  try
-	  {
-  	    // We are moving forward one page.
-  	    WidgetDataEvents dataEvents = page.getDataEvents();
-  	  
-  	    dataManager_.process( dataEvents );  // Push model data into the new page.
-  	    dataEvents.internalize();
-  	  
-  	    page.validatePageToStatus();  	  
-	  }
-	  catch( Throwable exc )
-	  {
-		exc.printStackTrace();
-	  }
-	  finally
-	  {
-	  	if( currentPage_ != null ) page.setPreviousPage( currentPage_ );
-	    	  
-	  	if( firstPage_ == null ) firstPage_ = page;
-	  	  
-	  	currentPage_ = page;  
-	  }
-  	}
-  }
-  
-  public boolean performFinish()
-  { 	
-  	// We need to simulate the next button being pressed until there are no more pages.
-  	// If an error occurs we will return false and reset the command stack back our original state.
-  	boolean    doneOk    = true;
-  	PageWizardDataEvents startPage = currentPage_;
-  	
-  	// Externalize the current page.
-  	currentPage_.getDataEvents().externalize();
-  	
-  	// Loop through subsequent pages.
-  	do
-  	{  	  
-  	  IStatus status = runForwardToNextStop();	  
-  	  
-  	  if( status.getSeverity() == IStatus.ERROR )
-  	  {
-  	  	// An error occured in one of the commands.
-  	  	doneOk = false;
-  	  }
-  	  else
-  	  {
-  	  	currentPage_ = nextPage_;
-  	  }
-  	}
-  	while( nextPage_ != null && doneOk);
-  	
-  	if( !doneOk )
-  	{
-  	  // An error occured, so we need to return the command stack to it's
-  	  // orginal state.
-  	  PageWizardDataEvents page = null;
-  	  boolean              done = false;
-  	  
-  	  do
-  	  {
-  	    done = engine_.undoToLastStop();
-  	    page = getPage( lastUndoFragment_ );
-  	  }
-  	  while( page != startPage && !done ); 	  
-  	  
-  	  currentPage_ = page;
-  	}
-  	
-  	return doneOk;
-  }
-  
-  public boolean performCancel()
-  {
-  	while( !engine_.undoToLastStop() ){}
-  	
-  	return true;
-  }
-    
-  protected boolean peekFragment( CommandFragment fragment )
-  {     	
-    // Check to see if this fragment is in our page table.
-    nextPage_ = getPage( fragment );
-          	
-	if( nextPage_ == null )
-	{
-	  INamedWidgetContributorFactory factory = getWidgetFactory( fragment.getId() );
-	  
-	  if( factory != null )
-	  {
-		nextPage_ = getNextPageInGroup( factory, false );  
-	  }
-	}
-	
-    return nextPage_ == null;
-  }
-  
-  protected boolean nextFragment( CommandFragment fragment )
-  {
-    // If the super class nextFragment want us to stop then we will stop right away.
-    if( !super.nextFragment( fragment ) ) return false;
-    
-  	// The first fragment is either at the start of the wizard
-  	// or it is on a wizard page.  In either case we do not want 
-  	// to stop if a page is found.
-  	if( firstFragment_ )
-  	{
-  	  firstFragment_ = false;
-  	}
-  	else
-  	{
-	  widgetFactory_ = getWidgetFactory( fragment.getId() );
-	  
-	  if( widgetFactory_ != null )
-	  {
-		widgetStack_ = new Stack();
-		
-		StackEntry entry = new StackEntry();
-		
-		entry.factory_ = widgetFactory_;
-		entry.stack_   = widgetStack_;
-		widgetStackStack_.push( entry );
-		
-		nextPage_ = getNextPageInGroup( widgetFactory_, true );
-	  }
-	  else
-	  {
-  	    nextPage_ = getPage( fragment );
-	  }
-  	}  	  	
-  	
-    return nextPage_ == null;
-  }
-  
-  protected boolean undoFragment( CommandFragment fragment )
-  {
-  	lastUndoFragment_ = fragment;
-  	
-  	return true;
-  }
-  
-  
-  private PageWizardDataEvents getNextPageInGroup( INamedWidgetContributorFactory factory, boolean pushNewWidget )
-  {
-	PageWizardDataEvents page = null;
-	
-	if( factory != null )
-	{	  
-	  INamedWidgetContributor newWidget = null;
-		  
-	  if( widgetStack_ == null || widgetStack_.size() == 0 )
-	  {
-		newWidget = factory.getFirstNamedWidget();   
-	  }
-	  else
-	  {
-		INamedWidgetContributor currentWidget = (INamedWidgetContributor)widgetStack_.peek();
-		newWidget = factory.getNextNamedWidget( currentWidget ); 
-	  }
-		  
-	  if( newWidget != null )
-	  {
-		page = getPage( newWidget );
-		
-		if( pushNewWidget )
-		{
-		  widgetStack_.push( newWidget );
-		}
-	  }
-	}
-		
-	return page;  
-  }
-  
-  private void undoToLastPage()
-  {
-    boolean stackEmpty  = false;
-	boolean doneUndoing = false;
-    
-	while( !doneUndoing )
-	{
-	  stackEmpty = engine_.undoToLastStop();
-	  
-	  IWizardPage page = null;
-	  
-	  if( lastUndoFragment_ != null )
-	  {
-	    page = getPage( lastUndoFragment_ );
-		
-	    if( page == null )
-	    {
-		  // Check to see if a group page fragment was found.
-		  INamedWidgetContributorFactory factory = getWidgetFactory( lastUndoFragment_.getId() );
-		  
-		  if( factory != null )
-		  {
-		    StackEntry entry = (StackEntry)widgetStackStack_.peek();
-			
-		    widgetFactory_ = entry.factory_;
-		    widgetStack_   = entry.stack_;	
-			
-		    if( widgetStack_ != null && !widgetStack_.empty() )
-		    {
-		      INamedWidgetContributor currentWidget = (INamedWidgetContributor)widgetStack_.peek();
-			
-		      page = getPage( currentWidget );
-		    }
-		  }
-	    }
-	  }
-	  
-	  doneUndoing = page != null || stackEmpty;
-	}
-  }
-  
-  private PageWizardDataEvents getPage( CommandFragment fragment )
-  {
-    // Check to see if this fragment is in our page table.
-  	PageWizardDataEvents page = (PageWizardDataEvents)pageTable_.get( fragment ); 
-  	String      id   = fragment.getId();      	
-          	
-    if( page == null && id != null )
-    {
-      // Check to see if this fragment id is in the registry.
-      PageInfo pageInfo = registry_.getPageInfo( id );          	  
-              
-      if( pageInfo != null )
-      {
-        page = pageFactory_.getPage( pageInfo, this );
-        pageTable_.put( fragment, page );            	
-      }
-    }
-
-    return page;
-  }    
-  
-  private PageWizardDataEvents getPage( INamedWidgetContributor widget )
-  {
-	PageWizardDataEvents page = (PageWizardDataEvents)widgetTable_.get( widget );
-
-	if( page == null )
-	{
-	  PageInfo pageInfo = new PageInfo(widget.getTitle(), widget.getDescription(), widget.getWidgetContributorFactory() );
-	  
-	  page = pageFactory_.getPage( pageInfo, this );
-	  widgetTable_.put( widget, page );
-	}
-	
-	return page;
-  }
-  
-  private INamedWidgetContributorFactory getWidgetFactory( String id )
-  {
-	INamedWidgetContributorFactory factory = (INamedWidgetContributorFactory)widgetFactoryTable_.get( id );
-	
-	if( factory == null )
-	{
-	  // The factory is not in our table so we will try the registry.
-	  factory = widgetRegistry_.getFactory( id );
-	  
-	  if( factory != null )
-	  {
-	    widgetFactoryTable_.put( id, factory );
-	    factory.registerDataMappings( dataManager_.getMappingRegistry() );
-		dataManager_.process( factory );
-	  }
-	}
-	else
-	{
-	  dataManager_.process( factory );
-	}
-	
-	return factory;
-  }
-  
-  private class StackEntry
-  {
-    INamedWidgetContributorFactory factory_;
-	Stack                          stack_;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java
deleted file mode 100644
index 4f1a34d..0000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java
+++ /dev/null

@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets.popup;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimplePopupPageFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WizardPageFactory;
-
-
-/**
- * This class is used to popup dynamic wizards.  The popupMenus extension is used
- * the contribute a popup to Eclipse.  The class in the action element should reference
- * this DynamicPopupWizard class.  This id attribute in the action element should contain
- * an id that references a dynamicWizard extension point.  This is how the DynamicPopupWizard
- * class knows which wizard to display.
- *   
- * Note: the id attribute in the objectContribution element refers to an
- *       actionDialogPreferenceType extension point.  The ids in objectContribution
- *       element and the action element need not be the same as they are in the
- *       example below.
- *
- *<pre>
- *   &lt;extension
- *         point="org.eclipse.ui.popupMenus"&gt;
- *&lt;!-- IFile *.wsdl popup menu --&gt;
- *     &lt;objectContribution
- *           objectClass="org.eclipse.core.resources.IFile"
- *           nameFilter="*.wsdl"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *&lt;!-- WSDL To Java Bean Proxy --&gt;
- *        &lt;action
- *              label="%ACTION_GENERATE_JAVA_PROXY"
- *              class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- *              menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- *              id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *        &lt;/action&gt;
- *     &lt;/objectContribution&gt;
- *  &lt;/extension&gt;
- *
- *   &lt;extension
- *        point="org.eclipse.wst.command.env.dynamicWizard"&gt;
- *     &lt;dynamicWizard
- *           iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
- *           class="org.eclipse.jst.ws.consumption.ui.widgets.binding.ClientWidgetBinding"
- *           title="%WIZARD_TITLE_WSC"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *     &lt;/dynamicWizard&gt;
- *  &lt;/extension&gt;
- *</pre>
- *
- */
-public class DynamicPopupWizard extends DynamicWizard implements IActionDelegate
-{
-  private ISelection selection_;
-  
-  public DynamicPopupWizard()
-  {
-	super();
-  }
-  
-  /**
-   * 
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard#getWizardPageFactory()
-   */
-  protected WizardPageFactory getWizardPageFactory()
-  {
-    return new SimplePopupPageFactory( getId() );
-  }
-  
-  private String getId()
-  {
-    return ((IConfigurationElement)originalElement_.getParent()).getAttribute( "id" );  
-  }
-  
-  /**
-   * @see IActionDelegate#run
-   */
-  public void run(IAction action) 
-  {
-    PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-    String                         id      = getId();
-    
-	if( context.showDialog(id) )
-	{
-	  // Launch the wizard.
-	  init( PlatformUI.getWorkbench(), getSelection() );  
-	    
-	  WizardDialog dialog= new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), this);
-	  dialog.setPageSize( 400, 500 );
-	  dialog.create();
-    
-    if( startPage_ != null )
-    {
-	    dialog.open();
-    }
-	}
-	else
-	{
-	  final ProgressMonitorDialog monitor = new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
-	  
-	  try
-	  {
-	    monitor.run( false, false, new IRunnableWithProgress()
-	                               {
-	                                 public void run( IProgressMonitor progressMonitor )
-	                                 {
-	                             	     runHeadLess( getSelection(), monitor );
-	                                 }
-	                               } );
-	  }
-	  catch( InterruptedException exc )
-	  { 
-	  }
-	  catch( InvocationTargetException exc )
-	  {
-	  }
-	}
-  }
-  
-  /**
-   * Runs only the Commands associated with the dynamic wizard.
-   * 
-   * @param selection the initial selection from the user.
-   * @param context the context that this execution should take place in.  This
-   *                is usually a progress context so that the user can get feedback
-   *                on how execution is progressing.  The context may be null.
-   */
-  public void runHeadLess( IStructuredSelection selection, IRunnableContext context )
-  {
-	PersistentResourceContext  resourceContext = PersistentResourceContext.getInstance();
-	EclipseStatusHandler       handler         = new EclipseStatusHandler();
-	EclipseEnvironment         environment     = new EclipseEnvironment( null, resourceContext, handler );
-	    
-	DataMappingRegistryImpl    dataRegistry_   = new DataMappingRegistryImpl();	    
-	DataFlowManager            dataManager     = new DataFlowManager( dataRegistry_, environment );
-	SimpleCommandEngineManager manager         = new SimpleCommandEngineManager(environment, dataManager );
-	
-    try
-    {
-      commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" );
-    }
-    catch( CoreException exc )
-    {
-      exc.printStackTrace();
-    }
-	  
-	commandWidgetBinding_.registerDataMappings( dataRegistry_ );
-	
-	CommandFragment rootFragment = getRootFragment( selection, null );
-	
-	manager.setRootFragment( rootFragment );
-	manager.runForwardToNextStop( context );
-  }
-  
-  /**
-   * @see IActionDelegate#selectionChanged
-   */
-  public void selectionChanged(IAction action, ISelection selection) 
-  {
-      selection_ = selection;
-  }
-  
-  private IStructuredSelection getSelection()
-  {
-    IStructuredSelection result = new StructuredSelection();
-    
-	if( selection_ != null) 
-	{	
-	  if( selection_ instanceof IStructuredSelection ) 
-	  {
-	    result = (IStructuredSelection)selection_;
-	  }
-	}
-	else 
-	{
-	  IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-	  
-	  if( window != null ) 
-	  {
-		ISelection selection = window.getSelectionService().getSelection();
-		
-		if( selection instanceof IStructuredSelection ) 
-		{
-		  result = (IStructuredSelection)selection;
-		}
-	  }
-	}
-	
-	return result;
-  }  
-}

diff --git a/bundles/org.eclipse.wst.command.env/.classpath b/bundles/org.eclipse.wst.command.env/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/bundles/org.eclipse.wst.command.env/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.wst.command.env/.cvsignore b/bundles/org.eclipse.wst.command.env/.cvsignore
deleted file mode 100644
index 93e7d4a..0000000
--- a/bundles/org.eclipse.wst.command.env/.cvsignore
+++ /dev/null

@@ -1,6 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-env.jar
-@dot

diff --git a/bundles/org.eclipse.wst.command.env/.options b/bundles/org.eclipse.wst.command.env/.options
deleted file mode 100644
index 1e0b724..0000000
--- a/bundles/org.eclipse.wst.command.env/.options
+++ /dev/null

@@ -1,18 +0,0 @@
-# Debugging options for the org.eclipse.wst.env plugin.
-
-# Turn on debugging master switch for the org.eclipse.wst.command.env plugin.
-org.eclipse.wst.command.env/debug=true
-
-# Turn on different tracing level
-org.eclipse.wst.command.env/trace/info=true
-org.eclipse.wst.command.env/trace/warning=true
-org.eclipse.wst.command.env/trace/error=true
-
-# Turn on data flow tracing
-org.eclipse.wst.command.env/trace/data=true
-
-# Turn on command tracing
-org.eclipse.wst.command.env/trace/command=true
-
-# Turn on emitter tracing
-org.eclipse.wst.command.env/trace/emitter=true

diff --git a/bundles/org.eclipse.wst.command.env/.project b/bundles/org.eclipse.wst.command.env/.project
deleted file mode 100644
index 74dad12..0000000
--- a/bundles/org.eclipse.wst.command.env/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.command.env</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
deleted file mode 100644
index 50f61b8..0000000
--- a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.command.internal.env.plugin.EnvPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.internal.env.commandline,
- org.eclipse.wst.command.internal.env.common,
- org.eclipse.wst.command.internal.env.context,
- org.eclipse.wst.command.internal.env.eclipse,
- org.eclipse.wst.command.internal.env.plugin,
- org.eclipse.wst.command.internal.env.preferences
-Require-Bundle: org.eclipse.wst.command.env.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true

diff --git a/bundles/org.eclipse.wst.command.env/about.html b/bundles/org.eclipse.wst.command.env/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.command.env/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.command.env/build.properties b/bundles/org.eclipse.wst.command.env/build.properties
deleted file mode 100644
index de22392..0000000
--- a/bundles/org.eclipse.wst.command.env/build.properties
+++ /dev/null

@@ -1,9 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               plugin.properties,\
-               .,\
-               META-INF/,\
-               about.html
-source.. = src/
-output.. = bin/
-

diff --git a/bundles/org.eclipse.wst.command.env/plugin.properties b/bundles/org.eclipse.wst.command.env/plugin.properties
deleted file mode 100644
index afde089..0000000
--- a/bundles/org.eclipse.wst.command.env/plugin.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Environment Command Framework (headless)
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_XP_DYNAMIC_WIZARD=Dynamic Wizard
-PLUGIN_XP_POPUP_DIALOGS=Optional Pop-up Action Dialogs Types
-
-

diff --git a/bundles/org.eclipse.wst.command.env/plugin.xml b/bundles/org.eclipse.wst.command.env/plugin.xml
deleted file mode 100644
index e03a537..0000000
--- a/bundles/org.eclipse.wst.command.env/plugin.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension-point
-      id="dynamicWizard"
-      name="%PLUGIN_XP_DYNAMIC_WIZARD"/>
-   
-   <extension-point
-      id="actionDialogPreferenceType"
-      name="%PLUGIN_XP_POPUP_DIALOGS"/>
-
-</plugin>

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java
deleted file mode 100644
index c35982a..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java
+++ /dev/null

@@ -1,855 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.commandline;
-
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.ResourceBundle;
-import java.util.Vector;
-import org.eclipse.wst.command.internal.env.common.StringUtils;
-
-
-/**
-  * <p>This is a generic command line parsing class.  The programmer need only specify
-  * the characteristics of their command line(ie. positional parameters, flags, etc)
-  * and this class will perform the rest of the parsing work.  As an added bonus this
-  * class will also create formated help text that displays the syntax of this
-  * command line.
-  *
-  * <p>The main parameter to the CommandLine constructor is a two dimensional String
-  * array.  There are 5 columns in this array and as many rows as needed for each
-  * flag or positional parameter.  The five columns are:
-  *
-  * <ol>
-  * <li>The name of the flag(eg. "help" or "a", etc)
-  *     Note: no dash should be in the name here.  The user would specify "-help" on the
-  *           command line though.
-  * <li>The name of the flag parameter(if any)
-  * <li>A string indicating whether this flag can appear more than once on the
-  *     command line.
-  * <li>A string indicating whether this flag must be specified on the command line.
-  * <li>A help text string which describes this particular flag or positional parameter.
-  * </ol>
-  *
-  * <p>Each row in the string array is associate with either a positional parameter
-  * or with a flag.  For example, consider this command line:
-  * <ul>
-  * <li>My_prog required_parm1 -ab parm_for_ab required_parm2 -help optional_parms
-  * </ul>
-  *
-  * <p>In this example My_prog is the name of the program.  required_parm1 and
-  * required_parm2 must be specified on the command line.  Notice that they do not
-  * have to be adjacent to each other on the command line. optional_parms may optionally
-  * specified.  optional_parms can be 0 or more parameters.  They does not need to be
-  * adjacent to the required parameters, but they do need to follow the required
-  * parameters. Two flags are specified "-ab" and "-help".  The "-ab" flag has a
-  * parameter "parm_for_ab" associated with it.  Note: a flag can not have an optional
-  * parameter. (ie. a flag either never have a parameter or it always has a parameter)
-  * In this example, the first two rows in the string array would describe required_parm1
-  * and required_parm2.  The third entry would describe optional_parms.  The fourth and
-  * fifth rows would describe "-ab" and "-help".  For this command line the string array
-  * would look like this:
-  *
-  * <ul>
-  * <li>{ { CommandLine.POSITIONAL, "parm1", CommandLine.NO_DUPS,
-  *       CommandLine.REQUIRED, "parm1 help text" },
-  * <li>{ CommandLine.POSITIONAL, "parm2", CommandLine.NO_DUPS,
-  *       CommandLine.REQUIRED, "parm2 help text" },
-  * <li>{ CommandLine.POSITIONAL, "optional_parms", CommandLine.DUPS_OK,
-  *       CommandLine.REQUIRED, "optional help text" },
-  * <li>{ "ab", "parm_for_ab", CommandLine.NO_DUPS,
-  *       CommandLine.OPTIONAL, "ab help text" },
-  * <li>{ "help", CommandLine.NO_PARM, CommandLine.NO_DUPS,
-  *       CommandLine.OPTIONAL, "displays this help text" } }
-  * </ul>
-  *
-  * <p>String array rules:
-  *
-  * <ol>
-  * <li>Positional rows must always come first in the array.  These rows must
-  *     have a name specified in column 2, except for one case.  If you want to indicate that
-  *     there are no optional positional parameters you would put CommandLine.NO_PARM
-  *     in column 2 of the positional row.  You would also need to put CommandLine.OPTIONAL
-  *     in column 4 since this row is for optional parameters(or the non-existence of
-  *     optional parameters as the case may be)
-  * <li>Once a positional row specifies that it is optional, no further positional rows
-  *     may be specified.
-  * <li>At least one positional row must be specified, even if it is to just to specify that
-  *     there are no optional parameters.
-  * <li>Flag names must be in lower case.  Note: the user can specify upper or lower case
-  *     on the command line.
-  * <li>If a flag has a parameter the name of the parameter should be put into column 2.
-  *     otherwise CommandLine.NO_PARM should be put in column 2.
-  * <li>If a flag is allowed to appear more than once on the command line then
-  *     CommandLine.DUPS_OK should be put into column 3, otherwise CommandLine.NO_DUPS
-  *     should be put into column 3.
-  * <li>If a flag must be specified on the command line then CommandLine.REQUIRED should
-  *     be specified in column 4, otherwise CommandLine.OPTIONAL should be specified.
-  * <li>A help flag must be specified.
-  * <li>The strings specified in the flags column, the parameter name column, and the
-  *     help column are always translated using the resource bundle specified.  Of
-  *     course the special string values such as POSITIONAL and NO_PARM are not
-  *     translated.
-  * </ol>
-  *
-  * <p> Flag matching rules:
-  * <ol>
-  * <li>The parser will attempt to match a user specified flag with the minimum number
-  *     of programmer specified flag characters.  For example, if the programmer has
-  *     specified that the flag is "help" the user could specify "-h", "-he", "-hel", or
-  *     "-help".  If the programmer has also specified a flag called "hello", the
-  *     user would get an error message for specifing either "-h", "-he" or "-hel", since
-  *     it is ambiguous which flag is being refered to.  Both "-hell" and "-hello"
-  *     would be ok for the user to specify the hello flag on the command line.
-  * <li>If a flag has a parameter, the parameter may be immediately adjacent to the flag.
-  *     For example if "abcd" is specified as a flag with a parameter, the user could
-  *     specify the following assuming there are no other ambiguous flags. "-abcdparm",
-  *     "-abcparm", "-abparm", or "-aparm" where parm is the parameter for the flag.
-  *     (Of course the user can always put a white space between the flag and the
-  *     parameter.)
-  * <li>If a flag does not have a parameter and a parameter is adjacent to it then this
-  *     parameter is interpreted as a positional parameter.  For example if "abcb" is
-  *     specified as a flag and the user specifies "-abhello", then the first "ab" will be
-  *     interpreted as the flag and "hello" will be interpreted as a positional
-  *     parameter.
-  * </ol>
-  *
-  * @author Peter Moogk
-  * @date   July 13, 2000
-**/
-
-public class CommandLine
-{
-  // Constant strings that the user should use in their flags_info input array.
-  /**
-    * Specifies that this flag or positional parameter is required.
-  **/
-  public static final String REQUIRED   = "required";
-  /**
-    * Specifies that this flag or positional parameter is optional.
-  **/
-  public static final String OPTIONAL   = "optional";
-  /**
-    * Specifies that this flag may be specified more than once on the command line.
-    * Note: This string has no meaning for positional parameters.
-  **/
-  public static final String DUPS_OK    = "dups_ok";
-  /**
-    * Specifies that this flag may not be specified more than once on the command line.
-    * Note: This string has no meaning for positional parameters.
-  **/
-  public static final String NO_DUPS    = "no_dups";
-  /**
-    * Specifies that a row is a positional parameter row.
-  **/
-  public static final String POSITIONAL = "";
-  /**
-    * Specifies that a flag has no parameter.  For positional parameters this
-    * string indicates that there are no optional parameters.
-  **/
-  public static final String NO_PARM    = "";
-  
-  /**
-    * @param flags_info This parameter specifies the characteristics of the
-    *                   command line parser.  See the class description for a
-    *                   definition of what this string array should look like.
-    * @param help_flag  This string indicates which flag in the flags_info
-    *                   array is the help flag.
-    * @param tool_name  This string indicates the name of the tool that this
-    *                   command line parser is being used for.  This string
-    *                   is only used when creating the help text.
-  **/
-  public CommandLine( String[][]     flags_info,
-                       String         help_flag,
-                       String         tool_name,
-                       ResourceBundle flagMessages )
-                   
-    throws InternalErrorExc
-  {
-    this.flags_info   = flags_info;
-    this.help_flag    = help_flag;
-    this.tool_name    = tool_name;
-    this.flagMessages = flagMessages;
-    
-    messages = ResourceBundle.getBundle( "org.eclipse.wst.command.internal.env.commandline.commandline" );
-    verify_flags_info();
-  }
-
-  /**
-    * Call this method to parse a command line.
-    * @param args This is the string array from the command line.
-    * @throws Flag_error If the user has specified the command line incorrectly
-    *                    a Flag_error exception will be thrown.  Use getMessage
-    *                    to get a description of the user error.
-    *
-    * @throws Help_specified If the user specifies the help flag this exception
-    *                        will be thrown.  Use getMessage to get a fully
-    *                        formatted syntax description of this command line.
-  **/
-  public void check_flags( String[] args ) throws Flag_error
-  {
-    flags_specified = new Vector[flags_info.length];
-
-    for( int index = 0; index < args.length; index++ )
-    {
-      boolean processed_the_next_arg = process_arg( args, index );
-      if( processed_the_next_arg == true ) index++;
-    }
-
-    // If help was specified we will not check the regular rules.
-    if( !flag_specified( help_flag ) )
-    {
-      // Check for flags breaking the rules specified in flags_info.
-      check_rules();
-
-      // Call subclassed method to see if more processing is required.
-      more_processing();
-    }
-  }
-
-  /**
-    * This method is for subclasses of this class.  This method is called at
-    * the very end of check_flags method.  It is intended that subclasses would
-    * perform additional command line checking here.
-  **/
-  protected void more_processing() throws Flag_error, InternalErrorExc
-  {
-  }
-
-  /**
-    * Once the command line has been parsed by calling check_flags a
-    * call can be made to this method to get the parameters for this flag.
-    * If the flag was not specified on the command line null will be returned.
-    * If the flag was specified, but has no parameters a valid vector will be
-    * returned containing a null.
-  **/
-  public String[] get_flag_parms( String flag )
-  {
-    int     row        = 0;
-    boolean flag_found = false;
-
-    while( flag_found == false && row < flags_info.length )
-    {
-      if( flags_info[row][FLAG_COL].equals( flag ) )
-      {
-        flag_found = true;
-      }
-      else
-      {
-        row++;
-      }
-    }
-
-    if( flag_found == true ) 
-    {
-      Vector parms = flags_specified[row];
-      return parms == null ? null : (String[])(parms.toArray( new String[0] ));
-    }
-
-    return null;
-  }
-
-  /**
-    * Call this method to get all of the positional parameters.
-    * This method returns both the required positionals and the
-    * optional positionals in that order.  If no positional parameters
-    * were specified null will be returned.
-  **/
-  public String[] get_positionals()
-  {
-    return (String[])flags_specified[POSITIONAL_ROW].toArray( new String[0] );
-  }
-
-  /**
-    * This method returns true if this flag was specified by the user
-    * otherwise false is returned.
-  **/
-  public boolean flag_specified( String flag )
-  {
-    return get_flag_parms( flag ) != null;
-  }
-
-  /**
-    * This method returns fully formated help text syntax for this
-    * command line.
-  **/
-  public String get_help_text()
-  {
-    StringBuffer help_text  = new StringBuffer(400);
-    int          help_width = HELP_LINE_LEN -
-                              2 -              // blanks
-                              1 -              // dash
-                              max_flag_size -  // flag field
-                              1 -              // blank
-                              max_name_size -  // name field
-                              1;               // blank
-
-    help_text.append( messages.getString( FlagMessages.PARSER_INFO_SYNTAX ) +
-                      ": " + tool_name + " " );
-
-    // Display the required positionals if any.
-    for( int index = 0; index < required_positionals; index++ )
-    {
-      help_text.append( flagMessages.getString( flags_info[index][NAME_COL] ) +
-                        " " );
-    }
-
-    help_text.append( "[" + messages.getString( FlagMessages.PARSER_FLAGS ) +
-                      "] " );
-
-    if( optional_positionals_allowed == true )
-    {
-      help_text.append( flagMessages.getString( flags_info[optional_list_index][NAME_COL] ) );
-    }
-
-    help_text.append( "\n  " + messages.getString( FlagMessages.PARSER_INFO_WHERE ) + "\n" );
-
-    // Create one line of description for each parameter
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      String columnId   = flags_info[row][NAME_COL];
-      String columnName = columnId == NO_PARM ? "" : flagMessages.getString( columnId );
-
-      String flagId     = flags_info[row][FLAG_COL];
-      String flagName   = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString(flagId);
-
-      int flag_padding = max_flag_size - flagName.length();
-      int name_padding = max_name_size - columnName.length();
-
-      // Skip this row if this is a marker for no optional positionals.
-      if( flags_info[row][FLAG_COL] == POSITIONAL &&
-          flags_info[row][NAME_COL] == NO_PARM ) continue;
-
-      if( flagName == POSITIONAL )
-      {
-        help_text.append( getBlanks(3 ) );
-      }
-      else
-      {
-        help_text.append( "  -" + flagName );
-      }
-
-      help_text.append( getBlanks( flag_padding + 1 ) );
-      help_text.append( columnName );
-      help_text.append( getBlanks( name_padding + 1 ) );
-
-      String   columnHelp = flagMessages.getString( flags_info[row][HELP_COL] );
-      String[] split_help_text
-        = StringUtils.splitter( columnHelp, help_width );
-
-      if( split_help_text.length > 0 )
-        help_text.append( split_help_text[0] + "\n" );
-      else
-        help_text.append( "\n" );
-
-      for( int index = 1; index < split_help_text.length; index++ )
-      {
-        help_text.append( getBlanks( HELP_LINE_LEN - help_width ) );
-        help_text.append( split_help_text[index] + "\n" );
-      }
-      
-      help_text.append( "\n" );
-    }
-
-    return "" + help_text;
-  }
-  
-  /**
-   *  Return a string with the specified number of blanks.
-   */
-  private String getBlanks( int count )
-  {
-  	char[] blanks = new char[count];
-  	Arrays.fill( blanks, 0, count, ' ' );
-  	
-  	return new String( blanks );
-  }
-
-  /**
-    * This class is the base for all command line exception classes.
-  **/
-  static public class ErrorExc extends Exception
-  {
-  	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3257567317259793720L;
-
-	public ErrorExc( String message, String[] args )
-  	{
-  	  super( MessageFormat.format( message, args ) );
-  	}
-  }
-
-  /**
-    * This class will be thrown when an internal error is detected.
-    * This usually happens if the flag description information was
-    * specified incorrectly.
-  **/
-  static public class InternalErrorExc extends IllegalArgumentException
-  {  	
-  	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3258410621136614450L;
-
-	public InternalErrorExc( String message, String[] args )
-  	{
-  	  super( MessageFormat.format( message, args ) );
-  	}
-  	
-  	public InternalErrorExc( String message )
-  	{
-  	  this( message, (String[])null );
-  	}
-  	
-  	public InternalErrorExc( String message, String arg )
-  	{
-  	  this( message, new String[]{ arg } );
-  	}
-  }
-
-  /**
-    * This class will be thrown if a user error occurs while parsing the command line.
-  **/
-  static public class Flag_error extends ErrorExc
-  {
-    /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3832621776877663537L;
-
-	public Flag_error( String message, String[] args )
-    {
-      super( message, args );
-    }
-
-    public Flag_error( String message, String arg )
-    {
-      super( message, new String[]{ arg } );
-    }
-
-    public Flag_error( String message )
-    {
-      super( message, null );
-    }
-  }
-
-  /**
-    * Tries to process a single flag on the command line.
-    * @param  args      All the command line parameters.
-    * @param  arg_index This is the index of the argument that is to be processed.
-    * @return returns true if the argument we are processing is a flag that has a
-    *         parameter and the parameter is specified in the next argument.
-  **/
-  private boolean process_arg( String[] args, int arg_index ) throws Flag_error
-  {
-    boolean processed_next_arg = false;
-
-    if( args[arg_index].charAt(0) == '-' )
-    {
-      // This is the start of a flag.
-      int flag_index = 1;
-      int info_index = get_info_index( args[arg_index], flag_index );
-      int max_index  = get_max_index( args[arg_index], flag_index, info_index );
-
-      if( flags_info[info_index][NAME_COL] != NO_PARM )
-      {
-        // This flag takes a parameter so check if it is stuck to this
-        // arg.
-        if( max_index < args[arg_index].length() )
-        {
-          add_flag_parm( info_index,
-                         args[arg_index].substring( max_index,
-                                                    args[arg_index].length() ) );
-        }
-        else
-        {
-          // This flag has a parameter and it wasn't stuck to the flag,
-          // so we will try to get it from the next arg.
-          if( arg_index+1 < args.length &&
-              args[arg_index+1].charAt(0) != '-' )
-          {
-            // We found an parameter in the next string so we will use this
-            // one as a parameter for this flag.  Note: if was no parameter
-            // after the flag at all, the error will be caught in the
-            // check_rules method.
-            add_flag_parm( info_index, args[arg_index+1] );
-            processed_next_arg = true;
-          }
-          else
-          {
-            // Error missing paramater. This error is caught by check_rules.
-            add_flag_parm( info_index, null );
-          }
-        }
-      }
-      else
-      {
-        // The flag does not have a parameter so we will add a null.
-        add_flag_parm( info_index, null );
-
-        // Check to see if a positional parameter is stuck to this flag.
-        if( max_index < args[arg_index].length() )
-        {
-          add_positional( args[arg_index].substring( max_index,
-                                                     args[arg_index].length() ) );
-        }
-      }
-    }
-    else
-    {
-      // This is a positional parameter.
-      add_positional( args[arg_index] );
-    }
-
-    return processed_next_arg;
-  }
-
-  /**
-    * Finds the row for the flag that uniquely matched this flag str.
-    * @return returns the flags_info index of the matching flag.
-  **/
-  private int get_info_index( String flag_str, int start_index )
-    throws Flag_error
-  {
-    //int info_start  = 1;
-    //int info_end    = flags_info.length;
-    int info_index;
-    int found_count = 0;
-    int info_col_index = 0;
-    int last_info_index = 0;
-
-    BitSet flags_rejected = new BitSet();
-
-    // Loop over each char in flag_str.  Note: we will probably bail early.
-    for( int flag_col_index = start_index; flag_col_index < flag_str.length(); flag_col_index++ )
-    {
-      // Loop over each flag in flag_info
-      for( info_index = 0; info_index < flags_info.length; info_index++ )
-      {
-        String flagId   = flags_info[info_index][FLAG_COL];
-        String flagName = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString( flagId );
-
-        if( flags_rejected.get( info_index ) == false &&
-            info_col_index < flagName.length() &&
-              Character.toLowerCase(flag_str.charAt(flag_col_index)) ==
-              flagName.charAt(info_col_index) )
-        {
-          found_count++;
-          last_info_index = info_index;
-        }
-        else
-        {
-          flags_rejected.set( info_index );
-        }
-      }
-
-      if( found_count == 1 )
-      {
-        // We have a match.
-        return last_info_index;
-      }
-      else if( found_count == 0 )
-      {
-        // Flag not found at all.
-        throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_FLAG_NOT_FOUND ),
-                              flag_str.substring( start_index ) );
-      }
-      else
-      {
-        // More than one flag was found with this char so we will go to the
-        // next char to uniquely match it.
-        info_col_index++;
-        //info_start = last_info_index - found_count + 1;
-        //info_end   = last_info_index + 1;
-        found_count = 0;
-      }
-    }
-
-    // The only way to get to this code is if the loop exited with
-    // the found_count greater than 1.  Therefore, the flag specified is
-    // ambiguous.
-    throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_AMBIGUOUS_FLAG ),
-                          flag_str.substring( start_index) );
-  }
-
-  /**
-    * This method tries to match as many characters as possible of the user
-    * specified flag with the matched flag string.
-    * @return returns the position of the last matching flag chararacter.
-  **/
-  private int get_max_index( String flag_str, int flag_start, int info_index )
-  {
-    int flag_col_index = flag_start;
-    int info_col_index = 0;
-
-    String info_str = flagMessages.getString( flags_info[info_index][FLAG_COL] );
-
-    while( flag_col_index < flag_str.length() &&
-           info_col_index < info_str.length() )
-    {
-      if( Character.toLowerCase( flag_str.charAt(flag_col_index) ) !=
-          info_str.charAt(info_col_index) )
-        break;
-
-      flag_col_index++;
-      info_col_index++;
-    }
-
-    return flag_col_index;
-  }
-
-  /**
-    * Adds a positional parameter to flags_specified.
-  **/
-  private void add_positional( String positional_parm )
-  {
-    if( flags_specified[POSITIONAL_ROW] == null )
-      flags_specified[POSITIONAL_ROW] = new Vector(3);
-
-    flags_specified[POSITIONAL_ROW].add( positional_parm );
-  }
-
-  /**
-    * Adds a flag and its parameter to flags_specified.  If only the
-    * flag was specified, then a null should be passed to flag_parm.
-  **/
-  private void add_flag_parm( int flag_index, String flag_parm )
-    throws Flag_error
-  {
-    if( flags_info[flag_index][DUP_COL] == NO_DUPS &&
-        flags_specified[flag_index] != null )
-      throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED ),
-                             flagMessages.getString( flags_info[flag_index][FLAG_COL] ) );
-
-    if( flags_specified[flag_index] == null )
-      flags_specified[flag_index] = new Vector(3);
-
-    flags_specified[flag_index].add( flag_parm );
-  }
-
-  /**
-    * Checks that the user hasn't broken any command line rules.
-  **/
-  private void check_rules() throws Flag_error
-  {
-    // Check that all of the required positionals were specified.
-    int positional_count = 0;
-
-    if( flags_specified[POSITIONAL_ROW] != null )
-    {
-      positional_count = flags_specified[POSITIONAL_ROW].size();
-    }
-
-    if( required_positionals > positional_count )
-      throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_POSITIONAL ),
-                             flagMessages.getString( flags_info[required_positionals-1][NAME_COL] ) );
-
-    else if( required_positionals < positional_count &&
-             optional_positionals_allowed == false )
-      throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_TOO_MANY_POSITIONALS ) );
-
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      if( flags_info[row][FLAG_COL] == POSITIONAL ) continue;
-
-      if( flags_specified[row] == null &&
-          flags_info[row][REQUIRED_COL] == REQUIRED )
-        throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_REQUIRED_FLAG ),
-                               flagMessages.getString( flags_info[row][FLAG_COL] ) );
-
-      int parm_count = 0;
-
-      if( flags_specified[row] != null ) parm_count = flags_specified[row].size();
-
-      // Check for too many flag parameters.
-      if( flags_info[row][DUP_COL] == NO_DUPS && parm_count > 1 )
-        throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED ),
-                               flagMessages.getString( flags_info[row][FLAG_COL] ) );
-
-      // Check for missing flag parameter.
-      if( parm_count > 0 && flags_info[row][NAME_COL] != NO_PARM )
-      {
-        for( int index = 0; index < flags_specified[row].size(); index++ )
-        {
-          if( flags_specified[row].elementAt(index) == null )
-            throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_FLAG_PARAMETER ),
-                                  new String[]
-                                    { flagMessages.getString( flags_info[row][FLAG_COL] ),
-                                      flagMessages.getString( flags_info[row][NAME_COL] ) } );
-
-        }
-      }
-    }
-  }
-
-  /**
-    * This method verifies that a proper flags_info string array was passed
-    * to us by the programmer.
-  **/
-  private void verify_flags_info() throws InternalErrorExc
-  {
-    boolean done_positionals = false;
-    boolean help_specified   = false;
-
-    required_positionals = 0;
-    optional_positionals_allowed = false;
-    optional_list_index = -1;
-    max_flag_size = 0;
-    max_name_size = 0;
-
-    if( flags_info == null || flags_info.length == 0 )
-      throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED  ) );
-
-    if( flags_info[POSITIONAL_ROW] != null &&
-        flags_info[POSITIONAL_ROW].length > 0 &&
-        flags_info[POSITIONAL_ROW][FLAG_COL] != POSITIONAL )
-      throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL ) );
-
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      if( flags_info[row] == null )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NULL_FLAG_ROW ) );
-
-      if( flags_info[row].length != 5 )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_ROW_SIZE ) );
-
-      if( flags_info[row][FLAG_COL] == null ||
-          flags_info[row][NAME_COL] == null ||
-          flags_info[row][HELP_COL] == null )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NULL_IN_ROW ) );
-
-      if( flags_info[row][FLAG_COL].equals( help_flag ) ) help_specified = true;
-
-      String flagId   = flags_info[row][FLAG_COL];
-      String nameId   = flags_info[row][NAME_COL];
-
-      String flag_col = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString( flagId );
-      String name_col = nameId == NO_PARM ? NO_PARM : flagMessages.getString( nameId );
-
-      if( flag_col.length() > max_flag_size )
-        max_flag_size = flag_col.length();
-
-      if( name_col != NO_PARM && name_col.length() > max_name_size )
-        max_name_size = name_col.length();
-
-      // Ensure that flags are all in lowercase.
-      if( !flag_col.equals( flag_col.toLowerCase() ) )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_FLAG_NOT_LOWERCASE ),
-                                    flag_col );
-
-      // Ensure that only the predefined dup strings are used.
-      // Note: it's ok to use != when comparing constant strings literals.
-      if( flags_info[row][DUP_COL] == null ||
-          ( flags_info[row][DUP_COL] != NO_DUPS &&
-            flags_info[row][DUP_COL] != DUPS_OK ) )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_DUP_STRING ),
-                                 flags_info[row][DUP_COL] );
-
-      // Ensure that only the predefined required strings are used.
-      if( flags_info[row][REQUIRED_COL] == null ||
-          ( flags_info[row][REQUIRED_COL] != REQUIRED &&
-            flags_info[row][REQUIRED_COL] != OPTIONAL ) )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_REQUIRED_STRING ),
-                                 flags_info[row][REQUIRED_COL] );
-
-      // Count the number of required positionals.
-      if( flags_info[row][FLAG_COL] == POSITIONAL )
-      {
-        if( flags_info[row][REQUIRED_COL] == REQUIRED )
-        {
-          if( flags_info[row][NAME_COL] == NO_PARM )
-            throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME ) );
-
-          required_positionals++;
-        }
-        else if( flags_info[row][NAME_COL] != NO_PARM )
-        {
-          // We use the NAME_COL field for an optional positional to denote
-          // whether additional positionals are allowed or not.
-          optional_positionals_allowed = true;
-          optional_list_index = row;
-        }
-      }
-
-      // Ensure that positionals are at the beginning of the info.
-      if( flags_info[row][FLAG_COL] != POSITIONAL ||
-          ( done_positionals == false &&
-            flags_info[row][FLAG_COL] == POSITIONAL &&
-            flags_info[row][REQUIRED_COL] == OPTIONAL ) )
-      {
-        done_positionals = true;
-      }
-      else if( done_positionals == true )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING ) );
-    }
-
-    // Ensure that a help flag was specified in the info list.
-    if( help_specified == false )
-      throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED ) );
-  }
-
-  /**
-    * This method is used to dump internal information about a parsed
-    * command line.
-  **/
-  public String toString()
-  {
-    StringBuffer b = new StringBuffer(100);
-
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      b.append( "\n" );
-
-      if( flags_info[row][FLAG_COL] == POSITIONAL )
-        b.append( "Positional:" );
-      else
-        b.append( flagMessages.getString( flags_info[row][FLAG_COL] ) + ":" );
-
-
-      if( flags_specified[row] == null )
-        b.append( "no parameters" );
-      else
-        for( int parm_index = 0; parm_index < flags_specified[row].size(); parm_index++ )
-        {
-          String parm = (String)flags_specified[row].elementAt(parm_index);
-          b.append( parm + ":" );
-        }
-      b.append( "\n" );
-    }
-
-    return ""+b;
-  }
-
-  private static final int FLAG_COL     = 0;
-  private static final int NAME_COL     = 1;
-  private static final int DUP_COL      = 2;
-  private static final int REQUIRED_COL = 3;
-  private static final int HELP_COL     = 4;
-
-  private static final int POSITIONAL_ROW = 0;
-  private static final int HELP_LINE_LEN  = 75;
-
-  private String[][] flags_info;
-  private String     help_flag;
-  private String     tool_name;
-  private Vector[]   flags_specified;
-  private int        required_positionals;
-  private boolean    optional_positionals_allowed;
-  private int        optional_list_index;
-  private int        max_flag_size;
-  private int        max_name_size;
-
-  protected ResourceBundle messages;
-  private   ResourceBundle flagMessages;
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java
deleted file mode 100644
index 49a128c..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.commandline;
-
-/**
-  * This class is used to store constant string error messages
-  * generated by CommandLine.java
-  *
-  *
-  * @author Peter Moogk
-  * @date   July 13, 2000
-  * @see    org.eclipse.wst.command.internal.env.commandline.CommandLine
-**/
-
-public final class FlagMessages
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public static final String PARSER_ERROR_FLAG_NOT_FOUND = "PARSER_ERROR_FLAG_NOT_FOUND";
-
-  public static final String PARSER_ERROR_AMBIGUOUS_FLAG = "PARSER_ERROR_AMBIGUOUS_FLAG";
-
-  public static final String PARSER_ERROR_MISSING_POSITIONAL = "PARSER_ERROR_MISSING_POSITIONAL";
-
-  public static final String PARSER_ERROR_TOO_MANY_POSITIONALS = "PARSER_ERROR_TOO_MANY_POSITIONALS";
-
-  public static final String PARSER_ERROR_MISSING_REQUIRED_FLAG = "PARSER_ERROR_MISSING_REQUIRED_FLAG";
-
-  public static final String PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED = "PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED";
-
-  public static final String PARSER_ERROR_MISSING_FLAG_PARAMETER = "PARSER_ERROR_MISSING_FLAG_PARAMETER";
-
-  // Error internal error messages.
-  public static final String PARSER_ERROR_MESSAGE_MISSING_ARG = "PARSER_ERROR_MESSAGE_MISSING_ARG";
-
-  // Internal command line error messages.
-  public static final String PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED = "PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED";
-
-  public static final String PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL = "PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL";
-
-  public static final String PARSER_ERROR_NULL_FLAG_ROW = "PARSER_ERROR_NULL_FLAG_ROW";
-
-  public static final String PARSER_ERROR_INCORRECT_ROW_SIZE = "PARSER_ERROR_INCORRECT_ROW_SIZE";
-
-  public static final String PARSER_ERROR_NULL_IN_ROW = "PARSER_ERROR_NULL_IN_ROW";
-
-  public static final String PARSER_ERROR_INCORRECT_DUP_STRING = "PARSER_ERROR_INCORRECT_DUP_STRING";
-
-  public static final String PARSER_ERROR_INCORRECT_REQUIRED_STRING = "PARSER_ERROR_INCORRECT_REQUIRED_STRING";
-
-  public static final String PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING = "PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING";
-
-  public static final String PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED = "PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED";
-
-  public static final String PARSER_ERROR_FLAGS_NOT_ORDERED = "PARSER_ERROR_FLAGS_NOT_ORDERED";
-
-  public static final String PARSER_ERROR_FLAG_NOT_LOWERCASE = "PARSER_ERROR_FLAG_NOT_LOWERCASE";
-
-  public static final String PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME = "PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME";
-
-  public static final String PARSER_INFO_SYNTAX = "PARSER_SYNTAX";
-
-  public static final String PARSER_FLAGS = "PARSER_FLAGS";
-  
-  public static final String PARSER_INFO_WHERE = "PARSER_WHERE";
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties
deleted file mode 100644
index 7852981..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties
+++ /dev/null

@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-PARSER_ERROR_FLAG_NOT_FOUND=IWAB0123E Flag -{0} is not valid.
-PARSER_ERROR_AMBIGUOUS_FLAG=IWAB0284E Flag -{0} is ambiguous.
-PARSER_ERROR_MISSING_POSITIONAL=IWAB0285E Missing {0} parameter.
-PARSER_ERROR_TOO_MANY_POSITIONALS=IWAB0286E Too many positional parameters specified.
-PARSER_ERROR_MISSING_REQUIRED_FLAG=IWAB0288E Flag -{0} is missing.
-PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED=IWAB0293E Flag -{0} has been specified more than once.
-PARSER_ERROR_MISSING_FLAG_PARAMETER=IWAB0294E Flag -{0} is missing parameter {1}.
-PARSER_ERROR_MESSAGE_MISSING_ARG=IWAB0319E Error message {0} is missing an argument.
-PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED=IWAB0345E Specify flag information.
-PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL=IWAB0346E The first flag must be positional.
-PARSER_ERROR_NULL_FLAG_ROW=IWAB0347E Null flag row.
-PARSER_ERROR_INCORRECT_ROW_SIZE=IWAB0348E Flag row must have 5 strings.
-PARSER_ERROR_NULL_IN_ROW=IWAB0349E Flag information contains a null string.
-PARSER_ERROR_INCORRECT_DUP_STRING=IWAB0350E Duplicate string {0} is not valid.
-PARSER_ERROR_INCORRECT_REQUIRED_STRING=IWAB0351E Required string {0} is not valid.
-PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING=IWAB0352E Positional flag is not at the beginning.
-PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED=IWAB0353E Help flag is not specified in information array.
-PARSER_ERROR_FLAGS_NOT_ORDERED=IWAB0354E Flags are not in lexical order.
-PARSER_ERROR_FLAG_NOT_LOWERCASE=IWAB0355E Flag {0} is not lowercase.
-PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME=IWAB0356E Required positional parameters must have a name specified.
-PARSER_SYNTAX=Syntax
-PARSER_FLAGS=Flags
-PARSER_WHERE=Where

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java
deleted file mode 100644
index fa1923e..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.File;
-
-/**
- * 
- * The class provides and easy way to build classpaths.
- *
- */
-public class ClassPath 
-{
-  private StringBuffer path = new StringBuffer();
-  
-  /**
-   * 
-   * @param newPath appends this new path to the end of the classpath.
-   */
-  public void appendPath( String newPath )
-  {
-  	// No value to put on path, so just return
-  	if( newPath.equals( "" ) ) return;
-  	
-  	// If this is the first path in the string then we don't need a path
-  	// separator.
-  	if( path.length() == 0 )
-  	{
-  	  path.append( newPath );
-  	}
-  	else
-  	{
-  	  path.append( File.pathSeparatorChar + newPath );
-  	}
-  }
-  
-  /**
-   * This method appends all jar and zip files in a particular directory to
-   * the classpath.
-   * 
-   * @param directory specifies a directory contains jar and zip files.
-   */
-  public void appendDir( String directory )
-  {
-  	File dir = new File( directory );
-  	
-  	if( !dir.isDirectory() ) return;
-  	
-  	File[] files = dir.listFiles();
-  	
-  	for( int index = 0; index < files.length; index++ )
-  	{
-  	  File   file = files[index];
-  	  String name = file.getName();
-  	  
-  	  if( file.isFile() &&
-  	      ( name.endsWith( ".jar" ) ||
-  	        name.endsWith( ".zip" ) ) )
-  	  {
-  	  	appendPath( file.getAbsolutePath() );
-  	  }
-  	        
-  	}
-  }
-  
-  /**
-   * 
-   * @param newPath appends a new classpath to the end of this classpath.
-   */
-  public void appendPath( ClassPath newPath )
-  {
-  	appendPath( newPath.path.toString() );
-  }
-  
-  /**
-   * @return returns the full string classpath with separators.
-   */
-  public String toString()
-  {
-  	return path.toString();
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java
deleted file mode 100644
index 0960ac6..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-
-
-/**
-* This class defines an output stream that writes to an
-* {@link org.eclipse.core.resources.IFile IFile}.
-*/
-public class FileResourceOutputStream extends OutputStream
-{
-
-  IPath                 fFilePath;
-  ResourceContext       fResourceContext; 
-  IProgressMonitor       fMonitor;   
-  IStatusHandler         fStatusHandler;
-  ByteArrayOutputStream fByteArrayOutputStream;
-  boolean               fOpen;
-
-  /**
-  * Constructs an output stream that can be used to write to the
-  * given <code>file</code>. The workspace is neither examined nor
-  * altered during construction. All resource creation is deferred
-  * until later in the stream's lifecycle, such as during writing
-  * or closure.
-  * <b>Note:</b> The preferred mechanism for creating a stream that
-  * writes to an IFile is to call the static factory method
-  * {@link FileResourceUtils#newFileOutputStream FileResourceUtils.newFileOutputStream()}
-  * and work with the resulting <code>OutputStream</code>.
-  * Direct construction of a FileResourceOutputStream is not recommended.
-  * @param file The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file resource to create. The project implied by the
-  * pathname of the file must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param progressMonitor The progress monitor for the operation, or null.
-  */
-  public FileResourceOutputStream ( 
-  			ResourceContext resourceContext, 
-  			IPath           filePath, 
-  			IProgressMonitor monitor,
-  			IStatusHandler   statusHandler
-  			)
-  {
-    fFilePath = filePath;
-    fResourceContext = resourceContext;
-    fMonitor = monitor;
-    fStatusHandler = statusHandler;
-    fByteArrayOutputStream = new ByteArrayOutputStream();
-    fOpen = true;
-  }
-
-  /**
-  * Closes the stream.
-  * @throws IOException If an error occurs while closing the stream.
-  * For example, if this stream was constructed with overwriteFile = false
-  * and a file of the same name already exists, then an IOException will
-  * be thrown either now or during an earlier {@link #write write}.
-  */
-  public void close ()
-  throws IOException
-  {
-    if (!fOpen) return;
-    fOpen = false;
-    fByteArrayOutputStream.close();
-    byte[] buffer = fByteArrayOutputStream.toByteArray();
-    ByteArrayInputStream tempInputStream = new ByteArrayInputStream(buffer);
-    try
-    {
-      FileResourceUtils.createFile(fResourceContext, fFilePath, tempInputStream, fMonitor, fStatusHandler);
-    }
-    catch (CoreException e)
-    {
-      throw new IOException(e.getMessage());
-    }
-  }
-
-  /**
-  * Flushes the stream. This does not imply the File resource
-  * will be created or become visible within the workbench.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void flush ()
-  throws IOException
-  {
-    fByteArrayOutputStream.flush();
-  }
-
-  /**
-  * Writes all bytes from the given array to the stream.
-  * @param b The array of bytes to write.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void write ( byte[] b )
-  throws IOException
-  {
-    fByteArrayOutputStream.write(b);
-  }
-
-  /**
-  * Writes bytes from the given array beginning at some offset
-  * and continuing for some number of bytes (len) to the stream.
-  * @param b The array of bytes to write.
-  * @param off The offset into the array to begin writing.
-  * @param len The number of bytes to write.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void write ( byte[] b, int off, int len )
-  {
-    fByteArrayOutputStream.write(b,off,len);
-  }
-
-  /**
-  * Writes a single byte to the stream.
-  * @param b The byte to write.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void write ( int b )
-  {
-    fByteArrayOutputStream.write(b);
-  }
-}
-

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java
deleted file mode 100644
index 589aa36..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java
+++ /dev/null

@@ -1,659 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-
-
-/**
-* This class contains useful methods for working with Eclipse resources.
-*/
-public final class FileResourceUtils
-{
-  //
-  // Keeps the IWorkspace hanging around. See getWorkspace().
-  //
-  private static IWorkspace workspace_ = null;
-  //
-  // Keeps the IWorkspaceRoot hanging around. See getWorkspaceRoot().
-  //
-  private static IWorkspaceRoot root_ = null;
-  
-  private static MessageUtils msg_ = new MessageUtils( "org.eclipse.wst.command.internal.env.common.environment", new FileResourceUtils() );
-
-
- /**
-  * Returns the IWorkspaceRoot object.
-  * @return The IWorkspaceRoot object.
-  */
-  public static IWorkspaceRoot getWorkspaceRoot ()
-  {
-    if (root_ == null)
-    {
-      root_ = ResourcesPlugin.getWorkspace().getRoot();
-    }
-    return root_;
-  }
-
- /**
-  * Returns the IWorkspace object.
-  * @return The IWorkspace object.
-  */
-  public static IWorkspace getWorkspace ()
-  {
-    if (workspace_ == null)
-    {
-      if (root_ == null)
-      {
-        root_ = ResourcesPlugin.getWorkspace().getRoot();
-      }
-      
-      workspace_ = root_.getWorkspace();
-    }
-    
-    return workspace_;
-  }
-  
-  /**
-   * 
-   * @return returns an array of three common choices. (ie. Yes, yes all, and cancel )
-   */
-  public static Choice[] getThreeStateFileOptions() 
-  {
-    Vector choices = new Vector();
-    
-    choices.add(new Choice( 'Y', msg_.getMessage("LABEL_YES")));
-    choices.add(new Choice( 'A', msg_.getMessage("LABEL_YES_TO_ALL")));
-    choices.add(new Choice( 'C', msg_.getMessage("LABEL_CANCEL")));
-    
-    return (Choice[])choices.toArray(new Choice[choices.size()]);
-  }
-  
-  /**
-  * Returns an
-  * {@link org.eclipse.core.resources.IResource IResource}
-  * of the given absolute pathname or null if no such resource exists.
-  * @param absolutePathname The absolute path of the resource.
-  * @return The <code>IResource</code>.
-  */
-  public static IResource findResource ( String absolutePathname )
-  {
-    if (absolutePathname == null)
-    {
-      return null;
-    }
-    
-    return findResource(new Path(absolutePathname));
-  }
-
-  /**
-  * Returns an
-  * {@link org.eclipse.core.resources.IResource IResource}
-  * of the given absolute path or null if no such resource exists.
-  * @param absolutePath The absolute <code>IPath</code> of the resource.
-  * @return The <code>IResource</code>.
-  */
-  public static IResource findResource ( IPath absolutePath )
-  {
-    if (absolutePath == null)
-    {
-      return null;
-    }
-    
-    return FileResourceUtils.getWorkspaceRoot().findMember(absolutePath);
-  }
-  
-  /**
-   * Copies a file from a plugin's installation location
-   * to an Eclipse folder.
-   * @param plugin The plugin containing the files to copy.
-   * Must not be null.
-   * @param sourcePath The path, relative to the <code>plugin</code>
-   * install location, containing the files to copy.
-   * If null, then the plugin install location is the source path
-   * (ie. null is equivalent to ".").
-   * @param pathname The pathname of the file to copy.
-   * The pathname is relative to the <code>plugin sourcePath</code>.
-   * Must not be null.
-   * @param targetPath The absolute Eclipse path of the folder to
-   * which the file will be copied. The relative pathname of the
-   * file is preserved.
-   * Must not be null.
-   * @param createFolders The intermediate folder creation policy, one of
-   * {@link #CREATE CREATE} or {@link #DONT_CREATE DONT_CREATE}.
-   * <ul>
-   * <li><code>CREATE</code> -
-   * If any intermediate folders in the given <code>absolutePath</code>
-   * do not exist, they will be created.
-   * <li><code>DONT_CREATE</code> -
-   * If any intermediate folders in the given <code>absolutePath</code>
-   * do not exist, the method will throw a <code>CoreException</code>.
-   * </ul>
-   * @param overwriteFile The policy for existing files, one of
-   * {@link #OVERWRITE OVERWRITE} or {@link #DONT_OVERWRITE DONT_OVERWRITE}.
-   * <ul>
-   * <li><code>OVERWRITE</code> -
-   * If a resource of the same name as the given
-   * <code>absolutePath</code> already exists and is a file,
-   * it will be replaced.
-   * If the resource already exists and it is not a file,
-   * then no file will be created and
-   * a <code>CoreException</code> will be thrown.
-   * <li><code>DONT_OVERWRITE</code> -
-   * If any resource of the same name as the given
-   * <code>absolutePath</code> already exists,
-   * then no file will be created and
-   * a <code>CoreException</code> will be thrown.
-   * </ul>
-   * @param progressMonitor The progress monitor for the operation, or null.
-   * @throws CoreException An exception containing an
-   * {@link org.eclipse.core.runtime.IStatus IStatus}
-   * with a severity of <code>IStatus.ERROR</code> and a
-   * locale-specific description of the cause.
-   */
-   static public void copyFile( ResourceContext resourceContext,
-                                Plugin plugin,
-                                IPath sourcePath,
-                                IPath pathname,
-                                IPath targetPath,
-                                IProgressMonitor progressMonitor,
-                                IStatusHandler statusMonitor )
-     throws CoreException
-   {
-     try
-     {
-       IPath target = targetPath.append(pathname);
-       IPath source = sourcePath == null ? pathname : sourcePath.append(pathname);
-       InputStream input = plugin.openStream(source);
-       createFile(resourceContext, target, input, progressMonitor, statusMonitor);
-     }
-     catch (IOException e)
-     {
-       throw new CoreException(new Status(IStatus.ERROR,
-                               plugin.getBundle().getSymbolicName(),
-                               0,
-                               msg_.getMessage("MSG_ERROR_IO"),e));
-     }
-   }
-   
-  /**
-   * Deletes a file under a container.
-   * The container must already exist.
-   * @param file - the IFile to be deleted
-   * @param progressMonitor
-   * @param statusMonitor
-   * @return True if the file does not exist or if it exists and is successfully deleted. False otherwise.
-   */
-  public static boolean deleteFile( ResourceContext resourceContext, 
-                                    IFile file,
-                                    IProgressMonitor progressMonitor, 
-                                    IStatusHandler statusMonitor)
-    throws CoreException
-  {
-    if (file.exists())
-    {
-      if (!resourceContext.isOverwriteFilesEnabled())
-      {
-        IStatus status 
-          = StatusUtils.warningStatus( msg_.getMessage( "MSG_ERROR_FILE_OVERWRITE_DISABLED",
-                                                        new Object[]{ file.getParent().getFullPath().toString(),
-                                                                      file.getName()}) );
-                            
-        
-        Choice choice = statusMonitor.report( status, getThreeStateFileOptions() );
-        
-        if( choice.getShortcut() == 'C' ) return false;
-        
-        if( choice.getShortcut() == 'A' ) resourceContext.setOverwriteFilesEnabled(true);
-      }
-      
-      //We have permission to overwrite so check if file is read-only
-      if (file.isReadOnly())
-      {
-        if (!resourceContext.isCheckoutFilesEnabled())
-        {
-          IStatus status 
-            = StatusUtils.warningStatus( msg_.getMessage( "MSG_ERROR_FILE_CHECKOUT_DISABLED",
-                                                          new Object[]{ file.getParent().getFullPath().toString(),
-                                                                        file.getName()}) );
-          
-          Choice choice = statusMonitor.report( status, getThreeStateFileOptions() );
-          
-          if( choice.getShortcut() == 'C' ) return false;
-          
-          if( choice.getShortcut() == 'A' ) resourceContext.setCheckoutFilesEnabled(true);          
-        }
-        
-        IFile[] files = new IFile[1];
-        files[0] = file;
-        IStatus status = getWorkspace().validateEdit(files, null);
-        
-        if( status.getSeverity() == IStatus.ERROR )
-        {
-          statusMonitor.reportError( status );
-          return false;
-        }
-      }
-      
-      file.delete(true, null);
-    }
-    //At this point, either the file did not exist or we successfully deleted
-    // it. Return success.
-    return true;
-  }
-
-  /**
-   * Deletes a folder under a container.
-   * @param folder - the IFolder to be deleted
-   * @param progressMonitor
-   * @param statusMonitor
-   * @return True if the folder does not exist or if it exists and is successfully deleted along with its members. False otherwise.
-   */
-   public static boolean deleteFolder( ResourceContext resourceContext,
-                                       IFolder folder,
-                                       IProgressMonitor progressMonitor,
-                                       IStatusHandler statusMonitor )
-     throws CoreException
-   {
-     if (!folder.exists()) return true;
-
-     boolean     deleted   = true;
-     IResource[] resources = folder.members();
-     
-     for (int i=0; i<resources.length; i++)
-     {
-       IResource resource = resources[i];
-       if (resource instanceof IFile)
-       {
-         deleted = deleteFile(resourceContext, (IFile)resource, progressMonitor, statusMonitor);
-       }
-       if (resource instanceof IFolder)
-       {
-         deleted = deleteFolder( resourceContext, (IFolder)resource, progressMonitor, statusMonitor);
-       }
-
-       if( !deleted ) break;
-     }
-     
-     if( deleted )
-     {
-       folder.delete(true, true, null);
-       return true;
-     }
-     else
-       return false;
-   }
-
-  /**
-  * Creates a file of the given <code>absolutePath</code>
-  * and returns its handle as an <code>IFile</code>.
-  * If the file cannot be created, a
-  * <code>CoreException</code> containing an
-  * <code>IStatus</code> object is thrown.
-  * @param absolutePath The absolute path of the file to create.
-  * The project at the beginning of the path must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param progressMonitor The progress monitor for the operation, or null.
-  * @return The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file.
-  * @throws CoreException An exception containing an
-  * {@link org.eclipse.core.runtime.IStatus IStatus}
-  * with a severity of <code>IStatus.ERROR</code> and a
-  * locale-specific description of the cause.
-  */
-  public static IFile createFile (
-    ResourceContext resourceContext,
-    IPath           absolutePath,
-    InputStream     inputStream,
-    IProgressMonitor progressMonitor,
-    IStatusHandler   statusHandler )
-
-    throws CoreException 
-  {    
-    if (!absolutePath.isAbsolute())
-    {
-      throw new CoreException(new Status(IStatus.ERROR, "ResourceUtils",0,msg_.getMessage("MSG_ERROR_PATH_NOT_ABSOLUTE",new Object[] {absolutePath.toString()}),null));
-    }
-    if (absolutePath.segmentCount() < 1)
-    {
-      throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,msg_.getMessage("MSG_ERROR_PATH_EMPTY",new Object[] {absolutePath.toString()}),null));
-    }
-    if (absolutePath.segmentCount() < 2)
-    {
-      throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,msg_.getMessage("MSG_ERROR_PATH_NOT_FOLDER",new Object[] {absolutePath.toString()}),null));
-    }
-    IContainer parent   = makeFolderPath(resourceContext, absolutePath.removeLastSegments(1), progressMonitor, statusHandler);
-    String     fileName = absolutePath.lastSegment();
-    
-    return makeFile(resourceContext, parent, fileName, inputStream, progressMonitor, statusHandler);
-  }
-
-  /**
-  * Creates under the given <code>project</code>
-  * a file of the given <code>relativePath</code>
-  * and returns its handle as an <code>IFile</code>.
-  * If the file cannot be created, a
-  * <code>CoreException</code> containing an
-  * <code>IStatus</code> object is thrown.
-  * @param absolutePath The absolute path of the file to create.
-  * The project at the beginning of the path must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param createFolders The intermediate folder creation policy, one of
-  * {@link #CREATE CREATE} or {@link #DONT_CREATE DONT_CREATE}.
-  * <ul>
-  * <li><code>CREATE</code> -
-  * If any intermediate folders in the given <code>absolutePath</code>
-  * do not exist, they will be created.
-  * <li><code>DONT_CREATE</code> -
-  * If any intermediate folders in the given <code>absolutePath</code>
-  * do not exist, the method will throw a <code>CoreException</code>.
-  * </ul>
-  * @param overwriteFile The policy for existing files, one of
-  * {@link #OVERWRITE OVERWRITE} or {@link #DONT_OVERWRITE DONT_OVERWRITE}.
-  * <ul>
-  * <li><code>OVERWRITE</code> -
-  * If a resource of the same name as the given
-  * <code>absolutePath</code> already exists and is a file,
-  * it will be replaced.
-  * If the resource already exists and it is not a file,
-  * then no file will be created and
-  * a <code>CoreException</code> will be thrown.
-  * <li><code>DONT_OVERWRITE</code> -
-  * If any resource of the same name as the given
-  * <code>absolutePath</code> already exists,
-  * then no file will be created and
-  * a <code>CoreException</code> will be thrown.
-  * </ul>
-  * @param progressMonitor The progress monitor for the operation, or null.
-  * @return The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file.
-  * @throws CoreException An exception containing an
-  * {@link org.eclipse.core.runtime.IStatus IStatus}
-  * with a severity of <code>IStatus.ERROR</code> and a
-  * locale-specific description of the cause.
-  */
-  public static IFile createFile (
-    ResourceContext resourceContext,
-    IProject        project,
-    IPath           relativePath,
-    InputStream     inputStream,
-    IProgressMonitor progressMonitor,
-    IStatusHandler   statusMonitor )
- 
-    throws CoreException 
-  {
-    IPath absolutePath = project.getFullPath().append(relativePath);
-    return createFile(resourceContext, absolutePath, inputStream, progressMonitor, statusMonitor);
-  }
-
-  /**
-  * Creates an output stream that can be used to write to the
-  * given <code>file</code>. Actual changes to the workspace
-  * may occur during creation of the stream, while writing to
-  * the stream, or when the stream is closed.
-  * A <code>CoreException</code> containing
-  * an <code>IStatus</code> will be thrown
-  * at some point in the lifecycle of the stream
-  * if the file resource cannot be created.
-  * @param file The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file resource to create. The project implied by the
-  * pathname of the file must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param progressMonitor The progress monitor for the operation, or null.
-  * @return An <code>OutputStream</code> tied to the file resource.
-  * Actual checks of or changes to the workspace may occur as early during
-  * stream creation, closure, or any time in between.
-  * @throws CoreException An exception containing an
-  * {@link org.eclipse.core.runtime.IStatus IStatus}
-  * with a severity of <code>IStatus.ERROR</code> and a
-  * locale-specific description of the cause.
-  * Reasons include:
-  * <ol>
-  * <li>The project of the given file's path does not exist.
-  * <li>A non-file resource of the same name of the given file
-  * already exists.
-  * <li>A file resource of the same name of the given file
-  * already exists, and <code>overwriteFile</code> is false.
-  * <li>One or more intermediate folders to the given file
-  * do not exist, and <code>createFolders</code> is false.
-  * </ol>
-  */
-
-  public static OutputStream newFileOutputStream (
-       ResourceContext  context,
-       IPath            file,
-       IProgressMonitor progressMonitor,
-       IStatusHandler    statusHandler )
- 
-  {
-    return new FileResourceOutputStream(context, file, progressMonitor, statusHandler);
-  }
-
-  //----------------------------------------------------------------------
-  // Naughty bits...
-  //----------------------------------------------------------------------
-
-  //
-  // Creates a path of folders.
-  // Do not call with an absolutePath of less than one segment.
-  //
-  /**
-   * Creates a path of folders.
-   * Do not call with an absolutePath of less than one segment.
-   * @param resourceContext the resource context for making folders.
-   * @param absolutePath the path of folders that will be created.
-   * @param progressMonitor the progress monitor to be used.
-   * @param statusHandler the status handler.
-   * @return returns the IContainer of the created folder.
-   */
-  public static IContainer makeFolderPath (
-    ResourceContext  resourceContext,
-    IPath            absolutePath,
-    IProgressMonitor progressMonitor,
-    IStatusHandler    statusHandler )
-  
-    throws CoreException
-  {
-    if (absolutePath.segmentCount() <= 1)
-    {
-      return getWorkspaceRoot().getProject(absolutePath.segment(0));
-    }
-    else
-    {
-      IContainer parent = makeFolderPath(resourceContext, absolutePath.removeLastSegments(1), progressMonitor, statusHandler );
-      String folderName = absolutePath.lastSegment();
-      
-      return makeFolder(resourceContext, parent,folderName, progressMonitor , statusHandler );
-    }
-  }
-  //
-  // Creates a folder under a container.
-  // The container must already exist.
-  //
- private static IFolder makeFolder (
-    ResourceContext  resourceContext,
-    IContainer       parent,
-    String           folderName,
-    IProgressMonitor progressMonitor,
-    IStatusHandler    statusHandler )
-  
-  throws CoreException
-  {
-    IResource child  = parent.findMember(folderName);
-    Choice    result = null;
-    
-    if( child == null )
-    {
-      if (!resourceContext.isCreateFoldersEnabled())  
-      {
-        result = statusHandler.report(
-                StatusUtils.warningStatus(
-        	                      msg_.getMessage("MSG_ERROR_FOLDER_CREATION_DISABLED",
-        	                      new Object[]{ parent.getFullPath().toString(), folderName} ) ), 
-                getThreeStateFileOptions() );
-        
-        if( result == null || result.getShortcut() == 'C' )
-        {
-          return null;
-        }
-        else if( result.getShortcut() == 'A' )
-        {
-          resourceContext.setCreateFoldersEnabled(true);
-        }
-      }
-      
-      IFolder folder = parent.getFolder(new Path(folderName));
-      folder.create(true,true,null);
-      return folder;
-    }
-    else if( child.getType() == IResource.FOLDER )
-    {
-      return (IFolder)child;
-    }
-    else
-    {
-      throw new CoreException(
-        new Status( IStatus.ERROR, 
-                    "ResourceUtils",
-                    0, 
-					msg_.getMessage( "MSG_ERROR_RESOURCE_NOT_FOLDER",
-					                 new Object[]{ parent.getFullPath().append(folderName).toString() }),
-			null ) );
-    }
-  }
-
-  //
-  // Creates a file under a container.
-  // The container must already exist.
-  //
- private static IFile makeFile (
-    ResourceContext  resourceContext,
-    IContainer       parent,
-    String           fileName,
-    InputStream      inputStream,
-    IProgressMonitor progressMonitor,
-    IStatusHandler    statusHandler )
- 
-    throws CoreException
-  {
-    IResource child  = parent.findMember(fileName);
-    Choice    result = null;
-    
-    if( child != null )
-    {
-      if( child.getType() == IResource.FILE )
-      {
-        if( !resourceContext.isOverwriteFilesEnabled() )   
-        {
-          result = statusHandler.report( 
-                StatusUtils.warningStatus( msg_.getMessage( "MSG_ERROR_FILE_OVERWRITE_DISABLED",
-                                           new Object[] {parent.getFullPath().toString(),fileName}) ),					  		    
-                getThreeStateFileOptions() );
-          
-          if( result == null || result.getShortcut() == 'C' )
-          {
-            return null;
-          }
-          else if( result.getShortcut() == 'A' )
-          {
-            resourceContext.setOverwriteFilesEnabled(true);
-          }
-        }	
-        
-        //We have permission to overwrite so check if file is read-only
-        if( child.getResourceAttributes().isReadOnly() )
-        {
-          if( !resourceContext.isCheckoutFilesEnabled() ) 
-          {            
-            result = statusHandler.report( 
-                         StatusUtils.errorStatus( msg_.getMessage( "MSG_ERROR_FILE_CHECKOUT_DISABLED",
-                                                  new Object[]{ parent.getFullPath().toString(),fileName} ) ), 
-                         getThreeStateFileOptions() );
-            
-		    if( result == null || result.getShortcut() == 'C' )
-		    {
-              return null;
-		    }
-            else if( result.getShortcut() == 'A' )
-            {
-              resourceContext.setCheckoutFilesEnabled(true);
-            }
-          }
-
-          IFile[] files = new IFile[1];
-          files[0] = (IFile)child;
-          
-          IStatus status = getWorkspace().validateEdit(files,null);
-          
-          try
-          {
-            statusHandler.report( status );
-          }
-          catch( StatusException exc )
-          {
-            return null;
-          }
-        }
-
-        //Change the contents of the existing file.
-        IFile file = parent.getFile( new Path(fileName) );
-        file.setContents( inputStream, true, true, null );
-        
-        return file;
-      
-      }
-      else
-      {
-        throw new CoreException( 
-          new Status( IStatus.ERROR,
-                      "ResourceUtils",
-                      0, 
-				      msg_.getMessage( "MSG_ERROR_RESOURCE_NOT_FILE",
-				                       new Object[] {parent.getFullPath().append(fileName)}),
-					  null ) );
-      }
-    }
-    else
-    {
-      //Create a new file.
-      IFile file = parent.getFile( new Path(fileName) );
-      file.create( inputStream, true, null);
-      
-      return file;
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java
deleted file mode 100644
index 601e15a..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
-  * This class contains some useful string utilities that are not provided by
-  * either String or StringBuffer.
-  *
-  * @author Peter Moogk
-  * @date   July 13, 2000
-**/
-public final class StringUtils
-{
-  /**
-  * The platform-specific line separator.
-  */
-  public static final String NEWLINE = System.getProperty("line.separator");
-
-  private StringUtils(){};
-
-  /**
-    * This method splits a single line of text into multiple lines
-    * based on a maximum line length.  The method will try to fit as
-    * many words as possible onto a line without exceeding the maximum
-    * line length.  Note: the only case where a line might exceed the
-    * maximum is if a single word is longer than the maximum.
-    * @param text a single line a text that is to be split.
-    * @param max_length the maximum length of each split line.
-    * @return a string array of the split lines.
-  **/
-  public static String[] splitter( String text, int max_length )
-  {
-    Vector          return_text = new Vector(20);
-    String[]        return_str;
-    int             index = 0;
-
-    while( index < text.length() )
-    {
-      String str = text.substring( index, Math.min( max_length + index,
-                                                    text.length() ) );
-      int space_index = str.lastIndexOf( " " );
-
-      if( index + str.length() < text.length() &&
-          text.charAt( index + str.length() - 1 ) != ' ' &&
-          text.charAt( index + str.length() ) != ' ' &&
-          space_index != -1 )
-      {
-        return_text.addElement( str.substring( 0, space_index ) );
-        index += space_index + 1;
-      }
-      else
-      {
-        return_text.addElement( str.trim() );
-        index += str.length();
-      }
-    }
-
-    return_str = new String[return_text.size()];
-
-    for( index = 0; index < return_text.size(); index++ )
-    {
-      return_str[index] = (String)(return_text.elementAt(index));
-    }
-
-    return return_str;
-  }
-
-  /**
-    * This method returns a string with a repeated number of characters.
-    * @param the_char the character to be repeated.
-    * @param count the number of time this character should be repeated.
-    * @return the resulting string of repeated characters.
-  **/
-  static public String repeat( char the_char, int count )
-  {
-    StringBuffer buf = new StringBuffer( count );
-
-    for( int index = 0; index < count; index++ )
-    {
-      buf.append( the_char );
-    }
-
-    return buf.toString();
-  }
-
-  /**
-    * This method flattens an array of arguments to a string.
-    * The method respects embedded whitespace and quotes.
-    * <ul>
-    * <li>Any argument with embedded whitespace will be flattened out
-    * with enclosing quotes. For example, the single argument
-    * <u>Hello World</u>
-    * will be returned as
-    * <u>"Hello World"</u>.
-    * <li>Any argument with quotes will be flattened out with the
-    * quotes escaped. For example, the single argument
-    * <u>"Happy days"</u>
-    * will be returned as
-    * <u>\"Happy days\"</u>.
-    * </ul>
-    * @param arguments The array of strings to flatten.
-    * @return the flattened string.
-  */
-  static public String flattenArguments ( String[] arguments )
-  {
-    StringBuffer buf = new StringBuffer();
-
-    for (int i=0; i<arguments.length; i++)
-    {
-      //
-      // Append a separator (except the first time).
-      //
-      if (i > 0) buf.append(' ');
-
-      //
-      // Look for whitespace.
-      //
-      boolean whitespace = false;
-      char[] chars = arguments[i].toCharArray();
-      for (int j=0; !whitespace && j<chars.length; j++)
-      {
-        if (Character.isWhitespace(chars[j]))
-        {
-          whitespace = true;
-        }
-      }
-
-      //
-      // Append the argument, quoted as necessary.
-      //
-      if (whitespace) buf.append('"');
-      for (int j=0; j<chars.length; j++)
-      {
-        if (chars[j] == '"') buf.append('\\');
-        buf.append(chars[j]);
-      }
-      if (whitespace) buf.append('"');
-    }
-
-    return buf.toString();
-  }
-
-  /**
-    * This method parses whitespace-delimitted filenames from
-    * the given <code>input</code> stream. <b>Limitation:</b>
-    * Quoted filenames or filenames with embedded whitespace
-    * are not currently supported.
-    * @param input The input stream.
-    * @return An enumeration of filenames from the stream.
-  */
-  static public Enumeration parseFilenamesFromStream ( InputStream input )
-  throws IOException
-  {
-    Vector filenames = new Vector(64,64);
-    StringBuffer buffer = null;
-    byte state = STATE_WS;
-    int ic = input.read();
-    while (ic >= 0)
-    {
-      char c = (char)ic;
-      switch (state)
-      {
-        case STATE_WS:
-          if (!Character.isWhitespace(c))
-          {
-            buffer = new StringBuffer();
-            buffer.append(c);
-            state = STATE_NWS;
-          }
-          break;
-        case STATE_NWS:
-          if (!Character.isWhitespace(c))
-          {
-            buffer.append(c);
-          }
-          else
-          {
-            String filename = buffer.toString();
-            filenames.add(filename);
-            buffer = null;
-            state = STATE_WS;
-          }
-          break;
-        default:
-          break;
-      }
-      ic = input.read();
-    }
-    return filenames.elements();
-  }
-
-  private static final byte STATE_WS = 0;
-  private static final byte STATE_NWS = 1;
-
-
-  /**
-  * Returns true is the type passed in is a primtive java type
-  * @param class name String
-  * @return true is primitive type
-  */
-  public static boolean isPrimitiveType(String typeName) 
-  {
-
-    if (typeName.equalsIgnoreCase("boolean") ||
-      typeName.equalsIgnoreCase("byte") ||
-      typeName.equalsIgnoreCase("double") ||
-      typeName.equalsIgnoreCase("float") ||
-      typeName.equalsIgnoreCase("int") ||
-      typeName.equalsIgnoreCase("long") ||
-      typeName.equalsIgnoreCase("short") ||
-      typeName.equalsIgnoreCase("char"))
-      return true;
-    return false;
-
-  }
-
-  /**
-  * The method replace the characters that are allowed in URIs
-  * and not allowed in Java class names to an underscore ('_')
-  * @param URI String
-  * @return valid Java class name String
-  */
-  public static String URI2ClassName( String uri ) {
-    String className = uri;
-    for ( int i = 0; i < URI_SYMBOLS.length; i++ ) {
-    	className = className.replace ( URI_SYMBOLS[i], UNDERSCORE );
-    }
-    return className;
-  }
-
-  /**
-   * Creates and array of strings containing the exception traceback information of
-   * a Throwable.  This is the same traceback data that is displayed by exc.printStackTrace().
-   * @param exc the exception
-   * @return a string array of the traceback information.
-   */
-  public static String[] getStackTrace( Throwable exc )
-  {
-    Vector       lines        = new Vector();
-    StringWriter stringWriter = new StringWriter();
-    PrintWriter  printWriter  = new PrintWriter( stringWriter );
-    
-    exc.printStackTrace( printWriter );
-    
-    try
-    {
-      printWriter.close();
-      stringWriter.close();
-    }
-    catch( Exception nestedExc )
-    {
-      return new String[0];
-    }
-    
-    StringReader stringReader = new StringReader( stringWriter.toString() );
-    BufferedReader reader     = new BufferedReader( stringReader );
-    String         line       = null;
-    
-    try
-    {
-      line = reader.readLine();
-    
-      while( line != null )
-      {
-        lines.add( line.trim() );
-        line = reader.readLine();
-      }
-    }
-    catch( Exception nestedExc )
-    {
-      return new String[0];
-    }
-    
-    return (String[])lines.toArray( new String[0] );
-  }
-  
-  private static final char[] URI_SYMBOLS = {'-', '~', '#', '/', '.'};
-  private static final char UNDERSCORE = '_';
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
deleted file mode 100644
index 0d8a184..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class WaitForAutoBuildCommand extends AbstractDataModelOperation
-{
-  public IStatus execute( IProgressMonitor montitor, IAdaptable adaptable ) 
-  {
-  	IStatus status = Status.OK_STATUS;
-  	
-	try 
-	{
-	  Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-	} 
-	catch( InterruptedException exc ) 
-	{
-	  // UISynchronizer.syncExec seems to interrupt the UI tread when the autobuilder is done.  Not sure, why.
-	  // I'm assuming here that the autobuilder has actually completed its stuff.	
-	}
-		
-	return status;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/environment.properties b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/environment.properties
deleted file mode 100644
index 6c160b0..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/environment.properties
+++ /dev/null

@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages for EclipseScheme
-#
-MSG_INVALID_PLATFORM_URL=Invalid URL: {0} for an Eclipse platform.
-
-#
-# Messages for ResouceUtils
-#
-MSG_ERROR_PATH_NOT_ABSOLUTE=IWAB0003E Path {0} is not absolute for creating a file.
-MSG_ERROR_PATH_EMPTY=IWAB0004E Path {0} is empty while creating a file.
-MSG_ERROR_PATH_NOT_FOLDER=IWAB0005E Path {0} is not a folder for creating a file.
-MSG_ERROR_FOLDER_CREATION_DISABLED=IWAB0007E Folder creation has been disabled for parent folder {0} and child {1}.
-MSG_ERROR_RESOURCE_NOT_FOLDER=IWAB0008E Resource {0} is not a folder.
-MSG_WARN_FILE_OVERWRITE_DISABLED=IWAB0009W Can not overwrite file {1} in folder {0}.
-MSG_ERROR_FILE_CHECKOUT_DISABLED=IWAB0010E Can not checkout file {1} in folder {0}.
-MSG_ERROR_RESOURCE_NOT_FILE=IWAB0011E The following path is not a resource: {0}.
-MSG_ERROR_FOLDER_HAS_CHILDREN=IWAB0012E Can not create folder: {0} that already has children.
-MSG_ERROR_IO=IWAB0006E An input/output error occurred while processing the resource "{0}".
-MSG_ERROR_FILE_OVERWRITE_DISABLED=IWAB0164E Cannot create the file "{1}" relative to the path "{0}" because automatic file overwriting has not been enabled. Do you want to enable it for this file?
-MSG_ERROR_FILE_CHECKOUT_DISABLED=IWAB0061E Cannot create the file "{1}" relative to the path "{0}" because automatic file check out has not been enabled. Do you want to enable it for this file?
-
-LABEL_YES=Yes
-LABEL_YES_TO_ALL=Yes All
-LABEL_CANCEL=Cancel
-
-TITLE_WARNING=Warning:
-TITLE_ERROR=Error:
-TITLE_INFO=Info:
-
-
-

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java
deleted file mode 100644
index ff6a2c5..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.context;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-
-
-public class ActionDialogPreferenceTypeRegistry
-{
-  private Vector preferences_;
-  
-  private static ActionDialogPreferenceTypeRegistry registry_;
-
-  private ActionDialogPreferenceTypeRegistry()
-  {
-    preferences_ = new Vector();
-    
-    loadDialogsPreferences();  
-  }
-  
-  static public ActionDialogPreferenceTypeRegistry getInstance()
-  {
-    if( registry_ == null )
-    {
-      registry_ = new ActionDialogPreferenceTypeRegistry();
-    }
-    
-    return registry_;
-  }
-  
-  //
-  private void loadDialogsPreferences ()
-  {
-  	IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor( "org.eclipse.wst.command.env",
-                                                                      "actionDialogPreferenceType");
-    
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement      elem   = config[idx];     
-      ActionDialogPreferenceType dialog = new ActionDialogPreferenceType();
-      
-      dialog.setId( elem.getAttribute("id") );
-      dialog.setName( elem.getAttribute("name") );
-      dialog.setInfopop( elem.getAttribute("infopop") );
-      dialog.setTooltip( elem.getAttribute("tooltip") );
-      dialog.setCategory( elem.getAttribute("category") );
-      
-      String showCheckbox = elem.getAttribute( "showcheckbox" );
-      String alwaysHide   = elem.getAttribute( "alwayshide" );
-      
-      dialog.setShowCheckbox( showCheckbox == null ? true : showCheckbox.equals( "true" ) );
-      dialog.setAlwaysHide( alwaysHide == null ? false : alwaysHide.equals( "true" ) );
-      
-      preferences_.add(dialog);        
-    }
-  }
-
-  /**
-  * Returns all registered <code>WebServiceType</code> objects.
-  * @return All registered <code>WebServiceType</code> objects.
-  */
-  public ActionDialogPreferenceType[] getActionDialogsPrefrences ()
-  {
-    return (ActionDialogPreferenceType[])preferences_.toArray( new ActionDialogPreferenceType[0]);
-  }
-  
-  public ActionDialogPreferenceType getActionDialogsPrefrence( String id )
-  {
-    int                        length = preferences_.size();
-    ActionDialogPreferenceType result = null;
-    
-    for( int index = 0; index < length; index++ )
-    {
-      ActionDialogPreferenceType preference = (ActionDialogPreferenceType)preferences_.elementAt( index );
-      
-      if( preference.getId().equals( id ) )
-      {
-        result = preference;
-        break;
-      }
-    }
-    
-    return result;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java
deleted file mode 100644
index 91e266e..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-
-
-public class PersistentActionDialogsContext extends PersistentContext
-{
-  private ActionDialogPreferenceTypeRegistry registry;
-  
-  private static PersistentActionDialogsContext instance_ = null;
-
-  private PersistentActionDialogsContext()
-  {
-    super(EnvPlugin.getInstance());
-  }
-  
-  static public PersistentActionDialogsContext getInstance()
-  {
-    if( instance_ == null )
-    {
-      instance_ = new PersistentActionDialogsContext();
-      instance_.load();
-    }
-    
-    return instance_;
-  }
-
-  public void load()
-  {
-    registry = ActionDialogPreferenceTypeRegistry.getInstance();
-    ActionDialogPreferenceType[] dialogs = registry.getActionDialogsPrefrences();
-  
-    for (int i = 0; i < dialogs.length; i++)
-    {
-      setDefault(dialogs[i].getId(), false);
-    }
-  }
-
-  public ActionDialogPreferenceType[] getDialogs()
-  {
-    return registry.getActionDialogsPrefrences();
-  }
-
-  public void setActionDialogEnabled(String id, boolean value)
-  {
-    setValue(id, value);
-  }
-
-  public boolean isActionDialogEnabled(String id)
-  {
-    if (id == null) return true;
-    return getValueAsBoolean(id);
-  }
-  
-  public boolean showDialog( String id )
-  {
-    ActionDialogPreferenceType dialog = registry.getActionDialogsPrefrence( id );    
-   
-    return (dialog.getShowCheckbox() && !dialog.getAlwaysHide() && !isActionDialogEnabled( id )) ||
-            !dialog.getShowCheckbox() && !dialog.getAlwaysHide();
-  }
-  
-  public boolean showCheckbox( String id )
-  {
-    ActionDialogPreferenceType dialog = registry.getActionDialogsPrefrence( id );    
-    
-    return dialog == null ? false : dialog.getShowCheckbox();
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java
deleted file mode 100644
index 5852c90..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java
+++ /dev/null

@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.command.internal.env.core.context.Context;
-
-/**
- * This class is used as the base class for types that what to persist preference
- * data in the plugin preferences area.
- *
- *
- */
-public abstract class PersistentContext implements Context
-{
- protected Preferences preferences_;
- protected Plugin plugin_;
-
- public PersistentContext ( Plugin plugin)
- 	{
- 		plugin_ = plugin;
- 	  	preferences_ = plugin.getPluginPreferences();
- 	}
-
- /**
-  * Sets the default for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, boolean value) {
- 	preferences_.setDefault(name, value);
- 	}
- 
- /**
-  * Sets the default for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, String value) {
- 	preferences_.setDefault(name,value);
- 	}
- 
- /**
-  * Sets the default for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, int value) {
- 	preferences_.setDefault(name,value);
- 	}
- 
- /**
-  * Sets the value for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, String value) {
- 	preferences_.setValue(name,value);
- 	plugin_.savePluginPreferences();
- 	}
- 
- /**
-  * Sets the value for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, boolean value) {
- 	preferences_.setValue(name, value);
- 	plugin_.savePluginPreferences();
- 	}
- 
- /**
-  * Sets the value for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, int value) {
- 	preferences_.setValue(name, value);
- 	plugin_.savePluginPreferences();
-	}
-
- /**
-  * Gets the value for a string preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public String getValueAsString ( String name) {
- 	return preferences_.getString(name);
- 	}
- 
- /**
-  * Gets the value for a boolean preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
-  public boolean getValueAsBoolean ( String name) {
- 	return preferences_.getBoolean(name);
- 	}
-  
-  /**
-   * Gets the value for a int preference.
-   * @param name the preference name.
-   * @return the preference value.
-   */
- public int getValueAsInt( String name) {
- 		return preferences_.getInt(name);
- 	}
- 
- /**
-  * Gets the default value for a string preference.
-  * @param name the preference name.
-  * @return the default preference value.
-  */
- public String getDefaultString(String name)
- {
- 	return preferences_.getDefaultString(name);
- }
- 
- /**
-  * Gets the default value for a boolean preference.
-  * @param name the preference name.
-  * @return the default preference value.
-  */
- public boolean getDefaultBoolean(String name)
- {
- 	return preferences_.getDefaultBoolean(name);
- }
- 
- /**
-  * Gets the default value for a int preference.
-  * @param name the preference name.
-  * @return the default preference value.
-  */
- public int getDefaultInt(String name)
- {
- 	return preferences_.getDefaultInt(name);
- }
- 
- /**
-  * Sets the default value for a string preference if a default value has
-  * not already been set.
-  * @param name the preference name.
-  * @param value the default preference value
-  */
- public void setDefaultStringIfNoDefault( String key, String value )
- {
-   // If the key already has a default value we don't want to override it.
-   if( preferences_.getDefaultString( key ).equals("") ) 
-   {
-     preferences_.setDefault( key, value );
-   }
- }
- 
- /**
-  * Sets the default value for a boolean preference if a default value has
-  * not already been set.
-  * @param name the preference name.
-  * @param value the default preference value
-  */
- public void setDefaultBooleanIfNoDefault( String key, boolean value )
- {
-   // If the key already has a default value we don't want to override it.
-   if( preferences_.getDefaultString( key ).equals("") ) 
-   {
-     preferences_.setDefault( key, value );
-   }
- }
- 
- /**
-  * Sets the default value for a int preference if a default value has
-  * not already been set.
-  * @param name the preference name.
-  * @param value the default preference value
-  */
- public void setDefaultIntIfNoDefault( String key, int value )
- {
-   // If the key already has a default value we don't want to override it.
-   if( preferences_.getDefaultString( key ).equals("") ) 
-   {
-     preferences_.setDefault( key, value );
-   }
- }
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java
deleted file mode 100644
index a0675c4..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.ResourceDefaults;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-
-
-public class PersistentResourceContext extends PersistentContext implements ResourceContext
-{
-  private static PersistentResourceContext context_ = null;
-  
-  public static PersistentResourceContext getInstance()
-  {
-    if( context_ == null )
-    {
-      context_ = new PersistentResourceContext();
-      context_.load();
-    }
-    
-    return context_;
-  }
-  
-  private PersistentResourceContext()
-  {
-    super(EnvPlugin.getInstance());
-  }
-
-  public void load()
-  {
-    setDefault(PREFERENCE_OVERWRITE, ResourceDefaults
-        .getOverwriteFilesDefault());
-    setDefault(PREFERENCE_CREATE_FOLDERS, ResourceDefaults
-        .getCreateFoldersDefault());
-    setDefault(PREFERENCE_CHECKOUT, ResourceDefaults.getCheckoutFilesDefault());
-  }
-
-  public void setOverwriteFilesEnabled(boolean enable)
-  {
-    setValue(PREFERENCE_OVERWRITE, enable);
-  }
-
-  public boolean isOverwriteFilesEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_OVERWRITE);
-  }
-
-  public void setCreateFoldersEnabled(boolean enable)
-  {
-    setValue(PREFERENCE_CREATE_FOLDERS, enable);
-  }
-
-  public boolean isCreateFoldersEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_CREATE_FOLDERS);
-  }
-
-  public void setCheckoutFilesEnabled(boolean enable)
-  {
-    setValue(PREFERENCE_CHECKOUT, enable);
-  }
-
-  public boolean isCheckoutFilesEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_CHECKOUT);
-  }
-
-  public ResourceContext copy()
-  {
-    ResourceContext cc = new TransientResourceContext();
-    cc.setOverwriteFilesEnabled(isOverwriteFilesEnabled());
-    cc.setCreateFoldersEnabled(isCreateFoldersEnabled());
-    cc.setCheckoutFilesEnabled(isCheckoutFilesEnabled());
-    return cc;
-  }
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java
deleted file mode 100644
index 4f59f6c..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.eclipse;
-
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
- * This interface adds resources to the base IEnvironment.
- */
-public interface BaseEclipseEnvironment extends IEnvironment 
-{
-  /**
-   * 
-   * @return returns a ResourceContext object for this environment.
-   */	
-  public ResourceContext getResourceContext();
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java
deleted file mode 100644
index cb8f4ab..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EnvPlugin extends Plugin {
-
-	//The shared instance.
-	private static EnvPlugin instance;
-
-	/**
-	 * The constructor.
-	 */
-	public EnvPlugin() {
-		super();
-		instance = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static EnvPlugin getInstance() {
-		return instance;
-	}
-}

diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java
deleted file mode 100644
index d1a551e..0000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java
+++ /dev/null

@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.preferences;
-
-/**
- * This class is used to define preference ids. It corresponds to information
- * specified by a actionDialogPreferenceType extension point.
- * Each actionDialogPreferenceType entry will result in an entry in the
- * action dialogs preference page if the showcheckbox field is true.
- *   
- * Here is an example of this extension point.
- * 
- * <pre>
-  *   &lt;extension
- *       point="org.eclipse.wst.command.env.actionDialogPreferenceType"&gt;
- *     &lt;actionDialogPreferenceType
- *           showcheckbox="true"
- *           name="%CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG"
- *           category="org.eclipse.jst.wss.popup.category"
- *           tooltip="%TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY"
- *           infopop="org.eclipse.jst.ws.consumption.ui.PPAD0004"
- *           alwayshide="false"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *     &lt;/actionDialogPreferenceType&gt;
- * </pre>
- *
- * This actionDialogPreferenceType extension point is associated with an ObjectContribution
- * extension point.  For example: 
- * 
- *      <objectContribution
- *           objectClass="org.eclipse.core.resources.IFile"
- *           nameFilter="*.wsdl"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard">
- * <!-- WSDL To Java Bean Proxy -->
- *        <action
- *              label="%ACTION_GENERATE_JAVA_PROXY"
- *              class="org.eclipse.wst.command.env.ui.widgets.popup.DynamicPopupWizard"
- *              menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- *              id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard">
- *        </action>
- *     </objectContribution>
- *
- * The ObjectContribution entry is linked with the actionDialogPreferenceType entry
- * via the id attribute of the ObjectContirbution and the id attribute of actionDialogPreferenceType.
- * Note: the id in the action entry is always associated with the dynamic wizard that
- * should be popuped up.  In the example above the ObjectionContribution id and the
- * action ids are the same, but this need not be the case.  
- */
-public class ActionDialogPreferenceType
-{
-  private String  id_;
-  private String  name_;
-  private String  infopop_;
-  private String  tooltip_;
-  private boolean showCheckbox_;
-  private boolean alwaysHide_;
-  private String  category_;
-
-  /**
-   * Sets the id for this popup action.  This id link the actionDialogPreference
-   * with an ObjectContribution.
-   * @param id the id.
-   */
-  public void setId(String id)
-  {
-    id_ = id;
-  }
-
-  /**
-   * Gets the id for this popup action.
-   * @return the id.
-   */
-  public String getId()
-  {
-    return id_;
-  }
-
-  /**
-   * Sets the name for this popup action.  This name is displayed on the
-   * dialog preferences page and must be translated.
-   * @param name the name of the popup check box.
-   */
-  public void setName(String name)
-  {
-    name_ = name;
-  }
-
-  /**
-   * Gets the display value for this popup check box.
-   * Note: this value may be null if the getShowCheckBox method returns false.
-   * @return the name.
-   */
-  public String getName()
-  {
-    return name_;
-  }
-
-  /**
-   * Sets the info pop value for this popup check box.
-   * @param infopop
-   */
-  public void setInfopop(String infopop)
-  {
-    infopop_ = infopop;
-  }
-
-  /**
-   * Gets the info pop value for this popup check box.
-   * Note: this value may be null if the getShowCheckBox method returns false.
-   * 
-   * @return the infopop value.
-   */
-  public String getInfopop()
-  {
-    return infopop_;
-  }
-
-  /**
-   * Sets the tooltip value for this popup check box.
-   * @param tooltip
-   */
-  public void setTooltip(String tooltip)
-  {
-    tooltip_ = tooltip;
-  }
-
-  /**
-   * Gets the tooltip value for this popup check box.
-   * Note: this value may be null if the getShowCheckBox method returns false.
-   * 
-   * @return the tooltip value.
-   */
-  public String getTooltip()
-  {
-    return tooltip_;
-  }
-  
-  /**
-   * Sets the show check box value for this popup.  If the value is true then
-   * this popup will appear on an action dialogs preference page.  Also if this
-   * value is true and the always hide value is false then a check box will be displayed
-   * on the first page of this popup which asks the user if they want the popup
-   * to be displayed the next time are to just execute the popup action.
-   * @param value the show check box value.
-   */
-  public void setShowCheckbox( boolean value )
-  {
-    showCheckbox_ = value;
-  }
-  
-  /**
-   * Gets the show check box value.
-   * @return the show check box value.
-   */
-  public boolean getShowCheckbox()
-  {
-    return showCheckbox_;
-  }
-  
-  /**
-   * Sets the always hide value.  This value specifies that the popup should always
-   * be executed without bringing up the popup wizard.
-   * @param value the always hide value.
-   */
-  public void setAlwaysHide( boolean value )
-  {
-    alwaysHide_ = value;
-  }
-  
-  /**
-   * 
-   * @return returns the always hide value.
-   */
-  public boolean getAlwaysHide()
-  {
-    return alwaysHide_; 
-  }
-  
-  /**
-   * Sets the category id for popup action.  All popup actions with the same
-   * category id will be grouped together on the same popup action preference page.
-   * @param value the category.
-   */
-  public void setCategory( String value )
-  {
-    category_ = value;
-  }
-  
-  /**
-   * 
-   * @return the category id.
-   */
-  public String getCategory()
-  {
-    return category_;
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/.classpath b/bundles/org.eclipse.wst.ws.parser/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/bundles/org.eclipse.wst.ws.parser/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.wst.ws.parser/.cvsignore b/bundles/org.eclipse.wst.ws.parser/.cvsignore
deleted file mode 100644
index 6248f15..0000000
--- a/bundles/org.eclipse.wst.ws.parser/.cvsignore
+++ /dev/null

@@ -1,6 +0,0 @@
-bin
-.cdtproject
-build.xml
-temp.folder
-parser.jar
-@dot

diff --git a/bundles/org.eclipse.wst.ws.parser/.project b/bundles/org.eclipse.wst.ws.parser/.project
deleted file mode 100644
index feb6640..0000000
--- a/bundles/org.eclipse.wst.ws.parser/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws.parser</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
deleted file mode 100644
index 307f4ce..0000000
--- a/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.parser
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.ws.internal.parser.disco,
- org.eclipse.wst.ws.internal.parser.discovery,
- org.eclipse.wst.ws.internal.parser.favorites,
- org.eclipse.wst.ws.internal.parser.plugin,
- org.eclipse.wst.ws.internal.parser.wsil
-Require-Bundle: org.eclipse.wst.wsdl,
- org.wsdl4j,
- org.eclipse.core.runtime,
- org.apache.wsil4j,
- org.uddi4j,
- org.eclipse.wst.command.env.core,
- org.apache.axis
-Eclipse-AutoStart: true

diff --git a/bundles/org.eclipse.wst.ws.parser/about.html b/bundles/org.eclipse.wst.ws.parser/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.ws.parser/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.parser/build.properties b/bundles/org.eclipse.wst.ws.parser/build.properties
deleted file mode 100644
index f41b40a..0000000
--- a/bundles/org.eclipse.wst.ws.parser/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html
-source.. = src/
-output.. = bin/

diff --git a/bundles/org.eclipse.wst.ws.parser/plugin.properties b/bundles/org.eclipse.wst.ws.parser/plugin.properties
deleted file mode 100644
index 395ac6e..0000000
--- a/bundles/org.eclipse.wst.ws.parser/plugin.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001,2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Description Parser
-PLUGIN_PROVIDER=Eclipse.org

diff --git a/bundles/org.eclipse.wst.ws.parser/plugin.xml b/bundles/org.eclipse.wst.ws.parser/plugin.xml
deleted file mode 100644
index 98566ef..0000000
--- a/bundles/org.eclipse.wst.ws.parser/plugin.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-    
-</plugin>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java
deleted file mode 100644
index a96dad2..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.disco;
-
-public class DISCOContractReference extends DISCOReference
-{
-  private String docRef_;
-  
-  public DISCOContractReference(String ref,String docRef)
-  {
-    super(ref);
-    docRef_ = docRef;
-  }
-  
-  public String getDocRef()
-  {
-    return docRef_;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java
deleted file mode 100644
index 6209449..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.disco;
-
-import java.util.Vector;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-/**
- * See http://msdn.microsoft.com/msdnmag/issues/02/02/xml/default.aspx for more
- * details on DISCO.
- */
-public class DISCOParser
-{
-  private DocumentBuilder parser_;
-  private final String NS_DISCO = "http://schemas.xmlsoap.org/disco/";
-  private final String DISCOVERY = "discovery";
-  private final String DISCOVERY_REF = "discoveryRef";
-  private final String NS_CONTRACT_REF = "http://schemas.xmlsoap.org/disco/scl/";
-  private final String CONTRACT_REF = "contractRef";
-  private final String REF = "ref";
-  private final String DOC_REF = "docRef";
-
-  public DISCOParser()
-  {
-    try
-    {
-      DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-      docBuilderFactory.setNamespaceAware(true);
-      parser_ = docBuilderFactory.newDocumentBuilder();
-    }
-    catch (ParserConfigurationException pce)
-    {
-      parser_ = null;
-    }
-  }
-
-  public DISCOReference[] parse(String discoURI, InputSource source) throws Exception
-  {
-    if (parser_ != null)
-    {
-      Document doc = parser_.parse(source);
-      Element rootElement = doc.getDocumentElement();
-      // Root element must by <disco:discovery
-      // xmlns:disco="http://schemas.xmlsoap.org/disco/">
-      if (rootElement != null && rootElement.getNamespaceURI().equals(NS_DISCO) && rootElement.getLocalName().equals(DISCOVERY))
-      {
-        NodeList childNodes = rootElement.getChildNodes();
-        Vector discoReferences = new Vector();
-        for (int i = 0; i < childNodes.getLength(); i++)
-        {
-          Node childNode = childNodes.item(i);
-          if (childNode instanceof Element)
-          {
-            Element element = (Element)childNode;
-            String localName = element.getLocalName();
-            String nsURI = element.getNamespaceURI();
-            if (nsURI.equals(NS_DISCO) && localName.equals(DISCOVERY_REF))
-            {
-              // DISCO link.
-              String ref = convertToAbsoluteURI(discoURI, element.getAttribute(REF));
-              discoReferences.addElement(new DISCOReference(ref));
-            }
-            else if (nsURI.equals(NS_CONTRACT_REF) && localName.equals(CONTRACT_REF))
-            {
-              // WSDL link.
-              String ref = convertToAbsoluteURI(discoURI, element.getAttribute(REF));
-              String docRef = convertToAbsoluteURI(discoURI, element.getAttribute(DOC_REF));
-              discoReferences.addElement(new DISCOContractReference(ref, docRef));
-            }
-          }
-        }
-        int numberOfDISCOReferences = discoReferences.size();
-        if (numberOfDISCOReferences > 0)
-        {
-          DISCOReference[] references = new DISCOReference[numberOfDISCOReferences];
-          discoReferences.copyInto(references);
-          return references;
-        }
-      }
-      else
-      {
-        // The document is not a valid DISCO document.
-        throw new Exception();
-      }
-    }
-    return null;
-  }
-
-  private String convertToAbsoluteURI(String discoURI, String refURI)
-  {
-    if (refURI != null)
-    {
-      if (refURI.indexOf("://") > -1)
-      {
-        // refURI is already absolute.
-        return refURI;
-      }
-      else
-      {
-        StringBuffer absoluteURI = new StringBuffer(discoURI.substring(0, Math.max(discoURI.lastIndexOf('\\'), discoURI.lastIndexOf('/') + 1)));
-        absoluteURI.append(refURI);
-        return absoluteURI.toString();
-      }
-    }
-    return null;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java
deleted file mode 100644
index dd2175e..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.disco;
-
-public class DISCOReference
-{
-  private String ref_;
-  
-  public DISCOReference(String ref)
-  {
-    ref_ = ref;
-  }
-  
-  public String getRef()
-  {
-    return ref_;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java
deleted file mode 100644
index 527a489..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.discovery;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import sun.misc.BASE64Encoder;
-
-public final class NetUtils
-{
-
-  /**
-   * Get the java.net.URLConnection given a string representing the URL. This class ensures
-   * that proxy settings in WSAD are respected.
-   * @param urlString String representing the URL.
-   * @return java.net.URLCDonnection URLConnection to the URL.
-   */
-  public static final URLConnection getURLConnection(String urlString)
-  {
-    try
-    {
-      URL url = createURL(urlString);
-      URLConnection uc = url.openConnection();
-      String proxyUserName = System.getProperty("http.proxyUserName");
-      String proxyPassword = System.getProperty("http.proxyPassword");
-      if (proxyUserName != null && proxyPassword != null)
-      {
-        StringBuffer userNamePassword = new StringBuffer(proxyUserName);
-        userNamePassword.append(':').append(proxyPassword);
-        BASE64Encoder encoder = new BASE64Encoder();
-        String encoding = encoder.encode(userNamePassword.toString().getBytes());
-        userNamePassword.setLength(0);
-        userNamePassword.append("Basic ").append(encoding);
-        uc.setRequestProperty("Proxy-authorization",userNamePassword.toString());
-      }
-      return uc;
-    }
-    catch (MalformedURLException e)
-    {
-    }
-    catch (IOException e)
-    {
-    }
-    return null;
-  }
-  
-  /**
-   * Get the java.io.InputStream for a URL given a string representing the URL. This class
-   * ensures that proxy settings in WSAD are respected.
-   * @param urlString String representing the URL.
-   * @return java.io.InputStream InputStream for reading the URL stream.
-   */
-  public static final InputStream getURLInputStream(String urlString)
-  {
-    try
-    {
-      URLConnection uc = getURLConnection(urlString);
-      if (uc != null)
-      {
-        InputStream is = uc.getInputStream();
-        return is;
-      }
-    }
-    catch (IOException e)
-    {
-    }
-    return null;
-  }
-
-  /**
-   * Create a URL from a string.
-   * @param urlString String representing the URL.
-   * @return URL java.lang.URL representation of the URL.
-   * @throws MalformedURLException
-   */
-  public static final URL createURL(String urlString) throws MalformedURLException
-  {
-  	return new URL(urlString);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java
deleted file mode 100644
index 4e90753..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.discovery;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class WebServicesParserExt extends WebServicesParser {
-
-    public WebServicesParserExt() {
-        super();
-    }
-
-    public WebServicesParserExt(String uri) {
-        super(uri);
-    }
-
-    protected URL createURL(String url) throws MalformedURLException {
-        return NetUtils.createURL(url);
-    }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java
deleted file mode 100644
index 5b2e956..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public class FavoritesConstants
-{
-  // Namespace
-  public static final String NAMESPACE_WSDL = "http://schemas.xmlsoap.org/wsdl/";
-  public static final String NAMESPACE_UDDI_V1 = "urn:uddi-org:api";
-  public static final String NAMESPACE_UDDI_V2 = "urn:uddi-org:api_v2";
-  public static final String NAMESPACE_UDDI_BINDING = "http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/";
-  public static final String NAMESPACE_WSIL_INSPECTION = "http://schemas.xmlsoap.org/ws/2001/10/inspection/";
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java
deleted file mode 100644
index c8c9129..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.Link;
-
-public class FavoritesLink
-{
-  protected Link link_;
-
-  public FavoritesLink()
-  {
-    link_ = null;
-  }
-
-  public Link getLink()
-  {
-    return link_;
-  }
-
-  public void setLink(Link link)
-  {
-    link_ = link;
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java
deleted file mode 100644
index d167fbe..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java
+++ /dev/null

@@ -1,429 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Vector;
-
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Description;
-import org.apache.wsil.Inspection;
-import org.apache.wsil.Link;
-import org.apache.wsil.Service;
-import org.apache.wsil.ServiceName;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.apache.wsil.extension.uddi.BusinessDescription;
-import org.apache.wsil.extension.uddi.ServiceDescription;
-import org.apache.wsil.impl.AbstractImpl;
-import org.apache.wsil.impl.DescriptionImpl;
-import org.apache.wsil.impl.LinkImpl;
-import org.apache.wsil.impl.ServiceImpl;
-import org.apache.wsil.impl.ServiceNameImpl;
-import org.apache.wsil.impl.extension.uddi.BusinessDescriptionImpl;
-import org.apache.wsil.impl.extension.uddi.ServiceDescriptionImpl;
-import org.uddi4j.util.BusinessKey;
-import org.uddi4j.util.ServiceKey;
-
-public abstract class FavoritesRegistryTypeAbstract implements IFavoritesRegistryType
-{
-  public FavoritesRegistryTypeAbstract()
-  {
-  }
-
-  public abstract String getReadLocation();
-  public abstract String getWriteLocation();
-  protected abstract WSILDocument getWSILDocument();
-
-  public void init()
-  {
-    getWSILDocument();
-  }
-
-  protected WSILDocument loadWSILDocument(String path, boolean force)
-  {
-    try
-    {
-      WSILDocument wsilDoc = WSILDocument.newInstance();
-      wsilDoc.read(new FileReader(new File(path)));
-      return wsilDoc;
-    }
-    catch (Throwable t)
-    {
-      if (force)
-      {
-        try
-        {
-          return WSILDocument.newInstance();
-        }
-        catch (Throwable t2)
-        {
-          return null;
-        }
-      }
-      else
-        return null;
-    }
-  }
-
-  public String getFavoritesVersion()
-  {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Abstract[] abstracts = inspection.getAbstracts();
-    if (abstracts.length > 0)
-      return abstracts[0].getText();
-    else
-      return null;
-  }
-
-  public void setFavoritesVersion(String version)
-  {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Abstract abst = new AbstractImpl();
-    abst.setText(version);
-    inspection.removeAbstracts();
-    inspection.addAbstract(abst);
-  }
-
-  public synchronized void save() throws WSILException, IOException
-  {
-    WSILDocument wsilDoc = getWSILDocument();
-    if (wsilDoc != null)
-      wsilDoc.write(getWriteLocation());
-  }
-
-  public IFavoritesUDDIRegistry[] getFavoritesUDDIRegistries()
-  {
-    Link[] links = loadUDDIRegistries();
-    FavoritesUDDIRegistry[] registries = new FavoritesUDDIRegistry[links.length];
-    for (int i = 0; i < links.length; i++)
-    {
-      registries[i] = new FavoritesUDDIRegistry();
-      registries[i].setLink(links[i]);
-    }
-    return registries;
-  }
-
-  public IFavoritesUDDIBusiness[] getFavoritesUDDIBusinesses()
-  {
-    Link[] links = loadUDDIBusinesses();
-    FavoritesUDDIBusiness[] businesses = new FavoritesUDDIBusiness[links.length];
-    for (int i = 0; i < links.length; i++)
-    {
-      businesses[i] = new FavoritesUDDIBusiness();
-      businesses[i].setLink(links[i]);
-    }
-    return businesses;
-  }
-
-  public IFavoritesUDDIService[] getFavoritesUDDIServices()
-  {
-    Service[] services = loadUDDIServices();
-    FavoritesUDDIService[] uddiServices = new FavoritesUDDIService[services.length];
-    for (int i = 0; i < services.length; i++)
-    {
-      uddiServices[i] = new FavoritesUDDIService();
-      uddiServices[i].setService(services[i]);
-    }
-    return uddiServices;
-  }
-
-  public IFavoritesUDDIServiceInterface[] getFavoritesUDDIServiceInterfaces()
-  {
-    Service[] services = loadUDDIServiceInterfaces();
-    FavoritesUDDIServiceInterface[] serInts = new FavoritesUDDIServiceInterface[services.length];
-    for (int i = 0; i < services.length; i++)
-    {
-      serInts[i] = new FavoritesUDDIServiceInterface();
-      serInts[i].setService(services[i]);
-    }
-    return serInts;
-  }
-
-  public IFavoritesWSDL[] getFavoritesWSDLs()
-  {
-    Service[] services = loadWSDLServices();
-    FavoritesWSDL[] wsdls = new FavoritesWSDL[services.length];
-    for (int i = 0; i < services.length; i++)
-    {
-      wsdls[i] = new FavoritesWSDL();
-      wsdls[i].setService(services[i]);
-    }
-    return wsdls;
-  }
-
-  public IFavoritesWSIL[] getFavoritesWSILs()
-  {
-    Link[] links = loadWSILs();
-    FavoritesWSIL[] wsils = new FavoritesWSIL[links.length];
-    for (int i = 0; i < links.length; i++)
-    {
-      wsils[i] = new FavoritesWSIL();
-      wsils[i].setLink(links[i]);
-    }
-    return wsils;
-  }
-
-  public Link[] loadUDDIRegistries() {
-    return loadLinksByNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
-  }
-    
-  public Link[] loadUDDIBusinesses() {
-    return loadLinksByNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
-  }
-
-  public Service[] loadUDDIServices() {
-    return loadServicesByNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
-  }
-
-  public Service[] loadUDDIServiceInterfaces() {
-    return loadServicesByNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
-  }
-
-  public Service[] loadWSDLServices() {
-    return loadServicesByNamespace(FavoritesConstants.NAMESPACE_WSDL);
-  }
-
-  public Link[] loadWSILs() {
-    return loadLinksByNamespace(FavoritesConstants.NAMESPACE_WSIL_INSPECTION);
-  }
-
-  private Service[] loadServicesByNamespace(String namespace) {
-    Vector serviceVector = new Vector();
-    WSILDocument wsilDoc = getWSILDocument();
-    if (wsilDoc != null)
-    {
-      Inspection inspection = wsilDoc.getInspection();
-      Service[] services = inspection.getServices();
-      for (int i = 0; i < services.length; i++)
-      {
-         Description[] desc = services[i].getDescriptions();
-         if (desc[0].getReferencedNamespace().equals(namespace))
-           serviceVector.add(services[i]);
-      }
-    }
-    Service[] services = new Service[serviceVector.size()];
-    serviceVector.copyInto(services);
-    return services;
-  }
-
-  private Link[] loadLinksByNamespace(String namespace) {
-    Vector linkVector = new Vector();
-    WSILDocument wsilDoc = getWSILDocument();
-    if (wsilDoc != null)
-    {
-      Inspection inspection = wsilDoc.getInspection();
-      Link[] links = inspection.getLinks();
-      for (int i = 0; i < links.length; i++)
-      {
-        if (links[i].getReferencedNamespace().equals(namespace))
-          linkVector.add(links[i]);
-      }
-    }
-    Link[] links = new Link[linkVector.size()];
-    linkVector.copyInto(links);
-    return links;
-  }
-
-  public void addFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry)
-  {
-    addUDDIRegistry(registry.getName(), registry.getInquiryURL(), registry.getPublishURL(), registry.getRegistrationURL());
-  }
-
-  public void addFavoritesUDDIBusiness(IFavoritesUDDIBusiness business)
-  {
-    addUDDIBusiness(business.getName(), business.getInquiryURL(), business.getBusinessKey());
-  }
-
-  public void addFavoritesUDDIService(IFavoritesUDDIService service)
-  {
-    addUDDIService(service.getName(), service.getInquiryURL(), service.getServiceKey());
-  }
-
-  public void addFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface)
-  {
-    addUDDIServiceInterface(serviceInterface.getName(), serviceInterface.getInquiryURL(), serviceInterface.getServiceInterfaceKey());
-  }
-
-  public void addFavoritesWSDL(IFavoritesWSDL wsdl)
-  {
-    addWSDLService(wsdl.getWsdlUrl());
-  }
-
-  public void addFavoritesWSIL(IFavoritesWSIL wsil)
-  {
-    addWSILLink(wsil.getWsilUrl());
-  }
-
-  public Link addUDDIRegistry(String registryName, String inquiryAPI, String publishAPI, String registrationURL) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Link link = new LinkImpl();
-    // registry name
-    Abstract abst = new AbstractImpl();
-    abst.setText(registryName);
-    link.addAbstract(abst);
-    // inquiry URL
-    Abstract abst2 = new AbstractImpl();
-    abst2.setText(inquiryAPI);
-    link.addAbstract(abst2);
-    // publish URL
-    Abstract abst3 = new AbstractImpl();
-    if (publishAPI != null)
-      abst3.setText(publishAPI);
-    else
-      abst3.setText("");
-    link.addAbstract(abst3);
-    // registration URL
-    Abstract abst4 = new AbstractImpl();
-    if (registrationURL != null)
-      abst4.setText(registrationURL);
-    else
-      abst4.setText("");
-    link.addAbstract(abst4);
-    // add namespace
-    link.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
-    inspection.addLink(link);
-    return link;
-  }
-
-  public Link addUDDIBusiness(String businessName, String inquiryAPI, String businessKey) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Link link = new LinkImpl();
-    Abstract abst = new AbstractImpl();
-    abst.setText(businessName);
-    link.addAbstract(abst);
-    link.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
-    BusinessDescription bd = new BusinessDescriptionImpl();
-    bd.setLocation(inquiryAPI);
-    BusinessKey key = new BusinessKey(businessKey);
-    bd.setBusinessKey(key);
-    link.setExtensionElement(bd);
-    inspection.addLink(link);
-    return link;
-  }
-
-  public Service addUDDIService(String serviceName, String inquiryAPI, String serviceKey) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Service service = new ServiceImpl();
-    ServiceName name = new ServiceNameImpl();
-    name.setText(serviceName);
-    service.addServiceName(name);
-    Description desc = new DescriptionImpl();
-    desc.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V2);
-    ServiceDescription sd = new ServiceDescriptionImpl();
-    sd.setLocation(inquiryAPI);
-    ServiceKey key = new ServiceKey(serviceKey);
-    sd.setServiceKey(key);
-    desc.setExtensionElement(sd);
-    service.addDescription(desc);
-    inspection.addService(service);
-    return service;
-  }
-
-  public Service addUDDIServiceInterface(String serIntName, String inquiryAPI, String serIntKey) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Service service = new ServiceImpl();
-    ServiceName name = new ServiceNameImpl();
-    name.setText(serIntName);
-    service.addServiceName(name);
-    Description desc = new DescriptionImpl();
-    desc.setReferencedNamespace(FavoritesConstants.NAMESPACE_UDDI_V1);
-    ServiceDescription sd = new ServiceDescriptionImpl();
-    sd.setLocation(inquiryAPI);
-    ServiceKey key = new ServiceKey(serIntKey);
-    sd.setServiceKey(key);
-    desc.setExtensionElement(sd);
-    service.addDescription(desc);
-    inspection.addService(service);
-    return service;
-  }
-
-  public Service addWSDLService(String url) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Service service = new ServiceImpl();
-    Description desc = new DescriptionImpl();
-    desc.setLocation(url);
-    desc.setReferencedNamespace(FavoritesConstants.NAMESPACE_WSDL);
-    service.addDescription(desc);
-    inspection.addService(service);
-    return service;
-  }
-
-  public Link addWSILLink(String url) {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    Link link = new LinkImpl();
-    link.setLocation(url);
-    link.setReferencedNamespace(FavoritesConstants.NAMESPACE_WSIL_INSPECTION);
-    inspection.addLink(link);
-    return link;
-  }
-
-  public void removeFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry)
-  {
-    if (registry instanceof FavoritesUDDIRegistry)
-      removeLink(((FavoritesUDDIRegistry)registry).getLink());
-  }
-
-  public void removeFavoritesUDDIBusiness(IFavoritesUDDIBusiness business)
-  {
-    if (business instanceof FavoritesUDDIBusiness)
-      removeLink(((FavoritesUDDIBusiness)business).getLink());
-  }
-
-  public void removeFavoritesUDDIService(IFavoritesUDDIService service)
-  {
-    if (service instanceof FavoritesUDDIService)
-      removeService(((FavoritesUDDIService)service).getService());
-  }
-
-  public void removeFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface)
-  {
-    if (serviceInterface instanceof FavoritesUDDIServiceInterface)
-      removeService(((FavoritesUDDIServiceInterface)serviceInterface).getService());
-  }
-
-  public void removeFavoritesWSDL(IFavoritesWSDL wsdl)
-  {
-    if (wsdl instanceof FavoritesWSDL)
-      removeService(((FavoritesWSDL)wsdl).getService());
-  }
-
-  public void removeFavoritesWSIL(IFavoritesWSIL wsil)
-  {
-    if (wsil instanceof FavoritesWSIL)
-      removeLink(((FavoritesWSIL)wsil).getLink());
-  }
-
-  public void removeService(Service service)
-  {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    inspection.removeService(service);
-  }
-
-  public void removeLink(Link link)
-  {
-    WSILDocument wsilDoc = getWSILDocument();
-    Inspection inspection = wsilDoc.getInspection();
-    inspection.removeLink(link);
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java
deleted file mode 100644
index 4520f9a..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.Service;
-
-public class FavoritesService
-{
-  protected Service service_;
-
-  public FavoritesService()
-  {
-    service_ = null;
-  }
-
-  public Service getService()
-  {
-    return service_;
-  }
-
-  public void setService(Service service)
-  {
-    service_ = service;
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java
deleted file mode 100644
index f53883c..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.extension.uddi.BusinessDescription;
-
-public class FavoritesUDDIBusiness extends FavoritesLink implements IFavoritesUDDIBusiness
-{
-  public FavoritesUDDIBusiness()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return (link_.getAbstracts())[0].getText();
-  }
-
-  public String getInquiryURL()
-  {
-    return ((BusinessDescription)link_.getExtensionElement()).getLocation();
-  }
-
-  public String getBusinessKey()
-  {
-    return ((BusinessDescription)link_.getExtensionElement()).getBusinessKey().getText();
-  }
-
-  public void setName(String name)
-  {
-  }
-
-  public void setInquiryURL(String inquiryURL)
-  {
-  }
-
-  public void setBusinessKey(String key)
-  {
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java
deleted file mode 100644
index 7cc8076..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.Abstract;
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class FavoritesUDDIRegistry extends FavoritesLink implements IFavoritesUDDIRegistry
-{
-  public FavoritesUDDIRegistry()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    String name = (link_.getAbstracts())[0].getText();
-    if (name.startsWith("%"))
-    {
-      String translatedName = ParserPlugin.getMessage(name);
-      if (translatedName != null)
-        name = translatedName;
-    }
-    return name;
-  }
-
-  public String getInquiryURL()
-  {
-    return (link_.getAbstracts())[1].getText();
-  }
-
-  public String getPublishURL()
-  {
-    Abstract[] abstracts = link_.getAbstracts();
-    if (abstracts.length > 2)
-    {
-      String publishURL = abstracts[2].getText();
-      if (publishURL != null && publishURL.length() > 0)
-        return publishURL;
-    }
-    return null;
-  }
-
-  public String getRegistrationURL()
-  {
-    Abstract[] abstracts = link_.getAbstracts();
-    if (abstracts.length > 3)
-    {
-      String registrationURL = abstracts[3].getText();
-      if (registrationURL != null && registrationURL.length() > 0)
-        return registrationURL;
-    }
-    return null;
-  }
-
-  public void setName(String name)
-  {
-    (link_.getAbstracts())[0].setText(name);
-  }
-
-  public void setInquiryURL(String inquiryURL)
-  {
-    (link_.getAbstracts())[1].setText(inquiryURL);
-  }
-
-  public void setPublishURL(String publishURL)
-  {
-    Abstract[] abstracts = link_.getAbstracts();
-    if (abstracts.length > 2)
-      abstracts[2].setText(publishURL);
-  }
-
-  public void setRegistrationURL(String registrationURL)
-  {
-    Abstract[] abstracts = link_.getAbstracts();
-    if (abstracts.length > 3)
-      abstracts[3].setText(registrationURL);
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java
deleted file mode 100644
index 0954f57..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.extension.uddi.ServiceDescription;
-
-public class FavoritesUDDIService extends FavoritesService implements IFavoritesUDDIService
-{
-  public FavoritesUDDIService()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return (service_.getServiceNames())[0].getText();
-  }
-
-  public String getInquiryURL()
-  {
-    ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
-    return sd.getLocation();
-  }
-
-  public String getServiceKey()
-  {
-    ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
-    return sd.getServiceKey().getText();
-  }
-
-  public void setName(String name)
-  {
-  }
-
-  public void setInquiryURL(String inquiryURL)
-  {
-  }
-
-  public void setServiceKey(String key)
-  {
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java
deleted file mode 100644
index 56ec674..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-import org.apache.wsil.extension.uddi.ServiceDescription;
-
-public class FavoritesUDDIServiceInterface extends FavoritesService implements IFavoritesUDDIServiceInterface
-{
-  public FavoritesUDDIServiceInterface()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return (service_.getServiceNames())[0].getText();
-  }
-
-  public String getInquiryURL()
-  {
-    ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
-    return sd.getLocation();
-  }
-
-  public String getServiceInterfaceKey()
-  {
-    ServiceDescription sd = (ServiceDescription)(service_.getDescriptions())[0].getExtensionElement();
-    return sd.getServiceKey().getText();
-  }
-
-  public void setName(String name)
-  {
-  }
-
-  public void setInquiryURL(String inquiryURL)
-  {
-  }
-
-  public void setServiceInterfaceKey(String key)
-  {
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java
deleted file mode 100644
index 0f340e0..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public class FavoritesWSDL extends FavoritesService implements IFavoritesWSDL
-{
-  public FavoritesWSDL()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return getWsdlUrl();
-  }
-
-  public String getWsdlUrl()
-  {
-    return (service_.getDescriptions())[0].getLocation();
-  }
-
-  public void setName(String name)
-  {
-  }
-
-  public void setWsdlUrl(String wsdlURL)
-  {
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java
deleted file mode 100644
index 6622c7d..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public class FavoritesWSIL extends FavoritesLink implements IFavoritesWSIL
-{
-  public FavoritesWSIL()
-  {
-    super();
-  }
-
-  public String getName()
-  {
-    return getWsilUrl();
-  }
-
-
-  public String getWsilUrl()
-  {
-    return link_.getLocation();
-  }
-
-  public void setName(String name)
-  {
-  }
-
-  public void setWsilUrl(String wsilURL)
-  {
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java
deleted file mode 100644
index b2c96c1..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesRegistryType
-{
-  public IFavoritesUDDIRegistry[] getFavoritesUDDIRegistries();
-  public IFavoritesUDDIBusiness[] getFavoritesUDDIBusinesses();
-  public IFavoritesUDDIService[] getFavoritesUDDIServices();
-  public IFavoritesUDDIServiceInterface[] getFavoritesUDDIServiceInterfaces();
-  public IFavoritesWSDL[] getFavoritesWSDLs();
-  public IFavoritesWSIL[] getFavoritesWSILs();
-
-  public void addFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry);
-  public void addFavoritesUDDIBusiness(IFavoritesUDDIBusiness business);
-  public void addFavoritesUDDIService(IFavoritesUDDIService service);
-  public void addFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface);
-  public void addFavoritesWSDL(IFavoritesWSDL wsdl);
-  public void addFavoritesWSIL(IFavoritesWSIL wsil);
-
-  public void removeFavoritesUDDIRegistry(IFavoritesUDDIRegistry registry);
-  public void removeFavoritesUDDIBusiness(IFavoritesUDDIBusiness business);
-  public void removeFavoritesUDDIService(IFavoritesUDDIService service);
-  public void removeFavoritesUDDIServiceInterface(IFavoritesUDDIServiceInterface serviceInterface);
-  public void removeFavoritesWSDL(IFavoritesWSDL wsdl);
-  public void removeFavoritesWSIL(IFavoritesWSIL wsil);  
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java
deleted file mode 100644
index dd2d2c9..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIBusiness
-{
-  public String getName();
-  public String getInquiryURL();
-  public String getBusinessKey();
-
-  public void setName(String name);
-  public void setInquiryURL(String inquiryURL);
-  public void setBusinessKey(String key);
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java
deleted file mode 100644
index bb035f1..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIRegistry
-{
-  public String getName();
-  public String getInquiryURL();
-  public String getPublishURL();
-  public String getRegistrationURL();
-
-  public void setName(String name);
-  public void setInquiryURL(String inquiryURL);
-  public void setPublishURL(String publishURL);
-  public void setRegistrationURL(String registrationURL);
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java
deleted file mode 100644
index 286370d..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIService
-{
-  public String getName();
-  public String getInquiryURL();
-  public String getServiceKey();
-
-  public void setName(String name);
-  public void setInquiryURL(String inquiryURL);
-  public void setServiceKey(String key);
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java
deleted file mode 100644
index ad426cb..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesUDDIServiceInterface
-{
-  public String getName();
-  public String getInquiryURL();
-  public String getServiceInterfaceKey();
-
-  public void setName(String name);
-  public void setInquiryURL(String inquiryURL);
-  public void setServiceInterfaceKey(String key);
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java
deleted file mode 100644
index d69f824..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesWSDL
-{
-  public String getName();
-  public String getWsdlUrl();
-
-  public void setName(String name);
-  public void setWsdlUrl(String wsdlURL);
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java
deleted file mode 100644
index 4c129e1..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.favorites;
-
-public interface IFavoritesWSIL
-{
-  public String getName();
-  public String getWsilUrl();
-
-  public void setName(String name);
-  public void setWsilUrl(String wsilURL);
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java
deleted file mode 100644
index d2dc6dc..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.plugin;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ParserPlugin extends Plugin {
-	//The shared instance.
-	private static ParserPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public ParserPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle   = ResourceBundle.getBundle("org.eclipse.wst.ws.parser.ParserPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static ParserPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = ParserPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	 /**
-	  * Returns the message string identified by the given key from
-	  * the plugin.properties file for the appropriate locale.
-	  * @param key The message key string prefixed by a "%" symbol.
-	  * That is, the string passed in must be of the form "%KEY"
-	  * where the plugin.properties file contains a line of the
-	  * form: "KEY = value".
-	  * @return The locale-specific message.
-	  */
-	  public static String getMessage ( String key )
-	  {
-	    MessageUtils msgUtils = new MessageUtils( "org.eclipse.wst.ws.parser.plugin", plugin );
-	    
-	    if( key.startsWith("%"))
-	    {
-	      key = key.substring( 1, key.length() );
-	    }
-	    
-	    return msgUtils.getMessage(key);
-	  }
-
-	  /**
-	  * Returns the message string identified by the given key from
-	  * the plugin.properties file for the appropriate locale.
-	  * Substitution sequences in the message string
-	  * are replaced by the given array of substitution objects (which
-	  * are most frequently strings). See java.text.MessageFormat for
-	  * further details on substitution.
-	  * @param key The message key string prefixed by a "%" symbol.
-	  * That is, the string passed in must be of the form "%KEY"
-	  * where the plugin.properties file contains a line of the
-	  * form: "KEY = value".
-	  * @param args The substitution values for the message
-	  * as required by the message in plugin.properties and
-	  * by the rules of class java.text.MessageFormat.
-	  * @return The locale-specific message.
-	  */
-	  public static String getMessage ( String key, Object[] args )
-	  {
-	    return MessageFormat.format(getMessage(key),args);
-	  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java
deleted file mode 100644
index 36994bb..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Vector;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class HTMLHeadHandler extends DefaultHandler
-{
-  private final char START_TAG = '<';
-  private final char END_TAG = '>';
-  private final String HEAD_START_TAG = "<head>";
-  private final String HEAD_END_TAG = "</head>";
-  private final String ROOT_START_TAG = "<root>";
-  private final String ROOT_END_TAG = "</root>";
-  private final String UTF8 = "UTF-8";  
-  
-  // WSIL tag information.
-  private final String META = "meta";
-  private final String NAME = "name";
-  private final String SERVICE_INSPECTION = "serviceInspection";
-  private final String CONTENT = "content";
-  
-  // DISCO tag information.
-  private final String LINK = "link";
-  private final String TYPE = "type";
-  private final String TEXT_XML = "text/xml";
-  private final String REL = "rel";
-  private final String ALTERNATE = "alternate";
-  private final String HREF = "href";
-    
-  private String baseURI_;
-  private Vector wsils_;
-  private Vector discos_;
-  
-  public HTMLHeadHandler(String baseURI)
-  {
-    super();
-    baseURI_ = baseURI;
-    wsils_ = new Vector();
-    discos_ = new Vector();
-  }
- 
-  public String[] getWsils()
-  {
-    String[] wsils = new String[wsils_.size()];
-    wsils_.copyInto(wsils);
-    return wsils;
-  }
-  
-  public String[] getDiscos()
-  {
-    String[] discos = new String[discos_.size()];
-    discos_.copyInto(discos);
-    return discos;
-  }
-  
-  public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
-  {
-    String qNameLC = qName.toLowerCase();
-    if (qNameLC.equals(META))
-    {
-      String nameValue = attributes.getValue(NAME);
-      if (SERVICE_INSPECTION.equals(nameValue))
-      {
-        String wsilURI = attributes.getValue(CONTENT);
-        if (baseURI_ != null && wsilURI.indexOf(":/") == -1)
-        {
-          StringBuffer sb = new StringBuffer();
-          sb.append(baseURI_.substring(0, baseURI_.lastIndexOf("/")+1));
-          sb.append(wsilURI);
-          wsilURI = sb.toString();
-        }
-        if (!wsils_.contains(wsilURI))
-          wsils_.add(wsilURI);
-      }
-    }
-    else if (qNameLC.equals(LINK))
-    {
-      // See http://msdn.microsoft.com/msdnmag/issues/02/02/xml/default.aspx for more details on DISCO.
-      String type = attributes.getValue(TYPE);
-      String rel = attributes.getValue(REL);
-      String href = attributes.getValue(HREF);
-      if (TEXT_XML.equals(type) && ALTERNATE.equals(rel) && href != null)
-      {
-        String discoURI = href;
-        if (discoURI.indexOf(":/") == -1)
-        {
-          StringBuffer sb = new StringBuffer();
-          sb.append(baseURI_.substring(0,baseURI_.lastIndexOf("/")+1));
-          sb.append(discoURI);
-          discoURI = sb.toString();
-        }
-        if (!discos_.contains(discoURI))
-          discos_.add(discoURI);
-      }
-    }
-  }
-  
-  public void error(SAXParseException e) throws SAXException
-  {
-  }
-  
-  public void fatalError(SAXParseException e) throws SAXException
-  {
-  }
-  
-  public void warning(SAXParseException e) throws SAXException
-  {
-  }
-  
-  private void harvestTags(StringBuffer target,String document,String tag)
-  {
-    int index = document.indexOf(START_TAG);
-    int documentLength = document.length();
-    int tagLength = tag.length();
-    while (index != -1 && (index+1+tagLength)<documentLength)
-    {
-      String str = document.substring(index+1,index+1+tagLength);
-      if (str.toLowerCase().equals(tag))
-      {
-        str = document.substring(index,document.indexOf(END_TAG,index+1)+1);
-        target.append(str);
-        index += str.length();
-      }
-      else
-        index++;
-      index = document.indexOf(START_TAG,index);
-    }
-  }
-  
-  public byte[] harvestHeadTags(byte[] b)
-  {
-    String s;
-    try
-    {
-      s = new String(b, UTF8);
-    }
-    catch (UnsupportedEncodingException uee)
-    {
-      s = new String(b);
-    }
-    String head = s.toLowerCase();
-    int headStartIndex = head.indexOf(HEAD_START_TAG);
-    int headEndIndex = head.indexOf(HEAD_END_TAG);
-    StringBuffer sb = new StringBuffer();
-    sb.append(ROOT_START_TAG);
-    if (headStartIndex != -1 && headEndIndex != -1)
-    {
-      head = s.substring(headStartIndex, headEndIndex+HEAD_END_TAG.length());
-      harvestTags(sb,head,META);
-      harvestTags(sb,head,LINK);
-    }
-    sb.append(ROOT_END_TAG);
-    return sb.toString().getBytes();
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java
deleted file mode 100644
index bf42dc6..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-public class IllegalArgumentsException extends Exception
-{
-  private static final long serialVersionUID = -2533981176285561234L;
-
-  public IllegalArgumentsException(String arg)
-  {
-    super(arg);
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java
deleted file mode 100644
index 3d007ac..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.text.MessageFormat;
-import java.text.ParseException;
-
-public class UDDIURIHelper
-{
-  private static final String QUERYSERVICE_URI_TEMPLATE = "uddiservice:query:{0}:query:{1}";
-  private static final String SERVICEKEY_URI_TEMPLATE = "uddiservice:serviceKey:{0}:serviceKey:{1}";
-  
-  public static final String getQueryServiceURI(String query,String inquiryURL)
-  {
-    String[] uriParams = {query,inquiryURL};
-    return MessageFormat.format(QUERYSERVICE_URI_TEMPLATE,uriParams);
-  }
-  
-  public static final String getServiceKeyURI(String serviceKey,String inquiryURL)
-  {
-    String[] uriParams = {serviceKey,inquiryURL};
-    return MessageFormat.format(SERVICEKEY_URI_TEMPLATE,uriParams);
-  }
-  
-  private static final String[] parseURI(String pattern,String uri)
-  {
-    try
-    {
-      MessageFormat mf = new MessageFormat(pattern);
-      Object[] parsedResults = mf.parse(uri);
-      if (parsedResults != null && parsedResults.length > 0)
-      {
-        String[] results = new String[parsedResults.length];
-        for (int i=0;i<parsedResults.length;i++)
-          results[i] = (String)parsedResults[i];
-        return results;
-      }        
-    }
-    catch (ParseException e)
-    {
-    }
-    return null;
-  }
-  
-  public static final String[] parseServiceKeyURI(String uri)
-  {
-    return parseURI(SERVICEKEY_URI_TEMPLATE,uri);
-  }
-  
-  public static final String[] parseQueryServiceURI(String uri)
-  {
-    return parseURI(QUERYSERVICE_URI_TEMPLATE,uri);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java
deleted file mode 100644
index 8ac66a6..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.io.IOException;
-
-public class WWWAuthenticationException extends Exception
-{
-  private static final long serialVersionUID = -4918211021620316049L;
-
-  private IOException ioe_;
-  private String wwwAuthMsg_;
-  private String url_;
-
-  public WWWAuthenticationException(IOException ioe, String wwwAuthMsg, String url)
-  {
-    super(ioe.getMessage());
-    ioe_ = ioe;
-    wwwAuthMsg_ = wwwAuthMsg;
-    url_ = url;
-  }
-
-  public IOException getIOException()
-  {
-    return ioe_;
-  }
-
-  public String getWWWAuthenticationMsg()
-  {
-    return wwwAuthMsg_;
-  }
-
-  public String getURL()
-  {
-    return url_;
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java
deleted file mode 100644
index c7a8cab..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-public interface WWWAuthenticationHandler
-{
-  public void handleWWWAuthentication(WWWAuthenticationException wwwae);
-  public String getUsername();
-  public String getPassword();
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java
deleted file mode 100644
index 33e38a7..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java
+++ /dev/null

@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class WebServiceEntity
-{
-  public static final int TYPE_UNKNOWN = -1;
-  public static final int TYPE_HTML = 0;
-  public static final int TYPE_WSIL = 1;
-  public static final int TYPE_WSDL = 2;
-  public static final int TYPE_UDDI_SERVICE = 3;
-  public static final int TYPE_DISCO = 4;
-
-  private Object parent_;
-  private List children_;
-  private int type_;
-  private String uri_;
-  private byte[] bytes_;
-  private String httpUsername_;
-  private String httpPassword_;
-  private String documentation_;
-  private Object model_;
-
-  public WebServiceEntity()
-  {
-    parent_ = null;
-    children_ = new ArrayList();
-    type_ = TYPE_UNKNOWN;
-    uri_ = null;
-    bytes_ = null;
-    httpUsername_ = null;
-    httpPassword_ = null;
-    documentation_ = null;
-    model_ = null;
-  }
-
-  public Object getParent()
-  {
-    return parent_;
-  }
-
-  public void setParent(Object parent)
-  {
-    parent_ = parent;
-  }
-
-  public List getChildren()
-  {
-    return children_;
-  }
-
-  public void addChild(Object child)
-  {
-    children_.add(child);
-  }
-
-  public void removeChild(Object child)
-  {
-    children_.remove(child);
-  }
-
-  public int getType()
-  {
-    return type_;
-  }
-
-  public void setType(int type)
-  {
-    type_ = type;
-  }
-
-  public String getURI()
-  {
-    return uri_;
-  }
-
-  public void setURI(String uri)
-  {
-    uri_ = uri;
-  }
-
-  public byte[] getBytes()
-  {
-    return bytes_;
-  }
-
-  public void setBytes(byte[] bytes)
-  {
-    bytes_ = bytes;
-  }
-
-  public String getHTTPUsername()
-  {
-    return httpUsername_;
-  }
-
-  public void setHTTPUsername(String httpUsername)
-  {
-    httpUsername_ = httpUsername;
-  }
-
-  public String getHTTPPassword()
-  {
-    return httpPassword_;
-  }
-
-  public void setHTTPPassword(String httpPassword)
-  {
-    httpPassword_ = httpPassword;
-  }
-  
-  public String getDocumentation()
-  {
-    return documentation_;
-  }
-  
-  public void setDocumentation(String documentation)
-  {
-    documentation_ = documentation;
-  }
-  
-  public Object getModel()
-  {
-    return model_;
-  }
-  
-  public void setModel(Object model)
-  {
-    model_ = model;
-  }
-
-  public boolean isEntityResolved()
-  {
-    return (bytes_ != null);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java
deleted file mode 100644
index 1acc20c..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java
+++ /dev/null

@@ -1,547 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.parser.wsil;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Hashtable;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Description;
-import org.apache.wsil.Inspection;
-import org.apache.wsil.Link;
-import org.apache.wsil.Service;
-import org.apache.wsil.WSILConstants;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.uddi.ServiceDescription;
-import org.apache.wsil.extension.uddi.UDDIConstants;
-import org.apache.wsil.extension.wsdl.WSDLConstants;
-import org.eclipse.wst.ws.internal.parser.disco.DISCOContractReference;
-import org.eclipse.wst.ws.internal.parser.disco.DISCOParser;
-import org.eclipse.wst.ws.internal.parser.disco.DISCOReference;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import sun.misc.BASE64Encoder;
-
-public class WebServicesParser
-{
-  public static final int PARSE_NONE = 0;
-  public static final int PARSE_WSIL = 1<<0;
-  public static final int PARSE_WSDL = 1<<1;
-  public static final int PARSE_LINKS = 1<<2;
-  public static final int PARSE_DISCO = 1<<3;
-
-  private String uri_;
-  private Hashtable uriToEntityTable_;
-
-  private String httpBasicAuthUsername_;
-  private String httpBasicAuthPassword_;
-
-  public WebServicesParser()
-  {
-    this(null);
-  }
-
-  public WebServicesParser(String uri)
-  {
-    uri_ = uri;
-    uriToEntityTable_ = new Hashtable();
-    httpBasicAuthUsername_ = null;
-    httpBasicAuthPassword_ = null;
-  }
-
-  public String getURI()
-  {
-    return uri_;
-  }
-
-  public void setURI(String uri)
-  {
-    uri_ = uri;
-  }
-
-  public WebServiceEntity getWebServiceEntityByURI(String uri)
-  {
-    if (uri != null)
-      return (WebServiceEntity)uriToEntityTable_.get(uri);
-    else
-      return null;
-  }
-
-  public WSILDocument getWSILDocument(String wsilURI)
-  {
-    try
-    {
-      return getWSILDocumentVerbose(wsilURI);
-    }
-    catch (Throwable t)
-    {
-    }
-    return null;
-  }
-
-  public WSILDocument getWSILDocumentVerbose(String wsilURI) throws MalformedURLException, IOException, WWWAuthenticationException, WSILException
-  {
-    WebServiceEntity wsEntity = getWebServiceEntityByURI(wsilURI);
-    if (wsEntity == null)
-    {
-      wsEntity = new WebServiceEntity();
-      wsEntity.setURI(wsilURI);
-      uriToEntityTable_.put(wsilURI, wsEntity);
-    }
-    WSILDocument wsilDocument = (WSILDocument)wsEntity.getModel();
-    if (wsilDocument == null)
-    {
-      byte[] b = getInputStreamAsByteArray(wsilURI);
-      wsEntity.setBytes(b);
-      setHTTPSettings(wsEntity);
-      InputStreamReader isr = new InputStreamReader(new ByteArrayInputStream(b));
-      wsilDocument = WSILDocument.newInstance();
-      wsilDocument.read(isr);
-      wsEntity.setType(WebServiceEntity.TYPE_WSIL);
-      wsEntity.setModel(wsilDocument);
-    }
-    return wsilDocument;
-  }
-
-  public Definition getWSDLDefinition(String wsdlURI)
-  {
-    try
-    {
-      return getWSDLDefinitionVerbose(wsdlURI);
-    }
-    catch (Throwable t)
-    {
-    }
-    return null;
-  }
-
-  public Definition getWSDLDefinitionVerbose(String wsdlURI) throws MalformedURLException, IOException, WWWAuthenticationException, WSDLException
-  {
-    WebServiceEntity wsEntity = getWebServiceEntityByURI(wsdlURI);
-    if (wsEntity == null)
-    {
-      wsEntity = new WebServiceEntity();
-      wsEntity.setURI(wsdlURI);
-      uriToEntityTable_.put(wsdlURI, wsEntity);
-    }
-    Definition definition = (Definition)wsEntity.getModel();
-    if (definition == null)
-    {
-      byte[] b = getInputStreamAsByteArray(wsdlURI);
-      wsEntity.setBytes(b);
-      setHTTPSettings(wsEntity);
-      ByteArrayInputStream bais = new ByteArrayInputStream(b);
-      WSDLFactory factory = WSDLPlugin.INSTANCE.createWSDL4JFactory();
-      WSDLReader wsdlReader = factory.newWSDLReader();
-      definition = wsdlReader.readWSDL(wsdlURI, new InputSource(bais));
-      wsEntity.setType(WebServiceEntity.TYPE_WSDL);
-      wsEntity.setModel(definition);
-    }
-    return definition;
-  }
-
-  public void parse() throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException
-  {
-    parseURL(PARSE_WSIL | PARSE_WSDL | PARSE_LINKS | PARSE_DISCO);
-  }
-
-  public void parse(int parseOption) throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException
-  {
-    parseURL(parseOption);
-  }
-
-  private void parseURL(int parseOption) throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException
-  {
-    WebServiceEntity wsEntity = new WebServiceEntity();
-    wsEntity.setURI(uri_);
-    byte[] b = getInputStreamAsByteArray(uri_);
-    wsEntity.setBytes(b);
-    setHTTPSettings(wsEntity);
-    uriToEntityTable_.put(uri_, wsEntity);
-    // parse uri_ as a HTML document
-    HTMLHeadHandler headHandler = new HTMLHeadHandler(uri_);
-    byte[] head = headHandler.harvestHeadTags(b);
-    SAXParserFactory factory = SAXParserFactory.newInstance();
-    factory.setNamespaceAware(false);
-    factory.setValidating(false);
-    SAXParser parser = factory.newSAXParser();
-    try
-    {
-      parser.parse(new ByteArrayInputStream(head), headHandler);
-    }
-    catch (Throwable t)
-    {
-    }
-    String[] wsilURIs = headHandler.getWsils();
-    String[] discoURIs = headHandler.getDiscos();
-    // true if uri_ is a HTML document
-    if (wsilURIs.length > 0 || discoURIs.length > 0)
-    {
-      wsEntity.setType(WebServiceEntity.TYPE_HTML);
-      for (int i = 0; i < wsilURIs.length; i++)
-      {
-        String absoluteURI = convertToAbsoluteURI(uri_, wsilURIs[i]);
-        WebServiceEntity wsilEntity = new WebServiceEntity();
-        wsilEntity.setType(WebServiceEntity.TYPE_WSIL);
-        wsilEntity.setURI(absoluteURI);
-        associate(wsEntity, wsilEntity);
-        uriToEntityTable_.put(absoluteURI, wsilEntity);
-        if ((parseOption | PARSE_WSIL) == parseOption)
-        {
-          try
-          {
-            parseWSIL(absoluteURI, parseOption);
-          }
-          catch (Throwable t)
-          {
-          }
-        }
-      }
-      for (int i=0;i<discoURIs.length;i++)
-      {
-        WebServiceEntity discoEntity = new WebServiceEntity();
-        discoEntity.setType(WebServiceEntity.TYPE_DISCO);
-        discoEntity.setURI(discoURIs[i]);
-        associate(wsEntity,discoEntity);
-        uriToEntityTable_.put(discoURIs[i],discoEntity);
-        if ((parseOption | PARSE_DISCO) == parseOption)
-        {
-          try
-          {
-            parseDISCO(discoURIs[i],parseOption);
-          }
-          catch (Throwable t)
-          {
-          }
-        }
-      }
-    }
-    // false if uri_ is not a HTML document
-    // then parse uri_ as a WSIL document
-    else
-    {
-      try
-      {
-        parseWSIL(uri_, parseOption);
-        // no exception thrown if uri_ is a WSIL document
-        wsEntity.setType(WebServiceEntity.TYPE_WSIL);
-      }
-      catch (Throwable t)
-      {
-        // exception thrown if uri_ is not a WSIL document
-        // then parse uri_ as a DISCO document.
-        try
-        {
-          parseDISCO(uri_, parseOption);
-          // no exception thrown if uri_ is a DISCO document
-          wsEntity.setType(WebServiceEntity.TYPE_DISCO);
-        }
-        catch (Throwable t2)
-        {
-          // exception thrown if uri_ is not a DISCO document
-          // then parse uri_ as a WSDL document
-          try
-          {
-            parseWSDL(uri_);
-            // no exception thrown if uri_ is a WSDL document
-            wsEntity.setType(WebServiceEntity.TYPE_WSDL);
-          }
-          catch (Throwable t3)
-          {
-            // exception thrown if uri_ is not a WSDL document
-            // then do nothing
-          }
-        }
-      }
-    }
-  }
-
-  private void parseWSIL(String wsilURI, int parseOption) throws WSILException, MalformedURLException, IOException, WSDLException, WWWAuthenticationException
-  {
-    WebServiceEntity wsilEntity = getWebServiceEntityByURI(wsilURI);
-    WSILDocument wsilDoc = (WSILDocument)wsilEntity.getModel();
-    if (wsilDoc != null)
-    {
-      // Prevent infinite loops from occurring when a WSIL cycles occur.
-      return;
-    }
-    wsilDoc = getWSILDocumentVerbose(wsilURI);
-    Inspection inspection = wsilDoc.getInspection();
-    Service[] services = inspection.getServices();
-    for (int i = 0; i < services.length; i++)
-    {
-      Description[] descs = services[i].getDescriptions();
-      // Set the documentation to the <service> element's first abstract.
-      String documentation = null;
-      Abstract[] abstracts = services[i].getAbstracts();
-      if (abstracts != null && abstracts.length > 0)
-        documentation = abstracts[0].getText();
-      for (int j = 0; j < descs.length; j++)
-      {
-      	String referencedNS = descs[j].getReferencedNamespace();
-      	// If a <description> element contains an abstract, use it to override the service documentation.      	
-      	abstracts = descs[j].getAbstracts();
-      	if (abstracts != null && abstracts.length > 0)
-      	  documentation = abstracts[0].getText();
-        if (WSDLConstants.NS_URI_WSDL.equals(referencedNS))
-        {
-          String location = descs[j].getLocation();
-          if (location != null && location.length() > 0)
-          {
-            String absoluteURI = convertToAbsoluteURI(wsilURI, location);
-            WebServiceEntity wsdlEntity = new WebServiceEntity();
-            wsdlEntity.setType(WebServiceEntity.TYPE_WSDL);
-            wsdlEntity.setURI(absoluteURI);
-            wsdlEntity.setDocumentation(documentation);
-            associate(wsilEntity, wsdlEntity);
-            uriToEntityTable_.put(absoluteURI, wsdlEntity);
-            if ((parseOption | PARSE_WSDL) == parseOption)
-              parseWSDL(absoluteURI);
-          }
-        }
-        else if (UDDIConstants.NS_URI_UDDI_V2.equals(referencedNS))
-        {
-          ExtensionElement ee = descs[j].getExtensionElement();
-          if (ee instanceof ServiceDescription)
-          {
-            ServiceDescription sd = (ServiceDescription)ee;
-            String inquiryURL = sd.getLocation();
-            String serviceKey = sd.getServiceKey().getText();
-            WebServiceEntity uddiServiceEntity = new WebServiceEntity();
-            uddiServiceEntity.setType(WebServiceEntity.TYPE_UDDI_SERVICE);
-            String uddiServiceKeyURI = UDDIURIHelper.getServiceKeyURI(serviceKey,inquiryURL);
-            uddiServiceEntity.setURI(uddiServiceKeyURI);
-            uddiServiceEntity.setDocumentation(documentation);
-            associate(wsilEntity,uddiServiceEntity);
-            uriToEntityTable_.put(uddiServiceKeyURI,uddiServiceEntity);
-            // TODO: parse WSDL if necessary...
-          }
-        }
-      }
-    }
-    Link[] links = inspection.getLinks();    
-    for (int i = 0; i < links.length; i++)
-    {
-      if (WSILConstants.NS_URI_WSIL.equals(links[i].getReferencedNamespace()))
-      {
-        String documentation = null;
-        Abstract[] abstracts = links[i].getAbstracts();
-        if (abstracts != null && abstracts.length > 0)
-          documentation = abstracts[0].getText();
-        String linkLocation = links[i].getLocation();
-        String absoluteURI = convertToAbsoluteURI(wsilURI, linkLocation);
-        // Prevent cycles.
-        WebServiceEntity wsilLinkEntity = getWebServiceEntityByURI(absoluteURI);
-        if (wsilLinkEntity == null)
-        {
-          wsilLinkEntity = new WebServiceEntity();
-          wsilLinkEntity.setType(WebServiceEntity.TYPE_WSIL);
-          wsilLinkEntity.setURI(absoluteURI);
-          wsilLinkEntity.setDocumentation(documentation);
-          uriToEntityTable_.put(absoluteURI, wsilLinkEntity);
-          if ((parseOption | PARSE_LINKS) == parseOption)
-            parseWSIL(absoluteURI, parseOption);
-        }
-        associate(wsilEntity,wsilLinkEntity);
-      }
-    }
-  }
-  
-  private void parseDISCO(String discoURI, int parseOption) throws MalformedURLException, WWWAuthenticationException, Exception
-  {
-    WebServiceEntity discoEntity = getWebServiceEntityByURI(discoURI);
-    byte[] b = getInputStreamAsByteArray(discoURI);
-    discoEntity.setBytes(b);
-    setHTTPSettings(discoEntity);
-    ByteArrayInputStream bais = new ByteArrayInputStream(b);
-    DISCOParser parser = new DISCOParser();
-    DISCOReference[] references = parser.parse(discoURI,new InputSource(bais));
-    if (references != null && references.length > 0)
-    {
-      for (int i=0;i<references.length;i++)
-      {
-        if (references[i] instanceof DISCOContractReference)
-        {
-          // contractRef
-          DISCOContractReference reference = (DISCOContractReference)references[i];
-          String ref = reference.getRef();
-          String docRef = reference.getDocRef();
-          WebServiceEntity wsdlEntity = new WebServiceEntity();
-          wsdlEntity.setType(WebServiceEntity.TYPE_WSDL);
-          wsdlEntity.setURI(ref);
-          wsdlEntity.setDocumentation(docRef);
-          associate(discoEntity,wsdlEntity);
-          uriToEntityTable_.put(ref,wsdlEntity);
-          if ((parseOption | PARSE_WSDL) == parseOption)
-            parseWSDL(ref);
-        }
-        else
-        {
-          // discoveryRef
-          String ref = references[i].getRef();
-          // Prevent cycles.
-          WebServiceEntity discoLinkEntity = getWebServiceEntityByURI(ref);
-          if (discoLinkEntity == null)
-          {
-            discoLinkEntity = new WebServiceEntity();
-            discoLinkEntity.setType(WebServiceEntity.TYPE_DISCO);
-            discoLinkEntity.setURI(ref);
-            uriToEntityTable_.put(ref,discoLinkEntity);
-            if ((parseOption | PARSE_LINKS) == parseOption)
-              parseDISCO(ref,parseOption);
-          }
-          associate(discoEntity,discoLinkEntity);
-        }
-      }
-    }
-  }
-
-  private Definition parseWSDL(String wsdlURI) throws WSDLException, MalformedURLException, IOException, WWWAuthenticationException
-  {
-    return getWSDLDefinitionVerbose(wsdlURI);
-  }
-
-  private byte[] getInputStreamAsByteArray(String uriString) throws MalformedURLException, IOException, WWWAuthenticationException
-  {
-    // Try to get a cached copy of the byte[]
-    WebServiceEntity wsEntity = getWebServiceEntityByURI(uriString);
-    if (wsEntity != null)
-    {
-      byte[] bytes = wsEntity.getBytes();
-      if (bytes != null)
-        return bytes;
-    }
-    // Get the byte[] by opening a stream to the URI
-    URL url = createURL(uriString);
-    URLConnection conn = url.openConnection();
-    // proxy server setting
-    String proxyUserName = System.getProperty("http.proxyUserName");
-    String proxyPassword = System.getProperty("http.proxyPassword");
-    if (proxyUserName != null && proxyPassword != null)
-    {
-      StringBuffer userNamePassword = new StringBuffer(proxyUserName);
-      userNamePassword.append(':').append(proxyPassword);
-      BASE64Encoder encoder = new BASE64Encoder();
-      String encoding = encoder.encode(userNamePassword.toString().getBytes());
-      userNamePassword.setLength(0);
-      userNamePassword.append("Basic ").append(encoding);
-      conn.setRequestProperty("Proxy-authorization", userNamePassword.toString());
-    }
-    // HTTP basic authentication setting
-    if (httpBasicAuthUsername_ != null && httpBasicAuthPassword_ != null)
-    {
-      StringBuffer sb = new StringBuffer(httpBasicAuthUsername_);
-      sb.append(':').append(httpBasicAuthPassword_);
-      BASE64Encoder encoder = new BASE64Encoder();
-      String encoding = encoder.encode(sb.toString().getBytes());
-      sb.setLength(0);
-      sb.append("Basic ").append(encoding);
-      conn.setRequestProperty("Authorization", sb.toString());
-    }
-    InputStream is = null;
-    try
-    {
-      is = conn.getInputStream();
-      String wwwAuthMsg = conn.getHeaderField("WWW-Authenticate");
-      if (wwwAuthMsg != null)
-        throw new WWWAuthenticationException(new IOException(), wwwAuthMsg, uriString);
-    }
-    catch (IOException ioe)
-    {
-      String wwwAuthMsg = conn.getHeaderField("WWW-Authenticate");
-      if (wwwAuthMsg != null)
-        throw new WWWAuthenticationException(ioe, wwwAuthMsg, uriString);
-      else
-        throw ioe;
-    }
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    byte[] b = new byte[1024];
-    int byteRead = is.read(b);
-    while (byteRead != -1)
-    {
-      baos.write(b, 0, byteRead);
-      byteRead = is.read(b);
-    }
-    is.close();
-    return baos.toByteArray();
-  }
-
-  protected URL createURL(String url) throws MalformedURLException
-  {
-    return new URL(url);
-  }
-
-  private void associate(WebServiceEntity parent, WebServiceEntity child)
-  {
-    parent.addChild(child);
-    child.setParent(parent);
-  }
-
-  private String convertToAbsoluteURI(String baseURI,String refURI)
-  {
-    if (refURI != null && refURI.indexOf(":") < 0)
-    {
-      StringBuffer absoluteURI = new StringBuffer(baseURI.substring(0,Math.max(baseURI.lastIndexOf('\\'),baseURI.lastIndexOf('/')+1)));
-      absoluteURI.append(refURI);
-      return absoluteURI.toString();
-    }
-    return refURI;
-  }
-
-  private void setHTTPSettings(WebServiceEntity entity)
-  {
-    if (httpBasicAuthUsername_ != null && httpBasicAuthPassword_ != null)
-    {
-      entity.setHTTPUsername(httpBasicAuthUsername_);
-      entity.setHTTPPassword(httpBasicAuthPassword_);
-    }
-  }
-
-  public String getHTTPBasicAuthUsername()
-  {
-    return httpBasicAuthUsername_;
-  }
-
-  public void setHTTPBasicAuthUsername(String username)
-  {
-    httpBasicAuthUsername_ = username;
-  }
-
-  public String getHTTPBasicAuthPassword()
-  {
-    return httpBasicAuthPassword_;
-  }
-
-  public void setHTTPBasicAuthPassword(String password)
-  {
-    httpBasicAuthPassword_ = password;
-  }
-}

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties
deleted file mode 100644
index 1e60c01..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2001,2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages for AddWSDLToWSILCommand
-#
-MSG_ERROR_INVALID_ARGUMENTS=IWAB0055E Invalid command arguments.
-MSG_ERROR_ILLEGAL_ARGUMENTS=IWAB0105E Illegal argument.
-MSG_ERROR_INVALID_WSDL_URI=IWAB0185E Invalid WSDL URI.
-MSG_ERROR_INVALID_WSIL_URI=IWAB0206E Invalid WSIL URI.
-MSG_ERROR_UNRESOLVABLE_WSDL=IWAB0405E WSDL is unresolvable.
-MSG_ERROR_UNEXPECTED_EXCEPTION=IWAB0451E An unexpected exception has occured.
-MSG_ERROR_MALFORMED_WSDL=IWAB0452E WSDL is malformed, error parsing WSDL.
-MSG_ERROR_WRITE_WSIL=IWAB0453E Error writing WSIL.

diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties
deleted file mode 100644
index ec8bde8..0000000
--- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2004,2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# PublicUDDIRegistryType
-#
-PUBLICUDDIREGISTRYTYPE_NAME_IBM=IBM UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST=IBM UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT=Microsoft UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST=Microsoft UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP=SAP UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST=SAP UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS=XMethods Registry
-PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM=NTT Communications Registry
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.ui/.classpath b/bundles/org.eclipse.wst.ws.ui/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/bundles/org.eclipse.wst.ws.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.wst.ws.ui/.cvsignore b/bundles/org.eclipse.wst.ws.ui/.cvsignore
deleted file mode 100644
index 1452f2e..0000000
--- a/bundles/org.eclipse.wst.ws.ui/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-temp.folder
-wsui.jar
-build.xml
-@dot

diff --git a/bundles/org.eclipse.wst.ws.ui/.project b/bundles/org.eclipse.wst.ws.ui/.project
deleted file mode 100644
index a1487d2..0000000
--- a/bundles/org.eclipse.wst.ws.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 50bb254..0000000
--- a/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.ws.internal.ui.wsrt,
- org.eclipse.wst.ws.internal.ui.plugin,
- org.eclipse.wst.ws.internal.ui.preferences,
- org.eclipse.wst.ws.internal.ui.wsi.preferences,
- org.eclipse.wst.ws.internal.ui.wsi.properties,
- org.eclipse.wst.ws.ui
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true

diff --git a/bundles/org.eclipse.wst.ws.ui/about.html b/bundles/org.eclipse.wst.ws.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.ws.ui/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.ui/build.properties b/bundles/org.eclipse.wst.ws.ui/build.properties
deleted file mode 100644
index ee7ecd5..0000000
--- a/bundles/org.eclipse.wst.ws.ui/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               .,\
-               plugin.properties,\
-               META-INF/,\
-               about.html

diff --git a/bundles/org.eclipse.wst.ws.ui/plugin.properties b/bundles/org.eclipse.wst.ws.ui/plugin.properties
deleted file mode 100644
index fcd4063..0000000
--- a/bundles/org.eclipse.wst.ws.ui/plugin.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services UI
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-PREFERENCE_CATEGORY_WSI=Profile Validation
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.ws.ui/plugin.xml b/bundles/org.eclipse.wst.ws.ui/plugin.xml
deleted file mode 100644
index a504604..0000000
--- a/bundles/org.eclipse.wst.ws.ui/plugin.xml
+++ /dev/null

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    	<extension
-         point="org.eclipse.ui.preferencePages">
-
-      <page
-            name="%PLUGIN_NEW_CATEGORY_NAME_WS"
-            class="org.eclipse.wst.ws.internal.ui.preferences.WebServicesPreferencePage"
-            id="org.eclipse.wst.ws.internal.ui.preferences.name">
-      </page>
-      
-      <page
-            name="%PREFERENCE_CATEGORY_WSI"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.wst.ws.internal.ui.wsi.preferences.WSICompliancePreferencePage"
-            id="org.eclipse.wst.ws.internal.ui.wsi.preferences.WSICompliancePreferencePage">
-      </page>
-
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.propertyPages">
-
-      <page
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true"
-            name="%PREFERENCE_CATEGORY_WSI"
-            class="org.eclipse.wst.ws.internal.ui.wsi.properties.WSICompliancePropertyPage"
-            id="org.eclipse.wst.ws.internal.ui.wsi.properties.WSICompliancePropertyPage">
-      </page>
-
-   </extension>
-</plugin>

diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java
deleted file mode 100644
index d5424e6..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java
+++ /dev/null

@@ -1,162 +0,0 @@
-package org.eclipse.wst.ws.internal.ui.plugin;
-
-/*******************************************************************************
-* Copyright (c) 2005 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-* 
-* Contributors:
-*     IBM Corporation - initial API and implementation
-*******************************************************************************/
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIAPContext;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSISSBPContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WSUIPlugin extends AbstractUIPlugin
-{
-	// Copyright
-	public static final String copyright =
-		"(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.wst.ws.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WSUIPlugin instance_;
-
- private PersistentWSISSBPContext wsiSSBPContext_;
- private PersistentWSIAPContext wsiAPContext_;
- 
- /**
-  * Constructs a runtime plugin object for this plugin.
-  */
- public WSUIPlugin() {
-	super();
-	instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WSUIPlugin)Platform.getPlugin("org.eclipse.wst.ws.ui");
- * @return The WSUIPlugin singleton.
- */
- static public WSUIPlugin getInstance() {
-   return instance_;
- }
-
-	/**
-	 * Get WSI Context
-	 * @deprecated use getWSISSBPContext or getWSIAPContext instead
-	 * 
-	 */ 
- public PersistentWSIContext getWSIContext() 
- 	{ // defaulting to get WSI Simple SOAP Binding Profile context
- 	  return getWSISSBPContext();
- 	}
- 
- /**
-	 * Get WSI Simple SOAP Binding Profile Context
-	 * 
-	 */ 
- public PersistentWSISSBPContext getWSISSBPContext() 
-	{
-	  if (wsiSSBPContext_ == null)
-	  	{
-	  		wsiSSBPContext_ = new PersistentWSISSBPContext();
-	  		wsiSSBPContext_.load();
-	  	}
-	  return wsiSSBPContext_;
-	}
- 
- /**
-	 * Get WSI Attachment Profile Context
-	 * 
-	 */ 
- public PersistentWSIAPContext getWSIAPContext() 
-	{
-	  if (wsiAPContext_ == null)
-	  	{
-	  		wsiAPContext_ = new PersistentWSIAPContext();
-	  		wsiAPContext_.load();
-	  	}
-	  return wsiAPContext_;
-	}
-
- /**
- * Returns the message string identified by the given key from
- * the plugin.properties file for the appropriate locale.
- * @param key The message key string prefixed by a "%" symbol.
- * That is, the string passed in must be of the form "%KEY"
- * where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @return The locale-specific message.
- */
-	public static String getMessage(String key) 
-	{
-	    MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.ui.plugin", instance_ );
-	    
-	    if( key.startsWith("%"))
-	    {
-	      key = key.substring( 1, key.length() );
-	    }
-	    
-	    return msgUtils.getMessage(key);
-   }
-
- /**
- * Returns the message string identified by the given key from
- * the plugin.properties file for the appropriate locale.
- * Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See java.text.MessageFormat for
- * further details on substitution.
- * @param key The message key string prefixed by a "%" symbol.
- * That is, the string passed in must be of the form "%KEY"
- * where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @param args The substitution values for the message
- * as required by the message in plugin.properties and
- * by the rules of class java.text.MessageFormat.
- * @return The locale-specific message.
- */
-	public static String getMessage(String key, Object[] args) {
-		return MessageFormat.format(getMessage(key), args);
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
-	public static ImageDescriptor getImageDescriptor(String name) {
-		try {
-			URL installURL = instance_.getBundle().getEntry("/");
-			URL imageURL = new URL(installURL, name);
-			return ImageDescriptor.createFromURL(imageURL);
-		} catch (MalformedURLException e) {
-     return null;
-   }
- }
-
-}

diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/preferences/WebServicesPreferencePage.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/preferences/WebServicesPreferencePage.java
deleted file mode 100644
index d8ee6b6..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/preferences/WebServicesPreferencePage.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * The WebServicesPreferencePage
- */
-public class WebServicesPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-/**
- * Creates and returns the SWT control for the customized body 
- * of this preference page under the given parent composite.
- * <p>
- * This framework method must be implemented by concrete
- * subclasses.
- * </p>
- *
- * @param parent the parent composite
- * @return the new control
- */
-protected Control createContents(org.eclipse.swt.widgets.Composite parent) {
-	return new Composite(parent, SWT.NULL);
-}
-/**
- * Do any initialization required by the desktop. By default do nothing.
- */
-public void init(IWorkbench desktop) {}
-}
-

diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/PersistentWSIAPContext.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/PersistentWSIAPContext.java
deleted file mode 100644
index 2bf04d9..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/PersistentWSIAPContext.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.ui.wsi.preferences;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-
-
-
-public class PersistentWSIAPContext extends PersistentWSIContext
-{
-	private static final String NON_WSI_AP_COMPLIANCE = "nonWSIAPCompliance";
-
-public PersistentWSIAPContext () 
-{
-	super();
-	non_wsi_compliance = NON_WSI_AP_COMPLIANCE;
-	name = new QualifiedName(WSUIPlugin.ID , non_wsi_compliance);
-	wsiWarning_ = "WSI_AP_WARNING";
-	wsiError_ = "WSI_AP_ERROR";
-}
-
-public String getPersistentWSICompliance ()
-{
-	String property = getValueAsString(non_wsi_compliance);
-	// default to Ignore if no init has been done from ini file
-	if (property == null || property.equals("")) {
-		setValue( non_wsi_compliance, IGNORE_NON_WSI);
-		return IGNORE_NON_WSI;
-	}
-	else
-		return property;
-}
-}

diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/PersistentWSIContext.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/PersistentWSIContext.java
deleted file mode 100644
index 463fa9b..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/PersistentWSIContext.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.ui.wsi.preferences;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-
-
-
-public class PersistentWSIContext extends PersistentContext
-{
-	public static final String STOP_NON_WSI = "0";
-	public static final String WARN_NON_WSI = "1";
-	public static final String IGNORE_NON_WSI = "2";
-	public static final String FOLLOW_WSI_PREFERENCE = "3";
-
-	protected QualifiedName name = null; // set in subclass
-	protected String non_wsi_compliance;
-	private static final String NON_WSI_SSBP_COMPLIANCE = "nonWSISSBPCompliance";
-	protected String wsiWarning_; // set in subclass
-	protected String wsiError_; // set in subclass
-
-public PersistentWSIContext () 
-{
-	super(  WSUIPlugin.getInstance());
-	
-//  NOTE:  name, wsiWarning_ and wsiError_ should be set in the subclasses.  This is providing defaulting only.
-	non_wsi_compliance = NON_WSI_SSBP_COMPLIANCE;
-	name = new QualifiedName(WSUIPlugin.ID , non_wsi_compliance);
-	wsiWarning_ = "WSI_SSBP_WARNING";
-	wsiError_ = "WSI_SSBP_ERROR";
-}
-
-public void load() 
-{
-	// let the default be read from plugin_costomization.ini file
-	// setDefault(non_wsi_compliance, WARN_NON_WSI);
-}
-
-// to be used only by the preference page
-public void updateWSICompliances ( String value)
-{
- 		setValue( non_wsi_compliance, value);
-}
-
-public String getPersistentWSICompliance ()
-{
-	String property = getValueAsString(non_wsi_compliance);
-//	 default to Ignore if no init has been done from ini file
-	if (property == null || property.equals("")) {
-		setValue( non_wsi_compliance, IGNORE_NON_WSI);
-		return IGNORE_NON_WSI;
-	}
-	else
-		return property;
-}
-
-public boolean StopNonWSICompliances()
-{
-	 return STOP_NON_WSI.equals(getPersistentWSICompliance());
-}
-
-public boolean WarnNonWSICompliances()
-{
-	 return WARN_NON_WSI.equals(getPersistentWSICompliance());
-}
-
-public boolean IgnoreNonWSICompliances()
-{
-	 return IGNORE_NON_WSI.equals(getPersistentWSICompliance());
-}
-
-// to be used only by the property page
-public void updateProjectWSICompliances ( IProject project, String value)
-{
-    try {
-		project.setPersistentProperty(name, value);
-    }
-    catch (CoreException e) { 
-    	System.out.println("No such Project");
-    	ILog log = EnvironmentService.getEclipseLog();
-    	log.log(ILog.INFO, 5084, this, "updateProjectWSICompliances", "No such Project "+project);
-    }
-}
-
-public boolean projectStopNonWSICompliances(IProject project)
-{
- 	return STOP_NON_WSI.equals(getProjectPersistentProperty(project));    
-}
-
-public boolean projectWarnNonWSICompliances(IProject project)
-{
- 	return WARN_NON_WSI.equals(getProjectPersistentProperty(project));    
-}
-
-public boolean projectIgnoreNonWSICompliances(IProject project)
-{
- 	return IGNORE_NON_WSI.equals(getProjectPersistentProperty(project));    
-}
-
-
-// to be used only by the property page
-public boolean projectFollowWSIPreferance(IProject project)
-{
-    try {
- 	String property = project.getPersistentProperty(name);
-    return (property == null || property.equals("") || property.equals(FOLLOW_WSI_PREFERENCE));
-    	}
-    catch (CoreException e)     {
-    	return true;
-     }     
-}
-
-private String getProjectPersistentProperty(IProject project)
-{
-	String property = getProjectWSICompliance(project);
-	if (property.equals(FOLLOW_WSI_PREFERENCE)) {
-		property = getPersistentWSICompliance();
-	}
-	return property;
- }
-
-public String getProjectWSICompliance(IProject project)
-{
-  try {
-     	String property = project.getPersistentProperty(name);
-     	if (property == null || property.equals(""))
-     	{
-     		property = FOLLOW_WSI_PREFERENCE;
-     	}
-     	return property;
-     }
-     catch (CoreException e)     {
-    	System.out.println("No such Project");
-    	return getPersistentWSICompliance();
-     }     
-}
-
-public String getWarning()
-{
-	return wsiWarning_;
-}
-
-public String getError()
-{
-	return wsiError_;
-}
-
-}

diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/PersistentWSISSBPContext.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/PersistentWSISSBPContext.java
deleted file mode 100644
index e0b432a..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/PersistentWSISSBPContext.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.ui.wsi.preferences;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-
-
-
-public class PersistentWSISSBPContext extends PersistentWSIContext
-{
-	private static final String NON_WSI_SSBP_COMPLIANCE = "nonWSISSBPCompliance";
-
-public PersistentWSISSBPContext () 
-{
-	super();
-	non_wsi_compliance = NON_WSI_SSBP_COMPLIANCE;
-	name = new QualifiedName(WSUIPlugin.ID , non_wsi_compliance);
-	wsiWarning_ = "WSI_SSBP_WARNING";
-	wsiError_ = "WSI_SSBP_ERROR";
-}
-
-}

diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java
deleted file mode 100644
index 1c953f7..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java
+++ /dev/null

@@ -1,379 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.ui.wsi.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSDLValidationContext;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-
-
-
-public class WSICompliancePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener, Listener
-
-{
-  private MessageUtils msgUtils_;
-	  
-  /*CONTEXT_ID PWSI0001 for the WS-I Preference Page*/
-  private String INFOPOP_PWSI_PAGE = WSUIPlugin.ID + ".PWSI0000";
-  //
-
-  private Label wsi_ssbp_Label_;
-  private Combo wsi_ssbp_Types_;
-  
-  /*CONTEXT_ID PWSI0004 for the WS-I SSBP type combo box on the WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_SSBP_COMBO_TYPE = WSUIPlugin.ID + ".PWSI0004";
-  /*CONTEXT_ID PWSI0008 for the WS-I AP type combo box on the WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_AP_COMBO_TYPE = WSUIPlugin.ID + ".PWSI0008";
-      
-  private Label wsi_ap_Label_;
-  private Combo wsi_ap_Types_;
-  
-  private int savedSSBPSetting_ = -1;
-  
-  private Group validationSelectionGroup_;
-  
-  private Label wsdlValidationLabel_;
-  private Button validateNoWsdlButton_;
-  private Button validateRemoteWsdlButton_;
-  private Button validateAllWsdlButton_;
-  private Label waitForWsdlValidationLabel_;
-  private Button waitForWSDLValidationCheckbox_;
-  
-
-  /*
-   * CONTEXT_ID PWRS0009 for the no wsdl validation radio button of the profile validation preference page
-   */
-  private String INFOPOP_PWSI_RADIO_WSDLVAL_NONE = WSUIPlugin.ID + ".PWSI0009";
-  /*
-   * CONTEXT_ID PWRS0010 for the wsdl validation on remote document radio button of the profile validation preference page
-   */
-  private String INFOPOP_PWSI_RADIO_WSDLVAL_REMOTE = WSUIPlugin.ID + ".PWSI00010";
-  /*
-   * CONTEXT_ID PWRS0011 for the wsdl validation on all document radio button of the profile validation preference page
-   */
-  private String INFOPOP_PWSI_RADIO_WSDLVAL_ALL = WSUIPlugin.ID + ".PWSI0011";
-  /*
-   * CONTEXT_ID PWRS0012 for the wsdl validation label of the profile validation preference page
-   */
-  private String INFOPOP_PWSI_WSDLVAL_LABEL = WSUIPlugin.ID + ".PWSI0012";
-  /*
-   * CONTEXT_ID PWRS0013 for the wait for wsdl validation checkbox of the profile validation preference page
-   */
-  private String INFOPOP_PWSI_BUTTON_WAIT_FOR_WSDLVAL = WSUIPlugin.ID + ".PWSI0013";
-
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-  	String       pluginId = "org.eclipse.wst.ws.ui";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-    
-    IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-	
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    parent.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_PAGE"));
-    helpSystem.setHelp(parent,INFOPOP_PWSI_PAGE);
-
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-
-    Composite wsi_Composite = new Composite (parent, SWT.NONE);
-    wsi_Composite.setLayout(gl);
-    wsi_Composite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    
-    wsi_ap_Label_ = new Label(wsi_Composite, SWT.NONE);
-    wsi_ap_Label_.setText(msgUtils_.getMessage("LABEL_WSI_AP"));
-    wsi_ap_Label_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_AP_LABEL"));
-    wsi_ap_Types_ = new Combo(wsi_Composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    wsi_ap_Types_.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    wsi_ap_Types_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_AP_COMBO"));
-    helpSystem.setHelp(wsi_ap_Types_,INFOPOP_PWSI_AP_COMBO_TYPE);
-    
-    wsi_ap_Types_.add(msgUtils_.getMessage("STOP_NON_WSI"));
-    wsi_ap_Types_.add(msgUtils_.getMessage("WARN_NON_WSI"));
-    wsi_ap_Types_.add(msgUtils_.getMessage("IGNORE_NON_WSI"));
-    
-    wsi_ap_Types_.addSelectionListener(this);
-    
-    wsi_ssbp_Label_ = new Label(wsi_Composite, SWT.NONE);
-    wsi_ssbp_Label_.setText(msgUtils_.getMessage("LABEL_WSI_SSBP"));
-    wsi_ssbp_Label_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_SSBP_LABEL"));
-    wsi_ssbp_Types_ = new Combo(wsi_Composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    wsi_ssbp_Types_.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    wsi_ssbp_Types_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_SSBP_COMBO"));
-    helpSystem.setHelp(wsi_ssbp_Types_,INFOPOP_PWSI_SSBP_COMBO_TYPE);
-    
-    wsi_ssbp_Types_.add(msgUtils_.getMessage("STOP_NON_WSI"));
-    wsi_ssbp_Types_.add(msgUtils_.getMessage("WARN_NON_WSI"));
-    wsi_ssbp_Types_.add(msgUtils_.getMessage("IGNORE_NON_WSI"));
-  
-    // WSDL validation preferences
-    validationSelectionGroup_ = new Group(wsi_Composite, SWT.NONE);
-    gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    validationSelectionGroup_.setLayout(gl);
-    GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-    validationSelectionGroup_.setLayoutData(gd);
-    
-    wsdlValidationLabel_ = new Label(validationSelectionGroup_, SWT.NONE);
-    wsdlValidationLabel_.setText(msgUtils_.getMessage("LABEL_WSDLVAL"));
-    wsdlValidationLabel_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_WSDLVAL_LABEL"));
-    helpSystem.setHelp(wsdlValidationLabel_, INFOPOP_PWSI_WSDLVAL_LABEL);
-    
-    validateNoWsdlButton_ = new Button(validationSelectionGroup_, SWT.RADIO);
-    validateNoWsdlButton_.setText(msgUtils_.getMessage("LABEL_WSDLVAL_NONE"));
-    validateNoWsdlButton_.addListener(SWT.Selection, this);
-    validateNoWsdlButton_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_RADIO_WSDLVAL_NONE"));
-    helpSystem.setHelp(validateNoWsdlButton_, INFOPOP_PWSI_RADIO_WSDLVAL_NONE);
-    
-    validateRemoteWsdlButton_ = new Button(validationSelectionGroup_, SWT.RADIO);
-    validateRemoteWsdlButton_.setText(msgUtils_.getMessage("LABEL_WSDLVAL_REMOTE"));
-    validateRemoteWsdlButton_.addListener(SWT.Selection, this);
-    validateRemoteWsdlButton_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_RADIO_WSDLVAL_REMOTE"));
-    helpSystem.setHelp(validateRemoteWsdlButton_, INFOPOP_PWSI_RADIO_WSDLVAL_REMOTE);
-    
-    validateAllWsdlButton_ = new Button(validationSelectionGroup_, SWT.RADIO);
-    validateAllWsdlButton_.setText(msgUtils_.getMessage("LABEL_WSDLVAL_ALL"));
-    validateAllWsdlButton_.addListener(SWT.Selection, this);
-    validateAllWsdlButton_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_RADIO_WSDLVAL_ALL"));
-    helpSystem.setHelp(validateAllWsdlButton_, INFOPOP_PWSI_RADIO_WSDLVAL_ALL);
-    
-    new Label(validationSelectionGroup_, SWT.NONE);;
-    
-    waitForWsdlValidationLabel_ = new Label(validationSelectionGroup_, SWT.NONE);
-    waitForWsdlValidationLabel_.setText(msgUtils_.getMessage("LABEL_WAIT_FOR_WSDLVAL"));
-    waitForWsdlValidationLabel_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_LABEL_WAIT_FOR_WSDLVAL"));
-    
-    waitForWSDLValidationCheckbox_ = new Button(validationSelectionGroup_, SWT.CHECK);
-    waitForWSDLValidationCheckbox_.setText(msgUtils_.getMessage("BUTTON_WAIT_FOR_WSDLVAL"));            
-    waitForWSDLValidationCheckbox_.addListener(SWT.Selection, this);
-    waitForWSDLValidationCheckbox_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_BUTTON_WAIT_FOR_WSDLVAL"));
-    helpSystem.setHelp(waitForWSDLValidationCheckbox_, INFOPOP_PWSI_BUTTON_WAIT_FOR_WSDLVAL);
-    
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-    return parent;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)   { }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults()
-  {
-    // force WSI compliance by default
-    
-    wsi_ssbp_Types_.select(wsi_ssbp_Types_.indexOf(msgUtils_.getMessage("IGNORE_NON_WSI")));
-    int apSelection = wsi_ap_Types_.indexOf(msgUtils_.getMessage("IGNORE_NON_WSI"));
-    wsi_ap_Types_.select(apSelection);
-    savedSSBPSetting_ = -1;  // do not restore saved SSBP setting
-    processAPSelection(apSelection);
-
-    PersistentWSDLValidationContext wsdlValidationContext = WSPlugin.getInstance().getWSDLValidationContext();
-    String validationSelection = wsdlValidationContext.getDefault();
-    wsdlValidationContext.updateWSDLValidation(validationSelection);
-    validateNoWsdlButton_.setSelection(false);
-    validateRemoteWsdlButton_.setSelection(false);
-    validateAllWsdlButton_.setSelection(false);
-    processWSDLValidationSelection(validationSelection);
-    
-    waitForWSDLValidationCheckbox_.setSelection(WSPlugin.getInstance().getWaitForWSDLValidationContext().getDefault());
-    WSPlugin.getInstance().getWaitForWSDLValidationContext().setWaitForWSDLValidation(WSPlugin.getInstance().getWaitForWSDLValidationContext().getDefault());
-    
-  }
-
-  /**
-   * Initializes states of the controls from the preference store.
-   */
-  private void initializeValues()
-  {
-    
-	String WSIText = getWSISelection(WSUIPlugin.getInstance().getWSISSBPContext());
-    wsi_ssbp_Types_.select(wsi_ssbp_Types_.indexOf(WSIText));
-    
-    int apSelection = wsi_ap_Types_.indexOf(getWSISelection(WSUIPlugin.getInstance().getWSIAPContext()));
-    wsi_ap_Types_.select(apSelection);
-    savedSSBPSetting_ = -1;  // do not restore saved SSBP setting
-    processAPSelection(apSelection);
-    
-    String validationSelection = WSPlugin.getInstance().getWSDLValidationContext().getPersistentWSDLValidation();
-    processWSDLValidationSelection(validationSelection);
-    
-    waitForWSDLValidationCheckbox_.setSelection(WSPlugin.getInstance().getWaitForWSDLValidationContext().getPersistentWaitForWSDLValidation());
-  }
-
-  private void processWSDLValidationSelection(String validationSelection) {
-
-		if (PersistentWSDLValidationContext.VALIDATE_NO_WSDL.equals(validationSelection)) {
-			validateNoWsdlButton_.setSelection(true);
-		} else if (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection)) {
-			validateRemoteWsdlButton_.setSelection(true);
-		} else if (PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) {
-			validateAllWsdlButton_.setSelection(true);
-		}
-
-	}
-
-private String getWSISelection(PersistentWSIContext context)
-  {
-    
-    String WSIvalue = context.getPersistentWSICompliance();
-    String WSIText = msgUtils_.getMessage("WARN_NON_WSI");
-    if (PersistentWSIContext.STOP_NON_WSI.equals(WSIvalue)) {
-		WSIText = msgUtils_.getMessage("STOP_NON_WSI");
-	} else if (PersistentWSIContext.IGNORE_NON_WSI.equals(WSIvalue)) {
-		WSIText = msgUtils_.getMessage("IGNORE_NON_WSI");
-	}
-	return WSIText;
-  }
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-  	updateWSIContext(wsi_ssbp_Types_.getSelectionIndex(), WSUIPlugin.getInstance().getWSISSBPContext());
-  	updateWSIContext(wsi_ap_Types_.getSelectionIndex(), WSUIPlugin.getInstance().getWSIAPContext());
-  }
-  
-  private void updateWSIContext(int selectionIndex, PersistentWSIContext context)
-  {
-    // get the persistent context from the plugin
-    
-    String value=null;
-    switch (selectionIndex) {
-    	case 0:
-    		value = PersistentWSIContext.STOP_NON_WSI;
-    		break;
-    	case 1:
-    		value = PersistentWSIContext.WARN_NON_WSI;
-    		break;
-    	case 2:
-    		value = PersistentWSIContext.IGNORE_NON_WSI;		
-    		break;
-    }
-    context.updateWSICompliances(value);
-  }
-  
-  public void widgetSelected(SelectionEvent e)
-  {
-  	
-  	processAPSelection( wsi_ap_Types_.getSelectionIndex() );
-  	
-  }
-  
-  public void processAPSelection(int selection) {
-  	if (selection == 2) { // reset SSBP to default if AP is ignore
-  		wsi_ssbp_Types_.setEnabled(true);
-  		if (savedSSBPSetting_ != -1)  {
-  			// restore saved SSBP setting, if any
-  			wsi_ssbp_Types_.select(savedSSBPSetting_);
-  			savedSSBPSetting_ = -1;
-  		}
-  	} else { // set SSBP to follow AP setting if STOP or WARN chosen
-  		if (savedSSBPSetting_ == -1)  {  // SSBP setting not saved
-  			savedSSBPSetting_ = wsi_ssbp_Types_.getSelectionIndex();
-  		}
-  		wsi_ssbp_Types_.select(selection);
-  		wsi_ssbp_Types_.setEnabled(false);
-  		
-  	}
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e) {
-	
-  }
-  
-  /**
-   * Called when an event occurs on the page. Handles the event and revalidates the page.
-   * 
-   * @param event
-   *          The event that occured.
-   */
-  public void handleEvent(Event event) {
-	  
-	  if (waitForWSDLValidationCheckbox_ == event.widget) {		   		  
-		  WSPlugin.getInstance().getWaitForWSDLValidationContext().setWaitForWSDLValidation(waitForWSDLValidationCheckbox_.getSelection());
-	  } else {
-		  String wsdlValdationSelection = null;
-		  if (validateNoWsdlButton_ == event.widget) {
-			  wsdlValdationSelection = PersistentWSDLValidationContext.VALIDATE_NO_WSDL;
-		  }
-		  else if (validateRemoteWsdlButton_ == event.widget) {
-			  wsdlValdationSelection = PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL;
-		  }
-		  else if (validateAllWsdlButton_ == event.widget) {
-			  wsdlValdationSelection = PersistentWSDLValidationContext.VALIDATE_ALL_WSDL;
-		  }
-		  WSPlugin.getInstance().getWSDLValidationContext().updateWSDLValidation(wsdlValdationSelection);
-	  }
-	  
-	  
-  }
-
-
-}

diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSIComplianceUtils.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSIComplianceUtils.java
deleted file mode 100644
index 5d2f2ed..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSIComplianceUtils.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.ui.wsi.preferences;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-
-
-public class WSIComplianceUtils
-{
-private static MessageUtils msgUtils_;
-
-/**
- * @deprecated use getWSISeverity (IProject project, PersistentWSIContext context) instead
- * @param project
- * @return int
- */
-public static int getWSISeverity (IProject project)
-{
-	return getWSISeverity (project, WSUIPlugin.getInstance().getWSISSBPContext());
-}
-/**
- * @param project
- * @param context
- * @return
- */
-public static int getWSISeverity (IProject project, PersistentWSIContext context)
-{
-	if (context.projectStopNonWSICompliances(project))
-		return Status.ERROR;
-	else if (context.projectWarnNonWSICompliances(project))
-		return Status.WARNING;
-	else
-		return Status.INFO;
-}
-
-/**
- * @deprecated use checkWSICompliance ( IStatusHandler monitor, Status[] status, IProject project, PersistentWSIContext context) instead
- * @param monitor IStatusHandler
- * @param status Status[]
- * @param project IProject
- * @return boolean true if to continue
- */
-public static boolean checkWSICompliance ( IStatusHandler monitor, Status[] status, IProject project)
-{	// check for SSBP by default
-	return checkWSICompliance ( monitor, status, project, WSUIPlugin.getInstance().getWSISSBPContext());
-}
-/**
- * @param monitor IStatusHandler
- * @param status Status[]
- * @param project IProject
- * @param context PersistentWSIContext
- * @return boolean true if to continue
- */
-public static boolean checkWSICompliance ( IStatusHandler monitor, Status[] status, IProject project, PersistentWSIContext context)
-{
-	String pluginId = "org.eclipse.wst.ws.ui";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", WSUIPlugin.getInstance()); 
-	
-  	if (context.projectStopNonWSICompliances(project))
-  		{
-      
-  			// emit an error message and return false
-  			IStatus status_ = StatusUtils.multiStatus( msgUtils_.getMessage(context.getError()), status );
-			  monitor.reportError(status_);
-  			return false;
-  		}
-  	else if (context.projectWarnNonWSICompliances(project))
-  		{
-  			// give a warning message with the options to stop, ignore this one, or ignore all coming messages
-  			IStatus status_ = StatusUtils.multiStatus( msgUtils_.getMessage(context.getWarning()), status);
-
-  			Choice ignoreChoice = new Choice('I', msgUtils_.getMessage("IGNORE_LABEL"), msgUtils_.getMessage("IGNORE_DESCRIPTION"));
-  			Choice ignoreAllChoice = new Choice('A', msgUtils_.getMessage("IGNORE_ALL_LABEL"), msgUtils_.getMessage("IGNORE_ALL_DESCRIPTION"));
-  			Choice cancelChoice = new Choice('C', msgUtils_.getMessage("CANCEL_LABEL"), msgUtils_.getMessage("CANCEL_DESCRIPTION"));
-  			Choice result = monitor.report(status_, new Choice[]{ignoreChoice, ignoreAllChoice, cancelChoice});
-  			
-  			// if the user closes the message box or selects ignore continue
-  			if (result == null || (result.getLabel().equals(ignoreChoice.getLabel())))
-        			return true;
-  			// if the user selects ignore all, change the preference
-	        else  if (result.getLabel().equals(ignoreAllChoice.getLabel()))
-	        	{
-	        		context.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI);
-	        		return true;
-	        	}
-			// if the user selects to cancel , do not continue with the command
-        	else if (result.getLabel().equals(cancelChoice.getLabel()))
-						return false;
-  		}
-  return true;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/properties/WSICompliancePropertyPage.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/properties/WSICompliancePropertyPage.java
deleted file mode 100644
index 04b266b..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/properties/WSICompliancePropertyPage.java
+++ /dev/null

@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.ui.wsi.properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-
-
-public class WSICompliancePropertyPage extends PropertyPage implements SelectionListener
-{
-   private MessageUtils msgUtils_;
-	  
-  /*CONTEXT_ID PWSI0001 for the WS-I Preference Page*/
-  private String INFOPOP_PWSI_PAGE = WSUIPlugin.ID + ".PWSI0000";
-  //
-
-  private Label wsi_ssbp_Label_;
-  private Combo wsi_ssbp_Types_;
-  
-  /*CONTEXT_ID PWSI0004 for the WS-I SSBP type combo box on the WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_SSBP_COMBO_TYPE = WSUIPlugin.ID + ".PWSI0004";
-  /*CONTEXT_ID PWSI0008 for the WS-I AP type combo box on the WS-I AP Non compliance Preference Page*/
-  private String INFOPOP_PWSI_AP_COMBO_TYPE = WSUIPlugin.ID + ".PWSI0008";
-
-  private Label wsi_ap_Label_;
-  private Combo wsi_ap_Types_;
-  private int savedSSBPSetting_ = -1;
-  
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-  	String       pluginId = "org.eclipse.wst.ws.ui";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	
-    IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-    
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    parent.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_PAGE"));
-    helpSystem.setHelp(parent, INFOPOP_PWSI_PAGE);
-
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-
-    Composite wsi_Composite = new Composite (parent, SWT.NONE);
-    wsi_Composite.setLayout(gl);
-    wsi_Composite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-        
-    wsi_ap_Label_ = new Label(wsi_Composite, SWT.NONE);
-    wsi_ap_Label_.setText(msgUtils_.getMessage("LABEL_WSI_AP"));
-    wsi_ap_Label_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_AP_LABEL"));
-    wsi_ap_Types_ = new Combo(wsi_Composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    wsi_ap_Types_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_AP_COMBO"));
-    wsi_ap_Types_.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    helpSystem.setHelp(wsi_ap_Types_,INFOPOP_PWSI_AP_COMBO_TYPE);
-    
-    wsi_ap_Types_.add(msgUtils_.getMessage("STOP_NON_WSI"));
-    wsi_ap_Types_.add(msgUtils_.getMessage("WARN_NON_WSI"));
-    wsi_ap_Types_.add(msgUtils_.getMessage("IGNORE_NON_WSI"));
-    wsi_ap_Types_.add(msgUtils_.getMessage("FOLLOW_WSI_PREFERENCE"));
-
-    wsi_ap_Types_.addSelectionListener(this);
-    
-    wsi_ssbp_Label_ = new Label(wsi_Composite, SWT.NONE);
-    wsi_ssbp_Label_.setText(msgUtils_.getMessage("LABEL_WSI_SSBP"));
-    wsi_ssbp_Label_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_SSBP_LABEL"));
-    wsi_ssbp_Types_ = new Combo(wsi_Composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    wsi_ssbp_Types_.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWSI_SSBP_COMBO"));
-    wsi_ssbp_Types_.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    helpSystem.setHelp(wsi_ssbp_Types_,INFOPOP_PWSI_SSBP_COMBO_TYPE);
-    
-    wsi_ssbp_Types_.add(msgUtils_.getMessage("STOP_NON_WSI"));
-    wsi_ssbp_Types_.add(msgUtils_.getMessage("WARN_NON_WSI"));
-    wsi_ssbp_Types_.add(msgUtils_.getMessage("IGNORE_NON_WSI"));
-    wsi_ssbp_Types_.add(msgUtils_.getMessage("FOLLOW_WSI_PREFERENCE"));
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-    return parent;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults()
-  {
-    wsi_ssbp_Types_.select(wsi_ssbp_Types_.indexOf(msgUtils_.getMessage("FOLLOW_WSI_PREFERENCE")));
-    int apSelection = wsi_ap_Types_.indexOf(msgUtils_.getMessage("FOLLOW_WSI_PREFERENCE"));
-    wsi_ap_Types_.select(apSelection);
-    savedSSBPSetting_ = -1;  // do not restore saved SSBP setting
-    processAPSelection(apSelection);
-  }
-
-  /**
-   * Initializes states of the controls from the preference store.
-   */
-  private void initializeValues() {
-  	String WSIText = getWSISelection(WSUIPlugin.getInstance().getWSISSBPContext());
-    wsi_ssbp_Types_.select(wsi_ssbp_Types_.indexOf(WSIText));
-    
-    int apSelection = wsi_ap_Types_.indexOf(getWSISelection(WSUIPlugin.getInstance().getWSIAPContext()));
-    wsi_ap_Types_.select(apSelection);
-    savedSSBPSetting_ = -1;  // do not restore saved SSBP setting
-    processAPSelection(apSelection);
-	}
-
-  private String getWSISelection(PersistentWSIContext context)
-  {
-    
-  	IProject project = (IProject) getElement();
-  	String WSIvalue = context.getProjectWSICompliance(project);
-	String WSIText = msgUtils_.getMessage("FOLLOW_WSI_PREFERENCE");
-	if (PersistentWSIContext.STOP_NON_WSI.equals(WSIvalue)) {
-		WSIText = msgUtils_.getMessage("STOP_NON_WSI");
-	} else if (PersistentWSIContext.WARN_NON_WSI.equals(WSIvalue)) {
-		WSIText = msgUtils_.getMessage("WARN_NON_WSI");
-	} else if (PersistentWSIContext.IGNORE_NON_WSI.equals(WSIvalue)) {
-		WSIText = msgUtils_.getMessage("IGNORE_NON_WSI");
-	}
-	return WSIText;
-  }
-  
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-  	updateWSIContext(wsi_ssbp_Types_.getSelectionIndex(), WSUIPlugin.getInstance().getWSISSBPContext());
-  	updateWSIContext(wsi_ap_Types_.getSelectionIndex(), WSUIPlugin.getInstance().getWSIAPContext());
-  }
-  
-  private void updateWSIContext(int selectionIndex, PersistentWSIContext context)
-  {    
-  	String value = PersistentWSIContext.FOLLOW_WSI_PREFERENCE;
-    IProject project = (IProject) getElement();
-    
-    switch (selectionIndex) {
-    	case 0:
-    		value = PersistentWSIContext.STOP_NON_WSI;
-    		break;
-    	case 1:
-    		value = PersistentWSIContext.WARN_NON_WSI;
-    		break;
-    	case 2:
-    		value = PersistentWSIContext.IGNORE_NON_WSI;		
-    		break;
-    	case 3:
-    		value = PersistentWSIContext.FOLLOW_WSI_PREFERENCE;		
-    		break;
-    }
-    context.updateProjectWSICompliances(project, value);
-  }
-  
-  public void widgetSelected(SelectionEvent e)
-  {
-  	
-  	processAPSelection( wsi_ap_Types_.getSelectionIndex() );
-  	
-  }
-  
-  public void processAPSelection(int selection) {
-  	if (selection == 2) { // reset SSBP to default if AP is ignore
-  		wsi_ssbp_Types_.setEnabled(true);
-  		if (savedSSBPSetting_ != -1)  {
-  			// restore saved SSBP setting, if any
-  			wsi_ssbp_Types_.select(savedSSBPSetting_);
-  			savedSSBPSetting_ = -1;
-  		}
-  	} else { // set SSBP to follow AP setting if STOP or WARN chosen
-  		if (savedSSBPSetting_ == -1)  {  // SSBP setting not saved
-  			savedSSBPSetting_ = wsi_ssbp_Types_.getSelectionIndex();
-  		}
-  		wsi_ssbp_Types_.select(selection);
-  		wsi_ssbp_Types_.setEnabled(false);
-  		
-  	}
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e) {
-	
-  }
-}
-

diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsrt/IObjectSelector.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsrt/IObjectSelector.java
deleted file mode 100644
index 459e68b..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsrt/IObjectSelector.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.ui.wsrt;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-
-public interface IObjectSelector {
-	
-	public void setInitialSelection(ISelection sel);
-	public ISelection getSelection();
-	public String getProject();
-	public IStatus validateSelection(ISelection sel);
-	public WidgetDataEvents addControls(Composite parent, Listener statusListener);
-
-}

diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/ui/plugin.properties b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/ui/plugin.properties
deleted file mode 100644
index 1c5341e..0000000
--- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/ui/plugin.properties
+++ /dev/null

@@ -1,87 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services UI
-PLUGIN_VENDOR=Eclipse.org
-PLUGIN_DESC=\
-The Web services GUI plugin delivers the graphical \
-user interface to the Web services function in the WST subproject.
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-
-#
-#  WS-I Preference pages
-#
-# WS-I Compliance Page
-#
-PREFERENCE_CATEGORY_WSI=WS-I Compliance
-STOP_NON_WSI=Require compliance
-WARN_NON_WSI=Suggest compliance
-IGNORE_NON_WSI=Ignore compliance
-FOLLOW_WSI_PREFERENCE=Follow Preference
-
-TOOLTIP_PWSI_PAGE=Web Services Interoperability
-TOOLTIP_PWSI_RADIO_STOP_NON_WSI=Stop and produce an error message if you make a choice that does not comply with WS-I.
-TOOLTIP_PWSI_RADIO_WARNING_NON_WSI=Produce a warning message if you make a choice that does not comply with WS-I.
-TOOLTIP_PWSI_RADIO_IGNORE_NON_WSI=Silently allow choices that do not comply with WS-I.
-TOOLTIP_PWSI_RADIO_FOLLOW_WSI_PREFERENCE=Project would use WS-I compliance level set in Workspace Preference.
-
-LABEL_WSI_SSBP=WS-I SSBP compliance level
-TOOLTIP_PWSI_SSBP_LABEL=WS-I Simple SOAP Binding Profile compliance level
-TOOLTIP_PWSI_SSBP_COMBO=Choose the WS-I Simple SOAP Binding Profile compliance level
-
-LABEL_WSI_AP=WS-I AP compliance level
-TOOLTIP_PWSI_AP_LABEL=WS-I Attachment Profile compliance level
-TOOLTIP_PWSI_AP_COMBO=Choose the WS-I Attachment Profile compliance level
-
-
-#
-#	WS-I Compliance Messages
-#
-WSI_SSBP_ERROR=You have made a choice that may result in a Web service that does not comply with the WS-I Simple SOAP Binding Profile. Your current Web services preference is set to require compliance with WS-I SSBP.
-WSI_SSBP_WARNING=You have made a choice that may result in a Web service that does not comply with the WS-I Simple SOAP Binding Profile. Do you wish to ignore this warning and continue?
-WSI_SSBP_INCOMPLIANT_RUNTIME=The selected Web Service runtime does not comply with the WS-I Simple SOAP Binding Profile.
-WSI_AP_ERROR=You have made a choice that may result in a Web service that does not comply with the WS-I Attachment Profile. Your current Web services preference is set to require compliance with WS-I AP.
-WSI_AP_WARNING=You have made a choice that may result in a Web service that does not comply with the WS-I Attachment Profile. Do you wish to ignore this warning and continue?
-WSI_AP_INCOMPLIANT_RUNTIME=The selected Web Service runtime does not comply with the WS-I Attachment Profile.
-IGNORE_LABEL=Ignore
-IGNORE_DESCRIPTION=Ignore the WS-I non-compliance and continue
-IGNORE_ALL_LABEL=Ignore All
-IGNORE_ALL_DESCRIPTION=Always ignore the WS-I non-compliance and continue
-CANCEL_LABEL=Cancel
-TASK_LABEL_WSI_NONCOMPLIANT=Check for WSI Compliance
-TASK_DESC_WSI_NONCOMPLIANT=Check for WSI Compliance
-CANCEL_DESCRIPTION=Cancel
-NOT_OK=Cannot continue due to WS-I non-compliance
-
-#
-#	WSDL Validation
-#
-LABEL_WSDLVAL=Select whether WSDL validation should be performed on wizards that consume WSDL files  
-LABEL_WSDLVAL_NONE=No WSDL validation
-LABEL_WSDLVAL_REMOTE=WSDL validation for remote files only
-LABEL_WSDLVAL_ALL=WSDL validation for all files
-LABEL_WAIT_FOR_WSDLVAL=Wait for WSDL validation to complete before moving along the wizards?
-BUTTON_WAIT_FOR_WSDLVAL=Wait for pending WSDL validation to complete 
-TOOLTIP_PWSI_RADIO_WSDLVAL_NONE=Do not perform WSDL validation on the WSDL file or URL input to the Web Services wizard
-TOOLTIP_PWSI_RADIO_WSDLVAL_REMOTE=Only perform WSDL validation on remote WSDL file or URL input to the Web Services wizard
-TOOLTIP_PWSI_RADIO_WSDLVAL_ALL=Perform WSDL validation on all WSDL file or URL input to the Web Services wizard
-TOOLTIP_PWSI_WSDLVAL_LABEL=Select whether WSDL validation should be performed on wizards that consume WSDL files, \nfor example, Web Service wizard in skeleton scenario and Web Service Client wizard.
-TOOLTIP_PWSI_LABEL_WAIT_FOR_WSDLVAL=WSDL validation might not have completed during wizard flow, \nwould you like to wait for WSDL validation or cancel it?
-TOOLTIP_PWSI_BUTTON_WAIT_FOR_WSDLVAL=Wait for pending WSDL validation to complete and continue with the wizard
-
-
-
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/.classpath b/bundles/org.eclipse.wst.wsdl.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.wst.wsdl.ui/.cvsignore b/bundles/org.eclipse.wst.wsdl.ui/.cvsignore
deleted file mode 100644
index 506fe66..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/.cvsignore
+++ /dev/null

@@ -1,6 +0,0 @@
-bin
-build.xml
-wsdleditor.jar
-temp.folder
-org.eclipse.wst.wsdl.ui_1.0.0.jar
-@dot

diff --git a/bundles/org.eclipse.wst.wsdl.ui/.project b/bundles/org.eclipse.wst.wsdl.ui/.project
deleted file mode 100644
index c5a4ddc..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsdl.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index ab1f31b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,72 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_UI_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.wsdl.ui; singleton:=true
-Bundle-Version: 0.7.1
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.wsdl.ui.internal,
- org.eclipse.wst.wsdl.ui.internal.actions,
- org.eclipse.wst.wsdl.ui.internal.commands,
- org.eclipse.wst.wsdl.ui.internal.contentgenerator,
- org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui,
- org.eclipse.wst.wsdl.ui.internal.dialogs,
- org.eclipse.wst.wsdl.ui.internal.dialogs.types,
- org.eclipse.wst.wsdl.ui.internal.extension,
- org.eclipse.wst.wsdl.ui.internal.filter,
- org.eclipse.wst.wsdl.ui.internal.gef.util.editparts,
- org.eclipse.wst.wsdl.ui.internal.gef.util.editpolicies,
- org.eclipse.wst.wsdl.ui.internal.gef.util.figures,
- org.eclipse.wst.wsdl.ui.internal.graph,
- org.eclipse.wst.wsdl.ui.internal.graph.editparts,
- org.eclipse.wst.wsdl.ui.internal.graph.editpolicies,
- org.eclipse.wst.wsdl.ui.internal.graph.figures,
- org.eclipse.wst.wsdl.ui.internal.graph.model,
- org.eclipse.wst.wsdl.ui.internal.icons,
- org.eclipse.wst.wsdl.ui.internal.model,
- org.eclipse.wst.wsdl.ui.internal.nsedit,
- org.eclipse.wst.wsdl.ui.internal.outline,
- org.eclipse.wst.wsdl.ui.internal.properties.section,
- org.eclipse.wst.wsdl.ui.internal.reconciler,
- org.eclipse.wst.wsdl.ui.internal.text,
- org.eclipse.wst.wsdl.ui.internal.typesystem,
- org.eclipse.wst.wsdl.ui.internal.util,
- org.eclipse.wst.wsdl.ui.internal.util.flatui,
- org.eclipse.wst.wsdl.ui.internal.util.ui,
- org.eclipse.wst.wsdl.ui.internal.viewers,
- org.eclipse.wst.wsdl.ui.internal.viewers.widgets,
- org.eclipse.wst.wsdl.ui.internal.visitor,
- org.eclipse.wst.wsdl.ui.internal.widgets,
- org.eclipse.wst.wsdl.ui.internal.wizards,
- org.eclipse.wst.wsdl.ui.internal.xsd,
- org.eclipse.wst.wsdl.ui.internal.xsd.actions,
- org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.gef,
- org.eclipse.jface,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.common.ui,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.xsd,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.common.ui.properties,
- org.eclipse.wst.xsd.ui,
- org.eclipse.emf.edit,
- org.eclipse.emf.edit.ui,
- org.eclipse.wst.validation,
- org.wsdl4j
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin

diff --git a/bundles/org.eclipse.wst.wsdl.ui/about.html b/bundles/org.eclipse.wst.wsdl.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/build.properties b/bundles/org.eclipse.wst.wsdl.ui/build.properties
deleted file mode 100644
index d2d6d72..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               .,\
-               META-INF/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/bundles/org.eclipse.wst.wsdl.ui/icons/reloadgrammar.gif b/bundles/org.eclipse.wst.wsdl.ui/icons/reloadgrammar.gif
deleted file mode 100644
index 9d4c9ca..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/icons/reloadgrammar.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/icons/validate.gif b/bundles/org.eclipse.wst.wsdl.ui/icons/validate.gif
deleted file mode 100644
index 2b347ac..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/icons/validate.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/icons/wsdl_file_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/icons/wsdl_file_obj.gif
deleted file mode 100644
index 75b1f92..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/icons/wsdl_file_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/plugin.properties b/bundles/org.eclipse.wst.wsdl.ui/plugin.properties
deleted file mode 100644
index dbc5acd..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/plugin.properties
+++ /dev/null

@@ -1,322 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-!
-! Plugin
-!
-_UI_PLUGIN_NAME             = WSDL Editor
-_UI_EDITOR_NAME             = WSDL Editor
-_UI_WSDL_LABEL              = WSDL Files
-
-
-_UI_HIDE_BINDINGS           = Hide Bindings
-_UI_BACK_TO                 = Back to {0}
-_UI_BACK_TO_DEFINITION      = Back to Definition
-_UI_BACK                    = Back to Previous View
-
-! New property tabs
-_UI_LABEL_GENERAL       = General
-_UI_LABEL_OTHER         = Other
-_UI_LABEL_ATTRIBUTES    = Attributes
-_UI_LABEL_DOCUMENTATION = Documentation
-_UI_LABEL_FACETS        = Facets
-_UI_LABEL_ENUMERATIONS  = Enumerations
-_UI_LABEL_NAMESPACE     = Namespace
-
-! Section title for other attributes
-_UI_SECTION_ADVANCED_ATTRIBUTES   = Advanced
-
-!
-! Workbook Pages
-!
-_UI_TAB_SOURCE = Source
-_UI_TAB_GRAPH  = Graph
-
-_UI_ADD_EXTENSIBILITY_ELEMENT    = Add Extensibility Element
-_UI_CREATE_WSDL_DOCUMENTATION    = Create WSDL Documentation
-_UI_FOLDER_NOT_CREATED           = Folder not created
-_UI_CREATING_DOCUMENTATION       = Creating Documentation
-_UI_LABEL_CREATE_FOLDER_FOR_DOCS = Create a new folder for the html documentation files
-_UI_LABEL_CREATING_HTML_FILES    = Creating HTML files
-_UI_LABEL_NEW_FOLDER             = New folder
-
-_UI_ACTION_ADD             = Add
-_UI_ACTION_COPY            = Copy
-_UI_ACTION_PASTE           = Paste
-_UI_ACTION_DELETE          = Delete
-_UI_ACTION_MULTIPLE_DELETE = Multiple Delete
-_UI_ACTION_RENAME          = Rename
-
-_UI_LABEL_BINDING_WIZARD = Binding Wizard
-_UI_ACTION_GENERATE_HTML_DOCUMENTATION = Generate HTML Documentation for this WSDL document
-_UI_ACTION_VALIDATE_WSDL_DOCUMENT = Validate WSDL Document
-
-_UI_ACTION_ADD_CHILD        = Add Child
-_UI_ACTION_SET_BINDING      = Set Binding
-_UI_ACTION_SET_PORTTYPE     = Set PortType
-_UI_ACTION_SET_MESSAGE      = Set Message
-_UI_ACTION_SET_ELEMENT      = Set Element
-_UI_ACTION_SET_TYPE         = Set Type
-_UI_LABEL_BINDING_OPERATION = Binding Operation
-_UI_ACTION_NEW_MESSAGE      = New Message...
-_UI_ACTION_NEW_SERVICE      = New Service
-_UI_ACTION_NEW_PORTTYPE     = New PortType...
-_UI_ACTION_NEW_BINDING      = New Binding...
-_UI_ACTION_NEW_PORT         = New Port
-_UI_ACTION_NEW_OPERATION    = New Operation
-_UI_ACTION_NEW_FAULT        = New Fault
-_UI_ACTION_NEW_PART         = New Part
-_UI_ACTION_NEW_ELEMENT      = New Element...
-_UI_ACTION_NEW_COMPLEX_TYPE = New Complex Type...
-_UI_ACTION_NEW_SIMPLE_TYPE  = New Simple Type...
-
-_UI_LABEL_NEW_BINDING      = New Binding
-_UI_LABEL_NEW_PORTTYPE     = New PortType
-_UI_LABEL_NEW_MESSAGE      = New Message
-_UI_LABEL_NEW_ELEMENT      = New Element
-_UI_LABEL_NEW_COMPLEX_TYPE = New Complex Type
-_UI_LABEL_NEW_SIMPLE_TYPE  = New Simple Type
-
-_UI_ACTION_EXISTING_BINDING  = Existing Binding...
-_UI_ACTION_EXISTING_PORTTYPE = Existing PortType...
-_UI_ACTION_EXISTING_MESSAGE  = Existing Message...
-_UI_ACTION_EXISTING_ELEMENT  = Existing Element...
-_UI_ACTION_EXISTING_TYPE     = Existing Type...
-
-_UI_ACTION_ADD_IMPORT            = Add Import
-_UI_ACTION_ADD_SCHEMA            = Add Schema
-_UI_ACTION_ADD_SERVICE           = Add Service
-_UI_ACTION_ADD_BINDING           = Add Binding
-_UI_ACTION_ADD_OPERATION         = Add Operation
-_UI_ACTION_ADD_BINDING_OPERATION = Add Binding Operation
-_UI_ACTION_ADD_PART              = Add Part
-_UI_ACTION_ADD_PORT              = Add Port
-_UI_ACTION_ADD_PORTTYPE          = Add PortType
-_UI_ACTION_ADD_MESSAGE           = Add Message
-_UI_ACTION_ADD_INPUT             = Add Input
-_UI_ACTION_ADD_OUTPUT            = Add Output
-_UI_ACTION_ADD_FAULT             = Add Fault
-
-_UI_LABEL_DEFINITION = Definition
-_UI_LABEL_BINDING    = Binding
-_UI_LABEL_INPUT      = Input
-_UI_LABEL_OUTPUT     = Output
-_UI_LABEL_FAULT      = Fault
-_UI_LABEL_MESSAGE    = Message
-_UI_LABEL_PORT       = Port
-_UI_LABEL_PORTTYPE   = PortType
-_UI_LABEL_SERVICE    = Service
-_UI_LABEL_ELEMENTS   = Elements
-_UI_LABEL_TYPES      = Types
-_UI_LABEL_NAME       = Name
-_UI_LABEL_OPERATION  = Operation
-_UI_LABEL_ELEMENT    = Element
-_UI_LABEL_TYPE       = Type
-
-_UI_LABEL_BINDING_NAME    = Binding Name:
-_UI_LABEL_PORTTYPE_NAME   = PortType Name:
-_UI_LABEL_MESSAGE_NAME    = Message Name:
-_UI_LABEL_TYPE_NAME       = Type Name:
-_UI_LABEL_ELEMENT_NAME    = Element Name:
-
-_UI_LABEL_MATCHING_BINDINGS  = Matching Bindings:
-_UI_LABEL_MATCHING_PORTTYPES = Matching PortTypes:
-_UI_LABEL_MATCHING_MESSAGES  = Matching Messages:
-_UI_LABEL_MATCHING_TYPES     = Matching Types:
-_UI_LABEL_MATCHING_ELEMENTS  = Matching Elements:
-
-_UI_LABEL_NEW_COMPONENT  = New Component
-
-_UI_LABEL_READ_ONLY     = read-only
-
-! Note to translators: keep the one character space and colon after the translation of View
-_UI_MENU_VIEW         = View :
-_UI_LABEL_XSD_COMPONENTS = XSD Components
-
-_UI_LABEL_UNKNOWN_OBJECT = Unknown Object
-_UI_LABEL_UNKNOWN_NODE   = Unknown Node
-_UI_LABEL_VIEW_NOT_AVAILABLE = View not available for selected object
-
-_UI_LABEL_PORT_W_COLON     = Port : 
-_UI_LABEL_PORTTYPE_W_COLON = PortType : 
-_UI_LABEL_SERVICE_W_COLON  = Service : 
-_UI_LABEL_UNKNOWN  = Unknown : 
-_UI_LABEL_VIEW_BY_SERVICE = View By : Service
-
-_UI_FOLDER_IMPORTS = Imports
-_UI_FOLDER_MESSAGES= Messages
-_UI_FOLDER_SERVICES = Services
-_UI_FOLDER_BINDINGS = Bindings
-_UI_FOLDER_PORTTYPES = Port Types
-_UI_FOLDER_TYPES     = Types
-_UI_FOLDER_EXTENSIBILITY_ELEMENTS = Extensiblity Elements
-_UI_FOLDER_DEFINITION = Definition
-
-_UI_LABEL_NONE = (none)
-_UI_MENUBAR_GENERATE_BINDING = Generate Binding
-
-_UI_LABEL_HTTP_BINDING_OPTIONS = HTTP Binding Options
-
-_UI_SOME_ELEMENT_NAME = some-element-name
-
-_UI_LABEL_BINDING_INPUT   = Binding Input
-_UI_LABEL_BINDING_OUTPUT  = Binding Output
-_UI_LABEL_BINDING_FAULT   = Binding Fault
-
-_UI_LABEL_BINDING_OPERATION = Binding Operation
-
-_UI_LABEL_UNKNOWN_EXTENSIBILITY_ELEMENT = Unknown Extensibility Element
-
-_UI_LABEL_IMPORT = Import
-_UI_LABEL_NAMESPACE = Namespace
-_UI_LABEL_PREFIX = Prefix
-_UI_LABEL_LOCATION = Location
-_UI_TITLE_SELECT = Select
-_UI_TITLE_SELECT_FILE = Select File
-_UI_DESCRIPTION_SELECT_WSDL_OR_XSD = Select a WSDL or XSD file to import.
-
-_UI_LABEL_PARAMETER_ORDER = Parameter Order
-_UI_LABEL_PART = Part
-_UI_LABEL_REFERENCE_KIND = Reference kind:
-_UI_LABEL_OVERVIEW = Overview
-_UI_LABEL_VIEW_NOT_IMPLEMENTED = This view is not yet implemented.
-_UI_LABEL_BINDING_VIEW = Binding View
-_UI_LABEL_DOCUMENTION = Documentation
-_UI_LABEL_PROPERTY = Property
-_UI_LABEL_VALUE = Value
-
-_UI_BUTTON_NEW    = New...
-_UI_BUTTON_IMPORT = Import...
-
-_UI_BUTTON_CREATE_ASSOCIATED_BINDINGS = Create associated bindings
-_UI_TITLE_GENERATE_BINDING_WIZARD = Generate Binding Wizard
-
-_UI_LABEL_NAMESPACE_URIS_TO_BE_INCLUDED = Namespace URIs to be included
-_UI_ACTION_ADD = Add
-
-_UI_TITLE_SELECT_WSDL_FILE = Select WSDL File
-_UI_DESCRIPTION_SELECT_WSDL_FILE_TO_IMPORT = Select a WSDL file to import
-
-_UI_TITLE_SPECIFY_BINDING = Specify Binding
-_UI_TITLE_SPECIFY_TYPE = Specify Type
-_UI_TITLE_SPECIFY_ELEMENT = Specify Element
-_UI_TITLE_SPECIFY_MESSAGE = Specify Message
-_UI_TITLE_SPECIFY_PORTTYPE = Specify Port Type
-
-_UI_TITLE_SPECIFY_BINDING_DETAILS = Specify Binding Details
-_UI_LABEL_SPECIFY_BINDING_DETAILS_DESC = Specify the details of the binding you wish to generate.
-
-! Translators: Leave the {0} as is
-_UI_RADIO_SELECT_EXISTING  = Select an existing {0}
-_UI_RADIO_CREATE_NEW       = Create a new {0}
-_UI_RADIO_IMPORT_FROM_FILE = Import {0} from a file
-_UI_LABEL_NAME_OF_ITEM     = Name of {0}:
-
-! Translators: Leave the {0} as is
-_UI_DESCRIPTION_CHOOSE_FROM_EXISTING = Choose {0} from the list
-_UI_DESCRIPTION_PROVIDE_NAME = Provide a name of the {0} to create
-_UI_DESCRIPTION_IMPORT_FILE = Select a file and then choose the {0}
-_UI_HELP = Help
-_UI_LABEL_FILE = File:
-_UI_BUTTON_BROWSE = Browse...
-
-_UI_TITLE_NEW_WSDL_FILE = New WSDL File
-_UI_TITLE_OPTIONS       = Options
-
-_UI_DESCRIPTION_SPECIFY_BINDING_PAGE = Description of Specify Binding Page
-_UI_RADIO_GENERATE_CONTENT = Generate content for an existing binding
-_UI_RADIO_GENERATE_NEW_BINDING = Generate a new binding
-_UI_LABEL_BINDING_NAME = Name:
-_UI_LABEL_BINDING_PROTOCOL = Protocol:
-_UI_CHECKBOX_OVERWRITE = Overwrite existing binding information
-_UI_LABEL_SOAP_BINDING_OPTIONS = SOAP Binding Options
-_UI_RADIO_DOCUMENT_LITERAL = document literal
-_UI_RADIO_RPC_LITERAL = rpc literal
-_UI_RADIO_RPC_ENCODED = rpc encoded
-
-_UI_DESCRIPTION_NEW_WSDL_FILE = Specify the attributes for the new WSDL file.
-_UI_LABEL_TARGET_NAMESPACE = Target namespace:
-_UI_LABEL_PREFIX_WITH_COLON = Prefix:
-_UI_LABEL_DEFINITION_NAME   = Definition name:
-_UI_LABEL_CREATE_NEW_WSDL_FILE = Create a new WSDL File
-_UI_LABEL_CREATE_WSDL_SKELETON = Create WSDL Skeleton
-_UI_LABEL_NEW_CATEGORY_NAME_WS = Web Services
-
-! Translators: Leave the {0} as is
-_UI_ERROR_NAMESPACE_INVALID = The target namespace is invalid
-_UI_ERROR_PREFIX_IS_INVALID = Prefix {0} is invalid
-_UI_ERROR_PREFIX_IS_A_DUPLICATE = Prefix {0} is a duplicate
-_UI_ERROR_MORE_THAN_ONE_PREFIX_IS_BLANK = More than one prefix is blank
-_UI_ERROR_FILE_MUST_END_WITH_WSDL = Error: File must end with wsdl
-_UI_ERROR_FILE_ALREADY_EXISTS = File already exists: {0}
-
-_UI_ERROR_INVALID_WSDL = Invalid WSDL
-_UI_ERROR_INVALID_WSDL_DESC = The WSDL File is invalid.  Fix errors and then retry this action.
-_UI_ERROR_ERROR             = Error
-_UI_ERROR_FOLDER_NOT_CREATED  = Folder not created.
-_UI_ERROR_CREATING_HTML_FILES = Error creating HTML files.
-
-_UI_ERROR_IMPORT_ERROR      = Import Error
-_UI_ERROR_IMPORTING_ITSELF  = This file is attempting to import itself.  Change the location of the import.
-
-
-_UI_USE_WS-I_STYLE_SCHEMA_IMPORT       = Use WS-I style schema import
-_UI_BINDING_WIZARD                     = Binding Wizard
-_UI_SPECIFY_BINDING_DETAILS_LABEL      = Specify the details of the binding that will be created
-_UI_PORT_TYPE                          = Port Type
-_UI_PORT_WIZARD                        = Port Wizard
-_UI_SPECIFY_PORT_DETAILS               = Specify Port Details
-_UI_SPECIFY_PORT_DETAILS_TO_BE_CREATED = Specify the details of the port that will be created
-_UI_BINDING                            = Binding
-_UI_NAMESPACES                         = Namespaces
-_UI_EDIT_NAMESPACES                    = Edit Namespaces...
-_UI_SELECT_REGISTERED_NAMESPACES       = Select From Registered Namespaces
-_UI_SPECIFY_NEW_NAMESPACE              = Specify New Namespace
-_UI_SELECT_NAMESPACE_TO_ADD            = Select the namespace declarations to add.
-_UI_ENTER_REQ_PREFIX_AND_NAMESPACE     = Enter the required prefix and namespace URI for the namespace declaration.
-_UI_TARGET_NAMESPACE                   = Target Namespace
-_UI_NAMESPACE_DECLARATIONS             = Namespace Declarations
-_UI_ADD                                = Add...
-_UI_ADD_NAMESPACE_DECLARATIONS_TITLE   = Add Namespace Declarations
-_UI_SOAP_PORT_DETAILS                  = SOAP Port Details
-_UI_LOCATION                           = Location:
-_UI_HTTP_PORT_DETAILS                  = HTTP Port Details
-_UI_EDIT_NAMESPACES_DIALOG_TITLE       = Edit Namespaces
-_UI_DEPENDENCIES_CHANGED               = Dependencies Changed
-_UI_DEPENDENCIES_CHANGED_REFRESH       = One or more dependencies have changed.  Do you want to refresh the editor to reflect these changes?
-_UI_RELOAD_DEPENDENCIES                = Reload Dependencies
-_UI_UNSPECIFIED                        = (unspecified)
-_UI_NO_IMPORT_SPECIFIED                = (no import location specified)
-_UI_GENERATE_BINDING_CONTENT           = Generate Binding Content...
-_UI_OPEN_IMPORT                        = Open Import
-
-_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE = Default Target Namespace:
-_UI_PREF_PAGE_AUTO_REGENERATE_BINDING  = Regenerate Binding on save
-_UI_PREF_PAGE_CREATING_FILES		   = Creating files
-
-_UI_CREATE_MESSAGE_CHECKBOX_LABEL       = Create default messages
-_UI_DELETE_ASSOCIATED_MSG_AND_PARTS     = Delete associated Messages and Parts
-_UI_DELETE_OPERATION_TITLE              = Delete Operation
-_UI_LABEL_WARNING_DUPLICATE_NAME_EXISTS = Warning: duplicate name already exists
-
-_WARN_NAME_HAS_SPACE         = IWAX1402W Name field cannot contain a space
-_WARN_NAME_INVALID_FIRST      = IWAX1403W First character in name field must be one of the following ('_', ':', 'letter')
-_WARN_NAME_MUST_CONTAIN_AT_LEAST_ONE_CHAR = IWAX1415W Name field must contain at least one character
-_WARN_NAME_INVALID_CHAR       = IWAX1404W Name field contains invalid character ('
-_UI_NAME_INVALID_CHAR_END   = ')
-
-! Copied from sse
-23concat_EXC_=Resource {0} does not exist.
-32concat_EXC_=Editor could not be open on {0}
-An_error_has_occurred_when1_ERROR_=An error has occurred when initializing the input for the the editor's source page.
-! ----------------------------------------------------------------
-! Translators : please don't translate any string below this line 
-! ----------------------------------------------------------------
-! _DEBUG_UPDATE_POLICY = 0Dummy.label=

diff --git a/bundles/org.eclipse.wst.wsdl.ui/plugin.xml b/bundles/org.eclipse.wst.wsdl.ui/plugin.xml
deleted file mode 100644
index 19c0963..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/plugin.xml
+++ /dev/null

@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.ui.editors">
-		<editor
-			name="%_UI_EDITOR_NAME"
-			default="true"
-			icon="icons/wsdl_file_obj.gif"
-			class="org.eclipse.wst.wsdl.ui.internal.WSDLEditor"
-			contributorClass="org.eclipse.wst.wsdl.ui.internal.actions.WSDLActionBarContributor"
-			id="org.eclipse.wst.wsdl.ui.internal.WSDLEditor">
-			<contentTypeBinding
-				contentTypeId="org.eclipse.wst.wsdl.wsdlsource" />
-		</editor>
-	</extension>
-
-	<extension-point
-		id="internalEditorExtensions"
-		name="Internal Editor Extensions" />
-	<extension-point
-		id="extensibilityItemTreeProviders"
-		name="Extensibility Item Tree Providers" />
-	<extension-point
-		id="propertySourceProvider"
-		name="Property Source Providers" />
-
-	<!-- This extension point is used to suplement WSDL 1.1 schemas in order to   -->
-	<!-- constrain the extensiblity elements that are allowed at the 'wsdl' level -->
-	<extension-point
-		id="extensibilityElementFilter"
-		name="Extensiblity Element Filter" />
-
-	<extension-point
-		id="propertyDescriptorProvider"
-		name="Property Descriptor Provider" />
-
-	<extension-point
-		id="detailsViewerProviders"
-		name="Details Viewer Providers" />
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders">
-		<extensibilityItemTreeProvider
-			id="org.eclipse.wst.wsdl.ui.internal.extensibilityItemTreeProviders.http"
-			namespace="http://schemas.xmlsoap.org/wsdl/http/"
-			labelProviderClass="org.eclipse.wst.wsdl.ui.internal.outline.HTTPLabelProvider">
-		</extensibilityItemTreeProvider>
-	</extension>
-
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders">
-		<extensibilityItemTreeProvider
-			id="org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders.soap"
-			namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-			labelProviderClass="org.eclipse.wst.wsdl.ui.internal.outline.SOAPLabelProvider">
-		</extensibilityItemTreeProvider>
-	</extension>
-
-
-
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
-		<extensibilityElementFilter
-			namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-			class="org.eclipse.wst.wsdl.ui.internal.filter.SoapExtensiblityElementFilter">
-		</extensibilityElementFilter>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
-		<extensibilityElementFilter
-			namespace="http://schemas.xmlsoap.org/wsdl/http/"
-			class="org.eclipse.wst.wsdl.ui.internal.filter.HttpExtensiblityElementFilter">
-		</extensibilityElementFilter>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
-		<extensibilityElementFilter
-			namespace="http://schemas.xmlsoap.org/wsdl/mime/"
-			class="org.eclipse.wst.wsdl.ui.internal.filter.MimeExtensiblityElementFilter">
-		</extensibilityElementFilter>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityElementFilter">
-		<extensibilityElementFilter
-			namespace="http://www.w3.org/2001/XMLSchema"
-			class="org.eclipse.wst.wsdl.ui.internal.filter.XSDExtensiblityElementFilter">
-		</extensibilityElementFilter>
-	</extension>
-
-	<extension point="org.eclipse.ui.newWizards">
-		<category
-			id="org.eclipse.jst.ws.ui.new"
-			name="%_UI_LABEL_NEW_CATEGORY_NAME_WS" />
-		<wizard
-			id="org.eclipse.wst.wsdl.ui"
-			name="WSDL"
-			class="org.eclipse.wst.wsdl.ui.internal.wizards.NewWSDLWizard"
-			category="org.eclipse.jst.ws.ui.new"
-			icon="icons/wsdl_file_obj.gif">
-			<description>%_UI_LABEL_CREATE_NEW_WSDL_FILE</description>
-			<selection class="org.eclipse.core.resources.IResource" />
-		</wizard>
-
-		<wizard
-			id="org.eclipse.wst.wsdl.ui"
-			name="WSDL"
-			class="org.eclipse.wst.wsdl.ui.internal.wizards.NewWSDLWizard"
-			category="org.eclipse.wst.XMLCategory"
-			icon="icons/wsdl_file_obj.gif">
-			<description>%_UI_LABEL_CREATE_NEW_WSDL_FILE</description>
-			<selection class="org.eclipse.core.resources.IResource" />
-		</wizard>
-	</extension>
-
-
-	<extension point="org.eclipse.ui.editorActions">
-		<editorContribution
-			id="org.eclipse.ui.articles.action.contribution.editor2"
-			targetID="org.eclipse.wst.wsdl.ui.internal.WSDLEditor">
-
-			<menu
-				id="WSDLEditor"
-				label="%_UI_EDITOR_NAME"
-				path="additions">
-				<separator name="group1" />
-			</menu>
-
-			<action
-				id="org.eclipse.wst.wsdl.ui.actions.ReloadDependenciesActionDelegate"
-				label="%_UI_RELOAD_DEPENDENCIES"
-				icon="icons/reloadgrammar.gif"
-				tooltip="Reload Dependencies"
-				menubarPath="WSDLEditor/group1"
-				class="org.eclipse.wst.wsdl.ui.internal.actions.ReloadDependenciesActionDelegate">
-			</action>
-
-			<!--
-				<action
-				id="org.eclipse.wst.wsdl.ui.internal.actions.ValidateActionDelegate" 
-				label="%_UI_ACTION_VALIDATE_WSDL_DOCUMENT" 
-				icon="icons/validate.gif" 
-				tooltip="%_UI_ACTION_VALIDATE_WSDL_DOCUMENT"
-				menubarPath="WSDLEditor/group1"
-				toolbarPath="%Normal/WSDLEditor"
-				class="org.eclipse.wst.wsdl.ui.internal.actions.ValidateActionDelegate"> 
-				</action>      
-			-->
-
-		</editorContribution>
-        <editorContribution
-            targetID="org.eclipse.wst.wsdl.wsdlsource.source"
-            id="org.eclipse.wst.wsdl.wsdlsource.ruler.actions">
-         <action
-               label="%Dummy.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               actionID="RulerDoubleClick"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction"/>
-         <action
-               label="%Dummy.label"
-               class="org.eclipse.ui.texteditor.SelectRulerAction"
-               actionID="RulerClick"
-               id="org.eclipse.ui.texteditor.SelectRulerAction"/>
-        </editorContribution>
-	</extension>
-
-	<extension point="org.eclipse.ui.preferencePages">
-		<!-- place everything in "Web and XML" -->
-		<page
-			name="%_UI_WSDL_LABEL"
-			category="org.eclipse.wst.sse.ui.internal.provisional.preferences"
-			class="org.eclipse.wst.wsdl.ui.internal.util.WSDLPreferencePage"
-			id="org.eclipse.wst.wsdl.ui.internal.util.WSDLPreferencePage" />
-	</extension>
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-		<!-- add preference pages to the context menu action (ID must correspond to the declared "path" above) -->
-		<provisionalDefinition
-			type="preferencepages"
-			value="org.eclipse.wst.wsdl.ui.internal.util.WSDLPreferencePage"
-			target="org.eclipse.wst.wsdl.ui.internal.WSDLEditor.source" />
-		<sourceViewerConfiguration
-			class="org.eclipse.wst.wsdl.ui.internal.StructuredTextViewerConfigurationWSDL"
-			target="org.eclipse.wst.wsdl.wsdlsource" />
-		<contentOutlineConfiguration
-			class="org.eclipse.wst.wsdl.ui.internal.outline.WSDLContentOutlineConfiguration"
-			target="org.eclipse.wst.wsdl.wsdlsource" />
-		<!--
-			<propertySheetConfiguration
-			class="org.eclipse.wst.wsdl.ui.internal.properties.WSDLPropertySheetConfiguration"
-			target="org.eclipse.wst.wsdl.ui.internal.WSDLTextEditor">
-			</propertySheetConfiguration>
-		-->
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.common.ui.properties.propertyContributor">
-		<propertyContributor
-			typeMapper="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLTypeMapper"
-			contributorId="org.eclipse.wst.wsdl.ui.internal.WSDLEditor"
-			sectionDescriptorProvider="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLSectionDescriptorProvider"
-			labelProvider="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLLabelProvider">
-			<propertyCategory category="general"></propertyCategory>
-			<propertyCategory category="namespace"></propertyCategory>
-			<propertyCategory category="other"></propertyCategory>
-			<propertyCategory category="attributes"></propertyCategory>
-			<propertyCategory category="enumerations">
-			</propertyCategory>
-			<propertyCategory category="documentation">
-			</propertyCategory>
-			<propertyCategory category="facets"></propertyCategory>
-		</propertyContributor>
-	</extension>
-	<extension
-		point="org.eclipse.wst.common.ui.properties.propertyTabs">
-		<propertyTabs
-			contributorId="org.eclipse.wst.wsdl.ui.internal.WSDLEditor">
-			<propertyTab
-				label="%_UI_LABEL_GENERAL"
-				category="general"
-				id="org.eclipse.wst.xmlwebservices.general">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_NAMESPACE"
-				category="namespace"
-				afterTab="org.eclipse.wst.xmlwebservices.general"
-				id="org.eclipse.wst.xmlwebservices.namespace">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_OTHER"
-				category="other"
-				id="org.eclipse.wst.xmlwebservices.other">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_ATTRIBUTES"
-				category="attributes"
-				id="org.eclipse.wst.xmlwebservices.attributes">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_ENUMERATIONS"
-				category="enumerations"
-				id="org.eclipse.wst.xmlwebservices.enumerations">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_DOCUMENTATION"
-				category="documentation"
-				id="org.eclipse.wst.xmlwebservices.documentation">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_SECTION_ADVANCED_ATTRIBUTES"
-				category="facets"
-				id="org.eclipse.wst.xmlwebservices.facets">
-			</propertyTab>
-		</propertyTabs>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.internalEditorExtensions">
-		<internalEditorExtension
-			class="org.eclipse.wst.wsdl.ui.internal.xsd.XSDExtension" />
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders">
-		<extensibilityItemTreeProvider
-			id="org.eclipse.wst.wsdl.ui.extensibilityItemTreeProviders.xsd"
-			namespace="http://www.w3.org/2001/XMLSchema"
-			labelProviderClass="org.eclipse.wst.wsdl.ui.internal.xsd.XSDLabelProvider">
-		</extensibilityItemTreeProvider>
-	</extension>
-
-	<!-- intialize wsdl source validator -->
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator
-			scope="total"
-			class="org.eclipse.wst.wsdl.ui.internal.reconciler.DelegatingSourceValidatorForWSDL"
-			id="org.eclipse.wst.wsdl.ui.internal.reconciler.DelegatingSourceValidatorForWSDL">
-			<contentTypeIdentifier
-				id="org.eclipse.wst.wsdl.wsdlsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT">
-				</partitionType>
-			</contentTypeIdentifier>
-		</validator>
-	</extension>
-
-	<!-- this extension point is used to augment the ModelQuery to provide WSDL specific guided editing -->
-	<extension point="org.eclipse.wst.xml.core.modelQueryExtensions">
-		<modelQueryExtension
-			class="org.eclipse.wst.wsdl.ui.internal.text.WSDLModelQueryExtension"
-			contentType="org.eclipse.wst.wsdl.wsdlsource">
-		</modelQueryExtension>
-	</extension>
-</plugin>

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/Logger.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/Logger.java
deleted file mode 100644
index c554e60..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/Logger.java
+++ /dev/null

@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.wsdl.ui"; //$NON-NLS-1$
-	
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + INFO;
-
-	public static final int OK = IStatus.OK; // 0
-
-	public static final int OK_DEBUG = 200 + OK;
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + WARNING;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java
deleted file mode 100644
index 744bd43..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-
-public class StructuredTextViewerConfigurationWSDL extends StructuredTextViewerConfigurationXML {
-	public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
-		if (sourceViewer == null || !fPreferenceStore.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED))
-			return null;
-
-		List allDetectors = new ArrayList(0);
-		// add WSDL Hyperlink detector
-		allDetectors.add(new WSDLHyperlinkDetector());
-
-		IHyperlinkDetector[] superDetectors = super.getHyperlinkDetectors(sourceViewer);
-		for (int m = 0; m < superDetectors.length; m++) {
-			IHyperlinkDetector detector = superDetectors[m];
-			if (!allDetectors.contains(detector)) {
-				allDetectors.add(detector);
-			}
-		}
-		return (IHyperlinkDetector[]) allDetectors.toArray(new IHyperlinkDetector[0]);
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java
deleted file mode 100644
index ff58c8f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java
+++ /dev/null

@@ -1,749 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.INavigationLocation;
-import org.eclipse.ui.INavigationLocationProvider;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.TextSelectionNavigationLocation;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.contentoutline.ConfigurableContentOutlinePage;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.GenerateBindingOnSaveDialog;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLGraphViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLEditPartFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.outline.ModelAdapterContentProvider;
-import org.eclipse.wst.wsdl.ui.internal.outline.ModelAdapterLabelProvider;
-import org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLTabbedPropertySheetPage;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLNodeAssociationProvider;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLResourceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.WSDLDetailsViewer;
-import org.eclipse.wst.wsdl.ui.internal.viewers.WSDLDetailsViewerProvider;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-// public class WSDLEditor extends StructuredTextMultiPageEditorPart
-// implements
-// INavigationLocationProvider
-public class WSDLEditor extends WSDLMultiPageEditorPart implements INavigationLocationProvider, ITabbedPropertySheetPageContributor {
-	protected StructuredTextEditor textEditor;
-	protected WSDLGraphViewer graphViewer;
-	protected WSDLDetailsViewer detailsViewer;
-	protected WSDLSelectionManager selectionManager;
-	protected SashForm sashForm;
-	int graphPageIndex;
-	protected WSDLModelAdapter modelAdapter;
-	protected WSDLEditorResourceChangeHandler resourceChangeHandler;
-	// Used for Cut, Copy, Paste actions. This acts as a copy, cut, paste
-	// clipboard
-	protected WSDLElement clipboardElement;
-	private IPropertySheetPage fPropertySheetPage;
-	private SourceEditorSelectionListener fSourceEditorSelectionListener;
-	private WSDLSelectionManagerSelectionListener fWSDLSelectionListener;
-
-	/**
-	 * Listener on SSE's outline page's selections that converts DOM
-	 * selections into wsdl selections and notifies WSDL selection manager
-	 */
-	class OutlineTreeSelectionChangeListener implements ISelectionChangedListener, IDoubleClickListener {
-		private ISelectionProvider fProvider = null;
-
-		public OutlineTreeSelectionChangeListener(IContentOutlinePage provider) {
-			fProvider = provider;
-			fProvider.addSelectionChangedListener(OutlineTreeSelectionChangeListener.this);
-			if (provider instanceof ConfigurableContentOutlinePage) {
-				((ConfigurableContentOutlinePage) provider).addDoubleClickListener(OutlineTreeSelectionChangeListener.this);
-			}
-		}
-
-		private ISelection getWSDLSelection(ISelection selection) {
-			ISelection sel = null;
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-				Object o = structuredSelection.getFirstElement();
-
-				// TODO ...
-				// we need to implement a selectionManagerMapping
-				// extension point
-				// so that extensions can specify how they'd like to map
-				// view objects
-				// to selection objects
-				//                                        
-				// if (o instanceof Element)
-				// {
-				// try
-				// {
-				// Object modelObject =
-				// WSDLEditorUtil.getInstance().findModelObjectForElement(wsdlEditor.getDefinition(),
-				// (Element)o);
-				// if (modelObject != null && !(modelObject instanceof
-				// UnknownExtensibilityElement))
-				// {
-				// o = modelObject;
-				// }
-				// }
-				// catch (Exception e)
-				// {
-				// }
-				// }
-				if (o != null)
-					sel = new StructuredSelection(o);
-			}
-			return sel;
-		}
-
-		public void doubleClick(DoubleClickEvent event) {
-			/*
-			 * Selection in outline tree changed so set outline tree's
-			 * selection into editor's selection and say it came from outline
-			 * tree
-			 */
-			if (getSelectionManager() != null && getSelectionManager().enableNotify) {
-				ISelection selection = getWSDLSelection(event.getSelection());
-				if (selection != null) {
-					getSelectionManager().setSelection(selection, fProvider);
-				}
-
-				if(getTextEditor() != null && selection instanceof IStructuredSelection) {
-					int start = -1;
-					int length = 0;
-					Object o = ((IStructuredSelection)selection).getFirstElement();
-					if (o != null)
-						o = WSDLEditorUtil.getInstance().getNodeForObject(o);
-					if (o instanceof IndexedRegion) {
-						start = ((IndexedRegion) o).getStartOffset();
-						length = ((IndexedRegion) o).getEndOffset() - start;
-					}
-					if(start > -1) {
-						getTextEditor().selectAndReveal(start, length);
-					}
-				}
-			}
-		}
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			/*
-			 * Selection in outline tree changed so set outline tree's
-			 * selection into editor's selection and say it came from outline
-			 * tree
-			 */
-			if (getSelectionManager() != null && getSelectionManager().enableNotify) {
-				ISelection selection = getWSDLSelection(event.getSelection());
-				if (selection != null) {
-					getSelectionManager().setSelection(selection, fProvider);
-				}
-			}
-		}
-	}
-	private OutlineTreeSelectionChangeListener fOutlineTreeListener = null;
-
-	/**
-	 * Listener on SSE's source editor's selections that converts DOM
-	 * selections into wsdl selections and notifies WSDL selection manager
-	 */
-	private class SourceEditorSelectionListener implements ISelectionChangedListener {
-		/**
-		 * Determines WSDL node based on object (DOM node)
-		 * 
-		 * @param object
-		 * @return
-		 */
-		private Object getWSDLNode(Object object) {
-			// get the element node
-			Element element = null;
-			if (object instanceof Node) {
-				Node node = (Node) object;
-				if (node != null) {
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						element = (Element) node;
-					}
-					else if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-						element = ((Attr) node).getOwnerElement();
-					}
-				}
-			}
-			Object o = element;
-			if (element != null) {
-				Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(getDefinition(), element);
-				if (modelObject != null) {
-					o = modelObject;
-				}
-			}
-			return o;
-		}
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			ISelection selection = event.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				List wsdlSelections = new ArrayList();
-				for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();) {
-					Object domNode = i.next();
-					Object wsdlNode = getWSDLNode(domNode);
-					if (wsdlNode != null) {
-						wsdlSelections.add(wsdlNode);
-					}
-				}
-
-				if (!wsdlSelections.isEmpty()) {
-					StructuredSelection wsdlSelection = new StructuredSelection(wsdlSelections);
-					getSelectionManager().setSelection(wsdlSelection, getTextEditor().getSelectionProvider());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Listener on WSDL's selection manager's selections that converts WSDL
-	 * selections into DOM selections and notifies SSE's selection provider
-	 */
-	private class WSDLSelectionManagerSelectionListener implements ISelectionChangedListener {
-		/**
-		 * Determines DOM node based on object (wsdl node)
-		 * 
-		 * @param object
-		 * @return
-		 */
-		private Object getObjectForOtherModel(Object object) {
-			Node node = null;
-
-			if (object instanceof Node) {
-				node = (Node) object;
-			}
-			else {
-				node = WSDLEditorUtil.getInstance().getNodeForObject(object);
-			}
-
-			// the text editor can only accept sed nodes!
-			//
-			if (!(node instanceof IDOMNode)) {
-				node = null;
-			}
-			return node;
-		}
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			// do not fire selection in source editor if selection event came
-			// from source editor
-			if (event.getSource() != getTextEditor().getSelectionProvider()) {
-				ISelection selection = event.getSelection();
-				if (selection instanceof IStructuredSelection) {
-					List otherModelObjectList = new ArrayList();
-					for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();) {
-						Object modelObject = i.next();
-						Object otherModelObject = getObjectForOtherModel(modelObject);
-						if (otherModelObject != null) {
-							otherModelObjectList.add(otherModelObject);
-						}
-					}
-					if (!otherModelObjectList.isEmpty()) {
-						StructuredSelection nodeSelection = new StructuredSelection(otherModelObjectList);
-						getTextEditor().getSelectionProvider().setSelection(nodeSelection);
-					}
-				}
-			}
-		}
-	}
-
-	public WSDLEditor() {
-		selectionManager = new WSDLSelectionManager();
-	}
-
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		super.init(site, input);
-		try {
-			IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-			IWorkbenchPage page = window.getActivePage();
-			if (page != null) {
-				page.showView("org.eclipse.ui.views.PropertySheet");
-			}
-		}
-		catch (PartInitException partInitException) {
-		}
-		catch (Exception exception) {
-		}
-	}
-
-	public Object getAdapter(Class key) {
-		Object result = null;
-		if (key == ISelectionProvider.class) {
-			result = selectionManager;
-		}
-		else if (IPropertySheetPage.class.equals(key)) {
-			if (fPropertySheetPage == null || fPropertySheetPage.getControl() == null || fPropertySheetPage.getControl().isDisposed()) {
-				fPropertySheetPage = new WSDLTabbedPropertySheetPage(this, this);
-				((WSDLTabbedPropertySheetPage) fPropertySheetPage).setSelectionManager(getSelectionManager());
-
-			}
-			return fPropertySheetPage;
-		}
-		else if (IContentOutlinePage.class.equals(key)) {
-			IContentOutlinePage page = (IContentOutlinePage) super.getAdapter(key);
-			if(page != null) {
-				fOutlineTreeListener = new OutlineTreeSelectionChangeListener(page);
-			}
-			result = page;
-		}
-		else {
-			result = super.getAdapter(key);
-		}
-		return result;
-	}
-
-	public void dispose() {
-		// call the extensibleOutlineProvider's inputChanged method a null
-		// viewer
-		// so that the outline's contentprovider/adapters don't attempt to
-		// update
-		// the viewer
-		// after the editor closes
-		// extensibleOutlineProvider.inputChanged(null, null, null);
-		if (resourceChangeHandler != null) {
-			resourceChangeHandler.dispose();
-		}
-
-		ISelectionProvider provider = getTextEditor().getSelectionProvider();
-		if (provider instanceof IPostSelectionProvider) {
-			((IPostSelectionProvider) provider).removePostSelectionChangedListener(fSourceEditorSelectionListener);
-		}
-		else {
-			provider.removeSelectionChangedListener(fSourceEditorSelectionListener);
-		}
-		getSelectionManager().removeSelectionChangedListener(fWSDLSelectionListener);
-		super.dispose();
-	}
-
-	public WSDLSelectionManager getSelectionManager() {
-		return selectionManager;
-	}
-
-	public WSDLGraphViewer getGraphViewer() {
-		return graphViewer;
-	}
-
-	public IStructuredModel getStructuredModel() {
-		return textEditor.getModel();
-		// IDocument doc =
-		// textEditor.getDocumentProvider().getDocument(getEditorInput());
-		// IModelManager modelManager = ModelManagerImpl.getInstance();
-		// return modelManager.getModelForRead((IStructuredDocument) doc);
-	}
-
-	public Document getXMLDocument() {
-		return ((IDOMModel) getStructuredModel()).getDocument();
-	}
-
-	public Definition getDefinition() {
-		return modelAdapter != null ? modelAdapter.getDefinition() : null;
-	}
-
-	/**
-	 * Creates the pages of this multi-page editor.
-	 * <p>
-	 * Subclasses of <code>MultiPageEditor</code> must implement this
-	 * method.
-	 * </p>
-	 */
-	protected void createPages() {
-		try {
-			if (resourceChangeHandler == null) {
-				resourceChangeHandler = new WSDLEditorResourceChangeHandler(this);
-				resourceChangeHandler.attach();
-			}
-			createSourcePage();
-			addSourcePage();
-			// create the wsdl model
-			//
-			lookupOrCreateWSDLModel();
-			createAndAddGraphPage();
-
-			// get the type of page and set the active page to show
-			int pageIndexToShow = getDefaultPageIndex();
-			setActivePage(pageIndexToShow);
-			getSelectionManager().setSelection(new StructuredSelection(getDefinition()));
-
-			// added selection listeners after setting selection to avoid
-			// navigation exception
-			ISelectionProvider provider = getTextEditor().getSelectionProvider();
-			fSourceEditorSelectionListener = new SourceEditorSelectionListener();
-			if (provider instanceof IPostSelectionProvider) {
-				((IPostSelectionProvider) provider).addPostSelectionChangedListener(fSourceEditorSelectionListener);
-			}
-			else {
-				provider.addSelectionChangedListener(fSourceEditorSelectionListener);
-			}
-			fWSDLSelectionListener = new WSDLSelectionManagerSelectionListener();
-			getSelectionManager().addSelectionChangedListener(fWSDLSelectionListener);
-		}
-		catch (PartInitException e) {
-			// log for now, unless we find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-		// TODO: add a catch block here for any exception the design page
-		// throws and
-		// convert it into a more informative message.
-	}
-
-	protected void lookupOrCreateWSDLModel() {
-		try {
-			Document document = ((IDOMModel) getModel()).getDocument();
-			if (document instanceof INodeNotifier) {
-				INodeNotifier notifier = (INodeNotifier) document;
-				modelAdapter = (WSDLModelAdapter) notifier.getAdapterFor(WSDLModelAdapter.class);
-				if (modelAdapter == null) {
-					modelAdapter = new WSDLModelAdapter();
-					notifier.addAdapter(modelAdapter);
-					modelAdapter.createDefinition(document.getDocumentElement());
-				}
-			}
-		}
-		catch (Exception e) {
-		}
-	}
-
-	protected int getDefaultPageIndex() {
-		if (WSDLEditorPlugin.getInstance().getDefaultPage().equals(WSDLEditorPlugin.GRAPH_PAGE)) {
-			if (graphPageIndex != -1) {
-				return graphPageIndex;
-			}
-		}
-		return sourcePageIndex;
-	}
-
-	/**
-	 * @see org.eclipse.wst.wsdl.ui.WSDLMultiPageEditorPart#createTextEditor()
-	 */
-	protected StructuredTextEditor createTextEditor() {
-		textEditor = new StructuredTextEditor();
-		return textEditor;
-	}
-
-	/**
-	 * create our own
-	 */
-	protected void createSourcePage() throws PartInitException {
-		super.createSourcePage();
-		textEditor = getTextEditor();
-	}
-
-	int sourcePageIndex = -1;
-
-	/**
-	 * Adds the source page of the multi-page editor.
-	 */
-	protected void addSourcePage() throws PartInitException {
-		sourcePageIndex = addPage(textEditor, getEditorInput());
-		setPageText(sourcePageIndex, WSDLEditorPlugin.getWSDLString("_UI_TAB_SOURCE"));
-		// the update's critical, to get viewer selection manager and
-		// highlighting to
-		// work
-		textEditor.update();
-	}
-
-	int[] weights;
-
-	public void setDesignWeights(int[] weights, boolean updateSourceDesign) {
-		this.weights = weights;
-		if (updateSourceDesign) {
-			sashForm.setWeights(weights);
-		}
-	}
-
-	protected void pageChange(int arg) {
-		super.pageChange(arg);
-		if (getPageText(arg).equals(WSDLEditorPlugin.getWSDLString("_UI_TAB_SOURCE"))) // TRANSLATE
-		// !
-		{
-			// update the input
-		}
-		else if (getPageText(arg).equals(WSDLEditorPlugin.getWSDLString("_UI_TAB_GRAPH"))) // TRANSLATE
-		// !
-		{
-			// update the input
-		}
-	}
-
-	static private Color dividerColor;
-
-	/**
-	 * Creates the graph page and adds it to the multi-page editor.
-	 */
-	protected void createAndAddGraphPage() throws PartInitException {
-		// create the graph page
-		sashForm = new SashForm(getContainer(), SWT.BORDER);
-		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-		sashForm.setOrientation(SWT.VERTICAL);
-		graphPageIndex = addPage(sashForm);
-		setPageText(graphPageIndex, WSDLEditorPlugin.getWSDLString("_UI_TAB_GRAPH"));
-		// create the graph viewer
-		graphViewer = new WSDLGraphViewer(this);
-		graphViewer.createControl(sashForm);
-		// detailsViewer = new WSDLDetailsViewer(this);
-		// detailsViewer.createControl(sashForm);
-		//
-		// sashForm.setWeights(weights);
-		if (dividerColor == null) {
-			dividerColor = new Color(getContainer().getDisplay(), 143, 141, 138);
-		}
-		getContainer().addPaintListener(new PaintListener() {
-			/**
-			 * @see org.eclipse.swt.events.PaintListener#paintControl(PaintEvent)
-			 */
-			public void paintControl(PaintEvent e) {
-				Object source = e.getSource();
-				if (source instanceof Composite) {
-					Composite comp = (Composite) source;
-					Rectangle boundary = comp.getClientArea();
-					e.gc.setForeground(dividerColor);
-					e.gc.drawLine(boundary.x, boundary.y, boundary.x + boundary.width, boundary.y);
-					setDesignWeights(sashForm.getWeights(), true);
-				}
-			}
-		});
-	}
-
-	public void setFocus() {
-		super.setFocus();
-		int activePage = getActivePage();
-		if (activePage == sourcePageIndex) {
-			WSDLEditorPlugin.getInstance().setDefaultPage(WSDLEditorPlugin.SOURCE_PAGE);
-		}
-		else {
-			WSDLEditorPlugin.getInstance().setDefaultPage(WSDLEditorPlugin.GRAPH_PAGE);
-		}
-	}
-
-	//
-	//
-	public static class BuiltInWSDLEditorExtension implements WSDLEditorExtension {
-		public boolean isExtensionTypeSupported(int type) {
-			return type == OUTLINE_TREE_CONTENT_PROVIDER || type == OUTLINE_LABEL_PROVIDER || type == EDIT_PART_FACTORY || type == DETAILS_VIEWER_PROVIDER || type == MENU_ACTION_CONTRIBUTOR || type == NODE_RECONCILER || type == NODE_ASSOCIATION_PROVIDER;
-		}
-
-		public boolean isApplicable(Object object) {
-			return (object instanceof WSDLElement && !(object instanceof XSDSchemaExtensibilityElement)) || (object instanceof WSDLGroupObject);
-		}
-
-		public Object createExtensionObject(int type, WSDLEditor wsdlEditor) {
-			Object result = null;
-			switch (type) {
-				case OUTLINE_TREE_CONTENT_PROVIDER : {
-					result = new ModelAdapterContentProvider(WSDLModelAdapterFactory.getWSDLModelAdapterFactory());
-					break;
-				}
-				case OUTLINE_LABEL_PROVIDER : {
-					result = new ModelAdapterLabelProvider(WSDLModelAdapterFactory.getWSDLModelAdapterFactory());
-					break;
-				}
-				case DETAILS_VIEWER_PROVIDER : {
-					result = new WSDLDetailsViewerProvider();
-					break;
-				}
-				case MENU_ACTION_CONTRIBUTOR : {
-					result = new WSDLMenuActionContributor(wsdlEditor);
-					break;
-				}
-				case NODE_ASSOCIATION_PROVIDER : {
-					result = new WSDLNodeAssociationProvider();
-					break;
-				}
-				case EDIT_PART_FACTORY : {
-					result = new WSDLEditPartFactory();
-					break;
-				}
-			}
-			return result;
-		}
-	}
-
-	public void reloadDependencies() {
-		try {
-			getGraphViewer().getComponentViewer().setPreserveExpansionEnabled(true);
-			Definition definition = getDefinition();
-			if (definition != null) {
-				WSDLResourceUtil.reloadDirectives(definition);
-				ComponentReferenceUtil.updateBindingReferences(definition);
-				ComponentReferenceUtil.updatePortTypeReferences(definition);
-				ComponentReferenceUtil.updateMessageReferences(definition);
-				ComponentReferenceUtil.updateSchemaReferences(definition);
-				// the line below simply causes a notification in order to
-				// update our
-				// views
-				//
-				definition.setDocumentationElement(definition.getDocumentationElement());
-			}
-		}
-		finally {
-			getGraphViewer().getComponentViewer().setPreserveExpansionEnabled(false);
-		}
-	}
-
-	public void openOnSelection(String specification) {
-		EObject eObject = getDefinition().eResource().getEObject(specification);
-		if (eObject != null) {
-			getSelectionManager().setSelection(new StructuredSelection(eObject));
-		}
-	}
-
-	public INavigationLocation createEmptyNavigationLocation() {
-		return new InternalTextSelectionNavigationLocation(textEditor, false);
-	}
-
-	public INavigationLocation createNavigationLocation() {
-		return new InternalTextSelectionNavigationLocation(textEditor, true);
-	}
-
-	static class InternalTextSelectionNavigationLocation extends TextSelectionNavigationLocation {
-		public InternalTextSelectionNavigationLocation(ITextEditor part, boolean initialize) {
-			super(part, initialize);
-		}
-
-		protected IEditorPart getEditorPart() {
-			IEditorPart part = super.getEditorPart();
-			if (part instanceof WSDLEditor) {
-				part = ((WSDLEditor) part).getTextEditor();
-			}
-			return part;
-		}
-
-		public String getText() {
-			// ISSUE: how to get title?
-			// IEditorPart part = getEditorPart();
-			// if (part instanceof WSDLTextEditor) {
-			// return ((WSDLTextEditor) part).getWSDLEditor().getTitle();
-			// }
-			// else {
-			// return super.getText();
-			// }
-			return super.getText();
-		}
-	}
-
-	// Returns the element currently on the copy, cut, paste clipboard
-	public WSDLElement getClipboardContents() {
-		return clipboardElement;
-	}
-
-	public void setClipboardContents(WSDLElement element) {
-		clipboardElement = element;
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor#getContributorId()
-	 */
-	public String getContributorId() {
-		return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-		// return getSite().getId();
-	}
-
-	/*
-	 * We override this method so we can hook in our automatic Binding
-	 * generation. We will generate the Binding after a save is executed (If
-	 * this preference has been set to true).
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		try {
-			// Display prompt message
-			boolean continueRegeneration = false;
-			if (WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean("Prompt Regenerate Binding on save")) {
-				Shell shell = Display.getCurrent().getActiveShell();
-				GenerateBindingOnSaveDialog dialog = new GenerateBindingOnSaveDialog(shell);
-
-				int rValue = dialog.open();
-				if (rValue == SWT.YES) {
-					continueRegeneration = true;
-				}
-				else if (rValue == SWT.NO) {
-					continueRegeneration = false;
-				}
-				else if (rValue == SWT.CANCEL) {
-					return;
-				}
-				else {
-					System.out.println("\nNothing: " + rValue);
-				}
-			}
-			else {
-				continueRegeneration = WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"));
-			}
-
-			if (continueRegeneration) {
-				Iterator bindingsIt = getDefinition().getEBindings().iterator();
-				while (bindingsIt.hasNext()) {
-					Binding binding = (Binding) bindingsIt.next();
-					BindingGenerator generator = new BindingGenerator(binding.getEnclosingDefinition(), binding);
-					generator.setOverwrite(false);
-					generator.generateBinding();
-				}
-
-				// Little hack to 'redraw' connecting lines in the graph
-				// viewer
-				getDefinition().setQName(getDefinition().getQName());
-			}
-		}
-		catch (Exception e) {
-			// e.printStackTrace();
-		}
-		super.doSave(monitor);
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java
deleted file mode 100644
index f9e5dfb..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java
+++ /dev/null

@@ -1,588 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.ExtensibilityItemTreeProviderRegistry;
-import org.eclipse.wst.wsdl.ui.internal.extension.NSKeyedExtensionRegistry;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-
-public class WSDLEditorPlugin extends AbstractUIPlugin //, IPluginHelper
-{
-  public static final String DEFAULT_PAGE = "org.eclipse.wst.wsdl.ui.internal.defaultpage";
-  public static final String GRAPH_PAGE = "org.eclipse.wst.wsdl.ui.internal.graphpage";
-  public static final String SOURCE_PAGE = "org.eclipse.wst.wsdl.ui.internal.sourcepage";
-
-  public final static String PLUGIN_ID = "org.eclipse.wst.wsdl.ui";
-  public final static String XSD_EDITOR_ID = "org.eclipse.wst.xsd.ui.XSDEditor"; 
-  
-  public final static String DEFAULT_TARGET_NAMESPACE = "http://www.example.org";
-  
-  public static int DEPENDECIES_CHANGED_POLICY_PROMPT = 0;
-  public static int DEPENDECIES_CHANGED_POLICY_IGNORE = 1;
-  public static int DEPENDECIES_CHANGED_POLICY_RELOAD = 2;
-
-  protected static WSDLEditorPlugin instance;
-  //  protected XMLSchemaPackage xmlschemaPackage;
-//  private static MsgLogger myMsgLogger;
-
-  private WSDLEditorExtensionRegistry wsdlEditorExtensionRegistry;
-  private NSKeyedExtensionRegistry extensiblityElementFilterRegistry;
-  private ExtensibilityItemTreeProviderRegistry treeProviderRegistry;
-  private NSKeyedExtensionRegistry propertyDescriptorProviderRegistry;
-  private NSKeyedExtensionRegistry propertySourceProviderRegistry;
-  private NSKeyedExtensionRegistry propertySectionDescriptorProviderRegistry;
-  private NSKeyedExtensionRegistry detailsViewerProviderRegistry;  
-  //private static Hashtable grayedImageMap = new Hashtable();
-  private int dependenciesChangedPolicy = DEPENDECIES_CHANGED_POLICY_RELOAD;
-
-  
-  public static void logMessage(String message)
-  {
-  }
-
-  /**
-   * Resources helper.
-   */
-
-  public WSDLEditorPlugin(IPluginDescriptor descriptor)
-  {
-    super(descriptor);
-    instance = this;
-
-    // TODO... remove this code when we add 'dependenciesChangedPolicy'
-    // to an editor preferences page
-    try
-    {
-      String string = getWSDLString("_DEBUG_UPDATE_POLICY");
-      int policy = Integer.parseInt(string);
-      if (policy >= 0 && policy <= DEPENDECIES_CHANGED_POLICY_RELOAD)
-      {
-        dependenciesChangedPolicy = policy;
-      }
-    }
-    catch (Exception e)
-    {
-    }
-  }
-
-  public WSDLEditorExtensionRegistry getWSDLEditorExtensionRegistry()
-  {
-    if (wsdlEditorExtensionRegistry == null)
-    {
-      wsdlEditorExtensionRegistry = new WSDLEditorExtensionRegistry();
-      new InternalEditorExtensionRegistryReader(wsdlEditorExtensionRegistry).readRegistry();
-    }
-    return wsdlEditorExtensionRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getDetailsViewerProviderRegistry()
-  {
-    if (detailsViewerProviderRegistry == null)
-    {
-	  detailsViewerProviderRegistry = new NSKeyedExtensionRegistry();
-      new DetailsViewerProviderRegistryReader(detailsViewerProviderRegistry).readRegistry();
-    }
-    return detailsViewerProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getExtensiblityElementFilterRegistry()
-  {
-    if (extensiblityElementFilterRegistry == null)
-    {
-      extensiblityElementFilterRegistry = new NSKeyedExtensionRegistry();
-      new ElementContentFilterExtensionRegistryReader(extensiblityElementFilterRegistry).readRegistry();
-    }
-    return extensiblityElementFilterRegistry;
-  }
-
-  public ExtensibilityItemTreeProviderRegistry getExtensibilityItemTreeProviderRegistry()
-  {
-    if (treeProviderRegistry == null)
-    {
-      treeProviderRegistry = new ExtensibilityItemTreeProviderRegistry();
-      new ExtensibilityItemTreeProviderRegistryReader(treeProviderRegistry).readRegistry();
-    }
-    return treeProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getPropertyDescriptorProviderRegistry()
-  {
-    if (propertyDescriptorProviderRegistry == null)
-    {
-      propertyDescriptorProviderRegistry = new NSKeyedExtensionRegistry();
-      new PropertyDescriptorProviderRegistryReader(propertyDescriptorProviderRegistry).readRegistry();
-    }
-    return propertyDescriptorProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getPropertySourceProviderRegistry()
-  {
-    if (propertySourceProviderRegistry == null)
-    {
-      propertySourceProviderRegistry = new NSKeyedExtensionRegistry();
-      new PropertySourceProviderRegistryReader(propertySourceProviderRegistry).readRegistry();
-    }
-    return propertySourceProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getPropertySectionDescriptorProviderRegistry()
-  {
-    if (propertySectionDescriptorProviderRegistry == null)
-    {
-      propertySectionDescriptorProviderRegistry = new NSKeyedExtensionRegistry();
-      new PropertySectionDescriptorProviderRegistry(propertySectionDescriptorProviderRegistry).readRegistry();
-    }
-    return propertySectionDescriptorProviderRegistry;
-  }
-
-  /**
-   * Get the Install URL
-   */
-  public static URL getInstallURL()
-  {
-    return getInstance().getDescriptor().getInstallURL();
-  }
-
-  /**
-   * Get resource string
-   */
-  public static String getWSDLString(String key)
-  {	  
-    return Platform.getResourceBundle(Platform.getBundle(PLUGIN_ID)).getString(key);
-  }
-
-  /**
-   * Get resource string
-   */
-  public static String getWSDLString(String key, String arg0)
-  {
-    return MessageFormat.format(getWSDLString(key), new Object [] { arg0 });
-  }
-  
-  /**
-   * Get resource string
-   */
-  public static String getWSDLString(String key, String arg0, String arg1)
-  {
-    return MessageFormat.format(getWSDLString(key), new Object [] { arg0, arg1 });
-  }
-
-  /**
-   * Return the plugin physical directory location
-   */
-  public static IPath getPluginLocation()
-  {
-    try
-    {
-      IPath installPath = new Path(getInstallURL().toExternalForm()).removeTrailingSeparator();
-      String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
-      return new Path(installStr);
-    }
-    catch (IOException e)
-    {
-      //System.out.println("WSDLEditorPlugin.getPluginLocation() exception.." + e);
-    }
-    return null;
-  }
-
-  protected Hashtable imageDescriptorCache = new Hashtable();
-
-  protected ImageDescriptor internalGetImageDescriptor(String key)
-  {
-    ImageDescriptor imageDescriptor = (ImageDescriptor) imageDescriptorCache.get(key);
-    if (imageDescriptor == null)
-    {
-      imageDescriptor = ImageDescriptor.createFromFile(WSDLEditorPlugin.class, key);
-      if (imageDescriptor != null)
-      {
-        imageDescriptorCache.put(key, imageDescriptor);
-      }
-    }
-    return imageDescriptor;
-  }
-
-  public static ImageDescriptor getImageDescriptor(String key)
-  {
-    return getInstance().internalGetImageDescriptor(key);
-  }
-
-  public Image getImage(String iconName)
-  {
-    ImageRegistry imageRegistry = getImageRegistry();
-    
-    if (imageRegistry.get(iconName) != null)
-    {
-      return imageRegistry.get(iconName);
-    }
-    else
-    {
-      imageRegistry.put(iconName, ImageDescriptor.createFromFile(getClass(), iconName));
-      return imageRegistry.get(iconName);
-    }
-  }
-  
-  /*
-    public Image getImage(String key, boolean isGrayed)
-    { 
-      Image image = null;
-      if (!isGrayed)
-      {
-        image = super.getImage(key);
-      }                             
-      else
-      {
-        image = (Image)grayedImageMap.get(key);
-        if (image == null)
-        {
-          Image colorImage = super.getImage(key);
-          if (colorImage != null)
-          {
-            image = new Image(Display.getCurrent(), colorImage, SWT.IMAGE_GRAY);//SWT.IMAGE_DISABLE);
-            grayedImageMap.put(key, image);
-          }
-        }
-      }
-      return image;
-    }
-  */
-
-  /**
-   * Get the metadata directory for this plugin
-   */
-  public static String getMetaDataDirectory()
-  {
-    return getInstance().getStateLocation().toOSString();
-  }
-
-  /**
-   * Get the singleton instance.
-   */
-  public static WSDLEditorPlugin getInstance()
-  {
-    return instance;
-  }
-
-  public IWorkspace getWorkspace()
-  {
-    return ResourcesPlugin.getWorkspace();
-  }
-
-  public static Shell getShell()
-  {
-    return getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeDefaultPreferences(org.eclipse.jface.preference.IPreferenceStore)
-   */
-  protected void initializeDefaultPreferences(IPreferenceStore store)
-  {
-    store.setDefault(DEFAULT_PAGE, GRAPH_PAGE);
-    
-    // WSDLPreferencePage prefs
-    store.setDefault(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"), DEFAULT_TARGET_NAMESPACE);
-    store.setDefault(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"), false);
-    store.setDefault("Prompt Regenerate Binding on save", false);	// TODO: Externalize
-    // Do we need this preference below?  Look at WSDLPreferencePage.java
-//    store.setDefault("Defualt Location:", "http://www.example.com");
-  }
-  
-  /**
-   * setDefaultPage
-   * Set the default page to open when the editor starts. Maintains the state
-   * when WSAD is shutdown and restarted.
-   * @param page
-   */
-  public void setDefaultPage(String page)
-  {
-    getPreferenceStore().setValue(DEFAULT_PAGE, page);
-  }
-
-  public String getDefaultPage()
-  {
-    return getPreferenceStore().getString(DEFAULT_PAGE);
-  }
-
-  public int getDependenciesChangedPolicy()
-  {
-    //return getPreferenceStore().getInt(DEPENDECIES_CHANGED_POLICY);
-    return dependenciesChangedPolicy;
-  }
-}
-
-class BaseRegistryReader
-{
-  protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.ui";
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry(String extensionPointId)
-  {
-	IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-	IExtensionPoint point = extensionRegistry.getExtensionPoint(PLUGIN_ID, extensionPointId);
-
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-  }
-}
-
-/**
- * This class reads the plugin manifests and registers each internal editor extension
- */
-class InternalEditorExtensionRegistryReader extends BaseRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "internalEditorExtensions";
-  protected static final String TAG_NAME = "internalEditorExtension";
-  protected static final String ATT_CLASS = "class";
-  protected WSDLEditorExtensionRegistry registry;
-
-  public InternalEditorExtensionRegistryReader(WSDLEditorExtensionRegistry registry)
-  {
-    this.registry = registry;
-  }
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    super.readRegistry(EXTENSION_POINT_ID);
-  }
-
-  /**
-   * readElement()
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(TAG_NAME))
-    {
-      String className = element.getAttribute(ATT_CLASS);
-      if (className != null)
-      {
-        try
-        {
-          ClassLoader pluginClsLoader = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPlugin().getClass().getClassLoader();
-          registry.add(pluginClsLoader, className);
-        }
-        catch (Exception e)
-        {
-        }
-      }
-    }
-  }
-}
-
-/**
- * 
- */
-abstract class NSKeyedExtensionRegistryReader extends BaseRegistryReader
-{
-  protected static final String ATT_NAME_SPACE = "namespace";
-  protected String extensionPointId;
-  protected String tagName;
-  protected String[] attributeNames;
-  protected NSKeyedExtensionRegistry nsKeyedExtensionRegistry;
-
-  private NSKeyedExtensionRegistryReader(String extensionPointId, String tagName, NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    this.extensionPointId = extensionPointId;
-    this.tagName = tagName;
-    this.nsKeyedExtensionRegistry = nsKeyedExtensionRegistry;
-  }
-
-  public NSKeyedExtensionRegistryReader(String extensionPointId, String tagName, String attributeName, NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    this(extensionPointId, tagName, nsKeyedExtensionRegistry);
-    attributeNames = new String[1];
-    attributeNames[0] = attributeName;
-  }
-
-  public NSKeyedExtensionRegistryReader(String extensionPointId, String tagName, String[] attributeNames, NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    this(extensionPointId, tagName, nsKeyedExtensionRegistry);
-    this.attributeNames = attributeNames;
-  }
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    super.readRegistry(extensionPointId);
-  }
-
-  /**
-   * readElement()
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(tagName))
-    {
-      String namespace = element.getAttribute(ATT_NAME_SPACE);
-      if (namespace != null)
-      {
-        ClassLoader pluginClasssLoader = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-        if (attributeNames.length == 1)
-        {
-          String className = element.getAttribute(attributeNames[0]);
-          if (className != null)
-          {
-            nsKeyedExtensionRegistry.put(namespace, className, pluginClasssLoader);
-          }
-        }
-        else
-        {
-          HashMap map = new HashMap();
-          for (int i = 0; i < attributeNames.length; i++)
-          {
-            String attributeName = attributeNames[i];
-            String className = element.getAttribute(attributeName);
-            if (className != null && className.length() > 0)
-            {
-              map.put(attributeName, className);
-            }
-          }
-          nsKeyedExtensionRegistry.put(namespace, map, pluginClasssLoader);
-        }
-      }
-    }
-  }
-}
-
-/**
- * This class reads the plugin manifests and registers each extensibility item tree provider
- */
-class ExtensibilityItemTreeProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "extensibilityItemTreeProviders";
-  protected static final String TAG_NAME = "extensibilityItemTreeProvider";
-  protected static final String[] ATT_NAMES = { "labelProviderClass", "contentProviderClass" };
-
-  public ExtensibilityItemTreeProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, ATT_NAMES, nsKeyedExtensionRegistry);
-  }
-}
-
-/**
- * 
- */
-class ElementContentFilterExtensionRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "extensibilityElementFilter";
-  protected static final String TAG_NAME = "extensibilityElementFilter";
-
-  public ElementContentFilterExtensionRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-}
-
-/**
- * 
- */
-class PropertyDescriptorProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "propertyDescriptorProvider";
-  protected static final String TAG_NAME = "propertyDescriptorProvider";
-
-  public PropertyDescriptorProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
-
-class PropertySourceProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "propertySourceProvider";
-  protected static final String TAG_NAME = "propertySourceProvider";
-
-  public PropertySourceProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
-
-class PropertySectionDescriptorProviderRegistry extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "propertySectionDescriptorProvider";
-  protected static final String TAG_NAME = "propertySectionDescriptorProvider";
-
-  public PropertySectionDescriptorProviderRegistry(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
-
-/**
- * 
- */
-class DetailsViewerProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "detailsViewerProviders";
-  protected static final String TAG_NAME = "detailsViewerProvider";
-
-  public DetailsViewerProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java
deleted file mode 100644
index 9eb610b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java
+++ /dev/null

@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.wsdl.Definition;
-
-
-public class WSDLEditorResourceChangeHandler
-{
-  protected WSDLEditor wsdlEditor;
-  protected boolean isUpdateRequired;
-  protected InternalResourceChangeListener resourceChangeListener;
-  protected InternalPartListener partListener;
-
-  public WSDLEditorResourceChangeHandler(WSDLEditor wsdlEditor)
-  {
-    this.wsdlEditor = wsdlEditor;
-    resourceChangeListener = new InternalResourceChangeListener();
-    partListener = new InternalPartListener();
-  }
-
-  public void attach()
-  {
-    ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener);
-    wsdlEditor.getSite().getWorkbenchWindow().getPartService().addPartListener(partListener);
-  }
-
-  public void dispose()
-  {
-    ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-    wsdlEditor.getSite().getWorkbenchWindow().getPartService().removePartListener(partListener);
-  }
-
-  protected Map computeDependencyMap()
-  {
-    Map map = new HashMap();
-    Definition definition = wsdlEditor.getDefinition();
-    ResourceSet resourceSet = definition.eResource().getResourceSet();
-    for (Iterator i = resourceSet.getResources().iterator(); i.hasNext();)
-    {
-      Resource resource = (Resource)i.next();
-      if (resource != definition.eResource())
-      {
-        String uri = resource.getURI().toString();
-        if (map.get(uri) == null)
-        {
-          map.put(uri, uri);
-        }
-      }
-    }
-    return map;
-  }
-
-  public void performReload()
-  {
-  	boolean doReload = false;  	
-	int policy = WSDLEditorPlugin.getInstance().getDependenciesChangedPolicy();
-	
-  	if (policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_PROMPT)
-  	{
-		doReload = MessageDialog.openQuestion(wsdlEditor.getSite().getShell(), WSDLEditorPlugin.getWSDLString("_UI_DEPENDENCIES_CHANGED"), WSDLEditorPlugin.getWSDLString("_UI_DEPENDENCIES_CHANGED_REFRESH"));  	
-  	}
-  	else if (policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_RELOAD)
-  	{
-  		doReload = true;
-  	}
-  	
-    if (doReload)
-    {    
-      wsdlEditor.reloadDependencies();
-    }  
-  }
-  
-  public boolean isListeningToResourceChanges()
-  {
-  	int policy = WSDLEditorPlugin.getInstance().getDependenciesChangedPolicy();
-  	return policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_PROMPT ||
-  		   policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_RELOAD;
-  }
-
-
-  class InternalResourceChangeListener implements IResourceChangeListener, IResourceDeltaVisitor
-  {
-    protected List list = new ArrayList();
-    protected boolean isPending = false;
-    protected int count = 0;
-
-    public void resourceChanged(IResourceChangeEvent event)
-    {      	
-      Display display = Display.getCurrent();
-      	     	
-      if (display != null && isListeningToResourceChanges() && !isUpdateRequired)
-      {
-        if (event.getType() == IResourceChangeEvent.POST_CHANGE)
-        {
-          IResourceDelta[] deltas = event.getDelta().getAffectedChildren();
-          for (int i = 0; i < deltas.length; i++)
-          {
-            try
-            {
-              deltas[i].accept(this);
-            }
-            catch (Exception e)
-            {
-            }
-          }
-        }
-        if (list.size() > 0)
-        {
-          if (!isPending)
-          {
-            isPending = true;
-            display.timerExec(2000, new TimerEvent());
-          }
-        }
-      }
-    }
-
-    public boolean visit(IResourceDelta delta) throws CoreException
-    {
-      IResource resource = delta.getResource();
-      if (resource.getType() == IResource.FILE)
-      {
-        if (!list.contains(resource))
-        {
-          list.add(resource);
-        }
-      }
-      return true;
-    }
-
-    class TimerEvent implements Runnable
-    {
-      public TimerEvent()
-      {
-        //System.out.println("NewTimerEvent(" + wsdlEditor.getDefinition().eResource().getURI() + ") " + count);      	
-      }
-
-      public void run()
-      {
-//        for (Iterator i = list.iterator(); i.hasNext();)
-//        {
-//          IResource resource = (IResource)i.next();
-//          String platformPath = URI.createPlatformResourceURI(resource.getFullPath().toString()).toString();
-//        }
-
-        Map dependencyMap = computeDependencyMap();
-
-        for (Iterator i = list.iterator(); i.hasNext();)
-        {
-          IResource resource = (IResource)i.next();
-          String platformPath = URI.createPlatformResourceURI(resource.getFullPath().toString()).toString();
-          if (dependencyMap.get(platformPath) != null)
-          {
-            isUpdateRequired = true;
-            if (wsdlEditor.getSite().getWorkbenchWindow().getPartService().getActivePart() == wsdlEditor)
-            {
-              isUpdateRequired = false;
-              performReload();
-            }
-          }
-        }
-
-        isPending = false;
-        list = new ArrayList();
-      }
-    }
-  }
-
-  class InternalPartListener implements IPartListener
-  {
-    public void partActivated(IWorkbenchPart part)
-    {
-      if (part == wsdlEditor)
-      {     
-        if (isUpdateRequired)
-        {
-          isUpdateRequired = false;
-          performReload();
-        }
-      }
-    }
-
-    public void partBroughtToTop(IWorkbenchPart part)
-    {
-    }
-
-    public void partClosed(IWorkbenchPart part)
-    {
-    }
-
-   
-    public void partDeactivated(IWorkbenchPart part)
-    {
-    }
-
-    public void partOpened(IWorkbenchPart part)
-    {
-    }
-  }
-
-
-}
-
-/*
-class DependencyVisitor
-{
-	public void visitImport(Import theImport)
-	{
-		if (theImport.getEDefinition() != null)
-		{
-			visitDefinition(theImport.getEDefinition());
-		}
-		else if (theImport.getESchema() != null)
-		{
-			visitSchema(theImport.getESchema());
-		}
-	}
-
-	public void visitXSDSchemaDirective(XSDSchemaDirective directive)
-	{
-		XSDSchema referencedSchema = directive.getResolvedSchema();
-		if (referencedSchema != null)
-		{
-			visitSchema(referencedSchema);
-		}
-	}
-
-	public void visitDefinition(Definition definition)
-	{
-		if (definition != null)
-		{
-			for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-			{
-				visitImport((Import)i.next());
-			}
-			Types types = definition.getETypes();
-			if (types != null)
-			{
-
-				for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
-				{
-					Object o = i.next();
-					if (o instanceof XSDSchemaExtensibilityElement)
-					{
-						XSDSchemaExtensibilityElement e = (XSDSchemaExtensibilityElement)o;
-						if (e.getEXSDSchema() != null)
-						{
-							visitSchema(e.getEXSDSchema());
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public void visitSchema(XSDSchema schema)
-	{
-		for (Iterator i = schema.getContents().iterator(); i.hasNext();)
-		{
-			Object o = i.next();
-			if (o instanceof XSDSchemaDirective)
-			{
-				visitXSDSchemaDirective((XSDSchemaDirective)o);
-			}
-		}
-	}
-}
-
-class ReloadDependencyVisitor extends DependencyVisitor
-{
-	public void visitImport(Import theImport)
-	{
-		ComponentHandler handler = WSDLReconciler.getReconciler(theImport);
-		Element element = WSDLUtil.getInstance().getElementForObject(theImport);
-		if (element != null && handler != null)
-		{
-			handler.reconcile(wsdlEditor.getDefinition(), theImport, element);
-		}
-	}
-
-	public void visitXSDSchemaDirective(XSDSchemaDirective directive)
-	{
-
-	}
-}*/
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlink.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlink.java
deleted file mode 100644
index f07b075..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlink.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * WSDL Hyperlink that knows how to open links from wsdl files
- */
-public class WSDLHyperlink implements IHyperlink {
-	private IRegion fRegion;
-	private String fResource;
-	private String fSpec;
-
-	public WSDLHyperlink(IRegion region, String resource, String spec) {
-		fRegion = region;
-		fResource = resource;
-		fSpec = spec;
-	}
-
-	public IRegion getHyperlinkRegion() {
-		return fRegion;
-	}
-
-	public String getTypeLabel() {
-		return null;
-	}
-
-	public String getHyperlinkText() {
-		return null;
-	}
-
-	public void open() {
-		/*
-		 * ISSUE: There are cleaner ways to find the right file based on a URI
-		 * string and cleaner ways to find which editor to open for the file.
-		 * See other IHyperlink and IHyperlinkDetector implementors for
-		 * examples.
-		 */
-		String pattern = "platform:/resource";
-		if (fResource != null && fResource.startsWith(pattern)) {
-			try {
-				Path path = new Path(fResource.substring(pattern.length()));
-				IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-
-				IWorkbenchPage workbenchPage = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				IEditorPart editorPart = workbenchPage.getActiveEditor();
-
-				if (editorPart.getEditorInput() instanceof IFileEditorInput && ((IFileEditorInput) editorPart.getEditorInput()).getFile().equals(file)) {
-					workbenchPage.getNavigationHistory().markLocation(editorPart);
-				}
-				else {
-					try {
-						if (fResource.endsWith("xsd")) {
-							editorPart = workbenchPage.openEditor(new FileEditorInput(file), WSDLEditorPlugin.XSD_EDITOR_ID);
-						}
-						else {
-							// Since we are already in the wsdleditor
-							editorPart = workbenchPage.openEditor(new FileEditorInput(file), editorPart.getEditorSite().getId());
-						}
-					}
-					catch (PartInitException initEx) {
-					}
-				}
-
-				/*
-				 * ISSUE: This just does not look like a safe thing to do. One
-				 * simple solution would be to have an interface for
-				 * openOnSelection that your editors can implement. Or, java
-				 * editor has something like a utility that is able to find
-				 * the offset/location for a given element in a file. Once you
-				 * have offset/location, you can just call setSelection.
-				 */
-				Class theClass = editorPart.getClass();
-				Class[] methodArgs = {String.class};
-				Method method = theClass.getMethod("openOnSelection", methodArgs);
-				Object args[] = {fSpec};
-				method.invoke(editorPart, args);
-				workbenchPage.getNavigationHistory().markLocation(editorPart);
-			}
-			catch (Exception e) {
-			}
-		}
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlinkDetector.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlinkDetector.java
deleted file mode 100644
index 1e6aa0b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlinkDetector.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-
-/**
- * Detects hyperlinks for WSDL files
- */
-public class WSDLHyperlinkDetector implements IHyperlinkDetector {
-	/**
-	 * Gets the definition from document
-	 * 
-	 * @param document
-	 * @return Definition
-	 */
-	private Definition getDefinition(IDocument document) {
-		Definition definition = null;
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-		if (model != null) {
-			try {
-				if (model instanceof IDOMModel) {
-					IDOMDocument domDoc = ((IDOMModel) model).getDocument();
-					if (domDoc != null) {
-						WSDLModelAdapter modelAdapter = (WSDLModelAdapter) domDoc.getAdapterFor(WSDLModelAdapter.class);
-
-						/*
-						 * ISSUE: if adapter does not already exist for domDoc
-						 * getAdapterFor will create one. So why is this null
-						 * check/creation needed?
-						 */
-						if (modelAdapter == null) {
-							modelAdapter = new WSDLModelAdapter();
-							domDoc.addAdapter(modelAdapter);
-							modelAdapter.createDefinition(domDoc.getDocumentElement());
-						}
-
-						definition = modelAdapter.getDefinition();
-					}
-				}
-			}
-			finally {
-				model.releaseFromRead();
-			}
-		}
-		return definition;
-	}
-
-	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
-		// for now, only capable of creating 1 hyperlink
-		List hyperlinks = new ArrayList(0);
-
-		if (region != null && textViewer != null) {
-			IDocument document = textViewer.getDocument();
-			Node node = getCurrentNode(document, region.getOffset());
-
-			if (node != null) {
-				Definition definition = getDefinition(textViewer.getDocument());
-				OpenOnSelectionHelper helper = new OpenOnSelectionHelper(definition);
-				String[] array = helper.computeSpecification(node);
-				if (array != null) {
-					IRegion nodeRegion = region;
-					if (node instanceof IndexedRegion) {
-						IndexedRegion indexed = (IndexedRegion) node;
-						nodeRegion = new Region(indexed.getStartOffset(), indexed.getLength());
-					}
-					hyperlinks.add(new WSDLHyperlink(nodeRegion, array[0], array[1]));
-				}
-			}
-		}
-		if (hyperlinks.size() == 0)
-			return null;
-		return (IHyperlink[]) hyperlinks.toArray(new IHyperlink[0]);
-	}
-
-	/**
-	 * Returns the node the cursor is currently on in the document. null if no
-	 * node is selected
-	 * 
-	 * @param offset
-	 * @return Node either element, doctype, text, or null
-	 */
-	private Node getCurrentNode(IDocument document, int offset) {
-		// get the current node at the offset (returns either: element,
-		// doctype, text)
-		IndexedRegion inode = null;
-		IStructuredModel sModel = null;
-		try {
-			sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			inode = sModel.getIndexedRegion(offset);
-			if (inode == null)
-				inode = sModel.getIndexedRegion(offset - 1);
-		}
-		finally {
-			if (sModel != null)
-				sModel.releaseFromRead();
-		}
-
-		if (inode instanceof Node) {
-			return (Node) inode;
-		}
-		return null;
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java
deleted file mode 100644
index 32e4c1f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java
+++ /dev/null

@@ -1,653 +0,0 @@
-
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextInputListener;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.wst.common.ui.provisional.editors.PostMultiPageEditorSite;
-import org.eclipse.wst.common.ui.provisional.editors.PostSelectionMultiPageEditorPart;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLPreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLEditorMessages;
-
-public class WSDLMultiPageEditorPart extends PostSelectionMultiPageEditorPart implements IPropertyListener {
-
-	/**
-	 * 
-	 */
-	public WSDLMultiPageEditorPart() {
-		super();
-	}
-
-	/**
-	 * Internal part activation listener
-	 */
-	class PartListener extends ShellAdapter implements IPartListener {
-		private IWorkbenchPart fActivePart;
-		private boolean fIsHandlingActivation = false;
-
-		private void handleActivation() {
-
-			if (fIsHandlingActivation)
-				return;
-
-			if (fActivePart == WSDLMultiPageEditorPart.this) {
-				fIsHandlingActivation = true;
-				try {
-					safelySanityCheckState();
-				}
-				finally {
-					fIsHandlingActivation = false;
-				}
-			}
-		}
-
-		/**
-		 * @see IPartListener#partActivated(IWorkbenchPart)
-		 */
-		public void partActivated(IWorkbenchPart part) {
-			fActivePart = part;
-			handleActivation();
-		}
-
-		/**
-		 * @see IPartListener#partBroughtToTop(IWorkbenchPart)
-		 */
-		public void partBroughtToTop(IWorkbenchPart part) {
-		}
-
-		/**
-		 * @see IPartListener#partClosed(IWorkbenchPart)
-		 */
-		public void partClosed(IWorkbenchPart part) {
-		}
-
-		/**
-		 * @see IPartListener#partDeactivated(IWorkbenchPart)
-		 */
-		public void partDeactivated(IWorkbenchPart part) {
-			fActivePart = null;
-		}
-
-		/**
-		 * @see IPartListener#partOpened(IWorkbenchPart)
-		 */
-		public void partOpened(IWorkbenchPart part) {
-		}
-
-		/*
-		 * @see ShellListener#shellActivated(ShellEvent)
-		 */
-		public void shellActivated(ShellEvent e) {
-			handleActivation();
-		}
-	}
-
-	class TextInputListener implements ITextInputListener {
-		public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
-		}
-
-		public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
-		}
-	}
-
-	/** The source page index. */
-	private int fSourcePageIndex;
-	/** The text editor. */
-	private StructuredTextEditor fTextEditor;
-
-	private PartListener partListener;
-
-
-	/*
-	 * This method is just to make firePropertyChanged accessbible from some
-	 * (anonomous) inner classes.
-	 */
-	protected void _firePropertyChange(int property) {
-		super.firePropertyChange(property);
-	}
-
-	/**
-	 * Adds the source page of the multi-page editor.
-	 */
-	protected void addSourcePage() throws PartInitException {
-		try {
-			fSourcePageIndex = addPage(fTextEditor, getEditorInput());
-			setPageText(fSourcePageIndex, WSDLEditorPlugin.getWSDLString("_UI_TAB_SOURCE")); //$NON-NLS-1$
-			// the update's critical, to get viewer selection manager and
-			// highlighting to work
-			fTextEditor.update();
-
-			firePropertyChange(PROP_TITLE);
-
-			// Changes to the Text Viewer's document instance should also
-			// force an
-			// input refresh
-			fTextEditor.getTextViewer().addTextInputListener(new TextInputListener());
-		}
-		catch (PartInitException e) {
-			// dispose editor
-			dispose();
-
-			// log for now, unless we find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#createPages()
-	 */
-	protected void createPages() {
-		try {
-			// source page MUST be created before design page, now
-			createSourcePage();
-			addSourcePage();
-			setActivePage();
-
-			// future_TODO: add a catch block here for any exception the
-			// design
-			// page throws and convert it into a more informative message.
-		}
-		catch (PartInitException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#createSite(org.eclipse.ui.IEditorPart)
-	 */
-	protected IEditorSite createSite(IEditorPart editor) {
-		IEditorSite site = null;
-		if (editor == fTextEditor) {
-			site = new PostMultiPageEditorSite(this, editor) {
-				/**
-				 * @see org.eclipse.ui.part.MultiPageEditorSite#getActionBarContributor()
-				 */
-				public IEditorActionBarContributor getActionBarContributor() {
-					IEditorActionBarContributor contributor = super.getActionBarContributor();
-//					IEditorActionBarContributor multiContributor = WSDLMultiPageEditorPart.this.getEditorSite().getActionBarContributor();
-					// if (multiContributor instanceof
-					// XMLMultiPageEditorActionBarContributor) {
-					// contributor = ((XMLMultiPageEditorActionBarContributor)
-					// multiContributor).sourceViewerActionContributor;
-					// }
-					return contributor;
-				}
-
-				public String getId() {
-					// sets this id so nested editor is considered xml source
-					// page
-					return ContentTypeIdForXML.ContentTypeID_XML + ".source"; //$NON-NLS-1$;
-				}
-			};
-		}
-		else {
-			site = super.createSite(editor);
-		}
-		return site;
-	}
-
-	/**
-	 * Creates the source page of the multi-page editor.
-	 */
-	protected void createSourcePage() throws PartInitException {
-		fTextEditor = createTextEditor();
-		fTextEditor.setEditorPart(this);
-
-		// Set the SourceViewerConfiguration now so the text editor won't use
-		// the default configuration first
-		// and switch to the StructuredTextViewerConfiguration later.
-		// DMW removed setSourceViewerConfiguration 3/26/2003 since added
-		// createPartControl to our text editor.
-		// fTextEditor.setSourceViewerConfiguration();
-		fTextEditor.addPropertyListener(this);
-	}
-
-	/**
-	 * Method createTextEditor.
-	 * 
-	 * @return StructuredTextEditor
-	 */
-	protected StructuredTextEditor createTextEditor() {
-		return new StructuredTextEditor();
-	}
-
-	public void dispose() {
-		IWorkbenchWindow window = getSite().getWorkbenchWindow();
-		window.getPartService().removePartListener(partListener);
-		window.getShell().removeShellListener(partListener);
-
-		getSite().getPage().removePartListener(partListener);
-		if (fTextEditor != null) {
-			fTextEditor.removePropertyListener(this);
-		}
-
-		// moved to last when added window ... seems like
-		// we'd be in danger of losing some data, like site,
-		// or something.
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc) Saves the contents of this editor. <p> Subclasses must
-	 * override this method to implement the open-save-close lifecycle for an
-	 * editor. For greater details, see <code> IEditorPart </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		fTextEditor.doSave(monitor);
-		// // this is a temporary way to force validation.
-		// // when the validator is a workbench builder, the following lines
-		// can be removed
-		// if (fDesignViewer != null)
-		// fDesignViewer.saveOccurred();
-
-	}
-
-	/*
-	 * (non-Javadoc) Saves the contents of this editor to another object. <p>
-	 * Subclasses must override this method to implement the open-save-close
-	 * lifecycle for an editor. For greater details, see <code> IEditorPart
-	 * </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public void doSaveAs() {
-		fTextEditor.doSaveAs();
-		// 253619
-		// following used to be executed here, but is
-		// now called "back" from text editor (since
-		// mulitiple paths to the performSaveAs in StructuredTextEditor.
-		// doSaveAsForStructuredTextMulitPagePart();
-	}
-
-	private void editorInputIsAcceptable(IEditorInput input) throws PartInitException {
-		if (input instanceof IFileEditorInput) {
-			// verify that it can be opened
-			CoreException[] coreExceptionArray = new CoreException[1];
-			if (fileDoesNotExist((IFileEditorInput) input, coreExceptionArray)) {
-				CoreException coreException = coreExceptionArray[0];
-				if (coreException.getStatus().getCode() == IResourceStatus.FAILED_READ_LOCAL) {
-					// I'm assuming this is always 'does not exist'
-					// we'll refresh local go mimic behavior of default
-					// editor, where the
-					// troublesome file is refreshed (and will cause it to
-					// 'disappear' from Navigator.
-					try {
-						((IFileEditorInput) input).getFile().refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor());
-					}
-					catch (CoreException ce) {
-						// very unlikely
-						Logger.logException(ce);
-					}
-					throw new PartInitException(NLS.bind(XMLEditorMessages.Resource__does_not_exist, (new Object[]{input.getName()})));
-				}
-				else {
-					throw new PartInitException(NLS.bind(XMLEditorMessages.Editor_could_not_be_open, (new Object[]{input.getName()})));
-				}
-			}
-		}
-		else if (input instanceof IStorageEditorInput) {
-			InputStream contents = null;
-			try {
-				contents = ((IStorageEditorInput) input).getStorage().getContents();
-			}
-			catch (CoreException noStorageExc) {
-			}
-			if (contents == null) {
-				throw new PartInitException(NLS.bind(XMLEditorMessages.Editor_could_not_be_open, (new Object[]{input.getName()})));
-			}
-			else {
-				try {
-					contents.close();
-				}
-				catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	// void doSaveAsForStructuredTextMulitPagePart() {
-	// setPageText(getActivePage(), fTextEditor.getTitle());
-	// setInput(fTextEditor.getEditorInput());
-	// if (fDesignViewer != null) {
-	// //fDesignViewer.setEditorInput(fTextEditor.getEditorInput());
-	// fDesignViewer.setModel(getModel());
-	// fDesignViewer.saveAsOccurred();
-	// }
-	// // even though we've set title etc., several times already!
-	// // only now is all prepared for it.
-	// firePropertyChange(IWorkbenchPart.PROP_TITLE);
-	// firePropertyChange(PROP_DIRTY);
-	// }
-	/*
-	 * (non-Javadoc) Initializes the editor part with a site and input. <p>
-	 * Subclasses of <code> EditorPart </code> must implement this method.
-	 * Within the implementation subclasses should verify that the input type
-	 * is acceptable and then save the site and input. Here is sample code:
-	 * </p><pre> if (!(input instanceof IFileEditorInput)) throw new
-	 * PartInitException("Invalid Input: Must be IFileEditorInput");
-	 * setSite(site); setInput(editorInput); </pre>
-	 */
-	protected boolean fileDoesNotExist(IFileEditorInput input, Throwable[] coreException) {
-		boolean result = false;
-		InputStream inStream = null;
-		if ((!(input.exists())) || (!(input.getFile().exists()))) {
-			result = true;
-		}
-		else {
-			try {
-				inStream = input.getFile().getContents(true);
-			}
-			catch (CoreException e) {
-				// very likely to be file not found
-				result = true;
-				coreException[0] = e;
-			}
-			finally {
-				if (input != null) {
-					try {
-						if (inStream != null) {
-							inStream.close();
-						}
-					}
-					catch (IOException e) {
-
-					}
-				}
-			}
-		}
-		return result;
-	}
-
-	public Object getAdapter(Class key) {
-		Object result = null;
-
-		// DMW: I'm bullet-proofing this because
-		// its been reported (on 4.03 version) a null pointer sometimes
-		// happens here on startup, when an editor has been left
-		// open when workbench shutdown.
-		if (fTextEditor != null) {
-			result = fTextEditor.getAdapter(key);
-		}
-		return result;
-	}
-
-	public IEditorPart getEditorPart() {
-		return this;
-	}
-
-	protected IStructuredModel getModel() {
-		IStructuredModel model = null;
-		if (fTextEditor != null) {
-			model = fTextEditor.getModel();
-//			IDocument doc = fTextEditor.getDocumentProvider().getDocument(getEditorInput());	
-//	    	IModelManager modelManager = ModelManagerImpl.getInstance();    	
-//	    	model = modelManager.getModelForRead((IStructuredDocument) doc);
-		}
-
-		return model;
-	}
-
-	protected IPreferenceStore getPreferenceStore() {
-		return WSDLEditorPlugin.getInstance().getPreferenceStore();
-	}
-
-	public StructuredTextEditor getTextEditor() {
-		return fTextEditor;
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on IWorkbenchPart.
-	 */
-	public String getTitle() {
-		String title = null;
-		if (getTextEditor() == null) {
-			if (getEditorInput() != null) {
-				title = getEditorInput().getName();
-			}
-		}
-		else {
-			title = getTextEditor().getTitle();
-		}
-		if (title == null) {
-			title = getPartName();
-		}
-		return title;
-	}
-
-	/*
-	 * (non-Javadoc) Sets the cursor and selection state for this editor to
-	 * the passage defined by the given marker. <p> Subclasses may override.
-	 * For greater details, see <code> IEditorPart </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public void gotoMarker(IMarker marker) {
-		// (pa) 20020217 this was null when opening an editor that was
-		// already open
-		if (fTextEditor != null) {
-			IGotoMarker markerGotoer = (IGotoMarker) fTextEditor.getAdapter(IGotoMarker.class);
-			markerGotoer.gotoMarker(marker);
-		}
-	}
-
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		editorInputIsAcceptable(input);
-		try {
-			super.init(site, input);
-			if (partListener == null) {
-				partListener = new PartListener();
-			}
-			// getSite().getPage().addPartListener(partListner);
-			// we want to listen for our own activation
-			IWorkbenchWindow window = getSite().getWorkbenchWindow();
-			window.getPartService().addPartListener(partListener);
-			window.getShell().addShellListener(partListener);
-		}
-		catch (Exception e) {
-			// log for now, unless we find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-		setPartName(input.getName());
-	}
-
-	/*
-	 * (non-Javadoc) Returns whether the "save as" operation is supported by
-	 * this editor. <p> Subclasses must override this method to implement the
-	 * open-save-close lifecycle for an editor. For greater details, see
-	 * <code> IEditorPart </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public boolean isSaveAsAllowed() {
-		return fTextEditor != null && fTextEditor.isSaveAsAllowed();
-	}
-
-	/*
-	 * (non-Javadoc) Returns whether the contents of this editor should be
-	 * saved when the editor is closed. <p> This method returns <code> true
-	 * </code> if and only if the editor is dirty ( <code> isDirty </code> ).
-	 * </p>
-	 */
-	public boolean isSaveOnCloseNeeded() {
-		// overriding super class since it does a lowly isDirty!
-		if (fTextEditor != null)
-			return fTextEditor.isSaveOnCloseNeeded();
-		return isDirty();
-	}
-
-	/**
-	 * Notifies this multi-page editor that the page with the given id has
-	 * been activated. This method is called when the user selects a different
-	 * tab.
-	 * 
-	 * @param newPageIndex
-	 *            the index of the activated page
-	 */
-	protected void pageChange(int newPageIndex) {
-		super.pageChange(newPageIndex);
-
-		saveLastActivePageIndex(newPageIndex);
-	}
-
-	/**
-	 * Posts the update code "behind" the running operation.
-	 */
-	protected void postOnDisplayQue(Runnable runnable) {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
-		if (windows != null && windows.length > 0) {
-			Display display = windows[0].getShell().getDisplay();
-			display.asyncExec(runnable);
-		}
-		else
-			runnable.run();
-	}
-
-	/**
-	 * Indicates that a property has changed.
-	 * 
-	 * @param source
-	 *            the object whose property has changed
-	 * @param propId
-	 *            the id of the property which has changed; property ids are
-	 *            generally defined as constants on the source class
-	 */
-	public void propertyChanged(Object source, int propId) {
-		switch (propId) {
-			// had to implement input changed "listener" so that
-			// strucutedText could tell it containing editor that
-			// the input has change, when a 'resource moved' event is
-			// found.
-			case IEditorPart.PROP_INPUT :
-			case IEditorPart.PROP_DIRTY : {
-				if (source == fTextEditor) {
-					if (fTextEditor.getEditorInput() != getEditorInput()) {
-						setInput(fTextEditor.getEditorInput());
-						// title should always change when input changes.
-						// create runnable for following post call
-						Runnable runnable = new Runnable() {
-							public void run() {
-								_firePropertyChange(IWorkbenchPart.PROP_TITLE);
-							}
-						};
-						// Update is just to post things on the display queue
-						// (thread). We have to do this to get the dirty
-						// property to get updated after other things on the
-						// queue are executed.
-						postOnDisplayQue(runnable);
-					}
-				}
-				break;
-			}
-			case IWorkbenchPart.PROP_TITLE : {
-				// update the input if the title is changed
-				if (source == fTextEditor) {
-					if (fTextEditor.getEditorInput() != getEditorInput()) {
-						setInput(fTextEditor.getEditorInput());
-					}
-				}
-				break;
-			}
-			default : {
-				// propagate changes. Is this needed? Answer: Yes.
-				if (source == fTextEditor) {
-					firePropertyChange(propId);
-				}
-				break;
-			}
-		}
-
-	}
-
-	protected void safelySanityCheckState() {
-		// If we're called before editor is created, simply ignore since we
-		// delegate this function to our embedded TextEditor
-		if (getTextEditor() == null)
-			return;
-
-		getTextEditor().safelySanityCheckState(getEditorInput());
-
-	}
-
-	protected void saveLastActivePageIndex(int newPageIndex) {
-		// save the last active page index to preference manager
-		getPreferenceStore().setValue(IXMLPreferenceNames.LAST_ACTIVE_PAGE, newPageIndex);
-	}
-
-	/**
-	 * Sets the currently active page.
-	 */
-	protected void setActivePage() {
-		// retrieve the last active page index from preference manager
-		int activePageIndex = getPreferenceStore().getInt(IXMLPreferenceNames.LAST_ACTIVE_PAGE);
-
-		// We check this range since someone could hand edit the XML
-		// preference file to an invalid value ... which I know from
-		// experience :( ... if they do, we'll reset to default and continue
-		// rather than throw an assertion error in the setActivePage(int)
-		// method.
-		if (activePageIndex < 0 || activePageIndex >= getPageCount()) {
-			activePageIndex = fSourcePageIndex;
-		}
-		setActivePage(activePageIndex);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
-	 */
-	protected void setInput(IEditorInput input) {
-		// If driven from the Source page, it's "model" may not be up to date
-		// with the input just yet. We'll rely on later notification from the
-		// TextViewer to set us straight
-		super.setInput(input);
-		setPartName(input.getName());
-	}
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionManager.java
deleted file mode 100644
index 55a4d83..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionManager.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-
-public class WSDLSelectionManager implements ISelectionProvider, ISelectionChangedListener
-{       
-  protected List listenerList = new ArrayList();
-  protected ISelection currentSelection;
-  protected boolean enableNotify = true;
-
-  public void setSelection(ISelection selection, ISelectionProvider source)
-  {  
-    if (enableNotify)
-    {
-      currentSelection = selection;
-      enableNotify = false;
-      try
-      {
-        SelectionChangedEvent event = new SelectionChangedEvent(source, selection);
-        List copyOfListenerList = new ArrayList(listenerList);
-        for (Iterator i = copyOfListenerList.iterator(); i.hasNext(); )
-        {
-          ISelectionChangedListener listener = (ISelectionChangedListener)i.next();
-          listener.selectionChanged(event);
-        }
-      }
-      finally
-      {
-        enableNotify = true;
-      }
-    }
-  }      
-
-  //  implements ISelectionProvider
-  //
-  public void setSelection(ISelection selection)
-  {
-    setSelection(selection, this);
-  }
-
-  public ISelection getSelection() 
-  {
-    return currentSelection;
-  }
-
-  public void removeSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.remove(listener);
-  }
-  
-  public void addSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.add(listener);
-  } 
-  
-  // implements ISelectionChangedListener
-  //
-  public void selectionChanged(SelectionChangedEvent event)  
-  {                                                                                         
-    if (enableNotify)
-    {
-      setSelection(event.getSelection(), event.getSelectionProvider());
-    }
-  }
-}                      
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java
deleted file mode 100644
index 8b9ac3e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLTextEditor.java
+++ /dev/null

@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.sse.core.internal.model.ModelManagerImpl;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.view.events.INodeSelectionListener;
-import org.eclipse.wst.sse.ui.internal.view.events.NodeSelectionChangedEvent;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.GenerateBindingOnSaveDialog;
-import org.eclipse.wst.wsdl.ui.internal.outline.ExtensibleOutlineProvider;
-import org.eclipse.wst.wsdl.ui.internal.outline.WSDLContentOutlinePage;
-import org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLTabbedPropertySheetPage;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.SelectionAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @deprecated use StructuredTextEditor directly instead
- */
-public class WSDLTextEditor extends StructuredTextEditor implements INodeSelectionListener, ISelectionChangedListener, ITabbedPropertySheetPageContributor
-{
-  protected WSDLEditor wsdlEditor;
-  protected WSDLContentOutlinePage outlinePage;
-  protected WSDLSelectionManager wsdlSelectionManager;
-  protected InternalSelectionProvider internalSelectionProvider = new InternalSelectionProvider();
-  private IPropertySheetPage fPropertySheetPage;
-  private ExtensibleOutlineProvider fExtensibleOutlineProvider;
-
-  public WSDLTextEditor(WSDLEditor wsdlEditor)
-  {
-    this.wsdlEditor = wsdlEditor;
-    wsdlSelectionManager = wsdlEditor.getSelectionManager();
-    wsdlSelectionManager.addSelectionChangedListener(this);
-  }
-
-  public void createPartControl(Composite arg0)
-  {
-    super.createPartControl(arg0);
-    addOpenOnSelectionListener();
-  }
-
-  protected void addOpenOnSelectionListener()
-  {
-    KeyAdapter keyAdapter = new KeyAdapter()
-    {
-      public void keyReleased(KeyEvent arg0)
-      {
-        if (arg0.keyCode == SWT.F3)
-        {
-          List list = getViewerSelectionManager().getSelectedNodes();
-          if (list.size() > 0)
-          {
-            Object object = list.get(0);
-            if (object instanceof Node)
-            {
-              OpenOnSelectionHelper helper = new OpenOnSelectionHelper(wsdlEditor.getDefinition());   
-              helper.openEditor((Node)object);
-            }
-          }
-        }
-      }
-    };
-    getTextViewer().getTextWidget().addKeyListener(keyAdapter);
-  }
-
-   
-  public Object getAdapter(Class required)
-  {
-		if (IContentOutlinePage.class.equals(required))
-		{
-		  return getContentOutlinePage();
-		}    
-		if (IPropertySheetPage.class.equals(required))
-		{
-			if (fPropertySheetPage == null || fPropertySheetPage.getControl() == null || fPropertySheetPage.getControl().isDisposed())
-			{
-//			  System.out.println("Create WSDL Property Sheet");
-//        PropertySheetConfiguration cfg = createPropertySheetConfiguration();
-//        if (cfg != null)
-//        {
-//            if (cfg instanceof StructuredPropertySheetConfiguration)
-//            {
-//                ((StructuredPropertySheetConfiguration) cfg).setEditor(this);
-//            }
-//            ConfigurablePropertySheetPage propertySheetPage = new ConfigurablePropertySheetPage();
-//            propertySheetPage.setConfiguration(cfg);
-//            propertySheetPage.setModel(getModel());
-//            fPropertySheetPage = propertySheetPage;
-//        }
-
-//  	    fPropertySheetPage = new WSDLPropertySheetPage(getModel(), getEditorPart());
-//  	    ((WSDLPropertySheetPage) fPropertySheetPage).setSelectionManager(getWSDLEditor().getSelectionManager()); //getViewerSelectionManager());
-////	  	  ((WSDLPropertySheetPage) fPropertySheetPage).setPropertySourceProvider((WSDLPropertySheetPage) fPropertySheetPage);
-//  	    ((WSDLPropertySheetPage)fPropertySheetPage).setPropertySourceProvider(new ExtensiblePropertySourceProvider(getWSDLEditor()));
-////  	    getWSDLEditor().getSelectionManager().addSelectionChangedListener((WSDLPropertySheetPage)fPropertySheetPage);
-
-  	    fPropertySheetPage = new WSDLTabbedPropertySheetPage(this, getWSDLEditor());
-  	    ((WSDLTabbedPropertySheetPage)fPropertySheetPage).setSelectionManager(getWSDLEditor().getSelectionManager());
-
-			}
-			return fPropertySheetPage;
-		}
-	
-		return super.getAdapter(required);
-  }
-
-  public String[] getPropertyCategories()
-  {
-    return new String[] { "general", "namespace", "other", "attributes", "documentation", "facets" };
-  }
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor#getContributorId()
-	 */
-	public String getContributorId()
-	{
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLTextEditor";
-	//	 return getSite().getId();
-  }
-  
-  /*
-   * @see StructuredTextEditor#getContentOutlinePage()
-   */
-  public IContentOutlinePage getContentOutlinePage()
-  {
-    if ((outlinePage == null) || outlinePage.getControl() == null || (outlinePage.getControl().isDisposed()))
-    {
-      outlinePage = new WSDLContentOutlinePage(wsdlEditor);
-      outlinePage.setContentProvider(getExtensibleOutlineProvider());
-      outlinePage.setLabelProvider(getExtensibleOutlineProvider());
-      outlinePage.setModel(wsdlEditor.getDefinition()); //XMLDocument());
-
-      getViewerSelectionManager().addNodeSelectionListener(this);
-      internalSelectionProvider.addSelectionChangedListener(getViewerSelectionManager());
-      internalSelectionProvider.setEventSource(outlinePage);
-    }
-    return outlinePage;
-  }
-
-  public WSDLEditor getWSDLEditor()
-  {
-    return (WSDLEditor)getEditorPart();
-  }
-
-  // used to map selections from the outline view to the source view
-  // this class thinks of selections in terms of DOM element
-  class InternalSelectionProvider extends SelectionAdapter
-  {
-    protected Object getObjectForOtherModel(Object object)
-    {
-      Node node = null;
-
-      if (object instanceof Node)
-      {
-        node = (Node)object;
-      }
-      else
-      {
-        node = WSDLEditorUtil.getInstance().getNodeForObject(object);
-      }
-
-      // the text editor can only accept sed nodes!
-      //
-      if (!(node instanceof IDOMNode))
-      {
-        node = null;
-      }
-      return node;
-    }
-  }
-
-  public void selectionChanged(SelectionChangedEvent event)
-  {
-    // here we convert the model selection to a node selection req'd for the source view
-    //
-    internalSelectionProvider.setSelection(event.getSelection());
-  }
-
-  public void nodeSelectionChanged(NodeSelectionChangedEvent event)
-  {
-    // here we convert an node seleciton to a model selection as req'd by the other views
-    //
-    if (!event.getSource().equals(internalSelectionProvider))
-    {
-      Element element = null;
-      List list = event.getSelectedNodes();
-      for (Iterator i = list.iterator(); i.hasNext();)
-      {
-        Node node = (Node)i.next();
-        if (node != null)
-        {
-	        if (node.getNodeType() == Node.ELEMENT_NODE)
-	        {
-	          element = (Element)node;
-	          break;
-	        }
-	        else if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-	        {
-	          element = ((Attr)node).getOwnerElement();
-	          break;
-	        }
-        }
-      }
-
-      Object o = element;
-      if (element != null)
-      {
-        Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(wsdlEditor.getDefinition(), element);
-        if (modelObject != null)
-        {
-          o = modelObject;
-        }
-      }
-
-      if (o != null)
-      {
-        wsdlSelectionManager.setSelection(new StructuredSelection(o), internalSelectionProvider);
-      }
-      else
-      {
-        wsdlSelectionManager.setSelection(new StructuredSelection(), internalSelectionProvider);
-      }
-    }
-  }
-
-  public void update()
-  {
-    super.update();
-    if (outlinePage != null) {    	
-    	IDocument doc = getDocumentProvider().getDocument(getEditorInput());	
-    	IModelManager modelManager = ModelManagerImpl.getInstance();    	
-    	outlinePage.setModel(modelManager.getModelForRead((IStructuredDocument) doc));
-    }
-  }
-  
-  /*
-   * We override this method so we can hook in our automatic Binding generation.
-   * We will generate the Binding after a save is executed (If this preference
-   * has been set to true).
-   */
-  public void doSave(IProgressMonitor monitor) {
-      try{
-		  // Display prompt message
-		  boolean continueRegeneration = false;
-		  if (WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean("Prompt Regenerate Binding on save")) {
-			  Shell shell = Display.getCurrent().getActiveShell();
-			  GenerateBindingOnSaveDialog dialog = new GenerateBindingOnSaveDialog(shell);
-	
-			  int rValue = dialog.open();
-			  if (rValue == SWT.YES) {
-				  continueRegeneration = true;
-			  }
-			  else if (rValue == SWT.NO) {
-				  continueRegeneration = false;
-			  }
-			  else if (rValue == SWT.CANCEL) {
-				  return;
-			  }
-			  else {
-				  System.out.println("\nNothing: " + rValue);
-			  }
-		  }
-		  else {
-			  continueRegeneration = WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"));
-		  }
-    	  
-		  if (continueRegeneration) {
-			  Iterator bindingsIt = wsdlEditor.getDefinition().getEBindings().iterator();
-			  while (bindingsIt.hasNext()) {
-				  Binding binding = (Binding) bindingsIt.next();
-				  BindingGenerator generator = new BindingGenerator(binding.getEnclosingDefinition(), binding);
-				  generator.setOverwrite(false);
-				  generator.generateBinding();
-			  }
-			  
-			  // Little hack to 'redraw' connecting lines in the graph viewer
-			  wsdlEditor.getDefinition().setQName(wsdlEditor.getDefinition().getQName());
-		  }
-      }
-      catch (Exception e)
-      {
-//    	  e.printStackTrace();
-      }
-	  super.doSave(monitor);
-  }
-
-  public InternalSelectionProvider getInternalSelectionProvider() {
-	return internalSelectionProvider;
-  }
-  
-  public ExtensibleOutlineProvider getExtensibleOutlineProvider() {
-	if (fExtensibleOutlineProvider == null) {
-	  fExtensibleOutlineProvider = new ExtensibleOutlineProvider(getWSDLEditor());
-	}
-	return fExtensibleOutlineProvider;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddEEMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddEEMenuActionContributor.java
deleted file mode 100644
index a8bb5d6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddEEMenuActionContributor.java
+++ /dev/null

@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-                      
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAction;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.ui.internal.actions.MenuBuilder;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonResources;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-                             
-/**
- * TODO... there are likely several places where we can refactor code from  AbstractNodeActionManager
- */
-public class AddEEMenuActionContributor implements IMenuActionContributor
-{                   
-  protected MenuBuilder menuBuilder = new MenuBuilder();
-
-  public void contributeMenuActions(final IMenuManager menu, Node node, Object object)
-  {
-    boolean isSubmenuRequired = false;
-    Element element = null;
-
-    if (object instanceof WSDLElement)
-    {     
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {                   
-      	public Object caseBinding(Binding binding)
-        {                                          
-          return Boolean.TRUE;
-	      } 
-
-      	public Object caseBindingOperation(BindingOperation bindingOperation)
-        {                                          
-          return Boolean.TRUE;
-	      } 
-
-      	public Object caseBindingInput(BindingInput bindingInput)
-        {                                          
-          return Boolean.TRUE;
-	      } 
-
-      	public Object caseBindingOutput(BindingOutput bindingOutput)
-        {                                          
-          return Boolean.TRUE;
-	      }
-
-      	public Object caseBindingFault(BindingFault bindingFault)
-        {                                          
-          return Boolean.TRUE;
-	      } 
- 
-      	public Object caseDefinition(Definition definition)
-        {      
-          return Boolean.TRUE;
-	      }           
-     
-      	public Object casePort(Port port)
-        {                                         
-          return Boolean.TRUE;
-        } 
-      	public Object caseUnknownExtensibilityElement(UnknownExtensibilityElement unknownExtensibilityElement)
-      	{
-      		if (getExtensibilityElementActions(unknownExtensibilityElement.getElement()).size() > 0)
-      		{      		
-      			return Boolean.TRUE;
-      		}
-      		else
-      		{
-      			return Boolean.FALSE;
-      		}
-      	}
-      };        
-      isSubmenuRequired = wsdlSwitch.doSwitch((WSDLElement)object) != null;
-      element = WSDLEditorUtil.getInstance().getElementForObject(object);      
-    }
-    else if (object instanceof WSDLGroupObject)
-    {
-      WSDLGroupObject groupObject = (WSDLGroupObject)object;
-     
-      switch (groupObject.getType())
-      {   
-        case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP : 
-        {
-          isSubmenuRequired = true;
-          element = WSDLEditorUtil.getInstance().getElementForObject(groupObject.getDefinition());    
-          break;
-        }
-      }   
-    }
-
-    if (isSubmenuRequired)
-    {
-      MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ADD_EXTENSIBILITY_ELEMENT"));  //$NON-NLS-1$
-      // here I'm attempting to add the menu item in a 'good' place in the exisiting menu
-      // todo add menu groups to avoid the need for this test
-      //
-//      if (menu.find("addchild") != null)
-//      {
-//      	menu.insertAfter("addchild", submenu);
-//      }
-//      else
-//      {
-//      	menu.add(submenu);
-//      }	 
-    	menu.add(submenu);
-      if (element != null && element instanceof IDOMNode)
-      {
-        addExtensibilityElementActions(submenu, element);
-      }
-    }
-  }
-
-  public void addExtensibilityElementActions(IMenuManager menu, Element element)
-  {                 
-    ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-    CMElementDeclaration ed = modelQuery.getCMElementDeclaration(element);
-    
-    if (ed != null)
-    {
-      addActionHelper(menu, getExtensibilityElementActions(element));
-    }
-  }
-  
-  public List getExtensibilityElementActions(Element element) {
-    List modelQueryActionList = new ArrayList();
-  	ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-    CMElementDeclaration ed = modelQuery.getCMElementDeclaration(element);                                                                                                                            
-
-    if (ed != null)
-    {                                                                                    
-      // add insert child node actions
-      //
-      int ic = ModelQuery.INCLUDE_CHILD_NODES;
-      int vc = ModelQuery.VALIDITY_STRICT;
-
-      modelQuery.getInsertActions(element, ed, -1, ic, vc, modelQueryActionList);
-    }
-    
-    return modelQueryActionList;
-  }
-  
-
-  protected void addActionHelper(IMenuManager menu, List modelQueryActionList)
-  {                          
-    List actionList = new Vector();
-
-    for (Iterator i = modelQueryActionList.iterator(); i.hasNext(); )
-    {                                                   
-      ModelQueryAction action = (ModelQueryAction)i.next();
-      CMNode cmnode = action.getCMNode();
-      if (cmnode != null)
-      {                                       
-        boolean isOtherNamespace = false;
-        CMDocument cmDocument = (CMDocument)cmnode.getProperty("CMDocument");
-        if (cmDocument != null)          
-        {             
-          String namespaceURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); 
-          isOtherNamespace = namespaceURI != null && !namespaceURI.equals(WSDLConstants.WSDL_NAMESPACE_URI);
-        }
-
-        if (isOtherNamespace)
-        {
-          int cmNodeType = cmnode.getNodeType();
-          if (action.getKind() == ModelQueryAction.INSERT)
-          {                                                 
-            switch (cmNodeType)                             
-            {
-              case CMNode.ELEMENT_DECLARATION :
-              {
-                actionList.add(new AddNodeAction((CMElementDeclaration)cmnode, action.getParent(), action.getStartIndex()));
-                break;
-              }
-            }
-          }           
-        }
-      }   
-    }  
-    menuBuilder.populateMenu(menu, actionList, false);
-  }   
-
-  /**
-   * AddNodeAction
-   */
-  public class AddNodeAction extends BaseNodeAction
-  {
-    protected String description;
-    protected String undoDescription; 
-    protected CMNode cmnode;
-    protected int index;
-    protected Node parent;
-
-
-    public AddNodeAction(CMNode cmnode, Node parent,  int index)
-    {                                 
-      this.cmnode = cmnode;
-      this.parent = parent;
-      this.index = index;                                   
-                                                                                                
-      String text = getLabel(parent, cmnode);
-      setText(text);     
-      description = text;
-      undoDescription = XMLCommonResources.getInstance().getString("_UI_MENU_ADD") + " " + text;
-      //setImageDescriptor(imageDescriptorCache.getImageDescriptor(cmnode)); 
-    }
-
-    public String getLabel(Node parent, CMNode cmnode)
-    {                                                
-      String result = "?" + cmnode + "?";
-      if (cmnode != null)
-      {                
-        result = DOMNamespaceHelper.computeName(cmnode, parent, null);         
-      }
-      return result;   
-    }  
-
-    public Node getNode()
-    {
-      return parent;
-    }
-
-    public String getUndoDescription()
-    {
-      return undoDescription;
-    }
-
-    public void run()
-    {
-      beginRecording();
-
-      if (cmnode != null && parent != null)
-      {
-        Document document = parent.getNodeType() == Node.DOCUMENT_NODE ? (Document)parent : parent.getOwnerDocument();        
-
-        DOMContentBuilder builder = new DOMContentBuilderImpl(document); 
-        builder.setProperty(DOMContentBuilder.PROPERTY_BUILD_BLANK_TEXT_NODES, Boolean.TRUE);
-        builder.setBuildPolicy(DOMContentBuilder.BUILD_ONLY_REQUIRED_CONTENT);
-        builder.build(parent, cmnode);
-        insertNodesAtIndex(parent, builder.getResult(), index, true);
-      }
-
-      endRecording();
-    } 
-
-    public void insertNodesAtIndex(Node parent, List list, int index, boolean format)
-    {                   
-      NodeList nodeList = parent.getChildNodes();
-      if (index == -1)
-      {
-        index = nodeList.getLength();
-      }
-      Node refChild = (index < nodeList.getLength()) ? nodeList.item(index) : null;
-    
-      // here we consider the case where the previous node is a 'white space' Text node
-      // we should really do the insert before this node
-      //
-      int prevIndex = index - 1;
-      Node prevChild = (prevIndex < nodeList.getLength()) ? nodeList.item(prevIndex) : null;
-	    if (isWhitespaceTextNode(prevChild)) 
-      {
-	  	  refChild = prevChild;
-	    }
-    
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        Node newNode = (Node)i.next();
-    
-        if (newNode.getNodeType() == Node.ATTRIBUTE_NODE)
-        {
-          Element parentElement = (Element)parent;
-          parentElement.setAttributeNode((Attr)newNode);
-        }
-        else
-        {
-          parent.insertBefore(newNode, refChild);
-        }  
-      }
-    
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        Node newNode = (Node)i.next();
-        if (format)
-        {                                                             
-		      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-		      formatProcessorXML.formatNode((IDOMNode)newNode);
-        }  
-      }                      
-	    //setViewerSelection(list);
-    }   
-
-    protected boolean isWhitespaceTextNode(Node node) 
-    {
-	    return (node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().trim().length() == 0);
-    } 
-  }                                       
-}    
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java
deleted file mode 100644
index 12a1f6b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java
+++ /dev/null

@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class AddElementAction extends BaseNodeAction {
-	protected Node parentNode;
-	protected String prefix;
-	protected String nodeName;
-	protected Element newElement;
-	protected Node relativeNode = null;
-	protected IEditorPart editorPart;
-	protected Definition definition;
-	protected Document document;
-	protected boolean computeTopLevelRefChild;
-
-	protected boolean selectNewlyCreatedObject = true; // We should not be
-														// selecting the
-														// object in the
-														// action..... TODO
-
-	public AddElementAction(String text, String imageDescriptorKey, Node parentNode, String nodeName) {
-		setText(text);
-		setImageDescriptor(WSDLEditorPlugin.getImageDescriptor(imageDescriptorKey));
-		this.parentNode = parentNode;
-		this.nodeName = nodeName;
-	}
-
-	public AddElementAction(String text, String imageDescriptorKey, Node parentNode, String prefix, String localName) {
-		setText(text);
-		setImageDescriptor(WSDLEditorPlugin.getImageDescriptor(imageDescriptorKey));
-		this.parentNode = parentNode;
-		this.prefix = prefix;
-		this.nodeName = localName;
-	}
-
-	public AddElementAction(String text, Node parentNode, String prefix, String localName) {
-		setText(text);
-		setImageDescriptor(null);
-		this.parentNode = parentNode;
-		this.prefix = prefix;
-		this.nodeName = localName;
-	}
-
-	public AddElementAction(Node parentNode, String prefix, String localName, Node relativeNode) {
-		this.parentNode = parentNode;
-		this.prefix = prefix;
-		this.nodeName = localName;
-		this.relativeNode = relativeNode;
-	}
-
-	public void setComputeTopLevelRefChild(boolean isEnabled) {
-		computeTopLevelRefChild = isEnabled;
-	}
-
-	protected void setEditorPart(IEditorPart editorPart) {
-		this.editorPart = editorPart;
-	}
-
-	protected boolean showDialog() {
-		return true;
-	}
-
-	public void run() {
-		boolean ok = showDialog();
-		if (ok) {
-			beginRecording();
-			performAddElement();
-			endRecording();
-		}
-	}
-
-	protected void performAddElement() {
-		if (parentNode != null) {
-			newElement = createElement(nodeName);
-			addAttributes(newElement);
-			if (relativeNode == null && computeTopLevelRefChild) {
-				relativeNode = computeTopLevelRefChild(newElement);
-			}
-
-			if (relativeNode == null) {
-				parentNode.appendChild(newElement);
-			}
-			else {
-				parentNode.insertBefore(newElement, relativeNode);
-			}
-			// format(parentNode);
-			format(newElement);
-			// Ugly..... We should not be selecting the object in the graph
-			// view in the Action.
-			// This should be refactored out. We add this boolean check
-			// because WSDLSetTypeDialog.java
-			// uses AddImportAction.java but we should not be selecting the
-			// newly created import....
-			if (selectNewlyCreatedObject) {
-				selectObjectForNewElement();
-			}
-		}
-	}
-
-	// Ugly..... We should not be selecting the object in the graph view in
-	// the Action.
-	// This should be refactored out. We add this boolean check because
-	// WSDLSetTypeDialog.java
-	// uses AddImportAction.java but we should not be selecting the newly
-	// created import....
-	// We should call this method before calling run()
-	public void selectObjectForNewElement(boolean select) {
-		selectNewlyCreatedObject = select;
-	}
-
-	public Node getNode() {
-		if (parentNode != null) {
-			return parentNode;
-		}
-		else {
-			return document;
-		}
-	}
-
-
-	public String getUndoDescription() {
-		return WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD");
-	}
-
-
-	protected Element createElement(String nodeName) {
-		Document document = parentNode.getOwnerDocument();
-
-		Element element = (prefix != null && prefix.length() > 0) ? document.createElement(prefix + ":" + nodeName) : document.createElement(nodeName);
-
-		return element;
-	}
-
-	protected void addAttributes(Element newElement) {
-	}
-
-
-	protected void format(Node parentNode) {
-		if (parentNode instanceof IDOMNode) {
-			// format selected node
-			FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-			formatProcessorXML.formatNode((IDOMNode) parentNode);
-
-		}
-	}
-
-	protected Element getDefinitionElement(Element parentElement) {
-		Element definitionElement = null;
-
-		for (Node node = parentElement.getOwnerDocument().getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				Element element = (Element) node;
-				if (WSDLEditorUtil.getInstance().getWSDLType(element) == WSDLConstants.DEFINITION) {
-					definitionElement = element;
-					break;
-				}
-			}
-		}
-		return definitionElement;
-	}
-
-	public Element getNewElement() {
-		return newElement;
-	}
-
-	public void setDefinition(Definition definition) {
-		this.definition = definition;
-	}
-
-	public void selectObjectForNewElement() {
-		if (editorPart == null) {
-			editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		}
-		if (editorPart != null && definition != null) {
-			Object object = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, newElement);
-			if (object != null) {
-				ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-				if (selectionProvider != null) {
-					selectionProvider.setSelection(new StructuredSelection(object));
-				}
-			}
-		}
-	}
-
-	public void selectObject(WSDLElement object) {
-		if (editorPart == null) {
-			editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		}
-		if (editorPart != null && definition != null) {
-			if (object != null) {
-				ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-				if (selectionProvider != null) {
-					selectionProvider.setSelection(new StructuredSelection(object));
-				}
-			}
-		}
-	}
-
-	public String showDialogHelper(String title, String defaultName, List usedNames) {
-		String result = defaultName;
-		NewComponentDialog dialog = new NewComponentDialog(WSDLEditorPlugin.getShell(), title, defaultName, usedNames);
-		int rc = dialog.createAndOpen();
-		if (rc == IDialogConstants.OK_ID) {
-			result = dialog.getName();
-		}
-		else {
-			result = null;
-		}
-		return result;
-	}
-
-	protected Node computeTopLevelRefChild(Node nodeToAdd) {
-		Node result = null;
-		int a = getPrecedence(nodeToAdd);
-
-		for (Node node = parentNode.getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				int b = getPrecedence(node);
-				if (b > a) {
-					result = node;
-					break;
-				}
-			}
-		}
-		return result;
-	}
-
-	protected void createDefinitionStub() {
-		if (document != null) {
-			// Create the Definitions element with proper namespace
-			Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-			String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-			if (charSet == null || charSet.trim().equals("")) {
-				charSet = "UTF-8";
-			}
-			document.appendChild(document.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"" + charSet + "\""));
-			Element root = document.createElement("wsdl:definitions");
-			document.appendChild(root);
-
-			// Add various namespace attributes here.
-			root.setAttribute("xmlns:soap", "http://schemas.xmlsoap.org/wsdl/soap/");
-			root.setAttribute("xmlns:tns", getDefaultNamespace());
-			root.setAttribute("xmlns:wsdl", "http://schemas.xmlsoap.org/wsdl/");
-			root.setAttribute("xmlns:xsd", "http://www.w3.org/2001/XMLSchema");
-			root.setAttribute("name", getFileName());
-			root.setAttribute("targetNamespace", getDefaultNamespace());
-
-			definition.setElement(root);
-			parentNode = root;
-			prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-		}
-	}
-
-	private String getDefaultNamespace() {
-		String namespace = WSDLEditorPlugin.getInstance().getPreferenceStore().getString(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"));
-		if (!namespace.endsWith("/")) {
-			namespace = namespace.concat("/");
-		}
-
-		namespace += getFileName() + "/";
-
-		return namespace;
-	}
-
-	private String getFileName() {
-		String fileLocation = definition.getLocation();
-		IPath filePath = new Path(fileLocation);
-		return filePath.removeFileExtension().lastSegment().toString();
-	}
-
-	protected static HashMap precedenceMap = createPrecedenceMap();
-
-	protected static int getPrecedence(Node node) {
-		int result = 2;
-		String localName = node.getLocalName();
-		if (localName != null) {
-			Integer integer = (Integer) precedenceMap.get(localName);
-			if (integer != null) {
-				result = integer.intValue();
-			}
-		}
-		return result;
-	}
-
-	protected static HashMap createPrecedenceMap() {
-		HashMap hashMap = new HashMap();
-		hashMap.put(WSDLConstants.DOCUMENTATION_ELEMENT_TAG, new Integer(1));
-		hashMap.put(WSDLConstants.IMPORT_ELEMENT_TAG, new Integer(3));
-		hashMap.put(WSDLConstants.TYPES_ELEMENT_TAG, new Integer(4));
-		hashMap.put(WSDLConstants.MESSAGE_ELEMENT_TAG, new Integer(5));
-		hashMap.put(WSDLConstants.PORT_TYPE_ELEMENT_TAG, new Integer(6));
-		hashMap.put(WSDLConstants.BINDING_ELEMENT_TAG, new Integer(7));
-		hashMap.put(WSDLConstants.SERVICE_ELEMENT_TAG, new Integer(8));
-		return hashMap;
-	}
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java
deleted file mode 100644
index 8bdee2f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class AddElementDeclarationAction extends Action
-{
-	protected Definition definition;
-	protected String namespace;
-	protected String prefix;
-	
-	public AddElementDeclarationAction(Definition definition, String namespace, String suggestedPrefix)
-	{
-		this.definition = definition;
-		this.namespace = namespace;
-		this.prefix = suggestedPrefix;
-	}
-	
-	public void run()
-	{
-		String existingPrefix = definition.getPrefix(namespace);
-		if (existingPrefix != null)
-		{
-			prefix = existingPrefix;
-		}
-		else
-		{
-			prefix = NameUtil.buildUniquePrefix(definition, prefix);
-			Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-			if (definitionElement != null)
-			{
-				definitionElement.setAttribute("xmlns:" + prefix, namespace);
-			}			
-		}		
-	}
-	
-	public String getPrefix()
-	{
-		return prefix;
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java
deleted file mode 100644
index fc85352..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class AddImportAction extends AddElementAction
-{                              
-  protected String namespace;
-  protected String location;
-  protected String elementDeclarationNamespacePrefix;
-
-  public AddImportAction(IEditorPart part, Definition definition, Node parentNode, String prefix)
-  {
-	this(part, definition, parentNode, prefix, null, null);
-  }
-  
-  public AddImportAction(IEditorPart part, Definition definition, Node parentNode, String prefix, String namespace, String location)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_IMPORT"), "icons/import_obj.gif", parentNode, prefix, "import");
-	  setDefinition(definition);
-	  setComputeTopLevelRefChild(true);
-	  this.namespace = namespace;
-	  this.location = location;
-	  setEditorPart(part);
-	  
-	  if (part instanceof WSDLEditor) {
-	  	document = ((WSDLEditor) part).getXMLDocument();
-	  }
-  }
-        
-  protected Element createElement(String nodeName)
-  {
-  	if (elementDeclarationNamespacePrefix != null && namespace != null)
-  	{ 
-    	Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    	if (definitionElement != null)
-    	{    
-	  	  definitionElement.setAttribute("xmlns:" + elementDeclarationNamespacePrefix, namespace);
-    	}      	
-  	}
-  	return super.createElement(nodeName);  
-  }
-  
-  public void setElementDeclarationNamespacePrefix(String nsPrefix)
-  {
-  	this.elementDeclarationNamespacePrefix = nsPrefix;
-  }
-                   
-  protected void addAttributes(Element newElement)
-  {                                              
-    newElement.setAttribute("namespace", namespace != null ? namespace : "");
-    newElement.setAttribute("location", location != null ? location : "");
-  }                                     
-  
-  public void performAddElement() {
-  	if (parentNode == null || (document != null && document.getChildNodes().getLength() == 0)) {
-  		createDefinitionStub();
-  	}
-  	
-  	super.performAddElement();
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddMessageUIAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddMessageUIAction.java
deleted file mode 100644
index 7e39d86..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddMessageUIAction.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-
-
-public final class AddMessageUIAction extends WSDLElementUIAction
-{
-  private Definition definition;
-  private String name;
-  
-  public AddMessageUIAction
-  	(Definition definition, 
-     String name, 
-     boolean createPart)
-  {
-    super
-    	(new AddMessageCommand(definition,name,createPart), 
-    	 WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD"), 
-    	 WSDLConstants.MESSAGE_ELEMENT_TAG, 
-    	 WSDLEditorPlugin.getImageDescriptor("icons/message_obj.gif"));
-    
-    this.definition = definition;
-    this.name = name;
-  }
- 
-  protected boolean showDialog()
-  {
-	  name = NameUtil.buildUniqueMessageName(definition, name);
-	  name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_MESSAGE"), name);
-	  return name != null;
-  }
-  
-  protected String showDialogHelper(String title, String defaultName)
-  {   
-    String result = defaultName;                                                                                             
-    NewComponentDialog dialog = new NewComponentDialog(WSDLEditorPlugin.getShell(), title, defaultName);
-    int rc = dialog.createAndOpen();
-    if (rc == IDialogConstants.OK_ID)
-    {
-      result = dialog.getName();  
-    }
-    else
-    {
-      result = null;
-    }               
-    return result;
-  } 
-  
-  protected void preRun()
-  {
-    ((AddMessageCommand)super.modelAction).setLocalName(name);
-  }
-
-  protected WSDLElement getOwner()
-  {
-    return definition;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddNamespaceDeclarationsAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddNamespaceDeclarationsAction.java
deleted file mode 100644
index b352e34..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddNamespaceDeclarationsAction.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Hashtable;
-
-import org.eclipse.jface.action.Action;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class AddNamespaceDeclarationsAction extends Action
-{
-  protected Element ownerElement;
-  protected String[] namespaceNames;
-  protected String[] preferredPrefixes;
-
-  public AddNamespaceDeclarationsAction(Element ownerElement, String[] namespaceNames, String[] preferredPrefixes)
-  {
-    this.ownerElement = ownerElement;
-    this.namespaceNames = namespaceNames;
-    this.preferredPrefixes = preferredPrefixes;
-  }
-
-  public AddNamespaceDeclarationsAction(Element ownerElement, String namespaceName, String preferredPrefix)
-  {
-    this.ownerElement = ownerElement;
-    namespaceNames = new String[1];
-    namespaceNames[0] = namespaceName;
-
-    preferredPrefixes = new String[1];
-    preferredPrefixes[0] = preferredPrefix;
-  }
-
-  public void run()
-  {
-    if (ownerElement != null)
-    {
-      NamedNodeMap map = ownerElement.getAttributes();
-      Hashtable table = new Hashtable();
-      Hashtable prefixTable = new Hashtable();
-
-      int mapLength = map.getLength();
-      for (int i = 0; i < mapLength; i++)
-      {
-        Attr attribute = (Attr) map.item(i);
-        String attributeName = attribute.getName();
-        if (attributeName.startsWith("xmlns:"))
-        {
-          table.put(attribute.getValue(), Boolean.TRUE);
-          prefixTable.put(attributeName.substring(6), Boolean.TRUE);
-        }
-        else if (attributeName.equals("xmlns"))
-        {
-          table.put(attribute.getValue(), Boolean.TRUE);
-          prefixTable.put("", Boolean.TRUE);
-        }
-      }
-
-      for (int i = 0; i < namespaceNames.length; i++)
-      {
-        String namespace = namespaceNames[i];
-        if (table.get(namespace) == null)
-        {
-          String prefix = (i < preferredPrefixes.length) ? preferredPrefixes[i] : "p0";
-          if (prefixTable.get(prefix) != null)
-          {
-            prefix = computeUniquePrefix("p", prefixTable);
-          }
-
-          String attributeName = prefix.length() > 0 ? "xmlns:" + prefix : "xmlns";
-          ownerElement.setAttribute(attributeName, namespace);
-        }
-      }
-    }
-  }
-
-  protected String computeUniquePrefix(String base, Hashtable table)
-  {
-    int i = 0;
-    String prefix = base;
-    while (true)
-    {
-      if (table.get(prefix) == null)
-      {
-        break;
-      }
-      else
-      {
-        prefix = base + i;
-        i++;
-      }
-    }
-    return prefix;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java
deleted file mode 100644
index 182c6a4..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class AddWSISchemaImportAction extends BaseNodeAction
-{
-    protected Definition definition;
-    protected Element definitionElement;
-    protected String namespace;
-    protected String location;
-    protected String elementDeclarationNamespacePrefix;
-
-    public AddWSISchemaImportAction(Definition definition, String namespace, String location)
-    {
-        this.definition = definition;
-        this.namespace = namespace;
-        this.location = location;
-        definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    }
-
-    public Node getNode()
-    {
-        return definitionElement;
-    }
-    
-    public String getUndoDescription()
-    {
-    	return WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_IMPORT");
-    }
-
-    protected Element getOrCreateTypesElement()
-    {
-        Element typesElement = null;
-        if (definition.getTypes() == null)
-        {
-            if (definitionElement != null)
-            {
-                AddElementAction addTypesAction = new AddElementAction("", "icons/xsd_obj.gif", definitionElement, definitionElement.getPrefix(), "types");
-                addTypesAction.setComputeTopLevelRefChild(true);
-                addTypesAction.run();
-                typesElement = addTypesAction.getNewElement();
-                format(typesElement);
-            }
-        }
-        else
-        {
-            typesElement = WSDLEditorUtil.getInstance().getElementForObject(definition.getTypes());
-        }
-        return typesElement;
-    }
-    
-    protected Element getImportHolderElement(Element typesElement) {
-    	Element importHolderElement = null;
-        NodeList nodeList = typesElement.getChildNodes();
-        for (int i = 0; i < nodeList.getLength(); i++)
-        {
-            Node node = nodeList.item(i);
-            if (node.getNodeType() == Node.ELEMENT_NODE)
-            {
-                Element element = (Element) node;
-                if ("schema".equals(element.getLocalName()) && element.getAttribute("targetNamespace") == null)
-                {
-                    importHolderElement = element;
-                    break;
-                }
-            }
-        }
-        
-        return importHolderElement;
-    }
-
-    public Element getOrCreateImportHolderElement(Element typesElement)
-    {
-        Element importHolderElement = getImportHolderElement(typesElement);
-        if (importHolderElement == null)
-        {
-            AddElementAction addImportHolderAction = new AddElementAction("", "icons/xsd_obj.gif", typesElement, "xsd", "schema")
-            {
-                protected void addAttributes(Element newElement)
-                {
-                    newElement.setAttribute("xmlns:xsd", WSDLConstants.XSD_NAMESPACE_URI);
-                }
-            };
-            addImportHolderAction.run();
-            importHolderElement = addImportHolderAction.getNewElement();
-            format(importHolderElement);
-        }
-        return importHolderElement;
-    }
-    
-    // We don't want to add the import if it's already there
-    protected boolean importNotAlreadyExists() {
-    	boolean notExists = true;
-    	
-    	if (definition.getTypes() != null) {
-    		Element typesElement = WSDLEditorUtil.getInstance().getElementForObject(definition.getTypes());
-    		Element schemaElement = getImportHolderElement(typesElement);
-
-    		if (schemaElement != null) {
-    			// Collect children
-    			Node node = schemaElement.getFirstChild();
-    			java.util.Vector schemaChildren = new java.util.Vector();
-    			if (node != null) {
-    				Node child = node;
-					
-    				if (!(child instanceof org.eclipse.wst.xml.core.internal.document.TextImpl)) {
-    					schemaChildren.addElement(child);
-    				}
-					
-    				while (child.getNextSibling() != null) {
-    					child = child.getNextSibling();
-    					if (!(child instanceof org.eclipse.wst.xml.core.internal.document.TextImpl)) {
-    						schemaChildren.addElement(child);
-    					}
-    				}
-
-    				for (int index = 0; index < schemaChildren.size(); index++) {
-    					Element schemaChild = (Element) schemaChildren.elementAt(index);
-    					String schemaLocation = schemaChild.getAttribute("schemaLocation");
-    					String schemaNamespace = schemaChild.getAttribute("namespace");
-				
-    					if (schemaLocation != null && namespace != null &&
-    							schemaLocation.equals(location) && schemaNamespace.equals(namespace)) {
-    						notExists = false;
-    						break;
-    					}
-    				}
-    			}
-    		}
-    	}
-    	
-    	return notExists;
-    }
-
-    public void run()
-    {
-        if (definitionElement != null && importNotAlreadyExists())
-        {
-            beginRecording();
-            performAddElement();
-            endRecording();
-        }
-    }
-    public void performAddElement()
-    {
-        try
-        {
-            Element typesElement = getOrCreateTypesElement();
-            Element importHolderElement = getOrCreateImportHolderElement(typesElement);
-
-            AddElementAction addImportAction = new AddElementAction("", "icons/xsd_obj.gif", importHolderElement, importHolderElement.getPrefix(), "import")
-            {
-                protected void addAttributes(Element newElement)
-                {
-                    newElement.setAttribute("namespace", namespace);
-                    newElement.setAttribute("schemaLocation", location);
-                }
-            };
-            addImportAction.run();
-            Element newElement = addImportAction.getNewElement();
-            format(newElement);
-        }
-        catch (Exception e)
-        {
-        }
-    }
-
-    public void setElementDeclarationNamespacePrefix(String nsPrefix)
-    {
-        this.elementDeclarationNamespacePrefix = nsPrefix;
-    }
-
-    protected static void format(Node parentNode)
-    {
-        if (parentNode instanceof IDOMNode)
-        {
-            // format selected node                                                    
-            FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-            formatProcessorXML.formatNode((IDOMNode)parentNode);
-        }
-    }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java
deleted file mode 100644
index e7fc8de..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-                      
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Node;
-
-public abstract class BaseNodeAction extends Action
-{ 
-  public abstract Node getNode();
-  public abstract String getUndoDescription();
-
-  public void beginRecording()
-  {    
-    Node node = getNode();  
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, getUndoDescription());  
-    }
-  }
-
-  public void endRecording()
-  {                 
-    Node node = getNode(); 
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyGlobalAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyGlobalAction.java
deleted file mode 100644
index ba45fde..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyGlobalAction.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class CopyGlobalAction extends Action {
-  	private IEditorPart editor;
-  	private WSDLElement selection;
-  	
-  	public CopyGlobalAction(WSDLElement selection, IEditorPart editor) {
-  		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_COPY"));
-  		this.selection = selection;
-  		this.editor = editor;
-  		setEnabledState();
-  	}
-  	
-  	public void run() {
-  		if (editor instanceof WSDLEditor) {
-  			((WSDLEditor) editor).setClipboardContents(selection);
-  			
-  			((WSDLEditor) editor).getSelectionManager().setSelection(new StructuredSelection(selection));
-  		}
-  	}
-  	
-  	public void setSelection(WSDLElement newSelection) {
-  		selection = newSelection;
-  		setEnabledState();
-  	}
-  	
-  	protected void setEnabledState() {
-  		if (selection instanceof Operation) {
-  			setEnabled(true);
-  		}
-  		else {
-  	  		setEnabled(false);
-  		}
-  	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyWSDLElementAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyWSDLElementAction.java
deleted file mode 100644
index 3f3d8af..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyWSDLElementAction.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOperationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Node;
-
-/*
- * Class which copies a WSDLElement and it's 'children' elements.
- * For example, a copy command on a Operation will result in a copy
- * of the operation and it's input/output/faults, and it's message
- * and parts.
- */
-public class CopyWSDLElementAction extends WSDLDragAction {
-	WSDLElement element, parent;
-	Node parentNode;
-	WSDLElementCommand wsdlElementCommand;
-	EditPartViewer editPartViewer;
-	
-	/*
-	 *  element = The WSDLElement being copied
-	 *  parent = The Parent of the 'new' WSDLElement
-	 *  parentNode = ElementImpl (for undo)
-	 */	
-	public CopyWSDLElementAction(EditPartViewer editPartViewer, WSDLElement element, WSDLElement parent, Node parentNode) {
-		setText("Copy WSDLElement");  // Do not Translate This
-		this.element = element;	
-		this.parent = parent;
-		this.parentNode = parentNode;
-		this.editPartViewer = editPartViewer;
-	}
-	
-	public boolean canExecute() {
-		if (element instanceof Operation){
-			if(parent instanceof PortType) {
-				PortType pt = (PortType) parent;
-				Operation op = (Operation) element;
-				wsdlElementCommand  = new AddOperationCommand(pt, op, NameUtil.buildUniqueOperationName(pt, op.getName()), true);		
-			}
-		}
-		/*
-		else if (element instanceof MessageReference) {
-	
-		}
-		else if (element instanceof Input) {
-
-		}
-		else if (element instanceof Output) {
-			
-		}
-		else if (element instanceof Fault) {
-			
-		}
-		else if (element instanceof Message) {
-			
-		}
-		*/
-		
-		if (wsdlElementCommand != null) {
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
-	
-	public void run() {
-		if (wsdlElementCommand == null) {
-			if (canExecute()) {
-				runCommand();
-			}
-		}
-		 else {
-		 	runCommand();
-		 }
-	}
-	
-	private void runCommand() {
-	 	this.beginRecording();
-		wsdlElementCommand.run();
-		selectWSDLElement(wsdlElementCommand.getWSDLElement());
-		this.endRecording();
-	}
-	
-	private void selectWSDLElement(WSDLElement element) {
-		// Select the newly created element
-	    // Expand all the associated elements 'below' the given element
-	    Map editPartMap = editPartViewer.getEditPartRegistry();
-	    WSDLTreeNodeEditPart wsdlEditPart = (WSDLTreeNodeEditPart) editPartMap.get(element);
-	    if (wsdlEditPart != null) {
-	    	editPartViewer.select(wsdlEditPart);
-		    expandEditParts(element, true);
-	    }
-	}
-	
-	private void expandEditParts(Object element, boolean expandChildren) {
-	    if (element != null) {
-	    	Map editPartMap = editPartViewer.getEditPartRegistry();
-	    	WSDLTreeNodeEditPart wsdlEditPart = (WSDLTreeNodeEditPart) editPartMap.get(element);
-			wsdlEditPart.setExpanded(true);
-			
-			if (expandChildren) {
-				Iterator iterator = WSDLEditorUtil.getModelGraphViewChildren(element).iterator();
-				
-				while (iterator.hasNext()) {
-					expandEditParts(iterator.next(), expandChildren);
-				}
-			}
-	    }
-	}
-	
-	// Inherited classes from BaseNodeAction
-	  public Node getNode() {
-	  	return parentNode;
-	  }
-	  
-	  public String getUndoDescription() {
-	  	return WSDLEditorPlugin.getWSDLString("_UI_ACTION_COPY");
-	  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CreateDocActionDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CreateDocActionDelegate.java
deleted file mode 100644
index 4e4b9c5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CreateDocActionDelegate.java
+++ /dev/null

@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewFolderMainPage;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class CreateDocActionDelegate extends ActionDelegate implements IEditorActionDelegate
-{
-  protected IFile iFile;
-  protected IEditorPart editorPart;
-
-  protected final static String WSDLEDITOR_DOCGEN_PLUGIN_ID = "org.eclipse.wst.wsdl.ui.internal.docgen"; //$NON-NLS-1$
-  protected final static String VALIDATE_WSDL_PLUGIN_ID = "org.eclipse.wst.validate.wsdl"; //$NON-NLS-1$
-
-  protected IWorkspaceRoot workspaceRoot = null;
-
-  public CreateDocActionDelegate()
-  {
-  }
-
-  public void setFile(IFile iFile)
-  {
-    this.iFile = iFile;
-  }
-
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-
-  public void run(IAction action)
-  {
-// TODO: Uncomment when validation is checked into corona    
-//    ISharedService validateSharedService = ExtensionPlugin.getSharedService("ValidateWSDLSharedService"); //$NON-NLS-1$
-//    System.out.println(validateSharedService);
-//    if (validateSharedService != null)
-//    {
-//      try
-//      {
-//        Boolean rc = (Boolean) validateSharedService.run(iFile);
-//        if (rc.booleanValue())
-//        {
-          NewWSDLDocFolderWizard wiz = new NewWSDLDocFolderWizard();
-          NewWSDLDocDialog dlg = new NewWSDLDocDialog(WSDLEditorPlugin.getShell(), wiz);
-          dlg.open();
-//        }
-//        else
-//        {
-//          MessageDialog.openError(Display.getCurrent().getActiveShell(), WSDLEditorPlugin.getWSDLString("_UI_ERROR_INVALID_WSDL"), //$NON-NLS-1$
-//          WSDLEditorPlugin.getWSDLString("_UI_ERROR_INVALID_WSDL_DESC")); //$NON-NLS-1$
-//        }
-//      }
-//      catch (Exception e)
-//      {
-//      }
-//    }
-//    else
-//    {
-//      MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", //$NON-NLS-1$
-//      "Cannot find validator"); //$NON-NLS-1$
-//    }
-  }
-
-  class GenHTMLOperation extends WorkspaceModifyOperation
-  {
-    IFile iFile;
-    String outputLocation;
-    public GenHTMLOperation(IFile iFile)
-    {
-      super();
-      this.iFile = iFile;
-    }
-
-    public void setOutputLocation(String outputLocation)
-    {
-      this.outputLocation = outputLocation;
-    }
-
-    protected void execute(IProgressMonitor monitor) throws CoreException
-    {
-    	/*
-      monitor.beginTask(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATING_HTML_FILES"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-      WSDLDoc doc = new WSDLDoc(new WSDLDocFileWriter());
-
-      try
-      {
-        Plugin plugin = Platform.getPlugin("org.eclipse.wst.wsdl.ui.internal.docgen"); //$NON-NLS-1$
-        IPath installPath = new Path(plugin.getDescriptor().getInstallURL().toExternalForm()).removeTrailingSeparator();
-        String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
-        Path docgenPath = new Path(installStr);
-
-        doc.setTemplateLocation(docgenPath.toOSString() + "template" + File.separator); //$NON-NLS-1$
-        doc.setOptions(iFile.getRawLocation().removeLastSegments(1).toOSString(), outputLocation, "");
-
-        doc.addFile(iFile.getName());
-        doc.doBuildStep();
-      }
-      catch (Exception e)
-      {
-        // e.printStackTrace(); 
-      }
-      finally
-      {
-        monitor.done();
-      }
-      */
-    }
-  }
-
-  class WSDLDocNewFolderMainPage extends WizardNewFolderMainPage
-  {
-    public WSDLDocNewFolderMainPage(String pageName)
-    {
-      super(pageName, new StructuredSelection(iFile));
-      setDescription(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATE_FOLDER_FOR_DOCS")); //$NON-NLS-1$
-    }
-  }
-
-  class NewWSDLDocFolderWizard extends Wizard
-  {
-    IFolder folder;
-
-    private WSDLDocNewFolderMainPage newFolderPage;
-
-    public NewWSDLDocFolderWizard()
-    {
-      super();
-      setNeedsProgressMonitor(true);
-    }
-
-    public boolean performFinish()
-    {
-      folder = newFolderPage.createNewFolder();
-      if (folder == null)
-      {
-        MessageDialog.openError(WSDLEditorPlugin.getShell(), WSDLEditorPlugin.getWSDLString("_UI_ERROR_ERROR"), //$NON-NLS-1$
-        WSDLEditorPlugin.getWSDLString("_UI_ERROR_FOLDER_NOT_CREATED")); //$NON-NLS-1$
-        return false;
-      }
-
-      GenHTMLOperation op = new GenHTMLOperation(iFile);
-      op.setOutputLocation(folder.getLocation().toOSString());
-
-      try
-      {
-        op.execute(new NullProgressMonitor());
-
-        // refresh folder and open index.html in web browser
-        folder.refreshLocal(IResource.DEPTH_INFINITE, null);
-        String indexHtmlFile = folder.getLocation().toOSString() + File.separator + "index.html"; //$NON-NLS-1$
-        IFile indexHtmlIFile = getWorkspaceFileFromLocalLocation(indexHtmlFile);
-        if (indexHtmlIFile != null && indexHtmlIFile.exists())
-        {
-          revealSelection(new StructuredSelection(indexHtmlIFile));
-          
-          openEditor(indexHtmlIFile, "org.eclipse.webbrowser"); //$NON-NLS-1$
-        }
-        else
-        {
-          MessageDialog.openError(Display.getCurrent().getActiveShell(), WSDLEditorPlugin.getWSDLString("_UI_ERROR_ERROR"), //$NON-NLS-1$
-          WSDLEditorPlugin.getWSDLString("_UI_ERROR_CREATING_HTML_FILES")); //$NON-NLS-1$
-        }
-      }
-      catch (CoreException ce)
-      {
-        //        ce.printStackTrace();
-      }
-      catch (Exception e)
-      {
-        //        e.printStackTrace();
-      }
-      return true;
-    }
-
-    protected void revealSelection(final ISelection selection)
-    {
-      if (selection != null)
-      {
-        IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
-        final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-        final IWorkbenchPart focusPart = workbenchWindow.getActivePage().getActivePart();
-        if (focusPart instanceof ISetSelectionTarget)
-        {
-          Display.getCurrent().asyncExec
-          (new Runnable()
-              {
-            public void run()
-            {
-              ((ISetSelectionTarget)focusPart).selectReveal(selection);
-            }
-          });
-        }
-      }
-    }
-    
-    protected void openEditor(final IFile iFile, final String editorId)
-    {
-      if (iFile != null)
-      {
-        IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
-        final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-
-        Display.getDefault().asyncExec
-        (new Runnable()
-            {
-          public void run()
-          {
-            try
-            {
-              workbenchWindow.getActivePage().openEditor(new FileEditorInput(iFile), editorId);
-            }
-            catch (PartInitException ex)
-            {
-//              B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception encountered when attempting to open file: " + iFile + "\n\n" + ex);
-            }
-          }
-        });
-      }
-    }
-    
-    protected IFile getWorkspaceFileFromLocalLocation(String fileName)
-    {
-      IWorkspace workspace = ResourcesPlugin.getWorkspace();
-      if (workspace != null)
-      {
-        IFile iFile = workspace.getRoot().getFileForLocation(new Path(fileName));
-        if (iFile != null)
-        {
-          return iFile;
-        }
-      }
-      return null;
-    }
-    
-    public void addPages()
-    {
-      newFolderPage = new WSDLDocNewFolderMainPage(WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_FOLDER")); //$NON-NLS-1$
-      addPage(newFolderPage);
-    }
-
-    public boolean canFinish()
-    {
-      if (newFolderPage.isPageComplete())
-      {
-        return true;
-      }
-      return false;
-    }
-
-    public IFolder getFolder()
-    {
-      return folder;
-    }
-  }
-
-  class NewWSDLDocDialog extends WizardDialog
-  {
-    public NewWSDLDocDialog(Shell parentShell, IWizard newWizard)
-    {
-      super(parentShell, newWizard);
-    }
-  }
-
-  public void setActiveEditor(IAction action, IEditorPart targetEditor)
-  {
-    editorPart = targetEditor;
-    iFile = null;
-    if (editorPart != null)
-    {
-      IEditorInput input = targetEditor.getEditorInput();
-      if (input instanceof IFileEditorInput)
-      {
-        iFile = ((IFileEditorInput) input).getFile();
-      }
-    }
-  }
-
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteAction.java
deleted file mode 100644
index b9b0612..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteAction.java
+++ /dev/null

@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class DeleteAction extends BaseNodeAction {
-	 protected List list;
-	 protected String deleteString = WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE") + " "; //$NON-NLS-1$
-//	 private Object object;
-//	 private Node node;
-	
-	public DeleteAction(Object object, Node node) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-	    list = new Vector();
-	    list.add(object);
-	}
-	
-	public DeleteAction(List deleteList) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-	    list = deleteList;
-	}
-
-	private Vector getReferencedMessages(Operation operation) {
-		Vector messages = new Vector();
-		messages.addAll(getMessages(operation.getEFaults()));
-		
-		if (operation.getEInput() != null && operation.getEInput().getEMessage() != null)
-			messages.addElement(operation.getEInput().getEMessage());
-		if (operation.getEOutput() != null && operation.getEOutput().getEMessage() != null)
-			messages.addElement(operation.getEOutput().getEMessage());
-		
-		return messages;
-	}
-	
-	public void run() {
-		// We want to delete Operations first.  So we need to sort the list
-		List sortedList = new ArrayList(list.size());
-		Iterator listIterator = list.iterator();
-		
-		while (listIterator.hasNext()) {
-			Object unsortedObject = listIterator.next();
-			if (unsortedObject instanceof Operation) {
-				sortedList.add(0, unsortedObject);
-			}
-			else {
-				sortedList.add(unsortedObject);
-			}
-		}
-		
-		Node recordingNode = null;
-		if (sortedList.size() > 1) {
-			recordingNode = getElement(sortedList.get(0));
-			beginRecording(recordingNode, WSDLEditorPlugin.getWSDLString("_UI_ACTION_MULTIPLE_DELETE"));
-		}
-		
-		Iterator iterator = sortedList.iterator();
-		while (iterator.hasNext()) {
-			Object object = iterator.next();
-			
-			if (object instanceof Operation) {
-				deleteOperation((Operation) object);
-			}
-			else if (object instanceof Part) {
-				deletePart((Part) object);
-			}
-			else {
-				DeleteNodeAction deleteNodeAction = new DeleteNodeAction(getElement(object));
-				deleteNodeAction.run();
-			}
-		}
-		
-		if (recordingNode != null) {
-			endRecording(recordingNode);
-		}
-	}
-	
-	private Vector getMessages(List faults) {
-		Vector v = new Vector();
-		Iterator it = faults.iterator();
-		
-		while (it.hasNext()) {
-			Fault fault = (Fault) it.next();
-			if (fault.getEMessage() != null) {
-				v.addElement(fault.getEMessage());
-			}
-		}
-		
-		return v;
-	}
-	
-	private Vector getParts(Vector messages) {
-		Vector parts = new Vector();
-		Iterator it = messages.iterator();
-		
-		while (it.hasNext()) {
-			Message message = (Message) it.next();
-			
-			if (message.getEParts() != null) {
-				parts.addAll(message.getEParts());
-			}
-		}
-		
-		return parts;
-	}
-	
-	public Node getNode()
-	{
-	  return list.size() > 0 ? (Node) getElement(list.get(0)) : null;
-	} 
-
-	public String getUndoDescription()
-	{
-	  return WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"); //$NON-NLS-1$
-	}
-	
-	private void deleteOperation(Operation operation) {
-		DeleteOperationDialog dialog = new DeleteOperationDialog(WSDLEditorPlugin.getShell(), operation.getName());
-	    int returnCode = dialog.createAndOpen();
-	    
-	    if (returnCode == IDialogConstants.OK_ID) {
-	    	if (dialog.deleteMessagesAndParts()) {
-	    		// Get all associated messages
-	    		Vector messages = getReferencedMessages(operation);
-	    		
-	    		// Determine which Messages are referenced from 'outside' this operation
-	    		Vector referencedMessages = new Vector();
-	    		if (operation.getEnclosingDefinition().getEPortTypes() != null) {
-	    			Iterator portTypeIterator = operation.getEnclosingDefinition().getEPortTypes().iterator();
-	    			Vector operations = new Vector();
-	    			
-	    			while (portTypeIterator.hasNext()) {
-	    				PortType portType = (PortType) portTypeIterator.next();
-	    				
-	    				if (portType.getEOperations() != null) {
-	    					Iterator operationIterator = portType.getEOperations().iterator();
-	    					while (operationIterator.hasNext()) {
-	    						Operation nextOperation = (Operation) operationIterator.next();
-	    						if (!nextOperation.equals(operation))
-	    							operations.add(nextOperation);
-	    					}
-	    				}
-	    			}
-	    			
-	    			for (int index = 0; index < operations.size(); index++) {
-	    				referencedMessages.addAll(getReferencedMessages((Operation) operations.elementAt(index)));
-	    			}
-	    		
-	    			// Filter which Messages need to be deleted
-	    			for (int index = 0; index < messages.size(); index++) {
-	    				int foundIndex = referencedMessages.indexOf(messages.elementAt(index));
-	    				
-	    				if (foundIndex != -1) {
-	    					// Message is referenced elsewhere.  Do not delete
-	    					messages.remove(index);
-	    				}
-	    			}
-	    		}
-	    		
-	    		// Get all associated parts
-	    		Vector parts = getParts(messages);
-	    		
-	    		// Remove our list of Messages and Parts
-	    		PortType portType = (PortType) operation.eContainer();
-	    		Node recordingNode = portType.getEnclosingDefinition().getElement();
-	    		beginRecording(recordingNode, deleteString + WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION"));
-	    		
-	    		for (int index = 0; index < messages.size(); index++) {
-	    			Message message = (Message) messages.elementAt(index);
-	    			Definition definition = (Definition) message.eContainer();
-	    			definition.getEMessages().remove(message);
-	    		}
-
-	    		for (int index = 0; index < parts.size(); index++) {
-	    			Part part = (Part) parts.elementAt(index);
-	    			Message message = (Message) part.eContainer();
-	    			message.getEParts().remove(part);
-	    		}
-	    		
-	    		// Delete the Operation
-	    		portType.getEOperations().remove(operation);
-
-	    		endRecording(recordingNode);
-	    	}
-	    	else {
-	    		// Only delete the Operation
-	    		PortType portType = (PortType) operation.eContainer();
-	    		Node recordingNode = portType.getElement();
-	    		
-	    		beginRecording(recordingNode, deleteString + WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION")); // Translate this!!!
-	    		portType.getEOperations().remove(operation);
-	    		endRecording(recordingNode);
-	    	}
-	    }
-	}
-	
-	private void deletePart(Part part) {
-		Message message = (Message) part.eContainer();
-		if (message != null) {
-			beginRecording(message.getElement(), deleteString + WSDLEditorPlugin.getWSDLString("_UI_LABEL_PART"));
-			message.getEParts().remove(part);
-			endRecording(message.getElement());
-		}
-	}
-	
-	private Element getElement(Object object) {
-		Element element = null;
-		if (object instanceof WSDLElement) {
-			element = ((WSDLElement) object).getElement();
-		}
-		else if (object instanceof XSDSchema) {
-			element = ((XSDSchema) object).getElement();
-		}
-		
-		return element;
-	}
-	
-	/*
-	 * The following method should be used to begin recording changes.
-	 * This should eventually replace BaseNodeAction.beginRecording()
-	 * when all deletes are model driven.
-	 */
-	  private void beginRecording(Node node, String undoDescription)
-	  {    
-	    if (node instanceof IDOMNode)
-	    {
-	      ((IDOMNode)node).getModel().beginRecording(this, undoDescription);  
-	    }
-	  }
-
-	/*
-	 * The following method should be used to begin recording changes.
-	 * This should eventually replace BaseNodeAction.beginRecording()
-	 * when all deletes are model driven.
-	 */
-	  public void endRecording(Node node)
-	  {
-	    if (node instanceof IDOMNode)
-	    {
-	      ((IDOMNode)node).getModel().endRecording(this);  
-	    }
-	  }
-	
-	private class DeleteOperationDialog extends Dialog implements SelectionListener{
-		private Button checkButton = null;
-		private boolean deleteMessagesAndParts = true;
-		private String operationName;
-		 
-		public DeleteOperationDialog(Shell shell, String name) {
-			super(shell);
-			operationName = name;
-		}
-		
-		protected Control createDialogArea(Composite parent) 
-		  {
-		    Composite dialogArea = (Composite)super.createDialogArea(parent);
-
-		    Composite composite = new Composite(dialogArea, SWT.NONE);
-		    GridLayout layout = new GridLayout();
-		    layout.numColumns = 2;
-		    layout.marginWidth = 0;
-		    layout.marginHeight = 0;
-		    layout.verticalSpacing = 0;
-
-		    composite.setLayout(layout);
-
-		    GridData gdFill= new GridData();
-		    gdFill.horizontalAlignment= GridData.FILL;
-		    gdFill.grabExcessHorizontalSpace= true;
-		    gdFill.verticalAlignment= GridData.FILL;
-		    gdFill.grabExcessVerticalSpace= true;
-		    composite.setLayoutData(gdFill);
-
-		    Label label = new Label(composite, SWT.NONE);
-		    label.setText(operationName);
-//		    label.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION") + " " + operationName);
-		    GridData labelData = new GridData();
-		    labelData.horizontalSpan = 2;
-		    
-		    label.setLayoutData(labelData);
-		    
-		    Label emptyLabel = new Label(composite, SWT.NONE);
-		    GridData emptyData = new GridData();
-		    emptyData.horizontalSpan = 2;
-		    emptyLabel.setLayoutData(emptyData);
-
-		    checkButton = new Button(composite, SWT.CHECK);
-		    checkButton.setSelection(deleteMessagesAndParts);
-		    checkButton.addSelectionListener(this);
-		    Label nameLabel = new Label(composite, SWT.NONE);
-		    nameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_DELETE_ASSOCIATED_MSG_AND_PARTS"));
-		    
-		    return dialogArea;
-		  }
-		
-		public boolean deleteMessagesAndParts() {
-			return deleteMessagesAndParts;
-		}
-		
-		public void widgetDefaultSelected(SelectionEvent e)  {}
-
-		public void widgetSelected(SelectionEvent e)  {
-			if (e.widget == checkButton) {
-				if (checkButton.getSelection()) {
-					deleteMessagesAndParts = true;
-				}
-				else {
-					deleteMessagesAndParts = false;
-				}
-			}
-		}
-
-		public int createAndOpen() {
-			create();
-		    getShell().setText(WSDLEditorPlugin.getWSDLString("_UI_DELETE_OPERATION_TITLE"));
-		    setBlockOnOpen(true);
-		    return open();
-		}
-		
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteInterfaceAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteInterfaceAction.java
deleted file mode 100644
index 1764287..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteInterfaceAction.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.List;
-
-public interface DeleteInterfaceAction {
-
-	public void setDeleteList(List list);
-	
-	public void run();
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteNodeAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteNodeAction.java
deleted file mode 100644
index f4e2931..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteNodeAction.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-                      
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-
-public class DeleteNodeAction extends BaseNodeAction
-{ 
-  protected List list;
-
-  public DeleteNodeAction(Node node)
-  {
-    setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-    list = new Vector();
-    list.add(node);
-  }    
-  
-  public DeleteNodeAction(List nodeList)
-  {
-    setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-    list = new Vector();
-    Iterator it = nodeList.iterator();
-    while (it.hasNext()) {
-    	list.add(it.next());
-    }
-  }
-
-  public void run()
-  {
-    beginRecording();
-
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      Node node = (Node)i.next();
-      if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-      {
-        Attr attr = (Attr)node;
-        attr.getOwnerElement().removeAttributeNode(attr);
-      }
-      else
-      {                
-        Node parent = node.getParentNode();
-        if (parent != null)
-        {                                         
-          Node previousSibling = node.getPreviousSibling();
-          if (previousSibling != null && isWhitespaceTextNode(previousSibling))
-          {
-            parent.removeChild(previousSibling);
-          }
-          parent.removeChild(node);
-        }
-      }
-    }         
-
-    endRecording();
-  }   
-
-  protected boolean isWhitespaceTextNode(Node node) 
-  {
-	  return (node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().trim().length() == 0);
-  }    
-
-  public Node getNode()
-  {
-    return list.size() > 0 ? (Node)list.get(0) : null;
-  } 
-
-  public String getUndoDescription()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"); //$NON-NLS-1$
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteWSDLAndXSDAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteWSDLAndXSDAction.java
deleted file mode 100644
index 731b0aa..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteWSDLAndXSDAction.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Node;
-
-
-/**
- * This class handles delete with the WSDL Editor's graph view.  the object for
- * deletion could be a WSDL 'object' or an XSD 'object'.  We need to make this
- * distinction because we have two different Delete classes.  One to handle
- * WSDL and another to handle XSD.
- */
-public class DeleteWSDLAndXSDAction extends BaseNodeAction {
-	List list;
-	Node recordingNode;
-	WSDLEditor wsdlEditor;
-
-	public DeleteWSDLAndXSDAction(List deleteList, Node recordingNode, WSDLEditor wsdlEditor) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));
-		list = deleteList;
-		this.recordingNode = recordingNode;
-		this.wsdlEditor = wsdlEditor;
-	}
-	
-	public void run() {
-		Iterator it = list.iterator();
-		List wsdlDeleteList = new ArrayList();
-		List xsdDeleteList = new ArrayList();
-
-		while (it.hasNext()) {
-			Object object = it.next();
-			
-			if (object instanceof WSDLElement || object instanceof XSDSchema) {
-				wsdlDeleteList.add(object);
-			}
-			else {
-				xsdDeleteList.add(object);
-			}
-		}
-		
-		Object newSelection = null;
-		Object topLevelObject = null;
-		if (wsdlDeleteList.size() > 0 || xsdDeleteList.size() > 0)
-		{	
-			try
-			{
-			beginRecording();	
-				
-		
-		// Delete WSDL objects
-		if (wsdlDeleteList.size() > 0) {
-			Object wsdlObject = wsdlDeleteList.get(0);
-			if (wsdlObject instanceof WSDLElement) {
-				newSelection = ((WSDLElement) wsdlObject).eContainer();
-				topLevelObject = getTopLevelWSDLObject((WSDLElement) wsdlObject);
-			}
-			
-			DeleteAction wsdlDelete = new DeleteAction(wsdlDeleteList);
-			wsdlDelete.run();
-		}
-		
-		// Delete XSD objects
-		if (xsdDeleteList.size() > 0) {
-			Object xsdObject = xsdDeleteList.get(0);
-			if (xsdObject instanceof XSDConcreteComponent) {
-				newSelection = ((XSDConcreteComponent) xsdObject).getContainer();
-				topLevelObject = getTopLevelXSDObject((XSDConcreteComponent) xsdObject);
-			}
-			
-			DeleteInterfaceAction xsdDelete = (DeleteInterfaceAction) getXSDDelete();
-			xsdDelete.setDeleteList(xsdDeleteList);
-			xsdDelete.run();
-			// Hack to force a refresh of all components of the Graph View.  This is needed
-			// for the case where we delete a XSD Element (View input == Definition).  The XSD
-			// Element EditPart visual would not be removed from the view.
-			wsdlEditor.getDefinition().setQName(wsdlEditor.getDefinition().getQName());
-		}
-			}
-			finally
-			{
-			  endRecording();
-			}
-			// Make our selection after our Deletions
-			ISelectionProvider selectionProvider = (ISelectionProvider)wsdlEditor.getSelectionManager();
-		    if (selectionProvider != null)
-		    {
-		    	if (newSelection instanceof XSDParticle)
-	            {
-	              newSelection = ((XSDParticle) newSelection).getContainer();
-	            }
-	    		
-		    	if (newSelection == null) {
-		    		newSelection = getNewSelection();
-		    	}
-		    	if (newSelection != null) {
-		    		// We have a newSelection, but it may also be deleted by the user.  In this case, select the top level object
-		    		if (list.contains(newSelection) && topLevelObject != null) {
-		    			newSelection = topLevelObject;
-		    		}
-
-		    		selectionProvider.setSelection(new StructuredSelection(newSelection));
-		    	}
-		    }
-		}
-	}
-	
-	public Node getNode()
-	{
-	  return recordingNode;
-	}
-
-	public String getUndoDescription()
-	{
-	  return WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"); //$NON-NLS-1$
-	}
-
-	private Object getXSDDelete() {
-		WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-	    WSDLEditorExtension[] extensions = registry.getRegisteredExtensions(WSDLEditorExtension.MENU_ACTION_CONTRIBUTOR);
-	    Object xsdDelete = null;
-	    
-	    for (int i = 0; i < extensions.length; i++)
-	    {
-//	    	xsdDelete = extensions[i].createExtensionObject(WSDLEditorExtension.XSD_DELETE_ACTION, wsdlEditor);
-	    	xsdDelete = extensions[i].createExtensionObject(WSDLEditorExtension.XSD_DELETE_ACTION, null);
-	    	if (xsdDelete != null) {
-	    		break;
-	    	}
-	    }	    
-	    
-	    return xsdDelete;
-	}
-	
-	private Object getNewSelection() {
-		// Hack using wsdleditor....  This situation occurs when we delete the Schema from the Types group....  We
-		// usually get the container of the object being deleted... however, in this situation, the container would
-		// be null because the object being deleted is a Schema......
-		Object selection;
-		try {
-			selection = wsdlEditor.getGraphViewer().getComponentViewer().getInput();
-			if (selection == null) {
-				selection = wsdlEditor.getDefinition();
-			}
-		}
-		catch (Exception e) {
-			selection = wsdlEditor.getDefinition();
-		}
-		
-		return selection;
-	}
-
-	private WSDLElement getTopLevelWSDLObject(WSDLElement element) {
-		WSDLElement topObject = (WSDLElement) element.eContainer();
-		
-		while (topObject != null && !(topObject instanceof Definition)) {
-			topObject = (WSDLElement) topObject.eContainer();
-		}
-
-		return topObject;
-	}
-	
-	private XSDConcreteComponent getTopLevelXSDObject(XSDConcreteComponent component) {
-		XSDConcreteComponent topObject = component.getContainer();
-		
-		while (topObject != null && !(topObject instanceof XSDSchema)) {
-			topObject = (XSDConcreteComponent) topObject.eContainer();
-		}
-
-		return topObject;
-	}
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java
deleted file mode 100644
index d84926f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.nsedit.EditNamespacesDialog;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceInfoManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.w3c.dom.Element;
-
-
-public class EditNamespacesAction extends Action
-{
-  protected Definition definition;
-
-  public EditNamespacesAction(Definition definition)
-  {
-    setText(WSDLEditorPlugin.getWSDLString("_UI_EDIT_NAMESPACES"));
-    this.definition = definition;
-  }
-
-  public void run()
-  {
-    DOMNamespaceInfoManager namespaceInfoManager = new DOMNamespaceInfoManager();
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    if (element != null)
-    {
-      List namespaceInfoList = namespaceInfoManager.getNamespaceInfoList(element);
-//      List oldNamespaceInfoList = NamespaceInfo.cloneNamespaceInfoList(namespaceInfoList);
-
-      // here we store a copy of the old info for each NamespaceInfo
-      // this info will be used in createPrefixMapping() to figure out how to update the document 
-      // in response to these changes
-      for (Iterator i = namespaceInfoList.iterator(); i.hasNext();)
-      {
-        NamespaceInfo info = (NamespaceInfo) i.next();
-        NamespaceInfo oldCopy = new NamespaceInfo(info);
-        info.setProperty("oldCopy", oldCopy);
-      }
-
-	  IPath path = new Path(definition.getDocumentBaseURI());
-      EditNamespacesDialog dialog = new EditNamespacesDialog(WSDLEditorPlugin.getShell(),  path, WSDLEditorPlugin.getWSDLString("_UI_EDIT_NAMESPACES_DIALOG_TITLE"), definition.getTargetNamespace(), namespaceInfoList);
-      int rc = dialog.createAndOpen();
-      if (rc == IDialogConstants.OK_ID)
-      {      	
-		element.setAttribute("targetNamespace", dialog.getTargetNamespace());
-		
-        List newInfoList = dialog.getNamespaceInfoList();
-        namespaceInfoManager.removeNamespaceInfo(element);
-        namespaceInfoManager.addNamespaceInfo(element, newInfoList, false);
-
-/*
-        // see if we need to rename any prefixes
-        Map prefixMapping = createPrefixMapping(oldNamespaceInfoList, namespaceInfoList);
-        if (prefixMapping.size() > 0)
-        {
-          //manager.getModel().aboutToChangeModel();
-          ReplacePrefixAction replacePrefixAction = new ReplacePrefixAction(element, prefixMapping);
-          replacePrefixAction.run();
-          //manager.getModel().changedModel();
-        }
-*/        
-      }
-    }
-  }
-
-  protected Map createPrefixMapping(List oldList, List newList)
-  {
-    Map map = new Hashtable();
-
-    Hashtable oldURIToPrefixTable = new Hashtable();
-    for (Iterator i = oldList.iterator(); i.hasNext();)
-    {
-      NamespaceInfo oldInfo = (NamespaceInfo) i.next();
-      oldURIToPrefixTable.put(oldInfo.uri, oldInfo);
-    }
-
-    for (Iterator i = newList.iterator(); i.hasNext();)
-    {
-      NamespaceInfo newInfo = (NamespaceInfo) i.next();
-      NamespaceInfo oldInfo = (NamespaceInfo) oldURIToPrefixTable.get(newInfo.uri != null ? newInfo.uri : "");
-
-      // if oldInfo is non null ... there's a matching URI in the old set
-      // we can use its prefix to detemine out mapping
-      //
-      // if oldInfo is null ...  we use the 'oldCopy' we stashed away 
-      // assuming that the user changed the URI and the prefix
-      if (oldInfo == null)
-      {
-        oldInfo = (NamespaceInfo) newInfo.getProperty("oldCopy");
-      }
-
-      if (oldInfo != null)
-      {
-        String newPrefix = newInfo.prefix != null ? newInfo.prefix : "";
-        String oldPrefix = oldInfo.prefix != null ? oldInfo.prefix : "";
-        if (!oldPrefix.equals(newPrefix))
-        {
-          map.put(oldPrefix, newPrefix);
-        }
-      }
-    }
-    return map;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ExtensibleMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ExtensibleMenuActionContributor.java
deleted file mode 100644
index 7020db6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ExtensibleMenuActionContributor.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;                        
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.w3c.dom.Node;
-
-
-public class ExtensibleMenuActionContributor implements IMenuActionContributor
-{                                                                   
-  protected WSDLEditor wsdlEditor;
-  protected IMenuActionContributor[] menuActionContributors;  
-
-  public ExtensibleMenuActionContributor(WSDLEditor wsdlEditor)
-  {
-    this.wsdlEditor = wsdlEditor; 
-
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    WSDLEditorExtension[] extensions = registry.getRegisteredExtensions(WSDLEditorExtension.MENU_ACTION_CONTRIBUTOR);
-    menuActionContributors = new IMenuActionContributor[extensions.length];
-
-    for (int i = 0; i < menuActionContributors.length; i++)
-    {
-      menuActionContributors[i] = (IMenuActionContributor)extensions[i].createExtensionObject(WSDLEditorExtension.MENU_ACTION_CONTRIBUTOR, wsdlEditor);
-    }
-  }
-                           
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object)
-  {  
-    for (int i = 0; i < menuActionContributors.length; i++)
-    {                          
-      if (menuActionContributors[i] != null)
-      {
-        menuActionContributors[i].contributeMenuActions(manager, node, object);
-      }
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/IDesignViewerActionBarContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/IDesignViewerActionBarContributor.java
deleted file mode 100644
index 428695c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/IDesignViewerActionBarContributor.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-
-public interface IDesignViewerActionBarContributor extends ISourceViewerActionBarContributor {
-	public void initViewerSpecificContributions(IActionBars bars);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/PasteGlobalAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/PasteGlobalAction.java
deleted file mode 100644
index ef249c5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/PasteGlobalAction.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Node;
-
-public class PasteGlobalAction extends Action {
-	private IEditorPart editor;
-	private WSDLElement selection;
-	private Node selectionNode;
-	
-	public PasteGlobalAction(WSDLElement selection, IEditorPart editor) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_PASTE"));  // Translate This
-		this.selection = selection;
-		this.editor = editor;
-		selectionNode = selection.getElement();
-		setEnabledState();
-	}
-	
-	public void run() {
-		if (editor instanceof WSDLEditor) {
-			WSDLEditor wsdlEditor = (WSDLEditor) editor;
-			CopyWSDLElementAction copyAction = new CopyWSDLElementAction(wsdlEditor.getGraphViewer().getComponentViewer(), wsdlEditor.getClipboardContents(), selection, selectionNode);
-			copyAction.run();
-		}
-	}
-	
-  	public void setSelection(WSDLElement newSelection) {
-  		selection = newSelection;
-  		setEnabledState();
-  	}
-  	
-  	protected void setEnabledState() {
-  		WSDLElement parentElement = null;
-  		if ((parentElement = showPasteAction((WSDLElement) selection, editor)) != null) {
-  			selection = parentElement;
-  			setEnabled(true);
-  		}
-  		else {
-  			setEnabled(false);
-  		}
-  	}
-  	
-  	 private WSDLElement showPasteAction(WSDLElement element, IEditorPart ePart) {
-  	  	WSDLElement parentElement = null;
-  	  	
-  	  	if (ePart instanceof WSDLEditor) {
-  	  		WSDLElement clipboardElement = ((WSDLEditor) ePart).getClipboardContents();
-  	  		
-  	  		if (element instanceof PortType) {
-  	  			if (clipboardElement instanceof Operation) {
-  	  				parentElement = element;
-  	  			}
-  	  		}
-  	  		if (element instanceof Operation) {
-  	  			if (clipboardElement instanceof Operation) {
-  	  				parentElement = (WSDLElement) ((Operation) element).eContainer();
-  	  			}
-  	  		}
-  	  	}
-  	  	
-  	  	return parentElement;
-  	  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ReloadDependenciesActionDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ReloadDependenciesActionDelegate.java
deleted file mode 100644
index 6a04631..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ReloadDependenciesActionDelegate.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public class ReloadDependenciesActionDelegate extends ActionDelegate implements IEditorActionDelegate
-{
-	private WSDLEditor wsdlEditor;
-
-	public void setActiveEditor(IAction action, IEditorPart targetEditor)
-	{
-		wsdlEditor = (targetEditor instanceof WSDLEditor) ? (WSDLEditor)targetEditor : null;
-	}
-
-	public void run(IAction action)
-	{
-		if (wsdlEditor != null)
-		{
-			try
-			{
-				wsdlEditor.reloadDependencies();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java
deleted file mode 100644
index f6826e8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.visitor.BindingRenamer;
-import org.eclipse.wst.wsdl.ui.internal.visitor.MessageRenamer;
-import org.eclipse.wst.wsdl.ui.internal.visitor.PortTypeRenamer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-//import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class RenameAction //extends BaseNodeAction implements Runnable
-{
-  protected Object modelObject;                 
-  protected String newName;
-  protected Node node;                        
-
-  public RenameAction(Object modelObject, String newName)
-  {                          
-    this.modelObject = modelObject;
-    this.newName = newName;
-    this.node = WSDLEditorUtil.getInstance().getNodeForObject(modelObject);
-  }      
-
-  /*
-  public Node getNode()
-  {
-    return node;
-  }
-  */
-
-  /*
-  public String getUndoDescription()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_ACTION_RENAME");  //$NON-NLS-1$
-  }
-  */
-
-  public void run()
-  {
-    if (modelObject instanceof Operation) 
-    {
-      renameOperationHelper((Operation)modelObject);
-    }  
-    else if (modelObject instanceof Input ||
-             modelObject instanceof Output ||
-             modelObject instanceof Fault)
-    {
-      renameIOFHelper((WSDLElement)modelObject);
-    }
-    else
-    {
-      renameModelObjectHelper(modelObject, newName);
-    }
-  } 
-
-  protected void renameModelObjectHelper(Object modelObject, String theNewName)
-  {
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(modelObject);
-    if (element != null)
-    { 
-      element.setAttribute("name", theNewName);
-    }    
-
-    if (modelObject instanceof Message)
-    {
-      MessageRenamer renamer = new MessageRenamer((Message)modelObject, theNewName);
-      renamer.visitBindings();
-    }
-    else if (modelObject instanceof PortType)
-    {
-      PortTypeRenamer renamer = new PortTypeRenamer((PortType)modelObject, theNewName);
-      renamer.visitBindings();
-    }
-    else if (modelObject instanceof Binding)
-    {
-      BindingRenamer renamer = new BindingRenamer((Binding)modelObject, theNewName);
-      renamer.visitServices();
-    }
-  }
-
-  protected void renameOperationHelper(Operation operation)
-  {
-    renameModelObjectHelper(operation, newName);
-  }
-
-
-  protected void renameIOFHelper(WSDLElement object)
-  {                         
-    Definition definition = object.getEnclosingDefinition(); 
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-                          
-    List list = null;
-
-    if (object instanceof Input)
-    {
-      list = util.getBindingInputs((Input)object);
-    }
-    else if (object instanceof Output)
-    {
-      list = util.getBindingOutputs((Output)object);
-    }
-    else // fault
-    {
-      list = util.getBindingFaults((Fault)object);
-    }
-      
-    if (list != null)
-    {
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        Object bindingObject = i.next();
-        renameModelObjectHelper(bindingObject, newName);
-      }                                           
-    }
-
-    renameModelObjectHelper(object, newName);
-  }  
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetExistingComponentAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetExistingComponentAction.java
deleted file mode 100644
index 3ff35e4..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetExistingComponentAction.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-import org.w3c.dom.Node;
-
-
-
-public class SetExistingComponentAction extends AddElementAction
-{
-  Object input;
-  protected IEditorPart editorPart;
-  protected String kind;
-
-  public SetExistingComponentAction(
-    String text,
-    Node parentNode,
-    String prefix,
-    String localName,
-    Object input)
-  {
-    super(text, parentNode, prefix, localName);
-    this.input = input;
-  }
-
-  public void setEditor(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart; 
-  }
-
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-
-  protected void performAddElement()
-  {
-    InvokeSetDialog dialog = new InvokeSetDialog();
-    if (input instanceof Part)
-    {
-      dialog.setReferenceKind(kind);
-    }
-    dialog.run(input, editorPart);
-    
-    // We shouldn't know about the editor in this class
-    WSDLEditor editor = (WSDLEditor) editorPart;
-    editor.getSelectionManager().setSelection(new StructuredSelection(input));
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetNewComponentAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetNewComponentAction.java
deleted file mode 100644
index f775e43..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetNewComponentAction.java
+++ /dev/null

@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDElementDeclarationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDTypeDefinitionCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.CreateWSDLElementHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/*
- * TODO: Need to clean up this class.... We probably don't use quite a few of these
- * methods/instance variables.
- */
-public class SetNewComponentAction extends AddElementAction
-{
-  Object input;
-  protected IEditorPart editorPart;
-  protected String kind;
-  private String typeKind = "complex";      // TODO: Refactor code to handle this better
-
-  public SetNewComponentAction(
-    String text,
-    Node parentNode,
-    String prefix,
-    String localName,
-    Object input)
-  {
-    super(text, parentNode, prefix, localName);
-    this.input = input;
-  }
-
-  public void setEditor(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart; 
-  }
-
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-  
-  public void setTypeKind(String typeKind)
-  {
-      this.typeKind = typeKind;
-  }
-
-  // TODO: Clean up next methods below!!!
-  private WSDLElementCommand command;
-  private String newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_COMPONENT");
-  
-  protected void performAddElement()
-  {
-    Shell shell = Display.getCurrent().getActiveShell();
-    String defaultName = getDefaultName();
-    NewComponentDialog dialog = new NewComponentDialog(shell, newDialogTitle, defaultName, getUsedNames());
-
-    int dialogCode = dialog.createAndOpen();
-    
-    if (dialogCode == Window.OK) {
-        if (input instanceof Port) {
-            Definition definition = ((Port) input).getEnclosingDefinition();
-            String newName = dialog.getName();
-            
-            // TODO: We should be smarter in choosing some default options/settings for generating a new Binding
-//            BindingGenerator bindingGenerator = new BindingGenerator(definition);
-//            bindingGenerator.setName(newName);
-//            bindingGenerator.setProtocol("SOAP");
-//            bindingGenerator.generate();
-			BindingGenerator bindingGenerator = new BindingGenerator(definition, null, SOAPConstants.SOAP_NAMESPACE_URI);
-			bindingGenerator.setName(newName);
-			bindingGenerator.generateBinding();
-            
-          String itemPrefix = definition.getPrefix(definition.getTargetNamespace());
-          if (itemPrefix == null)
-          {
-            itemPrefix = "";
-          }
-          org.w3c.dom.Element wsdlElement = WSDLEditorUtil.getInstance().getElementForObject((WSDLElement) input);
-          wsdlElement.setAttribute("binding", itemPrefix.length() == 0 ? newName : itemPrefix + ":" + newName);     
-          
-        }
-        else if (input instanceof Binding) {            
-            Definition definition = ((Binding) input).getEnclosingDefinition();
-            Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-            
-            String newName = dialog.getName();
-            String prefix = definitionElement.getPrefix();
-            // Use AddMessageAction in WSDLMenuActionContributor
-            AddElementAction addPortTypeAction = new AddElementAction("", "icons/message_obj.gif", definitionElement, prefix, "portType"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            addPortTypeAction.setComputeTopLevelRefChild(true);
-            addPortTypeAction.run();
-            org.w3c.dom.Element newMessage = addPortTypeAction.getNewElement();
-            newMessage.setAttribute("name", newName); //$NON-NLS-1$
-            // need to get the prefix for the item
-            // could get list of updated messages and then select but currently we only have the local name
-            String itemPrefix = definition.getPrefix(definition.getTargetNamespace());
-            if (itemPrefix == null)
-            {
-              itemPrefix = ""; //$NON-NLS-1$
-            }
-            String portTypeValue = itemPrefix.length() == 0 ? newName : itemPrefix + ":" + newName; //$NON-NLS-1$ //$NON-NLS-2$
-
-            // Set the component
-            if (input != null && portTypeValue != null) {
-                org.w3c.dom.Element wsdlElement = WSDLEditorUtil.getInstance().getElementForObject((WSDLElement) input);
-                wsdlElement.setAttribute("type", portTypeValue);
-            } 
-        }
-        else if (input instanceof Input || input instanceof Output || input instanceof Fault) {
-            Definition definition = ((MessageReference) input).getEnclosingDefinition();
-            String newName = dialog.getName();
-
-            AddMessageCommand action = new AddMessageCommand(definition, newName);
-            action.run();
-            Message message = (Message) action.getWSDLElement();
-            CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(message); 
-            CreateWSDLElementHelper.createPart(message);
-
-          // need to get the prefix for the item
-          // could get list of updated messages and then select but currently we only have the local name
-          String itemPrefix = definition.getPrefix(definition.getTargetNamespace());
-          if (itemPrefix == null)
-          {
-            itemPrefix = ""; //$NON-NLS-1$
-          }
-          org.w3c.dom.Element wsdlElement = WSDLEditorUtil.getInstance().getElementForObject((WSDLElement) input);
-          wsdlElement.setAttribute("message", itemPrefix.length() == 0 ? newName : itemPrefix + ":" + newName); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        else if (input instanceof Part) {
-            Definition definition = ((Part) input).getEnclosingDefinition();
-            String referencingPrefix = definition.getPrefix(definition.getTargetNamespace());
-            String newName = dialog.getName();
-            
-            if (kind.equalsIgnoreCase("type")) {
-                if (typeKind.equalsIgnoreCase("complex")) {
-                    ((AddXSDTypeDefinitionCommand) command).isComplexType(true);    
-                }
-                else {
-                    ((AddXSDTypeDefinitionCommand) command).isComplexType(false);
-                }                
-                ((AddXSDTypeDefinitionCommand) command).run(newName);
-                ComponentReferenceUtil.setComponentReference((Part) input, true, referencingPrefix.equals("") ? newName : referencingPrefix + ":" + newName);
-            }
-            else if (kind.equalsIgnoreCase("element")) {
-                ((AddXSDElementDeclarationCommand) command).run(newName);
-                ComponentReferenceUtil.setComponentReference((Part) input, false, referencingPrefix.equals("") ? newName : referencingPrefix + ":" + newName);
-            }
-        }
-        
-        // We shouldn't know about the editor in this class
-      WSDLEditor editor = (WSDLEditor) editorPart;
-      editor.getSelectionManager().setSelection(new StructuredSelection(input));
-    }
-  }
-  
-  private List getUsedNames() {
-      if (input instanceof Port) {
-          Definition definition = ((Port) input).getEnclosingDefinition();
-          return NameUtil.getUsedBindingNames(definition);
-      }
-      else if (input instanceof Binding) {
-          Definition definition = ((Binding) input).getEnclosingDefinition();
-          return NameUtil.getUsedPortTypeNames(definition);
-      }
-      else if (input instanceof Input || input instanceof Output || input instanceof Fault) {
-          Definition definition = ((MessageReference) input).getEnclosingDefinition();
-          return NameUtil.getUsedMessageNames(definition);
-      }
-      else if (input instanceof Part) {
-          Definition definition = ((Part) input).getEnclosingDefinition();
-          if (kind.equalsIgnoreCase("element")) {
-              if (command == null) {
-                  command = new AddXSDElementDeclarationCommand(definition, "NewElement");
-              }
-              XSDSchema parentSchema = ((AddXSDElementDeclarationCommand) command).getSchema();
-              
-              return getUsedElementNames(parentSchema);
-          }
-          else if (kind.equalsIgnoreCase("type")) {
-              if (command == null) {
-                  command = new AddXSDTypeDefinitionCommand(definition, "NewType");
-              }
-              XSDSchema parentSchema = ((AddXSDTypeDefinitionCommand) command).getSchema();
-              
-              List usedNames;
-              if (typeKind.equalsIgnoreCase("complex")) {
-                  usedNames = getUsedComplexTypeNames(parentSchema);    
-              }
-              else {
-                  usedNames = getUsedSimpleTypeNames(parentSchema);
-              }
-              
-              return usedNames;
-          }
-      }
-      
-      return (new ArrayList());
-  }
-
-  private String getDefaultName() {
-      if (input instanceof Port) {
-          newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_BINDING");       // TODO: Ugly Hack... remove
-          Definition def = ((Port) input).getEnclosingDefinition();
-          return NameUtil.getUniqueNameHelper("NewBinding", NameUtil.getUsedBindingNames(def));
-      }
-      else if (input instanceof Binding) {
-          newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_PORTTYPE");       // TODO: Ugly Hack... remove
-          Definition def = ((Binding) input).getEnclosingDefinition();
-          return NameUtil.getUniqueNameHelper("NewPortType", NameUtil.getUsedPortTypeNames(def));
-      }
-      else if (input instanceof Input || input instanceof Output || input instanceof Fault) {
-          newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_MESSAGE");       // TODO: Ugly Hack... remove
-          Definition def = ((MessageReference) input).getEnclosingDefinition();
-          return NameUtil.getUniqueNameHelper("NewMessage", NameUtil.getUsedMessageNames(def));
-      }
-      else if (input instanceof Part) {
-          Definition def = ((Part) input).getEnclosingDefinition();
-          
-          if (kind.equalsIgnoreCase("element")) {
-              newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_ELEMENT");      // TODO: Ugly Hack... remove
-              if (command == null) {
-                  command = new AddXSDElementDeclarationCommand(def, "NewElement");
-              }
-              XSDSchema parentSchema = ((AddXSDElementDeclarationCommand) command).getSchema();
-              
-              List usedNames = getUsedElementNames(parentSchema);
-              return NameUtil.getUniqueNameHelper("NewElement", usedNames);
-          }
-          else if (kind.equalsIgnoreCase("type")) {
-              if (command == null) {
-                  command = new AddXSDTypeDefinitionCommand(def, "NewType");
-              }
-              XSDSchema parentSchema = ((AddXSDTypeDefinitionCommand) command).getSchema();
-
-              String newItemName = "NewComplexType";
-              List usedNames = null;
-              if (typeKind.equalsIgnoreCase("complex")) {
-                  newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_COMPLEX_TYPE");       // TODO: Ugly Hack... remove
-                  usedNames = getUsedComplexTypeNames(parentSchema);    
-              }
-              else {
-                  newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_SIMPLE_TYPE");       // TODO: Ugly Hack... remove
-                  usedNames = getUsedSimpleTypeNames(parentSchema);
-                  newItemName = "NewSimpleType";
-              }
-              
-              return newItemName = NameUtil.getUniqueNameHelper(newItemName, usedNames);
-          }
-      }
-      
-      return "NewComponent";
-  }
-  
-  private List getUsedSimpleTypeNames(XSDSchema schema) {
-      List namesList = new ArrayList();
-      
-      Iterator typesIt = schema.getTypeDefinitions().iterator();
-      while (typesIt.hasNext()) {
-          XSDTypeDefinition type = (XSDTypeDefinition) typesIt.next();
-          if (type instanceof XSDSimpleTypeDefinition) {
-              namesList.add(type.getName());
-          }
-      }
-      
-      return namesList;
-  }
-  
-  private List getUsedComplexTypeNames(XSDSchema schema) {
-      List namesList = new ArrayList();
-      
-      Iterator typesIt = schema.getTypeDefinitions().iterator();
-      while (typesIt.hasNext()) {
-          XSDTypeDefinition type = (XSDTypeDefinition) typesIt.next();
-          if (type instanceof XSDComplexTypeDefinition) {
-              namesList.add(type.getName());
-          }
-      }
-      
-      return namesList;
-  }
-  
-  private List getUsedElementNames(XSDSchema schema) {
-      List namesList = new ArrayList();
-      
-      Iterator elementsIt = schema.getElementDeclarations().iterator();
-      while (elementsIt.hasNext()) {
-          XSDElementDeclaration element = (XSDElementDeclaration) elementsIt.next();
-          namesList.add(element.getName());
-      }
-      
-      return namesList;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java
deleted file mode 100644
index 32fc403..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java
+++ /dev/null

@@ -1,551 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.w3c.dom.Node;
-
-
-/*
- * This class renames 'related' WSDLElements.  The scenario is as follows:
- * The user renames a WSDLElement in the editor, say a Message.  This class
- * will find the 'related' elements to this Message and rename them as well.
- * It will only rename a 'related' element if the element name (or part of it)
- * is generated.
- * 
- * See NameUtil.java
- */
-public class SmartRenameAction extends BaseNodeAction implements Runnable {
-	protected Object element;
-	protected String newName;
-	private List messageReferences; // This variable should be accessed by method getAllMessageReferences()
-	protected Node node;   
-	
-	public SmartRenameAction(Object element, String newName) {
-		setText("Smart Rename Action"); // Do not translate
-		this.element = element;
-		this.newName = newName;
-	    this.node = WSDLEditorUtil.getInstance().getNodeForObject(element);
-	}
-	
-	public Node getNode() {
-	   return node;
-	}
-
-	public String getUndoDescription() {
-	  return WSDLEditorPlugin.getWSDLString("_UI_ACTION_RENAME");  //$NON-NLS-1$
-	}
-
-	public void run() {
-		RenameAction renamer;
-		String oldName;
-		
-		beginRecording();
-		if (element instanceof Operation) {
-			Operation operation = (Operation) element;
-			oldName = operation.getName();
-
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			// Rename Operation 
-			renamer = new RenameAction(operation, newName);
-			renamer.run();
-			
-			// Rename Input
-			Input input = operation.getEInput();
-			/*
-			if (input != null && isInputOutputNameGenerated(oldName, input.getName())) {
-				renamer = new RenameAction(input, newName);
-				renamer.run();
-			}
-			*/
-			
-			// Rename Output
-			Output output = operation.getEOutput();
-			/*
-			if (output != null && isInputOutputNameGenerated(oldName, output.getName())) {
-				renamer = new RenameAction(output, newName);
-				renamer.run();
-			}
-			*/
-			
-			// Rename Messages and Parts
-			Message msg;
-
-			// Input
-			if (input != null && input.getEMessage() != null) {
-				msg = input.getEMessage();
-				String oldMessageName = "";
-
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					
-					if (isMessageNameGenerated(oldMessageName, oldName, "Request")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);	
-					}
-				}
-			}
-			
-			// Output
-			if (output != null && output.getMessage() != null) {
-				msg = output.getEMessage();
-				String oldMessageName = "";
-				
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					
-					if (isMessageNameGenerated(oldMessageName, oldName, "Response")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-					}
-					
-				}
-			}
-			
-			// Faults
-			List faults = operation.getEFaults();
-			if (faults != null) {
-				Iterator it = faults.iterator();
-				while (it.hasNext()) {
-					Fault fault = (Fault) it.next();
-					msg = fault.getEMessage();
-					String oldMessageName = "";
-
-					if (msg != null) {
-						oldMessageName = msg.getQName().getLocalPart();
-						
-						if (isMessageNameGenerated(oldMessageName, oldName, fault.getName())) {
-							renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-							
-							if (msg.getEParts() != null)
-								renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-						}
-					}
-				}
-			}
-		}
-		else if (element instanceof Input) {
-			Input input = (Input) element;
-			oldName = input.getName();
-			if (oldName == null) {
-				oldName = "";
-			}
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			input.setName(newName);
-
-//			 Rename Messages and Parts
-			Message msg;
-			
-			// Input
-			if (input != null && input.getEMessage() != null) {
-				msg = input.getEMessage();
-				String oldMessageName = "";
-				
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					
-					if (isMessageNameGenerated(oldMessageName, oldName, "Request")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);	
-					}
-				}
-			}
-		}
-		else if (element instanceof Output) {
-			Output output = (Output) element;
-			oldName = output.getName();
-			if (oldName == null) {
-				oldName = "";
-			}
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			output.setName(newName);
-
-//			 Rename Messages and Parts
-			Message msg;
-			
-			// Output
-			if (output != null && output.getMessage() != null) {
-				msg = output.getEMessage();
-				String oldMessageName = "";
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					if (isMessageNameGenerated(oldMessageName, oldName, "Response")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-					}
-				}
-			}
-		}
-		else if (element instanceof Fault) {
-			Fault fault = (Fault) element;
-			Message msg = fault.getEMessage();
-			String oldMessageName = "";
-			oldName = fault.getName();
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			// Rename the Fault
-			renamer = new RenameAction(fault, newName);
-			renamer.run();
-
-			// Rename the Message and Parts
-			if (msg != null) {
-				oldMessageName = msg.getQName().getLocalPart();
-				
-				Operation op = (Operation) fault.eContainer();
-				if (isMessageNameGenerated(oldMessageName, op.getName(), oldName)) {
-					renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-					
-					if (msg.getEParts() != null)
-						renameFaultParts(msg.getEParts(), op.getName(), oldName, newName);
-				}
-			}
-		}
-		else if (element instanceof Message) {
-			Message msg = (Message) element;
-			oldName = msg.getQName().getLocalPart();
-			String oldMessageName = msg.getQName().getLocalPart();
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-
-			renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-					
-			if (msg.getEParts() != null)
-				renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-		}
-		else if (element instanceof Part) {
-			Part part = (Part) element;
-			String oldPartName = part.getName();
-			
-			if (oldPartName.equals(newName)) {
-				return;
-			}
-			
-			renamer = new RenameAction(element, newName);
-			renamer.run();
-			
-//			Rename Elements
-			renameXSDElement(part, oldPartName, newName);
-		}
-		else if (element instanceof Port) {
-			Port port = (Port) element;
-			String oldPortName = port.getName();
-			
-			renamer = new RenameAction(element, newName);
-			renamer.run();
-
-//			Rename Binding
-			Binding binding = port.getEBinding();
-			if (binding != null && binding.getQName().getLocalPart().equals(oldPortName)) {
-				renamer = new RenameAction(binding, newName);	
-				renamer.run();
-			}
-		}
-		endRecording();
-	}
-	
-	// boolean isInputOutput should be set to true if the part is an Input or Output.
-	// Set false if the part is a Fault.
-	private void renamePartsHelper(List partsList, String oldSubString, String newSubString, boolean isInputOutput) {
-		RenameAction renamer;
-		
-		if (partsList != null) {
-			Iterator pIt = partsList.iterator();
-			while (pIt.hasNext()) {
-				Part part = (Part) pIt.next();
-				String oldPartName = part.getName();
-				
-				if (isPartNameGenerated(oldPartName, oldSubString)) {
-					String newPartName;
-					if (isInputOutput) {
-						newPartName = computeNewPartName(part, oldSubString, newSubString);
-					}
-					else {
-						newPartName = computeNewFaultPartName(part, oldSubString, newSubString);
-					}
-					
-					renamer = new RenameAction(part, newPartName);
-					renamer.run();
-					
-					// Rename Elements
-					renameXSDElement(part, oldPartName, newPartName);
-				}
-			}
-		}
-	}
-	
-	// This method is used to update the Part name when the Fault name is changed.  Only
-	// change the Part name if the part name is a generated name.
-	// Compare to renamePartsHelper().  The renamePartsHelper() method is called when a Fault
-	// has NOT been renamed, rather, it is triggered by some other naming (ex. Operation
-	// renaming).  It will updat Input/Output, AND Fault Parts.
-	private void renameFaultParts(List partsList, String baseName, String oldSubString, String newSubString) {
-		RenameAction renamer;
-		
-		if (partsList != null) {
-			Iterator pIt = partsList.iterator();
-			while (pIt.hasNext()) {
-				Part part = (Part) pIt.next();
-				String oldPartName = part.getName();
-				
-				if (isPartNameGenerated(oldPartName, baseName, oldSubString)) {
-					String newPartName;
-					newPartName = computeNewFaultPartName(part, oldSubString, newSubString);
-					renamer = new RenameAction(part, newPartName);
-					renamer.run();
-					
-					// Rename Elements
-					renameXSDElement(part, oldPartName, newPartName);
-				}
-			}
-		}
-	}
-	
-	private String computeNewMessageName(Message message, String oldSubString, String newSubString) {
-		String string = message.getQName().getLocalPart();
-		return replaceSectionWithSubString(string, oldSubString, newSubString, 0);		
-	}
-	
-//	private String computeNewFaultMessageName(Message message, String oldSubString, String newSubString) {
-//		String string = message.getQName().getLocalPart();
-//		return replaceSectionWithSubString(string, oldSubString, newSubString, 1);		
-//	}
-	
-	// Method for Input, Output, and Fault Parts
-	// See computeNewFaultPartName() for comparison
-	private String computeNewPartName(Part part, String oldSubString, String newSubString) {
-		String string = part.getName();
-		return replaceSectionWithSubString(string, oldSubString, newSubString, 0);		
-	}
-	
-	// Method for Fault Parts
-	// This method behaves in the exact same way as computeNewPartName() except it starts searching for a match
-	// after the first character.  This method is intended for users who wish to rename a generated (Fault) part
-	// where the Fault name has changed.  We start our search after the first character because the generated name
-	// of the part is built by appending the Fault name after the Operation name.
-	private String computeNewFaultPartName(Part part, String oldSubString, String newSubString) {
-		String string = part.getName();
-		return replaceSectionWithSubString(string, oldSubString, newSubString, 1);		
-	}
-	
-	private String replaceSectionWithSubString(String fullString, String oldSubString, String newSubString, int startSearchIndex) {
-		StringBuffer fullSB = new StringBuffer(fullString);
-		int index = fullSB.indexOf(oldSubString, startSearchIndex);
-		if (index >= 0) {
-			return fullSB.replace(index, index + oldSubString.length(), newSubString).toString();
-		}
-		
-		return "";
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////
-	
-	private static boolean commonNameGeneratorCheck(String targetName, String baseName, String appendName) {
-		// First criteria is targetName must start with the baseName
-		if (!targetName.startsWith(baseName))
-			return false;
-			
-		if (appendName.trim().length() > 0) {
-			// Second criteria.  The appended name must be in the targetName and begin right
-			// after the baseName location
-			if (!targetName.startsWith(appendName, baseName.length()))
-				return false;
-		}
-			
-		// Third criteria (if necessary).  If baseName + appendName is shorter than targetName,
-		// then there must be 'extra' characters at the end of targetName.  These characters must
-		// make up an integer.  If not, it is not a generated string.
-		int subLength = baseName.length() + appendName.length();
-		if (targetName.length() > subLength) {
-			// We have 'extra' characters
-			String extras = targetName.substring(subLength);
-			
-			if(!isDigit(extras))
-				return false;
-		}
-		
-		return true;
-	}
-	
-	public static boolean isOperationNameGenerated(String opName, String name) {
-		return opName.equals(name);
-	}
-	
-	public static boolean isMessageNameGenerated(String msgName, String baseName, String appendName) {
-		return commonNameGeneratorCheck(msgName, baseName, appendName);
-	}
-	
-	public static boolean isInputOutputNameGenerated(String inOutName, String name) {
-		return inOutName.equals(name);
-	}
-	
-	public static boolean isFaultNameGenerated(String faultName, String name) {
-		return faultName.equals(name);
-	}
-	
-	public static boolean isPartNameGenerated(String partName, String baseName) {
-		return commonNameGeneratorCheck(partName, baseName, "");
-	}
-	
-	private boolean isPartNameGenerated(String partName, String baseName, String appendName) {
-		return commonNameGeneratorCheck(partName, baseName, appendName);
-	}
-	
-	private static boolean isDigit(String string) {
-		boolean rValue = true;
-		char[] chars = string.toCharArray();
-	
-		for (int index = 0; index < chars.length; index++) {
-			if (!Character.isDigit(chars[index])) {
-				rValue = false;
-				break;
-			}
-		}
-		
-		return rValue;
-	}
-	
-	/*
-	 * The following classes aid in renaming a message
-	 */
-	private void renameMessageHelper(Message msg, String newName) {
-		List messageRefs = getReferencingMessageReferences(msg, getAllMessageReferences());
-		
-		RenameAction renamer = new RenameAction(msg, newName);
-		renamer.run();
-		
-		Iterator iterator = messageRefs.iterator();
-		while (iterator.hasNext()) {
-			MessageReference messageReference = (MessageReference) iterator.next();
-			messageReference.setEMessage(msg);
-		}
-	}
-	
-	private List getReferencingMessageReferences(Message msg, List messageRefs) {
-		Vector referencesVector = new Vector();
-		QName messageQName = msg.getQName();
-		Iterator iterator = messageRefs.iterator();
-		
-		while (iterator.hasNext()) {
-			MessageReference messageReference = (MessageReference) iterator.next();
-			if (messageReference.getEMessage() != null && messageQName.equals(messageReference.getEMessage().getQName())) {
-				referencesVector.addElement(messageReference);
-			}
-		}
-		
-		return referencesVector;
-	}
-	
-	private List getAllMessageReferences() {
-		if (messageReferences == null) {
-			messageReferences = new Vector();
-			Definition definition = ((WSDLElement) element).getEnclosingDefinition();
-			List portTypes = definition.getEPortTypes();
-		
-			if (portTypes != null) {
-				Iterator portTypeIterator = portTypes.iterator();
-				while (portTypeIterator.hasNext()) {
-					List operationsList = ((PortType) portTypeIterator.next()).getEOperations();
-					
-					if (operationsList != null) {
-						Iterator operationsIterator = operationsList.iterator();
-						while (operationsIterator.hasNext()) {
-							messageReferences.addAll(getAllMessageReferences((Operation) operationsIterator.next()));
-						}
-					}
-				}
-			}
-		}
-		
-		return messageReferences;
-	}
-	
-	private Vector getAllMessageReferences(Operation operation) {
-		Vector iofs = new Vector();
-		Iterator it = operation.getEFaults().iterator();
-		while (it.hasNext()) {
-			iofs.addElement(it.next());
-		}
-		
-		if (iofs == null)
-			iofs = new Vector();
-		
-		if (operation.getEInput() != null)
-			iofs.addElement(operation.getEInput());
-		
-		if (operation.getEOutput() != null)
-			iofs.addElement(operation.getEOutput());
-		
-		return iofs;
-	}
-	
-	private void renameXSDElement(Part part, String oldXSDName, String newXSDName) {
-		XSDElementDeclaration elementDeclaration = part.getElementDeclaration();
-		if (elementDeclaration != null && oldXSDName.equals(elementDeclaration.getName())) {
-			renameElementDeclarationHelper(elementDeclaration, oldXSDName, newXSDName);
-			
-			// Here we rename the element reference.
-			//
-			QName qname = new QName(part.getElementName().getNamespaceURI(), newXSDName);
-			part.setElementName(qname);			
-		}
-	}
-	
-	private void renameElementDeclarationHelper(XSDElementDeclaration elementDeclaration, String oldXSDName, String newXSDName) {
-		if (elementDeclaration != null && elementDeclaration.getName().equals(oldXSDName)) {
-			elementDeclaration.setName(newXSDName);
-		}
-	}
-	
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourceEditorActionBarContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourceEditorActionBarContributor.java
deleted file mode 100644
index 472ca0d..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourceEditorActionBarContributor.java
+++ /dev/null

@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.ExtendedEditorActionBuilder;
-import org.eclipse.wst.sse.ui.internal.IExtendedContributor;
-import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLMultiPageEditorPart;
-
-public class SourceEditorActionBarContributor extends MultiPageEditorActionBarContributor implements IExtendedContributor {
-
-	protected IEditorActionBarContributor designViewerActionBarContributor = null;
-	protected IEditorActionBarContributor sourceViewerActionContributor = null;
-	protected WSDLMultiPageEditorPart multiPageEditor = null;
-
-	// EditorExtension
-	private static final String EDITOR_ID = "org.eclipse.wst.wsdl.ui.internal.actions.XMLMultiPageEditorPart"; //$NON-NLS-1$
-	private IExtendedContributor extendedContributor;
-
-	public SourceEditorActionBarContributor() {
-		super();
-
-		sourceViewerActionContributor = new SourcePageActionContributor();
-
-		// Read action extensions.
-		ExtendedEditorActionBuilder builder = new ExtendedEditorActionBuilder();
-		extendedContributor = builder.readActionExtensions(EDITOR_ID);
-	}
-
-	public void init(IActionBars actionBars) {
-		super.init(actionBars);
-
-		if (actionBars != null) {
-			initDesignViewerActionBarContributor(actionBars);
-			initSourceViewerActionContributor(actionBars);
-		}
-	}
-
-	protected void initDesignViewerActionBarContributor(IActionBars actionBars) {
-		if (designViewerActionBarContributor != null)
-			designViewerActionBarContributor.init(actionBars, getPage());
-	}
-
-	protected void initSourceViewerActionContributor(IActionBars actionBars) {
-		if (sourceViewerActionContributor != null)
-			sourceViewerActionContributor.init(actionBars, getPage());
-	}
-
-	public void dispose() {
-		super.dispose();
-
-		if (designViewerActionBarContributor != null)
-			designViewerActionBarContributor.dispose();
-
-		if (sourceViewerActionContributor != null)
-			sourceViewerActionContributor.dispose();
-
-		if (extendedContributor != null)
-			extendedContributor.dispose();
-	}
-
-	/**
-	 * @see EditorActionBarContributor#contributeToMenu(IMenuManager)
-	 */
-	public final void contributeToMenu(IMenuManager menu) {
-		super.contributeToMenu(menu);
-
-		addToMenu(menu);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToMenu(menu);
-	}
-
-	protected void addToMenu(IMenuManager menu) {
-	}
-
-	/**
-	 * @see IExtendedContributor#contributeToPopupMenu(IMenuManager)
-	 */
-	public final void contributeToPopupMenu(IMenuManager menu) {
-
-		addToPopupMenu(menu);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToPopupMenu(menu);
-	}
-
-	protected void addToPopupMenu(IMenuManager menu) {
-	}
-
-	/**
-	 * @see EditorActionBarContributor#contributeToToolBar(IToolBarManager)
-	 */
-	public final void contributeToToolBar(IToolBarManager toolBarManager) {
-		super.contributeToToolBar(toolBarManager);
-
-		addToToolBar(toolBarManager);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToToolBar(toolBarManager);
-	}
-
-	protected void addToToolBar(IToolBarManager toolBarManager) {
-	}
-
-	/**
-	 * @see EditorActionBarContributor#contributeToStatusLine(IStatusLineManager)
-	 */
-	public final void contributeToStatusLine(IStatusLineManager manager) {
-		super.contributeToStatusLine(manager);
-
-		addToStatusLine(manager);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToStatusLine(manager);
-	}
-
-	protected void addToStatusLine(IStatusLineManager manager) {
-	}
-
-	/**
-	 * @see IExtendedContributor#updateToolbarActions()
-	 */
-	public void updateToolbarActions() {
-		if (extendedContributor != null)
-			extendedContributor.updateToolbarActions();
-	}
-
-	public void setActiveEditor(IEditorPart targetEditor) {
-		// save multiPageEditor before calling super.setActiveEditor(targetEditor)
-		// super.setActiveEditor will call setActivePage(IEditorPart activeEditor)
-		// multiPageEditor is needed in setActivePage(IEditorPart activeEditor)
-		if (targetEditor instanceof WSDLMultiPageEditorPart)
-			multiPageEditor = (WSDLMultiPageEditorPart) targetEditor;
-
-		super.setActiveEditor(targetEditor);
-
-		updateToolbarActions();
-
-		if (extendedContributor != null)
-			extendedContributor.setActiveEditor(targetEditor);
-	}
-
-	public void setActivePage(IEditorPart activeEditor) {
-		// This contributor is designed for StructuredTextMultiPageEditorPart.
-		// To safe-guard this from problems caused by unexpected usage by other editors, the following
-		// check is added.
-		if (multiPageEditor != null) {
-			if (activeEditor != null && activeEditor instanceof StructuredTextEditor)
-				activateSourcePage(activeEditor);
-			else
-				activateDesignPage(activeEditor);
-		}
-
-		updateToolbarActions();
-
-		IActionBars actionBars = getActionBars();
-		if (actionBars != null) {
-			// update menu bar and tool bar
-			actionBars.updateActionBars();
-		}
-	}
-
-	protected void activateDesignPage(IEditorPart activeEditor) {
-		if (designViewerActionBarContributor != null && designViewerActionBarContributor instanceof IDesignViewerActionBarContributor) {
-			designViewerActionBarContributor.setActiveEditor(multiPageEditor);
-		}
-
-		if (sourceViewerActionContributor != null && sourceViewerActionContributor instanceof ISourceViewerActionBarContributor) {
-			// if design page is not really an IEditorPart, activeEditor == null, so pass in multiPageEditor instead (d282414)
-			if (activeEditor == null) {
-				sourceViewerActionContributor.setActiveEditor(multiPageEditor);
-			}
-			else {
-				sourceViewerActionContributor.setActiveEditor(activeEditor);
-			}
-			((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(false);
-		}
-	}
-
-	protected void activateSourcePage(IEditorPart activeEditor) {
-		if (designViewerActionBarContributor != null && designViewerActionBarContributor instanceof IDesignViewerActionBarContributor) {
-			designViewerActionBarContributor.setActiveEditor(multiPageEditor);
-		}
-
-		if (sourceViewerActionContributor != null && sourceViewerActionContributor instanceof ISourceViewerActionBarContributor) {
-			sourceViewerActionContributor.setActiveEditor(activeEditor);
-			((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(true);
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourcePageActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourcePageActionContributor.java
deleted file mode 100644
index 84b6bd7..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourcePageActionContributor.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML;
-
-
-/**
- * SourcePageActionContributor
- * 
- * This class is for multi page editor's source page contributor.
- *
- * Use WSDLEditorActionContributor for single page editor
- * */
-public class SourcePageActionContributor extends ActionContributorXML {
-
-	private IActionBars fBars;
-
-	/**
-	 * This method calls:
-	 * <ul>
-	 *  <li><code>contributeToMenu</code> with <code>bars</code>' menu manager</li>
-	 *  <li><code>contributeToToolBar</code> with <code>bars</code>' tool bar
-	 *    manager</li>
-	 *  <li><code>contributeToStatusLine</code> with <code>bars</code>' status line
-	 *    manager</li>
-	 * </ul>
-	 * The given action bars are also remembered and made accessible via 
-	 * <code>getActionBars</code>.
-	 * 
-	 * @param bars the action bars
-	 * 
-	 */
-	public void init(IActionBars bars) {
-		fBars = bars;
-		contributeToMenu(bars.getMenuManager());
-		contributeToToolBar(bars.getToolBarManager());
-		contributeToStatusLine(bars.getStatusLineManager());
-	}
-
-	/**
-	 * Returns this contributor's action bars.
-	 *
-	 * @return the action bars
-	 */
-	public IActionBars getActionBars() {
-		return fBars;
-	}
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLActionBarContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLActionBarContributor.java
deleted file mode 100644
index 1ac3e78..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLActionBarContributor.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public class WSDLActionBarContributor extends SourceEditorActionBarContributor
-{
-  protected ITextEditor textEditor;
-
-  /**
-   * Constructor for WSDLActionBarContributor.
-   */
-  public WSDLActionBarContributor()
-  {
-    super();
-  }
-
-  public void setActivePage(IEditorPart activeEditor)
-  {
-    super.setActivePage(activeEditor);
-
-    // always enable undo/redo regardless of which page we're on.  The undo/redo comes from the editor
-    //    
-    updateAction(ActionFactory.UNDO.getId(), ITextEditorActionConstants.UNDO, true);
-    updateAction(ActionFactory.REDO.getId(), ITextEditorActionConstants.REDO, true);
-
-    // turn these off so that the actionhandler will handle it for us
-    //
-    //updateAction(IWorkbenchActionConstants.CUT, ITextEditorActionConstants.CUT, false);
-    //updateAction(IWorkbenchActionConstants.COPY, ITextEditorActionConstants.COPY, false);
-    //updateAction(IWorkbenchActionConstants.PASTE, ITextEditorActionConstants.PASTE, false);
-
-    getActionBars().updateActionBars();
-  }
-
-  protected void updateAction(String globalActionId, String textEditorActionId, boolean enable)
-  {
-    getActionBars().setGlobalActionHandler(globalActionId, enable ? getAction(textEditor, textEditorActionId) : null);
-  }
-
-  /**
-   * Returns the action registed with the given text editor.
-   * @return IAction or null if editor is null.
-   */
-  protected IAction getAction(ITextEditor editor, String actionID)
-  {
-    try
-    {
-      return (editor == null ? null : editor.getAction(actionID));
-    }
-    catch (Exception e)
-    {
-      return null;
-    }
-  }
-
-  /**
-   * @see EditorActionBarContributor#contributeToToolBar(IToolBarManager)
-   */
-  public void addToToolBar(IToolBarManager toolBarManager)
-  {
-    super.addToToolBar(toolBarManager);
-    toolBarManager.add(new GroupMarker("WSDLEditor"));
-  }
-
-
-  public void setActiveEditor(IEditorPart activeEditor)
-  {
-    super.setActiveEditor(activeEditor);
-    textEditor = null;
-    if (activeEditor instanceof WSDLEditor)
-    {
-      textEditor = ((WSDLEditor) activeEditor).getTextEditor();
-    }
-    
-    updateAction(ActionFactory.UNDO.getId(), ITextEditorActionConstants.UNDO, true);
-    updateAction(ActionFactory.REDO.getId(), ITextEditorActionConstants.REDO, true);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragAction.java
deleted file mode 100644
index 6425160..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragAction.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.w3c.dom.Node;
-
-public abstract class WSDLDragAction extends BaseNodeAction {
-	protected WSDLTreeNodeEditPart movingChildEditPart;
-	protected Point pointerLocation;
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public boolean canExecute() {
-		return false;
-	}
-	
-	public void execute() {
-		run();
-	}
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public String getUndoDescription() {
-		return "";
-	}
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public Node getNode() {
-		return null;
-	}
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public IFigure getFeedbackFigure() {
-		return null;
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragReorderAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragReorderAction.java
deleted file mode 100644
index 1cff3c8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragReorderAction.java
+++ /dev/null

@@ -1,424 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import javax.wsdl.OperationType;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.OperationImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-
-
-public class WSDLDragReorderAction extends WSDLDragAction
-{
-  protected WSDLEditor wsdlEditor;
-  protected WSDLElement movingChild;
-  protected WSDLElement newParent;
-  protected WSDLTreeNodeEditPart leftSiblingEditPart;
-  protected WSDLTreeNodeEditPart rightSiblingEditPart;
-  protected WSDLElement leftSibElement;
-  protected WSDLElement rightSibElement;
-  protected boolean canNeverExecute = false;
-  
-  public WSDLDragReorderAction(WSDLTreeNodeEditPart movingChildEditPart, EditPart pointerEditPart, Point pointerLocation) {
-  	this.movingChildEditPart = movingChildEditPart;
-  	this.pointerLocation = pointerLocation;
-
-	EditPart possibleParent = getParentEditPart(pointerEditPart);
-	
-	if (!(possibleParent instanceof WSDLTreeNodeEditPart)) {
-		canNeverExecute = true;
-		return;
-	}
-  	
-	WSDLTreeNodeEditPart targetParentEditPart = (WSDLTreeNodeEditPart) possibleParent;
-	wsdlEditor = ((WSDLComponentViewer) possibleParent.getViewer()).getWSDLEditor();
-	
-	if (pointerEditPart.getParent() != null) {
-		// Sort the siblings (and itself)
-		List targetEditPartSiblings = pointerEditPart.getParent().getChildren();
-		Collections.sort(targetEditPartSiblings, new VerticalEditPartComparator());
-  
-		// Get 'left' and 'right' siblings
-		leftSiblingEditPart = getVerticalLeftSibling(targetEditPartSiblings, movingChildEditPart, pointerLocation);
-		rightSiblingEditPart = getVerticalRightSibling(targetEditPartSiblings, movingChildEditPart, pointerLocation);           	
-
-		if (movingChildEditPart != null)
-			movingChild = (WSDLElement) movingChildEditPart.getModel();
-		if (leftSiblingEditPart != null)
-			leftSibElement = (WSDLElement) leftSiblingEditPart.getModel();
-		if (rightSiblingEditPart != null)
-			rightSibElement = (WSDLElement) rightSiblingEditPart.getModel();
-		
-		newParent = (WSDLElement) targetParentEditPart.getModel();
-	}
-	else {
-		newParent = (WSDLElement) targetParentEditPart.getModel();
-		leftSibElement = null;
-		rightSibElement= null;
-	}
-  }
-            
-  public boolean canExecute()
-  {
-    boolean result = false;
-
-    if (canNeverExecute || newParent == null || movingChild == null) {
-    	return false;
-    }
-    
-    if (movingChild instanceof Input) {
-    	if (!(leftSibElement instanceof Fault) && newParent.equals(movingChild.eContainer())) {
-    		result = true;
-    	}
-    }
-    else if (movingChild instanceof Output) {
-    	if (!(leftSibElement instanceof Fault) && newParent.equals(movingChild.eContainer())) {
-    		result = true;
-    	}
-    }
-    else if (movingChild instanceof Part) {
-    	if (newParent instanceof Message && newParent.equals(movingChild.eContainer())) {
-    		result = true;
-    	}
-    }
-
-    return result;
-  }           
-
-
-  /*
-   * @see IAction#run()
-   */
-  public void run()
-  {                            
-//    beginRecording();
-  	if (canExecute()) {
-  		if (movingChild instanceof Input) {
-  			Input input = (Input) movingChild;
-  			OperationImpl operation = (OperationImpl) input.eContainer();
-  			
-  			if (leftSiblingEditPart == null) {
-  				// Input/Output style
-  				setInputOutputOrder(operation, true);
-  			}
-  			else {
-  				// Output/Input style
-  				setInputOutputOrder(operation, false);
-  			}
-  		}
-  		else if (movingChild instanceof Output) {
- 			Output output = (Output) movingChild;
-  			OperationImpl operation = (OperationImpl) output.eContainer();
-  			
-  			if (leftSiblingEditPart == null) {
-  				// Output/Input style
-  				setInputOutputOrder(operation, false);
-  			}
-  			else {
-  				// Input/Output style
-  				setInputOutputOrder(operation, true);
-  			}
-  		}
-  		else if (movingChild instanceof Part) {
-  			Message message = (Message) newParent;
-  			List parts = message.getEParts();
-
-  			parts.remove(movingChild);
-
-  			int leftIndex = -1, rightIndex = -1;
-  			if (leftSibElement != null) {
-  				leftIndex = parts.indexOf(leftSibElement);
-  			}
-  			if (rightSibElement != null) {
-  				rightIndex = parts.indexOf(rightSibElement);
-  			}
-
-  			if (leftIndex == -1) {
-  				// Add moving child to the front
-  				parts.add(0, movingChild);  				
-  			}
-  			else if (rightIndex == -1) {
-  				// Add moving child to the end
-  				parts.add(movingChild);
-  			}
-  			else {
-  				// Add moving child after the occurence of the left sibling
-  				parts.add(leftIndex + 1, movingChild);
-  			}
-  		}
-  		wsdlEditor.getSelectionManager().setSelection(new StructuredSelection(movingChild));
-  	}
-//    endRecording();
-  }
-  
-  public IFigure getFeedbackFigure() {
-  	IFigure feedbackFigure = null;
-    if (feedbackFigure == null && movingChildEditPart instanceof WSDLTreeNodeEditPart)
-    {                                       
-      feedbackFigure = new Polyline();                         
-//  polyLine.setLineStyle(Graphics.LINE_DASHDOT);      
-      ((Polyline)feedbackFigure).setLineWidth(2);	
-      drawLines((Polyline) feedbackFigure);
-    }
-    
-  	return feedbackFigure;
-  }
-
-  /* Return a PointList which will be used to add a feedback figure.  The feedback figure will be a
-   * Polyline composed of the Points in the PointList
-   */
-  private PointList drawLines(Polyline polyLine) {
-    PointList pointList = new PointList(); 
-    
-    if (leftSiblingEditPart != null) {
-    	Rectangle leftRectangle = leftSiblingEditPart.getFigure().getBounds();
-	   	int xCoord = leftRectangle.x + 15;
-	  	int yCoord = leftRectangle.y;
-	   	int height = leftRectangle.height;
-	   	int width = leftRectangle.width - 15;
-
-	   	// Draw left end line
-	   	addLineToPolyline(polyLine, xCoord, yCoord + height + 3, xCoord, yCoord + height - 3);
-	   	addLineToPolyline(polyLine, xCoord, yCoord + height - 3, xCoord, yCoord + height);
-	   	
-	   	// Draw horizontal line
-	   	addLineToPolyline(polyLine, xCoord, yCoord + height, xCoord + width, yCoord + height);
-	   	
-	   	// Draw right end line
-	   	addLineToPolyline(polyLine, xCoord + width, yCoord + height, xCoord + width, yCoord + height - 3);
-	  	addLineToPolyline(polyLine, xCoord + width, yCoord + height, xCoord + width, yCoord + height + 3);   	
-    }
-    else if (rightSiblingEditPart != null) {
-    	Rectangle rightRectangle = rightSiblingEditPart.getFigure().getBounds();
-    	int xCoord = rightRectangle.x + 15;
-    	int yCoord = rightRectangle.y;
-   		int width = rightRectangle.width - 15;	
-
-   		// Draw left end line
-	   	addLineToPolyline(polyLine, xCoord, yCoord + 3, xCoord, yCoord - 3);
-	   	addLineToPolyline(polyLine, xCoord, yCoord - 3, xCoord, yCoord);
-	   	
-	   	// Draw horizontal line
-	   	addLineToPolyline(polyLine, xCoord, yCoord, xCoord + width, yCoord);
-	   	
-	   	// Draw right end line
-	   	addLineToPolyline(polyLine, xCoord + width, yCoord, xCoord + width, yCoord - 3);
-	  	addLineToPolyline(polyLine, xCoord + width, yCoord, xCoord + width, yCoord + 3);   
-    }
-
-    return pointList;
-  }                    
-  
-  protected Polyline addLineToPolyline(Polyline polyline, int x1, int y1, int x2, int y2) {
-	polyline.addPoint(new Point(x1, y1));
-	polyline.addPoint(new Point(x2, y2));
-
-	return polyline;
-  }                                          
-  
-  /*
-   * Pre-condition: The List siblings should be sorted by it's y-coordinate 
-   */
-  private WSDLTreeNodeEditPart getVerticalRightSibling(List siblings, WSDLTreeNodeEditPart movingEditPart, Point pointerLocation) {
-  	WSDLTreeNodeEditPart rightSibling = null;
-  	int pointerYLocation = pointerLocation.y;
-
-  	for (int index = 0; index < siblings.size(); index++) {
-  		WSDLTreeNodeEditPart sibling = (WSDLTreeNodeEditPart) siblings.get(index);
-  		int siblingYLocation = sibling.getSelectionFigure().getBounds().getCenter().y;
-
-  		if (siblingYLocation > pointerYLocation) {
-  			rightSibling = sibling;
-  			break;
-  		}
-  	}
-  	
-  	return rightSibling;
-  }
-
-  /*
-   * Pre-condition: The List siblings should be sorted by it's y-coordinate 
-   */
-  private WSDLTreeNodeEditPart getVerticalLeftSibling(List siblings, WSDLTreeNodeEditPart movingEditPart, Point pointerLocation) {
-  	WSDLTreeNodeEditPart leftSibling = null;
-  	int pointerYLocation = pointerLocation.y;
-
-  	int index;
-  	for (index = 0; index < siblings.size(); index++) {
-  		WSDLTreeNodeEditPart sibling = (WSDLTreeNodeEditPart) siblings.get(index);
-  		int siblingYLocation = sibling.getSelectionFigure().getBounds().getCenter().y;
-  	  	
-  		if (siblingYLocation > pointerYLocation) {
-  			if (index > 0) {
-  				leftSibling = (WSDLTreeNodeEditPart) siblings.get(index - 1);
-  			}
-
-  			break;
-  		}
-  	}
-
-  	if (index == siblings.size()) {
-  		leftSibling = (WSDLTreeNodeEditPart) siblings.get(index - 1);
-  	}
-
-  	return leftSibling;
-  }
-  
-  protected EditPart getParentEditPart(EditPart target)
-  {
-  	return target.getParent();
-  }
-  
-  // boolean inputFirst = true if the Input is the first in the order of Input and Output
-  private void setInputOutputOrder(OperationImpl operation, boolean inputFirst) {
-  	// We need to determine more info before we can set the style	
-  	if (inputFirst && operation.getEInput() != null) {
-  		// Check if there is an Output
-  		if (operation.getEOutput() != null) {
-  			// Order is: Input, Output
-/*  			
-  			Node operationNode = operation.getElement();		
-  			NodeList childNodeList = operationNode.getChildNodes();
-  			
-  			Node inputNode = operation.getEInput().getElement();
-  			Node outputNode = operation.getEOutput().getElement();
-  			
-  			Node inputTextNode = inputNode.getNextSibling();
-  			Node outputTextNode = outputNode.getNextSibling();
-  			
-  			int inputNodeIndex = getNodeIndex(childNodeList, inputNode);
-  			int outputNodeIndex = getNodeIndex(childNodeList, outputNode);
-  			
-  			if (inputNodeIndex > outputNodeIndex) {
-  				// We need to swap Input and Output
-  				operationNode.removeChild(inputNode);
-  				operationNode.removeChild(outputNode);
-  				
-  				operationNode.insertBefore(inputNode, outputTextNode);
-  				operationNode.insertBefore(outputNode, inputTextNode);
-  			}
-*/  			
-  			
-  			setOperationStyle(operation, OperationType.REQUEST_RESPONSE);
-  		}
-  		/*
-  		else {
-  			// Order is: Input
-  			setOperationStyle(operation, OperationType.ONE_WAY);
-  		}
-  		*/
-  	}
-  	else if (operation.getEOutput() != null) {
-  		// Check if there is an Input
-  		if (operation.getEInput() != null) {
-  			// Order is: Output, Input
-/*  			
-  			Node operationNode = operation.getElement();		
-  			NodeList childNodeList = operationNode.getChildNodes();
-  			
-  			Node inputNode = operation.getEInput().getElement();
-  			Node outputNode = operation.getEOutput().getElement();
-  			
-  			Node inputTextNode = inputNode.getNextSibling();
-  			Node outputTextNode = outputNode.getNextSibling();
-  			
-  			int inputNodeIndex = getNodeIndex(childNodeList, inputNode);
-  			int outputNodeIndex = getNodeIndex(childNodeList, outputNode);
-  			
-  			if (outputNodeIndex > inputNodeIndex) {
-  				// We need to swap Input and Output
-  				operationNode.removeChild(inputNode);
-  				operationNode.removeChild(outputNode);
-
-  				operationNode.insertBefore(inputNode, outputTextNode);
-  				operationNode.insertBefore(outputNode, inputTextNode);
-  			}
-*/  			
-  			setOperationStyle(operation, OperationType.SOLICIT_RESPONSE);
-  		}
-  		/*
-  		else {
-  			// Order is: Output
-  			setOperationStyle(operation, OperationType.NOTIFICATION);
-  		}
-  		*/
-  	}
-  }
-
-/*
- * return -1 if node is not found in the given nodeList
- */
-//	private int getNodeIndex(NodeList nodeList, Node node) {
-//		int index = 0;
-//		while (index < nodeList.getLength() && !(nodeList.item(index).equals(node))) {
-//			index++;
-//		}
-//		
-//		if (index >= nodeList.getLength()) {
-//			index = -1;
-//		}
-//		
-//		return index;
-//	}
-  
-  private void setOperationStyle(OperationImpl operation, OperationType operationType) {
-  	// If there is no style to begin with, don't set one now
-  	if (operation.getStyle() == null) {
-  		return;
-  	}
-  	
-  	operation.setStyle(operationType);
-  }
-  
-  private class VerticalEditPartComparator implements Comparator {
-  	
-  	public VerticalEditPartComparator() {
-  	}
-  	
-  	public int compare(Object part1, Object part2) {
-  		int compareValue = 0;
-
-  		if (part1 instanceof WSDLTreeNodeEditPart && part2 instanceof WSDLTreeNodeEditPart) {
-  			WSDLTreeNodeEditPart editPart1 = (WSDLTreeNodeEditPart) part1;
-  			WSDLTreeNodeEditPart editPart2 = (WSDLTreeNodeEditPart) part2;
-  			
-  			int editPart1Y = editPart1.getSelectionFigure().getBounds().getCenter().y;
-  			int editPart2Y = editPart2.getSelectionFigure().getBounds().getCenter().y;
-  			
-  			Integer integerPart1 = new Integer(editPart1Y);
-  			Integer integerPart2 = new Integer(editPart2Y);
-  			
-  			compareValue = integerPart1.compareTo(integerPart2);
-  		}
-
-  		return compareValue;
-  	}
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragSetMessageAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragSetMessageAction.java
deleted file mode 100644
index 9aa7d48..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragSetMessageAction.java
+++ /dev/null

@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.GroupEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IConnectedFigure;
-
-public class WSDLDragSetMessageAction extends WSDLDragAction {
-	protected EditPart pointerEditPart;
-	protected WSDLElement movingChild;
-	protected WSDLElement pointerModelElement;
-	
-	public WSDLDragSetMessageAction(WSDLTreeNodeEditPart movingChildEditPart, EditPart pointerEditPart, Point pointerLocation) {
-		this.movingChildEditPart = movingChildEditPart;
-		this.pointerEditPart = pointerEditPart;
-		this.pointerLocation = pointerLocation;
-		
-		movingChild = (WSDLElement) movingChildEditPart.getModel();
-		pointerModelElement = (WSDLElement) pointerEditPart.getModel();
-		
-		// Allow the user to hover over a Part (of a Message) to set the Message
-		if (pointerModelElement instanceof Part) {
-			this.pointerEditPart = pointerEditPart.getParent();
-			pointerModelElement = (WSDLElement) this.pointerEditPart.getModel();
-		}
-	}
-
-	public boolean canExecute() {
-	    boolean result = false;
-
-	    if (pointerModelElement == null || movingChild == null) {
-	    	return false;
-	    }
-	    
-	    if (movingChild instanceof Input || movingChild instanceof Output || movingChild instanceof Fault) {
-	    	if (pointerModelElement instanceof Message) {
-	    		result = true;
-	    	}
-	    }
-
-	    return result;
-	}
-	
-	public void run() {
-		if (canExecute()) {
-			MessageReference messageReference = (MessageReference) movingChild;
-			messageReference.setEMessage((Message) pointerModelElement);
-			((WSDLElementImpl) messageReference).updateElement(true);
-			
-			WSDLEditor wsdlEditor = ((WSDLComponentViewer) pointerEditPart.getViewer()).getWSDLEditor();
-			wsdlEditor.getSelectionManager().setSelection(new StructuredSelection(movingChild));
-		}
-	}
-
-	public IFigure getFeedbackFigure() {
-		Polyline polyfigure = new Polyline();
-		GroupEditPart leftGroupEditPart = getGroupEditPart(movingChildEditPart);
-		GroupEditPart rightGroupEditPart = getGroupEditPart(pointerEditPart);
-		int mx = rightGroupEditPart.getFigure().getBounds().x - 5;                                                      
- 
-        drawLine(polyfigure, leftGroupEditPart.outputConnection.getFigure(), ((AbstractGraphicalEditPart) pointerEditPart).getFigure(), mx);
-		
-		return polyfigure;
-	}
-	
-	  protected void drawLine(Polyline feedbackFigure, IFigure a, IFigure b, int mx)
-	  {
-	        Rectangle r1 = getConnectionBounds(a);
-	        Rectangle r2 = getConnectionBounds(b);
-	        int x1 = r1.x + r1.width;
-	        int y1 = r1.y + r1.height / 2;
-	        int x2 = r2.x - 1;
-	        int y2 = r2.y + 8;
-                                          
-	        // draw horizontal line
-	       	addLineToPolyline(feedbackFigure, x1, y1, mx, y1);
-
-	        // draw horizontal line
-	       	addLineToPolyline(feedbackFigure, mx, y2, x2 - 1, y2);
-
-	        // draw the arrow head
-	       	addLineToPolyline(feedbackFigure, x2 - 1, y2, x2 - 4, y2 - 3);
-	       	addLineToPolyline(feedbackFigure, x2 - 1, y2, x2 - 4, y2 + 3);
-	  }
-
-	  protected Rectangle getConnectionBounds(IFigure figure)
-	  {                 
-	    Rectangle r = null;
-	    if (figure instanceof IConnectedFigure)
-	    {
-	      IConnectedFigure connectedFigure = (IConnectedFigure)figure;
-	      r = connectedFigure.getConnectionFigure().getBounds();
-	    }
-	    else
-	    {
-	      r = figure.getBounds();
-	    }
-	    return r; 
-	  }                      
-	  
-	  protected Polyline addLineToPolyline(Polyline polyline, int x1, int y1, int x2, int y2) {
-      	polyline.addPoint(new Point(x1, y1));
-      	polyline.addPoint(new Point(x2, y2));
-      	polyline.setLineWidth(1);
-      	//polyline.setLineStyle(Graphics.LINE_DOT);
-      	
-      	return polyline;
-	  }
-	  
-	  private GroupEditPart getGroupEditPart(EditPart editPart) {
-	  	EditPart parentPart = editPart.getParent();
-	  	
-	  	if (parentPart == null) {
-	  		return null;
-	  	}
-	  	if (!(parentPart instanceof GroupEditPart)) {
-	  		parentPart = getGroupEditPart(parentPart);
-	  	}
-	  	
-	  	return (GroupEditPart) parentPart;
-	  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementAction.java
deleted file mode 100644
index e2f287c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementAction.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Node;
-
-public abstract class WSDLElementAction extends Action
-{
-  protected WSDLElementCommand modelCommand;
-  private IEditorPart editorPart;
-  
-  public WSDLElementAction
-  	(WSDLElementCommand command,
-  	 String undoDescription,
-  	 String label,
-  	 ImageDescriptor image)
-  {
-    super(label,image);
-    modelCommand = command;
-  }
-
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-/*
-  private String getUndoDescription()
-  {
-    return undoDescription;
-  }
-*/
-  abstract protected WSDLElement getOwner();
-  
-  abstract protected boolean showDialog();
-  
-  public void run()
-  {
-    boolean ok = showDialog();
-    if (ok)
-    {
-	    preRun();
-	    modelCommand.run();
-	    format();
-	    selectObject();
-	    postRun();
-    }
-  }
-  
-  protected void preRun()
-  {
-  }
-  
-  protected void postRun()
-  {
-  }
-/*
-  private void beginRecording()
-  {    
-    Node node = null;
-    if (getOwner() != null)
-      node = getOwner().getElement(); 
-    
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, getUndoDescription());  
-    }
-  }
-
-  private void endRecording()
-  {                 
-    Node node = null;
-    if (getOwner() != null)
-      node = getOwner().getElement(); 
-    
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-*/
-  protected WSDLElement getWSDLElement()
-  {
-    return modelCommand.getWSDLElement();
-  }
-  
-  private void format()
-  {
-    Node parentNode = null;
-    if (getOwner() != null)
-      parentNode = getOwner().getElement(); 
-    
-    if (parentNode instanceof IDOMNode) 
-    {
-		  // format selected node                                                    
-      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-      formatProcessorXML.formatNode((IDOMNode)parentNode);      
-    }
-  }
-  
-  private void selectObject()
-  {               
-    if (editorPart != null && getOwner() != null)
-    {
-      Object object = getWSDLElement();
-      if (object != null)
-      {
-        ISelectionProvider selectionProvider = (ISelectionProvider)editorPart.getAdapter(ISelectionProvider.class);
-        if (selectionProvider != null)
-        {
-          selectionProvider.setSelection(new StructuredSelection(object));
-        }
-      }  
-    }   
-  }
-  
-  protected String showDialogHelper(String title, String defaultName)
-  {   
-    String result = defaultName;                                                                                             
-    NewComponentDialog dialog = new NewComponentDialog(WSDLEditorPlugin.getShell(), title, defaultName);
-    int rc = dialog.createAndOpen();
-    if (rc == IDialogConstants.OK_ID)
-    {
-      result = dialog.getName();  
-    }
-    else
-    {
-      result = null;
-    }               
-    return result;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementUIAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementUIAction.java
deleted file mode 100644
index 2382209..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementUIAction.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Node;
-
-public abstract class WSDLElementUIAction extends Action
-{
-  protected WSDLElementCommand modelAction;
-  private IEditorPart editorPart;
-  
-  public WSDLElementUIAction
-  	(WSDLElementCommand action,
-  	 String undoDescription,
-  	 String label,
-  	 ImageDescriptor image)
-  {
-    super(label,image);
-    modelAction = action;
-  }
-
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-
-  private Node getOwnerNode()
-  {
-    if (getOwner() != null)
-      return getOwner().getElement();
-    else
-      return null;
-  }
-
-  abstract protected WSDLElement getOwner();
-  
-  abstract protected boolean showDialog();
-  
-  public void run()
-  {
-    boolean ok = showDialog();
-    if (ok)
-    {
-	    preRun();
-	    modelAction.run();
-	    format();
-	    selectObject();
-	    postRun();
-    }
-  }
-  
-  protected void preRun()
-  {
-  }
-  
-  protected void postRun()
-  {
-  }
-/*
-  private void beginRecording()
-  {    
-    Node node = getOwnerNode();  
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, getUndoDescription());  
-    }
-  }
-
-  private void endRecording()
-  {                 
-    Node node = getOwnerNode(); 
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-*/
-  protected WSDLElement getWSDLElement()
-  {
-    return modelAction.getWSDLElement();
-  }
-  
-  private void format()
-  {
-    Node parentNode = getOwnerNode();
-    if (parentNode instanceof IDOMNode) 
-    {
-		  // format selected node                                                    
-      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-      formatProcessorXML.formatNode((IDOMNode)parentNode);      
-    }
-  }
-  
-  private void selectObject()
-  {               
-    if (editorPart != null && getOwner() != null)
-    {
-      Object object = getWSDLElement();
-      if (object != null)
-      {
-        ISelectionProvider selectionProvider = (ISelectionProvider)editorPart.getAdapter(ISelectionProvider.class);
-        if (selectionProvider != null)
-        {
-          selectionProvider.setSelection(new StructuredSelection(object));
-        }
-      }  
-    }   
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuActionContributor.java
deleted file mode 100644
index ba1026d..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuActionContributor.java
+++ /dev/null

@@ -1,1256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddInputCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOperationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOutputCommand;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.CreateWSDLElementHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentWithChildDialog;
-import org.eclipse.wst.wsdl.ui.internal.wizards.BindingWizard;
-import org.eclipse.wst.wsdl.ui.internal.wizards.PortWizard;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class WSDLMenuActionContributor implements IMenuActionContributor
-{
-  protected AddEEMenuActionContributor addEEMenuActionContributor;
-  IEditorPart editorPart;
-
-  public WSDLMenuActionContributor(IEditorPart editorPart)
-  {
-    addEEMenuActionContributor = new AddEEMenuActionContributor();
-    this.editorPart = editorPart;
-  }
-
-  protected static List createList(Action action)
-  {
-    List list = new ArrayList();
-    list.add(action);
-    return list;
-  }
-  
-	private class OpenSchemaOnSelectionHelper extends Action {
-		Object object;
-		
-		public OpenSchemaOnSelectionHelper(Object object) {
-			setText(WSDLEditorPlugin.getWSDLString("_UI_OPEN_IMPORT"));
-			this.object = object;
-			
-			if (object instanceof Import) {
-				String location = ((Import) object).getLocationURI();
-				
-				if (location == null || location.trim().equals(""))
-					setEnabled(false);
-			}
-		}
-		
-		public void run() {
-			Definition definition = ((WSDLElement) object).getEnclosingDefinition();
-			org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper helper = new org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper(definition);
-		    helper.openEditor((org.eclipse.emf.ecore.EObject) object);
-		}
-	}
-
-  public void contributeMenuActions(final IMenuManager menu, final Node node, Object object)
-  {
-    final IMenuManager addMenu;
-    boolean addEditAction = false;
-    final boolean isEditable = (node instanceof IDOMNode);
-    if (object instanceof WSDLElement && node != null && isEditable)
-    {
-      addEditAction = true;
-      addMenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_CHILD"), "addchild"); //$NON-NLS-1$ //$NON-NLS-2$
-      menu.add(addMenu);
-      Definition definition = ((WSDLElement) object).getEnclosingDefinition();
-
-      final String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-
-      if (object instanceof Import) {
-      	menu.add(new OpenSchemaOnSelectionHelper(object));
-      }
-      
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {
-        public Object caseBinding(Binding binding)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddBindingOperationAction(node, "NewBindingOperation", prefix)); //$NON-NLS-1$
-            menu.add(new Separator());
-          }
-          
-          menu.add(createSetPortTypeMenu(binding, isEditable));
-          menu.add(new GenerateBindingContentAction(binding, isEditable));
-          return null;
-        }
-
-        public Object caseBindingOperation(BindingOperation bindingOperation)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddBindingInputAction(editorPart, node, prefix));
-            menu.add(new AddBindingOutputAction(editorPart, node, prefix));
-            menu.add(new AddBindingFaultAction(node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseDefinition(Definition definition)
-        {
-           menu.add(new EditNamespacesAction(definition));
-           menu.add(new Separator());
-        	
-          if (isEditable)
-          {
-            menu.add(new AddMessageAction(definition, null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            menu.add(new AddServiceAction(definition, null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            menu.add(new AddPortTypeAction(definition, null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            menu.add(new AddBindingAction(definition, ((WSDLEditor) editorPart).getXMLDocument()));//, null, node, prefix));
-            menu.add(new AddImportAction(editorPart, definition, node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseFault(Fault fault)
-        {
-          menu.add(createSetMessageMenu(fault, isEditable));
-          //menu.add(createAddBindingMenuForIOF(fault));
-          return null;
-        }
-
-        public Object caseInput(Input input)
-        {
-          menu.add(createSetMessageMenu(input, isEditable));
-          //menu.add(createAddBindingMenuForIOF(input));
-          return null;
-        }
-
-        public Object caseOutput(Output output)
-        {
-          menu.add(createSetMessageMenu(output, isEditable));
-          //menu.add(createAddBindingMenuForIOF(output));
-          return null;
-        }
-
-        public Object caseMessage(Message message)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddPartAction(editorPart, message, node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseOperation(Operation operation)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddInputAction(editorPart, node, operation, prefix));
-            menu.add(new AddOutputAction(editorPart, node, operation, prefix));
-            menu.add(new AddFaultAction(editorPart, node, operation, prefix));
-          }
-          //menu.add(createAddBindingMenuForOperation(operation));
-          return null;
-        }
-
-        public Object casePart(Part part)
-        {
-          menu.add(createSetPartMenu(part, (Element) node, "element", isEditable)); //$NON-NLS-1$
-          menu.add(createSetPartMenu(part, (Element) node, "type", isEditable)); //$NON-NLS-1$
-          return null;
-        }
-
-        public Object casePort(Port port)
-        {
-          if (node instanceof Element)
-          {
-            menu.add(createSetBindingMenu(port, (Element) node, isEditable));
-            if (port.getEBinding() != null)
-            {
-              menu.add(createSetPortTypeMenu(port.getEBinding(), isEditable));
-            }
-          }
-          return null;
-        }
-
-        public Object casePortType(PortType portType)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddOperationAction(editorPart, portType, node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseService(Service service)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddPortAction(service));
-          }
-          return null;
-        }
-
-        //public Object caseTypes(Types types)
-        //{   
-        //  return createTypesAdapter();
-        // } 
-      };
-      wsdlSwitch.doSwitch((WSDLElement) object);
-    }
-    else if (object instanceof WSDLGroupObject)
-    {
-      addMenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_CHILD"), "addchild"); //$NON-NLS-1$ //$NON-NLS-2$
-      menu.add(addMenu);
-      
-      WSDLGroupObject groupObject = (WSDLGroupObject) object;
-      Definition definition = groupObject.getDefinition();
-
-      final String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-
-      //for (Iterator i = actionList.iterator(); i.hasNext(); )
-      //{                           
-      //  Action action = (Action)i.next();
-      //  manager.add(action); 
-      //}
-
-      switch (groupObject.getType())
-      {
-        case WSDLGroupObject.MESSAGES_GROUP :
-          {
-            menu.add(new AddMessageAction(groupObject.getDefinition(), null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            break;
-          }
-        case WSDLGroupObject.SERVICES_GROUP :
-          {
-            menu.add(new AddServiceAction(groupObject.getDefinition(), null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            break;
-          }
-        case WSDLGroupObject.PORT_TYPES_GROUP :
-          {
-            menu.add(new AddPortTypeAction(groupObject.getDefinition(), null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            break;
-          }
-        case WSDLGroupObject.BINDINGS_GROUP :
-          {
-            menu.add(new AddBindingAction(groupObject.getDefinition(), ((WSDLEditor) editorPart).getXMLDocument()));//, null, node, prefix));
-            break;
-          }
-        case WSDLGroupObject.IMPORTS_GROUP :
-          {
-            menu.add(new AddImportAction(editorPart, groupObject.getDefinition(), node, prefix));
-            break;
-          }
-      }
-    }
-
-    menu.add(new Separator());
-    
-   	addEEMenuActionContributor.contributeMenuActions(menu, node, object);
-
-    menu.add(new Separator());
-
-    if (object instanceof WSDLElement && node != null && addEditAction && node != null && isEditable)
-    {
-      //////////////////////////////////////// Currently, only allow Copy and Paste on Operations
-    	if (object instanceof Operation) {
-    		// Add Cut, Copy Actions
-    		// Note:  The Cut, Copy, Paste Actions are Model Driven.  The Delete Action is still
-    		// currently DOM driven.
-    		//      menu.add(new CutAction((WSDLElement) object, editorPart));
-   		 	menu.add(new CopyGlobalAction((WSDLElement) object, editorPart));
-    	}
-
-   	 	Action pasteAction = new PasteGlobalAction((WSDLElement) object, editorPart);
-   	 	if (pasteAction.isEnabled()) {
-   	 		menu.add(pasteAction);
-   	 	}
-   	 	
-	 	menu.add(new Separator());
-      //////////////////////////////////////// Currently, only allow Copy and Paste on Operations
-		
-		// Get the list of selected elements.  Use this list for the DeleteAction.		
-		IStructuredSelection selectionList = (IStructuredSelection) ((WSDLEditor) editorPart).getSelectionManager().getSelection();	
-		Action deleteAtion = new DeleteWSDLAndXSDAction(selectionList.toList(), node, (WSDLEditor) editorPart);
-		menu.add(deleteAtion);
-		deleteAtion.setEnabled(isEditable);
-    }
-    
-    // Allow Rename through a dialog mechanism.....  This should be changed when
-    // direct editing is ready
-    if (object instanceof WSDLElement && isEditable) {
-    	RenameDialogAction renameDialog = new RenameDialogAction((WSDLElement) object);
-    	if (renameDialog.showRenameDialog())
-    		menu.add(renameDialog);
-    }
-    
-    // insertion point for popupMenus extension
-    menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-  }
-
-  /*
-  protected MenuManager createAddBindingMenuForOperation(Operation operation) 
-  {
-    MenuManager subMenu = new MenuManager("Add Binding");                    
-  
-    Definition definition = operation.getEnclosingDefinition(); 
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-  
-    String operationName = operation.getName();
-    if (operationName != null)
-    {       
-      for (Iterator i = util.getBindings(operation).iterator(); i.hasNext(); )
-      {   
-        Binding binding = (Binding)i.next();
-            
-        BindingOperation matchingBindingOperation = null;
-  
-        for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext(); )
-        {
-          BindingOperation bindingOperation = (BindingOperation)j.next();
-          if (operationName.equals(bindingOperation.getName()))
-          { 
-            matchingBindingOperation = bindingOperation;
-            break;
-          }
-        }         
-  
-        if (matchingBindingOperation == null)
-        {                                                                            
-          Element bindingElement = WSDLUtil.getInstance().getElementForObject(binding);
-          subMenu.add(new AddBindingOperationAction(bindingElement, operation, prefix));
-        }    
-      }
-    }
-    return subMenu;
-  }*/
-
-  /*
-  protected MenuManager createAddBindingMenuForIOF(WSDLElement iof) 
-  {
-    MenuManager subMenu = new MenuManager("Add Binding");                    
-  
-    Definition definition = iof.getEnclosingDefinition(); 
-    Operation operation = (Operation)iof.eContainer();
-  
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-  
-    String operationName = operation.getName();
-    if (operationName != null)
-    {  
-      for (Iterator i = util.getBindings(operation).iterator(); i.hasNext(); )
-      {   
-        Binding binding = (Binding)i.next();
-  
-        boolean hasName = false;
-        for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext(); )
-        {
-          BindingOperation bindingOperation = (BindingOperation)j.next();
-          if (operationName.equals(bindingOperation.getName()))
-          {
-            hasName = true;
-            break;
-          }
-        }         
-  
-        if (!hasName)
-        {                                                                            
-          // TODO... should we add the operation to all of the bindings?
-          //
-          Element bindingElement = WSDLUtil.getInstance().getElementForObject(binding);
-          subMenu.add(new AddBindingOperationAction(bindingElement, operationName));
-        }
-      }
-    }
-    return subMenu;
-  }
-  */
-
-  protected MenuManager createSetBindingMenu(Port port, Element portElement, boolean isEditable)
-  {
-    MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_BINDING"));
-
-    Definition definition = port.getEnclosingDefinition();
-    String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-    Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-
-    SetNewComponentAction setNewAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_BINDING"), definitionElement, prefix, "binding", port);
-    setNewAction.setEditor(editorPart);
-    setNewAction.setEnabled(true);
-    submenu.add(setNewAction);     
-    
-    SetExistingComponentAction action = new SetExistingComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_BINDING"), definitionElement, prefix, "binding", port);
-    action.setEditor(editorPart);
-    action.setEnabled(isEditable);
-    submenu.add(action);
-    
-    return submenu;
-  }
-
-  protected MenuManager createSetPortTypeMenu(Binding binding, boolean isEditable)
-  {      
-    MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_PORTTYPE"));
-
-    if (binding != null)
-    {
-      Definition definition = binding.getEnclosingDefinition();
-      Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-      String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-	  
-      SetNewComponentAction setNewAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_PORTTYPE"), definitionElement, prefix, "portType", binding);
-      setNewAction.setEditor(editorPart);
-      setNewAction.setEnabled(true);
-      submenu.add(setNewAction);      
-
-      SetExistingComponentAction action = new SetExistingComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_PORTTYPE"), definitionElement, prefix, "portType", binding);
-      action.setEditor(editorPart);
-      action.setEnabled(isEditable);      
-      submenu.add(action);
-    }
-    return submenu;
-  }
-
-  protected MenuManager createSetMessageMenu(WSDLElement wsdlElement, boolean isEditable)
-  {
-    Definition definition = wsdlElement.getEnclosingDefinition();
-    Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    Element referencingElement = WSDLEditorUtil.getInstance().getElementForObject(wsdlElement);
-	
-    MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_MESSAGE"));
-    if (definitionElement != null && referencingElement != null)
-    {
-      String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-      
-      SetNewComponentAction setNewAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_MESSAGE"), definitionElement, prefix, "message", wsdlElement);
-      setNewAction.setEditor(editorPart);
-      setNewAction.setEnabled(true);
-      submenu.add(setNewAction);  
-      
-      SetExistingComponentAction action = new SetExistingComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_MESSAGE"), definitionElement, prefix, "message", wsdlElement);
-      action.setEditor(editorPart);
-      action.setEnabled(isEditable);
-      submenu.add(action);
-    }
-    
-    return submenu;
-  }
-
-  protected MenuManager createSetPartMenu(Part part, Element portElement, String referenceKind, boolean isEditable)
-  {
-    Definition definition = part.getEnclosingDefinition();
-    String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-    Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-
-    String actionName;
-    MenuManager submenu = null;
-    if (referenceKind.equalsIgnoreCase("element")) // NON NLS
-    {
-      actionName = WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_ELEMENT");
-      submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_ELEMENT"));
-	  
-      SetNewComponentAction setNewElementAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_ELEMENT"), definitionElement, prefix, "element", part);
-      setNewElementAction.setEditor(editorPart);
-      setNewElementAction.setEnabled(true);
-      setNewElementAction.setReferenceKind(referenceKind);
-      submenu.add(setNewElementAction);
-    }
-    else
-    {
-      actionName = WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_TYPE");
-      submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_TYPE"));
-      
-      SetNewComponentAction setNewComplexAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_COMPLEX_TYPE"), definitionElement, prefix, "complex type", part);
-      setNewComplexAction.setEditor(editorPart);
-      setNewComplexAction.setEnabled(true);
-      setNewComplexAction.setReferenceKind(referenceKind);
-      setNewComplexAction.setTypeKind("complex");
-      Image image = XSDEditorPlugin.getXSDImage("icons/XSDComplexType.gif");
-      setNewComplexAction.setImageDescriptor(ImageDescriptor.createFromImage(image));
-      submenu.add(setNewComplexAction);
-      
-      SetNewComponentAction setNewSimpleAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_SIMPLE_TYPE"), definitionElement, prefix, "simple type", part);
-      setNewSimpleAction.setEditor(editorPart);
-      setNewSimpleAction.setEnabled(true);
-      setNewSimpleAction.setReferenceKind(referenceKind);
-      setNewSimpleAction.setTypeKind("simple");
-      image = XSDEditorPlugin.getXSDImage("icons/XSDSimpleType.gif");
-      setNewSimpleAction.setImageDescriptor(ImageDescriptor.createFromImage(image));
-
-      submenu.add(setNewSimpleAction); 
-    }
-
-    
-    SetExistingComponentAction action = new SetExistingComponentAction(actionName, definitionElement, prefix, actionName, part);
-    action.setReferenceKind(referenceKind);
-    action.setEditor(editorPart);
-    action.setEnabled(isEditable);
-    submenu.add(action);
-    
-    return submenu;
-  }
-  
-//  private WSDLElement showPasteAction(WSDLElement element, IEditorPart ePart) {
-//  	WSDLElement parentElement = null;
-//  	
-//  	if (ePart instanceof WSDLEditor) {
-//  		WSDLElement clipboardElement = ((WSDLEditor) ePart).getClipboardContents();
-//  		
-//  		if (element instanceof PortType) {
-//  			if (clipboardElement instanceof Operation) {
-//  				parentElement = element;
-//  			}
-//  		}
-//  		if (element instanceof Operation) {
-//  			if (clipboardElement instanceof Operation) {
-//  				parentElement = (WSDLElement) ((Operation) element).eContainer();
-//  			}
-//  		}
-//  	}
-//  	
-//  	return parentElement;
-//  }
-}
-
-class AddBindingOperationAction extends AddElementAction
-{
-  protected String name;
-  protected Operation operation;
-
-  public AddBindingOperationAction(Node parentNode, String name, String prefix)
-  {
-    // super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD") + " " + WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_OPERATION"), "icons/operationbinding_obj.gif", parentNode, prefix, "operation");
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_BINDING_OPERATION"), "icons/operationbinding_obj.gif", parentNode, prefix, "operation");
-    this.name = name;
-  }
-
-  public AddBindingOperationAction(Node parentNode, Operation operation, String prefix)
-  {
-    this(parentNode, operation.getName(), prefix);
-    this.operation = operation;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-  }
-
-  protected void performAddElement()
-  {
-    super.performAddElement();
-
-    if (operation != null)
-    {
-      if (operation.getInput() != null)
-      {
-        new AddBindingInputAction(editorPart, newElement, prefix).run();
-      }
-      if (operation.getOutput() != null)
-      {
-        new AddBindingOutputAction(editorPart, newElement, prefix).run();
-      }
-      for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
-      {
-        Fault fault = (Fault) i.next();
-        new AddBindingFaultAction(newElement, fault, prefix).run();
-      }
-      format(operation.getElement());
-    }
-  }
-}
-
-
-class AddOperationAction extends AddElementAction
-{
-  protected String name = "NewOperation";
-  protected PortType portType;
-  protected boolean createSubComponents = false;
-
-  public AddOperationAction(IEditorPart editorPart, PortType portType, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_OPERATION"), "icons/operation_obj.gif", parentNode, prefix, "operation");
-    setEditorPart(editorPart);
-    setDefinition(portType.getEnclosingDefinition());
-    this.portType = portType;
-  }
-
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniqueOperationName(portType);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_OPERATION"), name, NameUtil.getUsedOperationNames(portType));
-    return name != null;
-  }
-
-//  protected void addAttributes(Element newElement)
-//  {
-//    newElement.setAttribute("name", name);
-//  }
-
-  protected void performAddElement()
-  {
-  	if (createSubComponents) {
-  	  	CreateWSDLElementHelper.operationName = name;
-  	  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(portType);
-  		Operation operation = CreateWSDLElementHelper.createOperation(portType);
-  		format(operation.getElement());  		
-  		selectObject(operation);
-  		expandEditParts(operation,true);
-  	}
-  	else {
-  		// Add Operation
-  		AddOperationCommand opAction = new AddOperationCommand(portType, name);
-		opAction.run();
-		Operation operation = (Operation) opAction.getWSDLElement();
-		
-		// Add Output
-  		AddOutputCommand outAction = new AddOutputCommand(operation, NameUtil.buildUniqueInputName(portType, operation.getName(), ""));
-  		outAction.run();
-  		
-		// Add Input
-		AddInputCommand inAction = new AddInputCommand(operation, NameUtil.buildUniqueOutputName(portType, operation.getName(), ""));
-  		inAction.run();
-
-  		format(operation.getElement());
-
- 	  	selectObject(operation);
- 	  	expandEditParts(operation, true);
-  	}
-  }
-
-	private void expandEditParts(Object element, boolean expandChildren) {
-	    if (element != null) {
-	    	EditPartViewer editPartViewer = ((WSDLEditor) editorPart).getGraphViewer().getComponentViewer();
-	    	Map editPartMap = editPartViewer.getEditPartRegistry();
-	    	WSDLTreeNodeEditPart wsdlEditPart = (WSDLTreeNodeEditPart) editPartMap.get(element);
-			wsdlEditPart.setExpanded(true);
-			
-			if (expandChildren) {
-				Iterator iterator = WSDLEditorUtil.getModelGraphViewChildren(element).iterator();
-				
-				while (iterator.hasNext()) {
-					expandEditParts(iterator.next(), expandChildren);
-				}
-			}
-	    }
-	}
-
-  public String showDialogHelper(String title, String defaultName, List usedNames)
-  {   
-    String result = defaultName; 
-    NewComponentWithChildDialog dialog = new NewComponentWithChildDialog(WSDLEditorPlugin.getShell(), title, defaultName, usedNames);
-    int rc = dialog.createAndOpen();
-    if (rc == IDialogConstants.OK_ID)
-    {
-      result = dialog.getName();  
-      createSubComponents = dialog.createSubComponents();
-    }
-    else
-    {
-      result = null;
-    }               
-    return result;
-  }
-}
-
-abstract class AddIOFAction extends AddElementAction
-{
-  protected Operation operation;
-
-  public AddIOFAction(IEditorPart editorPart, String text, String imageDescriptorKey, Node parentNode, String prefix, String localName, Operation operation)
-  {
-    super(text, imageDescriptorKey, parentNode, prefix, localName);
-    this.operation = operation;
-    setEditorPart(editorPart);
-    setDefinition(operation.getEnclosingDefinition());
-  }
-
-  abstract protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement);
-
-  /*
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("message", "");
-  }
-  */
-
-  protected void performAddElement()
-  {
-    if (operation != null)
-    {
-      Definition definition = operation.getEnclosingDefinition();
-      ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-
-      for (Iterator i = util.getBindingOperations(operation).iterator(); i.hasNext();)
-      {
-        BindingOperation bindingOperation = (BindingOperation) i.next();
-        Element bindingOperationElement = WSDLEditorUtil.getInstance().getElementForObject(bindingOperation);
-        if (bindingOperationElement != null)
-        {
-          performAddElementToBindingOperation(bindingOperation, bindingOperationElement);
-        }
-      }
-      format(operation.getElement());
-    }
-  }
-}
-
-class AddInputAction extends AddIOFAction
-{
-  public AddInputAction(IEditorPart editorPart, Node parentNode, Operation operation, String prefix)
-  {
-    super(editorPart, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_INPUT"), "icons/input_obj.gif", parentNode, prefix, "input", operation);
-  }
-
-  protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement)
-  {
-    if (bindingOperation.getBindingInput() == null)
-    {
-      new AddBindingInputAction(editorPart, bindingOperationElement, prefix).run();
-    }
-  }
-  
-  protected void performAddElement() {
-  	PortType portType = (PortType) ((WSDLElementImpl) operation).getContainer();
-  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(portType);
-  	Input input = CreateWSDLElementHelper.createInput(portType, operation, null); 
-  	format(input.getElement());
-  	selectObject(input);
-  }
-}
-
-class AddOutputAction extends AddIOFAction
-{
-  public AddOutputAction(IEditorPart editorPart, Node parentNode, Operation operation, String prefix)
-  {
-    super(editorPart, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_OUTPUT"), "icons/output_obj.gif", parentNode, prefix, "output", operation);
-  }
-
-  protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement)
-  {
-    if (bindingOperation.getBindingOutput() == null)
-    {
-      new AddBindingOutputAction(editorPart, bindingOperationElement, prefix).run();
-    }
-  }
-  
-  protected void performAddElement() {
-  	// Determine Part info
-  	PortType portType = (PortType) ((WSDLElementImpl) operation).getContainer();
-  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(portType);
-  	Output output = CreateWSDLElementHelper.createOutput(portType, operation); 
-  	format(output.getElement());
-  	selectObject(output);
-  }
-}
-
-class AddFaultAction extends AddIOFAction
-{
-  protected String name = "NewFault";
-  public AddFaultAction(IEditorPart editorPart, Node parentNode, Operation operation, String prefix)
-  {
-    super(editorPart, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_FAULT"), "icons/fault_obj.gif", parentNode, prefix, "fault", operation);
-    name = NameUtil.buildUniqueFaultName(operation);
-  }
-
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniqueFaultName(operation);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_FAULT"), name, NameUtil.getUsedFaultNames(operation));
-    return name != null;
-  }
-
-  /*
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("message", "");
-    newElement.setAttribute("name", name);
-  }
-  */
-
-  protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement)
-  {
-    if (bindingOperation.getBindingFault(name) == null)
-    {
-      new AddBindingFaultAction(bindingOperationElement, prefix).run();
-    }
-  }
-  
-  protected void performAddElement() {
-  	CreateWSDLElementHelper.faultName = name;
-  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(operation);
-  	Fault fault = CreateWSDLElementHelper.createFault(operation);
-  	format(fault.getElement());  	
-  	selectObject(fault);
-  }
-}
-
-class AddBindingInputAction extends AddElementAction
-{
-  public AddBindingInputAction(IEditorPart editorPart, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_INPUT"), "icons/input_obj.gif", parentNode, prefix, "input");
-    setEditorPart(editorPart);
-  }
-}
-
-class AddBindingOutputAction extends AddElementAction
-{
-  public AddBindingOutputAction(IEditorPart editorPart, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_OUTPUT"), "icons/output_obj.gif", parentNode, prefix, "output");
-    setEditorPart(editorPart);
-  }
-}
-
-class AddBindingFaultAction extends AddElementAction
-{
-  protected Fault fault;
-
-  public AddBindingFaultAction(Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_FAULT"), "icons/fault_obj.gif", parentNode, prefix, "fault");
-  }
-
-  public AddBindingFaultAction(Node parentNode, Fault fault, String prefix)
-  {
-    this(parentNode, prefix);
-    this.fault = fault;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    if (fault == null)
-    {
-      newElement.setAttribute("name", "NewFault");
-    }
-    else
-    {
-      newElement.setAttribute("name", fault.getName());
-    }
-  }
-}
-
-class AddMessageAction extends AddElementAction
-{
-  protected Definition definition;
-  protected String name;
-
-  public AddMessageAction(Definition definition, String name, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_MESSAGE"), "icons/message_obj.gif", parentNode, prefix, "message");
-    this.definition = definition;
-    this.name = name;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public AddMessageAction(Definition definition, String name, Node parentNode, String prefix, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_MESSAGE"), "icons/message_obj.gif", parentNode, prefix, "message");
-    this.definition = definition;
-    this.name = name;
-    this.setDefinition(definition);
-    this.document = document;
-    setComputeTopLevelRefChild(true);
-  }
-  
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniqueMessageName(definition, name);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_MESSAGE"), name, NameUtil.getUsedMessageNames(definition));
-    return name != null;
-  }
-
-//  protected void addAttributes(Element newElement)
-//  {
-//    newElement.setAttribute("name", name);
-//  }
-  
-  protected void performAddElement() {
-  	NodeList list = document.getChildNodes();
-  	if (parentNode == null|| list.getLength() == 0) {
-  		createDefinitionStub();
-  	}
-  	
-  	AddMessageCommand action = new AddMessageCommand(definition, name);
-	action.run();
-	Message message = (Message) action.getWSDLElement();
-	CreateWSDLElementHelper.createPart(message);
-	format(message.getElement());
-	selectObject(message);
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-}
-
-class AddPartAction extends AddElementAction
-{
-  protected Message message;
-  protected String name;
-
-  public AddPartAction(IEditorPart editorPart, Message message, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PART"), "icons/part_obj.gif", parentNode, prefix, "part");
-    this.message = message;
-    setEditorPart(editorPart);
-    setDefinition(message.getEnclosingDefinition());
-  }
-
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniquePartName(message, message.getQName().getLocalPart());
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_PART"), name, NameUtil.getUsedPartNames(message));
-    return name != null;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-    String xsdPrefix = message.getEnclosingDefinition().getPrefix(WSDLConstants.XSD_NAMESPACE_URI);
-    if (xsdPrefix == null)
-    {
-    	Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(message.getEnclosingDefinition());    	
-        new AddNamespaceDeclarationsAction(definitionElement, WSDLConstants.XSD_NAMESPACE_URI, "xsd").run();
-		xsdPrefix = message.getEnclosingDefinition().getPrefix(WSDLConstants.XSD_NAMESPACE_URI);
-    }
-			
-    String defaultTypeName = "string";
-    if (xsdPrefix != null && xsdPrefix.length() > 0)
-    {
-      defaultTypeName = xsdPrefix + ":" + defaultTypeName;
-    }
-    newElement.setAttribute("type", defaultTypeName);
-  }
-}
-
-class AddServiceAction extends AddElementAction
-{
-  protected String name;
-  protected Definition definition;
-
-  public AddServiceAction(Definition definition, String name, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SERVICE"), "icons/service_obj.gif", parentNode, prefix, "service");
-    this.definition = definition;
-    this.name = name;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public AddServiceAction(Definition definition, String name, Node parentNode, String prefix, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SERVICE"), "icons/service_obj.gif", parentNode, prefix, "service");
-    this.definition = definition;
-    this.name = name;
-    this.setDefinition(definition);
-    this.document = document;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public boolean showDialog()
-  {
-    if (name == null)
-    {
-      name = NameUtil.buildUniqueServiceName(definition);
-    }
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_SERVICE"), name, NameUtil.getUsedServiceNames(definition));
-    return name != null;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-  }
-  
-  protected void performAddElement() {  	
-  	NodeList list = document.getChildNodes();
-  	if (parentNode == null || list.getLength() == 0) {
-  		createDefinitionStub();
-  	}
-  	
-  	super.performAddElement();
-  }
-}
-
-class AddPortTypeAction extends AddElementAction
-{
-  protected String name;
-  protected Definition definition;
-
-  public AddPortTypeAction(Definition definition, String name, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PORTTYPE"), "icons/porttype_obj.gif", parentNode, prefix, "portType");
-    this.definition = definition;
-    this.name = name;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public AddPortTypeAction(Definition definition, String name, Node parentNode, String prefix, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PORTTYPE"), "icons/porttype_obj.gif", parentNode, prefix, "portType");
-    this.definition = definition;
-    this.name = name;
-    this.setDefinition(definition);
-    this.document = document;
-    setComputeTopLevelRefChild(true);
-  }
-  
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniquePortTypeName(definition, name);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_PORTTYPE"), name, NameUtil.getUsedPortTypeNames(definition));
-    return name != null;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-  }
-
-  public String getPortTypeName()
-  {
-    return name;
-  }
-  
-  protected void performAddElement() {
-  	NodeList list = document.getChildNodes();
-  	if (parentNode == null || list.getLength() == 0) {
-  		createDefinitionStub();
-  	}
-  	
-  	super.performAddElement();
-  }
-}
-
-class AddBindingAction extends Action
-{
-  protected Definition definition;
-  protected Document document;
-
-  public AddBindingAction(Definition definition, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_BINDING"), ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/binding_obj.gif")); //$NON-NLS-1$
-    //setToolTipText(WSDLEditorPlugin.getInstance().getWSDLString("_UI_LABEL_BINDING_WIZARD")); //$NON-NLS-1$
-    this.definition = definition;
-    this.document = document;
-  }
-
-  public void run()
-  {
-    BindingWizard wizard = new BindingWizard(definition, document);
-    WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-    wizardDialog.create();
-
-    int result = wizardDialog.open();
-
-    if (result == Window.OK)
-    {
-      //todo...      
-    }
-  }
-}
-
-class AddPortAction extends Action
-{
-	protected Service service;
-
-	public AddPortAction(Service service)
-	{
-		super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PORT"), ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/binding_obj.gif")); //$NON-NLS-1$
-		//setToolTipText(WSDLEditorPlugin.getInstance().getWSDLString("_UI_LABEL_BINDING_WIZARD")); //$NON-NLS-1$
-		this.service = service;
-	}
-
-	public void run()
-	{
-		PortWizard wizard = new PortWizard(service);
-		WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-		wizardDialog.create();
-
-		int result = wizardDialog.open();
-		if (result == Window.OK)
-		{
-			//todo...      
-		}
-	}
-}
-
-class GenerateBindingContentAction extends Action
-{
-	protected Binding binding;
-	public GenerateBindingContentAction(Binding binding, boolean isEditable)
-	{
-		super(WSDLEditorPlugin.getWSDLString("_UI_GENERATE_BINDING_CONTENT"));
-		this.binding = binding;
-		setEnabled(isEditable);
-	}
-	
-	public void run()
-	{
-		BindingWizard wizard = new BindingWizard(binding.getEnclosingDefinition(), binding, BindingWizard.KIND_REGENERATE_BINDING);
-		wizard.setBindingName(ComponentReferenceUtil.getName(binding));
-		wizard.setPortTypeName(ComponentReferenceUtil.getPortTypeReference(binding));
-		WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-		wizardDialog.create();
-		wizardDialog.open();	
-	}
-}
-
-//This is a temporary class to allow renaming.  This should be replaced when direct
-//renaming is ready
-class RenameDialogAction extends Action {
-	private WSDLElement element;
-	private String defaultName = "NewName";
-	private List usedNames = new ArrayList();
-	private boolean useSmartRename = false;
-	private boolean showDialog = false;
-	
-	public RenameDialogAction(WSDLElement selection) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_RENAME"));
-		element = selection;
-		initialize();
-	}
-	
-	public void run() {
-		String result;
-
-		NewComponentDialog dialog = new NewComponentDialog(WSDLEditorPlugin.getShell(), WSDLEditorPlugin.getWSDLString("_UI_ACTION_RENAME"), defaultName, usedNames);
-		int rc = dialog.createAndOpen();
-		if (rc == IDialogConstants.OK_ID)
-		{
-		  result = dialog.getName();
-		  if (useSmartRename) {
-		  	SmartRenameAction smartRename = new SmartRenameAction(element, result);	
-		  	smartRename.run();
-		  }
-		  else {
-		  	RenameAction rename = new RenameAction(element, result);
-		  	rename.run();
-		  }
-		}
-	}
-	
-	public void initialize() {
-		if (element instanceof Fault) {
-			usedNames = NameUtil.getUsedFaultNames((Operation) ((Fault) element).eContainer());
-			defaultName = ((Fault) element).getName();
-			
-			showDialog = true;
-			useSmartRename = true;
-		}
-		else if (element instanceof Message) {
-			usedNames = NameUtil.getUsedMessageNames(element.getEnclosingDefinition());
-			defaultName = ((Message) element).getQName().getLocalPart();
-			
-			showDialog = true;
-			useSmartRename = true;
-		}
-		else if (element instanceof Operation) {
-			usedNames = NameUtil.getUsedOperationNames((PortType) ((Operation) element).eContainer());		
-			defaultName = ((Operation) element).getName();
-			
-			showDialog = true;
-			useSmartRename = true;
-		}
-		else if (element instanceof Part) {
-			usedNames = NameUtil.getUsedPartNames((Message) ((Part) element).eContainer());			
-			defaultName = ((Part) element).getName();
-			
-			showDialog = true;
-			useSmartRename = true;
-		}
-		else if (element instanceof PortType) {
-			usedNames = NameUtil.getUsedPortTypeNames(element.getEnclosingDefinition());
-			defaultName = ((PortType) element).getQName().getLocalPart();
-			
-			showDialog = true;
-			useSmartRename = false;
-		}
-		else if (element instanceof Port) {
-			usedNames = NameUtil.getUsedPortNames((Service) ((Port) element).eContainer());
-			defaultName = ((Port) element).getName();
-			
-			showDialog = true;
-			useSmartRename = true;
-		}
-		else if (element instanceof Binding) {
-			usedNames = NameUtil.getUsedBindingNames(element.getEnclosingDefinition());			
-			defaultName = ((Binding) element).getQName().getLocalPart();
-			
-			showDialog = true;
-			useSmartRename = false;
-		}
-		else if (element instanceof Service) {
-			usedNames = NameUtil.getUsedServiceNames(element.getEnclosingDefinition());
-			defaultName = ((Service) element).getQName().getLocalPart();
-			
-			showDialog = true;
-			useSmartRename = false;
-		}
-		usedNames.remove(defaultName);
-	}
-	
-	public boolean showRenameDialog() {
-		return showDialog;
-	}
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuListener.java
deleted file mode 100644
index a71c238..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuListener.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.w3c.dom.Node;
-
-
-public class WSDLMenuListener implements IMenuListener
-{                      
-  protected ISelectionProvider selectionProvider;
-  protected ExtensibleMenuActionContributor extensibleMenuActionContributor;
-
-  public WSDLMenuListener(WSDLEditor editor, ISelectionProvider selectionProvider)
-  {
-    super();                                                               
-    this.extensibleMenuActionContributor = new ExtensibleMenuActionContributor(editor);
-    this.selectionProvider = selectionProvider;              
-  }
-      
-  protected Object getSelectedObject()
-  {      
-    ISelection selection = selectionProvider.getSelection();    
-    return selection.isEmpty() ? null : ((IStructuredSelection)selection).getFirstElement();   
-  }
-
-  public void menuAboutToShow(IMenuManager manager)
-  {                                                                                         
-    Object object = getSelectedObject();
-    Node node = null;
-    if (object instanceof Node)
-    {
-      node = (Node)object;
-    }
-    else if (object instanceof WSDLElement)
-    {
-      node = ((WSDLElement)object).getElement();   
-    }                                                                            
-    else if (object instanceof WSDLGroupObject)
-    {
-      node =  ((WSDLGroupObject)object).getDefinition().getElement();
-    }
-    extensibleMenuActionContributor.contributeMenuActions(manager, node, object);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java
deleted file mode 100644
index 899817a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-
-public final class AddBindingCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private Binding binding;
- 
-  public AddBindingCommand
-		(Definition definition,  
-		 String localName)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	}
-  
-  public WSDLElement getWSDLElement()
-  {
-    return binding;
-  }
-
-  public void run()
-  {
-    binding = WSDLFactory.eINSTANCE.createBinding();
-    binding.setQName(new QName(definition.getTargetNamespace(),localName));
-    binding.setEnclosingDefinition(definition);
-    definition.addBinding(binding);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java
deleted file mode 100644
index c8e02ae..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingFaultCommand extends WSDLElementCommand
-{
-  BindingFault bindingFault;
-  BindingOperation bindingOperation;
-  String name;
-  
-  public AddBindingFaultCommand(BindingOperation bindingOperation, String name)
-  {
-    this.bindingOperation = bindingOperation;
-    this.name = name;
-  }
-
-  public void run()
-  {
-    bindingFault = WSDLFactory.eINSTANCE.createBindingFault();
-    bindingFault.setName(name); 
-    bindingFault.setEnclosingDefinition(bindingOperation.getEnclosingDefinition());
-    bindingOperation.addBindingFault((BindingFault)bindingFault);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingFault;
-  }
-}
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java
deleted file mode 100644
index 5303b44..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingInputCommand extends WSDLElementCommand
-{
-  BindingInput bindingInput;
-  BindingOperation bindingOperation;
-  String name;
-  
-  public AddBindingInputCommand(BindingOperation bindingOperation, String name)
-  {
-    this.bindingOperation = bindingOperation;
-    this.name = name;
-  }
-
-  public void run()
-  {
-    bindingInput = WSDLFactory.eINSTANCE.createBindingInput();
-    bindingInput.setName(name); 
-    bindingInput.setEnclosingDefinition(bindingOperation.getEnclosingDefinition());
-    bindingOperation.setBindingInput((BindingInput)bindingInput);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingInput;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java
deleted file mode 100644
index 45e0f96..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingOperationCommand extends WSDLElementCommand
-{
-  private Binding binding;
-  
-  private String name;
-  private String bindingInputName = "";
-  private String bindingOutputName = "";
-  private String bindingFaultName ="";
-  
-  private BindingOperation bindingOperation;
-  
-  private boolean createBindingInput = false;
-  private boolean createBindingOutput = false;
-  private boolean createBindingFault = false;
-  
-  public AddBindingOperationCommand(Binding binding,String name)
-  {
-    this.binding = binding;
-    this.name = name;
-  }
-  
-  public AddBindingOperationCommand
-    (Binding binding,  
-     String name,
-     boolean createBindingInput,
-     boolean createBindingOutput,
-     boolean createBindingFault)
-  {
-    this.binding = binding;
-    this.name = name;
-    this.createBindingInput = createBindingInput;
-    this.createBindingOutput = createBindingOutput;
-    this.createBindingFault = createBindingFault;
-  }
-    
-  public void run()
-  {
-    bindingOperation = WSDLFactory.eINSTANCE.createBindingOperation();
-    bindingOperation.setName(name);
-    bindingOperation.setEnclosingDefinition(binding.getEnclosingDefinition());
-    binding.addBindingOperation(bindingOperation);
-
-    WSDLElementCommand command = null;
-    if (createBindingInput)
-    {
-      command = new AddBindingInputCommand(bindingOperation,bindingInputName);
-      command.run();
-    }
-
-    if (createBindingOutput)
-    {
-      command = new AddBindingOutputCommand(bindingOperation,bindingOutputName);
-      command.run();
-    }
-
-    if (createBindingFault)
-    {
-      command = new AddBindingFaultCommand(bindingOperation,bindingFaultName);
-      command.run();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingOperation;
-  }
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  
-  public void setBindingInputName(String name)
-  {
-    this.bindingInputName = name;
-  }
-  
-  public void setBindingOutputName(String name)
-  {
-    this.bindingOutputName = name;
-  }
-  
-  public void setBindingFaultName(String name)
-  {
-    this.bindingFaultName = name;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java
deleted file mode 100644
index 4286b6c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingOutputCommand extends WSDLElementCommand
-{
-  BindingOutput bindingOutput;
-  BindingOperation bindingOperation;
-  String name;
-  
-  public AddBindingOutputCommand(BindingOperation bindingOperation, String name)
-  {
-    this.bindingOperation = bindingOperation;
-    this.name = name;
-  }
-
-  public void run()
-  {
-    bindingOutput = WSDLFactory.eINSTANCE.createBindingOutput();
-    bindingOutput.setName(name); 
-    bindingOutput.setEnclosingDefinition(bindingOperation.getEnclosingDefinition());
-    bindingOperation.setBindingOutput((BindingOutput)bindingOutput);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingOutput;
-  }
-}
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java
deleted file mode 100644
index deb638a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddFaultCommand extends AddMessageReferenceCommand
-{
-  private Fault originalFault;
-  
-  public AddFaultCommand(Operation operation, String name)
-  {
-    super(operation,name);
-  }
-
-  public AddFaultCommand(Operation operation, String name, boolean createMessage)
-  {
-    super(operation,name,createMessage);
-  }
-  
-  /*
-   * Constructor used to create a Fault based on the given Fault.  In essence, this will
-   * create a copy of the given Fault.
-   */
-  public AddFaultCommand(Operation operation, Fault originalFault, String name) {
-  	super(operation, name, false);
-  	
-  	this.originalFault = originalFault;
-  }
-  
-  public void run()
-  {
-    messageReference = WSDLFactory.eINSTANCE.createFault();
-    messageReference.setName(name); 
-    messageReference.setEnclosingDefinition(operation.getEnclosingDefinition());
-    operation.addFault((Fault)messageReference);
-    
-    //  TBD - add binding fault
-
-    if (originalFault == null) {
-    	if (createMessage)
-    		createMessage();
-    }
-    else {
-    	// Do necessary copying of data from original Fault to new Fault
-    	if (originalFault.getEMessage() != null) {
-//    		String originalMsgName = originalFault.getEMessage().getQName().getLocalPart();
-//    		
-//    		boolean gened = false;
-//    		if (originalFault.eContainer() instanceof Operation)
-//    			gened = SmartRenameAction.isMessageNameGenerated(originalMsgName, ((Operation) originalFault.eContainer()).getName(), "");
-//    		
-//    		String newMsgName = "";
-//    		if (gened) {
-//    			newMsgName = NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference);
-//    		}
-//    		else {
-//    			Definition definition = operation.getEnclosingDefinition();
-//    			Message tMessage = originalFault.getEMessage();
-//    			newMsgName = NameUtil.buildUniqueMessageName(definition, tMessage.getQName().getLocalPart());
-//    		}
-    		
-    		createMessage(originalFault, NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference));
-    	}
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java
deleted file mode 100644
index 7fc4eb6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddImportCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String namespace;
-  private String location;
-  private Import importElement;
-  
-  public AddImportCommand
-  	(Definition definition,  
-  	 String namespace,
-  	 String location)
-  {
-    this.definition = definition;
-    this.namespace = namespace;
-    this.location = location;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return importElement;
-  }
-
-  public void run()
-  {
-    importElement = WSDLFactory.eINSTANCE.createImport();
-    importElement.setNamespaceURI(namespace);
-    importElement.setLocationURI(location);
-    importElement.setEnclosingDefinition(definition);
-    definition.addImport(importElement);
-  }
-  
-  public void setNamespaceURI(String namespace)
-  {
-    this.namespace = namespace;
-  }
-  
-  public void setLocationURI(String location)
-  {
-    this.location = location;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java
deleted file mode 100644
index 0e33b71..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddInputCommand extends AddMessageReferenceCommand
-{
-  private Input originalInput;
-	
-  public AddInputCommand(Operation operation, String name)
-  {
-    super(operation,name);
-  }
-
-  public AddInputCommand(Operation operation, String name, boolean createMessage)
-  {
-    super(operation,name,createMessage);
-  }
-  
-  /*
-   * Constructor used to create an Input based on the given Input.  In essence, this will
-   * create a copy of the given Input.
-   */
-  public AddInputCommand(Operation operation, Input originalInput, String name) {
-  	super(operation, name, false);
-  	
-  	this.originalInput = originalInput;
-  }
-  
-  public void run()
-  {
-    messageReference = WSDLFactory.eINSTANCE.createInput();
-  //  messageReference.setName(name); 
-    messageReference.setEnclosingDefinition(operation.getEnclosingDefinition());
-    operation.setInput((Input)messageReference);
-    
-    // TBD - add binding input 
-    
-    if (originalInput == null) {
-    	if (createMessage)
-    		createMessage();
-    }
-    else {
-    	// Do necessary copying of data from original Input to new Input
-    	if (originalInput.getEMessage() != null) {
-    		String originalMsgName = originalInput.getEMessage().getQName().getLocalPart();
-    		
-    		boolean gened = false;
-    		if (originalInput.eContainer() instanceof Operation)
-    			gened = SmartRenameAction.isMessageNameGenerated(originalMsgName, ((Operation) originalInput.eContainer()).getName(), "Request");
-    		
-    		String newMsgName = "";
-    		if (gened) {
-    			newMsgName = NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference);
-    		}
-    		else {
-    			Definition definition = operation.getEnclosingDefinition();
-    			Message tMessage = originalInput.getEMessage();
-    			newMsgName = NameUtil.buildUniqueMessageName(definition, tMessage.getQName().getLocalPart());
-    		}
-
-    		createMessage(originalInput, newMsgName);
-    	}
-    }
-  }
-  
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java
deleted file mode 100644
index 9079724..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-
-public final class AddMessageCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private Message message;
-  private Message originalMessage;
-  
-  private boolean createPart = false;
-  private final String DEFAULT_PART_NAME = "NewPart";
-  
-  public AddMessageCommand
-  	(Definition definition,  
-  	 String localName)
-  {
-    this.definition = definition;
-    this.localName = localName;
-  }
-  
-  public AddMessageCommand
-		(Definition definition, 
-		 String localName,
-		 boolean createPart)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	  this.createPart = createPart;
-	}
-  
-  /*
-   * Constructor used to create a Message based on the given Message.  In essence, this will
-   * create a copy of the given Message.
-   */
-  public AddMessageCommand(Definition definition, Message originalMessage, String localName, boolean copyPart) {
-    this.definition = definition;
-	this.localName = localName;
-	this.createPart = copyPart;
-  	this.originalMessage = originalMessage;
-  }
-  
-  public void run()
-  {
-    message = WSDLFactory.eINSTANCE.createMessage();
-    message.setQName(new QName(definition.getTargetNamespace(),localName));
-    message.setEnclosingDefinition(definition);
-    definition.addMessage(message);
-    
-    if (originalMessage == null) {
-    	if (createPart)
-    	{
-    		AddPartCommand command = 
-    			new AddPartCommand(message,DEFAULT_PART_NAME,WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string",true);
-    		command.run();
-    	}
-    }
-    else {
-    	if (originalMessage.getEParts() != null) {
-    		Iterator it = originalMessage.getEParts().iterator();
-    		
-    		while (it.hasNext()) {
-    			Part part = (Part) it.next();
-    			AddPartCommand command;
-    			if (SmartRenameAction.isPartNameGenerated(part.getName(), originalMessage.getQName().getLocalPart()))
-    				command = new AddPartCommand(message, part, NameUtil.buildUniquePartName(message, message.getQName().getLocalPart()));	
-    			else
-    				command = new AddPartCommand(message, part, part.getName());
-    			
-    			
-    			command.run();
-    		}
-    	}
-    }
-  }
-
-  public void setLocalName(String name)
-  {
-    this.localName = name;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return message;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java
deleted file mode 100644
index 1ec11ea..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-abstract public class AddMessageReferenceCommand extends WSDLElementCommand
-{
-  protected String name;
-  protected MessageReference messageReference;
-  protected Operation operation;
-  protected boolean createMessage = false;
-  private final String DEFAULT_MESSAGE_NAME = "NewMessage";
-
-  public AddMessageReferenceCommand(Operation operation, String name)
-  {
-    this.operation = operation;
-    this.name = name;
-  }
-  
-  public AddMessageReferenceCommand(Operation operation, String name, boolean createMessage)
-  {
-    this.operation = operation;
-    this.name = name;
-    this.createMessage = createMessage;
-  }
-
-  protected void createMessage()
-  {
-    Definition definition = operation.getEnclosingDefinition();
-    AddMessageCommand command = 
-      new AddMessageCommand(definition,DEFAULT_MESSAGE_NAME,createMessage);      
-    command.run();
-    messageReference.setEMessage((Message)command.getWSDLElement());
-  }
-  
-  /*
-   * Overloaded createMessage(arg) method.  Similar to to createMessage() but takes in a MessageReference.
-   * Method used to create a copy of the original Message (contained in the passed in MessageReference).
-   */
-  protected void createMessage(MessageReference originalMRef, String newMessageRefName) {
-    Definition definition = operation.getEnclosingDefinition();
-    Message tMessage = originalMRef.getEMessage();
-    AddMessageCommand command = 
-      new AddMessageCommand(definition, tMessage, newMessageRefName, true);
-    command.run();
-    messageReference.setEMessage((Message)command.getWSDLElement());
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return messageReference;
-  }
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java
deleted file mode 100644
index 8059fc2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddOperationCommand extends WSDLElementCommand
-{
-  private PortType portType;
-  private String name;
-  private Operation operation;
-  private Operation originalOperation;
-  private boolean copyInOutFault;
-  
-  private boolean createInput = false;
-  private boolean createOutput = false;
-  private boolean createFault = false;
-  
-  private final String DEFAULT_INPUT_NAME = "";
-  private final String DEFAULT_OUTPUT_NAME = "";
-  private final String DEFAULT_FAULT_NAME = "";
-  
-  public AddOperationCommand
-		(PortType portType,  
-		 String name)
-	{
-	  this.portType = portType;
-	  this.name = name;
-	}
-  
-  public AddOperationCommand
-		(PortType portType,  
-		 String name,
-		 boolean createInput,
-		 boolean createOutput,
-		 boolean createFault)
-	{
-	  this.portType = portType;
-	  this.name = name;
-	  this.createInput = createInput;
-	  this.createOutput = createOutput;
-	  this.createFault = createFault;
-	}
-  
-  /*
-   * Constructor used to create an Operation based on the given Operation.  In essence, this will
-   * create a copy of the given Operation.
-   */
-  public AddOperationCommand(PortType portType, Operation originalOperation, String name, boolean copyInOutFault) {
-  	this.portType = portType;
-  	this.originalOperation = originalOperation;
-  	this.name = name;
-  	this.copyInOutFault = copyInOutFault;
-  }
-  
-  public void run()
-  {
-    operation = WSDLFactory.eINSTANCE.createOperation();
-    operation.setName(name);
-    operation.setEnclosingDefinition(portType.getEnclosingDefinition());
-    portType.addOperation(operation);
-
-    if (originalOperation == null) {    
-    	WSDLElementCommand command = null;
-    	if (createInput)
-    	{
-    		command = new AddInputCommand(operation,DEFAULT_INPUT_NAME,true);
-    		command.run();
-    	}
-    
-    	if (createOutput)
-    	{
-    		command = new AddOutputCommand(operation,DEFAULT_OUTPUT_NAME,true);
-    		command.run();
-    	}
-    
-    	if (createFault)
-    	{
-    		command = new AddFaultCommand(operation,DEFAULT_FAULT_NAME,true);
-    		command.run();
-    	}
-    }
-    else {
-    	// Do necessary copying of data from original operation to new operation
-    	// Paramater ordering? Documentation?  This part still needs to be worked on    	
-    	// Copy 'kids' if necessary
-    	if (copyInOutFault) {
-    		WSDLElementCommand command = null;
-        
-        	if (originalOperation.getEOutput() != null)
-        	{
-        		Output output = originalOperation.getEOutput();
-        		command = new AddOutputCommand(operation, output, NameUtil.buildUniqueOutputName(portType, operation.getName(), ""));
-        		command.run();
-        	}
-        	
-        	if (originalOperation.getEInput() != null)
-        	{
-        		Input input = originalOperation.getEInput();
-        		command = new AddInputCommand(operation, input, NameUtil.buildUniqueInputName(portType, operation.getName(), ""));
-        		command.run();
-        	}
-        
-        	if (originalOperation.getEFaults() != null)
-        	{
-        		Iterator it = originalOperation.getEFaults().iterator();
-        		while (it.hasNext()) {
-        			Fault fault = (Fault) it.next();
-        			command = new AddFaultCommand(operation, fault, NameUtil.buildUniqueFaultName(originalOperation, fault.getName()));
-        			command.run();
-        		}
-        	}
-    		
-    	}
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return operation;
-  }
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java
deleted file mode 100644
index 5c57c58..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddOutputCommand extends AddMessageReferenceCommand
-{
-  private Output originalOutput;
-  
-  public AddOutputCommand(Operation operation, String name)
-  {
-    super(operation,name);
-  }
-
-  public AddOutputCommand(Operation operation, String name, boolean createMessage)
-  {
-    super(operation,name,createMessage);
-  }
-  
-  /*
-   * Constructor used to create an Output based on the given Output.  In essence, this will
-   * create a copy of the given Output.
-   */
-  public AddOutputCommand(Operation operation, Output originalOutput, String name) {
-  	super(operation, name, false);
-  	
-  	this.originalOutput = originalOutput;
-  }
-  
-  public void run()
-  {
-    messageReference = WSDLFactory.eINSTANCE.createOutput();
-//    messageReference.setName(name);
-    messageReference.setEnclosingDefinition(operation.getEnclosingDefinition());
-    operation.setOutput((Output)messageReference);
-    
-    //  TBD - add binding output 
-    
-    if (originalOutput == null) {
-    	if (createMessage)
-    		createMessage();
-    }
-    else {
-    	// Do necessary copying of data from original Output to new Output
-    	if (originalOutput.getEMessage() != null) {
-    		String originalMsgName = originalOutput.getEMessage().getQName().getLocalPart();
-		
-		boolean gened = false;
-		if (originalOutput.eContainer() instanceof Operation)
-			gened = SmartRenameAction.isMessageNameGenerated(originalMsgName, ((Operation) originalOutput.eContainer()).getName(), "Response");
-		
-		String newMsgName = "";
-		if (gened) {
-			newMsgName = NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference);
-		}
-		else {
-			Definition definition = operation.getEnclosingDefinition();
-			Message tMessage = originalOutput.getEMessage();
-			newMsgName = NameUtil.buildUniqueMessageName(definition, tMessage.getQName().getLocalPart());
-		}
-		
-    	createMessage(originalOutput, newMsgName);
-    	}
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java
deleted file mode 100644
index 2ed9d68..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java
+++ /dev/null

@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.PartImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-
-
-public final class AddPartCommand extends WSDLElementCommand
-{
-  private Message message;
-  private String name;
-  private Part part;
-  private Part originalPart;
-  
-  private QName typeOrElementName;
-  private boolean useType = true;
-
-  public AddPartCommand
-		(Message message,
-		 String name)
-	{
-	  this.message = message;
-	  this.name = name;
-	}
-  
-  public AddPartCommand
-		(Message message,
-		 String name,
-		 String namespace,
-		 String localName,
-		 boolean useType)
-	{
-	  this.message = message;
-	  this.name = name;
-	  this.useType = useType;
-	  typeOrElementName = new QName(namespace,localName);
-	}
-  
-  /*
-   * Constructor used to create a Part based on the given Part.  In essence, this will
-   * create a copy of the given Part.
-   */
-  public AddPartCommand
-	(Message message,
-	 Part originalPart,
-	 String name)
-  {
-  	this.message = message;
-  	this.name = name;
-  	this.originalPart = originalPart;
-  }
-  
-  /**
-   * @deprecated
-   */
-  public AddPartCommand
-		(Message message,
-		 String name,
-		 String namespace,
-		 String localName)
-	{
-	  this.message = message;
-	  this.name = name;
-	  typeOrElementName = new QName(namespace,localName);
-	}
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return part;
-  }
-  
-  public void run()
-  {
-    if (typeOrElementName == null)
-      typeOrElementName = createDefaultTypeName();
-    
-    // Add namespace to the Definitions if it is not there yet.
-    addNamespaceDeclaration();
-    
-    part = WSDLFactory.eINSTANCE.createPart();
-    part.setName(name);
-    
-    if (originalPart == null) {
-    	if (useType)
-    		part.setTypeName(typeOrElementName);
-    	else
-    		part.setElementName(typeOrElementName);
-    }
-    else {
-    	if (originalPart.getTypeName() != null)
-    		part.setTypeName(originalPart.getTypeName());
-
-    	String newElementName = null;
-    	if (originalPart.getElementName() != null) {
-    		
-    		boolean createNewElement = true;
-    		if (originalPart.getElementDeclaration() != null && originalPart.getElementDeclaration().getElement() != null) {
-        		if (!(originalPart.getElementDeclaration().getElement() instanceof IDOMNode)) {
-        			createNewElement = false;
-        		}        		
-    		}
-    		
-    		if (createNewElement) {
-    			newElementName = getNewNameHelper(name, originalPart.getEnclosingDefinition(), false);
-    			part.setElementName(new QName(originalPart.getElementName().getNamespaceURI(), newElementName));
-	
-    			if (originalPart.getEnclosingDefinition() != null) {
-    				if (newElementName == null) {
-    					newElementName = getNewNameHelper(name, originalPart.getEnclosingDefinition(), false);
-    				}
-    		
-    				AddXSDElementDeclarationCommand elementAction = new AddXSDElementDeclarationCommand(originalPart.getEnclosingDefinition(), newElementName);
-    				elementAction.run();
-    			}
-    		}
-    		else {
-    			part.setElementName(new QName(originalPart.getElementName().getNamespaceURI(), originalPart.getElementName().getLocalPart()));
-    		}
-    	}
-    }
-    	
-    part.setEnclosingDefinition(message.getEnclosingDefinition());
-    ((PartImpl)part).reconcileReferences(false); 
-    message.addPart(part);
-  }
-  
-  private void addNamespaceDeclaration()
-  {
-    Definition definition = message.getEnclosingDefinition();
-    if (!definition.getNamespaces().containsValue(typeOrElementName.getNamespaceURI()))
-    {
-      definition.addNamespace("p",typeOrElementName.getNamespaceURI());
-      ((WSDLElementImpl)definition).updateElement(false);
-    }
-  }
-  
-  private QName createDefaultTypeName()
-  {
-    QName qname = new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string");
-    return qname;
-  }
-  
-  private String getNewNameHelper(String base, Definition def, boolean isType)
-  { 
-    String name = base;    
-    int count = 0;
-
-    // Ugly....  Redo this...
-    // Get a list of Elements...
-    List elementList = null;
-    if (def.getETypes() != null) {
-    	List xsdsList = def.getETypes().getEExtensibilityElements();
-    	if (xsdsList != null) {
-    		Iterator xsdsIterator = xsdsList.iterator();
-    		XSDSchemaExtensibilityElement xsdElement = (XSDSchemaExtensibilityElement) xsdsIterator.next();
-    		XSDSchema schema = xsdElement.getSchema();
-    		if (schema != null) {
-    			elementList = schema.getElementDeclarations();
-    		}
-    	}
-    }
-    
-    if (elementList != null) {
-    	int index = 0;
-    	while (index < elementList.size()) {
-    		XSDElementDeclaration elementDeclaration = (XSDElementDeclaration) elementList.get(index);
-    		
-    		if (name.equals(elementDeclaration.getName())) {
-    			count++;
-    			name = name + count;
-    			index = 0;
-    		}
-    		else {
-    			index++;
-    		}
-    	}
-    }
-
-    return name;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java
deleted file mode 100644
index a647c52..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddPortCommand extends WSDLElementCommand
-{
-  private Service service;
-  private String name;
-  private Port port;
-  
-  public AddPortCommand
-		(Service service,
-		 String name)
-	{
-	  this.service = service;
-	  this.name = name;
-	}
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return port;
-  }
-
-  public void run()
-  {
-    port = WSDLFactory.eINSTANCE.createPort();
-    port.setName(name);
-    port.setEnclosingDefinition(service.getEnclosingDefinition());
-    service.addPort(port);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java
deleted file mode 100644
index 5eb4d5a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-
-public final class AddPortTypeCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private PortType portType;
-  
-  private boolean createOperation = false;
-  private final String DEFAULT_OPERATION_NAME = "NewOperation";
-
-  public AddPortTypeCommand
-		(Definition definition,  
-		 String localName)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	}
-
-  public AddPortTypeCommand
-		(Definition definition, 
-		 String localName,
-		 boolean createOperation)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	  this.createOperation = createOperation;
-	}
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementAction#getWSDLElement()
-   */
-  public WSDLElement getWSDLElement()
-  {
-    return portType;
-  }
-
-  public void run()
-  {
-    portType = WSDLFactory.eINSTANCE.createPortType();
-    portType.setQName(new QName(definition.getTargetNamespace(),localName));
-    portType.setEnclosingDefinition(definition);
-    definition.addPortType(portType);
-    
-    if (createOperation)
-    {
-      AddOperationCommand command = 
-        new AddOperationCommand(portType,DEFAULT_OPERATION_NAME,true,true,false);
-      command.run();
-    }
-  }
-  
-  public void setLocalName(String name)
-  {
-    localName = name;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java
deleted file mode 100644
index d9fed45..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-
-public final class AddServiceCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private Service service;
-  
-  private boolean createPort = false;
-  private final String DEFAULT_PORT_NAME = "NewPort";
-
-  public AddServiceCommand
-		(Definition definition,  
-		 String localName)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	}
-
-	public AddServiceCommand
-		(Definition definition, 
-		 String localName,
-		 boolean createPort)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	  this.createPort = createPort;
-	}
-
-  public WSDLElement getWSDLElement()
-  {
-    return service;
-  }
-
-  public void run()
-  {
-    service = WSDLFactory.eINSTANCE.createService();
-    service.setQName(new QName(definition.getTargetNamespace(),localName));
-    service.setEnclosingDefinition(definition);
-    definition.addService(service);
-    
-    if (createPort)
-    {
-      AddPortCommand command = 
-        new AddPortCommand(service,DEFAULT_PORT_NAME);
-      command.run();
-    }
-  }
-  
-  public void setLocalName(String name)
-  {
-    localName = name;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java
deleted file mode 100644
index b568fd1..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-// Definition must not have "types" element to run this command.
-public final class AddTypesCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private Types types;
-  
-  public AddTypesCommand(Definition definition)
-  {
-    this.definition = definition;
-  }
-
-  public void run()
-  {
-  	if ((types = definition.getETypes()) != null)
-      return; // "types" already exists.
-  	
-    types = WSDLFactory.eINSTANCE.createTypes();
-    types.setEnclosingDefinition(definition);
-    definition.setTypes(types);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return types;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java
deleted file mode 100644
index ab3352d..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.internal.impl.UnknownExtensibilityElementImpl;
-
-public final class AddUnknownExtensibilityElementCommand extends WSDLElementCommand
-{
-  private ExtensibleElement extensibleElement;
-  private String namespaceURI;
-  private String localName;
-  private UnknownExtensibilityElement extensibilityElement;
-  private Map properties;
- 
-  public AddUnknownExtensibilityElementCommand
-    (ExtensibleElement extensibleElement, 
-     String namespaceURI,
-     String localName)
-  {
-    this.extensibleElement = extensibleElement;
-    this.namespaceURI = namespaceURI;
-    this.localName = localName;
-  }
-  
-  public AddUnknownExtensibilityElementCommand
-    (ExtensibleElement extensibleElement, 
-     String namespaceURI,
-     String localName,
-     Map properties)
-  {
-    this.extensibleElement = extensibleElement;
-    this.namespaceURI = namespaceURI;
-    this.localName = localName;
-    this.properties = properties;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return extensibilityElement;
-  }
-
-  public void run()
-  {
-  	extensibilityElement = WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-  	extensibilityElement.setElementType(new QName(namespaceURI,localName));
-  	
-    if (properties != null)
-    {
-      Iterator iterator = properties.entrySet().iterator();
-      Map.Entry entry = null;
-      while (iterator.hasNext())
-      {
-      	entry = (Map.Entry)iterator.next();
-      	String attribute = (String)entry.getKey();
-      	String value = (String)entry.getValue();      	
-      	((UnknownExtensibilityElementImpl)extensibilityElement).setAttribute(attribute,value);
-      }
-    }
-    
-  	extensibilityElement.setEnclosingDefinition(extensibleElement.getEnclosingDefinition());
-  	extensibleElement.addExtensibilityElement(extensibilityElement);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java
deleted file mode 100644
index 4dc33a7..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-
-// This class is used to create a new XSDElementDeclaration in the targetNamespace.
-public final class AddXSDElementDeclarationCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String targetNamespace;
-  private String elementName;
-  private XSDSchema schema;
-  private XSDElementDeclaration xsdElement;
-  
-  /**
-   * TODO:
-   * We have a potential problem here....  What if the definition targetnamespace is null....
-   */
-  public AddXSDElementDeclarationCommand(Definition definition, String elementName)
-  {
-    this.definition = definition;
-    this.targetNamespace = definition.getTargetNamespace();
-    this.elementName = elementName;
-  }
-  
-  /**
-   * @deprecated
-   * Use AddXSDElementDeclarationCommand(Definition definition, String typeName)
-   */
-  public AddXSDElementDeclarationCommand
-    (Definition definition, 
-     String targetNamespace, 
-     String elementName)
-  {
-    this.definition = definition;
-    this.targetNamespace = targetNamespace;
-    this.elementName = elementName;
-  }
-
-  public void run()
-  {
-    XSDSchema xsdSchema = getSchema();
-    XSDElementDeclaration elementDecl = 
-      XSDFactory.eINSTANCE.createXSDElementDeclaration();
-    elementDecl.setName(elementName);
-    
-    XSDSimpleTypeDefinition simpleTypeDefinition = getXSDStringType(xsdSchema);
-    elementDecl.setTypeDefinition(simpleTypeDefinition);    
-    xsdSchema.getContents().add(elementDecl);
-  }
-  
-  public void run(String newElementName) {
-  	elementName = newElementName;
-  	run();
-  }
-  
-  /*
-   * Specify which Schema to use when creating the Type.
-   * Call this method before calling run().  Otherwise it will use the first
-   * Schema it finds.
-   */
-  public void setSchema(XSDSchema schema) {
-  	this.schema = schema;
-  }
-  
-  /*
-   * Return the Schema used to create the Type
-   */
-  public XSDSchema getSchema() {
-  	if (schema == null) {
-  		return getXSDSchema(targetNamespace);
-  	}
-  	else {
-  		return schema;
-  	}
-  }
-  
-  private XSDSimpleTypeDefinition getXSDStringType(XSDSchema schema)
-  {
-    return schema.getSchemaForSchema().resolveSimpleTypeDefinition("string");
-  }
-  
-  private XSDSchema getXSDSchema(String targetNamespace)
-  {
-    XSDSchema xsdSchema;
-    
-    // Do we have a schema already?
-    Iterator iterator = getTypes().getSchemas(targetNamespace).iterator();
-    if (iterator.hasNext())
-    {
-      xsdSchema = (XSDSchema)iterator.next(); // Get the first one.
-      return xsdSchema;
-    }
-    else
-    {	    
-      // Create a new schema because there's none.
-      AddXSDSchemaCommand command = new AddXSDSchemaCommand(definition,targetNamespace);
-      command.run();
-      return ((XSDSchemaExtensibilityElement)command.getWSDLElement()).getSchema();
-    }
-  }
-  
-  private Types getTypes()
-  {
-    // Types is created if it does not exist yet.
-    Types types = (Types)definition.getTypes();
-    if (types != null)
-      return types;
-    else
-    {
-      AddTypesCommand command = new AddTypesCommand(definition);
-      command.run();
-      return (Types)command.getWSDLElement();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return null;
-  }
-  
-  public XSDElementDeclaration getXSDElement()
-  {
-	  return xsdElement;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java
deleted file mode 100644
index 73bd1fd..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-
-
-
-public final class AddXSDSchemaCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private XSDSchemaExtensibilityElement extensibilityElement;
-  private String targetNamespace;
-  
-  public AddXSDSchemaCommand(Definition definition)
-  {
-    this.definition = definition;
-    this.targetNamespace = definition.getTargetNamespace();
-  }
-  
-  public AddXSDSchemaCommand(Definition definition, String targetNamespace)
-  {
-    this.definition = definition;
-    this.targetNamespace = targetNamespace;
-  }
-  
-  public void run()
-  {    
-    extensibilityElement = WSDLFactory.eINSTANCE.createXSDSchemaExtensibilityElement();
-    extensibilityElement.setEnclosingDefinition(definition);
- 
-    XSDSchema xsdSchema = XSDFactory.eINSTANCE.createXSDSchema();
-    xsdSchema.setSchemaForSchemaQNamePrefix("xsd");
-    xsdSchema.setTargetNamespace(targetNamespace);
-    // Choose the prefix Choose the prefix used for this schema's namespace and the schema for schema's namespace.
-    //    
-    java.util.Map qNamePrefixToNamespaceMap = xsdSchema.getQNamePrefixToNamespaceMap();
-//    qNamePrefixToNamespaceMap.put("p", xsdSchema.getTargetNamespace());
-    qNamePrefixToNamespaceMap.put
-	  (xsdSchema.getSchemaForSchemaQNamePrefix(),org.eclipse.xsd.util.XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-    extensibilityElement.setSchema(xsdSchema);
-       
-    // TBD - Check if multiple schemas with the same targetNamespace can co-exist.
-    Types types = getTypes();
-    types.addExtensibilityElement(extensibilityElement);
-  }
-
-  private Types getTypes()
-  {
-    // Types is created if it does not exist.
-    Types types = (Types)definition.getTypes();
-    if (types != null)
-      return types;
-    else
-    {
-      AddTypesCommand command = new AddTypesCommand(definition);
-      command.run();
-      return (Types)command.getWSDLElement();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return extensibilityElement;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java
deleted file mode 100644
index f81ae74..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-
-// This class is used to create a new XSDTypeDefinition in the targetNamespace.
-public final class AddXSDTypeDefinitionCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String targetNamespace;
-  private String typeName;
-  private XSDSchema schema;
-  private boolean isComplexType = true;
-  
-  /**
-   * TODO:
-   * We have a potential problem here....  What if the definition targetnamespace is null....
-   */
-  public AddXSDTypeDefinitionCommand(Definition definition, String typeName)
-  {
-    this.definition = definition;
-    this.targetNamespace = definition.getTargetNamespace();
-    this.typeName = typeName;
-  }
-  
-  public AddXSDTypeDefinitionCommand(Definition definition, String typeName, boolean isComplexType)
-  {
-  	this(definition, typeName);
-  	this.isComplexType = isComplexType;
-  }
-  
-  /**
-   * @deprecated
-   * Use AddXSDTypeDefinitionCommand(Definition definition, String typeName)
-   */
-  public AddXSDTypeDefinitionCommand
-    (Definition definition, 
-     String targetNamespace,
-     String typeName)
-  {
-    this.definition = definition;
-    this.targetNamespace = targetNamespace;
-    this.typeName = typeName;
-  }
-  
-  public void run()
-  {
-    XSDSchema xsdSchema = getSchema();
-    XSDNamedComponent typeDef;
-    
-    if (isComplexType) {
-    	typeDef = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-    }
-    else {
-    	typeDef = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-    }
-    
-    typeDef.setName(typeName);
-    xsdSchema.getContents().add(typeDef);
-  }
-  
-  public void run(String newTypeName) {
-  	typeName = newTypeName;
-  	run();
-  }
-  
-  /*
-   * Specifiy if we should create a complex or simple type.  This should should be
-   * called before run().
-   * Overrides the value set when the constructor
-   * AddXSDTypeDefinitionCommand(Definition definition, String typeName, boolean isComplexType)
-   * is used.
-   */
-  public void isComplexType(boolean isComplexType) {
-  	this.isComplexType = isComplexType;
-  }
-  
-  /*
-   * Specify which Schema to use when creating the Type.
-   * Call this method before calling run().  Otherwise it will use the first
-   * Schema it finds.
-   */
-  public void setSchema(XSDSchema schema) {
-  	this.schema = schema;
-  }
-  
-  /*
-   * Return the Schema used to create the Type
-   */
-  public XSDSchema getSchema() {
-  	if (schema == null) {
-  		return getXSDSchema(targetNamespace);
-  	}
-  	else {
-  		return schema;
-  	}
-  }
-
-  private XSDSchema getXSDSchema(String targetNamespace)
-  {
-    XSDSchema xsdSchema;
-    
-    // Do we have a schema already?
-    Iterator iterator = getTypes().getSchemas(targetNamespace).iterator();
-    if (iterator.hasNext())
-    {
-      xsdSchema = (XSDSchema)iterator.next(); // Get the first one.
-      return xsdSchema;
-    }
-    else
-    {	    
-      // Create a new schema because there's none.
-      AddXSDSchemaCommand command = new AddXSDSchemaCommand(definition,targetNamespace);
-      command.run();
-      return ((XSDSchemaExtensibilityElement)command.getWSDLElement()).getSchema();
-    }
-  }
-  
-  private Types getTypes()
-  {
-    // Types is created if it does not exist yet.
-    Types types = (Types)definition.getTypes();
-    if (types != null)
-      return types;
-    else
-    {
-      AddTypesCommand command = new AddTypesCommand(definition);
-      command.run();
-      return (Types)command.getWSDLElement();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return null;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java
deleted file mode 100644
index 3fc9c24..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.WSDLElement;
-
-public abstract class WSDLElementCommand
-{
-  public abstract WSDLElement getWSDLElement();
-  public abstract void run();
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ContentGenerator.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ContentGenerator.java
deleted file mode 100644
index ff3bfc7..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ContentGenerator.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator;  
-        
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.w3c.dom.Element;
-
-
-
-public interface ContentGenerator
-{        
-	
-  public static String ADDRESS_LOCATION = "http://tempuri.org/";  
-  public void init(Definition definition, Object generator, Object[] options);
-
-  public String[] getRequiredNamespaces();
-  
-  public String[] getPreferredNamespacePrefixes();
-
-  // generates the 'address' extensiblity element for a port
-  //
-  public void generatePortContent(Element portElement, Port port);
- 
-  public void generateBindingContent(Element bindingElement, PortType portType);
-
-  public void generateBindingOperationContent(Element bindingOperationElement, Operation operation);
- 
-  public void generateBindingInputContent(Element bindingInputElement, Input input);    
-
-  public void generateBindingOutputContent(Element bindingOutputElement, Output output);
-
-  public void generateBindingFaultContent(Element bindingFaultElement, Fault fault);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/HttpContentGenerator.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/HttpContentGenerator.java
deleted file mode 100644
index 3599cef..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/HttpContentGenerator.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.w3c.dom.Element;
-
-
-public class HttpContentGenerator implements ContentGenerator
-{
-  protected Definition definition;
-  protected boolean isPost;
-  protected String addressLocation = ContentGenerator.ADDRESS_LOCATION;
-
-  protected final static String[] requiredNamespaces = { "http://schemas.xmlsoap.org/wsdl/mime/", "http://schemas.xmlsoap.org/wsdl/http/" };
-  protected final static String[] preferredNamespacePrefixes = { "mime", "http" };
-
-  public void init(Definition definition, Object generator, Object[] options)
-  {
-    this.definition = definition;
-
-    if (options != null)
-    {
-      if (options.length > 0 && options[0] != null)
-      {
-        Boolean isPostOption = (Boolean) options[0];
-        isPost = isPostOption.booleanValue();
-      }
-      if (options.length > 1 && options[1] != null)
-      {
-        addressLocation = (String) options[1];
-      }
-    }
-  }
-
-  public String[] getRequiredNamespaces()
-  {
-    return requiredNamespaces;
-  }
-
-  public String[] getPreferredNamespacePrefixes()
-  {
-    return preferredNamespacePrefixes;
-  }
-
-  public void generatePortContent(Element portElement, Port port)
-  {
-    Element element = createElement(portElement, "http", "address");
-    element.setAttribute("location", addressLocation);
-  }
-
-  public void generateBindingContent(Element bindingElement, PortType portType)
-  {
-    Element element = createElement(bindingElement, "http", "binding");
-    element.setAttribute("verb", isPost ? "POST" : "GET");
-  }
-
-  public void generateBindingOperationContent(Element bindingOperationElement, Operation operation)
-  {
-    Element element = createElement(bindingOperationElement, "http", "operation");
-    element.setAttribute("location", "/" + operation.getName());
-  }
-
-  public void generateBindingInputContent(Element bindingInputElement, Input input)
-  {
-    if (isPost)
-    {
-      Element element = createElement(bindingInputElement, "mime", "content");
-      element.setAttribute("type", "application/x-www-form-urlencoded");
-    }
-    else
-    {
-      createElement(bindingInputElement, "http", "urlEncoded");
-    }
-  }
-
-  public void generateBindingOutputContent(Element bindingOutputElement, Output output)
-  {
-    Element element = createElement(bindingOutputElement, "mime", "content");
-    element.setAttribute("type", "text/xml");
-  }
-
-  public void generateBindingFaultContent(Element bindingFaultElement, Fault fault)
-  {
-    //TODO!!
-  }
-
-  protected Element createElement(Element parentElement, String prefix, String elementName)
-  {
-    String name = prefix != null ? (prefix + ":" + elementName) : elementName;
-    Element result = parentElement.getOwnerDocument().createElement(name);
-    parentElement.appendChild(result);
-    return result;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/SoapContentGenerator.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/SoapContentGenerator.java
deleted file mode 100644
index d928c33..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/SoapContentGenerator.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator;  
-        
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.w3c.dom.Element;
-
-
-public class SoapContentGenerator implements ContentGenerator
-{ 
-  private final int DOCUMENT_LITERAL = 1;
-  private final int RPC_LITERAL      = 2;
-  private final int RPC_ENCODED      = 3;
-
-  protected int bindingOption = DOCUMENT_LITERAL;
-  protected String namespaceValue = "";
-  protected String addressLocation = ContentGenerator.ADDRESS_LOCATION;                   
-  protected Definition definition;                                    
-
-  protected final static String[] requiredNamespaces = {"http://schemas.xmlsoap.org/wsdl/soap/"};
-  protected final static String[] preferredNamespacePrefixes = {"soap"};
-
-
-  public void init(Definition definition, Object generator, Object[] options)
-  {              
-    this.definition = definition;
-                       
-    if (options != null)
-    {
-      bindingOption = computeBindingOption(options);
-
-      if (options.length > 1 && options[1] != null)
-      {
-      	addressLocation = (String)options[1];
-      }  
-    }
-    if (definition.getTargetNamespace() != null)
-    {
-      namespaceValue = definition.getTargetNamespace();
-    } 
-  }
-  
-  private int computeBindingOption(Object[] options) {
-  	int option = DOCUMENT_LITERAL;
-    if (options.length > 0 && options[0] != null)
-    {
-		boolean isDocumentLiteralOption = ((Boolean)options[0]).booleanValue();
-		if (isDocumentLiteralOption)
-			option =  DOCUMENT_LITERAL;
-		else
-			option = RPC_ENCODED;		
-		
-    	if (options.length >= 3 && options[2] != null) {
-    		// Extra info sent in
-    		if (((Boolean)options[2]).booleanValue())
-    			option = RPC_LITERAL;
-    	}
-    }
-
-    return option;
-  }
-     
-  public String[] getRequiredNamespaces()
-  {
-    return requiredNamespaces;
-  }
-  
-  public String[] getPreferredNamespacePrefixes()
-  {
-    return preferredNamespacePrefixes;
-  }  
-
-  public void generatePortContent(Element portElement, Port port)
-  {
-    Element element = createElement(portElement, "soap", "address");
-    element.setAttribute("location", addressLocation);     
-  }  
-
-  public void generateBindingContent(Element bindingElement, PortType portType)
-  {
-    Element element = createElement(bindingElement, "soap", "binding");
-    element.setAttribute("style", (bindingOption == DOCUMENT_LITERAL) ? "document" : "rpc"); 
-    element.setAttribute("transport", "http://schemas.xmlsoap.org/soap/http");
-  }
-
-  public void generateBindingOperationContent(Element bindingOperationElement, Operation operation)
-  {
-    Element element = createElement(bindingOperationElement, "soap", "operation");
-    
-    String soapActionValue = namespaceValue;                                        
-    if (!soapActionValue.endsWith("/"))
-    {                
-      soapActionValue += "/";
-    }                        
-    soapActionValue += operation.getName();
-    element.setAttribute("soapAction", soapActionValue);
-  }  
-
-  public void generateBindingInputContent(Element bindingInputElement, Input input)
-  {
-    generateSoapBody(bindingInputElement);
-  }
-
-  public void generateBindingOutputContent(Element bindingOutputElement, Output output)
-  {
-    generateSoapBody(bindingOutputElement);
-  }         
-
-  public void generateBindingFaultContent(Element bindingFaultElement, Fault fault)
-  {                              
-    Element element = createElement(bindingFaultElement, "soap", "fault");      
-    element.setAttribute("name", fault.getName()); 
-    element.setAttribute("use", (bindingOption == RPC_ENCODED) ? "encoded" : "literal");
-    if (bindingOption == RPC_ENCODED)
-    {
-      element.setAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/");
-      element.setAttribute("namespace", namespaceValue);
-    }
-    else if (bindingOption == RPC_LITERAL) {
-        element.setAttribute("namespace", namespaceValue);
-    }
-  }  
-
-  protected void generateSoapBody(Element parentElement)
-  {
-    Element element = createElement(parentElement, "soap", "body");      
-    element.setAttribute("use", (bindingOption == RPC_ENCODED) ? "encoded" : "literal"); 
-    if (bindingOption == RPC_ENCODED)
-    {
-      element.setAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/");
-      element.setAttribute("namespace", namespaceValue);
-    }
-    else if (bindingOption == RPC_LITERAL) {
-    	element.setAttribute("namespace", namespaceValue);
-    }
-  }
-
-  protected Element createElement(Element parentElement, String prefix, String elementName)
-  {                                         
-    String name = prefix != null ? (prefix + ":" + elementName) : elementName;
-    Element result = parentElement.getOwnerDocument().createElement(name);
-    parentElement.appendChild(result);
-    return result;
-  }
-} 
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java
deleted file mode 100644
index bca40e9..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;  
-        
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-
-public interface ContentGeneratorOptionsPage
-{                                          
-  public void init(BaseGenerator baseGenerator);             
-  public Composite createControl(Composite parent);
-  public Composite getControl();
-  
-  // TODO can this go into init?
-  //
-  public void setOptionsOnGenerator();
-  public boolean isOverwriteApplicable();
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java
deleted file mode 100644
index 1e355e3..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-
-public class HttpBindingOptionsPage implements ContentGeneratorOptionsPage, SelectionListener
-{
-  protected Button getButton;
-  protected Button postButton;
-  protected Composite control;
-  protected BaseGenerator generator;
-  protected HTTPContentGenerator httpGenerator;
-
-  public HttpBindingOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-	if (generator.getContentGenerator() instanceof HTTPContentGenerator) {
-		httpGenerator = (HTTPContentGenerator) generator.getContentGenerator();
-	}
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-   
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_HTTP_BINDING_OPTIONS"));
-
-    getButton = new Button(control, SWT.RADIO);
-    getButton.setText("HTTP GET");
-    getButton.setSelection(true);
-
-    postButton = new Button(control, SWT.RADIO);
-    postButton.setText("HTTP POST");
-
-    if (generator.getName() != null)
-    {
-      Definition definition = generator.getDefinition();
-      QName qname = new QName(definition.getTargetNamespace(), generator.getName());
-      Binding binding = (Binding) definition.getBinding(qname);
-      if (binding != null)
-      {
-        List eeList = binding.getEExtensibilityElements();
-        if (eeList.size() > 0)
-        {
-          ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);
-          Element element = WSDLEditorUtil.getInstance().getElementForObject(ee);
-          String verb = element.getAttribute("verb");
-          if ("POST".equals(verb))
-          {
-            getButton.setSelection(false);
-            postButton.setSelection(true);
-          }
-        }
-      }
-    }
-
-    postButton.addSelectionListener(this);
-    getButton.addSelectionListener(this);
-	computeOptions();
-	
-    return control;
-  }
-  
-  public Composite getControl() {
-	  return control;
-  }
-  
-  public boolean isOverwriteApplicable()
-  {
-  	return true;
-  }  
-
-  public void widgetSelected(SelectionEvent event)
-  {
-	computeOptions();
-  }
-
-  protected void computeOptions()
-  {
-	  if (generator.getContentGenerator() instanceof HTTPContentGenerator) {
-		  HTTPContentGenerator httpGenerator = (HTTPContentGenerator) generator.getContentGenerator();
-
-		  if (postButton.getSelection()) {
-			  httpGenerator.setVerb(HTTPContentGenerator.VERB_POST);
-		  }	  
-		  else if (getButton.getSelection()) {
-			  httpGenerator.setVerb(HTTPContentGenerator.VERB_GET);
-		  }
-	  }
-  }
-  
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-
-  public void widgetDefaultSelected(SelectionEvent event)
-  {
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpPortOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpPortOptionsPage.java
deleted file mode 100644
index 28ea27a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpPortOptionsPage.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class HttpPortOptionsPage implements ContentGeneratorOptionsPage, ModifyListener
-{
-  protected Text addressField;
-  protected Composite control;
-  protected BaseGenerator generator;
-
-  public HttpPortOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-    control.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_HTTP_PORT_DETAILS"));
-
-    Composite nameValueGroup = new Composite(control, SWT.NONE);
-    nameValueGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-    GridLayout layout2 = new GridLayout(2, false);
-    layout2.marginWidth = 0;
-    nameValueGroup.setLayout(layout2);
-
-    Label addressLabel = new Label(nameValueGroup, SWT.NONE);
-    addressLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LOCATION") + " ");
-    addressField = new Text(nameValueGroup, SWT.BORDER);
-    addressField.setText("http://example.com/");
-    addressField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    addressField.addModifyListener(this);
-
-    return control;
-  }
-
-  public boolean isOverwriteApplicable()
-  {
-    return false;
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-	  computeOptions();
-  }
-  
-  private void computeOptions() {
-	if (generator.getContentGenerator() instanceof HTTPContentGenerator) {
-		((HTTPContentGenerator) generator.getContentGenerator()).setAddressLocation(addressField.getText());
-	}
-  }
-
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-  
-  public Composite getControl() {
-	  return control;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java
deleted file mode 100644
index a9e32d2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java
+++ /dev/null

@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-
-public class SoapBindingOptionsPage implements ContentGeneratorOptionsPage, SelectionListener
-{
-  protected Button docLiteral;
-  protected Button rpcLiteral;
-  protected Button rpcEncoded;
-  protected Composite control;
-  protected BaseGenerator generator;
-
-  public SoapBindingOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_SOAP_BINDING_OPTIONS"));
-
-    docLiteral = new Button(control, SWT.RADIO);
-    docLiteral.setText(WSDLEditorPlugin.getWSDLString("_UI_RADIO_DOCUMENT_LITERAL"));
-    docLiteral.setSelection(true);
-
-    rpcLiteral = new Button(control, SWT.RADIO);
-    rpcLiteral.setText(WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_LITERAL"));
-    
-    rpcEncoded = new Button(control, SWT.RADIO);
-    rpcEncoded.setText(WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_ENCODED"));
-
-    if (generator.getName() != null)
-    {
-      Definition definition = generator.getDefinition();
-      QName qname = new QName(definition.getTargetNamespace(), generator.getName());
-      Binding binding = (Binding) definition.getBinding(qname);
-
-      if (binding != null)
-      {
-        List eeList = binding.getEExtensibilityElements();
-        if (eeList.size() > 0)
-        {
-          ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);
-
-          Element element = WSDLEditorUtil.getInstance().getElementForObject(ee);
-          String style = element.getAttribute("style");
-          
-          if ("rpc".equals(style))
-          {
-            // Try to determine if it's RPC Literal or RPC Encoded
-          	String use = "encoded";
-          	List operations = binding.getEBindingOperations();
-          	if (operations.size() > 0) {
-          		element = null;
-          		BindingOperation operation = (BindingOperation) operations.get(0);
-          		if (operation.getEBindingInput() != null && operation.getEBindingInput().getEExtensibilityElements().size() > 0) {
-          			Object object = operation.getEBindingInput().getEExtensibilityElements().get(0);
-          			element = WSDLEditorUtil.getInstance().getElementForObject(object);
-          		}
-          		else if (operation.getEBindingOutput() != null && operation.getEBindingOutput().getEExtensibilityElements().size() > 0) {
-          			Object object = operation.getEBindingOutput().getEExtensibilityElements().get(0);
-          			element = WSDLEditorUtil.getInstance().getElementForObject(object);
-          		}
-          		else if (operation.getEBindingFaults().size() > 0) {
-          			BindingFault fault = (BindingFault) operation.getEBindingFaults().get(0);
-          			List faultEE = fault.getExtensibilityElements();
-          			
-          			if (faultEE.size() > 0) {
-          				element = WSDLEditorUtil.getInstance().getElementForObject(faultEE.get(0));
-          			}
-          		}
-          		
-          		if (element != null) {
-          			use = element.getAttribute("use");
-          		}
-          	}
-          	
-          	if (use != null && "literal".equals(use)) {
-          		docLiteral.setSelection(false);
-          		rpcLiteral.setSelection(true);
-          		rpcEncoded.setSelection(false);
-          	}
-          	else {          	
-          		docLiteral.setSelection(false);
-          		rpcLiteral.setSelection(false);
-          		rpcEncoded.setSelection(true);
-          	}
-          }
-        }
-      }
-    }
-
-    docLiteral.addSelectionListener(this);
-    rpcLiteral.addSelectionListener(this);
-    rpcEncoded.addSelectionListener(this);
-    computeOptions();
-
-    return control;
-  }
-
-  public Composite getControl() {
-	  return control;
-  }
-  
-  public boolean isOverwriteApplicable()
-  {
-    return true;
-  }
-
-  public void widgetSelected(SelectionEvent event)
-  {
-    computeOptions();
-  }
-
-  protected void computeOptions()
-  {
-	  if (generator.getContentGenerator() instanceof SOAPContentGenerator) {
-		  SOAPContentGenerator soapGenerator = (SOAPContentGenerator) generator.getContentGenerator();
-		  if (docLiteral.getSelection()) {
-			  soapGenerator.setStyle(SOAPContentGenerator.STYLE_DOCUMENT);
-			  soapGenerator.setUse(SOAPContentGenerator.USE_LITERAL);
-		  }	  
-		  else if (rpcLiteral.getSelection()) {
-			  soapGenerator.setStyle(SOAPContentGenerator.STYLE_RPC);
-			  soapGenerator.setUse(SOAPContentGenerator.USE_LITERAL);
-		  }
-		  else if (rpcEncoded.getSelection()) {
-			  soapGenerator.setStyle(SOAPContentGenerator.STYLE_RPC);
-			  soapGenerator.setUse(SOAPContentGenerator.USE_ENCODED);
-		  }
-	  }
-  }
-  
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-
-  public void widgetDefaultSelected(SelectionEvent event)
-  {
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapPortOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapPortOptionsPage.java
deleted file mode 100644
index 137394f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapPortOptionsPage.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class SoapPortOptionsPage implements ContentGeneratorOptionsPage, ModifyListener
-{
-  protected Text addressField;
-  protected Composite control;
-  protected BaseGenerator generator;
-
-  public SoapPortOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-    control.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_SOAP_PORT_DETAILS"));
-
-    Composite nameValueGroup = new Composite(control, SWT.NONE);
-    nameValueGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-    GridLayout layout2 = new GridLayout(2, false);
-    layout2.marginWidth = 0;
-    nameValueGroup.setLayout(layout2);
-
-    Label addressLabel = new Label(nameValueGroup, SWT.NONE);
-    addressLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LOCATION") + " ");
-    addressField = new Text(nameValueGroup, SWT.BORDER);
-    addressField.setText("http://example.com/");
-    addressField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    addressField.addModifyListener(this);
-
-    return control;
-  }
-
-  public boolean isOverwriteApplicable()
-  {
-    return false;
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-	  computeOptions();
-  }
-  
-  private void computeOptions() {
-	if (generator.getContentGenerator() instanceof SOAPContentGenerator) {
-		((SOAPContentGenerator) generator.getContentGenerator()).setAddressLocation(addressField.getText());
-	}
-  }
-  
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-  
-  public Composite getControl() {
-	  return control;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java
deleted file mode 100644
index 638a79f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java
+++ /dev/null

@@ -1,88 +0,0 @@
-package org.eclipse.wst.wsdl.ui.internal.dialogs;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class GenerateBindingOnSaveDialog extends MessageDialog implements SelectionListener {
-	private static String dialogTitle = "Regenerate Bindings On Save";		// TODO: Translations needed....
-	private static String dialogMessage = "Regenerate Bindings On Save?";
-	private static String[] buttons = new String[]{"Yes", "No", "Cancel"};
-	
-	private Button rememberDecisionBox;
-	private boolean rememberDecision = false;
-	
-	public GenerateBindingOnSaveDialog(Shell shell) {
-		super(shell, dialogTitle, null, dialogMessage, MessageDialog.QUESTION, buttons, 0);
-	}
-	
-	
-	protected Control createCustomArea(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		comp.setLayout(layout);
-		comp.setData(new GridData());
-		
-		// Spacer
-		new Label(comp, SWT.NONE);
-		new Label(comp, SWT.NONE);
-		
-		rememberDecisionBox = new Button(comp, SWT.CHECK);
-		rememberDecisionBox.setText("Remember my decision");	// TODO: Externalize...
-		rememberDecisionBox.addSelectionListener(this);
-
-		return parent;
-	}
-	
-	private void storePromptPreference(int swtValue) {
-		// Store the new preference for displaying this dialog.
-		if (rememberDecision) {
-			WSDLEditorPlugin.getInstance().getPluginPreferences().setValue("Prompt Regenerate Binding on save", false);
-		
-			String generateID = WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING");
-			if (swtValue == SWT.YES) {
-				WSDLEditorPlugin.getInstance().getPluginPreferences().setValue(generateID, true);
-			}
-			else if (swtValue == SWT.NO) {
-				WSDLEditorPlugin.getInstance().getPluginPreferences().setValue(generateID, false);
-			}
-		}
-	}
-	
-	public int open() {
-		int rValue = super.open();
-		
-		if (rValue ==0) {
-			storePromptPreference(SWT.YES);
-			return SWT.YES;
-		}
-		else if (rValue == 1) {
-			storePromptPreference(SWT.NO);
-			return SWT.NO;
-		}
-		else if (rValue == 2) {
-			storePromptPreference(SWT.CANCEL);
-			return SWT.CANCEL;
-		}
-		
-		return rValue;
-	}
-	
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == rememberDecisionBox) {
-			rememberDecision = rememberDecisionBox.getSelection();
-		}
-	}
-	
-	public void widgetDefaultSelected(SelectionEvent e) {}
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/ImportAddResourceListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/ImportAddResourceListener.java
deleted file mode 100644
index b696cad..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/ImportAddResourceListener.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs;
-
-import java.util.Collection;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-
-public class ImportAddResourceListener implements IResourceChangeListener, IResourceDeltaVisitor
-{
-  Vector importedFiles;
-
-  ImportAddResourceListener()
-  {
-    importedFiles = new Vector(); 
-  }
-  
-  public void resourceChanged(IResourceChangeEvent event)
-  {
-    IResourceDelta resourceDelta = event.getDelta();
-    
-    try
-    {
-      if (resourceDelta != null) 
-      {
-        resourceDelta.accept(this);
-      }
-    }
-    catch (Exception e)
-    {
-//      B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception caught during resource change" + e);
-//      B2BGUIPlugin.getPlugin().getMsgLogger().writeCurrentThread(); 
-    }      
-  }
-
-  public boolean visit(IResourceDelta delta)
-  {
-    if (delta.getKind() == IResourceDelta.ADDED)
-    {
-      if (delta.getResource() instanceof IFile) 
-        importedFiles.add(delta.getResource());
-    }
-    return true;
-  }
-
-  public Collection getImportedFiles()
-  {
-    return importedFiles;
-  }
-    
-  // This returns the first imported file in the list of imported files
-  public IFile getImportedFile()
-  {
-    if (importedFiles.isEmpty() == false) 
-      return (IFile)importedFiles.firstElement();
-  
-    return null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/InvokeSetDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/InvokeSetDialog.java
deleted file mode 100644
index e1a35d2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/InvokeSetDialog.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.types.WSDLComponentSelectionDialog;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.types.WSDLComponentSelectionProvider;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.types.WSDLSetComponentHelper;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-public class InvokeSetDialog
-{
-  String kind;
-  String newValue = "";
-  
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-  
-  public String getValue()
-  {
-    return newValue; 
-  }
-  
-  public void run(Object input, IEditorPart editorPart)
-  {
-      WSDLComponentSelectionDialog dialog = null;
-      Shell shell = Display.getCurrent().getActiveShell();
-      IFile iFile = ((IFileEditorInput) editorPart.getEditorInput()).getFile();
-      Definition definition = ((WSDLElement) input).getEnclosingDefinition();
-      String property = "";
-      
-    if (input instanceof Binding)
-    {
-        String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_PORTTYPE");
-        
-        WSDLComponentSelectionProvider provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.PORT_TYPE);
-        dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        provider.setDialog(dialog);
-        property = "type";
-    }
-    else if (input instanceof Port)
-    {
-        String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_BINDING");
-        
-        WSDLComponentSelectionProvider provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.BINDING);
-        dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        provider.setDialog(dialog);
-        property = "binding";
-    }
-    else if (input instanceof Part)
-    {
-        List validExtensions = new ArrayList(2);
-        validExtensions.add("wsdl");
-        validExtensions.add("xsd");
-        WSDLComponentSelectionProvider provider = null;
-        if (kind.equalsIgnoreCase("type")) {
-            property = ""; 
-            String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_TYPE");
-            
-            provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.TYPE, validExtensions);
-            dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        }
-        else {
-            property = ""; 
-            String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_ELEMENT");
-            
-            provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.ELEMENT, validExtensions);
-            dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        }
-        provider.setDialog(dialog);
-    }
-    else if (input instanceof Input || input instanceof Output || input instanceof Fault)
-    {
-        String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_MESSAGE");
-
-        WSDLComponentSelectionProvider provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.MESSAGE);
-        dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);   
-        provider.setDialog(dialog);
-        property = "message";
-    }
-
-    dialog.setBlockOnOpen(true);
-    dialog.create();
-
-    if (dialog.open() == Window.OK) {
-        WSDLSetComponentHelper helper = new WSDLSetComponentHelper(iFile, definition);
-        if (kind != null && kind.equalsIgnoreCase("type")) {
-            helper.setXSDTypeComponent((Part) input, dialog.getSelection());
-        }
-        else if (kind != null && kind.equalsIgnoreCase("element")){
-            helper.setXSDElementComponent((Part) input, dialog.getSelection());
-        }
-        else {
-            helper.setWSDLComponent((WSDLElement) input, property, dialog.getSelection());
-        }
-    } 
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentFinder.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentFinder.java
deleted file mode 100644
index 297501c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentFinder.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentFinder;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLQuickScan;
-
-public class WSDLComponentFinder extends XMLComponentFinder {
-    List lookupTagPaths;
-    
-    public WSDLComponentFinder(List tagPaths) {
-        lookupTagPaths = new ArrayList();
-        lookupTagPaths.addAll(tagPaths);
-    }
-    
-    public List getWorkbenchResourceComponents(int scope) {
-        List components = new ArrayList();
-        List filePaths = new ArrayList();
-        
-        // We don't want to search through the current file we're working on.
-        if (currentIFile != null) {
-            excludeFiles.add(currentIFile.getLocation().toOSString());
-        }
-        
-        // Find files matching the search criteria specified in List extensions and
-        // List excludeFiles.
-        switch (scope) {
-        case ENCLOSING_PROJECT_SCOPE:
-            filePaths = getEnclosingProjectFiles();
-            break;
-            
-        case ENTIRE_WORKSPACE_SCOPE:
-            filePaths = getWorkspaceFiles();
-            break;
-            
-        default:            
-            break;
-        }
-        
-        // Search for the components in each of the files specified in the path.
-        List attributes = new ArrayList();
-        String[] nameAttr = new String[1];
-        nameAttr[0] = "name";
-        attributes.add(nameAttr);
-        attributes.add(nameAttr);
-        attributes.add(nameAttr);
-        attributes.add(nameAttr);
-
-        Iterator pathsIterator = filePaths.iterator();
-        while (pathsIterator.hasNext()) {
-//           String stringPath = ((Path) pathsIterator.next()).toOSString();
-           String stringPath = ((Path) pathsIterator.next()).toString();
-           components.addAll(XMLQuickScan.getTagInfo(stringPath, lookupTagPaths, attributes));
-        }
-        
-        return components;
-    }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionDialog.java
deleted file mode 100644
index 885640f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionDialog.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.common.IComponentSelectionProvider;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSelectionDialog;
-
-public class WSDLComponentSelectionDialog extends XMLComponentSelectionDialog {
-	
-    public WSDLComponentSelectionDialog(Shell shell, String dialogTitle, IComponentSelectionProvider provider) {
-        super(shell, dialogTitle, provider);
-    }  
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionProvider.java
deleted file mode 100644
index bda75ad..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionProvider.java
+++ /dev/null

@@ -1,608 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.ImportImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.common.IComponentList;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentFinder;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSelectionDialog;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSelectionProvider;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.impl.XSDImportImpl;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class WSDLComponentSelectionProvider extends XMLComponentSelectionProvider {
-    public static final String BUILT_IN_TYPE = "BUILT_IN_TYPE";
-    
-    private WSDLComponentFinder wsdlComponentFinder;
-    private WSDLComponentSelectionDialog dialog;
-    private WSDLComponentLabelProvider labelProvider;
-    private Definition definition;
-    private List lookupTagPaths;
-    private int kind;
-    
-    /*
-     * Takes in the IFile we are currently editing.
-     */
-    public WSDLComponentSelectionProvider(IFile file, Definition definition, int kind) {
-    	this.kind = kind;
-        List validExt = new ArrayList(1);
-        validExt.add("wsdl");
-        this.lookupTagPaths = getLookupTagPath();
-        wsdlComponentFinder = new WSDLComponentFinder(lookupTagPaths);
-        wsdlComponentFinder.setFile(file);
-        wsdlComponentFinder.setValidExtensions(validExt);
-        this.definition = definition;
-        labelProvider = new WSDLComponentLabelProvider();
-    }
-    
-    protected List getLookupTagPath()
-    {    	
-    	List list = new ArrayList();
-    	switch (kind)
-		{
-		case WSDLConstants.BINDING :
-		{
-			list.add("/definitions/binding");
-			break;
-		}
-		case WSDLConstants.PORT_TYPE :
-		{
-			list.add("/definitions/portType");
-			break;
-		}	
-		case WSDLConstants.MESSAGE :
-		{
-			list.add("/definitions/message");
-			break;
-		}   
-		case WSDLConstants.TYPE :
-		{
-			list.add("/definitions/types/schema/simpleType");
-			list.add("/definitions/types/schema/complexType");
-			list.add("/schema/complexType");
-			list.add("/schema/simpleType");
-			break;
-		}
-		case WSDLConstants.ELEMENT :
-		{
-			list.add("/definitions/types/schema/element");
-			list.add("/schema/element");
-			break;
-		}
-		}    	
-    	return list;
-    }
-
-    public WSDLComponentSelectionProvider(IFile file, Definition definition, int kind, List validExt) {
-        this(file, definition, kind);
-        wsdlComponentFinder.setValidExtensions(validExt);
-    }
-    
-    public void setDialog(WSDLComponentSelectionDialog dialog) {
-        this.dialog = dialog;
-    }
-    
-    public String getType(Object element) {
-        return null;
-    }
-    
-    private void createWSDLComponentObjects(IComponentList list, List inputComponents, String tagPath) {
-        Iterator it = inputComponents.iterator();
-        while (it.hasNext()) {
-            WSDLElement wsdlElement = (WSDLElement) it.next();
-            XMLComponentSpecification spec = new XMLComponentSpecification(tagPath); 
-            spec.addAttributeInfo("name", wsdlElement.getElement().getAttribute("name"));
-            spec.setTargetNamespace(wsdlElement.getEnclosingDefinition().getTargetNamespace());
-            
-            String normalizedFile = getNormalizedLocation(wsdlElement.getEnclosingDefinition().getLocation());
-            spec.setFileLocation(normalizedFile);
-            
-            addDataItemToTreeNode(list, spec);
-        }
-    }
-    
-    private void createXSDComponentObjects(IComponentList list, List inputComponents, String tagPath) {
-        Iterator it = inputComponents.iterator();
-        while (it.hasNext()) {
-            XSDNamedComponent xsdElement = (XSDNamedComponent) it.next();
-            XMLComponentSpecification spec = new XMLComponentSpecification(tagPath); 
-            spec.addAttributeInfo("name", xsdElement.getName());
-            spec.setTargetNamespace(xsdElement.getTargetNamespace());
-            
-            String normalizedFile = getNormalizedLocation(xsdElement.getSchema().getSchemaLocation());
-            spec.setFileLocation(normalizedFile);
-            
-            addDataItemToTreeNode(list, spec);
-        }
-    }
-        
-    public void getComponents(IComponentList list, boolean quick) {
-        if (quick) {
-            Iterator tags = lookupTagPaths.iterator();
-            while (tags.hasNext()) {
-                getComponentsQuick(list, (String) tags.next());
-            }
-        }
-        else {
-            // Grab components from workspace locations
-            String scope = "";
-            if (dialog != null) {
-                scope = dialog.getSearchScope();
-            }
-            
-            List comps = new ArrayList();
-            if (scope.equals(XMLComponentSelectionDialog.SCOPE_ENCLOSING_PROJECT)) {
-                comps = wsdlComponentFinder.getWorkbenchResourceComponents(XMLComponentFinder.ENCLOSING_PROJECT_SCOPE);
-            }
-            else if (scope.equals(XMLComponentSelectionDialog.SCOPE_WORKSPACE)) {
-                comps = wsdlComponentFinder.getWorkbenchResourceComponents(XMLComponentFinder.ENTIRE_WORKSPACE_SCOPE);            
-            }
-
-            Iterator compsIt = comps.iterator();
-            while (compsIt.hasNext()) {
-                XMLComponentSpecification item = (XMLComponentSpecification) compsIt.next();
-                addDataItemToTreeNode(list, item);
-            }
-        }
-    }
-    
-    private void getComponentsQuick(IComponentList list, String tagPath) {
-        // Grab components within the file
-        if (tagPath.equals("/definitions/binding")) {
-            // Grab explictly defined components
-            createWSDLComponentObjects(list, definition.getEBindings(), tagPath);
-            
-            // Grab directly imported components
-            Iterator importsIt = getWSDLFileImports(definition.getEImports()).iterator();
-            while (importsIt.hasNext()) {
-                Import importItem = (Import) importsIt.next();
-                Definition importDefinition = importItem.getEDefinition();
-                List importedComponents = importDefinition.getEBindings();
-                
-                createWSDLComponentObjects(list, importedComponents, tagPath);
-            }
-        }
-        else if (tagPath.equals("/definitions/portType")) {
-            // Grab explictly defined components
-            createWSDLComponentObjects(list, definition.getEPortTypes(), tagPath);
-            
-            // Grab directly imported components
-            Iterator importsIt = getWSDLFileImports(definition.getEImports()).iterator();
-            while (importsIt.hasNext()) {
-                Import importItem = (Import) importsIt.next();
-                Definition importDefinition = importItem.getEDefinition();
-                List importedComponents = importDefinition.getEPortTypes();
-                
-                createWSDLComponentObjects(list, importedComponents, tagPath);
-            }
-        }
-        else if (tagPath.equals("/definitions/message")) {
-            // Grab explictly defined components
-            createWSDLComponentObjects(list, definition.getEMessages(), tagPath);
-            
-            // Grab directly imported components
-            Iterator importsIt = getWSDLFileImports(definition.getEImports()).iterator();
-            while (importsIt.hasNext()) {
-                Import importItem = (Import) importsIt.next();
-                Definition importDefinition = importItem.getEDefinition();
-                List importedComponents = importDefinition.getEMessages();
-                
-                createWSDLComponentObjects(list, importedComponents, tagPath);
-            }
-        }
-        else if (tagPath.equals("/definitions/types/schema/complexType")) {
-            createXSDInlineTypesObjects(list, tagPath);
-        }
-        else if (tagPath.equals("/definitions/types/schema/simpleType")) {
-            createXSDInlineTypesObjects(list, tagPath);
-        }
-        else if (tagPath.equals("/definitions/types/schema/element")) {
-            createXSDElementObjects(list, tagPath);
-            createRegularImportXSDElementObjects(list);
-        }
-        else if (tagPath.equals("/schema/complexType")) {
-            createXSDInlineWrapperTypeObjects(list, tagPath);
-            
-            createXSDBuiltInTypeObjects(list);
-            createRegularImportXSDTypeObjects(list);
-        }
-        else if (tagPath.equals("/schema/simpleType")) {
-            createXSDInlineWrapperTypeObjects(list, tagPath);
-        }
-        else if (tagPath.equals("/schema/element")) {
-            createXSDInlineWrapperElementObjects(list, tagPath);
-        }
-    }
-    
-    private List getWSDLFileImports(List wsdlImports) {
-        List list = new ArrayList();
-        Iterator it = wsdlImports.iterator();
-        while (it.hasNext()) {
-            ImportImpl importItem = (ImportImpl) it.next();
-            importItem.importDefinitionOrSchema();          // Load if necessary
-            if (importItem.getESchema() == null) {
-                list.add(importItem);
-            }
-        }
-        
-        return list;
-    }
-    
-    private void createXSDBuiltInTypeObjects(IComponentList list) { 
-        for (int i = 0; i < XSDDOMHelper.dataType.length; i++) {
-            String builtIn = XSDDOMHelper.dataType[i][0];
-            XMLComponentSpecification spec = new XMLComponentSpecification(BUILT_IN_TYPE); 
-            spec.addAttributeInfo("name", builtIn);
-            spec.setTargetNamespace(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-
-//            String normalizedFile = getNormalizedLocation(definition.getLocation());
-//            spec.setFileLocation(normalizedFile);
-            spec.setFileLocation("Built-in");    
-            
-            addDataItemToTreeNode(list, spec);
-        }
-    }
-    
-    private void createRegularImportXSDTypeObjects(IComponentList list) {
-        // Handle regular imports(xsd and wsdl).
-        Iterator imports = definition.getEImports().iterator();
-        while (imports.hasNext()) {
-            Import importItem = (Import) imports.next();
-            ((ImportImpl) importItem).importDefinitionOrSchema();
-            List schemas = new ArrayList();
-            String complexPath = "";
-            String simplePath = "";
-            
-            if (importItem.getESchema() != null) {
-                // Import is a xsd file
-                schemas.add(importItem.getESchema());
-                complexPath = "/schema/complexType";
-                simplePath = "/schema/simpleType";
-            }
-            else if (importItem.getEDefinition() != null) {
-                // Import is a wsdl file
-                Definition definition = importItem.getEDefinition();
-                if (definition.getETypes() != null) {
-	                Iterator schemaIt = definition.getETypes().getEExtensibilityElements().iterator();
-	                while (schemaIt.hasNext()) {
-	                    XSDSchemaExtensibilityElement eeElement = (XSDSchemaExtensibilityElement) schemaIt.next();
-	                    schemas.add(eeElement.getSchema());
-	                    complexPath = "/definitions/types/schema/complexType";
-	                    simplePath = "/definitions/types/schema/simpleType";
-	                }
-                }
-            }
-            
-            if (schemas.size() > 0) {
-                Iterator schemaIt = schemas.iterator();
-                while (schemaIt.hasNext()) {
-                    Iterator typesIt = ((XSDSchema) schemaIt.next()).getTypeDefinitions().iterator();
-                    List complexList = new ArrayList();
-                    List simpleList = new ArrayList();
-                    while (typesIt.hasNext()) {
-                        Object component = typesIt.next();
-                        if (component instanceof XSDComplexTypeDefinition) {
-                            complexList.add(component);
-                        }
-                        else if (component instanceof XSDSimpleTypeDefinition) {
-                            simpleList.add(component);
-                        }
-                    }
-                    
-                    createXSDComponentObjects(list, complexList, complexPath);
-                    createXSDComponentObjects(list, simpleList, simplePath);
-                }
-            }
-        }
-    }
-    
-    private void createRegularImportXSDElementObjects(IComponentList list) {
-        // Handle regular imports(xsd and wsdl).
-        Iterator imports = definition.getEImports().iterator();
-        while (imports.hasNext()) {
-            Import importItem = (Import) imports.next();
-            ((ImportImpl) importItem).importDefinitionOrSchema();
-            List schemas = new ArrayList();
-            String path = "";
-            
-            if (importItem.getESchema() != null) {
-                // Import is a xsd file
-                schemas.add(importItem.getESchema());
-                path = "/schema/element";
-            }
-            else if (importItem.getEDefinition() != null) {
-                // Import is a wsdl file
-                Definition definition = importItem.getEDefinition();
-                if (definition.getETypes() != null) {
-	                Iterator schemaIt = definition.getETypes().getEExtensibilityElements().iterator();
-	                while (schemaIt.hasNext()) {
-	                    XSDSchemaExtensibilityElement eeElement = (XSDSchemaExtensibilityElement) schemaIt.next();
-	                    schemas.add(eeElement.getSchema());
-	                    path = "/definitions/types/schema/element";
-	                }
-                }
-            }
-            
-            if (schemas.size() > 0) {
-                Iterator schemaIt = schemas.iterator();
-                while (schemaIt.hasNext()) {
-                    List elementList = ((XSDSchema) schemaIt.next()).getElementDeclarations();
-                    createXSDComponentObjects(list, elementList, path);
-                }
-            }
-        }
-    }
-    
-    private void createXSDInlineTypesObjects(IComponentList list, String tagPath) {
-        // Handle inline schemas
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            if (schema.getTargetNamespace() != null && !schema.getTargetNamespace().equals("")) {
-                    List keepTypes = new ArrayList();
-                    Iterator typeIterator = schema.getTypeDefinitions().iterator();
-                    // Filter out unwanted Types
-                    if (tagPath.equals("/definitions/types/schema/complexType")) {
-                        while (typeIterator.hasNext()) {
-                            Object type = typeIterator.next();
-                            if (type instanceof XSDComplexTypeDefinition &&
-                                    ((XSDComplexTypeDefinition) type).getSchema().equals(schema)) {
-                                keepTypes.add(type);
-                            }
-                        }
-                    }
-                    else if (tagPath.equals("/definitions/types/schema/simpleType")) {
-                        while (typeIterator.hasNext()) {
-                            Object type = typeIterator.next();
-                            if (type instanceof XSDSimpleTypeDefinition &&
-                                    ((XSDSimpleTypeDefinition) type).getSchema().equals(schema)) {
-                                keepTypes.add(type);
-                            }
-                        }
-                    }
-                    
-                    createXSDComponentObjects(list, keepTypes, tagPath);
-            }
-        }
-    }
-
-    private void createXSDElementObjects(IComponentList list, String tagPath) {
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            List keepElements = new ArrayList();
-            if (schema.getTargetNamespace() != null && !schema.getTargetNamespace().equals("")) {
-                Iterator elementIt = schema.getElementDeclarations().iterator();
-                while (elementIt.hasNext()) {
-                    // Only look for elements explicitly defined in the Schema (not through imports).
-                    XSDElementDeclaration xsdElement = (XSDElementDeclaration) elementIt.next();
-                    if (xsdElement.getSchema().equals(schema)) {
-                        keepElements.add(xsdElement);
-                    }
-                }
-                
-                createXSDComponentObjects(list, keepElements, tagPath);
-            }
-        }
-    }
-    
-    private void createXSDInlineWrapperTypeObjects(IComponentList list, String tagPath) {
-        // Handle inline schemas
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            if (schema.getTargetNamespace() == null || schema.getTargetNamespace().equals("")) {
-                List keepTypes = new ArrayList();
-                
-                List imports = new ArrayList();
-                Iterator contents = schema.getContents().iterator();
-                while (contents.hasNext()) {
-                    XSDSchemaContent content = (XSDSchemaContent) contents.next();
-                    if (content instanceof XSDImport) {
-                        imports.add(content);             
-                    }
-                }
-                
-                Iterator importIterator = imports.iterator();
-                while (importIterator.hasNext()) {
-                    XSDImport importObject = (XSDImport) importIterator.next();
-                    XSDSchema importSchema = ((XSDImportImpl) importObject).importSchema();
-                    Iterator typesIt = importSchema.getTypeDefinitions().iterator();
-                    while (typesIt.hasNext()) {
-                        Object typeObject = typesIt.next();
-                        if (tagPath.equals("/schema/complexType") &&
-                            typeObject instanceof XSDComplexTypeDefinition) {
-                            keepTypes.add(typeObject);
-                        }
-                        else if (tagPath.equals("/schema/simpleType") &&
-                                 typeObject instanceof XSDSimpleTypeDefinition) {
-                            keepTypes.add(typeObject);
-                        }
-                    }
-                    
-                }
-
-                createXSDComponentObjects(list, keepTypes, tagPath);
-            }
-        }
-    }
-    
-    private void createXSDInlineWrapperElementObjects(IComponentList list, String tagPath) {
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            if (schema.getTargetNamespace() == null || schema.getTargetNamespace().equals("")) {
-                Iterator contents = schema.getContents().iterator();
-                List imports = new ArrayList();
-                while (contents.hasNext()) {
-                    XSDSchemaContent content = (XSDSchemaContent) contents.next();
-                    if (content instanceof XSDImport) {
-                        imports.add(content);             
-                    }
-                }
-                
-                Iterator importIterator = imports.iterator();
-                while (importIterator.hasNext()) {
-                    XSDImport importObject = (XSDImport) importIterator.next();
-                    XSDSchema importSchema = ((XSDImportImpl) importObject).importSchema();
-
-                    createXSDComponentObjects(list, importSchema.getElementDeclarations(), tagPath);    
-                }                
-            }
-        }
-    }
-
-//      private ITypeSystemProvider getTypeSystemProvider() {
-//            ITypeSystemProvider provider = WSDLEditorUtil.getInstance().getTypeSystemProvider(definition);
-//            if (provider instanceof ExtensibleTypeSystemProvider) {
-//                provider = (ExtensibleTypeSystemProvider) provider; 
-//            }
-//            else {
-//                return null;
-//            }
-//            
-//            return provider;
-//      }
-
-    
-  
-    public ILabelProvider getLabelProvider() {
-        return labelProvider;
-    }    
-    
-	public String getListTitle() {
-
-		switch (kind)
-		{
-		case WSDLConstants.BINDING :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_BINDINGS");
-		}
-		case WSDLConstants.PORT_TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_PORTTYPES");
-		}	
-		case WSDLConstants.MESSAGE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_MESSAGES");
-		}   
-		case WSDLConstants.TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_TYPES");
-		}
-		case WSDLConstants.ELEMENT :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_ELEMENTS");
-		}
-		}    	
-		return null;	   
-	}
-
-	public String getNameFieldTitle() {
-		switch (kind)
-		{
-		case WSDLConstants.BINDING :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_NAME");
-		}
-		case WSDLConstants.PORT_TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE_NAME");
-		}	
-		case WSDLConstants.MESSAGE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE_NAME");
-		}   
-		case WSDLConstants.TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE_NAME");
-		}
-		case WSDLConstants.ELEMENT :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT_NAME");
-		}
-		}    	
-		return null;	   
-	}
-    public class WSDLComponentLabelProvider extends XMLComponentSelectionLabelProvider {
-        public Image getImage(Object element) {
-            XMLComponentTreeObject specification = (XMLComponentTreeObject) element;
-            XMLComponentSpecification spec = (XMLComponentSpecification) specification.getXMLComponentSpecification().get(0);
-            if (spec.getTagPath().equals("/definitions/binding")) {
-                return WSDLEditorPlugin.getInstance().getImage("icons/binding_obj.gif");
-            }
-            else if (spec.getTagPath().equals("/definitions/portType")) {
-                return WSDLEditorPlugin.getInstance().getImage("icons/port_obj.gif");
-            }
-            else if (spec.getTagPath().equals("/definitions/message")) {
-                return WSDLEditorPlugin.getInstance().getImage("icons/message_obj.gif");
-            }
-            else if (spec.getTagPath().equals("/definitions/types/schema/complexType") ||
-                     spec.getTagPath().equals("/schema/complexType")) {
-                return XSDEditorPlugin.getXSDImage("icons/XSDComplexType.gif");
-            }
-            else if (spec.getTagPath().equals("/definitions/types/schema/simpleType") ||
-                     spec.getTagPath().equals("/schema/simpleType") ||
-                     spec.getTagPath().equals("BUILT_IN_TYPE")) {
-                return XSDEditorPlugin.getXSDImage("icons/XSDSimpleType.gif");
-            }
-            else if (spec.getTagPath().equals("/definitions/types/schema/element") ||
-                     spec.getTagPath().equals("/schema/element")) {
-                return XSDEditorPlugin.getXSDImage("icons/XSDElement.gif");
-            }
-    
-            return null;
-        }
-    }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLSetComponentHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLSetComponentHelper.java
deleted file mode 100644
index f14c6b1..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLSetComponentHelper.java
+++ /dev/null

@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementDeclarationAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddImportAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddWSISchemaImportAction;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSpecification;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-
-
-public class WSDLSetComponentHelper {
-    private Definition definition;
-    private IFile currentIFile;
-    
-    public WSDLSetComponentHelper(IFile iFile, Definition definition) {
-        currentIFile = iFile;
-        this.definition = definition;
-    }
-    
-    public void setWSDLComponent(WSDLElement inputElement, String property, XMLComponentSpecification spec) {
-        addImportIfNecessary(spec);
-        String componentObject = getPrefixedComponentName(spec);
-
-        org.w3c.dom.Element wsdlElement = inputElement.getElement();
-        
-        wsdlElement.setAttribute(property, componentObject); //$NON-NLS-1$
-    }
-    
-    public void setXSDTypeComponent(Part part, XMLComponentSpecification spec) {
-        if (!spec.getTagPath().equals(WSDLComponentSelectionProvider.BUILT_IN_TYPE)) {
-            addImportIfNecessary(spec);
-        }
-        String componentObject = getPrefixedComponentName(spec);
-        
-        ComponentReferenceUtil.setComponentReference((Part) part, true, componentObject);
-    }
-    
-    public void setXSDElementComponent(Part part, XMLComponentSpecification spec) {
-        addImportIfNecessary(spec);
-        String componentObject = getPrefixedComponentName(spec);
-        
-        ComponentReferenceUtil.setComponentReference((Part) part, false, componentObject);
-    }
-    
-    /*
-     * Return the prefixed component name described by the given
-     * XMLComponentSpecification object.
-     */
-    public String getPrefixedComponentName(XMLComponentSpecification spec) {
-        String name = (String) spec.getAttributeInfo("name");
-        List prefixes = getPrefixes(definition, spec.getTargetNamespace());
-        if (prefixes.size() > 0) {
-            name = prefixes.get(0) + ":" + name;
-        }
-        
-        return name;
-    }         
-          
-    private List getPrefixes(Definition definition, String namespace) {
-        List list = new ArrayList();
-        Map map = definition.getNamespaces();
-        for (Iterator i = map.keySet().iterator(); i.hasNext();) {
-            String prefix = (String) i.next();
-            String theNamespace = (String) map.get(prefix);
-            if (theNamespace != null && theNamespace.equals(namespace)) {
-                list.add(prefix);
-            }
-        }
-        return list;
-    }
-
-    
-    private void addImportIfNecessary(XMLComponentSpecification spec) {
-        boolean foundMatch = false;
-        
-        // Check itself
-        String currentFileLocation = currentIFile.getLocation().toString();
-        if (currentFileLocation.equals(spec.getFileLocation())) {
-            foundMatch = true;
-        }
-        
-        // Check regular Imports
-        if (!foundMatch) {
-            Iterator importsIt = definition.getEImports().iterator();
-            
-            while (importsIt.hasNext()) {
-                String importLocation = "";
-                Import importItem = (Import) importsIt.next();
-                if (importItem.getESchema() != null) {
-                    XSDSchema schema = importItem.getESchema();
-                    importLocation = getNormalizedLocation(schema.getSchemaLocation());
-                }
-                else {            
-                    Definition importDefinition = importItem.getEDefinition();
-                    importLocation = getNormalizedLocation(importDefinition.getLocation()); 
-                }            
-    
-                if (importLocation.equals(spec.getFileLocation())) {
-                    foundMatch = true;
-                    break;
-                }
-            }
-        }
-        
-        // Check inline Schemas
-        if (!foundMatch) {
-            List imports = new ArrayList();
-            
-            if (definition.getETypes() != null) {
-	            Iterator it = definition.getETypes().getEExtensibilityElements().iterator();
-	            while (it.hasNext()) {
-	                XSDSchemaExtensibilityElement eeElement = (XSDSchemaExtensibilityElement) it.next();
-	                XSDSchema schema = eeElement.getSchema();
-	                if (schema.getTargetNamespace() == null || schema.getTargetNamespace().equals("")) {                    
-	                    Iterator contents = schema.getContents().iterator();
-	                    while (contents.hasNext()) {
-	                        XSDSchemaContent content = (XSDSchemaContent) contents.next();
-	                        if (content instanceof XSDImport) {
-	                            imports.add(content);             
-	                        }
-	                    }
-	                }
-	            }
-            }
-            
-            Iterator importIt = imports.iterator();
-            while (importIt.hasNext()) {
-                XSDImport importItem = (XSDImport) importIt.next();
-                XSDSchema resolvedSchema = importItem.getResolvedSchema();
-                String resolvedString = resolvedSchema.getSchemaLocation();
-                String importLocation = getNormalizedLocation(resolvedString);
-                
-                if (importLocation.equals(spec.getFileLocation())) {
-                    foundMatch = true;
-                    break;
-                }
-            }            
-        }
-        
-        if (!foundMatch) {
-            boolean wsiStyleImport = isXSDSchemaFile(spec);
-            if (wsiStyleImport) {
-                AddElementDeclarationAction action = new AddElementDeclarationAction(definition, spec.getTargetNamespace(), "xsd");
-                action.run();
-             
-                String location = URIHelper.getRelativeURI(new Path(spec.getFileLocation()), currentIFile.getLocation());
-                AddWSISchemaImportAction addImport = new AddWSISchemaImportAction(definition, spec.getTargetNamespace(), location);
-                addImport.run();
-            }
-            else {
-                String newSelectedFileLoc = spec.getFileLocation();
-                String currentFileLoc = getNormalizedLocation(definition.getLocation());
-                String relativeLoc = ComponentReferenceUtil.computeRelativeURI(newSelectedFileLoc, currentFileLoc, true);
-                
-                org.w3c.dom.Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-                String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-                String namespace = spec.getTargetNamespace();
-                
-                AddImportAction addImportAction = new AddImportAction(null, definition, definitionElement, prefix, namespace, relativeLoc);
-                addImportAction.run();            
-                
-                String uniquePrefix = getUniquePrefix(definition, prefix);            
-                definitionElement.setAttribute("xmlns:" + uniquePrefix, namespace);
-            }
-        }
-    }
-    /*
-     * Try to determine if the passed in XMLComponentSpecification refers to
-     * an XSD or WSDL file.  If it's an XSD, return true.
-     */
-    private boolean isXSDSchemaFile(XMLComponentSpecification spec) {
-        String fileLocation = spec.getFileLocation();
-        int periodIndex = fileLocation.lastIndexOf(".");
-        
-        if (periodIndex > 0) {
-            String extension = fileLocation.substring(periodIndex + 1);
-            if (extension.equalsIgnoreCase("xsd")) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-    
-    private String getUniquePrefix(Definition definition, String initPrefix) {
-      String uniquePrefix;
-      Map map = definition.getNamespaces();
-
-      if (definition.getNamespace(initPrefix) == null) {
-        uniquePrefix = initPrefix;
-      }
-      else {// if used, then try to create a unique one
-        String tempPrefix = initPrefix;
-        int i = 1;
-        while(map.containsKey(tempPrefix + i)) {
-          i++;
-        }
-        uniquePrefix = tempPrefix + i;
-      }
-      return uniquePrefix;    
-    } 
-    
-    private String getNormalizedLocation(String location) {
-        try {
-            URL url = new URL(location);
-            URL resolvedURL = Platform.resolve(url);
-            location = resolvedURL.getPath();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        
-        return location; 
-      }
-    
-    
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ExtensibilityItemTreeProviderRegistry.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ExtensibilityItemTreeProviderRegistry.java
deleted file mode 100644
index 326428b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ExtensibilityItemTreeProviderRegistry.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-
-/**
- * This class reads the plugin manifests and registers each extensibility item tree provider
- */
-public class ExtensibilityItemTreeProviderRegistry extends NSKeyedExtensionRegistry
-{
-  protected static final String LABEL_PROVIDER_PROPERTY = "labelProviderClass";
-  protected static final String CONTENT_PROVIDER_PROPERTY = "contentProviderClass";
-  protected static final String[] ATT_NAMES = { "labelProviderClass", "contentProviderClass" };
-
-  public ILabelProvider getLabelProvider(String namespace)
-  {
-    return (ILabelProvider) getProperty(namespace, LABEL_PROVIDER_PROPERTY);
-  }
-
-  public ITreeChildProvider getContentProvider(String namespace)
-  {
-    return (ITreeChildProvider) getProperty(namespace, CONTENT_PROVIDER_PROPERTY);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IDetailsViewerProvider.java
deleted file mode 100644
index d1f474f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IDetailsViewerProvider.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-
-public interface IDetailsViewerProvider
-{                                      
-  public Object getViewerKey(Object modelObject);
-  public Viewer createViewer(Object modelObject, Composite parent, IEditorPart editorPart);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IEditPartProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IEditPartProvider.java
deleted file mode 100644
index 01c8237..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IEditPartProvider.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.w3c.dom.Node;
-
-public interface IEditPartProvider
-{                                      
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IMenuActionContributor.java
deleted file mode 100644
index a1ff915..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IMenuActionContributor.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.w3c.dom.Node;
-
-public interface IMenuActionContributor
-{                                      
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IModelQueryContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IModelQueryContributor.java
deleted file mode 100644
index 95d9a75..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IModelQueryContributor.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-                   
-// Note this class will likely be removed in the future when the ModelQuery's extension mechanism is updated
-//
-public interface IModelQueryContributor
-{                                      
-  public void setModel(IDOMModel xmlModel);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeAssociationProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeAssociationProvider.java
deleted file mode 100644
index ee956ce..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeAssociationProvider.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public interface INodeAssociationProvider
-{                    
-  public Object getModelObject(Object parentModelObject, Element[] elementChain, int start, int[] end);
-  public Node getNode(Object modelObject); 
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeReconciler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeReconciler.java
deleted file mode 100644
index 86cfebb..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeReconciler.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.w3c.dom.Element;
-
-
-public interface INodeReconciler
-{
-  public void notifyChanged(Object modelObject, Element element, int eventType, Object feature, Object oldValue, Object newValue, int index);                                         
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITreeChildProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITreeChildProvider.java
deleted file mode 100644
index aac380e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITreeChildProvider.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-/**
- * This class allows extension writers to provide specialize tree content behaviour.
- * It is intended to behave similar to the org.eclipse.jface.viewers.ITreeContentProvider.
- * The major difference is that this class is simplified so that only one method is involved.
- * 
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)  	
- */
-public interface ITreeChildProvider
-{
-	public Object[] getChildren(Object object);
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITypeSystemProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITypeSystemProvider.java
deleted file mode 100644
index 4700ede..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITypeSystemProvider.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.xsd.XSDSchema;
-
-public interface ITypeSystemProvider
-{                                                      
-  public static final int UNKNOWN_TYPE = 0x0;
-  public static final int BUILT_IN_TYPE = 0x1;
-  public static final int USER_DEFINED_SIMPLE_TYPE = 0x2;
-  public static final int USER_DEFINED_COMPLEX_TYPE = 0x4;
-
-  public List getAvailableTypeNames(Definition definition, int typeNameCategory);
-  public List getAvailableElementNames(Definition definition);  
-  public List getAvailableTypes(Definition definition, XSDSchema schema, int typeNameCategory);
-  public int getCategoryForTypeName(Definition definition, String typeName);
-  public List getPrefixedNames(Definition definition, String namespace, String localName);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/NSKeyedExtensionRegistry.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/NSKeyedExtensionRegistry.java
deleted file mode 100644
index 03b7ea4..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/NSKeyedExtensionRegistry.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import java.util.HashMap;
-
-public class NSKeyedExtensionRegistry
-{
-  protected HashMap map = new HashMap();
-  private static final String PLUGIN_LOADING_ERROR = "PLUGIN_LOADING_ERROR";
-
-  public NSKeyedExtensionRegistry()
-  {
-  }
-
-  public void put(String namespaceURI, String className, ClassLoader classLoader)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    if (info == null)
-    {
-      info = new SinglePropertyExtensionInfo(className, classLoader);
-      map.put(namespaceURI, info);
-    }
-  }
-
-  public void put(String namespaceURI, HashMap propertyToClassNameMap, ClassLoader classLoader)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    if (info == null)
-    {
-      info = new MultiPropertyExtensionInfo(propertyToClassNameMap, classLoader);
-      map.put(namespaceURI, info);
-    }
-  }
-
-  /**
-   * 
-   * @deprecated
-   */
-  public Object get(String namespaceURI)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    return info != null ? info.getObject("") : null;
-  }
-
-  public Object getProperty(String namespaceURI, String property)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    return info != null ? info.getObject(property) : null;
-  }
-
-  private abstract class ExtensionInfo
-  {
-    protected ClassLoader classLoader;
-
-    public ExtensionInfo(ClassLoader classLoader)
-    {
-      this.classLoader = classLoader;
-    }
-
-    public abstract Object getObject(String property);
-  }
-
-  private class SinglePropertyExtensionInfo extends ExtensionInfo
-  {
-    protected String className;
-    protected Object object;
-    protected boolean error;
-
-    public SinglePropertyExtensionInfo(String className, ClassLoader classLoader)
-    {
-      super(classLoader);
-      this.className = className;
-    }
-
-    public Object getObject(String property)
-    {
-      if (object == null)
-      {
-        try
-        {
-          Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-          object = theClass.newInstance();
-        }
-        catch (Exception e)
-        {
-          object = PLUGIN_LOADING_ERROR;
-          e.printStackTrace();
-        }
-      }
-      return object != PLUGIN_LOADING_ERROR ? object : null;
-    }
-  }
-
-  private class MultiPropertyExtensionInfo extends ExtensionInfo
-  {
-    protected HashMap propertyToClassNameTable;
-    protected HashMap propertyToObjectTable = new HashMap();
-
-    public MultiPropertyExtensionInfo(HashMap propertToClassNameTable, ClassLoader classLoader)
-    {
-      super(classLoader);
-      this.propertyToClassNameTable = propertToClassNameTable;
-    }
-
-    public Object getObject(String property)
-    {
-      Object result = null;
-      String className = (String) propertyToClassNameTable.get(property);
-      if (className != null)
-      {
-        result = propertyToObjectTable.get(property);
-        if (result == null)
-        {
-          try
-          {
-            Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-            result = theClass.newInstance();
-            propertyToObjectTable.put(property, result);
-          }
-          catch (Exception e)
-          {
-            propertyToObjectTable.put(property, PLUGIN_LOADING_ERROR);
-            result = PLUGIN_LOADING_ERROR;
-            e.printStackTrace();
-          }
-        }
-      }
-	  return result != PLUGIN_LOADING_ERROR ? result : null;      
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtension.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtension.java
deleted file mode 100644
index 5bbaf6c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtension.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public interface WSDLEditorExtension
-{                                          
-  public static final int OUTLINE_TREE_CONTENT_PROVIDER = 1;    // req'd for model based ext
-  public static final int OUTLINE_LABEL_PROVIDER = 2;           // req'd for model based ext
-
-  public static final int MENU_ACTION_CONTRIBUTOR = 3;          // node
-  public static final int DETAILS_VIEWER_PROVIDER = 4;          // node
-
-  public static final int EDIT_PART_FACTORY = 5;                // req'd for model based ext
-  public static final int TYPE_SYSTEM_PROVIDER = 6;             // req'd for type system ext
-  public static final int NODE_RECONCILER = 7;                  // req'd for model based ext
-  public static final int NODE_ASSOCIATION_PROVIDER = 8;        // req'd for model based ext
-  public static final int MODEL_QUERY_CONTRIBUTOR = 9;          // req'd for model based ext
-
-  public static final int PROPERTY_SOURCE_PROVIDER = 10;        // req'd for model based ext
-  public static final int PROPERTY_SECTION_DESCRIPTOR_PROVIDER = 11;  // req'd for model based ext
-  public static final int XSD_DELETE_ACTION = 12;
-  
-  boolean isExtensionTypeSupported(int type);
-  boolean isApplicable(Object modelObject);
-  Object createExtensionObject(int type, WSDLEditor wsdlEditor);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtensionRegistry.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtensionRegistry.java
deleted file mode 100644
index f8e2435..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtensionRegistry.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-        
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public class WSDLEditorExtensionRegistry
-{                   
-  //protected List classNameClassLoaderPairList = new ArrayList();
-  //protected HashMap treeProviderMap = new HashMap(); 
-  protected List registeredExtensionList = new ArrayList();
-
-  public WSDLEditorExtensionRegistry()
-  {
-    add(new WSDLEditor.BuiltInWSDLEditorExtension());
-  }            
-
-  //public ExtensibilityItemTreeProvider getExtensibilityItemTreeProvider(String namespaceURI)
-  //{
-  //  return (ExtensibilityItemTreeProvider)treeProviderMap.get(namespaceURI);
-  //}
-
-  //public void putExtensibilityItemTreeProvider(String namespaceURI, ExtensibilityItemTreeProvider treeProvider)
-  //{
-  //  treeProviderMap.put(namespaceURI, treeProvider);
-  //}
-  
-  public List getRegisteredExtensions()
-  {                            
-    return registeredExtensionList;                                
-  }                       
-
-  public WSDLEditorExtension getApplicableExtension(int type, Object object)
-  { 
-    WSDLEditorExtension result = null;                                    
-    for (Iterator i = getRegisteredExtensions().iterator(); i.hasNext(); )
-    {
-      WSDLEditorExtension extension = (WSDLEditorExtension)i.next();
-      if (extension.isExtensionTypeSupported(type) && extension.isApplicable(object))
-      { 
-        result = extension;
-        break;
-      }
-    }         
-    return result;                                                           
-  }
-
-  public WSDLEditorExtension[] getRegisteredExtensions(int type)
-  { 
-    List list = new ArrayList();                                    
-    for (Iterator i = getRegisteredExtensions().iterator(); i.hasNext(); )
-    {
-      WSDLEditorExtension extension = (WSDLEditorExtension)i.next();
-      if (extension.isExtensionTypeSupported(type))
-      { 
-        list.add(extension);
-      }
-    } 
-
-    WSDLEditorExtension[] result = new WSDLEditorExtension[list.size()];
-    int count = 0;
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    { 
-      WSDLEditorExtension extension = (WSDLEditorExtension)i.next();
-      result[count] = extension;
-      count++;
-    }
-    return result;                          
-  }
-             
-  public void addAsFirst(WSDLEditorExtension extension)
-  {               
-    getRegisteredExtensions().add(0, extension);
-  }    
-
-  public void add(WSDLEditorExtension extension)
-  {               
-    getRegisteredExtensions().add(extension);
-  }          
-
-  public void add(ClassLoader classLoader, String className)
-  {                      
-    // TODO... consider defered instantiation of WSDLEditorExtensions         
-    try
-    {       
-      Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-      WSDLEditorExtension extension = (WSDLEditorExtension)theClass.newInstance();
-      registeredExtensionList.add(extension);
-    }
-    catch (Exception e)
-    {
-    	e.printStackTrace();
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java
deleted file mode 100644
index 61bf0d2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-public interface ExtensiblityElementFilter 
-{
-  public boolean isValidContext(Element parentElement, String localName);     
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java
deleted file mode 100644
index 859259c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-
-public class HttpExtensiblityElementFilter implements ExtensiblityElementFilter
-{  
-  public HttpExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-    
-    String parentElementName = parentElement.getLocalName();
-	if (parentElementName.equals("binding"))
-	{
-	  result = localName.equals("binding"); 	  
-	}	  
-	else if (parentElementName.equals("operation"))
-	{
-	  result = localName.equals("operation"); 
-	}
-	else if (parentElementName.equals("input") || 
-	         parentElementName.equals("output"))
-	{
-	  result = localName.equals("body") || 
-	           localName.equals("header"); 	  
-	}	
-	else if (parentElementName.equals("fault"))
-	{
-	  result = localName.equals("fault"); 	  
-	}
-	else if (parentElementName.equals("port"))
-	{
-	  result = localName.equals("address"); 	  
-	}	
-    
-    return result;
-  }     
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java
deleted file mode 100644
index eaa701f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-public class MimeExtensiblityElementFilter implements ExtensiblityElementFilter
-{   
-  private static final String MIME_NAMESPACE_URI="http://schemas.xmlsoap.org/wsdl/mime/";
-  public MimeExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-
-    String parentElementName = parentElement.getLocalName();
-    String parentElementNamespace = parentElement.getNamespaceURI();
-
-  	if (WSDLConstants.WSDL_NAMESPACE_URI.equals(parentElementNamespace))
-  	{
-    	if (parentElementName.equals("input") || parentElementName.equals("output"))
-    	{
-    	  	result = localName.equals("content") ||
-				     localName.equals("multipartRelated") ||
-				     localName.equals("mimeXml");    	  	
-    	}
-  	}
-  	else if (MIME_NAMESPACE_URI.equals(parentElementNamespace))
-  	{
-		result = true;				
-  	}
-    return result;
-  }     
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java
deleted file mode 100644
index fbfe95c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-public class SoapExtensiblityElementFilter implements ExtensiblityElementFilter
-{   
-  public SoapExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-
-    String parentElementName = parentElement.getLocalName();
-	if (parentElementName.equals("binding"))
-	{
-	  result = localName.equals("binding"); 	  
-	}	  
-	else if (parentElementName.equals("operation"))
-	{
-	  result = localName.equals("operation"); 
-	}
-	else if (parentElementName.equals("input") || 
-	         parentElementName.equals("output"))
-	{
-	  result = localName.equals("body") || 
-	           localName.equals("header"); 	  
-	}	
-	else if (parentElementName.equals("fault"))
-	{
-	  result = localName.equals("fault"); 	  
-	}
-	else if (parentElementName.equals("port"))
-	{
-	  result = localName.equals("address"); 	  
-	}	
-
-    return result;
-  }     
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java
deleted file mode 100644
index c9d3aec..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-public class XSDExtensiblityElementFilter implements ExtensiblityElementFilter
-{   
-  public XSDExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-    String parentElementName = parentElement.getLocalName();
-	if (parentElementName.equals("types"))
-	{
-	  result = localName.equals("schema"); 	  
-	}	  	
-    return result;
-  }     
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/InteractorHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/InteractorHelper.java
deleted file mode 100644
index 4709c16..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/InteractorHelper.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editparts;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseListener;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.Interactor;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IExpandable;
-
-                 
-// hooks up an interactor with an edit part and the figure that needs to be expanded and collapsed
-//
-public class InteractorHelper implements MouseListener
-{                             
-  protected boolean needToPerformDefaultExpansion = true;
-  protected EditPart editPart;               
-  protected Interactor interactor;                                                        
-  protected IExpandable expandable;
-
-  public InteractorHelper(EditPart editPart, Interactor interactor, IExpandable expandable)
-  {                          
-    this.editPart = editPart;
-    this.interactor = interactor;
-    this.expandable = expandable;
-    interactor.addMouseListener(this);
-    expandable.setExpanded(interactor.isExpanded());
-  }                  
-
-  public void setExpanded(boolean isExpanded)
-  {
-    interactor.setExpanded(isExpanded);
-    interactorExpansionChanged(isExpanded);
-  }
-  
-  protected void interactorExpansionChanged(boolean isInteractorExpanded)
-  { 
-    expandable.setExpanded(isInteractorExpanded);
-    expandable.setVisible(isInteractorExpanded);
-
-    editPart.refresh();
-
-    EditPart root = editPart.getRoot();
-    if (root instanceof AbstractGraphicalEditPart)
-    {                               
-      IFigure rootFigure = ((AbstractGraphicalEditPart)root).getFigure();
-      invalidateAll(rootFigure);
-      rootFigure.validate();
-      rootFigure.repaint();
-    }      
-  }
-
-         
-  protected void invalidateAll(IFigure figure)
-  {
-    figure.invalidate();   
-    LayoutManager manager = figure.getLayoutManager();
-    if (manager != null)
-    {
-      manager.invalidate();
-    }
-    for (Iterator i = figure.getChildren().iterator(); i.hasNext(); )
-    {
-      IFigure child = (IFigure)i.next();
-      invalidateAll(child);
-    }
-  } 
-     
-
-  // implements MouseListener
-  //
-  public void mouseDoubleClicked(MouseEvent me) 
-  {      
-  }
- 
-  public void mousePressed(MouseEvent me)
-  {      
-    boolean newExpansionState = !interactor.isExpanded();
-    interactor.setExpanded(newExpansionState);
-    interactorExpansionChanged(newExpansionState);
-  }
- 
-  public void mouseReleased(MouseEvent me)  
-  { 
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/MultiContentPaneEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/MultiContentPaneEditPart.java
deleted file mode 100644
index 115179a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/MultiContentPaneEditPart.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editparts;
-                               
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-
-
-public abstract class MultiContentPaneEditPart extends AbstractGraphicalEditPart
-{
-  protected IFigure[] contentPanes;
-  protected int[] contentPaneIndexAdjustment;
-                         
-  protected IFigure[] initContentPanes()
-  {                             
-    return null;
-  }    
-
-  protected int getContentPane(Object model)
-  {  
-    return 0;
-  }
-    
-  protected List sortByContentPane(List list)
-  {                    
-    return list;
-  }  
-
-
-  protected void setFigure(IFigure figure)
-  {
-	  super.setFigure(figure);
-    contentPanes = initContentPanes();   
-    if (contentPanes != null)
-    {
-      contentPaneIndexAdjustment = new int[contentPanes.length];
-    }
-  }        
-     
-
-  protected void updateContentPaneInfoIndexAdjustment(List list)
-  { 
-    int index = 0;  
-    int listSize = list.size();
-
-    for (int  j = 0; j < contentPanes.length; j++)
-    { 
-      contentPaneIndexAdjustment[j] = index;
-      while (index < listSize)
-      {              
-        Object model = list.get(index);
-        if (getContentPane(model) != j)
-        {
-          break;
-        }                          
-        index++;
-      }
-    }
-  }
-                            
-
-  protected void refreshChildren()
-  {                        
-    if (contentPanes != null)
-    {
-      List sortedList = sortByContentPane(getModelChildren());
-      updateContentPaneInfoIndexAdjustment(sortedList);
-    }
-    super.refreshChildren();
-  }
-                            
-
-  protected void addChildVisual(EditPart childEditPart, int index)
-  {                
-    if (contentPanes != null)
-    {
-      int j = getContentPane(childEditPart.getModel());
-      if (contentPaneIndexAdjustment.length > j)
-      {
-        int adjustedIndex = index - contentPaneIndexAdjustment[j];
-        if (adjustedIndex >= 0)
-        {
-  	      IFigure child = ((GraphicalEditPart)childEditPart).getFigure();
-  	      contentPanes[j].add(child, adjustedIndex);
-        }
-      }
-    }  
-    else
-    {
-      super.addChildVisual(childEditPart, index);
-    }
-  }
-
-  
-  protected void removeChildVisual(EditPart childEditPart)
-  {                         
-    if (contentPanes != null)
-    {
-      int j = getContentPane(childEditPart.getModel());
-      IFigure child = ((GraphicalEditPart)childEditPart).getFigure();
-      contentPanes[j].remove(child);  
-    }    
-    else
-    {
-      super.removeChildVisual(childEditPart);
-    }
-  }
-
-  protected void reorderChild(EditPart editpart, int index)
-  {
-    removeChildVisual(editpart);
-    List children = getChildren();
-    children.remove(editpart);
-    children.add(index, editpart);
-    addChildVisual(editpart, index);
-  }
-}     
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/IDirectEditPolicyDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/IDirectEditPolicyDelegate.java
deleted file mode 100644
index e2a84e8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/IDirectEditPolicyDelegate.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editpolicies;
-   
-import org.eclipse.jface.viewers.CellEditor;
-
-public interface IDirectEditPolicyDelegate
-{       
-  public void performEdit(CellEditor cellEditor);  
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/TextCellEditorManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/TextCellEditorManager.java
deleted file mode 100644
index 7bac729..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/TextCellEditorManager.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editpolicies;
-                                                  
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-public abstract class TextCellEditorManager extends DirectEditManager implements IDirectEditPolicyDelegate
-{
-  protected Label label;                                 
-
-  public TextCellEditorManager(GraphicalEditPart source,	Label label)
-  {
-	  super(source, TextCellEditor.class, new InternalCellEditorLocator(label));
-    this.label = label;     
-  }
-
-  protected void initCellEditor() 
-  {                                             
-  	String initialLabelText = label.getText();
-  	getCellEditor().setValue(initialLabelText);
-  	Text text = (Text)getCellEditor().getControl();
-  	text.setFont(label.getFont());
-    text.setForeground(label.getForegroundColor());
-    text.setBackground(label.getBackgroundColor());
-  	text.selectAll();
-  }	          
-
-  protected abstract void performModify(String value);
-    
-  public static class InternalCellEditorLocator implements CellEditorLocator
-  {
-    protected Label label;
-
-    public InternalCellEditorLocator(Label label)
-    {
-      this.label = label;
-    }                   
-
-    public void relocate(CellEditor celleditor) 
-    {
-      Text text = (Text)celleditor.getControl();  
-	    Point sel = text.getSelection();
-	    Point pref = text.computeSize(-1, -1);
-	    Rectangle rect = label.getTextBounds().getCopy();
-	    label.translateToAbsolute(rect);
-	    text.setBounds(rect.x-4, rect.y-1, pref.x+1, pref.y+1);	
-	    text.setSelection(0);
-	    text.setSelection(sel); 
-    }
-  }    
-
-  // implements DirectEditPolicyDelegate
-  // 
-  public void performEdit(CellEditor cellEditor)
-  {
-    performModify((String)cellEditor.getValue());
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/CenterLayout.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/CenterLayout.java
deleted file mode 100644
index f83f385..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/CenterLayout.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.figures;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-
-/**
- * Figures using the StackLayout as their layout manager have
- * their children placed on top of one another. Order of 
- * placement is determined by the order in which the children
- * were added, first child added placed on the bottom.
- */
-public class CenterLayout	extends AbstractLayout
-{       
-  public static final int ALIGNMENT_TOP = 1;
-  public static final int ALIGNMENT_CENTER = 2;
-  public static final int ALIGNMENT_BOTTOM = 3;
-                        
-  protected int spacing;
-  protected int verticalAlignment = ALIGNMENT_CENTER;
-  
-  public CenterLayout(){}
-  public CenterLayout(int spacing){ this.spacing = spacing; }
-  
- 
-  /**
-   * Calculates and returns the preferred size of the input container.
-   * This is the size of the largest child of the container, as all
-   * other children fit into this size.
-   *
-   * @param figure  Container figure for which preferred size is required.
-   * @return  The preferred size of the input figure.
-   */
-//  protected Dimension calculatePreferredSize(IFigure figure)
-  protected Dimension calculatePreferredSize(IFigure figure, int width, int height)
-  {
-  	Dimension d = calculatePreferredClientAreaSize(figure);
-//  	d.expand(figure.getInsets().getWidth(),
-//  	         figure.getInsets().getHeight());
-    d.expand(width, height);
-  	d.union(getBorderPreferredSize(figure));
-  	return d;
-  }
-  
-  protected Dimension calculatePreferredClientAreaSize(IFigure figure)
-  {
-  	Dimension d = new Dimension();
-  	List children = figure.getChildren();
-  	for (Iterator i = children.iterator(); i.hasNext(); )
-    {
-  		IFigure child = (IFigure)i.next();
-      Dimension childSize = child.getPreferredSize();
-      d.height += childSize.height;
-      d.width = Math.max(childSize.width, d.width);
-  	}	                    
-    int childrenSize = children.size();       
-    if (childrenSize > 0)
-    {
-      d.height += spacing * children.size() - 1;
-    }
-  	return d;
-  }
-  
-  /*
-   * Returns the minimum size required by the input container.
-   * This is the size of the largest child of the container, as all
-   * other children fit into this size.
-   */
-  // TODO GEF PORT
-  public Dimension getMinimumSize(IFigure figure, int width, int height)
-  {
-  	Dimension d = new Dimension();
-  	List children = figure.getChildren();
-  	IFigure child;
-  	for (int i=0; i < children.size(); i++)
-    {
-  		child = (IFigure)children.get(i);
-  		d.union(child.getMinimumSize());
-  	}
-  	d.expand(figure.getInsets().getWidth(), figure.getInsets().getHeight());
-  	return d;
-  }
-  // TODO GEF PORT
-  public Dimension getPreferredSize(IFigure figure, int width, int height)
-  {
-  	return calculatePreferredSize(figure, figure.getInsets().getWidth(), figure.getInsets().getHeight());
-  }
-  
-  
-  public void layout(IFigure figure)
-  {
-  	Rectangle r = figure.getClientArea();
-  	List children = figure.getChildren();
-    
-    Dimension preferredClientAreaSize = calculatePreferredClientAreaSize(figure);
-  
-    int x = r.x + (r.width - preferredClientAreaSize.width) / 2;
-    int y = 0;
-  
-    switch (getVerticalAlignment())
-    {
-      case ALIGNMENT_TOP :  
-      {
-        y = r.y;
-        break;
-      }
-      case ALIGNMENT_CENTER :
-      {
-        y = r.y + (r.height - preferredClientAreaSize.height) / 2;
-        break;
-      }
-      case ALIGNMENT_BOTTOM :
-      {
-        y = r.y + (r.height - preferredClientAreaSize.height);
-        break;
-      }
-    }
-        
-  	for (Iterator i = children.iterator(); i.hasNext(); )
-    {
-  		IFigure child = (IFigure)i.next();
-      Dimension childSize = child.getPreferredSize();
-  		child.setBounds(new Rectangle(x, y, childSize.width, childSize.height));
-      y += childSize.height + spacing;
-  	}
-  }
-  
-  /**
-   * @param verticalAlignment The verticalAlignment to set.
-   */
-  public void setVerticalAlignment(int verticalAlignment)
-  {
-    this.verticalAlignment = verticalAlignment;
-  }
-  
-  protected int getVerticalAlignment()
-  {
-    return verticalAlignment;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/IGraphNodeFigure.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/IGraphNodeFigure.java
deleted file mode 100644
index bd9d85a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/IGraphNodeFigure.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.figures;
-            
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-
-public interface IGraphNodeFigure extends IFigure
-{                       
-  public static final int UP_CONNECTION = 1; 
-  public static final int DOWN_CONNECTION = 2;
-  public static final int LEFT_CONNECTION = 3;
-  public static final int RIGHT_CONNECTION = 4;
-
-  public IFigure getSelectionFigure();
-  public IFigure getConnectionFigure();
-  public List getConnectedFigures(int type);
-  public int getConnectionType();      
-  public void addConnectedFigure(IGraphNodeFigure figure);
-  public void removeConnectedFigure(IGraphNodeFigure figure);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/Interactor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/Interactor.java
deleted file mode 100644
index 3e27c03..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/Interactor.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.figures;
-            
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Interactor the +/- control commonly found in trees
- */
-public class Interactor extends RectangleFigure
-{
-  protected boolean isExpanded;
-
-  public Interactor()
-  {
-    super(); 
-    setPreferredSize(new Dimension(9, 9));               
-  }  
-
-  public void setExpanded(boolean isExpanded)
-  {                                         
-    this.isExpanded = isExpanded;
-    repaint();
-  }
-
-  public boolean isExpanded()
-  {
-    return isExpanded;
-  }
-    
-  protected void fillShape(Graphics g)
-  {
-    super.fillShape(g);
-    Rectangle r = getBounds();                          
-    int mx = r.x + r.width / 2;
-    int my = r.y + r.height / 2;    
-    int s = 2;       
-    g.drawLine(r.x + s, my, r.x + r.width - s - 1, my); 
-    if (!isExpanded)
-    {
-      g.drawLine(mx, r.y + s, mx, r.y + r.height - s -1);
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/RoundedLineBorder.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/RoundedLineBorder.java
deleted file mode 100644
index b1bfad4..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/figures/RoundedLineBorder.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.figures;
-            
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.swt.graphics.Color;
-
-public class RoundedLineBorder extends LineBorder
-{               
-  protected int arcLength;   
-  protected int lineStyle = Graphics.LINE_SOLID;
-
-  public RoundedLineBorder(Color c, int width, int arcLength)
-  {
-	  super(c, width);     
-    this.arcLength = arcLength;
-  }
-
-  public RoundedLineBorder(int width, int arcLength)
-  {
-	  super(width);     
-    this.arcLength = arcLength;
-  }
-  
-  public RoundedLineBorder(Color c, int width, int arcLength, int lineStyle)
-  {
-    super(c, width);
-    this.arcLength = arcLength;
-    this.lineStyle = lineStyle;
-  }
-
-  public RoundedLineBorder(int width, int arcLength, int lineStyle)
-  {
-    super(width);
-    this.arcLength = arcLength;
-    this.lineStyle = lineStyle;
-  }
-
-  public void paint(IFigure figure, Graphics graphics, Insets insets)
-  {
-	  tempRect.setBounds(getPaintRectangle(figure, insets));
-    int width = getWidth();
-    Color color = getColor();
-  	if (width%2 == 1)
-    {
-		  tempRect.width--;
-		  tempRect.height--;
-	  }
-	  tempRect.shrink(width/2,width/2);
-	  graphics.setLineWidth(width);
-    graphics.setLineStyle(lineStyle);
-	  if (color != null)
-		  graphics.setForegroundColor(color);
-	  graphics.drawRoundRectangle(tempRect, arcLength, arcLength);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/FigureCanvasKeyboardHandler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/FigureCanvasKeyboardHandler.java
deleted file mode 100644
index e861ddf..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/FigureCanvasKeyboardHandler.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.RangeModel;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Widget;
-
-public class FigureCanvasKeyboardHandler extends KeyAdapter
-{
-  public static final int H_SCROLL_INCREMENT = 5;
-  public static final int V_SCROLL_INCREMENT = 30;
-
-  /**
-   * Constructor for FigureCanvasKeyboardHandler.
-   */
-  public FigureCanvasKeyboardHandler()
-  {
-    super();
-  }
-
-  public void keyPressed(KeyEvent e)
-  {
-    Widget w = e.widget;
-    if (w instanceof FigureCanvas)
-    {
-      processKey(e.keyCode, (FigureCanvas)w);
-    }
-  }
-
-  private void processKey(int keyCode, FigureCanvas figureCanvas)
-  {
-    switch (keyCode)
-    {
-      case SWT.ARROW_DOWN :
-        scrollVertical(figureCanvas, false);
-        break;
-      case SWT.ARROW_UP :
-        scrollVertical(figureCanvas, true);
-        break;
-      case SWT.ARROW_LEFT :
-        scrollHorizontal(figureCanvas, true);
-        break;
-      case SWT.ARROW_RIGHT :
-        scrollHorizontal(figureCanvas, false);
-        break;
-      case SWT.PAGE_UP :
-        scrollPage(figureCanvas, true);
-        break;
-      case SWT.PAGE_DOWN :
-        scrollPage(figureCanvas, false);
-        break;
-    }
-  }
-
-  private int verifyScrollBarOffset(RangeModel model, int value)
-  {
-    value = Math.max(model.getMinimum(), value);
-    return Math.min(model.getMaximum() - model.getExtent(), value);
-  }
-
-  private void scrollVertical(FigureCanvas figureCanvas, boolean up)
-  {
-    Point location = figureCanvas.getViewport().getViewLocation();
-    int vOffset = up ? -V_SCROLL_INCREMENT : V_SCROLL_INCREMENT;
-    int x = verifyScrollBarOffset(figureCanvas.getViewport().getHorizontalRangeModel(), location.x);
-    int y = verifyScrollBarOffset(figureCanvas.getViewport().getVerticalRangeModel(), location.y + vOffset);
-    figureCanvas.scrollSmoothTo(x, y);
-  }
-
-  private void scrollHorizontal(FigureCanvas figureCanvas, boolean left)
-  {
-    Point location = figureCanvas.getViewport().getViewLocation();
-    int hOffset = left ? -H_SCROLL_INCREMENT : H_SCROLL_INCREMENT;
-    int x = verifyScrollBarOffset(figureCanvas.getViewport().getHorizontalRangeModel(), location.x + hOffset);
-    int y = verifyScrollBarOffset(figureCanvas.getViewport().getVerticalRangeModel(), location.y);
-    figureCanvas.scrollSmoothTo(x, y);
-  }
-
-  private void scrollPage(FigureCanvas figureCanvas, boolean up)
-  {
-    Rectangle clientArea = figureCanvas.getClientArea();
-    int increment = up ? -clientArea.height : clientArea.height;
-    Point location = figureCanvas.getViewport().getViewLocation();
-    int x = verifyScrollBarOffset(figureCanvas.getViewport().getHorizontalRangeModel(), location.x);
-    int y = verifyScrollBarOffset(figureCanvas.getViewport().getVerticalRangeModel(), location.y + increment);
-    figureCanvas.scrollSmoothTo(x, y);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphViewToolBar.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphViewToolBar.java
deleted file mode 100644
index 5fec3a0..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphViewToolBar.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-                                                 
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-
- 
-public class GraphViewToolBar extends ViewForm
-{
-    ToolBar graphToolBar;  // the toolbar at the top of the graph view
-    //ToolItem toolItem;   // the view tool item
-    Composite frameBar;  // The composite that contains the toolbar
-    WSDLEditor editor;                        
-
-    ToolItem showBindingsButton;   // the view tool item   
-    ToolItem backButton;
-
-    public GraphViewToolBar(WSDLEditor wsdlEditor, Composite c, int style)
-    {
-      super(c, style);
-      this.editor = wsdlEditor;
-      frameBar = new Composite(this, SWT.NONE);
-      /*
-      CLabel label = new CLabel(frameBar, SWT.NONE);
-      label.setText("View :");
-      */
-      org.eclipse.swt.layout.GridLayout frameLayout = new org.eclipse.swt.layout.GridLayout();
-      frameLayout.numColumns = 3;
-      frameLayout.horizontalSpacing = 0;
-      frameLayout.marginWidth = 0;
-      frameLayout.marginHeight = 0;     
-
-      frameBar.setLayout(frameLayout);
-      
-      graphToolBar = new ToolBar(frameBar, SWT.FLAT);
-      graphToolBar.addTraverseListener(new TraverseListener()
-      {
-        public void keyTraversed(TraverseEvent e)
-        {
-          if (e.detail == SWT.TRAVERSE_MNEMONIC)
-           e.doit = false;
-        }
-      });
-              
-
-      backButton = new ToolItem(graphToolBar, SWT.PUSH);
-      backButton.setImage(WSDLEditorPlugin.getInstance().getImage("icons/back.gif"));
-      // backButton.setToolTipText(WSDLEditorPlugin.getWSDLString("_UI_BACK_TO", "Definition"));
-      backButton.setToolTipText(WSDLEditorPlugin.getWSDLString("_UI_BACK"));
-      backButton.setEnabled(false);
-      backButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter()
-      {
-        public void widgetSelected(SelectionEvent e)
-        {
-          Object object = editor.getGraphViewer().getComponentViewer().getInput();
-          if (object instanceof XSDSchema)
-          {
-            editor.getGraphViewer().setInput(editor.getDefinition());
-          }
-          else if (object instanceof XSDConcreteComponent)
-          {
-            // Need to common this up with xsdeditor's BackAction code
-            XSDSchema xsdSchema = ((XSDConcreteComponent)object).getSchema();
-            boolean flag = true;
-            while (flag)
-            {
-              List list = xsdSchema.getReferencingDirectives();
-              if (list.size() > 0)
-              {
-                XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)list.get(0);
-                if (xsdSchemaDirective.getSchema() != null)
-                {
-                  xsdSchema = xsdSchemaDirective.getSchema();
-                }
-                else
-                {
-                  flag = false;
-                }
-              }
-              else
-              {
-                flag = false;
-              }
-            }
-
-            editor.getGraphViewer().setInput(xsdSchema);
-          }
-          else
-          {
-            editor.getGraphViewer().setInput(editor.getDefinition());
-          }
-        }
-      }); 
-
-      // hack to make the button look like a toggle button.  SWT.TOGGLE is not an allowed style
-      // for a ToolItem, but SWT.RADIO is.  SWT.RADIO makes it look like a toggle.......
-      showBindingsButton = new ToolItem(graphToolBar, SWT.RADIO);
-      showBindingsButton.setImage(WSDLEditorPlugin.getInstance().getImage("icons/hidebinding.gif"));
-      showBindingsButton.setToolTipText(WSDLEditorPlugin.getWSDLString("_UI_HIDE_BINDINGS")); 
-      showBindingsButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter()
-      {
-      	private boolean currentlySelected = false;
-      	
-        public void widgetSelected(SelectionEvent e)
-        {                                             
-          ViewMode vm = WSDLGraphModelAdapterFactory.getViewMode((Definition)editor.getDefinition());
-          vm.setBindingVisible(!vm.isBindingVisible());
-          
-          // hack to make the button look like a toggle button
-          ToolItem item = (ToolItem) e.widget;
-          if (currentlySelected) {
-          	item.setSelection(false);
-          	currentlySelected = false;
-          }
-          else {
-          	currentlySelected = true;
-          }
-        }
-      }); 
-
-      setTopLeft(frameBar);
-    }
-    
-    public void setBackButtonEnabled(boolean state)
-    {
-      backButton.setEnabled(state);
-    }
-
-    
-//    public void updateHoverHelp(Object object)
-//    {
-//      if (object instanceof XSDSchema)
-//      {
-//        backButton.setToolTipText(WSDLEditorPlugin.getWSDLString("_UI_BACK_TO", "Definition"));
-//      }
-//      else if (object instanceof XSDConcreteComponent)
-//      {
-//        backButton.setToolTipText(WSDLEditorPlugin.getWSDLString("_UI_BACK_TO", "XML Schema"));
-//      }
-//    }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphicsConstants.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphicsConstants.java
deleted file mode 100644
index 8170eba..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/GraphicsConstants.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * A collection of color and font related constants.
- */
-public interface GraphicsConstants 
-{                          
-  public final static Display display = Display.getDefault(); 
-                                                 
-  public final static Color groupBorderColor        = new Color(null, 118, 134, 164);
-  public final static Color groupHeaderColor        = new Color(null, 232, 240, 248);
-
-  public final static Color elementBorderColor      = new Color(null, 120, 152, 184);
-  public final static Color elementBackgroundColor  = new Color(null, 232, 240, 248);  
-  public final static Color elementLabelColor       = new Color(null,  80, 102, 144);
-  public final static Color readOnlyBorderColor     = new Color(null, 164, 164, 164); 
-  public final static Color red                     = new Color(null, 255,   0,   0); 
-
-  public final static Color readOnlyBackgroundColor = ColorConstants.white;
-
-  public final static Font  smallBoldFont           = new Font(Display.getCurrent(), "Tahoma", 8, SWT.BOLD);
-  public final static Font  mediumFont              = new Font(Display.getCurrent(), "Tahoma", 10, SWT.NONE);
-  public final static Font  mediumBoldFont          = new Font(Display.getCurrent(), "Tahoma", 10, SWT.BOLD); 
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/ViewMode.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/ViewMode.java
deleted file mode 100644
index 6275daf..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/ViewMode.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class ViewMode 
-{
-  public static final int BINDING     =   1;
-  public static final int MESSAGE     =   2;
-  public static final int PORT_TYPE   =   3;
-  public static final int SERVICE     =   4;
-  public static final int TYPES       =   5;
-
-  public static final String BINDING_DESCRIPTION     = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING");
-  public static final String MESSAGE_DESCRIPTION     = WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE");
-  public static final String PORT_TYPE_DESCRIPTION   = WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE");
-  public static final String SERVICE_DESCRIPTION     = WSDLEditorPlugin.getWSDLString("_UI_LABEL_SERVICE");
-  public static final String TYPES_DESCRIPTION       = WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPES");
-
-
-  protected boolean isBindingVisible = true;
-  protected int mode = SERVICE;
-  protected List listenerList = new ArrayList();
-
-  public ViewMode()
-  {
-  }                              
-
-  public void setBindingVisible(boolean isVisible)
-  {
-    if (isBindingVisible != isVisible)
-    {
-      isBindingVisible = isVisible;
-      fireChangeNotification();
-    }
-  }
-
-  public boolean isBindingVisible()
-  {                                                   
-    return isBindingVisible;
-  }
-
-  public static int getModeForDescription(String description)
-  {               
-    int result = SERVICE;
-    if (description.equals(BINDING_DESCRIPTION))
-    {               
-      result = BINDING; 
-    }
-    else if (description.equals(MESSAGE_DESCRIPTION))
-    {        
-      result = MESSAGE;
-    }
-    else if (description.equals(PORT_TYPE_DESCRIPTION))
-    { 
-      result = PORT_TYPE;
-    }
-    else if (description.equals(SERVICE_DESCRIPTION))
-    {    
-      result = SERVICE;
-    }
-    else if (description.equals(TYPES_DESCRIPTION))
-    {  
-      result = TYPES;
-    }    
-    return result;
-  }
-
-  public static String getDescriptionForMode(int mode)
-  {               
-    String result = SERVICE_DESCRIPTION;
-    switch (mode)
-    {
-      case BINDING :
-      {             
-        result = BINDING_DESCRIPTION;
-        break;
-      }
-      case MESSAGE : 
-      {             
-        result = MESSAGE_DESCRIPTION;
-        break;
-      }
-      case PORT_TYPE : 
-      {             
-        result = PORT_TYPE_DESCRIPTION;
-        break;
-      }
-      case SERVICE : 
-      {             
-        result = SERVICE_DESCRIPTION;
-        break;
-      }
-      case TYPES :  
-      {             
-        result = TYPES_DESCRIPTION;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public interface Listener
-  {
-    public void viewModeChanged(ViewMode mode);
-  }
-
-  public void setMode(int mode)
-  {
-    this.mode = mode;
-    fireChangeNotification();
-  }
-
-  public void setMode(String description)
-  {
-    this.mode = getModeForDescription(description);
-    fireChangeNotification();
-  }
-
-  public int getMode()
-  {
-    return mode;
-  } 
-
-  public String getModeDescription()
-  {
-    return getDescriptionForMode(mode);
-  }
-
-  public void addListener(Listener listener)
-  {
-    if (!listenerList.contains(listener))
-    { 
-      listenerList.add(listener);
-    }  
-  }
-
-  public void removeListener(Listener listener)
-  {
-    listenerList.remove(listener);
-  }  
-
-  public void fireChangeNotification()
-  {
-    for (Iterator i = listenerList.iterator(); i.hasNext(); )
-    {
-      Listener listener = (Listener)i.next();
-      listener.viewModeChanged(this);
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLComponentViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLComponentViewer.java
deleted file mode 100644
index b551a22..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLComponentViewer.java
+++ /dev/null

@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.gef.tools.SelectionTool;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.actions.ExtensibleMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.CenterLayout;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.ComponentViewerRootEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.figures.MyConnectionRenderingHelper;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ConnectionRenderingFigure;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IConnectionRenderingViewer;
-import org.w3c.dom.Node;
-
-public class WSDLComponentViewer extends ScrollingGraphicalViewer implements IConnectionRenderingViewer
-{
-  protected EditDomain editDomain;
-  protected WSDLEditor editor;
-  protected ISelectionProvider menuSelectionProvider;
-  protected ComponentViewerRootEditPart componentViewerRootEditPart;
-  protected ConnectionRenderingFigure connectionRenderingFigure;
-  protected boolean isPreserveExpansionEnabled;
-
-  public WSDLComponentViewer(WSDLEditor editor, ISelectionProvider menuSelectionProvider)
-  {
-    super();
-    this.editor = editor;
-    this.menuSelectionProvider = menuSelectionProvider;
-  }
-
-  public void setPreserveExpansionEnabled(boolean isPreserveExpansionEnabled)
-  {
-    this.isPreserveExpansionEnabled = isPreserveExpansionEnabled;
-  }
-
-  public boolean isPreserveExpansionEnabled()
-  {
-    return isPreserveExpansionEnabled;
-  }
-
-  public ConnectionRenderingFigure getConnectionRenderingFigure()
-  {
-    return connectionRenderingFigure;
-  }
-
-  public Object getInput()
-  {
-    return componentViewerRootEditPart.getModel();
-  }
-
-  public void setInput(Object object)
-  {
-    componentViewerRootEditPart.setInput(object);
-    
-    if (object instanceof Definition)
-    {
-      editor.getGraphViewer().setBackButtonEnabled(false);
-    }
-    else
-    {
-      editor.getGraphViewer().setBackButtonEnabled(true);
-    }
-    
-    // todo.. revisit this to understand why we don't get a set input
-    // when drilling down into a schema element or type
-    //
-    int layoutAlignment = (object instanceof Definition) ? 
-                          CenterLayout.ALIGNMENT_TOP :
-                          CenterLayout.ALIGNMENT_CENTER;
-    
-    ScalableRootEditPart graphicalRootEditPart = (ScalableRootEditPart)getRootEditPart();
-    CenterLayout centerLayout = (CenterLayout)graphicalRootEditPart.getLayer(LayerConstants.PRIMARY_LAYER).getLayoutManager();
-    centerLayout.setVerticalAlignment(layoutAlignment);
-  }
-
-  //public void setSelection(Object object)
-  //{                                      
-  //}
-
-  protected void hookControl()
-  {
-    super.hookControl();
-
-    getControl().setBackground(ColorConstants.white);
-
-    editDomain = new DefaultEditDomain(null);
-    ((DefaultEditDomain)editDomain).setDefaultTool(new SelectionTool());
-    editDomain.loadDefaultTool();
-    editDomain.addViewer(this);
-
-    componentViewerRootEditPart = new ComponentViewerRootEditPart();
-
-    KeyAdapter keyListener = new KeyAdapter()
-    {
-      public void keyReleased(KeyEvent e)
-      {   	
-        if (e.keyCode == SWT.F3)
-        {
-          ISelection selection = editor.getSelectionManager().getSelection();
-          if (selection instanceof IStructuredSelection)
-          {
-            Object object = ((IStructuredSelection)selection).getFirstElement();
-            if (object instanceof EObject)
-            {
-			  OpenOnSelectionHelper helper = new OpenOnSelectionHelper(editor.getDefinition());
-              helper.openEditor((EObject)object);
-            }
-          }
-
-        }
-      }
-    };
-    getControl().addKeyListener(keyListener);
-
-    setContents(componentViewerRootEditPart);
-    //getFigureCanvas().addKeyListener(new FigureCanvasKeyboardHandler(editor));
-    getRootEditPart().activate();
-
-    componentViewerRootEditPart.setInput(editor.getDefinition());
-
-    ScalableRootEditPart graphicalRootEditPart = (ScalableRootEditPart)getRootEditPart();
-
-    // set the layout for the primary layer so that the children are always centered
-    //
-    CenterLayout centerLayout = new CenterLayout();
-    centerLayout.setVerticalAlignment(CenterLayout.ALIGNMENT_TOP);
-    graphicalRootEditPart.getLayer(LayerConstants.PRIMARY_LAYER).setLayoutManager(centerLayout); //new ContainerLayout());//
-
-    ContextMenuProvider menuProvider = new InternalContextMenuProvider(this, editor); 
-    setContextMenu(menuProvider);
-    
-    // add context menu to the graph
-    MenuManager manager = new MenuManager("#popup");
-    manager.addMenuListener(menuProvider);
-    manager.setRemoveAllWhenShown(true);
-    Menu menu = manager.createContextMenu(getControl());
-    getControl().setMenu(menu);    
-    
-    // enable popupMenus extension
-    ((IEditorSite) editor.getSite()).registerContextMenu("org.eclipse.wst.wsdl.ui.popup.graph", manager, menuSelectionProvider, false);
-  
-    // add the ConnectionFigure which is responsible for drawing all of the lines in the view
-    //                       
-    IFigure figure = graphicalRootEditPart.getLayer(LayerConstants.CONNECTION_LAYER);
-    figure.setLayoutManager(new StackLayout());
-
-    final MyConnectionRenderingHelper connectionRenderingHelper = new MyConnectionRenderingHelper(this);
-
-    connectionRenderingFigure = new ConnectionRenderingFigure(graphicalRootEditPart.getLayer(LayerConstants.PRIMARY_LAYER))
-    {
-      protected void fillShape(Graphics graphics)
-      {
-        super.fillShape(graphics);
-        connectionRenderingHelper.fillShapeHelper(graphics);
-      }
-    };
-    figure.add(connectionRenderingFigure);
-    figure.validate();
-  }
-  
-  public WSDLEditor getWSDLEditor() {
-  	return editor;
-  }
-
-  public class InternalContextMenuProvider extends ContextMenuProvider
-  {
-    protected EditPartViewer viewer;
-    protected ExtensibleMenuActionContributor extensibleMenuActionContributor;
-
-    public InternalContextMenuProvider(EditPartViewer viewer, WSDLEditor editor)
-    {
-      super(viewer);
-      this.viewer = viewer;
-      extensibleMenuActionContributor = new ExtensibleMenuActionContributor(editor);
-    }
-
-    public void buildContextMenu(IMenuManager menu)
-    {
-      List list = getSelectedEditParts();
-      if (list.size() > 0)
-      {
-        EditPart editPart = (EditPart)list.get(0);
-        Object object = editPart.getModel();
-
-        //if (editPart instanceof PropertyEditPart)
-        //{
-        //  object = ((PropertyEditPart)editPart).getOwnerModel();
-        //}               
-
-        if (object != null)
-        {
-          Node node = null;
-          if (object instanceof Node)
-          {
-            node = (Node)object;
-          }
-          else if (object instanceof WSDLElement)
-          {
-            node = ((WSDLElement)object).getElement();
-          }
-          else if (object instanceof WSDLGroupObject)
-          {
-            node = ((WSDLGroupObject)object).getDefinition().getElement();
-          }
-          extensibleMenuActionContributor.contributeMenuActions(menu, node, object);
-        }
-      }
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLGraphViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLGraphViewer.java
deleted file mode 100644
index b6a7ddf..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/WSDLGraphViewer.java
+++ /dev/null

@@ -1,365 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph;
-                                                 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.actions.CopyGlobalAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.DeleteWSDLAndXSDAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.PasteGlobalAction;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.ComponentViewerRootEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.GroupEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.TreeNodeEditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.SelectionAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLGraphViewer implements ISelectionChangedListener
-{
-  protected Control componentViewerControl; 
-  protected WSDLComponentViewer componentViewer;
-  protected Definition definition;              
-  protected WSDLEditor editor;  
-  protected InternalSelectionAdapter internalSelectionAdapter = new InternalSelectionAdapter();
-
-  GraphViewToolBar form;  // Tool bar view form
-  
-  public WSDLGraphViewer(WSDLEditor editor)
-  {
-    super();
-    this.editor = editor;                 
-  }    
-
-  public void setDefinition(Definition definition)
-  {
-    this.definition = definition;              
-  }
-
-  public ISelectionProvider getSelectionProvider()
-  {
-    return internalSelectionAdapter;
-  }
-
-  public Control createControl(Composite parent)
-  {
-    componentViewer = new WSDLComponentViewer(editor, editor.getSelectionManager());
-
-    componentViewer.addSelectionChangedListener(internalSelectionAdapter);
-    internalSelectionAdapter.addSelectionChangedListener(editor.getSelectionManager());
-
-    form = new GraphViewToolBar(editor, parent, SWT.NONE);
-
-    componentViewerControl = componentViewer.createControl(form);
-    form.setContent(componentViewerControl);
-
-    editor.getSelectionManager().addSelectionChangedListener(this);
-    
-    componentViewerControl.addKeyListener(new KeyAdapter() {
-    	public void keyPressed(KeyEvent e) {
-    		if (e.character == SWT.DEL) {
-    			List selections = ((IStructuredSelection) editor.getSelectionManager().getSelection()).toList();
-       			DeleteWSDLAndXSDAction deleteAction = new DeleteWSDLAndXSDAction(selections, editor.getDefinition().getElement(), editor);
-       			deleteAction.run();
-    		}
-    	}    	
-    });
-    
-    return componentViewerControl; 
-  }
-
-  public WSDLComponentViewer getComponentViewer()
-  {
-    return componentViewer;
-  }
-
-
-  Node inputNode;    
-  public void setInput(Object object)
-  {
-    componentViewer.setInput(object);
-  }
-  
-  public void setBackButtonEnabled(boolean state)
-  {
-    form.setBackButtonEnabled(state);
-  }
-
-  //protected boolean isDeleted(Object object)
-  //}            
-
-    
-  // this is called when selection changes in the selection manager
-  //
-
-
-  
-  protected Object getInputComponentForNode(Node node)   
-  {
-    // TODO... logic to get WSDLElement or other object (e.g. XSD or extension for the Node)
-    // TODO... consider case where the model is simply a chunk of DOM
-    return null;
-  }
-   
-  protected Object getSelectionComponentForNode(Node node)   
-  {
-    // TODO... logic to get WSDLElement or other object (e.g. XSD or extension for the Node)
-    // TODO... consider case where the model is simply a chunk of DOM
-    return null;
-  } 
-
-  protected class InternalSelectionAdapter extends SelectionAdapter implements ISelectionChangedListener
-  {
-    public Object getObjectForOtherModel(Object object)
-    {            
-      Object result = null;
-      if (object instanceof EditPart)
-      {       
-        // fix for defect 4294 ... this test prevents selection from changing
-        // when a component is renamed which indirectly causes it to be removed and
-        // re-added from the 'sorted' list
-        //
-        if (!(object instanceof ComponentViewerRootEditPart))
-        {  
-          EditPart editPart = (EditPart)object;
-          result = editPart.getModel();
-        }  
-      }
-      return result;
-    }  
-
-    public void selectionChanged(SelectionChangedEvent event)                                       
-    {                                        
-      setSelection(event.getSelection()); 
-    }  
-  }
-    
-  // this gets called when the selection changes within the selection manager
-  //
-  public void selectionChanged(SelectionChangedEvent event) 
-  {   
-    //System.out.println("WSDLGraphViewer.selectionChanged( " + event.getSource() + ")");
-  	
-  	 IStructuredSelection selectionObject = (IStructuredSelection)event.getSelection();
-     Object modelObject = selectionObject.getFirstElement();
-     if (modelObject instanceof WSDLElement) {
-     	Element node = ((WSDLElement) modelObject).getElement();
-         boolean isEditable = (node instanceof IDOMNode);
-         
-     	Action copyAction = new CopyGlobalAction((WSDLElement) modelObject, editor);
-     	Action pasteAction = new PasteGlobalAction((WSDLElement) modelObject, editor);
- 		
- 		IActionBars actionBars = editor.getEditorSite().getActionBars();
- 		actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copyAction);
- 		actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), pasteAction);
- 		actionBars.updateActionBars();
- 		
- 		if (!isEditable) {
- 			copyAction.setEnabled(false);
- 			pasteAction.setEnabled(false);
- 		}
-     }
-
-    if (event.getSource() != internalSelectionAdapter && event.getSource() != (editor.getTextEditor()).getSelectionProvider())
-    {   
-      boolean isEmptySelectionRequired = true;
-      if (event.getSelection() instanceof IStructuredSelection)
-      {
-        IStructuredSelection selection = (IStructuredSelection)event.getSelection();
-        Object model = selection.getFirstElement();
-
-        if (model != null)
-        {                                                                           
-          EditPart editPart = getEditPart(componentViewer.getRootEditPart(), model);
-          if (editPart == null)
-          {                                                                         
-            editPart = expandToReveal(componentViewer.getRootEditPart(), model);
-          }
-          if (editPart == null)
-          {
-          	if (model instanceof XSDConcreteComponent) {
-          		model = getTopLevelComponent((XSDConcreteComponent) model);
-          		
-				if (model instanceof XSDElementDeclaration ||
-					model instanceof XSDComplexTypeDefinition ||
-					model instanceof XSDModelGroupDefinition ||
-					model instanceof XSDSchema) {
-						componentViewer.setInput(model);
-				}
-            }
-          	else if (model instanceof WSDLElement || model instanceof WSDLGroupObject) {
-          		// We need to switch the output to Definition
-          		componentViewer.setInput(editor.getDefinition());
-          		editPart = getEditPart(componentViewer.getRootEditPart(), model);
-          		if (editPart == null)
-          		{                                                                         
-          			editPart = expandToReveal(componentViewer.getRootEditPart(), model);
-          		}
-          	}
-            else
-            {
-              // bad hack to convert xsd editor category to xsd object
-              // see also WSDLTabbedPropertySheetPage
-              Node node = WSDLEditorUtil.getInstance().getNodeForObject(model);
-              Object o = WSDLEditorUtil.getInstance().findModelObjectForElement(editor.getDefinition(), (Element)node);
-              if (o instanceof XSDSchemaExtensibilityElement)
-              {
-                Object obj = ((XSDSchemaExtensibilityElement)o).getSchema();
-                componentViewer.setInput(obj);
-              }
-            }
-          }
-          if (editPart != null)
-          {
-            isEmptySelectionRequired = false;
-            componentViewer.setSelection(new StructuredSelection(editPart));
-            scrollIntoView(editPart);
-          }   
-        }
-      }
-      if (isEmptySelectionRequired)
-      {
-        componentViewer.setSelection(new StructuredSelection());
-      }
-    }
-  }
-  
-  protected XSDConcreteComponent getTopLevelComponent(XSDConcreteComponent component)
-  {
-    XSDConcreteComponent prev = component;
-    XSDConcreteComponent container = component;
-    while ( container != null && !(container instanceof XSDSchema))
-    {
-      prev = container;     
-      container = container.getContainer();
-    }
-    return container != null ? prev : null;
-  }
-
-  protected EditPart getEditPart(EditPart editPart, Object model)  
-  {                     
-    EditPart result = null;
-    if (editPart.getModel() == model)
-    {
-      result = editPart;      
-    }                   
-    else
-    {
-      for (Iterator i = editPart.getChildren().iterator(); i.hasNext(); )
-      {
-        result = getEditPart((EditPart)i.next(), model);
-        if (result != null)
-        {
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-
-  public EditPart expandToReveal(EditPart editPart, Object model)
-  {   
-    // here we create the parent list
-    //
-    List parentList = new ArrayList();
-    for (Object o = model; o != null; o = getParent(o))
-    {
-      parentList.add(0, o);
-    }               
-    EditPart result = expandToRevealHelper(editPart, parentList, 0);    
-                 
-    return result;
-  }   
-
-
-  public EditPart expandToRevealHelper(EditPart editPart, List parentList, int index)
-  {                                      
-    EditPart result = null;
-    int parentListSize =  parentList.size();
-    Object model = index < parentListSize ? parentList.get(index) : null;
-    if (model != null && editPart != null)
-    { 
-      // search editpart and its descendants to find a match for this model object
-      //
-      result = getEditPart(editPart, model);  
-      //System.out.println("getEditPart(" + index + ", " + model + ") = " + result);
-    }
-
-    if (result != null)
-    {
-      if (index < (parentListSize - 1))
-      {
-        // we've found the editPart for the item in the parentList 
-        // now we need to find the next item 
-        if (result instanceof TreeNodeEditPart)
-        {
-          ((TreeNodeEditPart)result).setExpanded(true);
-        }           
-        result = expandToRevealHelper(result, parentList, index + 1);
-      }
-    }
-    return result;
-  }
-    
-    
-  protected Object getParent(Object model)
-  { 
-    Object parent = null;
-    if (model instanceof EObject)
-    {
-      parent = ((EObject)model).eContainer();
-    }                                        
-    return parent;
-  }     
-
-
-  public void scrollIntoView(EditPart editPart)
-  {                
-    for (EditPart parent = editPart.getParent(); parent != null; parent = parent.getParent())
-    {
-      if (parent instanceof GroupEditPart)
-      {
-        GroupEditPart groupEditPart = (GroupEditPart)parent;
-        groupEditPart.scrollToRevealEditPart(editPart);
-        break;
-      }
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/AbstractConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/AbstractConnectionManager.java
deleted file mode 100644
index 6f84aaa..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/AbstractConnectionManager.java
+++ /dev/null

@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-                                                   
-public class AbstractConnectionManager implements IConnectionManager
-{            
-  public static final int PROPAGATE_FORWARD = 0;
-  public static final int PROPAGATE_BACK    = 1;
-  public static final int SELECTED          = 2;
-
-  protected GroupEditPart groupEditPart;
-
-  public AbstractConnectionManager(GroupEditPart groupEditPart)
-  {
-    this.groupEditPart = groupEditPart;
-  }                                    
-                                                
-  protected WSDLSwitch createSwitch(int selectionType)
-  {
-    return new WSDLSwitch();
-  }
-
-  public void propagateForward(Object model)
-  {  
-    if (model instanceof WSDLElement)
-    {
-      WSDLSwitch theSwitch = createSwitch(PROPAGATE_FORWARD);
-      theSwitch.doSwitch((EObject)model);    
-      groupEditPart.scrollToRevealInputConnection();
-    }       
-    else
-    {
-      removeConnections();
-    }
-    propagateForwardToNext(model);
-  }
-
-  public void propagateBack(Object model)
-  {                               
-    if (model instanceof WSDLElement)
-    {                        
-      WSDLSwitch theSwitch = createSwitch(PROPAGATE_BACK);
-      theSwitch.doSwitch((EObject)model);   
-      groupEditPart.scrollToRevealOutputConnection();
-    }
-    else
-    {
-      removeConnections();
-    }
-    propagateBackToPrevious(model);
-  }
-
-  public void setSelectedModelObject(Object model)
-  {  
-	if (model instanceof Node)
-	{
-    	Node node = (Node)model;
-		//Definition definition = groupEditPart.getDefinition();
-        while(node != null)
-        {        
-    	  if (WSDLConstants.WSDL_NAMESPACE_URI.equals(node.getNamespaceURI()))
-    	  {
-    		break;
-    	  }  
-    	  else
-    	  {
-    	  	node = node.getParentNode();
-    	  }
-        }
-        if (node instanceof Element)
-        {
-        	model = WSDLEditorUtil.getInstance().findModelObjectForElement( groupEditPart.getDefinition(), (Element)node);
-        }  
-	}
-	  	
-    if (model instanceof WSDLElement)
-    {
-      WSDLSwitch theSwitch = createSwitch(SELECTED);
-      theSwitch.doSwitch((EObject)model);                                                       
-    }
-    else 
-    {
-      removeConnections();
-    }
-    propagateForwardToNext(model);
-    propagateBackToPrevious(model);
-  } 
-
- 
-  protected void removeConnections()
-  {
-    groupEditPart.setEmphasizedModelObject(null);
-    groupEditPart.setInputConnectionModelObject(null);
-    groupEditPart.setOutputConnectionModelObject(null);
-  }
-     
-  protected void propagateForwardToNext(Object model)
-  {
-    GroupEditPart group = groupEditPart.getNext();
-    if (group != null)
-    {
-      IConnectionManager connectionManager = group.getConnectionManager();
-      if (connectionManager != null)
-      {
-        connectionManager.propagateForward(model);
-      }
-    }
-  }
-
-  protected void propagateBackToPrevious(Object model)
-  {
-    GroupEditPart group = groupEditPart.getPrevious();
-    if (group != null)
-    {
-      IConnectionManager connectionManager = group.getConnectionManager();
-      if (connectionManager != null)
-      {
-        connectionManager.propagateBack(model);
-      }
-    }
-  }  
-
-  protected Binding getEnclosingBinding(EObject object)
-  { 
-    Binding binding = null;
-    if (object instanceof Binding)
-    {     
-      binding = (Binding)object;
-    }
-    else if (object instanceof BindingOperation)
-    {     
-      binding = (Binding)object.eContainer();
-    }
-    else if (object instanceof BindingInput ||
-             object instanceof BindingOutput ||
-             object instanceof BindingFault)
-    {
-      binding = (Binding)object.eContainer().eContainer();
-    }
-    return binding;
-  }   
-
-  protected PortType getEnclosingPortType(EObject object)
-  { 
-    PortType portType = null;
-    if (object instanceof Operation)
-    {     
-      portType = (PortType)object.eContainer();
-    }
-    else if (object instanceof Input ||
-             object instanceof Output ||
-             object instanceof Fault)
-    {
-    	
-      portType = object.eContainer() != null ? (PortType)object.eContainer().eContainer() : null;
-    } 
-    else if (object instanceof PortType)
-    {
-      portType = (PortType)object;	
-    }                         
-    return portType;
-  }
-  
-  protected Operation getEnclosingOperation(EObject object)
-  { 
-    Operation operation = null;
-    if (object instanceof Operation)
-    {     
-      operation = (Operation)object;
-    }
-    else if (object instanceof Input ||
-             object instanceof Output ||
-             object instanceof Fault)
-    {
-      operation = (Operation)object.eContainer();
-    } 	                
-    return operation;
-  } 
-	
-  protected EObject getMessageReference(EObject object)
-  {      
-    return (object instanceof Input ||
-            object instanceof Output ||
-            object instanceof Fault) ? object : null;  
-  }	
-}  
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/BindingsGroupConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/BindingsGroupConnectionManager.java
deleted file mode 100644
index 61ce315..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/BindingsGroupConnectionManager.java
+++ /dev/null

@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-                                                   
-public class BindingsGroupConnectionManager extends AbstractConnectionManager
-{ 
-  public BindingsGroupConnectionManager(GroupEditPart groupEditPart)
-  {
-    super(groupEditPart);
-  }                                    
-
-    
-  class InternalWSDLSwitch extends WSDLSwitch
-  {                             
-    protected ComponentReferenceUtil util = new ComponentReferenceUtil(groupEditPart.getDefinition());
-
-    public Object caseBinding(Binding binding)
-    {                
-      groupEditPart.setEmphasizedModelObject(binding);      
-      groupEditPart.setInputConnectionModelObject(binding);
-      groupEditPart.setOutputConnectionModelObject(binding);
-      return Boolean.TRUE;
-    }  
-      
-    public Object caseBindingFault(BindingFault bindingFault)
-    {    
-      groupEditPart.setEmphasizedModelObject(getEnclosingBinding(bindingFault)); 
-      groupEditPart.setInputConnectionModelObject(getEnclosingBinding(bindingFault));
-      groupEditPart.setOutputConnectionModelObject(bindingFault);
-      return Boolean.TRUE;
-    }
-
-    public Object caseBindingInput(BindingInput bindingInput)
-    {                                                
-      groupEditPart.setEmphasizedModelObject(getEnclosingBinding(bindingInput)); 
-      groupEditPart.setInputConnectionModelObject(getEnclosingBinding(bindingInput));
-      groupEditPart.setOutputConnectionModelObject(bindingInput);
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOperation(BindingOperation bindingOperation)
-    {                       
-      groupEditPart.setEmphasizedModelObject(getEnclosingBinding(bindingOperation));
-      groupEditPart.setInputConnectionModelObject(getEnclosingBinding(bindingOperation));
-      groupEditPart.setOutputConnectionModelObject(bindingOperation);
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOutput(BindingOutput bindingOutput)
-    {                
-      groupEditPart.setEmphasizedModelObject(getEnclosingBinding(bindingOutput));
-      groupEditPart.setInputConnectionModelObject(getEnclosingBinding(bindingOutput));
-      groupEditPart.setOutputConnectionModelObject(bindingOutput);
-      return Boolean.TRUE;
-    }                                            
-                 
-    public Object caseFault(Fault fault)
-    {                                               
-      handleInterfaceHelper(fault); 
-      return Boolean.TRUE;
-    } 
-          
-    public Object caseInput(Input input)
-    { 
-                
-      handleInterfaceHelper(input);
-      return Boolean.TRUE;
-    }     
-            
-    public Object caseOperation(Operation operation) 
-    {      
-      handleInterfaceHelper(operation);     
-      return Boolean.TRUE;
-    }
-          
-    public Object caseOutput(Output output)
-    {  
-      handleInterfaceHelper(output);
-      return Boolean.TRUE;
-    }   
-                                        
-    public Object casePortType(PortType portType)
-    {                     
-      handleInterfaceHelper(portType);
-      return Boolean.TRUE;
-    }  
-
-    public Object casePort(Port port)
-    {          
-      Binding binding = port.getEBinding();
-      groupEditPart.setEmphasizedModelObject(binding); 
-      groupEditPart.setInputConnectionModelObject(binding);
-      groupEditPart.setOutputConnectionModelObject(binding);
-      return Boolean.TRUE;
-    }                                         
-      
-    public Object defaultCase(EObject object)
-    {                       
-      groupEditPart.setEmphasizedModelObject(null);
-      groupEditPart.setInputConnectionModelObject(null);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }   
-    
-    protected Binding getPreviousMatchingBinding(PortType portType)
-    {
-      Binding result = null;
-      Object previousContext = groupEditPart.getOutputConnectionModelObject();
-      if (previousContext == null)      
-      {
-        previousContext = groupEditPart.getEmphasizedModelObject();
-      }
-      if (previousContext instanceof EObject) 
-      {
-        Binding binding = getEnclosingBinding((EObject)previousContext);
-        if (binding != null && binding.getEPortType() == portType)
-        {
-          result = binding;  
-        }        
-      }
-      return result;
-    }     
-
-    protected void handleInterfaceHelper(EObject interfaceObject)
-    {   
-      Binding binding = null;
-      PortType portType = getEnclosingPortType(interfaceObject);
-      if (portType != null)
-      {              
-        binding = getPreviousMatchingBinding(portType);     
-        if (binding == null)
-        {      
-          List list = util.getBindings(portType);
-          binding = list.size() > 0 ? (Binding)list.get(0) : null;  
-        }
-        if (binding != null)
-        {
-          groupEditPart.setEmphasizedModelObject(binding);   
-          groupEditPart.setInputConnectionModelObject(binding);     
-          EObject bindingObject = util.getBindingObject(interfaceObject, binding);
-          groupEditPart.setOutputConnectionModelObject(bindingObject);                  
-        }
-      }
-      if (binding == null)
-      {
-        defaultCase(null);
-      }
-    }   
-  }    
-    
-  protected WSDLSwitch createSwitch(int selectionType)
-  {
-    return new InternalWSDLSwitch();
-  }
-  
-  protected void propagateBackToPrevious(Object model)
-  {   
-    super.propagateBackToPrevious(groupEditPart.getInputConnectionModelObject());
-  }  
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ComponentViewerRootEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ComponentViewerRootEditPart.java
deleted file mode 100644
index a014114..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ComponentViewerRootEditPart.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                    
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.Panel;
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.xsd.ui.internal.gef.util.editparts.AbstractComponentViewerRootEditPart;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerLayout;
-              
-
-public class ComponentViewerRootEditPart extends AbstractComponentViewerRootEditPart
-{                       
-  protected final static String MESSAGE_PLACE_HOLDER = "MESSAGE_PLACE_HOLDER";
-  protected Object input; 
-
-  public void setInput(Object newInput)
-  {
-    input = newInput;  
-    setModel(input);
-    refreshChildren();
-  }
-
-  protected IFigure createFigure()
-  {
-    Panel panel = new Panel();
-    panel.setBorder(new MarginBorder(30, 30, 30, 30));
-    //panel.setBackgroundColor(GraphicsConstants.red);
-    
-    ContainerLayout layout = new ContainerLayout();
-    layout.setHorizontal(false);
-    panel.setLayoutManager(layout);
-    return panel;
-  } 
-   
-
-  protected EditPart createChild(Object model)
-  {
-    EditPart editPart = null;
-    if (model == MESSAGE_PLACE_HOLDER)
-    {
-      editPart = new NotAvailableMessageEditPart();
-      editPart.setModel(model);
-    } 
-    else
-    {
-      editPart = ExtensibleEditPartFactory.getInstance().createEditPart(this, model);
-    }
-    return editPart;
-  }  
-  
-
-  protected List getModelChildren() 
-  {   
-    List result = new ArrayList();
-
-    if (input != null)
-    {              
-      result.add(input);
-    }     
-    else
-    {
-      result.add(MESSAGE_PLACE_HOLDER);
-    }       
-
-    return result;
-  }    
-                                                           
-
-  public void propertyChanged(Object object, String property)
-  {                                                                                                  
-    if (property == ModelAdapter.CHILDREN_PROPERTY)
-    {
-      refreshChildren();
-    }
-    else if (property == ModelAdapter.DETAIL_PROPERTY)
-    { 
-      refreshVisuals(); 
-    }                                       
-    else
-    {
-      refreshChildren();
-      refreshVisuals();
-    }
-  }                                          
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DefinitionEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DefinitionEditPart.java
deleted file mode 100644
index b7cf866..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DefinitionEditPart.java
+++ /dev/null

@@ -1,417 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.RoundedLineBorder;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerLayout;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.FillLayout;
-
-public class DefinitionEditPart extends WSDLEditPart implements ISelectionChangedListener //, ModelAdapterListener
-{
-  protected Label label;
-  protected ContainerFigure outlined;
-
-  protected ContainerFigure rightContentPane;
-  protected ContainerFigure topContentPane;
-  protected ContainerFigure middleContentPane;
-  protected ContainerFigure bottomContentPane;
-  protected static final String SELECTED_EDIT_PART_REFERENCE = "SELECTED_EDIT_PART_REFERENCE";
-
-  public void activate()
-  {
-    super.activate();
-    getViewer().addSelectionChangedListener(this);
-  }
-  /** 
-   * Apart from the deactivation done in super, the source
-   * and target connections are deactivated, and the visual
-   * part of the this is removed.
-   *
-   * @see #activate() 
-   */
-  public void deactivate()
-  {
-    getViewer().removeSelectionChangedListener(this);
-    super.deactivate();
-  }
-
-  protected IFigure[] initContentPanes()
-  {
-    IFigure[] contentPanes = new IFigure[4];
-    contentPanes[0] = rightContentPane;
-    contentPanes[1] = topContentPane;
-    contentPanes[2] = middleContentPane;
-    contentPanes[3] = bottomContentPane;
-    return contentPanes;
-  }
-
-  protected int getContentPane(Object model)
-  {
-    int result = 0;
-
-    if (model == SELECTED_EDIT_PART_REFERENCE)
-    {
-      result = 0;
-    }
-    else if (model instanceof WSDLGroupObject)
-    {
-      WSDLGroupObject groupObject = (WSDLGroupObject)model;
-      switch (groupObject.getType())
-      {
-        case WSDLGroupObject.IMPORTS_GROUP :
-        case WSDLGroupObject.TYPES_GROUP :
-          //case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP :
-          {
-            result = 1;
-            break;
-          }
-        case WSDLGroupObject.BINDINGS_GROUP :
-        case WSDLGroupObject.MESSAGES_GROUP :
-        case WSDLGroupObject.PORT_TYPES_GROUP :
-        case WSDLGroupObject.SERVICES_GROUP :
-          {
-            result = 2;
-            break;
-          }
-        case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP :
-          {
-            result = 3;
-            break;
-          }
-      }
-    }
-    return result;
-  }
-
-  protected EditPart createChild(Object model)
-  {
-    EditPart editPart = null;
-    if (model == SELECTED_EDIT_PART_REFERENCE)
-    {
-      editPart = new PartReferenceSectionEditPart();
-      editPart.setModel(model);
-      editPart.setParent(this);
-    }
-    else
-    {
-      editPart = super.createChild(model);
-    }
-    return editPart;
-  }
-
-  protected IFigure createFigure()
-  {
-    ContainerFigure outer = new ContainerFigure();
-    ContainerLayout anchoredLayout = new ContainerLayout()
-    {
-      protected int alignFigure(IFigure parent, IFigure child)
-      {
-        return (child == outlined) ? 0 : -1;
-      }
-    };
-    outer.setLayoutManager(anchoredLayout);
-    /*
-    ContainerFigure outer = new ConnectedEditPartFigure(this)
-    {
-      public IFigure getConnectionFigure()
-      {
-        return selectedPartEditPart != null ? selectedPartEditPart.getFigure() : this;
-      }               
-    };*/
-    outer.getContainerLayout().setHorizontal(true);
-    //outer.setBorder(new MarginBorder(0, 20, 0, 0));
-
-    outlined = new ContainerFigure();
-    outer.add(outlined);
-    //outlined.getContainerLayout().setHorizontal(false);
-    outlined.setLayoutManager(new FillLayout());
-    outlined.setBorder(new RoundedLineBorder(1, 6));
-    outlined.setForegroundColor(groupBorderColor);
-
-    ContainerFigure rightPane = new ContainerFigure();
-    rightPane.setBorder(new MarginBorder(0, 0, 0, 300));
-    rightPane.getContainerLayout().setHorizontal(false);
-    outer.add(rightPane);
-
-    //RectangleFigure spacer = new RectangleFigure();
-    //rightPane.add(spacer);
-    //spacer.setPreferredSize(new Dimension(450, 200));
-
-    rightContentPane = new ContainerFigure();
-    rightPane.add(rightContentPane);
-    rightContentPane.setBorder(new MarginBorder(15, 20, 15, 15));
-
-    ContainerFigure labelHolder = new ContainerFigure();
-    outlined.add(labelHolder);
-
-    label = new Label();
-    labelHolder.add(label);
-    label.setBorder(new MarginBorder(2, 5, 0, 5));
-    label.setFont(mediumFont);
-    label.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_DEFINITION"));
-    label.setForegroundColor(ColorConstants.black);
-
-    topContentPane = new ContainerFigure();
-    outlined.add(topContentPane);
-
-    FillLayout fillLayout = new FillLayout(15);
-    fillLayout.setHorizontal(true);
-    topContentPane.setLayoutManager(fillLayout);
-    topContentPane.setBorder(new MarginBorder(10, 10, 10, 10));
-
-    middleContentPane = new ContainerFigure();
-    outlined.add(middleContentPane);
-    fillLayout = new FillLayout(15);
-    fillLayout.setHorizontal(true);
-    middleContentPane.setLayoutManager(fillLayout);
-    middleContentPane.setBorder(new MarginBorder(0, 10, 10, 10));
-
-    bottomContentPane = new ContainerFigure();
-    outlined.add(bottomContentPane);
-    bottomContentPane.setLayoutManager(new FillLayout());
-    bottomContentPane.setBorder(new MarginBorder(0, 10, 10, 10));
-
-    return outer;
-  }
-
-  //public IFigure getContentPane()
-  //{
-  //  return contentPane;
-  //}   
-  public PartReferenceSectionEditPart getPartReferenceSectionEditPart()
-  {
-    PartReferenceSectionEditPart result = null;
-    for (Iterator i = getChildren().iterator(); i.hasNext();)
-    {
-      EditPart editPart = (EditPart)i.next();
-      if (editPart.getModel() == SELECTED_EDIT_PART_REFERENCE)
-      {
-        result = (PartReferenceSectionEditPart)editPart;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public GroupEditPart getGroupEditPart(int type)
-  {
-    GroupEditPart result = null;
-    for (Iterator i = getChildren().iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      if (o instanceof GroupEditPart)
-      {
-        GroupEditPart groupEditPart = (GroupEditPart)o;
-        if (groupEditPart.getType() == type)
-        {
-          result = groupEditPart;
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-  public List getModelChildren()
-  {
-    List list = new ArrayList();
-    list.add(SELECTED_EDIT_PART_REFERENCE);
-    list.addAll(super.getModelChildren());
-    return list;
-  }
-
-  public void handleOpenRequest(EditPart editPart)
-  {
-    GroupEditPart groupEditPart = null;
-    if (editPart.getModel() instanceof Import)
-    {
-      Import theImport = (Import)editPart.getModel();
-      Definition definition = (Definition)getModel();
-      OpenOnSelectionHelper helper = new OpenOnSelectionHelper(definition);
-      helper.openEditor(theImport);
-    }
-    else
-    {
-      for (EditPart parent = (EditPart)editPart.getParent(); parent != null; parent = parent.getParent())
-      {
-        if (parent instanceof GroupEditPart)
-        {
-          groupEditPart = (GroupEditPart)parent;
-          break;
-        }
-      }
-
-      if (groupEditPart != null)
-      {
-        GroupEditPart nextGroupEditPart = groupEditPart.getNext();
-        if (nextGroupEditPart != null)
-        {
-          if (nextGroupEditPart.inputConnection instanceof TreeNodeEditPart)
-          {
-            ((TreeNodeEditPart) (nextGroupEditPart.inputConnection)).setExpanded(true);
-          }
-        }
-        GroupEditPart prevGroupEditPart = groupEditPart.getPrevious();
-        if (prevGroupEditPart != null)
-        {
-          if (prevGroupEditPart.outputConnection instanceof TreeNodeEditPart)
-          {
-            ((TreeNodeEditPart) (prevGroupEditPart.outputConnection)).setExpanded(true);
-          }
-        }
-      }
-      updateConnections();
-    }
-  }
-
-  public void selectionChanged(SelectionChangedEvent event)
-  {
-    updateConnections();
-  }
-
-  public void updateConnections()
-  {
-    // todo         
-    if (isActive())
-    {
-      try
-      {
-        final AbstractGraphicalEditPart selectedEditPart = getSelectedEditPart(getViewer().getSelection());
-        GroupEditPart group = getContainingGroup(selectedEditPart);
-        if (group != null && group.getConnectionManager() != null)
-        {
-          group.getConnectionManager().setSelectedModelObject(selectedEditPart.getModel());
-        }
-        else if (!isAncestor(getPartReferenceSectionEditPart(), selectedEditPart))
-        {
-          group = getGroupEditPart(WSDLGroupObject.PORT_TYPES_GROUP);
-          group.getConnectionManager().setSelectedModelObject(null);
-        }
-      }
-      catch (Exception e)
-      {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  public GroupEditPart getContainingGroup(AbstractGraphicalEditPart editPart)
-  {
-    GroupEditPart result = null;
-    for (EditPart parent = editPart.getParent(); parent != null; parent = parent.getParent())
-    {
-      if (parent instanceof GroupEditPart)
-      {
-        result = (GroupEditPart)parent;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public GroupEditPart getNextGroupEditPart(GroupEditPart groupEditPart)
-  {
-    GroupEditPart result = null;
-    GroupEditPart prev = null;
-    for (Iterator i = getChildren().iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      if (o instanceof GroupEditPart)
-      {
-        GroupEditPart editPart = (GroupEditPart)o;
-        if (prev == groupEditPart)
-        {
-          result = editPart;
-          break;
-        }
-        prev = editPart;
-      }
-    }
-    return result;
-  }
-
-  public GroupEditPart getPreviousGroupEditPart(GroupEditPart groupEditPart)
-  {
-    GroupEditPart prev = null;
-    for (Iterator i = getChildren().iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      if (o instanceof GroupEditPart)
-      {
-        GroupEditPart editPart = (GroupEditPart)o;
-        if (editPart == groupEditPart)
-        {
-          break;
-        }
-        prev = editPart;
-      }
-    }
-    return prev;
-  }
-
-  protected AbstractGraphicalEditPart getSelectedEditPart(ISelection selection)
-  {
-    AbstractGraphicalEditPart editPart = null;
-    if (selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection s = (IStructuredSelection)selection;
-      Object first = s.getFirstElement();
-      if (first instanceof AbstractGraphicalEditPart)
-      {
-        editPart = (AbstractGraphicalEditPart)first;
-      }
-    }
-    return editPart;
-  }
-
-  public void refreshChildren()
-  {
-    super.refreshChildren();
-    updateConnections();
-  }
-
-  public boolean isAncestor(EditPart ancestor, EditPart child)
-  {
-    boolean result = false;
-    if (ancestor != null && child != null)
-    {
-      for (EditPart editPart = child; editPart != null; editPart = editPart.getParent())
-      {
-        if (editPart == ancestor)
-        {
-          result = true;
-          break;
-        }
-      }
-    }
-    return result;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DrillDownEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DrillDownEditPart.java
deleted file mode 100644
index 07207c3..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/DrillDownEditPart.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.handles.MoveHandleLocator;
-import org.eclipse.gef.requests.LocationRequest;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-
-public class DrillDownEditPart extends AbstractGraphicalEditPart
-{
-  protected Label drillDownButtonLabel; 
-  protected Label label;            
-
-  protected IFigure createFigure()
-  {                                     
-    ContainerFigure figure = new ContainerFigure();  
-    drillDownButtonLabel = new Label();
-    drillDownButtonLabel.setIcon(WSDLEditorPlugin.getInstance().getImage("icons/forward.gif"));
-    figure.add(drillDownButtonLabel);
-    label = new Label();
-    label.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_UNKNOWN"));
-    
-//  evil hack to provide underlines
-    boolean isLinux = java.io.File.separator.equals("/");
-    if (!isLinux)
-    {
-      Font underlineFont = new Font(Display.getCurrent(), "Tahoma", 8, SWT.NONE); 
-      FontData oldData = underlineFont.getFontData()[0];
-      FontData fontData = new FontData(oldData.getName(), oldData.getHeight(), SWT.NONE);
-      try
-      {
-        // TODO... clean this awful code up... we seem to be leaking here too
-        // we can't call this directly since the methods are OS dependant
-        // fontData.data.lfUnderline = 1
-        // so instead we use reflection
-        Object data = fontData.getClass().getField("data").get(fontData);
-        System.out.println("data" + data.getClass());
-        data.getClass().getField("lfUnderline").setByte(data, (byte)1);
-        Font font = new Font(Display.getCurrent(), fontData);
-        label.setFont(font);        
-      }
-      catch (Exception e)
-      {    
-      }
-    }
-    figure.add(label);
-    
-    return figure;
-  }    
-
-
-  protected void createEditPolicies() 
-  {
-  	DrillDownEditPartSelectionHandlesEditPolicy policy = new DrillDownEditPartSelectionHandlesEditPolicy();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, policy);      
-  }
-
-  public void performRequest(Request request)
-  {  
-	  if (request.getType() == RequestConstants.REQ_DIRECT_EDIT ||
-        request.getType() == RequestConstants.REQ_OPEN)
-    {                                         
-      if (request instanceof LocationRequest)
-      {
-        LocationRequest locationRequest = (LocationRequest)request;
-        Point p = locationRequest.getLocation();
-        
-        if (hitTest(drillDownButtonLabel, p) || hitTest(label, p))
-        {
-  		    performDrillDownAction();
-        }              
-      }
-    }
-  }  
-
-  protected EditPart createChild(Object model) 
-  {
-    return null;
-  }  
-
-  protected List getModelChildren() 
-  {   
-    return Collections.EMPTY_LIST;
-  } 
-
-  public boolean hitTest(IFigure target, Point location)
-  {
-    Rectangle b = target.getBounds().getCopy();
-    target.translateToAbsolute(b);  
-    return b.contains(location);
-  }  
-
-  protected void performDrillDownAction()
-  {                                                                                    
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        ((WSDLComponentViewer)getViewer()).setInput(getModel());
-      }
-    };
-    Display.getCurrent().asyncExec(runnable);
-  }
-  
-  private class DrillDownEditPartSelectionHandlesEditPolicy extends SelectionHandlesEditPolicy {
-  	 protected List createSelectionHandles()
-  	  {              
-  	    List list = new ArrayList();
-  	    EditPart editPart = getHost();  
-  	  
-  	    if (editPart instanceof GraphicalEditPart)
-  	    {
-  	      GraphicalEditPart graphicalEditPart = (GraphicalEditPart)editPart;
-  	      IFigure figure = graphicalEditPart.getFigure();
-
-  	      MoveHandleLocator loc = new MoveHandleLocator(figure);    
-  	      MoveHandle moveHandle = new MoveHandle(graphicalEditPart, loc);     
-  	      list.add(moveHandle);
-  	    }
-
-  	    return list;
-  	  }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ExtensibleEditPartFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ExtensibleEditPartFactory.java
deleted file mode 100644
index 7783b1c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ExtensibleEditPartFactory.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-
-public class ExtensibleEditPartFactory implements EditPartFactory
-{                           
-  protected WSDLEditorExtension[] extensions;
-  protected EditPartFactory[] editPartFactories;
-
-  protected static ExtensibleEditPartFactory instance;
-                      
-  public static ExtensibleEditPartFactory getInstance()
-  {
-    if (instance == null)
-    {               
-      instance = new ExtensibleEditPartFactory();
-    }
-    return instance;
-  }
-                                              
-  public ExtensibleEditPartFactory()
-  {
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    extensions = registry.getRegisteredExtensions(WSDLEditorExtension.EDIT_PART_FACTORY); 
-    editPartFactories = new EditPartFactory[extensions.length]; 
-    for (int i = 0; i < extensions.length; i++)
-    {
-      editPartFactories[i] = (EditPartFactory)extensions[i].createExtensionObject(WSDLEditorExtension.EDIT_PART_FACTORY, null);
-    }
-  }        
-
-  protected EditPartFactory getApplicableEditPartFactory(Object object)
-  {                             
-    EditPartFactory result = null;
-    for (int i = 0; i < extensions.length; i++)
-    {
-      if (extensions[i].isApplicable(object))
-      {
-        result  = editPartFactories[i];
-        if (result != null)
-        {
-          break;
-        }
-      }
-    }
-
-    return result;
-  }  
-
-  public EditPart createEditPart(EditPart parent, Object model)
-  {                     
-    EditPart result = null;
-    EditPartFactory factory = getApplicableEditPartFactory(model);
-    if (factory != null)   
-    {
-      result = factory.createEditPart(parent, model);
-    }  
-    else
-    {
-      result = new UnknownObjectEditPart();
-      result.setModel(model);
-      result.setParent(parent);
-    }
-    return result;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/GroupEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/GroupEditPart.java
deleted file mode 100644
index 5d11eee..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/GroupEditPart.java
+++ /dev/null

@@ -1,479 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.ViewportLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.RoundedLineBorder;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerLayout;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.FillLayout;
-
-public class GroupEditPart extends WSDLEditPart
-{
-  protected ScrollPane scrollpane;
-  protected Label label;
-
-  protected Object emphasizedModelObject;
-  protected Object inputConnectionModelObject;
-  protected Object outputConnectionModelObject;
-
-  public WSDLTreeNodeEditPart emphasizedEditPart;
-  public AbstractGraphicalEditPart inputConnection;
-  public AbstractGraphicalEditPart outputConnection;
-
-  public GroupEditPart nextGroupEditPart;
-  public IConnectionManager connectionManager;
-
-  protected InternalFigureListener figureListener = new InternalFigureListener();
-
-  class InternalFigureListener implements FigureListener
-  {
-    public void figureMoved(IFigure source)
-    {
-      ScalableRootEditPart root = (ScalableRootEditPart)getViewer().getRootEditPart();
-      root.getLayer(LayerConstants.CONNECTION_LAYER).repaint();
-    }
-  }
-
-  public Object getEmphasizedModelObject()
-  {
-    return emphasizedModelObject;
-  }
-
-  public Definition getDefinition()
-  {
-    return ((WSDLGroupObject)getModel()).getDefinition();
-  }
-
-  //protected void setEmphasizedObject(EditPart editPart)
-  //{                                                            
-  //  UnknownObjectEditPart ep = null;
-  //  if (editPart instanceof UnknownObjectEditPart)
-  //  {
-  //   ep = (UnknownObjectEditPart)editPart;
-  //  }
-  //
-  //  if (emphasizedEditPart != null)
-  //  {
-  //    emphasizedEditPart.setEmphasized(false);
-  //  }
-  //  if (ep != null)
-  //  {
-  //    emphasizedEditPart = ep;
-  //    emphasizedEditPart.setEmphasized(true);
-  //  }
-  //}  
-
-  public void setEmphasizedModelObject(Object model)
-  {
-    emphasizedModelObject = model;
-
-    if (emphasizedEditPart != null)
-    {
-      emphasizedEditPart.setEmphasized(false);
-    }
-
-    EditPart editPart = getMatchingChildEditPart(model);
-    emphasizedEditPart = (editPart instanceof WSDLTreeNodeEditPart) ? (WSDLTreeNodeEditPart)editPart : null;
-
-    if (emphasizedEditPart != null)
-    {
-      emphasizedEditPart.setEmphasized(true);
-    }
-  }
-
-  public void scrollToRevealEditPart(EditPart editPart)
-  {
-    if (editPart instanceof AbstractGraphicalEditPart)
-    {
-      scrollToEditPart((AbstractGraphicalEditPart)editPart);
-    }
-  }
-
-  public void scrollToRevealInputConnection()
-  {
-    if (inputConnection != null)
-    {
-      scrollToEditPart(inputConnection);
-    }
-  }
-
-  public void scrollToRevealOutputConnection()
-  {
-    if (outputConnection != null)
-    {
-      scrollToEditPart(outputConnection);
-    }
-  }
-
-  public void setInputConnectionModelObject(Object model)
-  {
-    inputConnection = getMatchingChildEditPart(model);
-    inputConnectionModelObject = model;
-  }
-
-  public Object getInputConnectionModelObject()
-  {
-    return inputConnectionModelObject;
-  }
-
-  public Object getOutputConnectionModelObject()
-  {
-    return outputConnectionModelObject;
-  }
-
-  public void setOutputConnectionModelObject(Object model)
-  {
-    outputConnection = getMatchingChildEditPart(model);
-    outputConnectionModelObject = model;
-  }
-
-  protected void createConnectionManager()
-  {
-    switch (getType())
-    {
-      case WSDLGroupObject.MESSAGES_GROUP :
-        {
-          connectionManager = new MessagesGroupConnectionManager(this);
-          break;
-        }
-      case WSDLGroupObject.SERVICES_GROUP :
-        {
-          connectionManager = new ServicesGroupConnectionManager(this);
-          break;
-        }
-      case WSDLGroupObject.BINDINGS_GROUP :
-        {
-          connectionManager = new BindingsGroupConnectionManager(this);
-          break;
-        }
-      case WSDLGroupObject.PORT_TYPES_GROUP :
-        {
-          connectionManager = new PortTypesGroupConnectionManager(this);
-          break;
-        }
-    }
-  }
-
-  public IConnectionManager getConnectionManager()
-  {
-    return connectionManager;
-  }
-
-  public ContainerFigure outerPane;
-
-  public IFigure createFigure()
-  {
-    createConnectionManager();
-
-    outerPane = new ContainerFigure();
-    outerPane.setBorder(new RoundedLineBorder(1, 6));
-    outerPane.setForegroundColor(groupBorderColor);
-
-    ContainerFigure r = new ContainerFigure();
-    //r.setCornerDimensions(new Dimension(4, 4));   
-    r.setOutline(false);
-    r.setMinimumSize(new Dimension(0, 0));
-
-    r.setFill(true);
-
-    r.setBackgroundColor(groupHeaderColor);
-    outerPane.add(r);
-
-    //ContainerFigure labelHolder = new ContainerFigure();                             
-    //labelHolder.add(label);
-    label = new Label();
-    label.setForegroundColor(ColorConstants.black);
-    label.setBorder(new MarginBorder(2, 4, 2, 4));
-    r.add(label); //Holder);
-
-    RectangleFigure line = new RectangleFigure();
-    line.setPreferredSize(20, 1);
-    outerPane.add(line);
-
-    int minHeight = 250;
-    switch (getType())
-    {
-    	case WSDLGroupObject.IMPORTS_GROUP :
-		case WSDLGroupObject.TYPES_GROUP :
-		{
-			minHeight = 50;
-			break;	
-		}
-		case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP :
-		{
-			minHeight = 150;
-			break;
-		}
-    }
-
-	final int theMinHeight = minHeight;
-    FillLayout outerLayout = new FillLayout()
-    {
-      protected Dimension calculatePreferredSize(IFigure parent, int width, int height)
-      {
-        Dimension d = super.calculatePreferredSize(parent, width, height);
-        d.union(new Dimension(100, theMinHeight));
-        return d;
-      }
-    };
-    outerLayout.setHorizontal(false);
-    //layout.setSpacing(5);
-    outerPane.setLayoutManager(outerLayout);
-
-    scrollpane = new ScrollPane();
-    scrollpane.setForegroundColor(ColorConstants.black);
-    scrollpane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC); //ScrollPane.ALWAYS);
-    outerPane.add(scrollpane);
-
-    ContainerFigure pane = new ContainerFigure();
-    pane.setBorder(new MarginBorder(5, 8, 5, 8));
-    ContainerLayout layout = new ContainerLayout();
-    layout.setHorizontal(false);
-    layout.setSpacing(0);
-    pane.setLayoutManager(layout);
-
-    Viewport viewport = new Viewport();
-    viewport.setContentsTracksHeight(true);
-    ViewportLayout viewportLayout = new ViewportLayout()
-    {
-      protected Dimension calculatePreferredSize(IFigure parent, int width, int height)
-      {
-        Dimension d = super.calculatePreferredSize(parent, width, height);
-        d.height = Math.min(d.height, theMinHeight - 25); //getViewer().getControl().getBounds().height);
-        return d;
-      }
-    };
-    viewport.setLayoutManager(viewportLayout);
-
-    scrollpane.setViewport(viewport);
-    scrollpane.setContents(pane);
-    pane.addFigureListener(figureListener);
-
-    return outerPane;
-  }
-
-  protected void refreshVisuals()
-  {
-    ModelAdapter adapter = getModelAdapter(getModel());
-    if (adapter != null)
-    {
-      label.setText((String)adapter.getProperty(getModel(), ModelAdapter.LABEL_PROPERTY));
-      //label.setIcon((Image)adapter.getProperty(getModel(), ModelAdapter.IMAGE_PROPERTY));
-    }
-    super.refreshVisuals();
-  }
-
-  protected void createEditPolicies()
-  {
-  }
-
-  public IFigure getContentPane()
-  {
-    return scrollpane.getContents();
-  }
-
-  protected void scrollToEditPart(final AbstractGraphicalEditPart targetEditPart)
-  {
-    Runnable r = new Runnable()
-    {
-      public void run()
-      {
-        scrollToEditPartHelper(targetEditPart);
-      }
-    };
-    Display.getCurrent().asyncExec(r);
-  }
-
-  protected void scrollToEditPartHelper(AbstractGraphicalEditPart targetEditPart)
-  {
-    if (targetEditPart != null)
-    {
-      Rectangle r1 = targetEditPart.getFigure().getBounds();
-      Rectangle r2 = getContentPane().getBounds();
-      scrollpane.scrollVerticalTo((r1.y - r2.y) - scrollpane.getBounds().height / 2);
-    }
-  }
-
-  public AbstractGraphicalEditPart getMatchingChildEditPart(Object model)
-  {
-    List list = new ArrayList();
-    for (Object o = model; o != null && !(o instanceof Definition); o = getParent(o))
-    {
-      list.add(0, o);
-    }
-    return getMatchingChildEditPart(this, list, 0, true);
-  }
-
-  protected Object getParent(Object model)
-  {
-    Object parent = null;
-    if (model instanceof EObject)
-    {
-      parent = ((EObject)model).eContainer();
-    }
-    return parent;
-  }
-
-  protected AbstractGraphicalEditPart getMatchingChildEditPart(AbstractGraphicalEditPart editPart, List list, int index, boolean getUnexpandedParent)
-  {
-    AbstractGraphicalEditPart result = (getUnexpandedParent && editPart != this) ? editPart : null;
-    Object model = list.size() > index ? list.get(index) : null;
-    if (model != null && editPart != null)
-    {
-      for (Iterator i = editPart.getChildren().iterator(); i.hasNext();)
-      {
-        AbstractGraphicalEditPart child = (AbstractGraphicalEditPart)i.next();
-        if (child.getModel() == model)
-        {
-          result = child;
-          break;
-        }
-      }
-      index++;
-      if (index < list.size())
-      {
-        result = getMatchingChildEditPart(result, list, index, getUnexpandedParent);
-      }
-    }
-    return result;
-  }
-
-  public int getType()
-  {
-    return ((WSDLGroupObject)getModel()).getType();
-  }
-
-  public GroupEditPart getNext()
-  {
-    return ((DefinitionEditPart)getParent()).getNextGroupEditPart(this);
-  }
-
-  public GroupEditPart getPrevious()
-  {
-    return ((DefinitionEditPart)getParent()).getPreviousGroupEditPart(this);
-  }
-
-  private void _refreshChildren()
-  {
-    int i;
-    EditPart editPart;
-    Object model;
-
-    Map modelToEditPart = new HashMap();
-    List children = getChildren();
-
-    for (i = 0; i < children.size(); i++)
-    {
-      editPart = (EditPart)children.get(i);
-      modelToEditPart.put(editPart.getModel(), editPart);
-    }
-
-    List modelObjects = getModelChildren();
-
-    for (i = 0; i < modelObjects.size(); i++)
-    {
-      model = modelObjects.get(i);
-
-      //Do a quick check to see if editPart[i] == model[i]
-      if (i < children.size())
-      {
-        editPart = (EditPart)children.get(i);
-        Object editPartModel = editPart.getModel();
-        if (editPartModel == model)
-        {
-          continue;
-        }
-        else if (editPartModel.getClass() == model.getClass())
-        {
-          modelToEditPart.remove(editPartModel);
-
-          if (isActive())
-            editPart.deactivate();
-
-          editPart.setModel(model);
-
-          if (isActive())
-          {
-            editPart.activate();
-            editPart.refresh();
-          }
-          continue;
-        }
-      }
-
-      //Look to see if the EditPart is already around but in the wrong location
-      editPart = (EditPart)modelToEditPart.get(model);
-
-      if (editPart != null)
-        reorderChild(editPart, i);
-      else
-      {
-        //An editpart for this model doesn't exist yet.  Create and insert one.
-        editPart = createChild(model);
-        addChild(editPart, i);
-      }
-    }
-    List trash = new ArrayList();
-    for (; i < children.size(); i++)
-      trash.add(children.get(i));
-    for (i = 0; i < trash.size(); i++)
-    {
-      EditPart ep = (EditPart)trash.get(i);
-      removeChild(ep);
-    }
-  }
-
-  public void refreshChildren()
-  {
-    boolean reuseChildren = false;
-    if (getViewer() instanceof WSDLComponentViewer)
-    {
-      WSDLComponentViewer wsdlComponentViewer = (WSDLComponentViewer)getViewer();
-      reuseChildren = wsdlComponentViewer.isPreserveExpansionEnabled();
-    }
-
-    if (reuseChildren)
-    {
-      _refreshChildren();
-    }
-    else
-    {
-      super.refreshChildren();
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IConnectionManager.java
deleted file mode 100644
index bd0d0a8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IConnectionManager.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-public interface IConnectionManager
-{ 
-  public void propagateForward(Object model);
-  public void propagateBack(Object model);
-  public void setSelectedModelObject(Object model);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IFeedbackHandler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IFeedbackHandler.java
deleted file mode 100644
index b6ac2b5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/IFeedbackHandler.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-public interface IFeedbackHandler
-{
-  public void addFeedback();
-  public void removeFeedback();
-}              
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/MessagesGroupConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/MessagesGroupConnectionManager.java
deleted file mode 100644
index 231455d..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/MessagesGroupConnectionManager.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-
-                                                   
-public class MessagesGroupConnectionManager extends AbstractConnectionManager
-{ 
-  public MessagesGroupConnectionManager(GroupEditPart groupEditPart)
-  {
-    super(groupEditPart);
-  }                                    
-              
-  class InternalWSDLSwitch extends WSDLSwitch
-  {            
-    public Object caseFault(Fault fault)
-    {                      
-      groupEditPart.setEmphasizedModelObject(fault.getEMessage());
-      groupEditPart.setInputConnectionModelObject(fault.getEMessage());
-      groupEditPart.setOutputConnectionModelObject(getFirstPart(fault.getEMessage()));
-      return Boolean.TRUE;
-    } 
-          
-    public Object caseInput(Input input)
-    {       
-      groupEditPart.setEmphasizedModelObject(input.getEMessage());
-      groupEditPart.setInputConnectionModelObject(input.getEMessage());
-      groupEditPart.setOutputConnectionModelObject(getFirstPart(input.getEMessage()));
-      return Boolean.TRUE;
-    }     
-
-    public Object caseMessage(Message message)
-    {  
-      groupEditPart.setEmphasizedModelObject(message);  
-      groupEditPart.setInputConnectionModelObject(message);
-      groupEditPart.setOutputConnectionModelObject(getFirstPart(message));
-      return Boolean.TRUE;
-    } 
-                      
-    public Object caseOutput(Output output)
-    {  
-      groupEditPart.setEmphasizedModelObject(output.getEMessage());  
-      groupEditPart.setInputConnectionModelObject(output.getEMessage());
-      groupEditPart.setOutputConnectionModelObject(getFirstPart(output.getEMessage()));
-      return Boolean.TRUE;
-    }                                                         
-
-    public Object casePart(Part part)
-    {  
-      groupEditPart.setEmphasizedModelObject(part.eContainer());  
-      groupEditPart.setInputConnectionModelObject(part.eContainer());
-      groupEditPart.setOutputConnectionModelObject(part);
-      return Boolean.TRUE;
-    } 
-      
-    public Object defaultCase(EObject object)
-    {                       
-      groupEditPart.setEmphasizedModelObject(null);
-      groupEditPart.setInputConnectionModelObject(null);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }      
-
-    public Object doSwitch(EObject theEObject)
-    {
-      Object result = super.doSwitch(theEObject);
-      ((DefinitionEditPart)groupEditPart.getParent()).getPartReferenceSectionEditPart().setInput(groupEditPart.getOutputConnectionModelObject());
-      return result;
-    }
-  }
-
-  protected WSDLSwitch createSwitch(int selectionType)
-  {
-    return new InternalWSDLSwitch();
-  }   
-
-  protected Part getFirstPart(Message message)
-  {           
-    Part result = null;
-    if (message != null)
-    {    
-      List parts = message.getEParts();
-      result = (parts.size() > 0) ? (Part)parts.get(0) : null;
-    }
-    return result;
-  }
-  
-  protected void propagateBackToPrevious(Object model)
-  {  	
-  	model = (model instanceof Part) ?((Part)model).eContainer() : model; 
-    super.propagateBackToPrevious(model);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/NotAvailableMessageEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/NotAvailableMessageEditPart.java
deleted file mode 100644
index 6a4a500..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/NotAvailableMessageEditPart.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                          
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-              
-
-public class NotAvailableMessageEditPart extends AbstractGraphicalEditPart 
-{            
-  public NotAvailableMessageEditPart()
-  {
-  }   
-  
-  protected IFigure createFigure()
-  {                            
-    Label label = new Label(WSDLEditorPlugin.getWSDLString("_UI_LABEL_VIEW_NOT_AVAILABLE"));
-    return label;
-  }    
-
-  protected List getModelChildren() 
-  {                  
-    return Collections.EMPTY_LIST;
-  }    
-
-  protected EditPart createChild(Object model)
-  {
-    return null;
-  }
- 
-  protected void createEditPolicies()
-  {  
-  }   
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PartReferenceSectionEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PartReferenceSectionEditPart.java
deleted file mode 100644
index 8ab8dee..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PartReferenceSectionEditPart.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-import org.eclipse.xsd.XSDElementDeclaration;
-                                                   
-
-public class PartReferenceSectionEditPart extends AbstractGraphicalEditPart implements ModelAdapterListener
-{ 
-  protected Object input;
-  protected Definition definition;
-              
-  protected IFigure createFigure()
-  {                                                  
-    ContainerFigure outer = new ContainerFigure(); 
-    return outer;
-  } 
-
-  protected void setInput(Object object)
-  {                    
-    if (input != null)
-    {
-      removeModelAdapterListener(input, this);
-	  removeModelAdapterListener(definition, this);
-    }
-    input = object;
-    if (input != null)
-    {
-      addModelAdapterListener(input, this);
-	  definition = getParent() != null ? (Definition)getParent().getModel() : null;
-      addModelAdapterListener(definition, this);
-    }
-    refresh();
-    getFigure().repaint();
-  }
-  
-	public void deactivate() 
-	  {       
-		  if (input != null)
-		  { 	
-	        removeModelAdapterListener(input, this);
-	        removeModelAdapterListener(definition, this);
-		  }  
-			super.deactivate(); 
-		}  
-
-  protected List getModelChildren() 
-  { 
-    List list = new ArrayList();
-    if (input instanceof Part)
-    {
-      Part part = (Part)input;
-      Object component = part.getTypeDefinition();
-      if (component != null) 
-      {
-        // TODO... i'm pulling a fast one here.... we should call the extension
-        // to see if he wants to show a child here
-        if (component instanceof org.eclipse.xsd.XSDComplexTypeDefinition)
-        {
-          list.add(component);
-        }
-      }
-      else
-      {
-        // This is before the new org.eclipse.wst.wsdl model
-        // where it handled DOM nodes
-        // component = part.getElement();
-        XSDElementDeclaration ed = part.getElementDeclaration();
-        if (ed != null && ed.getContainer() != null)
-        {
-          list.add(ed);
-        }
-      }
-    }                    
-    return list;
-  }
-       
-  protected void createEditPolicies() 
-  {
-  }       
-
-  protected EditPart createChild(Object model) 
-  {
-    return getEditPartFactory().createEditPart(this, model);
-  } 
-
-  protected EditPartFactory getEditPartFactory()
-  {
-    return ExtensibleEditPartFactory.getInstance();
-  } 
-
-  public void propertyChanged(Object object, String property)
-  {                     
-    refreshChildren();
-  }  
-
-  protected ModelAdapter getModelAdapter(Object modelObject)
-  {
-    return WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(modelObject);
-  } 
-
-  protected void addModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.addListener(listener);
-    }
-  }
-
-  protected void removeModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener);
-    }
-  }  
-
-}   
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PortTypesGroupConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PortTypesGroupConnectionManager.java
deleted file mode 100644
index d6520e2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/PortTypesGroupConnectionManager.java
+++ /dev/null

@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-                                                   
-public class PortTypesGroupConnectionManager extends AbstractConnectionManager
-{ 
-  public PortTypesGroupConnectionManager(GroupEditPart groupEditPart)
-  {
-    super(groupEditPart);
-  }                                    
-
-    
-  class InternalWSDLSwitch extends WSDLSwitch
-  {        
-    public boolean isBindingGroupShowing()
-    {
-      GroupEditPart prevGroupEditPart = groupEditPart.getPrevious();
-      return prevGroupEditPart  != null && prevGroupEditPart.getType() == WSDLGroupObject.BINDINGS_GROUP;
-    } 
-
-    public Object caseBinding(Binding binding)
-    {                             
-      Object portType = getPortTypeForBindingObject(binding);
-      groupEditPart.setEmphasizedModelObject(portType);      
-      groupEditPart.setInputConnectionModelObject(portType);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }  
-
-    public Object caseBindingFault(BindingFault bindingFault)
-    {                
-      groupEditPart.setEmphasizedModelObject(getPortTypeForBindingObject(bindingFault));
-      Fault fault = ComponentReferenceUtil.computeFault(bindingFault);
-      groupEditPart.setInputConnectionModelObject(fault);
-      groupEditPart.setOutputConnectionModelObject(fault);
-      return Boolean.TRUE;
-    } 
-      
-    public Object caseBindingInput(BindingInput bindingInput)
-    {    
-      groupEditPart.setEmphasizedModelObject(getPortTypeForBindingObject(bindingInput)); 
-      Input input = ComponentReferenceUtil.computeInput(bindingInput);
-      groupEditPart.setInputConnectionModelObject(input);
-      groupEditPart.setOutputConnectionModelObject(input);
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOperation(BindingOperation bindingOperation)
-    {                       
-      groupEditPart.setEmphasizedModelObject(getPortTypeForBindingObject(bindingOperation));
-      groupEditPart.setInputConnectionModelObject(ComponentReferenceUtil.computeOperation(bindingOperation));
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOutput(BindingOutput bindingOutput)
-    {                
-      groupEditPart.setEmphasizedModelObject(getPortTypeForBindingObject(bindingOutput));
-      Output output = ComponentReferenceUtil.computeOutput(bindingOutput);
-      groupEditPart.setInputConnectionModelObject(output);
-      groupEditPart.setOutputConnectionModelObject(output);
-      return Boolean.TRUE;
-    }                                            
-                 
-    public Object caseFault(Fault fault)
-    {                      
-      groupEditPart.setEmphasizedModelObject(getEnclosingPortType(fault));   
-      if (isBindingGroupShowing())
-      {
-        groupEditPart.setInputConnectionModelObject(fault);
-      }
-      else
-      {
-        groupEditPart.setInputConnectionModelObject(getEnclosingPortType(fault));
-      }
-      groupEditPart.setOutputConnectionModelObject(fault);
-      return Boolean.TRUE;
-    } 
-          
-    public Object caseInput(Input input)
-    {       
-      groupEditPart.setEmphasizedModelObject(getEnclosingPortType(input));   
-      if (isBindingGroupShowing())
-      {
-        groupEditPart.setInputConnectionModelObject(input);
-      }
-      else
-      {
-        groupEditPart.setInputConnectionModelObject(getEnclosingPortType(input));
-      }
-      groupEditPart.setOutputConnectionModelObject(input);
-      return Boolean.TRUE;
-    }     
-    
-    public Object caseMessage(Message message)
-    {
-      Object previousContext = groupEditPart.getOutputConnectionModelObject();
-      if (previousContext == null)      
-      {
-        previousContext = groupEditPart.getEmphasizedModelObject();
-      }
-      
-      EObject messageReference = null;      
-      if (previousContext == null || previousContext instanceof EObject)
-      {
-      messageReference = getMessageReference(message, (EObject)previousContext);
-      }
-
-      if (messageReference != null)
-      {
-        doSwitch(messageReference);
-      }
-      else
-      {
-      defaultCase(null);
-      }
-      return Boolean.TRUE;
-    }  
-            
-    public Object caseOperation(Operation operation) 
-    {      
-      groupEditPart.setEmphasizedModelObject(getEnclosingPortType(operation));
-      if (isBindingGroupShowing())
-      {
-        groupEditPart.setInputConnectionModelObject(operation);
-      }
-      else
-      {
-        groupEditPart.setInputConnectionModelObject(getEnclosingPortType(operation));
-      }
-      groupEditPart.setOutputConnectionModelObject(null);      
-      return Boolean.TRUE;
-    }
-          
-    public Object caseOutput(Output output)
-    {  
-      groupEditPart.setEmphasizedModelObject(getEnclosingPortType(output));   
-      if (isBindingGroupShowing())
-      {
-        groupEditPart.setInputConnectionModelObject(output);
-      }
-      else
-      {
-        groupEditPart.setInputConnectionModelObject(getEnclosingPortType(output));
-      }
-      groupEditPart.setOutputConnectionModelObject(output);  
-      return Boolean.TRUE;
-    }   
-                                        
-    public Object casePortType(PortType portType)
-    { 
-      groupEditPart.setEmphasizedModelObject(portType); 
-      groupEditPart.setInputConnectionModelObject(portType);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }  
-
-    public Object casePort(Port port)
-    {          
-      Binding binding = port.getEBinding();
-      PortType portType = binding != null ? binding.getEPortType() : null;
-      groupEditPart.setEmphasizedModelObject(portType);     
-      groupEditPart.setInputConnectionModelObject(portType);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }                                         
-      
-    public Object defaultCase(EObject object)
-    {                       
-      groupEditPart.setEmphasizedModelObject(null);
-      groupEditPart.setInputConnectionModelObject(null);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }      
-  } 
-
-  protected WSDLSwitch createSwitch(int selectionType)
-  {
-    return new InternalWSDLSwitch();
-  }
-
-  protected PortType getPortTypeForBindingObject(EObject object)
-  { 
-    Binding binding = getEnclosingBinding(object);
-    return binding.getEPortType();
-  }   
-            
-  public void propagateForward(Object model)
-  { 
-    if (model instanceof WSDLElement)
-    {
-      WSDLSwitch theSwitch = createSwitch(PROPAGATE_FORWARD);
-      theSwitch.doSwitch((EObject)model);    
-      groupEditPart.scrollToRevealInputConnection();
-    }       
-    else
-    {
-      removeConnections();
-    }
-
-    Object o = groupEditPart.getOutputConnectionModelObject();
-    propagateForwardToNext(o != null ? o : model); 
-  }
-  
-  protected void propagateBackToPrevious(Object model)
-  {
-    model = (model instanceof Message) ? groupEditPart.getInputConnectionModelObject() : model; 
-    super.propagateBackToPrevious(model);
-  } 
-  
-
-  protected Message getReferencedMessage(EObject o)
-  {      
-    Message result = null;
-    if (o instanceof Input)
-    {
-      result = ((Input)o).getEMessage();
-    }                                   
-    else if (o instanceof Output)
-    {
-      result = ((Output)o).getEMessage();
-    }  
-    else if (o instanceof Fault)
-    {
-      result = ((Fault)o).getEMessage();
-    }                     
-    return result;
-  }
-  
-  protected boolean isMatchingMessageReference(EObject messageReference, Message message)
-  {
-    Message m = getReferencedMessage(messageReference);
-    return (m != null) && (m == messageReference);
-  }
-  
-  public EObject getMessageReference(Message message, EObject prevContext)
-  {
-    EObject result = null;
-        
-    PortType prevPortType = getEnclosingPortType(prevContext);
-    Operation prevOperation = getEnclosingOperation(prevContext);  
-    EObject prevMessageReference = getMessageReference(prevContext);
-    
-    if (prevPortType != null)
-    {
-      result = getMessageReference(message, prevPortType, prevOperation, prevMessageReference);  
-    }   
-    if (result == null)
-    {    
-      Definition definition = groupEditPart.getDefinition();
-      ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-      for (Iterator i = util.getPortTypes().iterator(); i.hasNext(); )
-      {
-        PortType portType = (PortType)i.next();              
-        result = getMessageReference(message, portType, null, null);  
-        
-        if (result != null)
-        {
-          break;
-        }
-      }
-    }
-    return result;
-  }
-  
-  public EObject getMessageReference(Message message, PortType portType, Operation prevOperation, EObject prevMessageReference)
-  {
-    EObject result = null;
-    if (prevMessageReference != null && isMatchingMessageReference(prevMessageReference, message)) 
-    {
-      result = prevMessageReference;
-    }
-      
-    if (result == null && prevOperation != null)
-    {
-      result = getMessageReference(message, prevOperation);       
-    }
-            
-    if (result == null)
-    {             
-      for (Iterator i = portType.getOperations().iterator(); i.hasNext();)
-      { 
-        Operation operation = (Operation)i.next();
-        result = getMessageReference(message, operation);
-        if (result != null)
-        {
-          break; 
-        }
-      }
-    }
-    return result;    
-  } 
-  
-  public EObject getMessageReference(Message message, Operation operation)
-  {
-    EObject result = null;
-    Input input = operation.getEInput();
-    Output output = operation.getEOutput(); 
-    if (input != null && input.getMessage() == message)
-    {
-      result = input;
-    }
-    else if (output != null && output.getMessage() == message)
-    {
-      result = output;
-    }
-    if (result == null)
-    {
-      for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
-      {
-        Fault fault = (Fault)i.next();
-        if (fault.getMessage() == message)
-        {
-          result = fault;
-          break;
-        }  
-      }
-    }
-    return result;        
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ServicesGroupConnectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ServicesGroupConnectionManager.java
deleted file mode 100644
index cc9543d..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/ServicesGroupConnectionManager.java
+++ /dev/null

@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                  
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-                                                   
-public class ServicesGroupConnectionManager extends AbstractConnectionManager
-{   
-  public ServicesGroupConnectionManager(GroupEditPart groupEditPart)
-  {
-    super(groupEditPart);
-  }                                    
-    
-  protected class InternalWSDLSwitch extends WSDLSwitch
-  {
-   	public Object caseBinding(Binding binding)
-    {                   
-      handleBindingHelper(binding);
-      return Boolean.TRUE;
-    }         
-
-    public Object caseBindingFault(BindingFault bindingFault)
-    {    
-      handleBindingHelper(getEnclosingBinding(bindingFault)); 
-      return Boolean.TRUE;
-    }
-
-    public Object caseBindingInput(BindingInput bindingInput)
-    {    
-      handleBindingHelper(getEnclosingBinding(bindingInput)); 
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOperation(BindingOperation bindingOperation)
-    {                       
-      handleBindingHelper(getEnclosingBinding(bindingOperation));
-      return Boolean.TRUE;
-    }
-      
-    public Object caseBindingOutput(BindingOutput bindingOutput)
-    {                
-      handleBindingHelper(getEnclosingBinding(bindingOutput));
-      return Boolean.TRUE;
-    }      
-
-    public Object caseFault(Fault fault)
-    {                      
-      handlePortTypeHelper(getEnclosingPortType(fault));   
-      return Boolean.TRUE;
-    } 
-          
-    public Object caseInput(Input input)
-    {       
-      handlePortTypeHelper(getEnclosingPortType(input));   
-      return Boolean.TRUE;
-    }     
-            
-    public Object caseOperation(Operation operation) 
-    {      
-      handlePortTypeHelper(getEnclosingPortType(operation));    
-      return Boolean.TRUE;
-    }
-          
-    public Object caseOutput(Output output)
-    {  
-      handlePortTypeHelper(getEnclosingPortType(output));   
-      return Boolean.TRUE;
-    }  
-
-   	public Object casePort(Port port)
-    {           
-      groupEditPart.setEmphasizedModelObject(port);     
-      groupEditPart.setOutputConnectionModelObject(port);
-      return Boolean.TRUE;
-    }   
-
-   	public Object casePortType(PortType portType)
-    {           
-      handlePortTypeHelper(portType);
-      return Boolean.TRUE;
-    }          
-        
-   	public Object defaultCase(EObject object)
-    {
-      groupEditPart.setEmphasizedModelObject(null);
-      groupEditPart.setOutputConnectionModelObject(null);
-      return Boolean.TRUE;
-    }          
-
-    //
-    protected void handlePortTypeHelper(PortType portType)
-    {       
-      if (portType != null)
-      { 
-        Port port = null;   
-        Object previousContext = groupEditPart.getOutputConnectionModelObject();
-        if (previousContext == null)      
-        {
-          previousContext = groupEditPart.getEmphasizedModelObject();
-        }
-        if (previousContext instanceof Port)
-        {
-          Port previousPort = (Port)previousContext;
-          if (previousPort.getEBinding() != null && previousPort.getEBinding().getEPortType() == portType)
-          {
-            port = previousPort;
-          }          
-        }                  
-
-        if (port == null)
-        {
-          ComponentReferenceUtil util = new ComponentReferenceUtil(groupEditPart.getDefinition());           
-          List list = util.getPortsForPortType(portType);          
-          if (list.size() > 0)
-          {
-            port = (Port)list.get(0);
-          }                          
-        }
-
-        groupEditPart.setEmphasizedModelObject(port);     
-        groupEditPart.setOutputConnectionModelObject(port);
-      } 
-    }   
-
-    protected void handleBindingHelper(Binding binding)
-    {       
-      if (binding != null)
-      {
-        ComponentReferenceUtil util = new ComponentReferenceUtil(groupEditPart.getDefinition());
-        List list = util.getPortsForBinding(binding);
-        Port port = null;
-        if (list.size() > 0)
-        {
-          port = (Port)list.get(0);
-        }                          
-        groupEditPart.setEmphasizedModelObject(port);     
-        groupEditPart.setOutputConnectionModelObject(port);                                          
-      }
-    }
-  }
-
-  protected WSDLSwitch createSwitch(int selectionType)
-  {
-    return new InternalWSDLSwitch();
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/TreeNodeEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/TreeNodeEditPart.java
deleted file mode 100644
index cd66aab..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/TreeNodeEditPart.java
+++ /dev/null

@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.SelectionEditPolicy;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.editparts.InteractorHelper;
-import org.eclipse.wst.wsdl.ui.internal.graph.GraphicsConstants;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editpolicies.WSDLSelectionHandlesEditPolicyImpl;
-import org.eclipse.wst.wsdl.ui.internal.graph.figures.TreeNodeContentFigure;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-
-public abstract class TreeNodeEditPart extends AbstractGraphicalEditPart implements ModelAdapterListener, GraphicsConstants, IFeedbackHandler
-{
-  protected Label label;
-  protected Label label2;
-  protected ContainerFigure labelHolder = new ContainerFigure();
-  protected TreeNodeContentFigure contentFigure;
-  protected InteractorHelper interactorHelper;
-  protected boolean isSelected = false;
-  protected boolean isReadOnly = false;
-
-  public void activate()
-  {
-    super.activate();
-    addModelAdapterListener(getModel(), this);
-    //viewer = getViewer();
-  }
-
-  int removeNotifyCount = 0;
-
-  public void removeNotify()
-  {
-    removeNotifyCount++;
-    if (removeNotifyCount == 1)
-    {
-      super.removeNotify();
-    }
-  }
-
-  /** 
-   * Apart from the deactivation done in super, the source
-   * and target connections are deactivated, and the visual
-   * part of the this is removed.
-   *
-   * @see #activate() 
-   */
-  public void deactivate()
-  {
-    removeModelAdapterListener(getModel(), this);
-    super.deactivate();
-  }
-
-  protected void createEditPolicies()
-  {
-    //SelectionHandlesEditPolicyImpl policy = new SelectionHandlesEditPolicyImpl();
-    //installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, policy);
-
-    SelectionEditPolicy feedBackSelectionEditPolicy = new WSDLSelectionHandlesEditPolicyImpl();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, feedBackSelectionEditPolicy);
-  }
-
-  protected EditPart createChild(Object model)
-  {
-    return getEditPartFactory().createEditPart(this, model);
-  }
-
-  public void propertyChanged(Object object, String property)
-  {
-    if (property == ModelAdapter.CHILDREN_PROPERTY)
-    {
-      refreshChildren();
-    }
-    else if (property == ModelAdapter.DETAIL_PROPERTY)
-    {
-      refreshVisuals();
-    }
-    else
-    {
-      refreshChildren();
-      refreshVisuals();
-    }
-  }
-
-  protected IFigure createFigure()
-  {
-    createContentFigure();
-    createFigureContent();
-    return contentFigure;
-  }
-
-  protected void createContentFigure()
-  {
-    contentFigure = new TreeNodeContentFigure();
-  }
-
-  protected void createFigureContent()
-  {
-    // add a bit of space between the interactor and icon
-    //                      
-    RectangleFigure space = new RectangleFigure();
-    space.setVisible(false);
-    space.setPreferredSize(new Dimension(3, 3));
-    contentFigure.getIconArea().add(space);
-
-    labelHolder = new ContainerFigure();
-    labelHolder.setFill(true);
-    contentFigure.getIconArea().add(labelHolder);
-
-    label = new Label(WSDLEditorPlugin.getWSDLString("_UI_LABEL_UNKNOWN_OBJECT"));
-    label.setForegroundColor(ColorConstants.black);
-    labelHolder.add(label);
-
-    interactorHelper = new InteractorHelper(this, contentFigure.getInteractor(), contentFigure.getInnerContentArea());
-  }
-
-  public IFigure getContentPane()
-  {
-    return contentFigure.getInnerContentArea();
-  }
-
-  public Color computeLabelColor()
-  {
-    Color color = ColorConstants.black;
-    if (isSelected)
-    {
-      color = ColorConstants.white;
-    }
-    else if (isReadOnly)
-    {
-      color = ColorConstants.gray;
-    }
-    return color;
-  }
-
-  public void refreshVisuals()
-  {
-    ModelAdapter adapter = getModelAdapter(getModel());
-    if (adapter != null)
-    {
-      isReadOnly = Boolean.TRUE.equals(adapter.getProperty(getModel(), "isReadOnly"));
-      label.setForegroundColor(computeLabelColor());
-      label.setText((String)adapter.getProperty(getModel(), ModelAdapter.LABEL_PROPERTY));
-      label.setIcon((Image)adapter.getProperty(getModel(), ModelAdapter.IMAGE_PROPERTY));
-    }
-    else
-    {
-      label.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_UNKNOWN_NODE") + getModel().getClass().getName());
-    }
-  }
-
-  private void _refreshChildren()
-  {
-    int i;
-    EditPart editPart;
-    Object model;
-
-    Map modelToEditPart = new HashMap();
-    List children = getChildren();
-
-    for (i = 0; i < children.size(); i++)
-    {
-      editPart = (EditPart)children.get(i);
-      modelToEditPart.put(editPart.getModel(), editPart);
-    }
-
-    List modelObjects = getModelChildren();
-
-    for (i = 0; i < modelObjects.size(); i++)
-    {
-      model = modelObjects.get(i);
-
-      //Do a quick check to see if editPart[i] == model[i]
-      if (i < children.size())
-      {
-        editPart = (EditPart)children.get(i);
-        Object editPartModel = editPart.getModel();
-        if (editPartModel == model)
-        {
-          continue;
-        }
-        else if (editPartModel.getClass() == model.getClass())
-        {
-          modelToEditPart.remove(editPartModel);
-
-          if (isActive())
-            editPart.deactivate();
-
-          editPart.setModel(model);
-
-          if (isActive())
-          {
-            editPart.activate();
-            editPart.refresh();
-          }
-          continue;
-        }
-      }
-
-      //Look to see if the EditPart is already around but in the wrong location
-      editPart = (EditPart)modelToEditPart.get(model);
-
-      if (editPart != null)
-        reorderChild(editPart, i);
-      else
-      {
-        //An editpart for this model doesn't exist yet.  Create and insert one.
-        editPart = createChild(model);
-        addChild(editPart, i);
-      }
-    }
-    List trash = new ArrayList();
-    for (; i < children.size(); i++)
-      trash.add(children.get(i));
-    for (i = 0; i < trash.size(); i++)
-    {
-      EditPart ep = (EditPart)trash.get(i);
-      removeChild(ep);
-    }
-  }
-
-  public void refreshChildren()
-  {
-
-    boolean reuseChildren = false;
-    if (getViewer() instanceof WSDLComponentViewer)
-    {
-      WSDLComponentViewer wsdlComponentViewer = (WSDLComponentViewer)getViewer();
-      reuseChildren = wsdlComponentViewer.isPreserveExpansionEnabled();
-    }
-
-    if (reuseChildren)
-    {
-      _refreshChildren();
-    }
-    else
-    {
-      super.refreshChildren();
-    }
-
-    contentFigure.getInteractor().setVisible(hasChildren());
-  }
-
-  public List getModelChildren()
-  {
-    return contentFigure.getInteractor().isExpanded() ? getModelChildrenHelper() : Collections.EMPTY_LIST;
-  }
-
-  protected List getModelChildrenHelper()
-  {
-    List result = null;
-    ModelAdapter modelAdapter = getModelAdapter(getModel());
-    if (modelAdapter != null)
-    {
-      result = (List)modelAdapter.getProperty(getModel(), ModelAdapter.CHILDREN_PROPERTY);
-    }
-    return result != null ? result : Collections.EMPTY_LIST;
-  }
-
-  protected boolean hasChildren()
-  {
-    return getModelChildrenHelper().size() > 0;
-  }
-
-  protected abstract ModelAdapter getModelAdapter(Object model);
-
-  protected EditPartFactory getEditPartFactory()
-  {
-    return ExtensibleEditPartFactory.getInstance();
-  }
-
-  protected void addModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.addListener(listener);
-    }
-  }
-
-  protected void removeModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener);
-    }
-  }
-
-  public void addFeedback()
-  {
-    isSelected = true;
-    labelHolder.setBackgroundColor(ColorConstants.black);
-    label.setForegroundColor(computeLabelColor());
-    labelHolder.setFill(true);
-  }
-
-  public void removeFeedback()
-  {
-    isSelected = false;
-    labelHolder.setBackgroundColor(null);
-    label.setForegroundColor(computeLabelColor());
-    labelHolder.setFill(false);
-  }
-
-  public boolean isExpanded()
-  {
-    return contentFigure.getInteractor().isExpanded();
-  }
-
-  public void setExpanded(boolean arg)
-  {
-    interactorHelper.setExpanded(arg);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/UnknownObjectEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/UnknownObjectEditPart.java
deleted file mode 100644
index 2354fbf..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/UnknownObjectEditPart.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                         
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-
-
-public class UnknownObjectEditPart extends TreeNodeEditPart
-{
-  protected ModelAdapter getModelAdapter(Object model)
-  {
-    return null;
-  }                                                                               
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPart.java
deleted file mode 100644
index a8872a4..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPart.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                                     
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editpolicies.SelectionEditPolicy;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.editparts.MultiContentPaneEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.GraphicsConstants;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-
-
-public abstract class WSDLEditPart extends MultiContentPaneEditPart implements ModelAdapterListener, GraphicsConstants
-{
-	/**
-	 * Activates the <code>EditPart</code> by setting the
-	 * appropriate flags, and activating its children.
-	 * activation signals to the EditPart that is should start observing
-	 * it's model, and that is should support editing at this time.
-	 * An EditPart will have a parent prior to activiation.
-	 * @see #deactivate()
-	 */
-	public void activate() 
-  {
-		super.activate();         
-    addModelAdapterListener(getModel(), this);   
-	}
-	/** 
-	 * Apart from the deactivation done in super, the source
-	 * and target connections are deactivated, and the visual
-	 * part of the this is removed.
-	 *
-	 * @see #activate() 
-	 */
-	public void deactivate() 
-  {                    
-    removeModelAdapterListener(getModel(), this); 
-		super.deactivate(); 
-	}   
-    
-  protected void createEditPolicies() 
-  {
-    SelectionEditPolicy policy = new SelectionEditPolicy()
-    {        
-      protected  void hideSelection() 
-      {
-        EditPart editPart = getHost();
-        if (editPart instanceof IFeedbackHandler)
-        {
-          ((IFeedbackHandler)editPart).removeFeedback();
-        }
-      }
-
-      protected  void showSelection()  
-      { 
-        EditPart editPart = getHost();
-        if (editPart instanceof IFeedbackHandler)
-        {
-          ((IFeedbackHandler)editPart).addFeedback();
-        }
-      }             
-    };
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, policy);           
-  }  
-
-  protected EditPart createChild(Object model) 
-  {
-    return getEditPartFactory().createEditPart(this, model);
-  } 
-
-  public void propertyChanged(Object object, String property)
-  {                                                                                                  
-    if (property == ModelAdapter.CHILDREN_PROPERTY)
-    {
-      refreshChildren();
-    }
-    else if (property == ModelAdapter.DETAIL_PROPERTY)
-    { 
-      refreshVisuals(); 
-    }                                       
-    else
-    {
-      refreshChildren();
-      refreshVisuals();
-    }
-  }  
-
-  protected List getModelChildren() 
-  {   
-    List result = null;
-    ModelAdapter modelAdapter = getModelAdapter(getModel());
-    if (modelAdapter != null)
-    {
-      result = (List)modelAdapter.getProperty(getModel(), ModelAdapter.CHILDREN_PROPERTY);
-    }
-    return result != null ? result : Collections.EMPTY_LIST;
-  } 
-
-  protected EditPartFactory getEditPartFactory()
-  {
-    return ExtensibleEditPartFactory.getInstance();
-  } 
-
-  protected ModelAdapter getModelAdapter(Object modelObject)
-  {
-    // TODO : port check
-    return WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(modelObject);
-//    return WSDLGraphModelAdapterFactory.EcoreUtil.getAdapter(getWSDLGraphModelAdapterFactory().eAdapters(),modelObject);
-  } 
-
-  protected void addModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.addListener(listener);
-    }
-  }
-
-  protected void removeModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {
-    ModelAdapter adapter = getModelAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener);
-    }
-  }  
-
-  public boolean hitTest(IFigure target, Point location)
-  {
-    Rectangle b = target.getBounds().getCopy();
-    target.translateToAbsolute(b);  
-    return b.contains(location);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java
deleted file mode 100644
index 62e4a2c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLEditPartFactory.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-                              
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-
-public class WSDLEditPartFactory implements EditPartFactory
-{ 
-  protected static WSDLEditPartFactory instance;                            
-
-  public static WSDLEditPartFactory getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new WSDLEditPartFactory();
-    }
-    return instance;
-  }
-           
-
-
-  public EditPart createEditPart(final EditPart parent, Object model)
-  {             
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {                   
-      	public Object caseWSDLElement(WSDLElement wsdlElement)
-        {   
-          return new WSDLTreeNodeEditPart();
-	    }   
-       
-      	public Object caseDefinition(Definition definition)
-        {   
-          return new DefinitionEditPart();
-	    }  
-				
-		public Object defaultCase(EObject object)
-		{
-	       return new WSDLTreeNodeEditPart();
-		}
-      };
-	 
-	  
-    EditPart editPart = null;       	
-    if (model instanceof EObject)
-    {
-      editPart = (EditPart)wsdlSwitch.doSwitch((EObject)model);
-    }
-    else if (model instanceof WSDLGroupObject)
-    {
-      editPart = new GroupEditPart();
-    }                                
-
-    if (editPart != null)   
-    {
-      editPart.setModel(model);
-      editPart.setParent(parent);
-    }
-    else
-    {      
-      System.out.println("can't create editPart for " + model);
-      Thread.dumpStack();
-    }
-    return editPart;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLTreeNodeEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLTreeNodeEditPart.java
deleted file mode 100644
index a6c9339..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editparts/WSDLTreeNodeEditPart.java
+++ /dev/null

@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.graph.editpolicies.WSDLDragAndDropEditPolicy;
-import org.eclipse.wst.wsdl.ui.internal.graph.editpolicies.WSDLGraphNodeDragTracker;
-import org.eclipse.wst.wsdl.ui.internal.graph.editpolicies.WSDLSelectionHandlesEditPolicyImpl;
-import org.eclipse.wst.wsdl.ui.internal.graph.figures.TreeNodeContentFigure;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-public class WSDLTreeNodeEditPart extends TreeNodeEditPart
-{ 
-  protected Label label2;                                     
-  protected boolean isEmphasized = false;  
-
-  protected static final Color emphasisColor = new Color(null, 238, 238, 238);
-  protected static final Color label2ForegroundColor = new Color(null, 82, 82, 158);        
-  protected static final Color label2ForegroundColorSelected = new Color(null, 182, 182, 255);
-
-  protected ModelAdapter getModelAdapter(Object modelObject)
-  {
-    return WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(modelObject);
-  }                                       
-
-  protected void createContentFigure()
-  {
-	contentFigure = new TreeNodeContentFigure()
-	{
-	  public IFigure getConnectionFigure()
-	  {  	
-  	    return isTopLevel() ? outlinedArea : iconArea;
-	  }   	  
-	};      
-  }
-  
-  protected boolean isTopLevel()
-  {
-    return getParent() instanceof GroupEditPart;
-  }
-	
-  protected void createFigureContent()
-  {                  
-    super.createFigureContent();
-      
-    if (getModel() instanceof Part)
-    {
-      label2 = new Label();
-      labelHolder.add(label2);
-      label2.setBorder(new MarginBorder(0, 5, 0, 0));
-      label2.setForegroundColor(label2ForegroundColor);
-    }
-  }   
-
-  public void setEmphasized(boolean isEmphasized)
-  {
-    this.isEmphasized = isEmphasized;
-    refreshVisuals();
-  }
-  
-  protected void updateEmphasis()
-  {
-    boolean isEmphasisShowing = isEmphasized && (!isSelected || getModelChildren().size() > 0);
-    if (isEmphasisShowing)
-    {              
-      contentFigure.getOutlinedArea().setBackgroundColor(emphasisColor); 
-    }                                                                                    
-
-    contentFigure.getOutlinedArea().setFill(isEmphasisShowing);
-    contentFigure.getOutlinedArea().setOutlined(isEmphasisShowing);    
-    contentFigure.setForegroundColor(elementBorderColor);
-  }
-
-  public void refreshVisuals()
-  {   
-    updateEmphasis();
-
-    super.refreshVisuals();
-   
-    if (label2 != null)
-    {
-      Part part = (Part)getModel();
-	  //String label = ComponentReferenceUtil.isType(part) ? "type" : "element";
-	  String value = ComponentReferenceUtil.getPartReferenceValue(part);  
-      label2.setText("(" + value + ")");
-    }
-  }         
-
-  public void performRequest(Request request)
-  {  
-    if (request.getType() == RequestConstants.REQ_OPEN)
-    {                                        
-      for (EditPart parent = (EditPart)getParent(); parent != null; parent = parent.getParent())
-      {
-        if (parent instanceof DefinitionEditPart)
-        {
-          ((DefinitionEditPart)parent).handleOpenRequest(this);
-          break;
-        }
-      }
-    }    
-    //else if (request.getType() == RequestConstants.REQ_DIRECT_EDIT)
-    //{                            
-    //  performDirectEdit();
-    //}
-  }     
-
-  public void addFeedback()
-  {    
-    super.addFeedback();
-    if (label2 != null)        
-    {
-      label2.setForegroundColor(label2ForegroundColorSelected);
-    }    
-    updateEmphasis();
-  }   
-
-  public void removeFeedback()
-  { 
-    super.removeFeedback();
-    if (label2 != null)        
-    {
-      label2.setForegroundColor(label2ForegroundColor);
-    }
-    updateEmphasis();
-  }                     
-  
-  protected void createEditPolicies()
-  { 
-    super.createEditPolicies();
-    selectionHandlesEditPolicy = new WSDLSelectionHandlesEditPolicyImpl();
-    installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new WSDLDragAndDropEditPolicy(getViewer(), selectionHandlesEditPolicy));
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, selectionHandlesEditPolicy);
-  }  
-  
-  WSDLSelectionHandlesEditPolicyImpl selectionHandlesEditPolicy;
-
-  public IFigure getSelectionFigure()
-  {
-    return getFigure();
-  }
-
-  public DragTracker getDragTracker(Request request)
-  {
-    return new WSDLGraphNodeDragTracker((EditPart)this);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/EditUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/EditUtil.java
deleted file mode 100644
index 69bcb3f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/EditUtil.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.w3c.dom.Element;
-
-//import org.eclipse.wst.wsdl.ui.internal.reconciler.WSDLToDOMElementUtil;
-
-
-public class EditUtil
-{
-  public static List getPossiblePropertyValues(Object model, String propertyName)
-  {
-    List list = null;
-    if (model instanceof Port)
-    {
-      Port port = (Port)model;   
-      ComponentReferenceUtil util = new ComponentReferenceUtil(port.getEnclosingDefinition());
-      list = util.getBindingNames();
-    }                                                   
-    else if (model instanceof Binding)
-    {
-      Binding binding = (Binding)model;   
-      ComponentReferenceUtil util = new ComponentReferenceUtil(binding.getEnclosingDefinition());
-      list = util.getPortTypeNames();
-    }    
-    else if (model instanceof Part)
-    {
-      Part part = (Part)model;    
-      boolean isType = ComponentReferenceUtil.isType(part);
-      list = ComponentReferenceUtil.getComponentNameList(part, isType);
-    } 
-    else if (model instanceof Input ||
-             model instanceof Output ||
-             model instanceof Fault)
-    { 
-      WSDLElement wsdlElement = (WSDLElement)model;   
-      ComponentReferenceUtil util = new ComponentReferenceUtil(wsdlElement.getEnclosingDefinition());
-      list = util.getMessageNames();
-    } 
-
-    if (list == null)
-    {                
-      list = new ArrayList();                            
-      list.add("A");
-      list.add("B");
-      list.add("C");
-    }
-    return list;
-  }
-
-  public static void setPropertyValue(Object model, String propertyName, String value)
-  { 
-    if (model instanceof Part)
-    {                     
-      Part part = (Part)model; 
-      boolean isType = ComponentReferenceUtil.isType(part);
-      ComponentReferenceUtil.setComponentReference(part, isType, value);
-    } 
-    else if (model instanceof Port)
-    {
-      Element element = ((WSDLElement)model).getElement();
-      element.setAttribute("binding", value);
-    } 
-    else if (model instanceof Binding)
-    { 
-      Element element = ((WSDLElement)model).getElement();
-      element.setAttribute("type", value);
-    } 
-    else if (model instanceof Input ||
-             model instanceof Output ||
-             model instanceof Fault)
-    { 
-      Element element = ((WSDLElement)model).getElement();
-      element.setAttribute("message", value);
-    } 
-  }
-
-  public static String getPropertyValue(Object model, String propertyName)
-  { 
-    String result = null;
-
-    if (model instanceof Part)
-    {
-      Element element = ((WSDLElement)model).getElement();
-      result = element.getAttribute(propertyName);
-    } 
-    else if (model instanceof Port)
-    {
-      Element element = ((WSDLElement)model).getElement();
-      result = element.getAttribute("binding");
-    }   
-    else if (model instanceof Binding)
-    { 
-      Element element = ((WSDLElement)model).getElement();
-      result = element.getAttribute("type");
-    }   
-    else if (model instanceof Input ||
-             model instanceof Output ||
-             model instanceof Fault)
-    { 
-      Element element = ((WSDLElement)model).getElement();
-      result = element.getAttribute("message");
-    }              
-    return result;
-  }
-
-  public static void setName(Object model, String value)
-  { 
-    if (model instanceof WSDLElement)
-    {
-      Element element = ((WSDLElement)model).getElement();
-      element.setAttribute("name", value);
-    }  
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/NameDirectEditManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/NameDirectEditManager.java
deleted file mode 100644
index 7619958..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/NameDirectEditManager.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.editpolicies.TextCellEditorManager;
-
-public class NameDirectEditManager extends TextCellEditorManager
-{
-  protected Object model;
-
-  public NameDirectEditManager(GraphicalEditPart source, Label label, Object model)
-  {
-    super(source, label);  
-    this.model = model;
-  }
-
-  public void performModify(final String value)
-  {          
-    Display.getCurrent().asyncExec(new SmartRenameAction(model, value));
-  }      
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropCommand.java
deleted file mode 100644
index 5792516..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropCommand.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.actions.CopyWSDLElementAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLDragAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLDragReorderAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLDragSetMessageAction;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-
-public class WSDLDragAndDropCommand extends Command //AbstractCommand
-{ 
-  protected EditPartViewer viewer;    
-  protected ChangeBoundsRequest request;
-  protected Point location;
-  protected WSDLDragAction dragAction;    
-  protected boolean canExecute = false;
-
-  public WSDLDragAndDropCommand(EditPartViewer viewer, ChangeBoundsRequest request)
-  {
-    this.viewer = viewer;                    
-    this.request = request;
-
-    location = request.getLocation();   
-    EditPart targetEditPart = viewer.findObjectAt(location); 
-
-    // Only support drag and drop for WSDLTreeNodeEditPart
-  	if (targetEditPart instanceof WSDLTreeNodeEditPart) {
-  		WSDLElement wsdlElement = (WSDLElement) targetEditPart.getModel();
-  		if (wsdlElement.getElement() instanceof IDOMNode) {
-  			((GraphicalEditPart)viewer.getRootEditPart()).getFigure().translateToRelative(location);
-  			WSDLTreeNodeEditPart movingChildEditPart;
-  			Vector dragActions = new Vector();
-
-  			if (request.getType().equals(RequestConstants.REQ_ADD))  { // This really shouldn't be REQ_ADD....
-  				List list = request.getEditParts();
-  				if (list.size() <= 0) {
-  					canExecute = false;
-  					return;
-  				}
-            
-  				// Grabbing the fist selection
-  				movingChildEditPart = (WSDLTreeNodeEditPart) list.get(0);
-  				Object model = movingChildEditPart.getModel();
-  				EditPart pointerEditPart = viewer.findObjectAt(location);
- 
-  				if (model instanceof Input || model instanceof Output) {
-  					dragActions.add(new WSDLDragReorderAction(movingChildEditPart, pointerEditPart, getPointerLocation(location)));
-  					dragActions.add(new WSDLDragSetMessageAction(movingChildEditPart, pointerEditPart, location));
-  				}
-  				else if (model instanceof Part) {
-  					dragActions.add(new WSDLDragReorderAction(movingChildEditPart, pointerEditPart, getPointerLocation(location)));     
-  				}
-  				else if (model instanceof Fault) {
-  					dragActions.add(new WSDLDragSetMessageAction(movingChildEditPart, pointerEditPart, location));
-  				}            
-  			}
-  			else if (request.getType().equals(RequestConstants.REQ_CLONE)) {
-  				List list = request.getEditParts();
-  				if (list.size() > 0)
-  				{
-  					// Grabbing the fist selection
-  					movingChildEditPart = (WSDLTreeNodeEditPart) list.get(0);
-             
-  					dragActions.add(new CopyWSDLElementAction(viewer,
-             											  (WSDLElement) movingChildEditPart.getModel(),
-             										      (WSDLElement) targetEditPart.getModel(),
-														  null));
-  				}
-  			}
-        
-  			Iterator it = dragActions.iterator();
-  			while (it.hasNext()) {
-  				dragAction = (WSDLDragAction) it.next();
-  				canExecute = dragAction.canExecute();
-  				if (canExecute)
-  					break;
-  			}
-  		}
-  	}
-  }
-  
-  public boolean canExecute()
-  { 
-    return canExecute;
-  }     
-  
-  public void execute() {
-    if (canExecute)
-    { 
-      dragAction.run(); 
-    }
-  }
-  
-  public IFigure getFeedbackFigure() {
-  	if (dragAction != null) {
-  		return dragAction.getFeedbackFigure();
-  	}
-  	else {
-  		return null;
-  	}
-  }
-  
-  /*
-   * This method compensates for the current scroll position
-   */
-  private Point getPointerLocation(Point origPointerLocation) {
-  	 Point compensatedLocation = origPointerLocation;
-  	 FigureCanvas figureCanvas = (FigureCanvas) viewer.getControl();
-     int yOffset = figureCanvas.getViewport().getVerticalRangeModel().getValue();
-     compensatedLocation.y = compensatedLocation.y + yOffset;
-     
-     return compensatedLocation;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropEditPolicy.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropEditPolicy.java
deleted file mode 100644
index b5dddbc..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLDragAndDropEditPolicy.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-
-public class WSDLDragAndDropEditPolicy extends org.eclipse.gef.editpolicies.GraphicalEditPolicy
-{ 
-  protected EditPartViewer viewer;    
-  protected WSDLSelectionHandlesEditPolicyImpl selectionHandlesEditPolicy;
-
-  public WSDLDragAndDropEditPolicy(EditPartViewer viewer, WSDLSelectionHandlesEditPolicyImpl selectionHandlesEditPolicy)
-  {
-    this.viewer = viewer;
-    this.selectionHandlesEditPolicy = selectionHandlesEditPolicy;
-  }
-
-  public boolean understandsRequest(Request req)
-  {
-	  return true;
-  }                             
-  
-  public org.eclipse.gef.commands.Command getCommand(Request request)
-  {
-    WSDLDragAndDropCommand command = null;                            
-    if (request instanceof ChangeBoundsRequest)
-    {
-      command = new WSDLDragAndDropCommand(viewer, (ChangeBoundsRequest)request);  
-      selectionHandlesEditPolicy.setDragAndDropCommand(command);
-    } 
-    return command;             
-  }                                                     
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLGraphNodeDragTracker.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLGraphNodeDragTracker.java
deleted file mode 100644
index 182b939..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLGraphNodeDragTracker.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.tools.DragEditPartsTracker;
-                                   
-public class WSDLGraphNodeDragTracker extends DragEditPartsTracker 
-{                                     
-  protected EditPart editPart; 
-           
-  public WSDLGraphNodeDragTracker(EditPart editPart)
-  {
-    super(editPart);
-    this.editPart = editPart;
-  } 
-                                              
-  protected Command getCommand() 
-  { 
-	  Request request = getTargetRequest();
-    return editPart.getCommand(request); 
-  }
-} 

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLSelectionHandlesEditPolicyImpl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLSelectionHandlesEditPolicyImpl.java
deleted file mode 100644
index b038d9a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/editpolicies/WSDLSelectionHandlesEditPolicyImpl.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.editpolicies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.handles.MoveHandleLocator;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.IFeedbackHandler;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-
-public class WSDLSelectionHandlesEditPolicyImpl	extends SelectionHandlesEditPolicy
-{
-  protected IFigure feedback;
-  protected Rectangle originalLocation;
-  protected WSDLDragAndDropCommand dragAndDropCommand;
-
-  protected List createSelectionHandles()
-  {              
-    List list = new ArrayList();
-    EditPart editPart = getHost();  
-
-    if (editPart instanceof GraphicalEditPart)
-    {
-      GraphicalEditPart graphicalEditPart = (GraphicalEditPart)editPart;
-      IFigure figure = (graphicalEditPart instanceof WSDLTreeNodeEditPart) ? 
-                          ((WSDLTreeNodeEditPart)graphicalEditPart).getSelectionFigure() :
-                          graphicalEditPart.getFigure();
-   
-      MoveHandleLocator loc = new MoveHandleLocator(figure);    
-      MoveHandle moveHandle = new MoveHandle(graphicalEditPart, loc);     
-      list.add(moveHandle);
-    }
-
-    return list;
-  }   
-  
-
-  public boolean understandsRequest(Request request)
-  {    
-    boolean result = false;
-
-	  if (REQ_MOVE.equals(request.getType()))
-    {  
-		  result = false; // return false to disable move for now 
-    }
-    else
-    {
-	    result = super.understandsRequest(request);
-    }
-    return result;
-  }
-  
-
-  public org.eclipse.gef.commands.Command getCommand(Request request) 
-  {                                          
-    return null;  
-  }   
-
-  public void setDragAndDropCommand(WSDLDragAndDropCommand dragAndDropCommand)
-  {
-    this.dragAndDropCommand = dragAndDropCommand;
-  }
-
-  protected org.eclipse.gef.commands.Command getMoveCommand(ChangeBoundsRequest request) 
-  {
-	  ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_MOVE_CHILDREN);
-	  req.setEditParts(getHost());
-	
-	  req.setMoveDelta(request.getMoveDelta());
-	  req.setSizeDelta(request.getSizeDelta());
-	  req.setLocation(request.getLocation());
-
-	  return getHost().getParent().getCommand(req);
-  } 
-
-  public void showSourceFeedback(Request request)
-  {
-  	eraseChangeBoundsFeedback(null);
-  	
-  	if (dragAndDropCommand != null && dragAndDropCommand.canExecute()) {
-	  if (REQ_MOVE.equals(request.getType()) || REQ_ADD.equals(request.getType())) {
-		  showMoveChangeBoundsFeedback((ChangeBoundsRequest) request);
-	  }
-	  else if (REQ_CLONE.equals(request.getType())) {
-	  	  showCopyChangeBoundsFeedback((ChangeBoundsRequest) request);
-	  }
-  	}
-  }
-
-  protected void showMoveChangeBoundsFeedback(ChangeBoundsRequest request)
-  {
-  	if (dragAndDropCommand != null && dragAndDropCommand.getFeedbackFigure() != null) {
-  		feedback = dragAndDropCommand.getFeedbackFigure();
-  		addFeedback(feedback);
-  	}
-  }        
-
-  protected void showCopyChangeBoundsFeedback(ChangeBoundsRequest request)
-  {
-  	/*
-  	IFigure p = getDragSourceFeedbackFigure();
-  	Rectangle r = originalLocation.getTranslated(request.getMoveDelta());
-  	Dimension resize = request.getSizeDelta();
-  	r.width += resize.width;
-  	r.height+= resize.height;
-  
-  	((GraphicalEditPart)getHost()).getFigure().translateToAbsolute(r);
-  	p.translateToRelative(r);
-                
-    Rectangle pBounds = r.getCopy();                            
-
-    if (dragAndDropCommand != null && dragAndDropCommand.canExecute())
-    {                     
-      int size = request.getEditParts().size();
-      if (size > 0 && request.getEditParts().get(size - 1) == getHost())
-      {         
-        PointList pointList = dragAndDropCommand.getConnectionPoints(r);
-        if (pointList != null && pointList.size() > 0)
-        {
-          polyLine.setPoints(pointList);
-          
-          Point firstPoint = pointList.getFirstPoint();
-          if (firstPoint != null)
-          {
-            pBounds = pBounds.getUnion(new Rectangle(firstPoint.x, firstPoint.y, 1, 1));
-          }
-        }
-      }
-    }
-    p.setBounds(pBounds);
-    ghostShape.setBounds(r);
-  	p.validate();
-  	*/
-  }        
-/*
-  protected IFigure getDragSourceFeedbackFigure() 
-  {
-    EditPart editPart = getHost(); 
-    if (feedback == null && editPart instanceof WSDLTreeNodeEditPart)
-    {                                       
-      WSDLTreeNodeEditPart baseEditPart = (WSDLTreeNodeEditPart)editPart;
-      originalLocation = new Rectangle(baseEditPart.getSelectionFigure().getBounds());
-      feedback = createDragSourceFeedbackFigure(baseEditPart.getSelectionFigure());
-	}
-	return feedback;
-  }
-
-  protected IFigure createDragSourceFeedbackFigure(IFigure draggedFigure)
-  {  	
-  	Polyline polyLine = new Polyline();                         
-//    polyLine.setLineStyle(Graphics.LINE_DASHDOT);      
-    polyLine.setLineWidth(1);
-    addFeedback(polyLine);
-			
-  	return polyLine;
-	} 
-	*/
-
-  public void deactivate()
-  {
-	  if (feedback != null)
-    {
-		  removeFeedback(feedback);
-		  feedback = null;
-	  }
-	  hideFocus();
-	  super.deactivate();
-  }
-
-  /**
-   * Erase feedback indicating that the receiver object is 
-   * being dragged.  This method is called when a drag is
-   * completed or cancelled on the receiver object.
-   * @param dragTracker org.eclipse.gef.tools.DragTracker The drag tracker of the tool performing the drag.
-   */
-  protected void eraseChangeBoundsFeedback(ChangeBoundsRequest request) 
-  {
-	  if (feedback != null) 
-    {		      
-		  removeFeedback(feedback);
-	  }
-	  feedback = null;
-	  originalLocation = null;
-  }
-
-  /**
-   * Erase feedback indicating that the receiver object is 
-   * being dragged.  This method is called when a drag is
-   * completed or cancelled on the receiver object.
-   * @param dragTracker org.eclipse.gef.tools.DragTracker The drag tracker of the tool performing the drag.
-   */
-  public void eraseSourceFeedback(Request request) 
-  {
-    if (REQ_MOVE.equals(request.getType()) ||  REQ_ADD.equals(request.getType()))
-    {
-		  eraseChangeBoundsFeedback((ChangeBoundsRequest)request);
-    }
-  }
-
-  protected void hideSelection()
-  {
-    EditPart editPart = getHost();
-    if (editPart instanceof IFeedbackHandler)
-    {
-      ((IFeedbackHandler)editPart).removeFeedback();
-    }
-  }
-
-  protected void showSelection()
-  {
-    EditPart editPart = getHost();
-    if (editPart instanceof IFeedbackHandler)
-    {
-      ((IFeedbackHandler)editPart).addFeedback();
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/ExpandableGraphNodeContentFigure.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/ExpandableGraphNodeContentFigure.java
deleted file mode 100644
index 0120df3..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/ExpandableGraphNodeContentFigure.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.Interactor;
-
-              
-              
-
-//  --------------------------------------------
-//  | ExpandableGraphNodeContentFigure         |
-//  |                                          |
-//  |   ----------------------------------     |
-//  |   | verticalGroup                  |     |
-//  |   |                                |     |
-//  |   | -----------------------------  |     |
-//  |   | | horizontalGroup           |  |     |
-//  |   | |                           |  |     |
-//  |   | | ---------------------     |  |     |
-//  |   | | | outlinedArea      |     |  |     |
-//  |   | | | ----------------- |     |  |     |
-//  |   | | | |[+]iconArea    | |     |  |     |
-//  |   | | | ----------------- |     |  |     |
-//  |   | | | ----------------- |     |  |     |
-//  |   | | | | innerContent  | |     |  |     |
-//  |   | | | ----------------- |     |  |     |
-//  |   | | ---------------------     |  |     |
-//  |   | -----------------------------  |     |
-//  |   |                                |     |
-//  |   ----------------------------------     |
-//  --------------------------------------------
-
-public class ExpandableGraphNodeContentFigure extends GraphNodeContentFigure
-{   
-  protected Interactor interactor; 
-  //protected ContainerFigure occurenceArea;  
- 
-  public ExpandableGraphNodeContentFigure()
-  {
-    super();    
-  }      
-  
-  public Interactor getInteractor()
-  {
-    return interactor;
-  } 
-
-
-  protected void createFigure()
-  {   
-    //createPreceedingSpace(this);           
-    createVerticalGroup(this);
-    createOutlinedArea(verticalGroup);   
-    createInteractor(iconArea);
-    innerContentArea.setBorder(new MarginBorder(0, 10, 0, 0));
-    //createOccurenceArea(verticalGroup);   
-  }
-  
-              
-
-  protected void createInteractor(IFigure parent)
-  {
-    interactor = new Interactor();
-    interactor.setBorder(new MarginBorder(0, 0, 0, 5));
-    interactor.setForegroundColor(ColorConstants.black);
-    interactor.setBackgroundColor(ColorConstants.white); 
-    parent.add(interactor);
-  } 
-
-                                
-  protected void createPreceedingSpace(IFigure parent)
-  {
-    // create a small space
-    RectangleFigure space = new RectangleFigure();
-    space.setVisible(false);
-    space.setPreferredSize(new Dimension(10, 10));
-    parent.add(space);  
-  }  
-  
-
-  //protected void createOccurenceArea(IFigure parent)
-  //{
-  //  occurenceArea = new ContainerFigure();             
-  //  parent.add(occurenceArea);
-  //}                 
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/GraphNodeContentFigure.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/GraphNodeContentFigure.java
deleted file mode 100644
index 94af5a4..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/GraphNodeContentFigure.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.figures;
-                                         
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IConnectedFigure;
-              
-
-//  ------------------------------
-//  | GraphNodeContentFigure     |
-//  |                            |
-//  | -------------------------  |
-//  | | vertical group        |  |
-//  | | --------------------- |  |
-//  | | | outlined area     | |  |
-//  | | | ----------------- | |  |
-//  | | | | icon area     | | |  |
-//  | | | ----------------- | |  |
-//  | | | ----------------- | |  |
-//  | | | | inner content | | |  |
-//  | | | ----------------- | |  |
-//  | | --------------------- |  |
-//  | -------------------------  |
-//  ------------------------------
-
-public class GraphNodeContentFigure extends ContainerFigure implements IConnectedFigure
-{                        
-  protected ContainerFigure verticalGroup; 
-  protected ContainerFigure outlinedArea;
-  protected ContainerFigure iconArea;
-  protected ContainerFigure innerContentArea; 
-         
-  public GraphNodeContentFigure()
-  {                                    
-    createFigure();                    
-  }      
-                  
-  protected void createFigure()
-  {                     
-    //getContainerLayout().setHorizontal(true);
-    //setLayoutManager(new FillLayout());
-    createVerticalGroup(this);
-    createOutlinedArea(verticalGroup); 
-  }
-
-  protected void createVerticalGroup(IFigure parent)
-  {
-    verticalGroup = new ContainerFigure();
-    verticalGroup.getContainerLayout().setHorizontal(false);
-    ///verticalGroup.setLayoutManager(new FillLayout());
-    parent.add(verticalGroup);
-  }
-
-  protected void createOutlinedArea(IFigure parent)
-  { 
-    outlinedArea = new ContainerFigure();
-    //outlinedArea.setLayoutManager(new FillLayout());
-    outlinedArea.getContainerLayout().setHorizontal(false);
-    parent.add(outlinedArea);      
-     
-    iconArea = new ContainerFigure();
-    iconArea.getContainerLayout().setHorizontal(true);
-    outlinedArea.add(iconArea);
-
-    innerContentArea = new ContainerFigure();
-    //innerContentArea.setLayoutManager(new FillLayout());
-    innerContentArea.getContainerLayout().setHorizontal(false);
-    outlinedArea.add(innerContentArea);  
-  }   
-
-  public ContainerFigure getIconArea()
-  {
-    return iconArea;
-  }
-
-  public ContainerFigure getOutlinedArea()
-  {
-    return outlinedArea;
-  }
-
-  public ContainerFigure getInnerContentArea()
-  {
-    return innerContentArea;
-  } 
-
-  public IFigure getConnectionFigure()
-  {
-    return outlinedArea;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/MyConnectionRenderingHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/MyConnectionRenderingHelper.java
deleted file mode 100644
index af8537d..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/MyConnectionRenderingHelper.java
+++ /dev/null

@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.figures;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.DefinitionEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.GroupEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.PartReferenceSectionEditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IConnectedFigure;
-              
-
-public class MyConnectionRenderingHelper //implements ISelectionChangedListener
-{               
-  protected boolean isOutlined = true;
-  protected EditPartViewer viewer;
-
-  public MyConnectionRenderingHelper(EditPartViewer viewer)
-  {
-    this.viewer = viewer;    
-    //viewer.addSelectionChangedListener(this);
-    //setFocusTraversable(false); 
-    //setEnabled(false); 
-  }      
-  
-  //public void selectionChanged(SelectionChangedEvent event) 
-  //{
-  //}
-            
-  public void fillShapeHelper(Graphics graphics)
-  { 
-    drawLines(graphics, viewer.getRootEditPart());    
-  }
-                 
-  protected Rectangle getConnectionBounds(IFigure figure)
-  {                 
-    Rectangle r = null;
-    if (figure instanceof IConnectedFigure)
-    {
-      IConnectedFigure connectedFigure = (IConnectedFigure)figure;
-      r = connectedFigure.getConnectionFigure().getBounds();
-    }
-    else
-    {
-      r = figure.getBounds();
-    }
-    return r; 
-  }                      
-            
-  final static int DOTTED_LINE_HEIGHT = 20;
-  protected int getClippedY(int y, Rectangle bounds)
-  {                        
-    if (bounds != null)
-    {
-      if (y < bounds.y)
-      {
-        y = bounds.y;
-      }     
-      if (y  > (bounds.y + bounds.height))
-      {
-        y = bounds.y + bounds.height; 
-      }
-    }
-    return y;
-  }
-    
-  protected void drawLine(Graphics graphics, IFigure a, IFigure b, int mx, Rectangle bounds)
-  {
-        Rectangle r1 = getConnectionBounds(a);
-        Rectangle r2 = getConnectionBounds(b);
-        int x1 = r1.x + r1.width;
-        int y1 = r1.y + r1.height / 2;
-        int x2 = r2.x - 1;
-        int y2 = r2.y + r2.height / 2;
-          
-        int clippedY1 = getClippedY(y1, bounds);
-        int clippedY2 = getClippedY(y2, bounds);
-
-        graphics.setForegroundColor(ColorConstants.black);
-
-        if (clippedY1 == y1 || clippedY2 == y2)
-        {                       
-          if (clippedY1 == y1)
-          {                                                
-            // draw horizontal line
-            graphics.drawLine(x1, y1, mx, y1); 
-          }
-       
-          if (clippedY2 == y2)
-          {        
-            // draw horizontal line
-            graphics.drawLine(mx, y2, x2 - 1, y2);    
-
-            // draw the arrow head
-            //
-            graphics.drawLine(x2 - 1, y2, x2 - 4, y2 - 3); 
-            graphics.drawLine(x2 - 1, y2, x2 - 4, y2 + 3); 
-          }  
-                  
-            
-          // draw the vertical line including dotted ends
-          //
-          int lowClippedY = Math.min(clippedY1, clippedY2);
-          int highClippedY = Math.max(clippedY1, clippedY2);
-          int lowY = Math.min(y1, y2);
-          int highY = Math.max(y1, y2);
-            
-          if (lowY == lowClippedY && highY == highClippedY)
-          {
-            graphics.drawLine(mx, lowClippedY, mx, highClippedY);
-          }
-          else
-          { 
-            int dottedLineLength = Math.min(DOTTED_LINE_HEIGHT, (highY - lowY)/3);
-            if (lowY != lowClippedY)
-            {
-              graphics.setLineStyle(Graphics.LINE_DOT);
-              int dottedY = lowClippedY + dottedLineLength;
-              graphics.drawLine(mx, lowClippedY, mx, dottedY); 
-              graphics.setLineStyle(Graphics.LINE_SOLID);
-              graphics.drawLine(mx, dottedY, mx, highClippedY); 
-            }
-            else //if (highY != highClippedY)
-            {
-              graphics.setLineStyle(Graphics.LINE_DOT);
-              int dottedY = highClippedY - dottedLineLength;
-              graphics.drawLine(mx, highClippedY, mx, dottedY); 
-              graphics.setLineStyle(Graphics.LINE_SOLID);
-              graphics.drawLine(mx, dottedY, mx, lowClippedY); 
-            }                              
-          }
-        }
-  }
-
-  protected void drawLines(Graphics graphics, EditPart editPart)
-  { 
-    if (editPart instanceof GroupEditPart)
-    { 
-      GroupEditPart leftGroupEditPart = (GroupEditPart)editPart;
-      GroupEditPart rightGroupEditPart = leftGroupEditPart.getNext();
-
-      if (leftGroupEditPart != null && rightGroupEditPart != null)
-      {                                                  
-        if (leftGroupEditPart.outputConnection != null && rightGroupEditPart.inputConnection != null)
-        {
-          int mx = rightGroupEditPart.getFigure().getBounds().x - 5;                                                      
-
-          Rectangle l = leftGroupEditPart.outerPane.getBounds();
-          Rectangle r = leftGroupEditPart.outerPane.getBounds();
-
-          // here we compute the union of the group bounds... rectangle.union() doesn't seem to work
-          //
-          int ux1 = Math.min(l.x, r.x); 
-          int uy1 = Math.min(l.y, r.y);       
-          int ux2 = Math.max(l.x + l.width, r.x + r.width);
-          int uy2 = Math.max(l.y + l.height, r.y + r.height);
-          Rectangle bounds = new Rectangle(ux1, uy1, ux2 - ux1, uy2 - uy1);       
-          drawLine(graphics, leftGroupEditPart.outputConnection.getFigure(), rightGroupEditPart.inputConnection.getFigure(), mx, bounds);      
-        }
-      }                                              
-    }  
-    else if (editPart instanceof PartReferenceSectionEditPart)
-    {
-      AbstractGraphicalEditPart child = (editPart.getChildren().size() > 0) ? 
-                                        (AbstractGraphicalEditPart)editPart.getChildren().get(0) :
-                                        null;
-      if (child != null)
-      {
-        DefinitionEditPart def = (DefinitionEditPart)editPart.getParent();
-        GroupEditPart groupEditPart = def.getGroupEditPart(WSDLGroupObject.MESSAGES_GROUP);
-        if (groupEditPart != null && groupEditPart.outputConnection != null)
-        {
-          int mx = child.getFigure().getBounds().x - 12;
-          drawLine(graphics, groupEditPart.outputConnection.getFigure(), child.getFigure(), mx, null);
-        }
-      }
-    }
-    else
-    {
-      for (Iterator i = editPart.getChildren().iterator(); i.hasNext(); )
-      {
-        EditPart child = (EditPart)i.next();
-        drawLines(graphics, child);
-      }
-    } 
-  }    
-}     
-
-/*
-    /*
-    List children = figure.getChildren();
-    for (Iterator i = children.iterator(); i.hasNext(); )
-    {
-      IFigure child = (IFigure)i.next();
-      drawLines(graphics, child);    
-    } */ 
-      /*  
-      List connectedFigures = graphNodeFigure.getConnectedFigures(IConnectedEditPartFigure.RIGHT_CONNECTION);
-      int connectedFiguresSize = connectedFigures.size();              
-
-      if (connectedFiguresSize > 0) 
-      {                                         
-        IConnectedEditPartFigure firstGraphNodeFigure = (IConnectedEditPartFigure)connectedFigures.get(0);
-        Rectangle r = graphNodeFigure.getConnectionFigure().getBounds();    
-          
-        int x1 = r.x + r.width;
-        int y1 = r.y + r.height/2;
-                                                                                   
-        int startOfChildBox = firstGraphNodeFigure.getConnectionFigure().getBounds().x;
-        int x2 = x1 + (startOfChildBox - x1) / 3;
-        int y2 = y1;
-      
-        if (connectedFiguresSize == 1)
-        {
-          graphics.drawLine(x1, y1, startOfChildBox, y2);   
-        }
-        else // (connectedFigures.length > 1)
-        { 
-          graphics.drawLine(x1, y1, x2, y2);
-
-          int minY = Integer.MAX_VALUE;
-          int maxY = -1;
-
-          for (Iterator i = connectedFigures.iterator(); i.hasNext(); )
-          {                                 
-            IConnectedEditPartFigure connectedFigure = (IConnectedEditPartFigure)i.next();
-            Rectangle childConnectionRectangle = connectedFigure.getConnectionFigure().getBounds();
-            int y = childConnectionRectangle.y + childConnectionRectangle.height / 2;
-            minY = Math.min(minY, y);
-            maxY = Math.max(maxY, y);
-            graphics.drawLine(x2, y, childConnectionRectangle.x, y);
-          }                   
-          graphics.drawLine(x2, minY, x2, maxY);
-        }                          
-      }                             
-    }            
-
-    //boolean visitChildren = true;
-    List children = figure.getChildren();
-    for (Iterator i = children.iterator(); i.hasNext(); )
-    {
-      IFigure child = (IFigure)i.next();
-      drawLines(graphics, child);
-    }
-*/

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/TreeNodeContentFigure.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/TreeNodeContentFigure.java
deleted file mode 100644
index 628b798..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/figures/TreeNodeContentFigure.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.figures;
-                                         
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-              
-
-public class TreeNodeContentFigure extends ExpandableGraphNodeContentFigure
-{            
-  protected void createOutlinedArea(IFigure parent)
-  {                   
-    super.createOutlinedArea(parent);
-    outlinedArea.setBorder(new MarginBorder(0,2,0,2)); 
-  }    
-  
-  public IFigure getConnectionFigure()
-  {
-    return outlinedArea;
-  }           
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/model/WSDLGraphModelAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/model/WSDLGraphModelAdapterFactory.java
deleted file mode 100644
index c336ce0..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/graph/model/WSDLGraphModelAdapterFactory.java
+++ /dev/null

@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.graph.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.graph.ViewMode;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-
-public class WSDLGraphModelAdapterFactory extends WSDLModelAdapterFactory
-{          
-  protected static WSDLGraphModelAdapterFactory wsdlGraphModelAdapterFactoryInstance;
-
-  public static WSDLGraphModelAdapterFactory getWSDLGraphModelAdapterFactory()
-  {                
-    if (wsdlGraphModelAdapterFactoryInstance == null)
-    {
-      wsdlGraphModelAdapterFactoryInstance = new WSDLGraphModelAdapterFactory();
-    }
-    return wsdlGraphModelAdapterFactoryInstance;
-  }  
-  
-  protected AdapterFactory createAdapterFactory()
-  {
-    return new GraphAdapterFactory();
-  }  
-
-  //protected boolean isExtensibilityElementConsideredChild()
-  //{
-  //  return false;
-  //}
-        
-
-  // There are many adapters associated with this factory.  Each DOM Node has its own adapter.
-  //
-  protected class GraphAdapterFactory extends WSDLAdapterFactoryImpl
-  {                                                                
-
-    public Adapter createDefinitionAdapter()
-    {
-      return new GraphDefinitionAdapter();
-    } 
-    
-    public Adapter createBindingAdapter()
-    {
-      return new GraphBindingAdapter();
-    } 
-
-    public Adapter createPartAdapter()
-    {
-      return new GraphPartAdapter();
-    }                                         
-
-    //public Adapter createPortAdapter()
-    //{
-    //  return new GraphPortAdapter();
-    //}
-
-    public Adapter createPortTypeAdapter()
-    {
-      return new GraphPortTypeAdapter();
-    }
-
-    //public Adapter createInputAdapter()
-    //{
-    //  return new GraphInputAdapter();
-    //} 
-
-    //public Adapter createOutputAdapter()
-    //{
-    //  return new GraphOutputAdapter();
-    //}   
-
-    //public Adapter createFaultAdapter()
-    //{
-    //  return new GraphFaultAdapter();
-    //}
-
-  	public Adapter createTypesAdapter() 
-    {                    
-      return new GraphTypesAdapter();
-    }
-  }      
-
-        
-  
-  protected class GraphDefinitionAdapter extends DefinitionAdapter implements ViewMode.Listener
-  {                
-    protected ViewMode viewMode = new ViewMode();  
- 
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);   
-      viewMode.addListener(this);         
-    }
-                                                      
-    protected List getChildren()
-    {             
-      List list = new ArrayList();
-      list.add(permanentWSDLGroupObjectList.get(0));
-      list.add(permanentWSDLGroupObjectList.get(1));  
-      list.add(permanentWSDLGroupObjectList.get(5));
-      if (viewMode.isBindingVisible())
-      {
-        list.add(permanentWSDLGroupObjectList.get(4));
-      } 
-      list.add(permanentWSDLGroupObjectList.get(3));  
-      list.add(permanentWSDLGroupObjectList.get(2));  
-      if (extensibilityElementsGroup.getChildren().size() > 0)
-      {
-        list.add(extensibilityElementsGroup);
-      }
-      return list;      
-    }
-
-  
-    public void viewModeChanged(ViewMode mode)
-    {
-      firePropertyChangedHelper();
-    }    
-
-    public ViewMode getViewMode()
-    {
-      return viewMode;
-    }    
-
-    protected ModelAdapterFactory getModelAdapterFactory()
-    {
-      return getWSDLGraphModelAdapterFactory();
-    }
-  }
-
-
-
-
-  protected class GraphBindingAdapter extends BindingAdapter
-  { /*                                  
-    protected List getChildren()
-    {                
-      List list = new ArrayList();   
-      if (binding.getPortType() != null)
-      {
-        list.add(binding.getPortType());
-      }
-      return list;
-    }*/  
-  }
-      
-                        
-  protected class GraphPartAdapter extends PartAdapter
-  { /*  
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();
-
-      Object component = part.getType();
-      if (component != null) 
-      {
-        // TODO... i'm pulling a fast one here.... we should call the extension
-        // to see if he wants to show a child here
-        if (component instanceof org.eclipse.xsd.XSDComplexTypeDefinition)
-        {
-          list.add(component);
-        }
-      }
-      else
-      {
-        component = part.getElement();
-        if (component != null)
-        {
-          list.add(component);
-        }
-      }
-
-      return list;
-    }*/   
-  }
-    
-  protected class GraphPortTypeAdapter extends PortTypeAdapter
-  {   
-    public Object getProperty(Object modelObject, String propertyName)
-    {           
-      Object result = null;
-      if (propertyName.equals("bindings"))
-      {    
-        ComponentReferenceUtil util = new ComponentReferenceUtil(portType.getEnclosingDefinition());
-        result = util.getBindings(portType);
-      }
-      else
-      {
-        result = super.getProperty(modelObject, propertyName);
-      }   
-      return result;
-    }  
-  }
-
-  protected class GraphPortAdapter extends PortAdapter implements ModelAdapterListener
-  {                                                
-    protected List getChildren()
-    {                
-      List list = new ArrayList(); 
-    
-      Binding binding = (Binding)port.getBinding();
-
-      if (binding != null)
-      {
-        list.add(binding);
-      }
-     
-      return list;
-    }
-                     
-    // propagate changes to the binding object
-    //
-    public void propertyChanged(Object object, String property)
-    {
-      firePropertyChanged(port, null);
-    }
-  }   
-            
-
-  protected class GraphInputAdapter extends InputAdapter
-  {
-    protected List getChildren()
-    {     
-      List list = new ArrayList();
-      if (input.getMessage() != null)
-      {
-        list.add(input.getMessage());
-      }       
-      return list;
-    }     
-
-    public Object getProperty(Object modelObject, String propertyName)
-    {           
-      Object result = null;
-      if (propertyName.equals("bindings"))
-      {    
-        ComponentReferenceUtil util = new ComponentReferenceUtil(input.getEnclosingDefinition());
-        result = util.getBindingInputs(input);
-      }
-      else
-      {
-        result = super.getProperty(modelObject, propertyName);
-      }   
-      return result;
-    }   
-  }
-
-
-  protected class GraphOutputAdapter extends OutputAdapter
-  {
-    protected List getChildren()
-    {     
-      List list = new ArrayList();
-      if (output.getMessage() != null)
-      {
-        list.add(output.getMessage());
-      }       
-      return list;
-    }  
-
-    public Object getProperty(Object modelObject, String propertyName)
-    {           
-      Object result = null;
-      if (propertyName.equals("bindings"))
-      {    
-        ComponentReferenceUtil util = new ComponentReferenceUtil(output.getEnclosingDefinition());
-        result = util.getBindingOutputs(output);
-      }
-      else
-      {
-        result = super.getProperty(modelObject, propertyName);
-      }   
-      return result;
-    }   
-  }
-
-  protected class GraphFaultAdapter extends FaultAdapter
-  {
-    protected List getChildren()
-    {     
-      List list = new ArrayList();
-      if (fault.getMessage() != null)
-      {
-        list.add(fault.getMessage());
-      }       
-      return list;
-    }  
-
-    public Object getProperty(Object modelObject, String propertyName)
-    {           
-      Object result = null;
-      if (propertyName.equals("bindings"))
-      {    
-        ComponentReferenceUtil util = new ComponentReferenceUtil(fault.getEnclosingDefinition());
-        result = util.getBindingFaults(fault);
-      }
-      else
-      {
-        result = super.getProperty(modelObject, propertyName);
-      }   
-      return result;
-    }                                     
-  }     
-
-  public class GraphTypesAdapter extends TypesAdapter
-  {                                             
-    protected List getChildren()
-    {  
-      List list = new ArrayList();
-      for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext(); )
-      {
-        Object o = i.next();
-        if (o instanceof XSDSchemaExtensibilityElement)
-        {
-          XSDSchemaExtensibilityElement s = (XSDSchemaExtensibilityElement)o;
-          Object schema = s.getSchema();
-          if (schema != null)
-          {
-            list.add(schema);
-          }
-        } 
-        else
-        {
-          list.add(o);
-        }
-      }
-      return list;
-    }                                                                                                         
-  }
-  /*
-  protected class GraphBindingAdapter extends BindingAdapter
-  {                                   
-    protected List getChildren()
-    {                
-      List list = new ArrayList();   
-      if (binding.getPortType() != null)
-      {
-        list.add(binding.getPortType());
-      }
-      return list;
-    }  
-  }*/
-
-  // convenience methods
-  //
-  public static void addModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {                                                               
-// TODO: port check
-    ModelAdapter adapter = getWSDLGraphModelAdapterFactory().getAdapter(modelObject);
-//    ModelAdapter adapter = EcoreUtil.getAdapter(getWSDLGraphModelAdapterFactory().eAdapters(),modelObject);
-    if (adapter != null)
-    {
-      adapter.addListener(listener);
-    }
-  }    
-
-  public static void removeModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {                                                            
-    ModelAdapter adapter = getWSDLGraphModelAdapterFactory().getAdapter(modelObject);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener);
-    }
-  } 
-
-  public static ViewMode getViewMode(Definition definition)
-  {
-    GraphDefinitionAdapter adapter = (GraphDefinitionAdapter)getWSDLGraphModelAdapterFactory().getAdapter(definition);
-    return adapter.getViewMode();
-  }           
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/back.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/back.gif
deleted file mode 100644
index 24d1a27..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/back.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/binding_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/binding_obj.gif
deleted file mode 100644
index 896e2f0..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/binding_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/bindingheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/bindingheader_obj.gif
deleted file mode 100644
index 1ffe54e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/bindingheader_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/browsebutton.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/browsebutton.gif
deleted file mode 100644
index e2402f8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/browsebutton.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/complextype_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/complextype_obj.gif
deleted file mode 100644
index 007f852..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/complextype_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/element_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/element_obj.gif
deleted file mode 100644
index dd45f08..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/element_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/error_co.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/error_co.gif
deleted file mode 100644
index 119dccc..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/error_co.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fault_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fault_obj.gif
deleted file mode 100644
index f228117..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fault_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/file_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/file_obj.gif
deleted file mode 100644
index efa7a38..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/file_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fldr_el.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fldr_el.gif
deleted file mode 100644
index 801c133..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/fldr_el.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/forward.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/forward.gif
deleted file mode 100644
index eab699e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/forward.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/hidebinding.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/hidebinding.gif
deleted file mode 100644
index c846cd8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/hidebinding.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpaddress_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpaddress_obj.gif
deleted file mode 100644
index fb20c38..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpaddress_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpbinding_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpbinding_obj.gif
deleted file mode 100644
index 4428ef3..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpbinding_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpoperation_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpoperation_obj.gif
deleted file mode 100644
index 1c40418..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpoperation_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlencoded_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlencoded_obj.gif
deleted file mode 100644
index ed5050f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlencoded_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlreplacement_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlreplacement_obj.gif
deleted file mode 100644
index 273587e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/httpurlreplacement_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/import_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/import_obj.gif
deleted file mode 100644
index b7275aa..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/import_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/importheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/importheader_obj.gif
deleted file mode 100644
index 6000cb8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/importheader_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/input_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/input_obj.gif
deleted file mode 100644
index fe6b349..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/input_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/message_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/message_obj.gif
deleted file mode 100644
index 2dce483..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/message_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/messageheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/messageheader_obj.gif
deleted file mode 100644
index 02a711c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/messageheader_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespace_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespace_obj.gif
deleted file mode 100644
index 7e3f274..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespace_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespacedecl_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespacedecl_obj.gif
deleted file mode 100644
index 2b79d27..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/namespacedecl_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/new_wsdl_wiz.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/new_wsdl_wiz.gif
deleted file mode 100644
index d1087b9..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/new_wsdl_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operation_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operation_obj.gif
deleted file mode 100644
index 5818a30..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operation_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operationbinding_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operationbinding_obj.gif
deleted file mode 100644
index ae386c6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/operationbinding_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_no.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_no.gif
deleted file mode 100644
index f6b9f8a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_no.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_obj.gif
deleted file mode 100644
index bd0918c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_yes.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_yes.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/output_yes.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/page_banner.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/page_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/page_banner.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/part_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/part_obj.gif
deleted file mode 100644
index 5219dfa..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/part_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/port_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/port_obj.gif
deleted file mode 100644
index 379498b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/port_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttype_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttype_obj.gif
deleted file mode 100644
index 21325ca..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttype_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttypeheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttypeheader_obj.gif
deleted file mode 100644
index 9afcc01..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/porttypeheader_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtcmplxpltyp_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtcmplxpltyp_obj.gif
deleted file mode 100644
index db86643..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtcmplxpltyp_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtelemt_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtelemt_obj.gif
deleted file mode 100644
index 782d108..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtelemt_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtsmpltyp_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtsmpltyp_obj.gif
deleted file mode 100644
index 8ffc7c5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/prtsmpltyp_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/service_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/service_obj.gif
deleted file mode 100644
index 5216b3f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/service_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/serviceheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/serviceheader_obj.gif
deleted file mode 100644
index 8b4814c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/serviceheader_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/simpletype_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/simpletype_obj.gif
deleted file mode 100644
index e45dbb1..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/simpletype_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soap_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soap_obj.gif
deleted file mode 100644
index fd426ed..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soap_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapaddress_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapaddress_obj.gif
deleted file mode 100644
index 4880ba7..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapaddress_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapatt_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapatt_obj.gif
deleted file mode 100644
index d0b3661..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapatt_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbinding_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbinding_obj.gif
deleted file mode 100644
index 115f6bf..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbinding_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbody_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbody_obj.gif
deleted file mode 100644
index b2d01aa..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapbody_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapfault_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapfault_obj.gif
deleted file mode 100644
index 856b1f7..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapfault_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheader_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheader_obj.gif
deleted file mode 100644
index f72ea3b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheader_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheaderfault_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheaderfault_obj.gif
deleted file mode 100644
index 2f0e190..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapheaderfault_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapoperation_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapoperation_obj.gif
deleted file mode 100644
index bcc1914..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/soapoperation_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/types_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/types_obj.gif
deleted file mode 100644
index d1f6f88..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/types_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/validate.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/validate.gif
deleted file mode 100644
index 2b347ac..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/validate.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/wsdl_file_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/wsdl_file_obj.gif
deleted file mode 100644
index 75b1f92..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/wsdl_file_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_file_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_file_obj.gif
deleted file mode 100644
index 13dcfce..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_file_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_obj.gif b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_obj.gif
deleted file mode 100644
index 13dcfce..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/icons/xsd_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapter.java
deleted file mode 100644
index 0e53e7e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapter.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.model;
-
-public interface ModelAdapter
-{               
-  public static final String CHILDREN_PROPERTY = "CHILDREN_PROPERTY";
-  public static final String LABEL_PROPERTY = "LABEL_PROPERTY";
-  public static final String IMAGE_PROPERTY = "IMAGE_PROPERTY";
-  public static final String DETAIL_PROPERTY = "DETAIL_PROPERTY";
-                                       
-  public void addListener(ModelAdapterListener l);
-  public void removeListener(ModelAdapterListener l);
-  public Object getProperty(Object modelObject, String propertyName); 
-  public void firePropertyChanged(Object modelObject, String propertyName);
-}
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterFactory.java
deleted file mode 100644
index 9db0daa..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterFactory.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.model;
-
-public interface ModelAdapterFactory
-{
-  public ModelAdapter getAdapter(Object o);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterListener.java
deleted file mode 100644
index 1e3e851..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/ModelAdapterListener.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.model;
-
-public interface ModelAdapterListener
-{                             
-  public void propertyChanged(Object object, String property);
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLGroupObject.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLGroupObject.java
deleted file mode 100644
index 5d9abfa..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLGroupObject.java
+++ /dev/null

@@ -1,414 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.model;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-
-
-  
-// Note that the TYPES_GROUP group is just a place holder.  If the Types obejct actually exists 
-// for the root WSDL document, it will be used instead of this model group
-//
-public class WSDLGroupObject implements ModelAdapter
-{
-  public static final int IMPORTS_GROUP = 1;
-  public static final int MESSAGES_GROUP = 2;
-  public static final int SERVICES_GROUP = 3;
-  public static final int PORT_TYPES_GROUP = 4;
-  public static final int BINDINGS_GROUP = 5;
-  public static final int TYPES_GROUP = 6;  
-  public static final int EXTENSIBILITY_ELEMENTS_GROUP = 7;
-         
-  protected Definition definition;
-  protected int type;       
-  protected List listenerList = new ArrayList();
-  protected ModelAdapterFactory modelAdapterFactory;
-
-  public WSDLGroupObject(Definition definition, int type)
-  {
-    this(definition, type, null);
-  }  
-
-  public WSDLGroupObject(Definition definition, int type, ModelAdapterFactory modelAdapterFactory)
-  {
-    this.definition = definition;
-    this.type = type;        
-    this.modelAdapterFactory = modelAdapterFactory;
-  }
-     
-  public Definition getParent()
-  {
-    return definition;
-  }               
-
-  public Definition getDefinition()
-  {
-    return definition;
-  }               
-
-
-  public int getType()
-  {
-    return type;
-  }
-
-  public String getLabel()
-  {            
-    String name = "";
-    switch (type)
-    {
-      case IMPORTS_GROUP :
-      {           
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_IMPORTS");  //$NON-NLS-1$
-        break;
-      }
-      case MESSAGES_GROUP :
-      {    
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_MESSAGES"); //$NON-NLS-1$
-        break;
-      }
-      case SERVICES_GROUP :
-      {
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_SERVICES"); //$NON-NLS-1$
-        break;
-      }
-      case BINDINGS_GROUP :
-      {                   
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_BINDINGS"); //$NON-NLS-1$
-        break;
-      }    
-      case PORT_TYPES_GROUP :
-      {                   
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_PORTTYPES"); //$NON-NLS-1$
-        break;
-      }  
-      case TYPES_GROUP :
-      {                   
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_TYPES"); //$NON-NLS-1$
-        break;
-      } 
-      case EXTENSIBILITY_ELEMENTS_GROUP:
-      {
-        name = WSDLEditorPlugin.getWSDLString("_UI_FOLDER_EXTENSIBILITY_ELEMENTS"); //$NON-NLS-1$
-        break;
-      }
-    }  
-    return name;
-  }    
-         
-
-  public Image getImage()
-  {                
-    Image image = null;
-    switch (type)
-    {
-      case IMPORTS_GROUP :
-      {    
-        image = WSDLEditorPlugin.getInstance().getImage("icons/importheader_obj.gif"); //$NON-NLS-1$
-        break;
-      }
-      case MESSAGES_GROUP :
-      {    
-        image = WSDLEditorPlugin.getInstance().getImage("icons/messageheader_obj.gif"); //$NON-NLS-1$
-        break;
-      }
-      case SERVICES_GROUP :
-      {
-        image = WSDLEditorPlugin.getInstance().getImage("icons/serviceheader_obj.gif"); //$NON-NLS-1$
-        break;
-      }
-      case PORT_TYPES_GROUP :
-      {                   
-        image = WSDLEditorPlugin.getInstance().getImage("icons/porttypeheader_obj.gif"); //$NON-NLS-1$
-        break;
-      }
-      case BINDINGS_GROUP :
-      {                   
-        image = WSDLEditorPlugin.getInstance().getImage("icons/bindingheader_obj.gif"); //$NON-NLS-1$
-        break;
-      }    
-      case TYPES_GROUP :
-      {                   
-        image = WSDLEditorPlugin.getInstance().getImage("icons/types_obj.gif"); //$NON-NLS-1$
-        break;
-      } 
-      case EXTENSIBILITY_ELEMENTS_GROUP:
-      {
-        image = WSDLEditorPlugin.getInstance().getImage("icons/fldr_el.gif"); //$NON-NLS-1$
-        break;
-      }
-    }  
-    return image;
-  }   
-
-
-  // implement ModelAdapter                                                             
-  public void addListener(ModelAdapterListener listener)
-  {
-    if (!listenerList.contains(listener))
-    {
-      listenerList.add(listener);
-    }
-  }   
-
-  public void removeListener(ModelAdapterListener listener)
-  {
-    listenerList.remove(listener);
-  } 
-
-
-  public Object getProperty(Object modelObject, String propertyName)
-  {       
-    Object result = null;
-    if (propertyName.equals(CHILDREN_PROPERTY))
-    {
-      result = getChildren();      
-    }                    
-    else if (propertyName.equals(LABEL_PROPERTY))
-    {
-      result = getLabel();      
-    }    
-    else if (propertyName.equals(IMAGE_PROPERTY))
-    {
-      result = getImage();      
-    }       
-    return result;
-  }
-
-
-  public  void firePropertyChanged(Object notifier, String property)
-  {                       
-    List list = new ArrayList();
-    list.addAll(listenerList);
-    for (Iterator i = list .iterator(); i.hasNext(); )
-    {
-      ModelAdapterListener listener = (ModelAdapterListener)i.next();
-      listener.propertyChanged(notifier, property);
-    }
-  } 
-   
-
-  public List getChildren()
-  {
-    List list = Collections.EMPTY_LIST;
-              
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-    switch (getType())
-    {
-      case WSDLGroupObject.IMPORTS_GROUP : 
-      {   
-        list = definition.getEImports();
-        break;
-      }
-      case WSDLGroupObject.MESSAGES_GROUP : 
-      {
-        try
-        {
-          list = sortMessages(util.getMessages());
-        }
-        catch(Exception e)
-        {
-          list = util.getMessages();
-        }  
-        break;
-      }
-      case WSDLGroupObject.SERVICES_GROUP : 
-      {
-        list = util.getServices();
-        break;
-      }
-      case WSDLGroupObject.PORT_TYPES_GROUP : 
-      {       
-        list = util.getPortTypes();
-        break;
-      }
-      case WSDLGroupObject.BINDINGS_GROUP : 
-      {
-        list = util.getBindings();
-        break;
-      }
-      case WSDLGroupObject.TYPES_GROUP : 
-      {                     
-        Object types = definition.getETypes();
-        if (types != null)                                                   
-        {
-          list = (List)modelAdapterFactory.getAdapter(types).getProperty(types, ModelAdapter.CHILDREN_PROPERTY);
-        }
-        break;
-      }     
-      case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP:
-      {
-        list = WSDLEditorUtil.getInstance().getExtensibilityElementNodes(definition);
-        break;
-      }
-    }   
-    return list;
-  }
-  
-  private List initialSort(List inputList) {
-  	List messageGroups = new ArrayList();
-  	Iterator iterator = inputList.iterator();
-  	
-  	while (iterator.hasNext()) {
-  		Message newMessage = (Message) iterator.next();
-  		
-  		boolean messageAdded = false;
-  		for (int index = 0; index < messageGroups.size(); index++) {
-  			MessageGroup messageItem = (MessageGroup) messageGroups.get(index);
-  			
-  			if(messageItem.addMessage(newMessage)) {
-  				messageAdded = true;
-  				break;
-  			}
-  		}
-  		
-  		// Do we need to create a new MessageGroup object?
-  		if (!messageAdded) {
-  			MessageGroup msGroup = new MessageGroup(newMessage.getQName().getLocalPart());
-			msGroup.addMessage(newMessage);
-  			messageGroups.add(msGroup);
-  		}
-  	}
-
-  	return messageGroups;
-  }
-  
-  private List buildMessageList(List list) {
-  	List sortedMessageList = new ArrayList();
-  	
-  	Iterator iterator = list.iterator();
-  	while (iterator.hasNext()) {
-  		MessageGroup mGroup = (MessageGroup) iterator.next();
-  		sortedMessageList.addAll(mGroup.getMessages());
-  	}
-  	
-  	return sortedMessageList;
-  }
-
-  private List sortMessages(List inputList) {
-  	List sortedList = new ArrayList();
-  	sortedList.addAll(inputList);
-  	
-  	// Get a sorted list of MessageGroups
-  	sortedList = initialSort(inputList);
-
-  	Collections.sort(sortedList, new Comparator() {
-  		public int compare(Object o1, Object o2) {
-  			String name1 = ((MessageGroup) o1).getBaseName();
-  			String name2 = ((MessageGroup) o2).getBaseName();
-  			
-  			return name1.compareToIgnoreCase(name2);
-      	}  	
-  	});
-  	
-  	sortedList = buildMessageList(sortedList);
-  	return sortedList;
-  }
-  
-  private class MessageGroup {
-  	private String baseName;
-  	private Vector messages;
-  	
-  	public MessageGroup(String name) {
-  		this.baseName = computeBaseName(name);
-  		messages = new Vector();
-  	}
-  	
-  	public boolean addMessage(Message newMessage) {
-  		// do check if it belongs here?......
-  		String newMessageBaseName = computeBaseName(newMessage.getQName().getLocalPart());
-  		
-  		if (newMessageBaseName.equalsIgnoreCase(getBaseName())) {
-  			addToSortedList(newMessage);
-  			
-  			return true;
-  		}
-  		
-  		return false;
-  	}
-  	
-  	public Vector getMessages() {
-  		return messages;
-  	}
-  	
-  	public String getBaseName() {
-  		return baseName;
-  	}
-  	
-  	private int getFirstInstance(String subString) {
-  		for (int index = 0; index < messages.size(); index++) {
-  			Message message = (Message) messages.get(index);
-  			String messageName = message.getQName().getLocalPart();
-  			
-  			if (messageName.indexOf(subString, 1) > 0) {
-  				return index;
-  			}
-  		}
-  		  		
-  		return -1;
-  	}
-  	
-  	private void addToSortedList(Message message) {
-  		// We need to add the new Message in the right position
-  		int index = -1;
-  		String name = message.getQName().getLocalPart();
-  		if (name.indexOf("Request", 1) > 0) {
-  			// Add after first instance of 'Response'
-  			index = getFirstInstance("Response");
-  		}
-  		else if (name.indexOf("Response", 1) > 0) {
-  			// Add after first instance of 'Request'
-  			index = getFirstInstance("Request");
-  			if (index >= 0)
-  				index++;
-  		}
-  		
-  		if (index >= 0) {
-  			messages.add(index, message);
-  		}
-  		else {
-  			messages.add(message);
-  		}
-  	}
-  	
-  	private String computeBaseName(String name) {
-  		int resReqIndex = name.indexOf("Request", 1);
-  		int resReqLength;
-  		if (resReqIndex == -1) {
-  			resReqIndex = name.indexOf("Response", 1);
-  			resReqLength = "Response".length();
-  		}
-  		else {
-  			resReqLength = "Request".length();
-  		}
-  				
-  		// Did we even find a Request/Response in both strings?
-  		if (resReqIndex != -1) {
-  			return name.substring(0, resReqIndex) + name.substring(resReqIndex + resReqLength, name.length());
-  		}
-  		else {  		
-  			return name;
-  		}
-  	}
-  }  
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java
deleted file mode 100644
index 8325e9e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/model/WSDLModelAdapterFactory.java
+++ /dev/null

@@ -1,1238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.model;
-        
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.OperationType;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.OperationImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITreeChildProvider;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class WSDLModelAdapterFactory implements ModelAdapterFactory
-{                                      
-  protected static WSDLModelAdapterFactory wsdlModelAdapterFactoryInstance;
-
-  public AdapterFactory adapterFactory;
-                       
-  public WSDLModelAdapterFactory()
-  {
-    adapterFactory = createAdapterFactory();
-  }   
-                                                 
-  protected boolean isExtensibilityElementConsideredChild()
-  {
-    return true;
-  }
-
-  protected void addExtensiblityElementChildren(List list, ExtensibleElement extensibleElement)
-  {
-    if (isExtensibilityElementConsideredChild())
-    {
-      //list.addAll(WSDLEditorUtil.getInstance().getExtensibilityElementNodes(extensibleElement));
-      list.addAll(WSDLEditorUtil.getInstance().getExtensibilityElementNodes(extensibleElement));
-    }
-  }
-
-  public static WSDLModelAdapterFactory getWSDLModelAdapterFactory()
-  {                
-    if (wsdlModelAdapterFactoryInstance == null)
-    {
-      wsdlModelAdapterFactoryInstance = new WSDLModelAdapterFactory();
-    }
-    return wsdlModelAdapterFactoryInstance;
-  }  
-    
-
-  protected AdapterFactory createAdapterFactory()
-  {
-    return new WSDLAdapterFactoryImpl();
-  }            
-
-
-  public ModelAdapter getAdapter(Object o)
-  {                             
-    ModelAdapter adapter = null;
-    if (o instanceof WSDLElement)                     
-    {
-      adapter = (ModelAdapter)adapterFactory.adapt((WSDLElement)o, adapterFactory);
-    }
-    else if (o instanceof WSDLGroupObject)
-    {           
-      adapter = (WSDLGroupObject)o;
-    }
-    return adapter;
-  }                                    
-
-  //
-  //
-  //
-  public class WSDLAdapterFactoryImpl extends AdapterFactoryImpl
-  {                     
-    public Adapter createAdapter(Notifier target)
-    {                     
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {                   
-      	public Object caseWSDLElement(WSDLElement wsdlElement)
-        {   
-          // note that the WSDLSwitch doesn't handle 
-          // caseExtensibilityElement when the object
-          // comes from another package... that why
-          // we have an instanceof check here
-		  if (wsdlElement instanceof ExtensibilityElement)
-		  {	
-			return createExtensibilityElementAdapter();  
-		  }
-		  else
-		  {	  
-            return createWSDLElementAdapter();
-		  }	
-	    }   
-
-      	public Object caseBinding(Binding binding)
-        {   
-          return createBindingAdapter();
-	      } 
-
-      	public Object caseBindingFault(BindingFault bindingFault)
-        {   
-          return createBindingFaultAdapter();
-	      } 
-
-      	public Object caseBindingInput(BindingInput bindingInput)
-        {   
-          return createBindingInputAdapter();
-	      } 
-
-      	public Object caseBindingOutput(BindingOutput bindingOutput)
-        {   
-          return createBindingOutputAdapter();
-	      } 
-                           
-      	public Object caseBindingOperation(BindingOperation bindingOperation)
-        {   
-          return createBindingOperationAdapter();
-	      } 
- 
-      	public Object caseDefinition(Definition definition)
-        {   
-          return createDefinitionAdapter();
-	      }           
-
-      	public Object caseFault(Fault fault)
-        {   
-          return createFaultAdapter();
-	      } 
-
-      	public Object caseImport(Import i)
-        {   
-          return createImportAdapter();
-	      } 
-
-      	public Object caseInput(Input input)
-        {   
-          return createInputAdapter();
-	      } 	
-
-      	public Object caseOutput(Output output)
-        {   
-          return createOutputAdapter();
-	      } 
-
-      	public Object caseMessage(Message message)
-        {   
-          return createMessageAdapter();
-	      }       
-
-      	public Object caseOperation(Operation operation)
-        {   
-          return createOperationAdapter();
-	      } 
-
-      	public Object casePart(Part part)
-        {   
-          return createPartAdapter();
-	      }  
-
-      	public Object casePort(Port port)
-        {   
-          return createPortAdapter();
-	      }  
-
-      	public Object casePortType(PortType portType)
-        {   
-          return createPortTypeAdapter();
-	      }  
-
-      	public Object caseService(Service service)
-        {   
-          return createServiceAdapter();
-	      }  
-
-      	public Object caseTypes(Types types)
-        {   
-          return createTypesAdapter();
-	    } 
-        
-		public Object defaultCase(EObject object)
-		{
-		  // note that the WSDLSwitch doesn't handle 
-          // caseExtensibilityElement when the object
-          // comes from another package... that why
-          // we have an instanceof check here
-		   if (object instanceof ExtensibilityElement)
-		   {	   
-	         return createExtensibilityElementAdapter();
-		   }
-		   else
-		   {
-			 return null;
-		   }	   
-        }
-      };   
-
-      Object o = wsdlSwitch.doSwitch((EObject)target);
-
-
-      Adapter result = null;
-      if (o instanceof Adapter)
-      {
-        result  = (Adapter)o;
-      }
-      else
-      {          
-        System.out.println("did not create adapter for target : " + target);
-        Thread.dumpStack();
-      }                   
-      return result;
-    }      
-                               
-  
-    public Adapter createWSDLElementAdapter()
-    {
-      return new WSDLElementAdapter();
-    }
-
-  	public Adapter createBindingAdapter()
-    {
-      return new BindingAdapter();
-    }   
-
- 	  public Adapter createBindingFaultAdapter()
-    {                                      
-      return new BindingFaultAdapter();
-    }           
-
- 	  public Adapter createBindingInputAdapter()
-    {                                      
-      return new BindingInputAdapter();
-    }
-
-    public Adapter createBindingOutputAdapter()
-    {
-      return new BindingOutputAdapter();
-	  } 
-                
-    public Adapter createBindingOperationAdapter()
-    {     
-      return new BindingOperationAdapter();
-    }
-          
-  	public Adapter createDefinitionAdapter() 
-    {
-		  return new DefinitionAdapter();
-	  }
-
-  	public Adapter createFaultAdapter() 
-    {
-		  return new FaultAdapter();
-	  }
-
-  	public Adapter createImportAdapter() 
-    {
-		  return new ImportAdapter();
-	  }
-
-  	public Adapter createInputAdapter() 
-    {
-		  return new InputAdapter();
-	  }
-
-  	public Adapter createMessageAdapter() 
-    {
-		  return new MessageAdapter();
-	  }
-
-
-  	public Adapter createOperationAdapter() 
-    {
-		  return new OperationAdapter();
-	  }
-
-  	public Adapter createOutputAdapter() 
-    {
-		  return new OutputAdapter();
-	  }
-
-  	public Adapter createPartAdapter() 
-    {
-		  return new PartAdapter();
-	  }
-
-  	public Adapter createPortAdapter() 
-    {
-		  return new PortAdapter();
-	  }
-
-  	public Adapter createPortTypeAdapter() 
-    {
-		  return new PortTypeAdapter();
-	  }
-
-  	public Adapter createServiceAdapter() 
-    {                    
-		  return new ServiceAdapter();
-	  } 
-
-  	public Adapter createTypesAdapter() 
-    {                    
-		  return new TypesAdapter();
-	  } 
-    
-    public Adapter createExtensibilityElementAdapter()
-    {
-      return new ExtensibilityElementAdapter();
-    }
-
-	
-    // convenience method
-    //
-    public Adapter adapt(Notifier target)
-    {
-      return adapt(target, this);
-    }
-  }
-    
-  //
-  //
-  //
-  protected class WSDLElementAdapter extends AdapterImpl implements ModelAdapter
-  {   
-    protected List listenerList = new ArrayList();
-
-
-    public WSDLElementAdapter()
-    {
-    }  
-                                 
-    public boolean isAdapterForType(Object type)
-    {
-      return type == adapterFactory;
-    }                                             
-
-    public void addListener(ModelAdapterListener listener)
-    {
-      if (!listenerList.contains(listener))
-      {
-        listenerList.add(listener);
-      }  
-    }  
-
-    public void removeListener(ModelAdapterListener listener)
-    {
-      if (listenerList.contains(listener))
-      {
-        listenerList.remove(listener);
-      }
-    } 
-
-    public void firePropertyChanged(Object notifier, String property)
-    {         
-      List list = new ArrayList();
-      list.addAll(listenerList);               
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        ModelAdapterListener listener = (ModelAdapterListener)i.next();
-        listener.propertyChanged(getTarget(), property);
-      }
-    }   
-
-    public void notifyChanged(Notification msg)
-    {                        
-      if (msg.getEventType() != Notification.RESOLVE)
-      {        
-        firePropertyChanged(msg.getNotifier(), null);
-      }
-    }  
-
-       
-    public Object getProperty(Object modelObject, String propertyName)
-    {           
-      Object result = null;
-      if (propertyName.equals(CHILDREN_PROPERTY))
-      {
-        result = getChildren();      
-      }                    
-      else if (propertyName.equals(LABEL_PROPERTY))
-      {
-        result = getLabel();      
-      }                    
-      else if (propertyName.equals(IMAGE_PROPERTY))
-      {
-        result = getImage();
-      } 
-      else if (propertyName.equals("extensibilityElements"))
-      { 
-        if (modelObject instanceof ExtensibleElement)
-        {
-          result = WSDLEditorUtil.getInstance().getExtensibilityElementNodes((ExtensibleElement)modelObject);
-        }
-      } 
-      else if (propertyName.equals("isReadOnly"))
-      {
-      	Element element = WSDLEditorUtil.getInstance().getElementForObject(target); 
-     	  result = (element instanceof IDOMNode) ? Boolean.FALSE : Boolean.TRUE;    
-      }
-      return result;
-    } 
-
-    protected List getChildren()
-    {
-      return Collections.EMPTY_LIST;
-    }                        
-
-    protected String getLabel()
-    {  
-      return "todo";
-    }
-
-    protected Image getImage()
-    {
-      return null;
-    }                       
-  }                     
-  
-
-  protected class BindingAdapter extends WSDLElementAdapter
-  {                
-    protected Binding binding;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.binding = (Binding)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();                 
-      addExtensiblityElementChildren(list, binding);
-      List operationsList = binding.getEBindingOperations();
-      List tempList = new ArrayList();
-      tempList.addAll(operationsList);
-      
-      Collections.sort(tempList, new Comparator() {
-    	public int compare(Object o1, Object o2) {
-    		String s1 = ((BindingOperation) o1).getName();
-    		String s2 = ((BindingOperation) o2).getName();
-    		
-    		if (s1 == null) {
-    			s1 = "";
-    		}
-    		if (s2 == null) {
-    			s2 = "";
-    		}
-
-      		return s1.compareToIgnoreCase(s2);
-      	}
-      });
-      
-      list.addAll(tempList);
-      
-      return list;
-    }     
-
-    protected String getLabel()
-    {  
-      return binding.getQName().getLocalPart();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/binding_obj.gif");
-    }                             
-  }  
-    
-
-  protected class BindingFaultAdapter extends WSDLElementAdapter
-  {                
-    protected BindingFault bindingFault;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.bindingFault = (BindingFault)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();    
-      addExtensiblityElementChildren(list, bindingFault);
-      return list;
-    }     
-
-    protected String getLabel()
-    {  
-      return bindingFault.getName();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/fault_obj.gif");
-    }               
-  } 
-
-
-  protected class BindingInputAdapter extends WSDLElementAdapter
-  {                
-    protected BindingInput bindingInput;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.bindingInput = (BindingInput)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();    
-      addExtensiblityElementChildren(list, bindingInput);
-      return list;
-    }     
-
-    protected String getLabel()
-    {  
-      return "input";
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/input_obj.gif");
-    }                             
-  }  
-
- 
-  protected class BindingOutputAdapter extends WSDLElementAdapter
-  {                
-    protected BindingOutput bindingOutput;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.bindingOutput = (BindingOutput)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();    
-      addExtensiblityElementChildren(list, bindingOutput);
-      return list;
-    }     
-
-    protected String getLabel()
-    {  
-      return "output";
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/output_obj.gif");
-    }    
-  }  
-                              
-
-  protected class BindingOperationAdapter extends WSDLElementAdapter
-  {                
-    protected BindingOperation bindingOperation;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.bindingOperation = (BindingOperation)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();         
-                  
-      addExtensiblityElementChildren(list, bindingOperation); 
-
-      if (bindingOperation.getBindingInput() != null)
-      {
-        list.add(bindingOperation.getBindingInput());
-      }
-      if (bindingOperation.getBindingOutput() != null)
-      {
-        list.add(bindingOperation.getBindingOutput());
-      }                             
-      list.addAll(bindingOperation.getEBindingFaults());
-      
-      return list;
-    }        
-                
-
-    protected String getLabel()
-    {  
-      return bindingOperation.getName();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/operationbinding_obj.gif");
-    }               
-  }  
-
-  //
-  //
-  //
-  protected class DefinitionAdapter extends WSDLElementAdapter implements ModelAdapterListener
-  {                
-    protected List permanentWSDLGroupObjectList;
-    protected Definition definition;
-
-    protected WSDLGroupObject typesGroup;
-    protected WSDLGroupObject extensibilityElementsGroup;
-    protected Types types; 
-     
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.definition = (Definition)newTarget;
-     
-      // this group is added and removed from the child list dynamically
-      // dependant on the presence of an 'actual' types element
-      //
-      typesGroup = new WSDLGroupObject(definition, WSDLGroupObject.TYPES_GROUP, getModelAdapterFactory());
-                                                          
-      // these groups always exist in the child list      
-      //
-      permanentWSDLGroupObjectList = new ArrayList();       
-      permanentWSDLGroupObjectList.add(new WSDLGroupObject(definition, WSDLGroupObject.IMPORTS_GROUP));
-      permanentWSDLGroupObjectList.add(typesGroup);  
-      permanentWSDLGroupObjectList.add(new WSDLGroupObject(definition, WSDLGroupObject.MESSAGES_GROUP));
-      permanentWSDLGroupObjectList.add(new WSDLGroupObject(definition, WSDLGroupObject.PORT_TYPES_GROUP));
-      permanentWSDLGroupObjectList.add(new WSDLGroupObject(definition, WSDLGroupObject.BINDINGS_GROUP));
-      permanentWSDLGroupObjectList.add(new WSDLGroupObject(definition, WSDLGroupObject.SERVICES_GROUP));
-      // we only add this group when it has content
-      //
-      extensibilityElementsGroup = new WSDLGroupObject(definition, WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP);
-
-      updateTypes();
-    }
-                                                      
-    protected List getChildren()
-    {       
-      List list = new ArrayList();
-      list.addAll(permanentWSDLGroupObjectList);   
-      //if (extensibilityElementsGroup.getChildren().size() > 0)
-      //{
-      list.add(extensibilityElementsGroup);
-      //}
-      return list;
-    }
-
-    public void notifyChanged(Notification msg)
-    {     
-      if (msg.getEventType() != Notification.RESOLVE)
-      {                           
-        updateTypes();
-        firePropertyChangedHelper();   
-      }
-    }        
-
-    protected void updateTypes()
-    {
-      if (types != definition.getETypes())
-      {
-        if (types != null)
-        {
-          removeModelAdapterListener(types, this);
-        }                                         
-        types = definition.getETypes();
-        if (types != null)
-        {
-          addModelAdapterListener(types, this);
-        }
-      }  
-    }
-
-    protected void firePropertyChangedHelper()
-    {                        
-      firePropertyChanged(getTarget(), null);
-
-      for (Iterator i = getChildren().iterator(); i.hasNext(); )
-      {                                                                              
-        ModelAdapter adapter = getAdapter(i.next());
-        adapter.firePropertyChanged(adapter, null);
-      }                                             
-    } 
-
-    // propagate changes to 'types' object
-    //
-    public void propertyChanged(Object object, String property)
-    {
-      typesGroup.firePropertyChanged(typesGroup, property);
-    } 
-
-    protected ModelAdapterFactory getModelAdapterFactory()
-    {
-      return getWSDLModelAdapterFactory();
-    }
-    
-    protected String getLabel()
-    {  
-      if (definition.getQName() != null) {
-    	  return definition.getQName().getLocalPart();
-      }
-      return "";
-    }
-
-    protected Image getImage()
-    {
-      return null;
-    }                       
-  }
-
- 
-
-  protected class FaultAdapter extends WSDLElementAdapter
-  {                
-    protected Fault fault;
-                                    
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.fault = (Fault)newTarget;
-    }
-                                                      
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/fault_obj.gif");
-    }   
-
-    protected String getLabel()
-    {  
-      return fault.getName();
-    }               
-  }   
-      
-
-  //
-  //
-  //
-  protected class ImportAdapter extends WSDLElementAdapter
-  {                
-    protected Import theImport;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.theImport = (Import)newTarget;
-    }
-                                                       
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/import_obj.gif");
-    }   
-
-    protected String getLabel()
-    {  
-      String result = theImport.getLocationURI();
-      if (result == null || result.length() == 0)
-      {
-      	result = WSDLEditorPlugin.getWSDLString("_UI_NO_IMPORT_SPECIFIED");
-      }
-      return result;
-    }               
-  } 
-
-
-  //
-  //
-  //
-  protected class InputAdapter extends WSDLElementAdapter
-  {                
-    protected Input input;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.input = (Input)newTarget;
-    }
-                                                       
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/input_obj.gif");
-    }   
-
-    protected String getLabel()
-    {  
-      return "input";
-    }               
-  }    
-
-   
- 
-  //
-  //
-  //
-  protected class MessageAdapter extends WSDLElementAdapter
-  {                
-    protected Message message;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.message = (Message)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {
-      List list = new ArrayList();
-      list.addAll(message.getEParts());
-      return list;
-    }                        
-
-    protected String getLabel()
-    {  
-      if (message.getQName() == null) return ""; // revisit...it shouldn't be null 
-      return message.getQName().getLocalPart();
-    
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/message_obj.gif");
-    }
-  }
-
-
-  //
-  //
-  //
-  protected class OutputAdapter extends WSDLElementAdapter
-  {                
-    protected Output output;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.output = (Output)newTarget;
-    }                     
-        
-    protected String getLabel()
-    {  
-      return "output";
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/output_obj.gif");
-    }                                                        
-  }  
-
-  //
-  //
-  //
-  protected class OperationAdapter extends WSDLElementAdapter
-  {                
-    protected Operation operation;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.operation = (Operation)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();
-      Input input = operation.getEInput();
-      Output output = operation.getEOutput();
-      
-      OperationType operationType = ((OperationImpl) operation).getStyle();
-      if (operationType != null) {
-      	if (operationType.equals(OperationType.REQUEST_RESPONSE) && input != null && output != null) {
-      		// Input, Output
-      		list.add(input);
-      		list.add(output);
-      	}
-      	else if (operationType.equals(OperationType.SOLICIT_RESPONSE) && input != null && output != null) {
-      		// Output, Input
-      		list.add(output);
-      		list.add(input);
-      	}
-      	else if (operationType.equals(OperationType.ONE_WAY) && input != null) {
-      		// Input
-      		list.add(input);
-      	}
-      	else if (operationType.equals(OperationType.NOTIFICATION) && output != null) {
-      		//Output
-      		list.add(output);
-      	}
-      }
-      list.addAll(operation.getFaults().values());
-      
-      return list;
-    }
-      
-//	private int getNodeIndex(NodeList nodeList, Node node) {
-//		int index = 0;
-//		while (index < nodeList.getLength() && !(nodeList.item(index).equals(node))) {
-//			index++;
-//		}
-//		
-//		if (index >= nodeList.getLength()) {
-//			index = -1;
-//		}
-//		
-//		return index;
-//	}
-
-    protected String getLabel()
-    {  
-      return operation.getName();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/operation_obj.gif");
-    }               
-  }  
-   
-
-  //
-  //
-  //
-  protected class PartAdapter extends WSDLElementAdapter
-  {                
-    protected Part part;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.part = (Part)newTarget;
-    }                                                       
-
-    protected String getLabel()
-    {
-      return part.getName();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/part_obj.gif");
-    }                             
-  }     
-
-  //
-  //
-  //
-  protected class PortAdapter extends WSDLElementAdapter implements ModelAdapterListener
-  {                
-    protected Port port;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.port = (Port)newTarget;
-    }
-                                                                             
-    protected String getLabel()
-    {  
-      return port.getName();
-    }
-
-    protected Image getImage()
-    {                                
-      return WSDLEditorPlugin.getInstance().getImage("icons/port_obj.gif");
-    }    
-
-    protected List getChildren()
-    {
-      return WSDLEditorUtil.getInstance().getExtensibilityElementNodes(port);  
-    }
-    // propagate changes to the binding object
-    //
-    public void propertyChanged(Object object, String property)
-    {
-      firePropertyChanged(port, property);
-    }
-  } 
-     
-  protected class ExtensibilityElementAdapter extends WSDLElementAdapter implements ModelAdapterListener
-  {                
-    protected ExtensibilityElement ee;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.ee = (ExtensibilityElement)newTarget;
-    }
-                                                                             
-    protected String getLabel()
-    {  
-      String result = null;
-      Node node = (Node) ee.getElement();
-
-      ILabelProvider labelProvider = getExtensibilityLabelProvider(node);
-      if (labelProvider != null)
-      {
-        result = labelProvider.getText(node);
-      }
-
-      if (result == null)
-      {
-        result = node.getNodeName();
-      }
-      return result;
-    }
-
-    protected Image getImage()
-    {                                
-      Image image = null;
-      Node node = (Node) ee.getElement();
-
-      ILabelProvider labelProvider = getExtensibilityLabelProvider(node);
-      if (labelProvider != null)
-      {
-        image = labelProvider.getImage(node);
-      }
-
-      if (image == null)
-      {
-        image = WSDLEditorPlugin.getInstance().getImage("icons/element_obj.gif");
-      }
-      return image;
-    }    
-
-    protected List getChildren()
-    {
-      List list = null;	  
-	  //TODO... we need to push getChildren down the ExtensiblityElement
-	  // for now let's just cast to UnkownExtensiblityElement
-	  if (ee instanceof UnknownExtensibilityElement)
-      {
-        list = ((UnknownExtensibilityElement)ee).getChildren();
-      }
-      return list; 
-    }
-
-    public void propertyChanged(Object object, String property)
-    {
-      firePropertyChanged(ee, property);
-    }
-    
-    protected ILabelProvider getExtensibilityLabelProvider(Node node)
-    {
-      ILabelProvider result = null;
-      String namespaceURI = node.getNamespaceURI();
-      if (namespaceURI != null)
-      {
-        result = WSDLEditorPlugin.getInstance().getExtensibilityItemTreeProviderRegistry().getLabelProvider(namespaceURI);
-      }
-      return result;
-    }
-    
-    protected ITreeChildProvider getExtensibilityContentProvider(Node node)
-    {
-      ITreeChildProvider result = null;
-      String namespaceURI = node.getNamespaceURI();
-      if (namespaceURI != null)
-      {
-        result = WSDLEditorPlugin.getInstance().getExtensibilityItemTreeProviderRegistry().getContentProvider(namespaceURI);
-      }
-      return result;
-    }
-
-    boolean isReadOnly()
-    {
-      return true;
-    }
-  } 
-
-
-  //
-  //
-  //
-  protected class PortTypeAdapter extends WSDLElementAdapter
-  {                
-    protected PortType portType;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.portType = (PortType)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();
-      list.addAll(portType.getOperations());
-      
-      Collections.sort(list, new Comparator()
-      {
-        public int compare(Object o1, Object o2)
-        {
-          String o1Name = ((Operation) o1).getName();
-          String o2Name = ((Operation) o2).getName();
-          if (o1Name == null) o1Name = "";
-          if (o2Name == null) o2Name = "";
-          return (o1Name.compareToIgnoreCase(o2Name));
-        }
-      });
-      return list; 
-    }                    
-      
-    protected String getLabel()
-    {  
-      return portType.getQName().getLocalPart();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/porttype_obj.gif");
-    }
-  } 
-     
-
-  protected class ServiceAdapter extends WSDLElementAdapter
-  {                
-    protected Service service;
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.service = (Service)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();
-      list.addAll(service.getEPorts());
-      return list; 
-    }                    
-      
-    protected String getLabel()
-    {  
-      return service.getQName().getLocalPart();
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/service_obj.gif");
-    }   
-  } 
-     
-  //
-  //
-  //
-  public class TypesAdapter extends WSDLElementAdapter
-  {
-    protected Types types; 
-                         
-    public void setTarget(Notifier newTarget) 
-    {
-      super.setTarget(newTarget);
-      this.types = (Types)newTarget;
-    }
-                                                      
-    protected List getChildren()
-    {                  
-      List list = new ArrayList();  
-      list.addAll(WSDLEditorUtil.getInstance().getExtensibilityElementNodes(types));
-      return list; 
-    }                    
-      
-    protected String getLabel()
-    {  
-      return "Types";
-    }
-
-    protected Image getImage()
-    {
-      return WSDLEditorPlugin.getInstance().getImage("icons/types_obj.gif");
-    }                                                                                      
-  }
-  
-  public static void addModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {                                                               
-// TODO: port check
-    ModelAdapter adapter = getWSDLModelAdapterFactory().getAdapter(modelObject);
-//    ModelAdapter adapter = EcoreUtil.getAdapter(getWSDLModelAdapterFactory().eAdapters(),modelObject);
-    if (adapter != null)
-    {
-      adapter.addListener(listener);
-    }
-  }    
-
-  public static void removeModelAdapterListener(Object modelObject, ModelAdapterListener listener)
-  {                                                            
-// TODO: port check
-    ModelAdapter adapter = getWSDLModelAdapterFactory().getAdapter(modelObject);
-//    ModelAdapter adapter = EcoreUtil.getAdapter(getWSDLModelAdapterFactory().eAdapters(),modelObject);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener);
-    }
-  }            
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/nsedit/EditNamespacesDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/nsedit/EditNamespacesDialog.java
deleted file mode 100644
index 60536f7..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/nsedit/EditNamespacesDialog.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.nsedit;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesTargetFieldDialog;
-
-public class EditNamespacesDialog extends Dialog
-{
-  protected Button okButton;
-  protected String title;
-  protected String targetNamespace;
-  protected List namespaceInfoList;
-  protected CommonEditNamespacesTargetFieldDialog editWSDLNamespacesControl;
-  protected IPath resourceLocation;
-  //  protected Label errorMessageLabel;
-  //  protected String errorMessage;  
-
-  //protected Label errorMessageLabel;
-
-  public EditNamespacesDialog(Shell parentShell, IPath resourceLocation, String title, String targetNamespace, List namespaceList)
-  {
-    super(parentShell);
-    this.resourceLocation = resourceLocation;
-    setShellStyle(getShellStyle() | SWT.RESIZE);
-    this.title = title;
-    this.targetNamespace = targetNamespace;
-    this.namespaceInfoList = namespaceList;
-  }
-
-  public int createAndOpen()
-  {
-    create();
-    getShell().setText(title);
-    setBlockOnOpen(true);
-    return open();
-  }
-
-  protected Control createContents(Composite parent)
-  {
-    Control control = super.createContents(parent);
-    updateErrorMessage();
-    return control;
-  }
-
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-    createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-  }
-
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite dialogArea = (Composite) super.createDialogArea(parent);
-    editWSDLNamespacesControl = new CommonEditNamespacesTargetFieldDialog(dialogArea, resourceLocation);
-    editWSDLNamespacesControl.setNamespaceInfoList(namespaceInfoList);
-    editWSDLNamespacesControl.setTargetNamespace(targetNamespace);
-
-    return dialogArea;
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-    updateErrorMessage();
-  }
-
-  protected String computeErrorMessage(String name)
-  {
-    return null;
-  }
-
-  protected void updateErrorMessage()
-  {
-    String errorMessage = null;
-    /*
-    String name = nameField.getText().trim();
-    if (name.length() > 0)
-    {
-      errorMessage = computeErrorMessage(name);
-    }
-    else
-    {
-      errorMessage = "";
-    }*/
-
-    //errorMessageLabel.setText(errorMessage != null ? errorMessage : "");
-    okButton.setEnabled(errorMessage == null);
-  }
-
-  protected void buttonPressed(int buttonId)
-  {
-    if (buttonId == IDialogConstants.OK_ID)
-    {
-      targetNamespace = editWSDLNamespacesControl.getTargetNamespace();
-    }
-    super.buttonPressed(buttonId);
-  }
-
-  public List getNamespaceInfoList()
-  {
-    return namespaceInfoList;
-  }
-
-  public String getTargetNamespace()
-  {
-    return targetNamespace;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ExtensibleOutlineProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ExtensibleOutlineProvider.java
deleted file mode 100644
index 03db596..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ExtensibleOutlineProvider.java
+++ /dev/null

@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-
-public class ExtensibleOutlineProvider implements ITreeContentProvider, ILabelProvider {
-	protected WSDLEditorExtension[] treeContentProviderExtensions;
-	protected ITreeContentProvider[] treeContentProviders;
-
-	protected WSDLEditorExtension[] labelProviderExtensions;
-	protected ILabelProvider[] labelProviders;
-
-	protected final static Object[] EMPTY_ARRAY = {};
-
-	public ExtensibleOutlineProvider(WSDLEditor wsdlEditor) {
-		WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
-
-		treeContentProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.OUTLINE_TREE_CONTENT_PROVIDER);
-		treeContentProviders = new ITreeContentProvider[treeContentProviderExtensions.length];
-		for (int i = 0; i < treeContentProviderExtensions.length; i++) {
-			treeContentProviders[i] = (ITreeContentProvider) treeContentProviderExtensions[i].createExtensionObject(WSDLEditorExtension.OUTLINE_TREE_CONTENT_PROVIDER, wsdlEditor);
-		}
-
-		labelProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.OUTLINE_LABEL_PROVIDER);
-		labelProviders = new ILabelProvider[labelProviderExtensions.length];
-		for (int i = 0; i < labelProviderExtensions.length; i++) {
-			labelProviders[i] = (ILabelProvider) labelProviderExtensions[i].createExtensionObject(WSDLEditorExtension.OUTLINE_LABEL_PROVIDER, wsdlEditor);
-		}
-	}
-
-
-	protected ITreeContentProvider getApplicableTreeContentProvider(Object object) {
-		ITreeContentProvider provider = null;
-		for (int i = 0; i < treeContentProviderExtensions.length; i++) {
-			if (treeContentProviderExtensions[i].isApplicable(object)) {
-				provider = treeContentProviders[i];
-				if (provider != null) {
-					break;
-				}
-			}
-		}
-		return provider;
-	}
-
-
-	protected ILabelProvider getApplicableLabelProvider(Object object) {
-		ILabelProvider provider = null;
-		for (int i = 0; i < labelProviderExtensions.length; i++) {
-			if (labelProviderExtensions[i].isApplicable(object)) {
-				provider = labelProviders[i];
-				if (provider != null) {
-					break;
-				}
-			}
-		}
-		return provider;
-	}
-
-	// implements ITreeContentProvider
-	//
-	public Object[] getChildren(Object parentElement) {
-		ITreeContentProvider provider = getApplicableTreeContentProvider(parentElement);
-		// System.out.println("getElements " + provider);
-		return provider != null ? provider.getChildren(parentElement) : EMPTY_ARRAY;
-	}
-
-	public Object getParent(Object element) {
-		ITreeContentProvider provider = getApplicableTreeContentProvider(element);
-		return provider != null ? provider.getParent(element) : null;
-	}
-
-	public boolean hasChildren(Object element) {
-		ITreeContentProvider provider = getApplicableTreeContentProvider(element);
-		return provider != null ? provider.hasChildren(element) : false;
-	}
-
-	public Object[] getElements(Object inputElement) {
-		// inputElement is initially a structured model, so turn it into a
-		// definition
-		Definition definition = getDefinition(inputElement);
-		ITreeContentProvider provider = getApplicableTreeContentProvider(definition);
-		// System.out.println("getElements " + provider);
-		return provider != null ? provider.getElements(definition) : EMPTY_ARRAY;
-	}
-
-	public void dispose() {
-		// TODO... call dispose dispose the created label and content
-		// providers
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		Definition definition = getDefinition(newInput);
-		for (int i = 0; i < treeContentProviders.length; i++) {
-			treeContentProviders[i].inputChanged(viewer, oldInput, definition);
-		}
-	}
-
-	// implements ILabelProvider
-	//
-	public Image getImage(Object element) {
-		ILabelProvider provider = getApplicableLabelProvider(element);
-		return provider != null ? provider.getImage(element) : null;
-	}
-
-	public String getText(Object element) {
-		String result = null;
-		if (element != null) {
-			ILabelProvider provider = getApplicableLabelProvider(element);
-			result = provider != null ? provider.getText(element) : (element.toString() + "noProviderForClass=" + element.getClass().getName());
-		}
-		return result != null ? result : "";
-	}
-
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	/**
-	 * Gets the definition from model
-	 * 
-	 * @param model
-	 *            (of type Object but really should be IStructuredModel)
-	 * @return Definition
-	 */
-	private Definition getDefinition(Object model) {
-		Definition definition = null;
-
-		if (model instanceof IDOMModel) {
-			IDOMDocument domDoc = ((IDOMModel) model).getDocument();
-			if (domDoc != null) {
-				WSDLModelAdapter modelAdapter = (WSDLModelAdapter) domDoc.getAdapterFor(WSDLModelAdapter.class);
-
-				/*
-				 * ISSUE: if adapter does not already exist for domDoc
-				 * getAdapterFor will create one. So why is this null
-				 * check/creation needed?
-				 */
-				if (modelAdapter == null) {
-					modelAdapter = new WSDLModelAdapter();
-					domDoc.addAdapter(modelAdapter);
-					modelAdapter.createDefinition(domDoc.getDocumentElement());
-				}
-
-				definition = modelAdapter.getDefinition();
-			}
-		}
-		return definition;
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/HTTPLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/HTTPLabelProvider.java
deleted file mode 100644
index 5afe4fe..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/HTTPLabelProvider.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Node;
-
-
-public class HTTPLabelProvider extends LabelProvider
-{                                                   
-  protected final static String ADDRESS         = "address";
-  protected final static String BINDING         = "binding";
-  protected final static String OPERATION       = "operation";
-  protected final static String URL_ENCODED     = "urlEncoded";
-  protected final static String URL_REPLACEMENT = "urlReplacement";
-
-  protected HashMap map = new HashMap();
-                         
-  public HTTPLabelProvider()
-  {                    
-    map.put(ADDRESS, "icons/httpaddress_obj.gif");
-    map.put(BINDING, "icons/httpbinding_obj.gif");
-    map.put(OPERATION, "icons/httpoperation_obj.gif");    
-    map.put(URL_ENCODED, "icons/httpurlencoded_obj.gif");
-    map.put(URL_REPLACEMENT, "icons/httpurlreplacement_obj.gif");
-  }
-
-  public Image getImage(Object object) 
-  {    
-    Node node = (Node)object;
-    String imageName = (String)map.get(node.getLocalName());       
-    return imageName != null ? WSDLEditorPlugin.getInstance().getImage(imageName) : null; 
-  }
-  
-  public String getText(Object object)  
-  {
-    Node node = (Node)object;
-    return node.getNodeName();
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterContentProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterContentProvider.java
deleted file mode 100644
index 7068aad..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterContentProvider.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-
-
-
-public class ModelAdapterContentProvider implements ITreeContentProvider, ModelAdapterListener
-{                                 
-  protected Viewer viewer;
-  protected ModelAdapterFactory adapterFactory;
-
-  public ModelAdapterContentProvider(ModelAdapterFactory adapterFactory)
-  {                                      
-    this.adapterFactory = adapterFactory;  
-  }
-        
-  protected void attachListener(Object object)
-  {
-    ModelAdapter adapter = adapterFactory.getAdapter(object);
-// TODO: port check
-//    ModelAdapter adapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),object);
-    if (adapter != null)
-    {
-      adapter.addListener(this);
-    }
-  } 
-
-  public void propertyChanged(Object object, String property)
-  {             
-    if (viewer != null)
-    {
-      if (viewer instanceof StructuredViewer)
-      {
-        ((StructuredViewer)viewer).refresh(object);
-      }
-      else
-      {     
-        viewer.refresh();
-      }
-    }
-  }
-
-  /*
-   * @see ITreeContentProvider#getChildren(Object)
-   */
-  public Object[] getChildren(Object parentObject)
-  {                                     
-    attachListener(parentObject);
-
-    List list = null;
-// TODO: port check    
-    ModelAdapter modelAdapter = adapterFactory.getAdapter(parentObject);
-//    ModelAdapter modelAdapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),parentObject);
-    if (modelAdapter != null)
-    {
-      list = (List)modelAdapter.getProperty(parentObject, ModelAdapter.CHILDREN_PROPERTY);     
-    }
-    list =  list != null ? list : Collections.EMPTY_LIST;
-    return list.toArray();
-  }
-
-  /*
-   * @see ITreeContentProvider#getParent(Object)
-   */
-  public Object getParent(Object element)
-  {
-    return null;
-  }
-
-  /*
-   * @see ITreeContentProvider#hasChildren(Object)
-   */
-  public boolean hasChildren(Object element)
-  {
-    Object[] children = getChildren(element);
-    return children != null && children.length > 0;   
-  }
-
-  /*
-   * @see IStructuredContentProvider#getElements(Object)
-   */
-  public Object[] getElements(Object inputElement)
-  {
-    return getChildren(inputElement);
-  }
-
-  /*
-   * @see IContentProvider#dispose()
-   */
-  public void dispose()
-  { 
-    viewer = null;
-  }
-  
-  /*
-   * @see IContentProvider#inputChanged(Viewer, Object, Object)
-   */
-  public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-  {               
-    this.viewer = viewer;
-  }   
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterLabelProvider.java
deleted file mode 100644
index 720c74c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/ModelAdapterLabelProvider.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-        
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-
-
-
-public class ModelAdapterLabelProvider extends LabelProvider
-{                     
-  protected ModelAdapterFactory adapterFactory;
-
-  public ModelAdapterLabelProvider(ModelAdapterFactory adapterFactory)
-  {                                      
-    this.adapterFactory = adapterFactory;
-  }
-
- 
-  public Image getImage(Object object)
-  {
-    Image result = null;           
-// TODO: port check
-    ModelAdapter modelAdapter = adapterFactory.getAdapter(object);
-//    ModelAdapter modelAdapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),object);
-    if (modelAdapter != null)
-    {
-      result = (Image)modelAdapter.getProperty(object, ModelAdapter.IMAGE_PROPERTY);     
-    }                                            
-    return result;
-  } 
-    
-
-  public String getText(Object object)
-  {                
-    String result = null;               
-// TODO: port check
-    ModelAdapter modelAdapter = adapterFactory.getAdapter(object);
-//    ModelAdapter modelAdapter = EcoreUtil.getAdapter(adapterFactory.eAdapters(),object);
-    if (modelAdapter != null)
-    {                       
-      result = (String)modelAdapter.getProperty(object, ModelAdapter.LABEL_PROPERTY);     
-    }                                            
-    return result;
-  }   
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/SOAPLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/SOAPLabelProvider.java
deleted file mode 100644
index 93cefa4..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/SOAPLabelProvider.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Node;
-
-
-public class SOAPLabelProvider extends LabelProvider
-{                                                     
-  protected final static String ADDRESS      = "address";
-  protected final static String BODY         = "body";
-  protected final static String BINDING      = "binding";
-  protected final static String FAULT        = "fault";                                 
-  protected final static String HEADER       = "header"; 
-  protected final static String HEADER_FAULT = "headerfault"; 
-  protected final static String OPERATION    = "operation";
-
-  protected HashMap map = new HashMap();
-                         
-  public SOAPLabelProvider()
-  {
-    map.put(ADDRESS, "icons/soapaddress_obj.gif");
-    map.put(BINDING, "icons/soapbinding_obj.gif");
-    map.put(BODY, "icons/soapbody_obj.gif");
-    map.put(FAULT, "icons/soapfault_obj.gif");
-    map.put(HEADER, "icons/soapheader_obj.gif");
-    map.put(HEADER_FAULT, "icons/soapheaderfault_obj.gif");
-    map.put(OPERATION, "icons/soapoperation_obj.gif");
-  }
-
-  public Image getImage(Object object) 
-  {    
-    Node node = (Node)object;
-    String imageName = (String)map.get(node.getLocalName());                        
-	  return imageName != null ? WSDLEditorPlugin.getInstance().getImage(imageName) : null; 
-  }
-  
-  public String getText(Object object)  
-  {
-    Node node = (Node)object;
-    return node.getNodeName();
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlineConfiguration.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlineConfiguration.java
deleted file mode 100644
index 92c5078..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlineConfiguration.java
+++ /dev/null

@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLMenuListener;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLContentOutlineConfiguration extends ContentOutlineConfiguration {
-	private ExtensibleOutlineProvider fOutlineProvider = null;
-	private KeyListener[] fKeyListeners = null;
-	private IMenuListener fMenuListener = null;
-	private WSDLEditor fEditor = null;
-
-	private ExtensibleOutlineProvider getOutlineProvider() {
-		if (fOutlineProvider == null) {
-			// ISSUE: what happens if cannot get WSDL Editor? (See
-			// getWSDLEditor comment)
-			fOutlineProvider = new ExtensibleOutlineProvider(getWSDLEditor());
-		}
-		return fOutlineProvider;
-	}
-
-	public IContentProvider getContentProvider(TreeViewer viewer) {
-		return getOutlineProvider();
-	}
-
-	public ILabelProvider getLabelProvider(TreeViewer viewer) {
-		return getOutlineProvider();
-	}
-
-	public KeyListener[] getKeyListeners(TreeViewer viewer) {
-		if (fKeyListeners == null) {
-			final TreeViewer finalViewer = viewer;
-			KeyAdapter keyListener = new KeyAdapter() {
-				public void keyReleased(KeyEvent e) {
-					if (e.keyCode == SWT.F3 && getWSDLEditor() != null) {
-						ISelection selection = getWSDLEditor().getSelectionManager().getSelection();
-						if (selection instanceof IStructuredSelection) {
-							Object object = ((IStructuredSelection) selection).getFirstElement();
-							if (object instanceof EObject) {
-								OpenOnSelectionHelper helper = new OpenOnSelectionHelper(getDefinition(finalViewer));
-								helper.openEditor((EObject) object);
-							}
-						}
-					}
-				}
-			};
-			fKeyListeners = new KeyListener[]{keyListener};
-		}
-
-		return fKeyListeners;
-	}
-
-	public IMenuListener getMenuListener(TreeViewer viewer) {
-		if (fMenuListener == null) {
-			// ISSUE: what happens if cannot get WSDL Editor? (See
-			// getWSDLEditor comment)
-			if (getWSDLEditor() != null)
-				fMenuListener = new WSDLMenuListener(getWSDLEditor(), getWSDLEditor().getSelectionManager());
-		}
-		return fMenuListener;
-	}
-
-	public ISelection getSelection(TreeViewer viewer, ISelection selection) {
-		ISelection sel = selection;
-
-		if (selection instanceof IStructuredSelection) {
-			List wsdlSelections = new ArrayList();
-			for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();) {
-				Object domNode = i.next();
-				Object wsdlNode = getWSDLNode(domNode, viewer);
-				if (wsdlNode != null) {
-					wsdlSelections.add(wsdlNode);
-				}
-			}
-
-			if (!wsdlSelections.isEmpty()) {
-				sel = new StructuredSelection(wsdlSelections);
-			}
-		}
-		return sel;
-	}
-
-	/**
-	 * Gets the definition from treeviewer's input
-	 * 
-	 * @param model
-	 *            (of type Object but really should be IStructuredModel)
-	 * @return Definition
-	 */
-	private Definition getDefinition(TreeViewer viewer) {
-		Definition definition = null;
-		Object model = null;
-		if (viewer != null)
-			model = viewer.getInput();
-
-		if (model instanceof IDOMModel) {
-			IDOMDocument domDoc = ((IDOMModel) model).getDocument();
-			if (domDoc != null) {
-				WSDLModelAdapter modelAdapter = (WSDLModelAdapter) domDoc.getAdapterFor(WSDLModelAdapter.class);
-
-				/*
-				 * ISSUE: if adapter does not already exist for domDoc
-				 * getAdapterFor will create one. So why is this null
-				 * check/creation needed?
-				 */
-				if (modelAdapter == null) {
-					modelAdapter = new WSDLModelAdapter();
-					domDoc.addAdapter(modelAdapter);
-					modelAdapter.createDefinition(domDoc.getDocumentElement());
-				}
-
-				definition = modelAdapter.getDefinition();
-			}
-		}
-		return definition;
-	}
-
-	// ISSUE: There are some cases where outline comes up before editor
-	private WSDLEditor getWSDLEditor() {
-		if (fEditor == null) {
-			IWorkbench workbench = PlatformUI.getWorkbench();
-			if (workbench != null) {
-				IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
-				if (window != null) {
-					IWorkbenchPage page = window.getActivePage();
-					if (page != null) {
-						IEditorPart editor = page.getActiveEditor();
-						if (editor instanceof WSDLEditor)
-							fEditor = (WSDLEditor) editor;
-					}
-				}
-			}
-		}
-		return fEditor;
-	}
-
-	public void unconfigure(TreeViewer viewer) {
-		super.unconfigure(viewer);
-		fEditor = null;
-	}
-
-	/**
-	 * Determines WSDL node based on object (DOM node)
-	 * 
-	 * @param object
-	 * @return
-	 */
-	private Object getWSDLNode(Object object, TreeViewer viewer) {
-		// get the element node
-		Element element = null;
-		if (object instanceof Node) {
-			Node node = (Node) object;
-			if (node != null) {
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					element = (Element) node;
-				}
-				else if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-					element = ((Attr) node).getOwnerElement();
-				}
-			}
-		}
-		Object o = element;
-		if (element != null) {
-			Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(getDefinition(viewer), element);
-			if (modelObject != null) {
-				o = modelObject;
-			}
-		}
-		return o;
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlinePage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlinePage.java
deleted file mode 100644
index ffa80ee..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/outline/WSDLContentOutlinePage.java
+++ /dev/null

@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.outline;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLSelectionManager;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLMenuListener;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-
-/**
- * @deprecated Using SSE's ConfiguratbleContentOutlinePage 
- * instead via WSDLContentOutlineCOnfiguration
- */
-public class WSDLContentOutlinePage extends ContentOutlinePage 
-{                                                    
-  protected WSDLEditor wsdlEditor;
-	protected int level = 0;  
-  protected Object model;                          
-  protected ITreeContentProvider contentProvider;
-  protected ILabelProvider labelProvider;
-  protected WSDLSelectionManager selectionManager;
-  protected SelectionManagerSelectionChangeListener selectionManagerSelectionChangeListener = new SelectionManagerSelectionChangeListener();
-  protected TreeSelectionChangeListener treeSelectionChangeListener = new TreeSelectionChangeListener();
-        
-  public WSDLContentOutlinePage(WSDLEditor wsdlEditor)
-  {                                          
-    this.wsdlEditor = wsdlEditor;
-  }
-
-
-  public void setContentProvider(ITreeContentProvider contentProvider)
-  {
-    this.contentProvider = contentProvider;
-  }
-
-
-  public void setLabelProvider(ILabelProvider labelProvider)
-  {
-    this.labelProvider = labelProvider;
-  }
-
-                          
-  // expose
-  public TreeViewer getTreeViewer()
-  {
-    return super.getTreeViewer();
-  }
-
-	public void createControl(Composite parent) 
-  {                                                 
-		super.createControl(parent);                 
-
-		getTreeViewer().setContentProvider(contentProvider);
-		getTreeViewer().setLabelProvider(labelProvider);
-    getTreeViewer().setInput(model);
-    getTreeViewer().addSelectionChangedListener(this);
-    
-    KeyAdapter keyListener = new KeyAdapter()
-    {
-      public void keyReleased(KeyEvent e)
-      {   	
-        if (e.keyCode == SWT.F3)
-        {
-          ISelection selection = selectionManager.getSelection();
-          if (selection instanceof IStructuredSelection)
-          {
-            Object object = ((IStructuredSelection)selection).getFirstElement();
-            if (object instanceof EObject)
-            {
-			  OpenOnSelectionHelper helper = new OpenOnSelectionHelper(wsdlEditor.getDefinition());
-              helper.openEditor((EObject)object);
-            }
-          }
-        }
-      }
-    };
-    getTreeViewer().getTree().addKeyListener(keyListener);
-
-    MenuManager menuManager = new MenuManager("#popup");//$NON-NLS-1$
-    menuManager.setRemoveAllWhenShown(true);
-    Menu menu = menuManager.createContextMenu(getTreeViewer().getControl());
-    getTreeViewer().getControl().setMenu(menu);
-    
-    WSDLMenuListener menuListener = new WSDLMenuListener(wsdlEditor, wsdlEditor.getSelectionManager());//, (XSDTextEditor)fTextEditor);
-    menuManager.addMenuListener(menuListener);
-
-    setSelectionManager(wsdlEditor.getSelectionManager());    
-    
-    // enable popupMenus extension - Rich - this class is deprecated.  TODO - change this
-    getSite().registerContextMenu("org.eclipse.wst.wsdl.ui.popup.outline", menuManager, wsdlEditor.getSelectionManager());
-	}
-
-
-  public void setModel(Object object)
-  {
-    model = object;
-  }
-
-	
-	public void setExpandToLevel(int i) 
-  {
-		level = i;
-	}
-
-	
-	public void setInput(Object value) 
-  {
-		getTreeViewer().setInput(value);
-	 	getTreeViewer().expandToLevel(level);
-	}  
-
-
-  public void setSelectionManager(WSDLSelectionManager newSelectionManager)
-  { 
-    TreeViewer treeViewer = getTreeViewer();
-
-    // disconnect from old one
-    if (selectionManager != null)
-    {                                                        
-      selectionManager.removeSelectionChangedListener(selectionManagerSelectionChangeListener);  
-      treeViewer.removeSelectionChangedListener(treeSelectionChangeListener);
-    }
-
-    selectionManager = newSelectionManager;
-
-    // connect to new one
-    if (selectionManager != null)
-    {
-      selectionManager.addSelectionChangedListener(selectionManagerSelectionChangeListener);  
-      treeViewer.addSelectionChangedListener(treeSelectionChangeListener);
-    }
-  }    
-
-  class SelectionManagerSelectionChangeListener implements ISelectionChangedListener
-  {
-    public void selectionChanged(SelectionChangedEvent event)  
-    {         
-      if (event.getSelectionProvider() != getTreeViewer())
-      {
-        getTreeViewer().setSelection(event.getSelection(), true);
-      }
-    }    
-  }
-
-  class TreeSelectionChangeListener implements ISelectionChangedListener
-  {
-    public void selectionChanged(SelectionChangedEvent event)  
-    { 
-      if (selectionManager != null)
-      {
-        ISelection selection = event.getSelection();
-        if (selection instanceof IStructuredSelection)
-        {
-          IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-          Object o = structuredSelection.getFirstElement();
-        
-          // TODO ... 
-          // we need to implement a selectionManagerMapping extension point
-          // so that extensions can specify how they'd like to map view objects 
-          // to selection objects
-          //                                        
-//          if (o instanceof Element)
-//          {  
-//            try
-//            {
-//              Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(wsdlEditor.getDefinition(), (Element)o);
-//              if (modelObject != null && !(modelObject instanceof UnknownExtensibilityElement))
-//              {
-//                o = modelObject;
-//              }
-//            }
-//            catch (Exception e)
-//            {
-//            }
-//          }
-
-          if (o != null)
-          {
-            selectionManager.setSelection(new StructuredSelection(o), getTreeViewer());
-          }
-          else
-          {
-            selectionManager.setSelection(new StructuredSelection(), getTreeViewer());
-          }   
-        }
-      }
-    }    
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java
deleted file mode 100644
index 2988ee2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java
+++ /dev/null

@@ -1,353 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.w3c.dom.Element;
-
-public class AbstractSection implements ISection, IPropertyChangeListener, Listener, SelectionListener
-{
-	private TabbedPropertySheetWidgetFactory factory;
-	private WSDLElement element;
-  protected boolean isReadOnly = false;
-  protected Composite composite;
-  protected int rightMarginSpace;
-  protected int tableMinimumWidth = 50;
-	
-  public void createControls(Composite parent,	TabbedPropertySheetPage tabbedPropertySheetPage)
-  {
-    createControls(parent, tabbedPropertySheetPage.getWidgetFactory());
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-   */
-  public void createControls(Composite parent, TabbedPropertySheetWidgetFactory aFactory)
-  {
-		this.factory = aFactory;
-    GC gc = new GC(parent);
-    Point extent = gc.textExtent("  ...  "); //$NON-NLS-1$
-    rightMarginSpace = extent.x;
-    gc.dispose();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-		Assert.isTrue(selection instanceof IStructuredSelection);
-		Object input = ((IStructuredSelection)selection).getFirstElement();
-		
-		if (input instanceof WSDLElement)
-		{
-		  this.element = (WSDLElement)input;
-      ModelAdapter adapter = WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(input);
-      if (adapter != null)
-      {
-        isReadOnly = Boolean.TRUE.equals(adapter.getProperty(input, "isReadOnly")); //$NON-NLS-1$
-      }
-		}
-		else if (input instanceof WSDLGroupObject)
-		{
-		  this.element = ((WSDLGroupObject)input).getDefinition();
-		}
-		refresh();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#aboutToBeShown()
-   */
-  public void aboutToBeShown()
-  {
-		refresh();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#aboutToBeHidden()
-   */
-  public void aboutToBeHidden()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#dispose()
-   */
-  public void dispose()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#getMinimumHeight()
-   */
-  public int getMinimumHeight()
-  {
-    return SWT.DEFAULT;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-   */
-  public boolean shouldUseExtraSpace()
-  {
-    return true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#refresh()
-   */
-  public void refresh()
-  {
-    if (isReadOnly)
-    {
-      composite.setEnabled(false);
-    }
-    else
-    {
-      composite.setEnabled(true);
-    }
-  }
-
-  public WSDLElement getElement()
-  {
-    return element;
-  }
-  
-	/**
-	 * Get the widget factory.
-	 * @return the widget factory.
-	 */
-	public TabbedPropertySheetWidgetFactory getWidgetFactory() {
-		return factory;
-	}
-
-	public void propertyChange(PropertyChangeEvent event)
-	{
-    refresh();
-	}
-
-	
-  public void doWidgetDefaultSelected(SelectionEvent e)
-  {}
-  
-  public void doWidgetSelected(SelectionEvent e)
-  {}
-  
-  /**
-   * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-   */
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-    if (isListenerEnabled() &&
-        getElement() != null &&
-        !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      doWidgetDefaultSelected(e);
-      isInDoHandle = false;
-    }
-    
-  }
-
-  /**
-   * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (isListenerEnabled() &&
-        getElement() != null &&
-        !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      doWidgetSelected(e);
-      isInDoHandle = false;
-    }
-    
-  }
-  
-  boolean listenerEnabled = true;
-  /**
-   * Get the value of listenerEnabled.
-   * @return value of listenerEnabled.
-   */
-  public boolean isListenerEnabled() 
-  {
-    return listenerEnabled;
-  }
-  
-  /**
-   * Set the value of listenerEnabled.
-   * @param v  Value to assign to listenerEnabled.
-   */
-  public void setListenerEnabled(boolean  v) 
-  {
-    this.listenerEnabled = v;
-  }
-
-  public void handleEvent(Event event)
-  {
-    if (isListenerEnabled() && !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      startDelayedEvent(event);
-      isInDoHandle = false;
-    } // end of if ()
-  }
-  
-  public void doHandleEvent(Event event)
-  {
-    
-  }
-  
-  protected DelayedEvent delayedTask;
-  
-  protected void startDelayedEvent(Event e)
-  {
-    if (delayedTask == null ||
-      delayedTask.getEvent() == null)
-    {
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500,delayedTask);
-    }
-    else
-    {
-      Event delayedEvent = delayedTask.getEvent();
-      
-      if (e.widget == delayedEvent.widget &&
-        e.type == delayedEvent.type)
-      {
-        // same event, just different data, delay new event
-        delayedTask.setEvent(null);
-      }
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500,delayedTask);
-    }
-  }
-  
-  class DelayedEvent implements Runnable
-  {
-    protected Event event;
-    
-    /*
-     * @see Runnable#run()
-     */
-    public void run()
-    {
-      if (event != null)
-      {
-        isInDoHandle = true;
-        doHandleEvent(event);
-        isInDoHandle = false;
-        event = null;
-      }
-    }
-    
-    /**
-     * Gets the event.
-     * @return Returns a Event
-     */
-    public Event getEvent()
-    {
-      return event;
-    }
-
-    /**
-     * Sets the event.
-     * @param event The event to set
-     */
-    public void setEvent(Event event)
-    {
-      this.event = event;
-    }
-
-  }
-
-  boolean isInDoHandle;
-  /**
-   * Get the value of isInDoHandle.
-   * @return value of isInDoHandle.
-   */
-  public boolean isInDoHandle() 
-  {
-    return isInDoHandle;
-  }
-
-  
-  static protected IEditorPart getActiveEditor()
-  {
-    IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
-    IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-    IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-
-    return editorPart;
-  }
-
-  static protected IStatusLineManager getStatusLineManager(IEditorPart editorPart)
-  { 
-    IStatusLineManager result = null;
-    try
-    {                       
-      EditorActionBarContributor contributor = (EditorActionBarContributor)editorPart.getEditorSite().getActionBarContributor();
-      result = contributor.getActionBars().getStatusLineManager();
-    }
-    catch (Exception e)
-    {
-    }  
-    return result;
-  }
-
-  public DocumentImpl getDocument(Element element)
-  {
-    return (DocumentImpl) element.getOwnerDocument();
-  }
-
-  public void beginRecording(String description, Element element)
-  {
-    getDocument(element).getModel().beginRecording(this, description);
-  }
-  
-  public void endRecording(Element element)
-  {
-    DocumentImpl doc = (DocumentImpl) getDocument(element);
-    
-    doc.getModel().endRecording(this);    
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java
deleted file mode 100644
index f65456d..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-public class AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public AbstractSectionDescriptor()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getFilter()
-   */
-  public ITypeMapper getFilter()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(WSDLElement.class);
-    return list;
- }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof WSDLElement || object instanceof WSDLGroupObject)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
-   */
-  public String getAfterSection()
-  {
-    return "";
-  }
-  
-  public int getEnablesFor()
-  {
-	return ENABLES_FOR_ANY;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java
deleted file mode 100644
index 93fe1e6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementAction;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class DocumentationSection extends AbstractSection {
-
-	Text docText;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-	  super.createControls(parent, factory);
-		composite =	getWidgetFactory().createFlatFormComposite(parent);
-		
-		docText = getWidgetFactory().createText(composite, "", SWT.MULTI | SWT.NONE | SWT.H_SCROLL | SWT.V_SCROLL); //$NON-NLS-1$
-    docText.addListener(SWT.Modify, this);  
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(0, 0);
-		data.bottom = new FormAttachment(100, 0);
-		docText.setLayoutData(data);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-    if (docText.isFocusControl())
-    {
-      return;
-    }
-    setListenerEnabled(false);
-	  docText.setText("");
-	  if (getElement() != null)
-	  {
-	    Element docNode = getElement().getDocumentationElement();
-	    if (docNode != null)
-	    {
-        Node textNode = docNode.getFirstChild();
-        if (textNode != null)
-        {
-          String docValue = textNode.getNodeValue();
-          if (docValue != null)
-          {
-            docText.setText(docValue);
-          }
-        }
-	    }
-	  }
-	  setListenerEnabled(true);
-	}
-	
-	public void doHandleEvent(Event event)
-	{
-	  if (event.widget == docText)
-	  {
-	    String value = docText.getText();
-	    if (getElement() != null)
-	    {
-	      Element docNode = getElement().getDocumentationElement();
-	      if (docNode != null)
-	      {
-          Node textNode = docNode.getFirstChild();
-          if (textNode != null)
-          {
-            textNode.setNodeValue(value);
-          }
-          else
-          {
-            if (value.length() > 0)
-            {
-              Document document = docNode.getOwnerDocument();
-              org.w3c.dom.Text newTextNode = document.createTextNode(value);
-              docNode.appendChild(newTextNode);
-            }
-          }
-	      }
-	      else
-	      {
-	        Element element = getElement().getElement();
-          AddElementAction action = new AddElementAction(element, element.getPrefix(), "documentation", element.getFirstChild()); //$NON-NLS-1$
-          action.run();
-          Element newDocumentation = action.getNewElement();
-          
-          Document document = newDocumentation.getOwnerDocument();
-          org.w3c.dom.Text newTextNode = document.createTextNode(value);
-          newDocumentation.appendChild(newTextNode);
-          getElement().setDocumentationElement(newDocumentation);
-	      }
-	    }
-	  }
-	}
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java
deleted file mode 100644
index 7213861..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-
-public class DocumentationSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public DocumentationSectionDescriptor()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.documentation";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    // TODO Auto-generated method stub
-    return new DocumentationSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    // TODO Auto-generated method stub
-    return "org.eclipse.wst.xmlwebservices.documentation";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof WSDLElement)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
-   */
-  public String getAfterSection()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java
deleted file mode 100644
index 2022a8a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-public class ExtensibilityElementSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public ExtensibilityElementSectionDescriptor()
-  {
-    super();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.extensibilityelement";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    // TODO Auto-generated method stub
-    return new ExtensiblityElementSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    // TODO Auto-generated method stub
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof ExtensibilityElement)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
-   */
-  public String getAfterSection()
-  {
-    return "";
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java
deleted file mode 100644
index 62646e2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.viewers.ExtensibilityElementViewer;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.AttributesTable;
-
-public class ExtensiblityElementSection extends AbstractSection implements ModelAdapterListener
-{
-  ExtensibilityElementViewer viewer;
-  protected AttributesTable attributesTable;
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-
-		composite =	getWidgetFactory().createFlatFormComposite(parent);
-	
-//		viewer = new ExtensibilityElementViewer(composite, getActiveEditor(), true);
-		attributesTable = new AttributesTable(getActiveEditor(), composite);
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(0, 0);
-		data.bottom = new FormAttachment(100, 0);
-		attributesTable.getControl().setLayoutData(data);
-//		viewer.getControl().setLayoutData(data);
-	}
-	
-  public void propertyChanged(Object object, String property)
-  {
-    if (isListenerEnabled())
-    {
-      setListenerEnabled(false);
-      refresh();
-      setListenerEnabled(true);
-    }
-  }  
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-    attributesTable.setInput(getElement().getElement());
-
-    Runnable runnable = new Runnable()
-    { 
-      public void run()
-      {           
-        if (!attributesTable.getControl().isDisposed())
-        {
-          attributesTable.refresh();
-        }
-      }
-    };               
-    Display.getCurrent().asyncExec(runnable);
-
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/IPropertyDescriptorProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/IPropertyDescriptorProvider.java
deleted file mode 100644
index c5f1e93..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/IPropertyDescriptorProvider.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.w3c.dom.Element;
-
-public interface IPropertyDescriptorProvider 
-{
-  //public void init(IEditorPart editor);  
-  public IPropertyDescriptor getPropertyDescriptor(IEditorPart editor, Element ownerElement, String attributeNamespace, String attributeName);
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java
deleted file mode 100644
index f218cc5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java
+++ /dev/null

@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.XMLQuickScan;
-import org.w3c.dom.Element;
-
-public class ImportSection extends AbstractSection
-{
-  protected Text namespaceText, prefixText, locationText;
-  private String oldPrefixValue;
-  Button button;
-  IEditorPart editorPart;
-  
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-		FormData data;
-
-		namespaceText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		namespaceText.setEditable(false);
-//		namespaceText.addListener(SWT.Modify, this);
-		data = new FormData();
-		data.left = new FormAttachment(0, 100);
-		data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(0, 0);
-		namespaceText.setLayoutData(data);
-
-		CLabel namespaceLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAMESPACE")); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(namespaceText, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(namespaceText, 0, SWT.CENTER);
-		namespaceLabel.setLayoutData(data);
-
-		prefixText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-//		prefixText.setEditable(false);
-		prefixText.addListener(SWT.Modify, this);
-		data = new FormData();
-		data.left = new FormAttachment(0, 100);
-		data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(namespaceText, +ITabbedPropertyConstants.VSPACE);
-		prefixText.setLayoutData(data);
-
-		CLabel prefixLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX")); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(prefixText, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(prefixText, 0, SWT.CENTER);
-		prefixLabel.setLayoutData(data);
-
-		locationText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		locationText.setEditable(false);
-//		locationText.addListener(SWT.Modify, this);
-
-		CLabel locationLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_LOCATION")); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(locationText, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(locationText, 0, SWT.CENTER);
-		locationLabel.setLayoutData(data);
-
-    button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$
-    button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$
-
-    button.addSelectionListener(this);
-		data = new FormData();
-		data.left = new FormAttachment(100, -rightMarginSpace + 2);
-		data.right = new FormAttachment(100,0);
-		data.top = new FormAttachment(locationText, 0, SWT.CENTER);
-		button.setLayoutData(data);
-    
-    data = new FormData();
-    data.left = new FormAttachment(0, 100);
-    data.right = new FormAttachment(button, 0);
-    data.top = new FormAttachment(prefixText, +ITabbedPropertyConstants.VSPACE);
-    locationText.setLayoutData(data);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-	  setListenerEnabled(false);  
-	  Object obj = getElement();
-    boolean refreshPrefixText = true;
-    boolean refreshLocationText = true;
-    boolean refreshNamespaceText = true;
-    if (prefixText.isFocusControl())
-    {
-      refreshPrefixText = false;
-    }
-    if (locationText.isFocusControl())
-    {
-      refreshLocationText = false;
-    }
-    if (namespaceText.isFocusControl())
-    {
-      refreshNamespaceText = false;
-    }
-    
-    if (refreshPrefixText)
-    {
-      prefixText.setText(""); //$NON-NLS-1$
-    }
-    if (refreshLocationText)
-    {
-      locationText.setText(""); //$NON-NLS-1$
-    }
-    if (refreshNamespaceText)
-    {
-      namespaceText.setText(""); //$NON-NLS-1$
-    }
-	  if (obj instanceof Import)
-	  {
-	    Element element = ((Import)obj).getElement();                           
-      if (refreshLocationText)
-      {
-        String locationValue = element.getAttribute("location"); //$NON-NLS-1$
-  	    locationText.setText(locationValue != null ? locationValue : ""); //$NON-NLS-1$
-      }
-
-      String namespaceValue = element.getAttribute("namespace"); //$NON-NLS-1$
-      if (refreshNamespaceText)
-      {
-        namespaceText.setText(namespaceValue != null ? namespaceValue : ""); //$NON-NLS-1$
-      }
-      
-      if (refreshPrefixText)
-      {
-  	    String prefix = ((Import)obj).getEnclosingDefinition().getPrefix(namespaceValue);
-  	    prefixText.setText(prefix != null ? prefix : ""); //$NON-NLS-1$
-      }
-	  }
-	oldPrefixValue = prefixText.getText();
-    setListenerEnabled(true);
-	}
-
-	public void doHandleEvent(Event event) {
-	    if (event.widget == prefixText && locationText.getText().length() > 0 && namespaceText.getText().length() > 0) {    	
-	    	Object input = getElement();
-	        Import importObj = (Import)input;
-//	        org.w3c.dom.Element importElement = WSDLEditorUtil.getInstance().getElementForObject(importObj);
-	        Map namespacesMap = importObj.getEnclosingDefinition().getNamespaces();
-
-	        if (namespacesMap.containsKey(prefixText.getText())) {
-	        	// We should add error messages.........
-	 //           setErrorMessage(XSDEditorPlugin.getXSDString("_ERROR_LABEL_PREFIX_EXISTS"));
-	        }
-	        else {
-	            Element definitionElement = importObj.getEnclosingDefinition().getElement();
-	            definitionElement.removeAttribute("xmlns:"+oldPrefixValue);
-	            definitionElement.setAttribute("xmlns:" + prefixText.getText(), namespaceText.getText());
-
-//	            clearErrorMessage();
-	            oldPrefixValue = prefixText.getText();
-	        }
-	    }
-	}
-	
-  public void widgetSelected(SelectionEvent e)
-  {
-	  if (e.widget == button)
-	  {
-		  Object input = getElement();
-		  
-		  WSDLEditor editor = (WSDLEditor)editorPart;
-		  IFile currentWSDLFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-		  
-		  SelectSingleFileDialog dialog = new SelectSingleFileDialog(WSDLEditorPlugin.getShell(), null, true);
-		  String [] filters = { "xsd", "wsdl" }; //$NON-NLS-1$
-		  IFile [] excludedFiles = { currentWSDLFile };
-		  
-		  dialog.addFilterExtensions(filters, excludedFiles);
-		  dialog.create();
-		  dialog.getShell().setText(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT")); //$NON-NLS-1$
-		  dialog.setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT_FILE")); //$NON-NLS-1$
-		  dialog.setMessage(WSDLEditorPlugin.getWSDLString("_UI_DESCRIPTION_SELECT_WSDL_OR_XSD")); //$NON-NLS-1$
-		  int rc = dialog.open();
-		  if (rc == IDialogConstants.OK_ID)
-		  {
-			  IFile selectedFile = dialog.getFile();
-			  
-			  //if (selectedFile.getLocation().toOSString().equals(currentWSDLFile.getLocation().toOSString()))
-			  //{
-			  //  System.out.println("SAME FILE:" + currentWSDLFile.getLocation());
-			  //}
-			  
-			  String location = ComponentReferenceUtil.computeRelativeURI(selectedFile, currentWSDLFile, true);
-			  
-			  Import importObj = (Import)input;
-			  org.w3c.dom.Element importElement = WSDLEditorUtil.getInstance().getElementForObject(importObj);
-			  Definition definition = importObj.getEnclosingDefinition();
-			  org.w3c.dom.Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-			  
-			  String importTargetNamespace = ""; //$NON-NLS-1$
-			  String prefix = prefixText.getText();
-			  String uniquePrefix = ""; //$NON-NLS-1$
-			  
-			  URI uri = URI.createPlatformResourceURI(selectedFile.getFullPath().toString());      
-			  
-			  // note that the getTargetNamespaceURIForSchema works for both schema and wsdl files
-			  // I should change the name of this convenience method
-			  importTargetNamespace =  XMLQuickScan.getTargetNamespaceURIForSchema(uri.toString());
-			  
-			  if (prefix.trim().equals("")) //$NON-NLS-1$
-			  {
-				  uniquePrefix = getUniquePrefix(definition, uri.fileExtension());
-			  }
-			  else
-			  {
-				  uniquePrefix = prefix; 
-			  }
-			  
-			  
-			  if (importTargetNamespace == null ||
-					  (importTargetNamespace != null && importTargetNamespace.trim().length() == 0))
-			  {
-				  return;  // what to do with no namespace docs?
-			  }
-			  
-			  importElement.setAttribute("location", location); //$NON-NLS-1$
-			  importElement.setAttribute("namespace", importTargetNamespace); //$NON-NLS-1$
-			  
-			  definitionElement.setAttribute("xmlns:" + uniquePrefix, importTargetNamespace); //$NON-NLS-1$
-			  
-			  namespaceText.setText(importTargetNamespace);
-			  locationText.setText(location);
-			  prefixText.setText(uniquePrefix);
-		  }
-		  
-		  refresh();
-	  }
-  }
-	
-  
-  private String getUniquePrefix(Definition definition, String initPrefix)
-  {
-    String uniquePrefix;
-    Map map = definition.getNamespaces();
-
-    if (definition.getNamespace(initPrefix) == null)
-    {
-      uniquePrefix = initPrefix;
-    }
-    else // if used, then try to create a unique one
-    {
-      String tempPrefix = initPrefix;
-      int i = 1;
-      while(map.containsKey(tempPrefix + i))
-      {
-        i++;
-      }
-      uniquePrefix = tempPrefix + i;
-    }
-    return uniquePrefix;    
-  } 
-  
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java
deleted file mode 100644
index 0122369..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Import;
-
-public class ImportSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  ImportSection importSection;
-  /**
-   * 
-   */
-  public ImportSectionDescriptor()
-  {
-    super();
-    importSection = new ImportSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.import";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(Import.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return importSection;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    importSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor());
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof Import)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-  
-  public String getAfterSection()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.name";
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java
deleted file mode 100644
index 8a2f11c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-
-
-public class NameSection extends AbstractSection
-{
-
-	Text nameText;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent,TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-		composite =	getWidgetFactory().createFlatFormComposite(parent);
-		FormData data;
-		
-
-		nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 100);
-		data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(0, 0);
-		nameText.setLayoutData(data);
-
-		CLabel nameLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME") + ":"); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(nameText, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(nameText, 0, SWT.CENTER);
-		nameLabel.setLayoutData(data);
-		
-		nameText.addListener(SWT.Modify, this);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-    if (nameText.isFocusControl())
-    {
-      return;
-    }
-    setListenerEnabled(false);
-	  nameText.setText(""); //$NON-NLS-1$
-	  if (getElement() != null)
-	  {
-	    if (getElement().getElement()!= null)
-	    {
-	      String name = getElement().getElement().getAttribute("name"); //$NON-NLS-1$
-	      if (name==null) name="";
-	      nameText.setText(name);
-	    }
-	  }
-    setListenerEnabled(true);
-	}
-	
-  public boolean shouldUseExtraSpace()
-  {
-    return false;
-  }
-
-  public void doHandleEvent(Event event)
-  {
-    if (event.widget == nameText && !nameText.isDisposed()) {
-        String newValue = nameText.getText();
-        Object wsdlElement = getElement();
-
-        if (wsdlElement instanceof Definition) {
-        	Definition definition = (Definition) wsdlElement;
-        	String uri = "";
-        	if (definition.getQName() != null) {
-        		uri = definition.getQName().getNamespaceURI();	
-        	}
-        	definition.setQName(new QName(uri, newValue));
-        }
-        else if (wsdlElement instanceof Service) {        
-        	Service service = (Service) wsdlElement;
-        	String uri = service.getQName().getNamespaceURI(); 
-        	service.setQName(new QName(uri, newValue));
-        }
-        else if (wsdlElement instanceof Port) {
-        	new SmartRenameAction(wsdlElement, newValue).run();
-//        	((Port) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof Binding) {
-        	Binding binding = (Binding) wsdlElement;
-        	String uri = binding.getQName().getNamespaceURI();
-        	binding.setQName(new QName(uri, newValue));
-        }
-        else if (wsdlElement instanceof BindingOperation) {
-        		((BindingOperation) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof BindingInput) {
-        	if(((BindingInput) wsdlElement).getName() == null && newValue.equals("")) //$NON-NLS-1$
-        		return;
-        	
-        	((BindingInput) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof BindingOutput) {
-        	if (((BindingOutput) wsdlElement).getName() == null && newValue.equals("")) //$NON-NLS-1$
-        		return;
-        	
-        	((BindingOutput) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof BindingFault) {
-        	((BindingFault) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof PortType) {
-        	PortType portType = (PortType) wsdlElement;
-        	String uri = portType.getQName().getNamespaceURI();
-        	portType.setQName(new QName(uri, newValue));
-        }
-        else if (wsdlElement instanceof Operation) {
-        	new SmartRenameAction(wsdlElement, newValue).run();
-//        	((Operation) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof MessageReference) {
-        	if (((MessageReference) wsdlElement).getName() == null && newValue.equals("")) //$NON-NLS-1$
-        		return;
-        	
-        	new SmartRenameAction(wsdlElement, newValue).run();
-//        	((MessageReference) wsdlElement).setName(newValue);
-        }
-        else if (wsdlElement instanceof Message) {
-/*
-        	Message message = (Message) wsdlElement;
-        	String uri = message.getQName().getNamespaceURI();
-        	message.setQName(new QName(uri, newValue));
-        	*/
-        	new SmartRenameAction(wsdlElement, newValue).run();
-        }
-        else if (wsdlElement instanceof Part) {
-//        	((Part) wsdlElement).setName(newValue);
-        	new SmartRenameAction(wsdlElement, newValue).run();
-        }
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java
deleted file mode 100644
index b641350..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-
-public class NameSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public NameSectionDescriptor()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.name";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(WSDLElement.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return new NameSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof WSDLElement && 
-          !(object instanceof ExtensibilityElement) &&
-          !(object instanceof Import))
-      {
-      	if (object instanceof WSDLElement) {
-      		Definition definition = ((WSDLElement) object).getEnclosingDefinition();
-      		if (definition.getElement() != null && !(object instanceof Definition)) {
-      			return true;
-      		}
-      		
-      		return false;
-      	}
-      	/*
-      	else if (object instanceof WSDLGroupObject) {
-      		Definition definition = ((WSDLGroupObject) object).getDefinition();
-      		if (definition.getElement() != null) {
-      			return true;
-      		}
-      		
-      		return false;
-      	}
-      	*/
-      }
-    }
-    return false;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java
deleted file mode 100644
index 93cc771..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java
+++ /dev/null

@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.EditNamespacesAction;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesTargetFieldDialog;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonNamespaceInfoTable;
-import org.w3c.dom.Element;
-
-public class NamespaceSection extends AbstractSection
-{
-  protected String targetNamespace;
-  protected List namespaceInfoList;
-  protected CommonEditNamespacesTargetFieldDialog editWSDLNamespacesControl;
-  protected Button button;
-  
-  Text nameText;
-  Text prefixText;
-  Text targetNamespaceText;
-  protected CommonNamespaceInfoTable tableViewer;
-  private boolean handlingEvent;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-		composite =	getWidgetFactory().createFlatFormComposite(parent);
-		
-		String nameString = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME") + ":";
-		String prefixString = WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX") + ":";
-		String namespaceString = WSDLEditorPlugin.getWSDLString("_UI_LABEL_TARGET_NAMESPACE");
-		GC gc = new GC(parent);
-		int xoffset = Math.max(115, gc.textExtent(nameString).x + 20); // adds 20 due to borders
-		xoffset = Math.max(xoffset, gc.textExtent(prefixString).x + 20); // adds 20 due to borders
-		xoffset = Math.max(xoffset, gc.textExtent(namespaceString).x + 20); // adds 20 due to borders
-		gc.dispose();
-
-		// name
-		CLabel nameLabel = getWidgetFactory().createCLabel(composite, nameString); //$NON-NLS-1$
-		nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		
-		// prefix
-		CLabel prefixLabel = getWidgetFactory().createCLabel(composite, prefixString); //$NON-NLS-1$
-		prefixText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-
-		// targetnamespace
-		CLabel targetNamespaceLabel = getWidgetFactory().createCLabel(composite, namespaceString); //$NON-NLS-1$
-		targetNamespaceText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-
-		// Advanced button
-		button = getWidgetFactory().createButton(composite, WSDLEditorPlugin.getWSDLString("_UI_SECTION_ADVANCED_ATTRIBUTES") + "...", SWT.PUSH); //$NON-NLS-1$
-		
-		
-		///////////////////// Labels
-		// name layout
-		FormData dataNameLabel = new FormData();
-		dataNameLabel.top = new FormAttachment(nameText, 0, SWT.CENTER);
-		nameLabel.setLayoutData(dataNameLabel);
-
-		// prefix layout
-		FormData dataPrefixLabel = new FormData();
-		dataPrefixLabel.left = new FormAttachment(0, 0);
-		dataPrefixLabel.top = new FormAttachment(prefixText, 0, SWT.CENTER);
-		prefixLabel.setLayoutData(dataPrefixLabel);
-
-		// targetNamespaceLabel layout
-		FormData datatnsLabel = new FormData();
-		datatnsLabel.left = new FormAttachment(0, 0);
-    datatnsLabel.right = new FormAttachment(targetNamespaceText, 0);
-		datatnsLabel.top = new FormAttachment(targetNamespaceText, 0, SWT.CENTER);
-		targetNamespaceLabel.setLayoutData(datatnsLabel);
-		
-
-		///////////////////// Text Fields
-		// name text field
-		FormData dataNameText = new FormData();
-		dataNameText.left = new FormAttachment(0, xoffset);
-		dataNameText.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		dataNameText.top = new FormAttachment(0, 0);
-		nameText.setLayoutData(dataNameText);
-		nameText.addListener(SWT.Modify, this);
-
-		// prefix text field
-		FormData dataPrefixText = new FormData();
-		dataPrefixText.left = new FormAttachment(0, xoffset);
-		dataPrefixText.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		dataPrefixText.top = new FormAttachment(nameText, +ITabbedPropertyConstants.VSPACE);
-		prefixText.setLayoutData(dataPrefixText);
-		prefixText.addListener(SWT.Modify, this);
-
-		// targetnamespace text field
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, xoffset);
-		data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(prefixText, +ITabbedPropertyConstants.VSPACE);
-		targetNamespaceText.setLayoutData(data);
-		targetNamespaceText.addListener(SWT.Modify, this);
-		
-		// Advanced button layout
-		FormData dataButton = new FormData();
-//		dataButton.left = new FormAttachment(100, -rightMarginSpace + 2);
-		dataButton.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-		dataButton.top = new FormAttachment(targetNamespaceText, +ITabbedPropertyConstants.VSPACE);
-//		dataButton.top = new FormAttachment(targetNamespaceText, 0, SWT.CENTER);
-		button.setLayoutData(dataButton);
-		button.addSelectionListener(this);
-	}
-
-	public void doHandleEvent(Event event)
-	{
-		handlingEvent = true;
-	  if (event.widget == nameText) {
-	  	Object obj = getElement();
-	  	if (obj instanceof Definition) {
-	  		Definition definition = (Definition) obj;
-	  		String uri = "";
-	  		if (definition.getQName() != null) {
-	  			uri = definition.getQName().getNamespaceURI();
-	  		}
-	  		definition.setQName(new QName(uri, nameText.getText()));
-	  	}
-	  }
-	  else if (event.widget == prefixText) {
-	  	Object obj = getElement();
-	  	if (obj instanceof Definition) {
-	  		Definition definition = (Definition) obj;
-	  		Element element = definition.getElement();
-	  		
-	  		// Remove the old prefix
-	  		String oldPrefix = definition.getPrefix(definition.getTargetNamespace());
-	  		element.removeAttribute("xmlns:"+oldPrefix); 
-	  		
-	  		// Set the new prefix
-	  	  	element.setAttribute("xmlns:" + prefixText.getText(), definition.getTargetNamespace());
-	  	}
-	  }
-	  else if (event.widget == targetNamespaceText)
-	  {
-		  Object obj = getElement();
-		  if (obj instanceof Definition)
-		  {
-		    Definition definition = (Definition)obj;
-		    String newValue = targetNamespaceText.getText();
-		    String prefix = definition.getPrefix(definition.getTargetNamespace());
-		    definition.setTargetNamespace(newValue);
-		    definition.getElement().setAttribute("xmlns:" + prefix, newValue);
-		  }
-	  }
-	  handlingEvent = false;		
-	}
-	
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-
-    if (targetNamespaceText.isFocusControl() || handlingEvent)
-    {
-      return;
-    }
-	  setListenerEnabled(false);  
-	  Object obj = getElement();
-	  if (obj instanceof Definition)
-	  {
-	    Definition definition = (Definition)obj;
-	    String targetNS = definition.getTargetNamespace();
-	    
-		// set targetnamespace field and prefix field
-	    if (targetNS != null)
-	    {
-	    	targetNamespaceText.setText(targetNS);
-	    	
-	    	Element element = definition.getElement();
-
-        String newPrefix = definition.getPrefix(targetNS);
-        if (newPrefix == null) newPrefix = "";
-        // TODO: remove this code
-        if (element != null)
-        {
-  	    	for (int index = 0; index < element.getAttributes().getLength(); index++) {
-  	    		AttrImpl attr = (AttrImpl) element.getAttributes().item(index);
-  	    		String nodeName = attr.getNodeName();
-  	    		String nsValue = attr.getNodeValue();
-  	    		if (nsValue.equals(targetNS)) {
-  	    			if (nodeName.indexOf(":") != -1) {
-  	    				String xmlnsString = nodeName.substring(0, nodeName.indexOf(":"));
-  	    				
-  	    				if (xmlnsString.equals("xmlns")) {
-  	    	    			newPrefix = attr.getLocalName();
-  	    	    			break;
-  	    				}
-  	    			}
-  	    		}
-  	    	}
-        }
-	    	prefixText.setText(newPrefix);     
-	    }
-	  }
-	  
-	  // set name field
-	  if (getElement() != null)
-	  {
-	    if (getElement().getElement()!= null)
-	    {
-	      String name = getElement().getElement().getAttribute("name"); //$NON-NLS-1$
-	      if (name==null) name="";
-	      nameText.setText(name);
-	    }
-	  }
-
-    setListenerEnabled(true);
-	}
-	
-	
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == button)
-    {
-      Object obj = getElement();
-      if (obj instanceof Definition)
-      {
-        Definition definition = (Definition)obj;
-        EditNamespacesAction action = new EditNamespacesAction(definition);
-      	action.run();
-        refresh();
-      }
-    }
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java
deleted file mode 100644
index eb0ffef..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-public class NamespaceSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public NamespaceSectionDescriptor()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.namespace";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(WSDLGroupObject.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return new NamespaceSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof WSDLGroupObject)
-      {
-      	Definition definition = ((WSDLGroupObject) object).getDefinition();
-      	if (definition.getElement() != null) {
-      		return true;
-      	}
-      	
-      	return false;
-      }
-      else if (object instanceof org.eclipse.wst.wsdl.Definition) {
-      	Definition definition = (Definition) object;
-      	if (definition.getElement() != null) {
-      		return true;
-      	}
-      	
-      	return false;
-      }
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
-   */
-  public String getAfterSection()
-  {
-    return "";
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java
deleted file mode 100644
index c3936aa..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java
+++ /dev/null

@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-
-
-public class PartSection extends AbstractSection
-{
-  CCombo componentNameCombo;
-	CCombo referenceKindCombo;
-  CLabel componentNameLabel;
-  Button button;
-  IEditorPart editorPart;
-
-	public void handleEvent (Event event)
-	{
-    if (event.type == SWT.Modify)
-    {  
-      if (event.widget == referenceKindCombo)
-      {
-        boolean isType = referenceKindCombo.getText().equals(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-        ComponentReferenceUtil.setComponentReference((Part)getElement(), isType, null);
-        refresh();
-      } 
-    }
-
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-		composite =	getWidgetFactory().createFlatFormComposite(parent);
-
-		FormData data;
-
-		referenceKindCombo = getWidgetFactory().createCCombo(composite);
-		referenceKindCombo.setBackground(composite.getBackground());
-		referenceKindCombo.add(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT")); //$NON-NLS-1$
-		referenceKindCombo.add(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-
-		CLabel valueLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_REFERENCE_KIND")); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(referenceKindCombo, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(referenceKindCombo, 0, SWT.CENTER);
-		valueLabel.setLayoutData(data);
-
-    componentNameCombo = getWidgetFactory().createCCombo(composite);
-    componentNameCombo.setBackground(composite.getBackground());
-    componentNameCombo.addListener(SWT.Modify, this);
-    componentNameCombo.addSelectionListener(this);
-
-    componentNameLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT") + ":"); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(componentNameCombo, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
-		componentNameLabel.setLayoutData(data);
-		
-    button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$
-    button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$
-
-    button.addSelectionListener(this);
-		data = new FormData();
-		data.left = new FormAttachment(100, -rightMarginSpace + 2);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
-		button.setLayoutData(data);
-		
-    data = new FormData();
-    data.left = new FormAttachment(0, 100);
-    data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE);
-    data.top = new FormAttachment(0, 0);
-    referenceKindCombo.setLayoutData(data);
-    
-    data = new FormData();
-    data.left = new FormAttachment(0, 100);
-    data.right = new FormAttachment(button, 0);
-    data.top = new FormAttachment(referenceKindCombo, +ITabbedPropertyConstants.VSPACE);
-    componentNameCombo.setLayoutData(data);
-
-    referenceKindCombo.addListener(SWT.Modify, this);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-	  referenceKindCombo.removeListener(SWT.Modify, this);
-		if (((Part)getElement()).getTypeDefinition() != null)
-		{
-		  referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-		}
-		else
-		{
-		  referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT")); //$NON-NLS-1$
-		}
-		
-    try
-    {
-      Part part = (Part)getElement();
-      boolean isType = ComponentReferenceUtil.isType(part);
-      String value = ComponentReferenceUtil.getPartComponentReference(part);
-
-      // update the combo-box content
-      //
-      componentNameCombo.removeAll(); 
-      List compList = ComponentReferenceUtil.getComponentNameList(part, isType);
-      if (compList != null)
-      {
-        for (Iterator iterator =  compList.iterator(); iterator.hasNext();)
-        {
-          componentNameCombo.add((String)iterator.next());
-        }
-      } 
-      
-      if (isType)
-      {                                                 
-        referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-        componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE") + ":");  //$NON-NLS-1$
-        componentNameCombo.setText(value != null ? value : ""); //$NON-NLS-1$
-//        button.setReferenceKind("type");
-      }
-      else
-      {
-        referenceKindCombo.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT"));  //$NON-NLS-1$
-        componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT") + ":");  //$NON-NLS-1$
-        componentNameCombo.setText(value != null ? value : ""); //$NON-NLS-1$
-        
-//        button.setReferenceKind("element");
-      }                                                        
-//      button.setInput(input);
-//      button.setEditor(editorPart);
-      
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-    finally
-    {
-  		referenceKindCombo.addListener(SWT.Modify, this);
-    }
-	}
-
-  /**
-   * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    Part part = (Part)getElement();
-    boolean isType = referenceKindCombo.getText().equals(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE")); //$NON-NLS-1$
-    if (e.widget == componentNameCombo)
-    {                                                      
-      ComponentReferenceUtil.setComponentReference(part, isType, componentNameCombo.getText());
-      refresh();
-    }
-    else if (e.widget == button)
-    {
-        InvokeSetDialog dialog = new InvokeSetDialog();
-          
-        if (getElement() instanceof Part)
-        {
-            dialog.setReferenceKind(referenceKindCombo.getText());
-        }
-        dialog.setReferenceKind(referenceKindCombo.getText());
-        dialog.run(getElement(), editorPart);
-        
-        WSDLEditor editor = (WSDLEditor) editorPart;
-        editor.getSelectionManager().setSelection(new StructuredSelection(getElement()));
-    }
-  }
-  
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java
deleted file mode 100644
index 78f6012..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Part;
-
-
-public class PartSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  PartSection partSection;
-  /**
-   * 
-   */
-  public PartSectionDescriptor()
-  {
-    super();
-    partSection = new PartSection();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.part";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(Part.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return partSection;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    partSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor());
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof Part)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-  
-  public String getAfterSection()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.name";
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java
deleted file mode 100644
index dffb3df..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-public class ReferenceSection extends AbstractSection
-{
-  protected CCombo componentNameCombo; 
-  protected ComponentNameComboHelper componentNameComboHelper;
-  Button button;
-  IEditorPart editorPart;
-  CLabel messageLabel;
-  
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory)
-	{
-		super.createControls(parent, factory);
-		composite = getWidgetFactory().createFlatFormComposite(parent);
-		FormData data;
-    
-    messageLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE")); //$NON-NLS-1$
-    componentNameCombo = getWidgetFactory().createCCombo(composite);
-    componentNameCombo.setBackground(composite.getBackground());
-    button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$
-    button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$
-    button.addSelectionListener(this);
-
-		data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(componentNameCombo, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
-		messageLabel.setLayoutData(data);
-		
-		data = new FormData();
-		data.left = new FormAttachment(100, -rightMarginSpace + 2);
-		data.right = new FormAttachment(100,0);
-		data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER);
-		button.setLayoutData(data);
-    
-    data = new FormData();
-    data.left = new FormAttachment(0, 100);
-    data.right = new FormAttachment(button, 0);
-    componentNameCombo.setLayoutData(data);
-    
-    componentNameCombo.addListener(SWT.Modify, this);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh()
-	{
-    super.refresh();
-	  setListenerEnabled(false);  
-	  componentNameCombo.removeListener(SWT.Modify, this);
-	  Object obj = getElement();
-	  if (obj instanceof MessageReference)
-	  {
-	    messageLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE")); //$NON-NLS-1$
-	    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-	    {
-	      protected List getComponentNameList(ComponentReferenceUtil util)
-	      {
-	        return util.getMessageNames();
-	      }
-
-	      protected String getAttributeName()
-	      {
-	        return WSDLConstants.MESSAGE_ATTRIBUTE;
-	      }
-	    };
-
-	  }
-	  else if (obj instanceof Binding)
-	  {
-	    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-	    {
-	      protected List getComponentNameList(ComponentReferenceUtil util)
-	      {
-	        return util.getPortTypeNames();
-	      }
-
-	      protected String getAttributeName()
-	      {
-	        return WSDLConstants.TYPE_ATTRIBUTE;
-	      }
-	    };
-
-	    messageLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE")); //$NON-NLS-1$
-	  }
-	  else if (obj instanceof Port)
-	  {
-	    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-	    {
-	      protected List getComponentNameList(ComponentReferenceUtil util)
-	      {
-	        return util.getBindingNames();
-	      }
-
-	      protected String getAttributeName()
-	      {
-	        return WSDLConstants.BINDING_ATTRIBUTE;
-	      }
-	    };
-	    messageLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING")); //$NON-NLS-1$
-	  }
-	  
-    componentNameComboHelper.update(getElement());
-    setListenerEnabled(true);
-    componentNameCombo.addListener(SWT.Modify, this);
-	}
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == button)
-    {
-        InvokeSetDialog dialog = new InvokeSetDialog();
-        dialog.run(getElement(), editorPart);
-        
-        WSDLEditor editor = (WSDLEditor) editorPart;
-        editor.getSelectionManager().setSelection(new StructuredSelection(getElement()));
-    }
-  }
-	
-  public void handleEvent(Event event)
-  {
-    componentNameComboHelper.handleEventHelper(getElement().getElement(), event);
-  }
-  
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java
deleted file mode 100644
index 7978dc9..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Port;
-
-
-public class ReferenceSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor
-{
-  ReferenceSection referenceSection;
-  
-  /**
-   * 
-   */
-  public ReferenceSectionDescriptor()
-  {
-    super();
-    this.referenceSection = new ReferenceSection(); 
-  }
-
-
-  /**
-   * 
-   */
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.reference";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(MessageReference.class);
-    list.add(Binding.class);
-    list.add(Port.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return referenceSection;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return "org.eclipse.wst.xmlwebservices.general";
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    referenceSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor());
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof MessageReference || object instanceof Binding || object instanceof Port)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public String getAfterSection()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.section.name";
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/TextChangeHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/TextChangeHelper.java
deleted file mode 100644
index 124ed18..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/TextChangeHelper.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * TextChangeHelper notifies the listner of text lifecycle events 
- * on behalf of the widget(s) it listens to. 
- * 
- * @author Anthony Hunter 
- * <a href="mailto:anthonyh@ca.ibm.com">anthonyh@ca.ibm.com</a>
- */
-public abstract class TextChangeHelper implements Listener {
-	
-	private boolean nonUserChange;
-
-	/**
-	 * Marks the start of a programmatic change to the widget contents.
-	 * Clients must call startNonUserChange() before directly setting 
-	 * the widget contents to avoid unwanted lifecycle events.
-	 * @throws IllegalArgumentException if a programmatic change is 
-	 * already in progress.
-	 */
-	public void startNonUserChange() {
-		if (nonUserChange)
-			throw new IllegalStateException("we already started a non user change");//$NON-NLS-1$
-		nonUserChange = true;
-	}
-
-	/**
-	 * Clients who call startNonUserChange() should call 
-	 * finishNonUserChange() as soon as possible after the change is done.
-	 * @throws IllegalArgumentException if no change is in progress.
-	 */
-	public void finishNonUserChange() {
-		if (!nonUserChange)
-			throw new IllegalStateException("we are not in a non user change");//$NON-NLS-1$
-		nonUserChange = false;
-	}
-
-	/**
-	 * Returns true if a programmatic change is in progress.
-	 */
-	public boolean isNonUserChange() {
-		return nonUserChange;
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		switch (event.type) {
-			case SWT.KeyDown :
-				if (event.character == SWT.CR)
-					textChanged((Control)event.widget);
-				break;
-			case SWT.FocusOut :
-				textChanged((Control)event.widget);
-				break;
-		}
-	}
-
-	/**
-	 * Abstract method notified when a text field has been changed.
-	 * @param control
-	 */
-	public abstract void textChanged(Control control);
-
-	/**
-	 * Registers this helper with the given control to listen for events
-	 * which indicate that a change is in progress (or done).
-	 */
-	public void startListeningTo(Control control) {
-		control.addListener(SWT.FocusOut, this);
-		control.addListener(SWT.Modify, this);
-	}
-
-	/**
-	 * Registers this helper with the given control to listen for the
-	 * Enter key.  When Enter is pressed, the change is considered done 
-	 * (this is only appropriate for single-line Text widgets).
-	 */
-	public void startListeningForEnter(Control control) {
-		// NOTE: KeyDown rather than KeyUp, because of similar usage in CCombo. 
-		control.addListener(SWT.KeyDown, this);
-	}
-
-	/**
-	 * Unregisters this helper from a control previously passed to
-	 * startListeningTo() and/or startListeningForEnter().
-	 */
-	public void stopListeningTo(Control control) {
-		control.removeListener(SWT.FocusOut, this);
-		control.removeListener(SWT.Modify, this);
-		control.removeListener(SWT.KeyDown, this);
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLLabelProvider.java
deleted file mode 100644
index a5de0b6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLLabelProvider.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-
-public class WSDLLabelProvider extends LabelProvider
-{
-  protected ModelAdapterFactory adapterFactory = new WSDLModelAdapterFactory();
-	private WSDLTypeMapper typeMapper;
-	
-  protected WSDLEditorExtension[] labelProviderExtensions;
-  protected LabelProvider[] labelProviders;
-  IEditorPart editorPart;
-
-  /**
-   * 
-   */
-  public WSDLLabelProvider()
-  {
-    super();
-    typeMapper = new WSDLTypeMapper();
-    editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-    labelProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.OUTLINE_LABEL_PROVIDER); 
-    labelProviders = new LabelProvider[labelProviderExtensions.length]; 
-    for (int i = 0; i < labelProviderExtensions.length; i++)
-    {
-      labelProviders[i] = (LabelProvider)labelProviderExtensions[i].createExtensionObject(WSDLEditorExtension.OUTLINE_LABEL_PROVIDER, (WSDLEditor)editorPart);
-    }
-  }
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object object)
-	{
-		if (object == null || object.equals(StructuredSelection.EMPTY)) {
-			return null;
-		}
-    Image result = null;           
-    if (object instanceof StructuredSelection)
-    {
-      Object selected = ((StructuredSelection)object).getFirstElement();
-      selected  = typeMapper.remapObject(selected);
-      for (int i = 0; i < labelProviders.length; i++)
-      {
-        result = labelProviders[i].getImage(selected);
-        if (result!=null)
-        break;
-      }
-//      if (result != null)
-//      {
-//        ModelAdapter modelAdapter = adapterFactory.getAdapter(selected);
-//        if (modelAdapter != null)
-//        {
-//          result = (Image)modelAdapter.getProperty(selected, ModelAdapter.IMAGE_PROPERTY);     
-//        }
-//      }
-    }
-    return result;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object object)
-	{
-		if (object == null || object.equals(StructuredSelection.EMPTY)) {
-			return "No items selected";//$NON-NLS-1$
-		}
-    String result = null;
-    Object selected = null;
-    if (object instanceof StructuredSelection)
-    {
-      selected = ((StructuredSelection)object).getFirstElement();
-      selected  = typeMapper.remapObject(selected);
-      
-      // Override outline provider's getText for WSDLElements
-      if (selected instanceof WSDLElement)
-      {
-      	if (((WSDLElement)selected).getElement() == null) {
-      		return "";
-      	}
-        boolean isReadOnly = false;
-        ModelAdapter adapter = WSDLGraphModelAdapterFactory.getWSDLGraphModelAdapterFactory().getAdapter(selected);
-        if (adapter != null)
-        {
-          isReadOnly = Boolean.TRUE.equals(adapter.getProperty(selected, "isReadOnly"));
-        }
-        if (isReadOnly)
-        {
-          result = ((WSDLElement)selected).getElement().getLocalName() + " (" + WSDLEditorPlugin.getWSDLString("_UI_LABEL_READ_ONLY") + ")";   //$NON-NLS-1$
-        }
-        else
-        {
-          result = ((WSDLElement)selected).getElement().getLocalName();
-        }
-        return result;
-      }
-      else if (selected instanceof XSDConcreteComponent)
-      {
-        // Override for XSD Components
-       
-        Element element = ((XSDConcreteComponent)selected).getElement();
-        if (element != null)
-        {
-          if (element instanceof IDOMNode)
-          {
-            return ((XSDConcreteComponent)selected).getElement().getLocalName();
-          }
-          else
-          {
-            return ((XSDConcreteComponent)selected).getElement().getLocalName() + " (" + WSDLEditorPlugin.getWSDLString("_UI_LABEL_READ_ONLY") + ")";   //$NON-NLS-1$
-          }
-        }
-        else
-        {
-          return "(" + WSDLEditorPlugin.getWSDLString("_UI_LABEL_READ_ONLY") + ")";  //$NON-NLS-1$
-        }
-
-      }
-      // otherwise get it from the extensions
-      for (int i = 0; i < labelProviders.length; i++)
-      {
-        result = labelProviders[i].getText(selected);
-        if (result!=null)
-        break;
-      }
-    }
-    else if (object instanceof TextSelection)
-    {
-    }
-    
-
-    return result;
-	}
-
-	/**
-	 * Determine if a multiple object selection has been passed to the 
-	 * label provider. If the objects is a IStructuredSelection, see if 
-	 * all the objects in the selection are the same and if so, we want
-	 * to provide labels for the common selected element.
-	 * @param objects a single object or a IStructuredSelection.
-	 * @param multiple first element in the array is true if there is multiple
-	 * unequal selected elements in a IStructuredSelection.
-	 * @return the object to get labels for.
-	 */
-//	private Object getObject(Object objects, boolean multiple[]) {
-//		Assert.isNotNull(objects);
-//		Object object = null;
-//		return object;
-//	}
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java
deleted file mode 100644
index 73d1658..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-
-public class WSDLSectionDescriptorProvider implements ISectionDescriptorProvider
-{
-  protected WSDLEditorExtension[] propertySectionDescriptorProviderExtensions;
-  protected ISectionDescriptorProvider[] propertySectionDescriptorProviders;
-
-  protected WSDLEditorExtension[] labelProviderExtensions;
-
-  protected final static Object[] EMPTY_ARRAY = {};
-  
-  IEditorPart editorPart;
-
-  /**
-   * 
-   */
-  public WSDLSectionDescriptorProvider()
-  {
-    super();
-    // TODO Check this
-    this.editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider#getSectionDescriptors()
-   */
-  public ISectionDescriptor[] getSectionDescriptors()
-  {
-    List list = new ArrayList();
-    
-    
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    propertySectionDescriptorProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.PROPERTY_SECTION_DESCRIPTOR_PROVIDER); 
-    propertySectionDescriptorProviders = new ISectionDescriptorProvider[propertySectionDescriptorProviderExtensions.length]; 
-    for (int i = 0; i < propertySectionDescriptorProviderExtensions.length; i++)
-    {
-      propertySectionDescriptorProviders[i] = (ISectionDescriptorProvider)propertySectionDescriptorProviderExtensions[i].createExtensionObject(WSDLEditorExtension.PROPERTY_SECTION_DESCRIPTOR_PROVIDER, (WSDLEditor)editorPart);
-      
-      ISectionDescriptor [] extensionSectionDescriptors = propertySectionDescriptorProviders[i].getSectionDescriptors();
-      for (int j = 0; j < extensionSectionDescriptors.length; j++)
-      {
-        list.add(extensionSectionDescriptors[j]);
-      }
-    }
-
-    
-    list.add(new NameSectionDescriptor());
-    list.add(new PartSectionDescriptor());
-    list.add(new DocumentationSectionDescriptor());
-    list.add(new ReferenceSectionDescriptor());
-    list.add(new NamespaceSectionDescriptor());
-    list.add(new ExtensibilityElementSectionDescriptor());
-    list.add(new ImportSectionDescriptor());
-    
-		ISectionDescriptor[] descriptors = new ISectionDescriptor[list.size()];
-	  list.toArray(descriptors);
-
-    return descriptors;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java
deleted file mode 100644
index ad924f7..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.sse.ui.internal.view.events.INodeSelectionListener;
-import org.eclipse.wst.sse.ui.internal.view.events.NodeSelectionChangedEvent;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLSelectionManager;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLTabbedPropertySheetPage extends TabbedPropertySheetPage implements ISelectionChangedListener, INodeSelectionListener, ModelAdapterListener
-{
-  private WSDLSelectionManager fViewerSelectionManager;
-  private WSDLEditor wsdlEditor;
-  private Object currentObject;
-
-  /**
-   * @param tabbedPropertySheetPageContributor
-   */
-  public WSDLTabbedPropertySheetPage(ITabbedPropertySheetPageContributor tabbedPropertySheetPageContributor, WSDLEditor editor)
-  {
-    super(tabbedPropertySheetPageContributor);
-    this.wsdlEditor = editor;
-  }
-  
-  public void createControl(Composite parent) {
-  	super.createControl(parent);
-  	wsdlEditor.getSelectionManager().setSelection(new StructuredSelection(wsdlEditor.getDefinition()));
-  }
-  
-	public void setSelectionManager(WSDLSelectionManager viewerSelectionManager) {
-		// disconnect from old one
-		if (fViewerSelectionManager != null) {
-			fViewerSelectionManager.removeSelectionChangedListener(this);
-		}
-
-		fViewerSelectionManager = viewerSelectionManager;
-
-		// connect to new one
-		if (fViewerSelectionManager != null) {
-			fViewerSelectionManager.addSelectionChangedListener(this);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event)
-	{
-		if (!event.getSelection().isEmpty()) {
-			selectionChanged(getSite().getWorkbenchWindow().getActivePage().getActivePart(), event.getSelection());
-		    //super.selectionChanged(getSite().getWorkbenchWindow().getActivePage().getActivePart(), event.getSelection());
-		}
-	}
-  
-  public void selectionChanged(IWorkbenchPart part, ISelection selection)
-  {
-    // override for category
-    if (selection != null)
-    {
-      if (selection instanceof StructuredSelection)
-      {
-        StructuredSelection structuredSelection = (StructuredSelection)selection;
-        if (structuredSelection.isEmpty())
-        {
-          return;
-        }
-        Object obj = structuredSelection.getFirstElement();
-        Node node = WSDLEditorUtil.getInstance().getNodeForObject(obj);
-        Object o = WSDLEditorUtil.getInstance().findModelObjectForElement(wsdlEditor.getDefinition(), (Element)node);
-        
-        // bad hack to get schema from category
-        // until we provide a better mechanism (selection manager extension)
-        // see also WSDLGraphViewer
-        if (o instanceof XSDSchemaExtensibilityElement)
-        {
-          obj = ((XSDSchemaExtensibilityElement)o).getSchema();
-          selection = new StructuredSelection(obj);
-        } 
-      	
-        attachListener(o);
-      }
-      else if (selection instanceof TextSelection)
-      {
-        return;
-      }
-    }
-    
-    super.selectionChanged(wsdlEditor.getEditorPart(), selection);   // event.getSelection()); 
-  }
-  
-  protected void attachListener(Object object)
-  {
-  	WSDLModelAdapterFactory adapterFactory = WSDLModelAdapterFactory.getWSDLModelAdapterFactory();
-    ModelAdapter adapter = adapterFactory.getAdapter(object);
-    if (adapter != null)
-    {
-    	// remove listener from the previously selected object
-    	removeListener(currentObject);
-    	
-    	// add listener to the newly selected object
-    	adapter.addListener(this);
-    	currentObject = object;
-    }
-  } 
-  
-  protected void removeListener(Object object)
-  {
-  	WSDLModelAdapterFactory adapterFactory = WSDLModelAdapterFactory.getWSDLModelAdapterFactory();
-    ModelAdapter adapter = adapterFactory.getAdapter(object);
-    if (adapter != null)
-    {
-      adapter.removeListener(this);
-      currentObject = null;
-    }
-  }
-	public void dispose() {
-		// disconnect from the ViewerSelectionManager
-		if (fViewerSelectionManager != null) {
-			fViewerSelectionManager.removeSelectionChangedListener(this);
-		}
-		
-		// disconnect listener from the current object
-		if (currentObject != null) {
-			removeListener(currentObject);
-		}
-		
-		super.dispose();
-	}
-
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.sse.editor.view.events.INodeSelectionListener#nodeSelectionChanged(org.eclipse.wst.sse.editor.view.events.NodeSelectionChangedEvent)
-   */
-  public void nodeSelectionChanged(NodeSelectionChangedEvent event)
-  {
-  }
-  
-  public void propertyChanged(Object object, String property) {
-  	if (getCurrentTab() != null) {
-  		refresh();
-  	}
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java
deleted file mode 100644
index 37ed055..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.properties.section;
-
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-
-public class WSDLTypeMapper implements ITypeMapper
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper#remapType(java.lang.Object, java.lang.Class)
-   */
-  public Class remapType(Object object, Class effectiveType)
-  {
-		Class type = effectiveType;
-		
-		if (object instanceof WSDLGroupObject) {
-			type = ((WSDLGroupObject) object).getDefinition().getClass();
-		}
-
-		return type;
-  }
-  
-  public Object remapObject(Object object)
-  {
-    Object type = object;
-    
-    if (object instanceof WSDLGroupObject)
-    {
-      type = ((WSDLGroupObject) object).getDefinition();
-    }
-    return type;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java
deleted file mode 100644
index f251731..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.reconciler;
-
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator;
-
-/**
- * 
- */
-public class DelegatingSourceValidatorForWSDL extends DelegatingSourceValidator
-{
-
-  final private static String VALIDATOR_CLASS = "org.eclipse.wst.wsdl.validation.internal.ui.eclipse.Validator"; 
-
-  public DelegatingSourceValidatorForWSDL()
-  { super();
-  }
-  
-  protected IValidator getDelegateValidator()
-  {
-    try
-    {
-    ValidationRegistryReader registry = ValidationRegistryReader.getReader();
-      return registry.getValidator(VALIDATOR_CLASS);
-    }
-    catch (Exception e)
-    { //
-    } 
-    return null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/ExtensibleNodeReconciler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/ExtensibleNodeReconciler.java
deleted file mode 100644
index 58a0759..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/ExtensibleNodeReconciler.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.reconciler;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeReconciler;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.w3c.dom.Element;
-
-                                    
-
-// TODO.. we should probably be keying off of the node's qname (perhaps supporting 'null' as a wild card for local names) 
-// in order to compute an applicable reconciler
-//
-public class ExtensibleNodeReconciler
-{  
-  protected WSDLEditorExtension[] extensions;
-  protected INodeReconciler[] reconcilers;
-
-  public ExtensibleNodeReconciler()
-  {                                  
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
-    extensions = registry.getRegisteredExtensions(WSDLEditorExtension.NODE_RECONCILER); 
-    reconcilers = new INodeReconciler[extensions.length]; 
-    for (int i = 0; i < extensions.length; i++)
-    {
-      reconcilers[i] = (INodeReconciler)extensions[i].createExtensionObject(WSDLEditorExtension.NODE_RECONCILER, null);
-    }
-  }         
-
-  protected INodeReconciler getApplicableNodeReconciler(Object object)
-  {
-    INodeReconciler reconciler = null;
-    for (int i = 0; i < extensions.length; i++)
-    {
-      if (extensions[i].isApplicable(object))
-      {
-        reconciler = reconcilers[i];
-        if (reconciler != null)
-        {
-          break;
-        }
-      }
-    }
-    return reconciler;
-  }
-
-  public void notifyChanged(Object modelObject, Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)             
-  {
-    INodeReconciler reconciler = getApplicableNodeReconciler(modelObject);
-    if (reconciler != null)
-    {                                                    
-      reconciler.notifyChanged(modelObject, element, eventType, feature, oldValue, newValue, index);
-    }
-  }                                         
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/SEDDocumentAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/SEDDocumentAdapter.java
deleted file mode 100644
index 10c5dd5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/reconciler/SEDDocumentAdapter.java
+++ /dev/null

@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.reconciler;    
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class SEDDocumentAdapter
-{
-  protected Document document;                               
-  protected Definition definition;   
-  protected ExtensibleNodeReconciler extensibleNodeReconciler;
-  
-  public SEDDocumentAdapter(IStructuredModel model, Definition definition)
-  {           
-    this.document = (model instanceof IDOMModel) ? ((IDOMModel)model).getDocument() : null;     
-    this.definition = definition;
-    this.extensibleNodeReconciler = new ExtensibleNodeReconciler();
-    new MyDocumentAdapter(document);
-  }  
- 
-
-  class MyDocumentAdapter extends DocumentAdapter
-  {
-//    private boolean isValidDefinition = true;
-    
-    MyDocumentAdapter(Document document)
-    {
-      super(document);
-    }   
-        
-    public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index) 
-    {                      
-      if (eventType == INodeNotifier.ADD)
-      {
-        if (newValue instanceof Element)
-        {
-          adapt((Element)newValue);
-
-          // See Bug 5366
-          // We need to sync up the Model and the DOM
-          Element newDocumentElement = (Element)newValue;
-          String wsdlPrefix = newDocumentElement.getPrefix();
-          if (wsdlPrefix == null) wsdlPrefix = "";
-          String ns = definition.getNamespace(wsdlPrefix);
-          if (ns != null && ns.equals(WSDLConstants.WSDL_NAMESPACE_URI)
-             && newDocumentElement.getLocalName().equals(WSDLConstants.DEFINITION_ELEMENT_TAG)) // &&
-             // !isValidDefinition)
-          {
-//            System.out.println("****** Setting new definition");
-            definition.setElement(newDocumentElement);
-          }
-        }
-      }   
-  
-      switch (eventType)
-      {                  
-        // we make the assumption that reconciling will only be triggered by one of these notifications 
-        // (ADD and REMOVE notifications are omitted)
-        //
-        case INodeNotifier.CHANGE: 
-        case INodeNotifier.STRUCTURE_CHANGED:
-        case INodeNotifier.CONTENT_CHANGED:
-        {                      
-          if (notifier instanceof Element)
-          {
-            reconcileModelObjectForElement((Element)notifier, eventType, feature, oldValue, newValue, index);
-          }
-          else if (notifier instanceof Document)
-          {
-            Document document = (Document)notifier;
-            Element definitionElement = null;          
-
-            for (Node node = document.getFirstChild(); node != null; node = node.getNextSibling())
-            {
-              if (node.getNodeType() == Node.ELEMENT_NODE)
-              {
-                Element element = (Element)node;
-                if (WSDLEditorUtil.getInstance().getWSDLType(element) == WSDLConstants.DEFINITION)
-                {
-                  definitionElement = element;
-                  break;
-                }
-              }
-            }
-           
-            // TODO... revisit definition.removeAllContent() and who should call this?
-            //
-            if (definitionElement != null)
-            {
-//              isValidDefinition = true;
-//              System.out.println("VALID DEFINITION ELEMENT");
-              ((DefinitionImpl)definition).elementChanged(definitionElement);
-            }
-            else
-            {
-//              System.out.println("INVALID DEFINITION ELEMENT");
-//              isValidDefinition = false;
-              ((DefinitionImpl)definition).removeAll();
-            }
-          }
-          break;
-        }
-      }
-    }
-    
-    protected void reconcileModelObjectForElement(Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)
-    {                                                                  
-      Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);  
-      if (modelObject != null)
-      {
-        if (modelObject instanceof XSDSchemaExtensibilityElementImpl)
-        {
-          XSDSchemaExtensibilityElementImpl ee = (XSDSchemaExtensibilityElementImpl)modelObject;
-          ((XSDSchemaImpl)ee.getSchema()).elementChanged(element);
-          ee.elementChanged(element);            
-        }		
-        else if (modelObject instanceof WSDLElementImpl)
-        {
-          ((WSDLElementImpl)modelObject).elementChanged(element);
-        }
-        else if (modelObject instanceof XSDConcreteComponent)
-        {
-          ((XSDConcreteComponent)modelObject).elementChanged(element);
-          extensibleNodeReconciler.notifyChanged(modelObject, element, eventType, feature, oldValue, newValue, index);     
-        }
-      } 	  
-    }   
-  }
-  
-                                                
-  // An abstract adapter that ensures that the children of a new Node are also adapted
-  //
-  abstract class DocumentAdapter implements INodeAdapter
-  {                               
-    public DocumentAdapter(Document document)
-    {
-      ((INodeNotifier)document).addAdapter(this);
-
-      for (Node child = document.getFirstChild(); child != null; child = child.getNextSibling())
-      {
-        if (child.getNodeType() == Node.ELEMENT_NODE)
-        {
-          adapt((Element)child);
-        }
-      }
-    }
-  
-    public void adapt(Element element)
-    {                 
-      if (element != null)
-      {
-        if (((INodeNotifier)element).getExistingAdapter(this) == null)
-        {  
-          ((INodeNotifier)element).addAdapter(this);
-        
-          for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling())
-          {
-            if (child.getNodeType() == Node.ELEMENT_NODE)
-            {
-              adapt((Element)child);
-            }
-          }
-        }
-      }
-    }
-  
-    public boolean isAdapterForType(Object type) 
-    {
-      return type == this;
-    }
-  
-    abstract public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index);  
-  }
-} 
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java
deleted file mode 100644
index e4ec0f3..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java
+++ /dev/null

@@ -1,96 +0,0 @@
-package org.eclipse.wst.wsdl.ui.internal.text;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.ui.internal.typesystem.ExtensibleTypeSystemProvider;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLModelLocatorAdapterFactory;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.util.XSDSchemaLocationResolverAdapterFactory;
-import org.w3c.dom.Element;
-
-public class WSDLModelAdapter implements INodeAdapter
-{
-  protected ResourceSet resourceSet;
-  protected Definition definition;
-
-  public Definition getDefinition()
-  {
-    return definition;
-  }
-
-  public void setDefinition(Definition definition)
-  {
-    this.definition = definition;
-  }
-
-  public boolean isAdapterForType(Object type)
-  {
-    return type == WSDLModelAdapter.class;
-  }
-
-  public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
-  {
-  }
-
-  public Definition createDefinition(Element element)
-  {     
-    try
-    {
-      IDOMNode domNode = (IDOMNode)element;
-      String baseLocation = domNode.getModel().getBaseLocation();
-          
-      definition = WSDLFactory.eINSTANCE.createDefinition();
-               
-      resourceSet = new ResourceSetImpl();
-      resourceSet.getAdapterFactories().add(new WSDLModelLocatorAdapterFactory());
-      resourceSet.getAdapterFactories().add(new XSDSchemaLocationResolverAdapterFactory());
-                     
-      // TODO.. .revist the best approach to obtain a URI from the SSE model
-      //
-      URI uri = null;
-      if (baseLocation.startsWith("/"))
-      {
-        uri = URI.createPlatformResourceURI(baseLocation);
-      }
-      else
-      {
-        uri = URI.createFileURI(baseLocation);
-      }            
-      
-      definition = WSDLFactory.eINSTANCE.createDefinition();
-      definition.setDocumentBaseURI(uri.toString());
-      definition.setElement(element);
-      
-      WSDLResourceFactoryImpl resourceFactory = new WSDLResourceFactoryImpl();
-      Resource resource = resourceFactory.createResource(uri);
-      resourceSet.getResources().add(resource);       
-      resource.getContents().add(definition);
-      resource.setModified(false);    
-      ((DefinitionImpl)definition).reconcileReferences(true);    
-                 
-      // attach an adapter to keep the WSDL model and DOM in sync
-      //
-      new WSDLModelReconcileAdapter(element.getOwnerDocument(), definition);
-
-      // TODO... CS : revisit this line
-      // currently this is used to associate a 'type' system with the definition      
-      // I suspect that this could be made a whole lot more simple
-      //
-      WSDLEditorUtil.getInstance().setTypeSystemProvider(definition, new ExtensibleTypeSystemProvider());
-    }
-    catch (Exception ex)
-    {
-      ex.printStackTrace();
-    }
-    return definition;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java
deleted file mode 100644
index 73e5a23..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java
+++ /dev/null

@@ -1,198 +0,0 @@
-package org.eclipse.wst.wsdl.ui.internal.text;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.filter.ExtensiblityElementFilter;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.text.XSDModelQueryExtension;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLModelQueryExtension extends XSDModelQueryExtension
-{
-  public WSDLModelQueryExtension()
-  {
-  }
-
-  protected boolean isParentElementMessageReference(String parentElementName)
-  {
-    return parentElementName.equals("input") || parentElementName.equals("output") || parentElementName.equals("fault");
-  }
-
-  protected boolean isMessageReference(String elementName)
-  {
-    return elementName.equals("body") || elementName.equals("header") || elementName.equals("fault") || elementName.equals("urlReplacement") || elementName.equals("urlEncoded");
-  }
-
-  
-  public boolean isApplicableChildElement(Node parentNode, String namespace, String name)
-  {
-    boolean result = true;
-    if (parentNode.getNodeType() == Node.ELEMENT_NODE)
-    {
-      Element element = (Element) parentNode;
-      String parentElementNamespaceURI = parentNode.getNamespaceURI();
-      String parentElementName = parentNode.getLocalName();
-      // only filter children for 'non-schema' elements
-      //      
-      if (!WSDLConstants.XSD_NAMESPACE_URI.equals(parentElementNamespaceURI))
-      {
-        if (parentElementName != null && name != null)
-        {
-          if (namespace != null)
-          {
-            // the following namespace are one that always should be filtered out            
-            // for now this is hardcoded
-            //
-            if (namespace.equals("http://schemas.xmlsoap.org/soap/encoding/"))
-            {
-              // exclude soap-enc elements
-              //
-              result = false;
-            }
-            else if (namespace.equals(WSDLConstants.XSD_NAMESPACE_URI))
-            {
-              // eclipse all schema elements, except for 'schema' withing wsdl types elements 
-              result = parentElementName.equals("types") && name.equals("schema");
-            }   
-            else
-            {
-              // TODO.. we should investigate removing the  ExtensiblityElementFilter extension point
-              // shouldn't this be a ModelQueryExtension defined on the extension languages?
-              //
-              ExtensiblityElementFilter filter = (ExtensiblityElementFilter) WSDLEditorPlugin.getInstance().getExtensiblityElementFilterRegistry().getProperty(namespace, "");
-              if (filter != null)
-              {
-                result = filter.isValidContext(element, name);
-              }
-            }
-          }
-        }
-      }
-    }
-    return result;
-  }
-
-  public String[] getAttributeValues(Element element, String namespace, String name)
-  {
-    if (WSDLConstants.WSDL_NAMESPACE_URI.equals(namespace))
-    {
-      List list = new ArrayList();
-      ComponentReferenceUtil util = new ComponentReferenceUtil(lookupOrCreateDefinition(element));
-      String currentElementName = element.getLocalName();
-      if (checkName(name, "message"))
-      {
-        list.addAll(util.getMessageNames());
-      }
-      else if (checkName(name, "binding"))
-      {
-        list.addAll(util.getBindingNames());
-      }
-      else if (checkName(name, "type"))
-      {
-        if (checkName(currentElementName, "binding"))
-        {
-          list.addAll(util.getPortTypeNames());
-        }
-        else if (checkName(currentElementName, "part"))
-        {
-          list.addAll(util.getComponentNameList(true));
-        }
-      }
-      else if (checkName(name, "element"))
-      {
-        if (checkName(currentElementName, "part"))
-        {
-          list.addAll(util.getComponentNameList(false));
-        }
-      }
-      String[] result = new String[list.size()];
-      list.toArray(result);
-      return result;
-    }
-    else
-    {
-      return super.getAttributeValues(element, namespace, name);
-    }
-  }
-
-  
-  protected XSDSchema lookupOrCreateSchemaForElement(Element element)
-  {       
-    XSDSchema schema = null;
-    Definition definition = lookupOrCreateDefinition(element);
-    Object o = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);
-    if (o instanceof XSDConcreteComponent)
-    {
-      schema = ((XSDConcreteComponent) o).getSchema();
-    } 
-    return schema;
-  }
-  
-  
-  protected Definition lookupOrCreateDefinition(Element element)
-  {
-    Definition definition = null;
-    Document document = element.getOwnerDocument();
-    if (document instanceof INodeNotifier)
-    {
-      INodeNotifier notifier = (INodeNotifier) document;
-      WSDLModelAdapter adapter = (WSDLModelAdapter) notifier.getAdapterFor(WSDLModelAdapter.class);
-      if (adapter == null)
-      {
-        adapter = new WSDLModelAdapter();
-        notifier.addAdapter(adapter);
-        adapter.createDefinition(document.getDocumentElement());
-      }
-      definition = adapter.getDefinition();
-    }
-    return definition;
-  }
-  
-  
-  protected TypesHelper getTypesHelper(final Element element)
-  {
-    XSDSchema schema = lookupOrCreateSchemaForElement(element);
-    return new TypesHelper(schema)
-    {
-      // TODO... it seems as though the model is not correctly
-      // mainting the list of prefixes for a given namespace
-      // must be a bug!
-      //
-      protected List getPrefixesForNamespace(String namespace)
-      {
-        List list = super.getPrefixesForNamespace(namespace);
-        Definition definition = lookupOrCreateDefinition(element);
-        if (definition != null)
-        {  
-          Map map = definition.getNamespaces();
-          for (Iterator i = map.keySet().iterator(); i.hasNext();)
-          {
-            String prefix = (String) i.next();
-            String ns = (String) map.get(prefix);
-            if (ns != null && ns.equals(namespace))
-            {
-              if (!list.contains(prefix))
-              {
-                list.add(prefix);
-              }
-            }
-          }
-        }
-        return list;
-      }       
-    };    
-  }  
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java
deleted file mode 100644
index b9f2212..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java
+++ /dev/null

@@ -1,166 +0,0 @@
-package org.eclipse.wst.wsdl.ui.internal.text;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.reconciler.ExtensibleNodeReconciler;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-class WSDLModelReconcileAdapter extends DocumentAdapter
-{                             
-  protected Definition definition;   
-  protected ExtensibleNodeReconciler extensibleNodeReconciler;
-
-  public WSDLModelReconcileAdapter(Document document, Definition definition)
-  {           
-    super(document);
-    this.definition = definition;
-    this.extensibleNodeReconciler = new ExtensibleNodeReconciler();
-  } 
-   
-     
-  public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index) 
-  {                      
-    if (eventType == INodeNotifier.ADD)
-    {
-      if (newValue instanceof Element)
-      {
-        adapt((Element)newValue);
-
-        // See Bug 5366
-        // We need to sync up the Model and the DOM
-        Element newDocumentElement = (Element)newValue;
-        String wsdlPrefix = newDocumentElement.getPrefix();
-        if (wsdlPrefix == null) wsdlPrefix = "";
-        String ns = definition.getNamespace(wsdlPrefix);
-        if (ns != null && ns.equals(WSDLConstants.WSDL_NAMESPACE_URI)
-           && newDocumentElement.getLocalName().equals(WSDLConstants.DEFINITION_ELEMENT_TAG)) // &&
-           // !isValidDefinition)
-        {
-//          System.out.println("****** Setting new definition");
-          definition.setElement(newDocumentElement);
-        }
-      }
-    }   
-
-    switch (eventType)
-    {                  
-      // we make the assumption that reconciling will only be triggered by one of these notifications 
-      // (ADD and REMOVE notifications are omitted)
-      //
-      case INodeNotifier.CHANGE: 
-      case INodeNotifier.STRUCTURE_CHANGED:
-      case INodeNotifier.CONTENT_CHANGED:
-      {                      
-        if (notifier instanceof Element)
-        {
-          reconcileModelObjectForElement((Element)notifier, eventType, feature, oldValue, newValue, index);
-        }
-        else if (notifier instanceof Document)
-        {
-          Document document = (Document)notifier;
-          Element definitionElement = null;          
-
-          for (Node node = document.getFirstChild(); node != null; node = node.getNextSibling())
-          {
-            if (node.getNodeType() == Node.ELEMENT_NODE)
-            {
-              Element element = (Element)node;
-              if (WSDLEditorUtil.getInstance().getWSDLType(element) == WSDLConstants.DEFINITION)
-              {
-                definitionElement = element;
-                break;
-              }
-            }
-          }
-         
-          // TODO... revisit definition.removeAllContent() and who should call this?
-          //
-          if (definitionElement != null)
-          {
-//            isValidDefinition = true;
-//            System.out.println("VALID DEFINITION ELEMENT");
-            ((DefinitionImpl)definition).elementChanged(definitionElement);
-          }
-          else
-          {
-//            System.out.println("INVALID DEFINITION ELEMENT");
-//            isValidDefinition = false;
-            ((DefinitionImpl)definition).removeAll();
-          }
-        }
-        break;
-      }
-    }
-  }
-
-  protected void reconcileModelObjectForElement(Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)
-  {                                                                  
-    Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);  
-    if (modelObject != null)
-    {
-      if (modelObject instanceof XSDSchemaExtensibilityElementImpl)
-      {
-        XSDSchemaExtensibilityElementImpl ee = (XSDSchemaExtensibilityElementImpl)modelObject;
-        ((XSDSchemaImpl)ee.getSchema()).elementChanged(element);
-        ee.elementChanged(element);            
-      }   
-      else if (modelObject instanceof WSDLElementImpl)
-      {
-        ((WSDLElementImpl)modelObject).elementChanged(element);
-      }
-      else if (modelObject instanceof XSDConcreteComponent)
-      {
-        ((XSDConcreteComponent)modelObject).elementChanged(element);
-        extensibleNodeReconciler.notifyChanged(modelObject, element, eventType, feature, oldValue, newValue, index);     
-      }
-    }     
-  }   
-}
-
-
-abstract class DocumentAdapter implements INodeAdapter
-{
-  Document document;
-  
-  public DocumentAdapter(Document document)
-  {
-    this.document = document;
-    ((INodeNotifier)document).addAdapter(this);
-    adapt(document.getDocumentElement());
-  }
-
-  public void adapt(Element element)
-  {
-    if (((INodeNotifier)element).getExistingAdapter(this) == null)
-    {
-      ((INodeNotifier)element).addAdapter(this);
-
-      for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling())
-      {
-        if (child.getNodeType() == Node.ELEMENT_NODE)
-        {
-          adapt((Element)child);
-        }
-      }
-    }
-  }
-
-  public boolean isAdapterForType(Object type)
-  {
-    return type == this;
-  }
-
-  abstract public void notifyChanged
-    (INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/typesystem/ExtensibleTypeSystemProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/typesystem/ExtensibleTypeSystemProvider.java
deleted file mode 100644
index d6bc54a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/typesystem/ExtensibleTypeSystemProvider.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.typesystem;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.xsd.XSDSchema;
-
-public class ExtensibleTypeSystemProvider implements ITypeSystemProvider
-{
-  protected WSDLEditorExtension[] extensions;
-  protected ITypeSystemProvider[] typeSystemProviders;
-
-  protected final static Object[] EMPTY_ARRAY = {};
-
-  public ExtensibleTypeSystemProvider()
-  {
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    extensions = registry.getRegisteredExtensions(WSDLEditorExtension.TYPE_SYSTEM_PROVIDER); 
-    typeSystemProviders = new ITypeSystemProvider[extensions.length]; 
-    for (int i = 0; i < extensions.length; i++)
-    {
-      typeSystemProviders[i] = (ITypeSystemProvider)extensions[i].createExtensionObject(WSDLEditorExtension.TYPE_SYSTEM_PROVIDER, null);
-    }
-  }          
-        
-  public List getAvailableTypeNames(Definition definition, int typeNameCategory)
-  {
-    List list = new ArrayList();
-    for (int i = 0; i < typeSystemProviders.length; i++)
-    {
-      list.addAll(typeSystemProviders[i].getAvailableTypeNames(definition, typeNameCategory));
-    }   
-    return list;
-  }
-  
-  public List getAvailableTypes(Definition definition, XSDSchema schema, int typeNameCategory)
-  {
-    List list = new ArrayList();
-    for (int i = 0; i < typeSystemProviders.length; i++)
-    {
-      list.addAll(typeSystemProviders[i].getAvailableTypes(definition, schema, typeNameCategory));
-    }   
-    return list;
-  }
-
-  public List getAvailableElementNames(Definition definition)
-  {
-    List list = new ArrayList();
-    for (int i = 0; i < typeSystemProviders.length; i++)
-    {
-      list.addAll(typeSystemProviders[i].getAvailableElementNames(definition));
-    }     
-    return list;
-  }
-
-  public int getCategoryForTypeName(Definition definition, String typeName)
-  {
-    int result = UNKNOWN_TYPE;
-    for (int i = 0; i < typeSystemProviders.length; i++)
-    {
-      result = typeSystemProviders[i].getCategoryForTypeName(definition, typeName);
-      if (result != UNKNOWN_TYPE)
-      {
-        break;
-      }
-    }                                                                                 
-    return result;
-  }
-  
-  public List getPrefixedNames(Definition definition, String namespace, String localName) {
-  	 List list = new ArrayList();
-     for (int i = 0; i < typeSystemProviders.length; i++)
-     {
-       list.addAll(typeSystemProviders[i].getPrefixedNames(definition, namespace, localName));
-     }     
-     return list;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java
deleted file mode 100644
index cbf51ae..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java
+++ /dev/null

@@ -1,957 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.ImportImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class ComponentReferenceUtil
-{
-  protected Definition rootDefinition;
-
-  public ComponentReferenceUtil(Definition rootDefinition)
-  {
-    this.rootDefinition = rootDefinition;
-  }
-
-  protected static boolean isEqual(String a, String b)
-  {
-    boolean result = false;
-    if (a != null)
-    {
-      result = a.equals(b) || (a.length() == 0 && b == null);
-    }
-    else
-    {
-      result = (b == null || b.length() == 0);
-    }
-    return result;
-  }
-
-  protected static boolean isEqualInputName(Operation operation, BindingOperation bindingOperation)
-  {
-    boolean result = false;
-    Input operationInput = operation.getEInput();
-    BindingInput bindingOperationInput = bindingOperation.getEBindingInput();
-
-    if (operationInput != null && bindingOperationInput != null)
-    {
-      result = isEqual(operationInput.getName(), bindingOperationInput.getName());
-    }
-    else if (operationInput == null && bindingOperationInput == null)
-    {
-      result = true;
-    }
-    return result;
-  }
-
-  protected static boolean isEqualOutputName(Operation operation, BindingOperation bindingOperation)
-  {
-    boolean result = false;
-    Output operationOutput = operation.getEOutput();
-    BindingOutput bindingOperationOutput = bindingOperation.getEBindingOutput();
-
-    if (operationOutput != null && bindingOperationOutput != null)
-    {
-      result = isEqual(operationOutput.getName(), bindingOperationOutput.getName());
-    }
-    else if (operationOutput == null && bindingOperationOutput == null)
-    {
-      result = true;
-    }
-    return result;
-  }
-
-  protected static boolean isMatchingBinding(Operation operation, BindingOperation bindingOperation)
-  {
-    return isEqual(operation.getName(), bindingOperation.getName()) && isEqualInputName(operation, bindingOperation) && isEqualOutputName(operation, bindingOperation);
-  }
-
-  public List getPortsForPortType(PortType portType)
-  {
-    List list = new ArrayList();
-    for (Iterator i = getServices().iterator(); i.hasNext();)
-    {
-      Service service = (Service) i.next();
-      for (Iterator j = service.getEPorts().iterator(); j.hasNext();)
-      {
-        Port port = (Port) j.next();
-        Binding binding = port.getEBinding();
-        if (binding != null && binding.getEPortType() == portType)
-        {
-          list.add(port);
-        }
-      }
-    }
-    return list;
-  }
-
-  public List getPortsForBinding(Binding binding)
-  {
-    List list = new ArrayList();
-    for (Iterator i = getServices().iterator(); i.hasNext();)
-    {
-      Service service = (Service) i.next();
-      for (Iterator j = service.getEPorts().iterator(); j.hasNext();)
-      {
-        Port port = (Port) j.next();
-        if (port.getEBinding() == binding)
-        {
-          list.add(port);
-        }
-      }
-    }
-    return list;
-  }
-
-  public List getBindingOperations(Operation operation)
-  {
-    List list = new ArrayList();
-    String operationName = operation.getName();
-
-    if (operationName != null)
-    {
-      PortType portType = getEnclosingPortType(operation);
-      for (Iterator i = getBindings(portType).iterator(); i.hasNext();)
-      {
-        Binding binding = (Binding) i.next();
-        BindingOperation bindingOperation = getBindingOperation(operation, binding);
-        if (bindingOperation != null)
-        {
-          list.add(bindingOperation);
-        }
-      }
-    }
-    return list;
-  }
-
-  public BindingOperation getBindingOperation(Operation operation, Binding binding)
-  {
-    BindingOperation result = null;
-    for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext();)
-    {
-      BindingOperation bindingOperation = (BindingOperation) j.next();
-      if (isMatchingBinding(operation, bindingOperation))
-      {
-        result = bindingOperation;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public BindingInput getBindingInput(Input input, Binding binding)
-  {
-    BindingOperation bindingOperation = getBindingOperation((Operation) input.eContainer(), binding);
-    return bindingOperation != null ? bindingOperation.getEBindingInput() : null;
-  }
-
-  public BindingOutput getBindingOutput(Output output, Binding binding)
-  {
-    BindingOperation bindingOperation = getBindingOperation((Operation) output.eContainer(), binding);
-    return bindingOperation != null ? bindingOperation.getEBindingOutput() : null;
-  }
-
-  public BindingFault getBindingFault(Fault fault, Binding binding)
-  {
-    BindingFault result = null;
-    String faultName = fault.getName();
-    if (faultName != null)
-    {
-      BindingOperation bindingOperation = getBindingOperation((Operation) fault.eContainer(), binding);
-      if (bindingOperation != null)
-      {
-        result = (BindingFault) bindingOperation.getBindingFault(faultName);
-      }
-    }
-    return result;
-  }
-
-  public EObject getBindingObject(EObject interfaceObject, Binding binding)
-  {
-    EObject result = null;
-    if (interfaceObject instanceof Input)
-    {
-      result = getBindingInput((Input) interfaceObject, binding);
-    }
-    else if (interfaceObject instanceof Output)
-    {
-      result = getBindingOutput((Output) interfaceObject, binding);
-    }
-    else if (interfaceObject instanceof Fault)
-    {
-      result = getBindingFault((Fault) interfaceObject, binding);
-    }
-    else if (interfaceObject instanceof Operation)
-    {
-      result = getBindingOperation((Operation) interfaceObject, binding);
-    }
-    else if (interfaceObject instanceof PortType)
-    {
-      result = binding;
-    }
-    return result;
-  }
-
-  public List getBindingInputs(Input input)
-  {
-    List list = new ArrayList();
-    List operations = getBindingOperations((Operation) input.eContainer());
-    for (Iterator i = operations.iterator(); i.hasNext();)
-    {
-      BindingOperation bindingOperation = (BindingOperation) i.next();
-      if (bindingOperation.getBindingInput() != null)
-      {
-        list.add(bindingOperation.getBindingInput());
-      }
-    }
-    return list;
-  }
-
-  public List getBindingOutputs(Output output)
-  {
-    List list = new ArrayList();
-    Operation operation = (Operation) output.eContainer();
-    if (operation != null)
-    {
-      List operations = getBindingOperations(operation);
-      for (Iterator i = operations.iterator(); i.hasNext();)
-      {
-        BindingOperation bindingOperation = (BindingOperation) i.next();
-        if (bindingOperation.getBindingOutput() != null)
-        {
-          list.add(bindingOperation.getBindingOutput());
-        }
-      }
-    }
-    return list;
-  }
-
-  public List getBindingFaults(Fault fault)
-  {
-    List list = new ArrayList();
-    String faultName = fault.getName();
-    if (faultName != null)
-    {
-      Operation operation = (Operation) fault.eContainer();
-      if (operation != null)
-      {
-        List operations = getBindingOperations(operation);
-        for (Iterator i = operations.iterator(); i.hasNext();)
-        {
-          BindingOperation bindingOperation = (BindingOperation) i.next();
-          BindingFault bindingFault = (BindingFault) bindingOperation.getBindingFault(faultName);
-          if (bindingFault != null)
-          {
-            list.add(bindingFault);
-          }
-        }
-      }
-    }
-    return list;
-  }
-
-  protected PortType getEnclosingPortType(Operation operation)
-  {
-    return (PortType) operation.eContainer();
-  }
-
-  public List getBindings(Operation operation)
-  {
-    return getBindings(getEnclosingPortType(operation));
-  }
-
-  public List getBindings(PortType portType)
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      for (Iterator j = definition.getBindings().values().iterator(); j.hasNext();)
-      {
-        Binding binding = (Binding) j.next();
-        if (portType == null || binding.getPortType() == portType)
-        {
-          list.add(binding);
-        }
-      }
-    }
-    return list;
-  }
-
-  public List getBindingsWithoutOperation(PortType portType, String operationName)
-  {
-    List result = new ArrayList();
-    if (operationName != null)
-    {
-      List bindings = getBindings(portType);
-      for (Iterator i = bindings.iterator(); i.hasNext();)
-      {
-        Binding binding = (Binding) i.next();
-        boolean hasName = false;
-        for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext();)
-        {
-          BindingOperation bindingOperation = (BindingOperation) j.next();
-          if (operationName.equals(bindingOperation.getName()))
-          {
-            hasName = true;
-            break;
-          }
-        }
-        if (!hasName)
-        {
-          result.add(binding);
-        }
-      }
-    }
-    return result;
-  }
-
-  public List getBindings()
-  {
-    return getBindings((PortType) null);
-  }
-
-  public List getBindingNames()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getBindings().iterator(); i.hasNext();)
-    {
-      Binding binding = (Binding) i.next();
-      list.addAll(getPrefixedNames(binding.getQName()));
-    }
-    return list;
-  }
-
-  public List getPortTypeNames()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      for (Iterator j = definition.getPortTypes().values().iterator(); j.hasNext();)
-      {
-        PortType portType = (PortType) j.next();
-        list.addAll(getPrefixedNames(portType.getQName()));
-      }
-    }
-    return list;
-  }
-
-  public List getServices()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      list.addAll(definition.getEServices());
-    }
-    return list;
-  }
-
-  public List getPortTypes()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      list.addAll(definition.getEPortTypes());
-    }
-    return list;
-  }
-
-  public List getMessages()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      list.addAll(definition.getEMessages());
-    }
-    return list;
-  }
-
-  public List getTypes()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      if (definition.getETypes() != null)
-      {
-        list.add(definition.getETypes());
-      }
-    }
-    return list;
-  }
-
-  public List getMessageNames()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getDefinitions().iterator(); i.hasNext();)
-    {
-      Definition definition = (Definition) i.next();
-      for (Iterator j = definition.getMessages().values().iterator(); j.hasNext();)
-      {
-        Message message = (Message) j.next();
-        list.addAll(getPrefixedNames(message.getQName()));
-      }
-    }
-    return list;
-  }
-
-  public List getDefinitions()
-  {
-    List list = new ArrayList();
-    addDefinition(rootDefinition, list);
-    return list;
-  }
-
-  /**
-   * @deprecated -- we should always use getPrefixedNames
-   */
-  public String getPrefixedName(QName qname)
-  {
-    String name = null;
-    if (qname != null)
-    {
-      String prefix = rootDefinition.getPrefix(qname.getNamespaceURI());
-      if (prefix != null)
-      {
-        name = prefix + ":" + qname.getLocalPart();
-      }
-    }
-    return name;
-  }
-
-  public List getPrefixedNames(QName qname)
-  {
-    List list = new ArrayList();
-    if (qname != null)
-    {
-      Map map = rootDefinition.getNamespaces();
-      for (Iterator i = map.keySet().iterator(); i.hasNext();)
-      {
-        String prefix = (String) i.next();
-        String namespace = (String) map.get(prefix);
-        if (namespace != null && namespace.equals(qname.getNamespaceURI()))
-        {
-          String name = prefix.length() > 0 ? prefix + ":" + qname.getLocalPart() : 
-                        qname.getLocalPart();
-          list.add(name);
-        }
-      }
-    }
-    return list;
-  }
-
-  protected void addDefinition(Definition definition, List list)
-  {
-    if (definition != null)
-    {
-      list.add(definition);
-      for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-      {
-        ImportImpl theImport = (ImportImpl) i.next();
-        if (theImport.getLocationURI() != null && !theImport.getLocationURI().endsWith("xsd"))
-        {
-          theImport.importDefinitionOrSchema();	 
-          Definition importedDefinition = (Definition) theImport.getEDefinition();
-          if (importedDefinition != null && !list.contains(importedDefinition))
-          {
-            addDefinition(importedDefinition, list);
-          }
-        }
-      }
-    }
-  }
-
-  public static String getPortTypeReference(Binding binding)
-  {
-    String result = null;
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
-    if (element != null)
-    {
-      result = element.getAttribute("type");
-    }
-    return result;
-  }
-
-  public static void setPortTypeReference(Binding binding, String portType)
-  {
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
-    if (element != null)
-    {
-      element.setAttribute("type", portType);
-    }
-  }
-
-  public static String getBindingReference(Port port)
-  {
-    String result = null;
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(port);
-    if (element != null)
-    {
-      result = element.getAttribute("binding");
-    }
-    return result;
-  }
-
-  public static String getName(Binding binding)
-  {
-    String result = null;
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
-    if (element != null)
-    {
-      result = element.getAttribute("name");
-    }
-    return result;
-  }
-
-  public static QName getPortTypeReferenceQName(Binding binding)
-  {
-    QName result = null;
-    Definition definition = binding.getEnclosingDefinition();
-    String prefixedName = getPortTypeReference(binding);
-    if (prefixedName != null)
-    {
-      result = WSDLEditorUtil.createQName(definition, prefixedName);
-    }
-    return result;
-  }
-
-  public static QName getBindingReferenceQName(Port port)
-  {
-    QName result = null;
-    Definition definition = port.getEnclosingDefinition();
-    String prefixedName = getBindingReference(port);
-    if (prefixedName != null)
-    {
-      result = WSDLEditorUtil.createQName(definition, prefixedName);
-    }
-    return result;
-  }
-
-  public static String getMessageReference(Input input)
-  {
-    return getMessageReferenceHelper(input);
-  }
-
-  public static String getMessageReference(Output output)
-  {
-    return getMessageReferenceHelper(output);
-  }
-
-  public static String getMessageReference(Fault fault)
-  {
-    return getMessageReferenceHelper(fault);
-  }
-
-  public static QName getMessageReferenceQName(Input input)
-  {
-    return getMessageReferenceQNameHelper(input);
-  }
-
-  public static QName getMessageReferenceQName(Output output)
-  {
-    return getMessageReferenceQNameHelper(output);
-  }
-
-  public static QName getMessageReferenceQName(Fault fault)
-  {
-    return getMessageReferenceQNameHelper(fault);
-  }
-
-  protected static String getMessageReferenceHelper(WSDLElement o)
-  {
-    String result = null;
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(o);
-    if (element != null)
-    {
-      result = element.getAttribute("message");
-    }
-    return result;
-  }
-
-  public static QName getMessageReferenceQNameHelper(WSDLElement o)
-  {
-    QName result = null;
-    Definition definition = o.getEnclosingDefinition();
-    String prefixedName = getMessageReferenceHelper(o);
-    if (prefixedName != null)
-    {
-      result = WSDLEditorUtil.createQName(definition, prefixedName);
-    }
-    return result;
-  }
-
-  public static void updatePortTypeReferences(Definition definition)
-  {
-    for (Iterator i = definition.getBindings().values().iterator(); i.hasNext();)
-    {
-      Binding binding = (Binding) i.next();
-      QName qname = ComponentReferenceUtil.getPortTypeReferenceQName(binding);
-
-      PortType portType = (qname != null) ? (PortType) definition.getPortType(qname) : null;
-
-      if (binding.getPortType() != portType)
-      {
-        binding.setPortType(portType);
-      }
-    }
-  }
-
-  public static void updateBindingReferences(Definition definition)
-  {
-    for (Iterator i = definition.getServices().values().iterator(); i.hasNext();)
-    {
-      Service service = (Service) i.next();
-      for (Iterator j = service.getEPorts().iterator(); j.hasNext();)
-      {
-        Port port = (Port) j.next();
-        QName qname = ComponentReferenceUtil.getBindingReferenceQName(port);
-
-        Binding binding = (qname != null) ? (Binding) definition.getBinding(qname) : null;
-
-        if (port.getBinding() != binding)
-        {
-          port.setBinding(binding);
-        }
-      }
-    }
-  }
-
-  public static void updateMessageReferences(Definition definition)
-  {
-    // for each port type
-    //
-    for (Iterator i = definition.getPortTypes().values().iterator(); i.hasNext();)
-    {
-      PortType portType = (PortType) i.next();
-
-      // for each operation
-      //
-      for (Iterator j = portType.getEOperations().iterator(); j.hasNext();)
-      {
-        Operation operation = (Operation) j.next();
-
-        // handle Input
-        //
-        Input input = (Input) operation.getInput();
-        if (input != null)
-        {
-          QName qname = ComponentReferenceUtil.getMessageReferenceQName(input);
-          Message message = (qname != null) ? (Message) definition.getMessage(qname) : null;
-          if (input.getMessage() != message)
-          {
-            input.setMessage(message);
-          }
-        }
-
-        // handle Output
-        //
-        Output output = (Output) operation.getOutput();
-        if (output != null)
-        {
-          QName qname = ComponentReferenceUtil.getMessageReferenceQName(output);
-          Message message = (qname != null) ? (Message) definition.getMessage(qname) : null;
-          if (output.getMessage() != message)
-          {
-            output.setMessage(message);
-          }
-        }
-
-        // handle Faults
-        //
-        for (Iterator k = operation.getEFaults().iterator(); k.hasNext();)
-        {
-          Fault fault = (Fault) k.next();
-
-          QName qname = ComponentReferenceUtil.getMessageReferenceQName(fault);
-          Message message = (qname != null) ? (Message) definition.getMessage(qname) : null;
-          if (fault.getMessage() != message)
-          {
-            fault.setMessage(message);
-          }
-        }
-      }
-    }
-  }
-
-  public static void updateSchemaReferences(Definition definition)
-  {
-    for (Iterator i = definition.getEMessages().iterator(); i.hasNext();)
-    {
-      Message message = (Message) i.next();
-      for (Iterator j = message.getEParts().iterator(); j.hasNext();)
-      {
-        Part part = (Part) j.next();
-        Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
-        if (element != null)
-        {
-          ((WSDLElementImpl)part).elementChanged(element);
-        }
-      }
-    }
-  }
-
-  public static Operation getOperation(PortType portType, BindingOperation bindingOperation)
-  {
-    Operation result = null;
-    for (Iterator i = portType.getEOperations().iterator(); i.hasNext();)
-    {
-      Operation operation = (Operation) i.next();
-      if (isMatchingBinding(operation, bindingOperation))
-      {
-        result = operation;
-        break;
-      }
-    }
-    return result;
-  }
-
-  public static void updateOperationReference(BindingOperation bindingOperation)
-  {
-    Operation operation = computeOperation(bindingOperation);
-    if (operation != bindingOperation.getOperation())
-    {
-      bindingOperation.setOperation(operation);
-    }
-  }
-
-  public List getComponentNameList(boolean isType)
-  {
-    List result = Collections.EMPTY_LIST;
-    ITypeSystemProvider typeSystemProvider = WSDLEditorUtil.getInstance().getTypeSystemProvider(rootDefinition);
-    if (typeSystemProvider != null)
-    {
-      result = isType ? typeSystemProvider.getAvailableTypeNames(rootDefinition, 0) : typeSystemProvider.getAvailableElementNames(rootDefinition);
-    }
-    return result;
-  }
-
-  public static List getComponentNameList(Part part, boolean isType)
-  {
-    List result = Collections.EMPTY_LIST;
-    Definition definition = part.getEnclosingDefinition();
-    ITypeSystemProvider typeSystemProvider = WSDLEditorUtil.getInstance().getTypeSystemProvider(definition);
-    if (typeSystemProvider != null)
-    {
-      result = isType ? typeSystemProvider.getAvailableTypeNames(definition, 0) : typeSystemProvider.getAvailableElementNames(definition);
-    }
-    return result;
-  }
-
-  public static boolean isType(Part part)
-  {
-    //Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
-    Element element = part.getElement();
-    return !element.hasAttribute("element");
-  }
-
-  public static String getPartComponentReference(Part part)
-  {
-    //Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
-    Element element = part.getElement();
-    String result = null;
-    if (element.hasAttribute("type"))
-    {
-      result = element.getAttribute("type");
-    }
-    else if (element.hasAttribute("element"))
-    {
-      result = element.getAttribute("element");
-    }
-    return result;
-  }
-
-  public static void setComponentReference(Part part, boolean isType, String componentName)
-  {
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
-    String newAttribute = isType ? "type" : "element";
-    String oldAttribute = isType ? "element" : "type";
-    element.removeAttribute(oldAttribute);
-
-    String value = componentName != null ? componentName : element.getAttribute(newAttribute);
-
-    if (value == null)
-    {
-      if (isType)
-      {
-        String xsdPrefix = part.getEnclosingDefinition().getPrefix(WSDLConstants.XSD_NAMESPACE_URI);
-        value = "string";
-        if (xsdPrefix != null && xsdPrefix.length() > 0)
-        {
-          value = xsdPrefix + ":" + value;
-        }
-      }
-      else
-      {
-        List list = getComponentNameList(part, isType);
-        value = list.size() > 0 ? (String) list.get(0) : "some-element-name";
-      }
-    }
-    element.setAttribute(newAttribute, value);
-  }
-
-  public static Operation computeOperation(BindingOperation bindingOperation)
-  {
-    Operation result = null;
-    Binding binding = (Binding) bindingOperation.eContainer();
-    PortType portType = (PortType) binding.getPortType();
-    if (portType != null)
-    {
-      result = getOperation(portType, bindingOperation);
-    }
-    return result;
-  }
-
-  public static Input computeInput(BindingInput bindingInput)
-  {
-    Operation operation = computeOperation((BindingOperation) bindingInput.eContainer());
-    return operation != null ? operation.getEInput() : null;
-  }
-
-  public static Output computeOutput(BindingOutput bindingOutput)
-  {
-    Operation operation = computeOperation((BindingOperation) bindingOutput.eContainer());
-    return operation != null ? operation.getEOutput() : null;
-  }
-
-  public static Fault computeFault(BindingFault bindingFault)
-  {
-    Fault result = null;
-    Operation operation = computeOperation((BindingOperation) bindingFault.eContainer());
-    if (operation != null)
-    {
-      for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
-      {
-        Fault fault = (Fault) i.next();
-        String faultName = fault.getName();
-        if (faultName != null && faultName.equals(bindingFault.getName()))
-        {
-          result = fault;
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-  public static String getPartReferenceValue(Part part)
-  {
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(part);
-    String value = null;
-    if (element != null)
-    {
-      if (element.hasAttribute("type"))
-      {      		
-        value = element.getAttribute("type");
-      }
-      else if (element.hasAttribute("element"))
-      {  
-        value = element.getAttribute("element");
-      }         
-    }  
-    return value != null ? value : "";
-  }
-
-  public Operation getBindingOperation(Element bindingOperationContent)
-  {
-    Operation operation = null;
-    Node parent = bindingOperationContent.getParentNode();
-    if (parent instanceof Element)
-    {
-      Object object = WSDLEditorUtil.getInstance().findModelObjectForElement(rootDefinition, (Element) parent);
-      if (object instanceof BindingOperation)
-      {
-        operation = ComponentReferenceUtil.computeOperation((BindingOperation) object);
-      }
-    }
-    return operation;
-  }
-
-  public Message getBindingOperationInputMessage(Element bindingOperationContent)
-  {
-    Message message = null;
-    Operation operation = getBindingOperation(bindingOperationContent);
-    if (operation != null)
-    {
-      Input input = operation.getEInput();
-      if (input != null)
-      {
-        message = input.getEMessage();
-      }
-    }
-    return message;
-  }
-
-  public Message getBindingOperationOutputMessage(Element bindingOperationContent)
-  {
-    Message message = null;
-    Operation operation = getBindingOperation(bindingOperationContent);
-    if (operation != null)
-    {
-      Output output = operation.getEOutput();
-      if (output != null)
-      {
-        message = output.getEMessage();
-      }
-    }
-    return message;
-  }
-
-  public static String computeRelativeURI(IFile referencedLocation, IFile baseLocation, boolean enableIEStyleReferences)
-  {
-    // TODO... we need some extension to allow IE folks to plugin logic to create an 'IE' style path
-    // TODO... consider using URI class in EMF 
-    return URIHelper.getRelativeURI(referencedLocation.getLocation(), baseLocation.getLocation());
-  }
-  
-  public static String computeRelativeURI(String referencedLocation, String baseLocation, boolean enableIEStyleReferences)
-  {
-    // TODO... we need some extension to allow IE folks to plugin logic to create an 'IE' style path
-    // TODO... consider using URI class in EMF 
-    return URIHelper.getRelativeURI(referencedLocation, baseLocation);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java
deleted file mode 100644
index 5e4eb02..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java
+++ /dev/null

@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.MessageReferenceImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddBindingCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddFaultCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddInputCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOperationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOutputCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddPartCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddPortCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddPortTypeCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddServiceCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDElementDeclarationCommand;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-
-public class CreateWSDLElementHelper {
-	// Constants used for getting Part information
-	public static final String PART_INFO_ELEMENT_DECLARATION = "ELEMENT_DECLARATION";
-	public static final String PART_INFO_TYPE_DEFINITION     = "TYPE_DEFINITION";
-
-	// The following variables should be set if a name other than the computed name is to be used.
-	public static String serviceName = null;
-	public static String portName = null;
-	public static String bindingName = null;
-	public static String portTypeName = null;
-	public static String operationName = null;
-	public static String inputName = null;
-	public static String outputName = null;
-	public static String faultName = null;
-	public static String messageName = null;
-	public static String partName = null;
-	
-	public static String PART_TYPE_OR_DEFINITION = PART_INFO_TYPE_DEFINITION;
-	public static boolean CREATE_DOWN_TO_PART = true;
-		
-/*
- * The following methods creates the 'specified' (by calling a certain method) WSDLElement
- * and it's 'children' all the way to the PortType level.
- */
-	public static Service createService(Definition definition) {
-		if (serviceName == null || serviceName.trim().equals(""))
-			serviceName = NameUtil.buildUniqueServiceName(definition);		
-		
-		CreateWSDLElementHelper.portTypeName = serviceName;
-		
-	    AddServiceCommand addService = new AddServiceCommand(definition, serviceName, false);
-	    addService.run();
-	    Service service = (Service) addService.getWSDLElement();
-	    CreateWSDLElementHelper.createPort(service);
-  		
-	    return service;
-	}
-	
-	public static Port createPort(Service service) {
-		if (portName == null || portName.trim().equals(""))
-			portName = NameUtil.buildUniquePortName(service, null);
-		
-	    AddPortCommand addPort = new AddPortCommand(service, portName);
-	    addPort.run();
-	    Port port = (Port) addPort.getWSDLElement();
-		Binding binding = CreateWSDLElementHelper.createBinding(port.getEnclosingDefinition(), port);
-
-		port.setBinding(binding);
-		
-	    return port;
-	}
-	
-	public static Binding createBinding(Definition definition, Port port) {
-		bindingName = port.getName();
-		if (bindingName == null || bindingName.trim().equals(""))
-			bindingName = NameUtil.buildUniqueBindingName(definition, null);
-		
-		AddBindingCommand addBinding = new AddBindingCommand(definition, bindingName);
-		addBinding.run();
-		Binding binding = (Binding) addBinding.getWSDLElement();
-		PortType portType = CreateWSDLElementHelper.createPortType(binding.getEnclosingDefinition());
-
-		binding.setPortType(portType);
-		
-		return binding;
-	}
-	
-	public static PortType createPortType(Definition definition) {
-		if (portTypeName == null || portTypeName.trim().equals(""))
-			portTypeName = NameUtil.buildUniquePortTypeName(definition, "PortType");
-		
-		AddPortTypeCommand addPortTypeCommand = new AddPortTypeCommand(definition, portTypeName);
-		addPortTypeCommand.run();
-		PortType portType = (PortType) addPortTypeCommand.getWSDLElement();
-
-		if (CREATE_DOWN_TO_PART) {
-			CreateWSDLElementHelper.createOperation(portType);
-		}
-		
-		return portType;
-	}
-
-	
-/*
- * The following methods creates the 'specified' (by calling a certain method) WSDLElement
- * and it's 'children' all the way to the Part level.
- */	
-  	public static Operation createOperation(PortType portType) {
-  		if (operationName == null || operationName.trim().equals(""))
-  			operationName = NameUtil.buildUniqueOperationName(portType);
-  		
-		AddOperationCommand action = new AddOperationCommand(portType, operationName);
-		action.run();
-		Operation operation = (Operation) action.getWSDLElement();
-  		CreateWSDLElementHelper.createOutput(portType, operation);
-		CreateWSDLElementHelper.createInput(portType, operation, null);
-
-//  		((PortTypeImpl) portType).updateElement(false);
-   		return operation;
-  	}
-
-  	public static Input createInput(PortType portType, Operation operation, String inputName) {
-  		if (inputName == null || inputName.trim().equals(""))
-  	  		inputName = NameUtil.buildUniqueInputName(portType, operation.getName(), "");
-  		
-  		AddInputCommand action = new AddInputCommand(operation, inputName);
-  		action.run();
-  		Input input = (Input) action.getWSDLElement(); 
-  		Message mess = CreateWSDLElementHelper.createMessage(input);
-  		input.setMessage(mess);
-  			  		
-  		return input;
-  	}
-  			  	
-  	public static Output createOutput(PortType portType, Operation operation) {
-  		if (outputName == null || outputName.trim().equals(""))
-  	  		outputName = NameUtil.buildUniqueOutputName(portType, operation.getName(), "");
-  		
-  		AddOutputCommand action = new AddOutputCommand(operation, outputName);
-  		action.run();
-  		Output output = (Output) action.getWSDLElement();
-  		Message mess = CreateWSDLElementHelper.createMessage(output);
-  		output.setMessage(mess);	
-  			  		
-  		return output;
-  	}
-  			  	
-  	public static Fault createFault(Operation operation) {
-  		if (faultName == null || faultName.trim().equals("")) 
-	  		faultName = NameUtil.buildUniqueFaultName(operation);
-  		
-  		AddFaultCommand action = new AddFaultCommand(operation, faultName);
-  		action.run();
-  		Fault fault = (Fault) action.getWSDLElement();
-  		Message mess = CreateWSDLElementHelper.createMessage(fault);
-  		fault.setMessage(mess);
-  		 		
-  		return fault;
-  	}
-  			  	
-  	public static Message createMessage(MessageReference iof) {
-  		if (messageName == null || messageName.trim().equals(""))
-  	  		messageName = NameUtil.buildUniqueMessageName(iof.getEnclosingDefinition(), iof);
-//	  		messageName = NameUtil.buildMessageName(iof.getName());
-  		
-  		Definition def = iof.getEnclosingDefinition();
-  		AddMessageCommand action = new AddMessageCommand(def, messageName);
-  		action.run();
-  		Message message = (Message) action.getWSDLElement();
-  		CreateWSDLElementHelper.createPart(message);
-  		Element parentNode = message.getElement();
-      if (parentNode instanceof IDOMNode) 
-      {
-		    // format selected node                                                    
-        FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-        formatProcessorXML.formatNode((IDOMNode)parentNode);
-      }
-  		
-  		messageName = null;
-  		return message;
-  	}
-  			  	
-  	public static Part createPart(Message message) {
-  		Definition def = message.getEnclosingDefinition();
-  		String name = NameUtil.buildUniquePartName(message, message.getQName().getLocalPart());
-  		AddPartCommand action = null;
-  		
-  		if (PART_TYPE_OR_DEFINITION == PART_INFO_TYPE_DEFINITION) {
-  			action = new AddPartCommand(message, name, WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001, "string", true);
-  		}
-  		else if (PART_TYPE_OR_DEFINITION == PART_INFO_ELEMENT_DECLARATION) {  			
-  			//action = new AddPartCommand(message, name, WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001, "string", true);
-  			String elementName = getNewNameHelper(name, def, false);
-  			AddXSDElementDeclarationCommand elementAction = new AddXSDElementDeclarationCommand(def, elementName);
-  			elementAction.run();
-  			action = new AddPartCommand(message, name, def.getTargetNamespace(), elementName, false);
-  		}
-
-  		action.run();
-  		
-  		return (Part) action.getWSDLElement();
-  	}	
-
-  	/*
-  	 * Used to determine a name for an Element
-  	 */
-    private static String getNewNameHelper(String base, Definition def, boolean isType)
-    { 
-      String name = base;    
-      int count = 0;
-
-      // Ugly....  Redo this...
-      // Get a list of Elements...
-      List elementList = null;
-      if (def.getETypes() != null) {
-      	List xsdsList = def.getETypes().getEExtensibilityElements();
-      	if (xsdsList != null) {
-      		Iterator xsdsIterator = xsdsList.iterator();
-      		XSDSchemaExtensibilityElement xsdElement = (XSDSchemaExtensibilityElement) xsdsIterator.next();
-      		XSDSchema schema = xsdElement.getSchema();
-      		if (schema != null) {
-      			elementList = schema.getElementDeclarations();
-      		}
-      	}
-      }
-      
-      if (elementList != null) {
-      	int index = 0;
-      	while (index < elementList.size()) {
-      		XSDElementDeclaration elementDeclaration = (XSDElementDeclaration) elementList.get(index);
-      		
-      		if (name.equals(elementDeclaration.getName())) {
-      			count++;
-      			name = name + count;
-      			index = 0;
-      		}
-      		else {
-      			index++;
-      		}
-      	}
-      }
-
-      return name;
-    }
-
-  	/*
-  	 * Return the type of Part this WSDLElement should have (Element vs Type).  To determine this, we filter up to the 'parent' PortType
-  	 * and go down to the first Part we encounter and check the type it has.  If this fails, default to Type.
-  	 */
-  	  public static String getPartInfo(WSDLElement element) {
-  	  	String partInfo = null;
-  	  	
-  	  	if (element instanceof PortType) {
-  	  		partInfo = getPartInfo((PortType) element);
-  	  	}
-  	  	else if (element instanceof Operation) {
-  	  		partInfo = getPartInfo(((WSDLElementImpl) element).getContainer());
-  	  	}
-  	  	else if (element instanceof MessageReferenceImpl) {
-  	  		partInfo = getPartInfo(((WSDLElementImpl) element).getContainer());
-  	  	}
-
-  	  	if (partInfo == null) {
-  	  		partInfo = CreateWSDLElementHelper.PART_INFO_TYPE_DEFINITION;
-  	  	}
-  	  	
-  	  	return partInfo;  	
-  	  }
-  	  
-  	  private static String getPartInfo(PortType portType) {
-  	  	String partInfo = null;
-  	  	
-  	  	if (portType.getOperations() != null) {
-  	  		Iterator operationIt = portType.getOperations().iterator();
-  	  		while (operationIt.hasNext()) {
-  	  			Operation op = (Operation) operationIt.next();
-
-  	  			if (op.getEInput() != null) {
-  	  				partInfo = getMessageRefPartInfo((MessageReferenceImpl) op.getEInput());
-  	  			}
-  	  	
-  	  			if (partInfo == null && op.getEOutput() != null) {
-  	  				partInfo = getMessageRefPartInfo((MessageReferenceImpl) op.getEOutput());
-  	  			}
-  	  	
-  	  			if (op.getEFaults() != null) {
-  	  				Iterator faultIt = op.getEFaults().iterator();
-  	  				while (partInfo == null && faultIt.hasNext()) {
-  	  					Fault fault = (Fault) faultIt.next();
-  	  					partInfo = getMessageRefPartInfo((MessageReferenceImpl) fault);
-  	  				}
-  	  			}
-  	  	  	  	
-  	  			if (partInfo != null)
-  	  				break;
-  	  		}
-  	  	}
-
-  	  	return partInfo;
-  	  }
-  	  
-  	  private static String getMessageRefPartInfo(MessageReferenceImpl iof) {
-  	  	String partInfo = null;
-  	  	
-  	  	if (iof.getEMessage() != null && iof.getEMessage().getEParts() != null) {
-  	  		Iterator partIt = iof.getEMessage().getEParts().iterator();
-  	  	
-  	  		while (partInfo == null && partIt.hasNext()) {
-  	  			Part part = (Part) partIt.next();
-  	  		
-  	  			if (part.getTypeDefinition() != null) {
-  	  				partInfo = CreateWSDLElementHelper.PART_INFO_TYPE_DEFINITION;
-  	  			}
-  	  			else if (part.getElementDeclaration() != null) {
-  	  				partInfo = CreateWSDLElementHelper.PART_INFO_ELEMENT_DECLARATION;
-  	  			}
-  	  		}
-  	  	}
-  	  	
-  	  	return partInfo;
-  	  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java
deleted file mode 100644
index 1778c8c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java
+++ /dev/null

@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-
-public class NameUtil
-{
-  /**
-   * Return a name which is not used by any other fault in the operation.
-   * @return String
-   */
-  public static String buildUniqueFaultName(Operation operation)
-  {
-  	return buildUniqueFaultName(operation, "NewFault");
-  }
-  
-  public static String buildUniqueFaultName(Operation operation, String baseName) {
-  	if (baseName == null)
-  		baseName = "NewFault";
-  	
-  	List names = getUsedFaultNames(operation);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  /**
-   * Return a name which is not used by any other input in the portType.  Returned name will be of the form:
-   * <operationName> + <ending> [+ unique Integer]
-   * @return String
-   */
-  public static String buildUniqueInputName(PortType portType, String operationName, String ending)
-  {
-    String name = null;
-    String candidate = operationName + ending;
-
-    int i = 0;
-
-    // loop until we find a unique name (the name will consist of the operationName + ending + an integer)
-    while (name == null)
-    {
-      boolean unique = true;
-
-      // determine if this combination is unique within the current porttype
-      for (Iterator it = portType.getEOperations().iterator(); it.hasNext() && unique;)
-      {
-        Operation current = (Operation) it.next();
-        // TODO : port check
-        // old  if(current.isSetEInput() && current.getEInput().isSetName()) {
-        if (current.getEInput() != null && current.getEInput().getName() != null)
-        {
-          if (current.getEInput().getName().equals(candidate))
-            unique = false;
-        }
-      }
-      if (unique)
-        name = candidate;
-      else
-        candidate = operationName + ending + i;
-      i++;
-    }
-    return name;
-  }
-
-  /**
-   * Return a name which is not used by any other message in the definition.
-   * @return String
-   */
-  public static String buildUniqueMessageName(Definition definition, String baseName)
-  {
-    if (baseName == null)
-    {
-      baseName = "NewMessage";
-    }
-
-    List names = getUsedMessageNames(definition);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  /**
-   * Return a name which is not used by any other operation in the port type.
-   * @return String
-   */
-  public static String buildUniqueOperationName(PortType portType)
-  {
-  	return buildUniqueOperationName(portType, "NewOperation");
-  }
-  
-  public static String buildUniqueOperationName(PortType portType, String baseName)
-  {
-  	if (baseName == null) {
-  		baseName = "NewOperation";
-  	}
-
-  	List names = getUsedOperationNames(portType);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  /**
-   * Return a name which is not used by any other output in the portType.  Returned name will be of the form:
-   * <operationName> + <ending> [+ unique Integer]
-   * @return String
-   */
-  public static String buildUniqueOutputName(PortType portType, String operationName, String ending)
-  {
-    String name = null;
-    String candidate = operationName + ending;
-
-    int i = 0;
-
-    // loop until we find a unique name (the name will consist of the operationName + ending + an integer)
-    while (name == null)
-    {
-      boolean unique = true;
-
-      // determine if this combination is unique within the current porttype			
-      for (Iterator it = portType.getEOperations().iterator(); it.hasNext() && unique;)
-      {
-        Operation current = (Operation) it.next();
-        // TODO: port check
-        // old				if(current.isSetEOutput() && current.getEOutput().isSetName()) {
-        if (current.getEOutput() != null && current.getEOutput().getName() != null)
-        {
-          if (current.getEOutput().getName().equals(candidate))
-            unique = false;
-        }
-      }
-      if (unique)
-        name = candidate;
-      else
-        candidate = operationName + ending + i;
-      i++;
-    }
-    return name;
-  }
-
-  /**
-   * Return a name which is not used by any other part in the message.
-   * @return String
-   */
-  public static String buildUniquePartName(Message message)
-  {
-  	List names = getUsedPartNames(message);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper("NewPart", names);
-  }
-  
-  public static String buildUniquePartName(Message message, String baseName)
-  {
-  	if (baseName == null)
-  	{
-  		baseName = "NewPart";
-  	}
-  	
-  	List names = getUsedPartNames(message);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  /**
-   * Return a name which is not used by any other port type in the definition.
-   * @return String
-   */
-  public static String buildUniquePortTypeName(Definition definition, String baseName)
-  {
-    if (baseName == null)
-    {
-      baseName = "NewPortType";
-    }
-
-    List names = getUsedPortTypeNames(definition);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  public static String getUniqueNameHelper(String baseName, List names)
-  {
-    int i = 0;
-
-    String name = baseName;
-    while (true)
-    {
-      if (!names.contains(name))
-      {
-        break;
-      }
-      i++;
-      name = baseName + i;
-    }
-
-    return name;
-  }
-
-  /**
-   * Return a name which is not used by any other service in the definition.
-   * @return String
-   */
-  public static String buildUniqueServiceName(Definition definition)
-  {
-  	List names = getUsedServiceNames(definition);
-
-    // Now search the list until we find an unused name
-    return getUniqueNameHelper("NewService", names);
-  }
-
-  /**
-   * Return a name which is not used by any other binding in the definition.
-   * @return String
-   */
-  public static String buildUniqueBindingName(Definition definition, String baseName)
-  {
-    if (baseName == null)
-    {
-      baseName = "NewBinding";
-    }
-
-    List names = getUsedBindingNames(definition);
-
-    return getUniqueNameHelper(baseName, names);
-  }
-
-  public static String buildUniquePrefix(Definition definition, String basePrefix)
-  {
-    String prefix = basePrefix;
-    for (int i = 1; definition.getNamespace(prefix) != null; i++)
-    {
-      prefix = basePrefix + i;
-    }
-    return prefix;
-  }
-
-  public static String buildUniquePortName(Service service, String baseName)
-  {
-    if (baseName == null)
-    {
-      baseName = "NewPort";
-    }
-  
-    List names = getUsedPortNames(service);
-    
-	return getUniqueNameHelper(baseName, names);
-  }
-	
-  public static String buildUniqueMessageName(Definition definition, MessageReference messRef)
-  {   
-    String name = null;
-    if (messRef instanceof Input)
-    {
-      name = createOperationName(messRef, "Request");    
-    }
-    else if (messRef instanceof Output)
-    {
-      name = createOperationName(messRef, "Response"); 
-    }
-    else if (messRef instanceof Fault)
-    {                                
-      String faultName = ((Fault) messRef).getName();
-      if (faultName == null || faultName.length() == 0)
-      {                     
-        faultName = "Fault";
-      }
-      name = createOperationName(messRef, faultName); 
-    }                                                                     
-
-    return NameUtil.buildUniqueMessageName(definition, name);
-  }
-  
-  
-  public static List getUsedFaultNames(Operation operation) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
-    {
-      Fault fault = (Fault) i.next();
-      names.add(fault.getName());
-    }
-    
-    return names;
-  }
-
-  public static List getUsedOperationNames(PortType portType) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = portType.getEOperations().iterator(); i.hasNext();)
-    {
-      Operation op = (Operation) i.next();
-      names.add(op.getName());
-    }
-    
-    return names;
-  }
-  
-  public static List getUsedPartNames(Message message) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = message.getEParts().iterator(); i.hasNext();)
-    {
-      Part part = (Part) i.next();
-      names.add(part.getName());
-    }    
-    return names;
-  }
-  
-  public static List getUsedPortTypeNames(Definition definition) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = definition.getEPortTypes().iterator(); i.hasNext();)
-    {
-      PortType portType = (PortType) i.next();
-      // TODO: port check
-      //			if (portType.isSetQName())
-      if (portType.getQName() != null)
-      {
-        names.add(portType.getQName().getLocalPart());
-      }
-    }
-    
-    return names;
-    
-  }
-  public static List getUsedServiceNames(Definition definition) {
-    // First build a list of names already used
-    ArrayList names = new ArrayList();
-    for (Iterator i = definition.getEServices().iterator(); i.hasNext();)
-    {
-      Service service = (Service) i.next();
-      // TODO: port check
-      // 		if(service.isSetQName())
-      if (service.getQName() != null)
-        names.add(service.getQName().getLocalPart());
-    }
-    
-    return names;
-  }
-  
-  public static List getUsedMessageNames(Definition definition) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = definition.getEMessages().iterator(); i.hasNext();)
-    {
-      Message msg = (Message) i.next();
-      // TODO: port check
-      if (msg.getQName() != null)
-        //			if(msg.isSetQName())
-        names.add(msg.getQName().getLocalPart());
-    }
-    
-    return names;
-  }
-
-  public static List getUsedBindingNames(Definition definition) {
-    ArrayList names = new ArrayList();
-    for (Iterator i = definition.getEBindings().iterator(); i.hasNext();)
-    {
-      Binding binding = (Binding) i.next();
-      // TODO: port check
-      //			if (binding.isSetQName())
-      if (binding.getQName() != null)
-      {
-        names.add(binding.getQName().getLocalPart());
-      }
-    }
-    
-    return names;
-  }
-
-  public static List getUsedPortNames(Service service) {
-    // First build a list of names already used
-    ArrayList names = new ArrayList();
-    for (Iterator i = service.getEPorts().iterator(); i.hasNext();)
-    {
-      Port port = (Port) i.next();
-
-      if (port.getName() != null)
-      {
-        names.add(port.getName());
-      }
-    }
-    
-    return names;
-  }
-  
-  private static String createOperationName(Object object, String suffix)
-  {               
-    String result = null;
-    if (object instanceof EObject)
-    {
-      EObject parent = ((EObject)object).eContainer();
-      if (parent instanceof Operation)
-      {
-        result = ((Operation)parent).getName();
-      }
-    } 
-    if (result != null)
-    {
-      result += suffix;
-    }
-    return result;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java
deleted file mode 100644
index 144c9ad..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeAssociationProvider;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class NodeAssociationManager
-{                   
-  protected WSDLEditorExtension[] extensions;
-  protected INodeAssociationProvider[] providers;
-
-  public NodeAssociationManager()
-  {             
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry();
-    extensions = registry.getRegisteredExtensions(WSDLEditorExtension.NODE_ASSOCIATION_PROVIDER); 
-    providers = new INodeAssociationProvider[extensions.length]; 
-    for (int i = 0; i < extensions.length; i++)
-    {
-      providers[i] = (INodeAssociationProvider)extensions[i].createExtensionObject(WSDLEditorExtension.NODE_ASSOCIATION_PROVIDER, null);
-    }
-  }        
-
-  protected INodeAssociationProvider getAppicableProvider(Object object)
-  {
-    INodeAssociationProvider provider = null;
-    for (int i = 0; i < extensions.length; i++)
-    {
-      if (extensions[i].isApplicable(object))
-      {
-        provider = providers[i];
-        if (provider != null)
-        {
-          break;
-        }
-      }
-    }
-    return provider;
-  }
-        
-
-  public Object getModelObjectForNode(Object rootObject, Element targetNode)
-  {                                                                       
-    int currentIndex = 0;
-
-    Element[] elementChain = getParentElementChain((Element)targetNode);
-
-    INodeAssociationProvider p = getAppicableProvider(rootObject);
-    if (p != null)
-    {
-      Node rootObjectNode = p.getNode(rootObject);
-
-      while (currentIndex < elementChain.length)
-      {
-        Element e = elementChain[currentIndex];
-        if (e == rootObjectNode)
-        {                
-          currentIndex++;
-          break;
-        }
-        currentIndex++;
-      }
-    }
-             
-    Object currentObject = rootObject;                        
-    int end[] = new int[1];
-
-    while (currentIndex < elementChain.length)
-    {               
-      p = getAppicableProvider(currentObject);                                                                                             
-      if (p != null)
-      {
-        end[0] = elementChain.length;
-        currentObject = p.getModelObject(currentObject, elementChain, currentIndex, end);
-        
-        if (currentObject == null)
-        {                      
-          // failure
-          break;
-        }                              
-        else
-        {
-          currentIndex = Math.max(end[0], currentIndex + 1);
-        }
-      }
-      else
-      {          
-        break;
-      } 
-    }     
-
-    return (currentIndex == elementChain.length) ? currentObject : null;
-  }  
-           
-
-  public Node getNode(Object modelObject)
-  {          
-    Node result = null;                                                                 
-    if (modelObject instanceof Node)
-    {
-      result = (Node)modelObject;
-    }
-    else
-    {
-      INodeAssociationProvider p = getAppicableProvider(modelObject);               
-      if (p != null)
-      {
-        result = p.getNode(modelObject);
-      }
-    }       
-    return result;
-  }     
-
-  protected Element[] getParentElementChain(Element element)
-  {
-    List list = new ArrayList();
-    while (element != null)
-    {
-      list.add(0, element);
-      Node node = element.getParentNode();
-      element = (node != null && node.getNodeType() == Node.ELEMENT_NODE) ? (Element)node : null;    
-    }                
-
-    int listSize = list.size();
-    Element[] result = new Element[listSize];
-    for (int i = 0; i < listSize; i++)
-    {
-      result[i] = (Element)list.get(i);
-    }             
-    return result;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java
deleted file mode 100644
index 8a0256c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java
+++ /dev/null

@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.ImportImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class OpenOnSelectionHelper extends WSDLSwitch
-{
-  Definition definition;
-  Attr attr = null;
-  Element element = null;
-
-  public OpenOnSelectionHelper(Definition definition)
-  {
-    this.definition = definition;
-  }
-
-  public void openEditor(EObject eObject)
-  {
-    String[] array = computeSpecification(eObject);
-    if (array != null)
-    {
-      openEditor(array[0], array[1]);
-    }
-  }
-
-  public void openEditor(Node node)
-  {
-    String[] array = computeSpecification(node);
-    if (array != null)
-    {
-      openEditor(array[0], array[1]);
-    }
-  }
-
-  protected void openEditor(String resource, String spec)
-  {
-    String pattern = "platform:/resource";
-    if (resource != null && resource.startsWith(pattern))
-    {
-      try
-      {
-        Path path = new Path(resource.substring(pattern.length()));
-        IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-
-        IWorkbenchPage workbenchPage = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage();
-        IEditorPart editorPart = workbenchPage.getActiveEditor();
-        
-        if (editorPart.getEditorInput() instanceof IFileEditorInput &&
-           ((IFileEditorInput)editorPart.getEditorInput()).getFile().equals(file))
-        {  
-        	workbenchPage.getNavigationHistory().markLocation(editorPart);
-        }
-        else
-        {
-          try
-          {
-            if (resource.endsWith("xsd"))
-            {
-              editorPart = workbenchPage.openEditor(new FileEditorInput(file), WSDLEditorPlugin.XSD_EDITOR_ID); 
-            }
-            else
-            {
-              // Since we are already in the wsdleditor
-			        editorPart =  workbenchPage.openEditor(new FileEditorInput(file), editorPart.getEditorSite().getId());
-            }
-          }
-					catch (PartInitException initEx)
- 					{
- 					}
-        }
-
-        Class theClass = editorPart.getClass();
-        Class[] methodArgs = { String.class };
-        Method method = theClass.getMethod("openOnSelection", methodArgs);
-        Object args[] = { spec };
-        method.invoke(editorPart, args);
-        workbenchPage.getNavigationHistory().markLocation(editorPart);
-      }
-      catch (Exception e)
-      {
-      }
-    }
-  }
-
-  public String[] computeSpecification(EObject eObject)
-  {
-    String[] result = null;
-    Object referencedObject = doSwitch(eObject);
-    if (referencedObject instanceof EObject)
-    {
-      EObject referencedEObject = (EObject)referencedObject;
-      if (referencedEObject != eObject || 
-         referencedEObject.eResource() != definition.eResource())
-      {        
-      
-      Resource resource = referencedEObject.eResource();
-      if (resource != null)
-      {
-        result = new String[2];
-        result[0] = resource.getURI().toString();
-        result[1] = resource.getURIFragment(referencedEObject);
-      }
-      }
-    }
-    return result;
-  }
-
-  public String[] computeSpecification(Node node)
-  {
-    String[] result = null;
-    switch (node.getNodeType())
-    {
-      case Node.ELEMENT_NODE :
-        {
-          element = (Element)node;
-          break;
-        }
-      case Node.ATTRIBUTE_NODE :
-        {
-          attr = (Attr)node;
-          element = attr.getOwnerElement();
-          break;
-        }
-      case Node.TEXT_NODE :
-        {
-          Node parent = node.getParentNode();
-          element = (parent instanceof Element) ? (Element)parent : null;
-          break;
-        }
-    }
-    if (element != null)
-    {
-      Object object = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, element);
-      if (object instanceof EObject)
-      {
-        result = computeSpecification((EObject)object);
-      }
-    }
-    return result;
-  }
-
-  public Object caseBinding(Binding binding)
-  {
-    Object result = binding;
-    if (isMatchingAttribute(WSDLConstants.TYPE_ATTRIBUTE))
-    {
-      result = binding.getEPortType();
-    }
-    return result;
-  }
-
-  public Object caseDefinition(Definition definition)
-  {
-    return definition;
-  }
-
-  public Object casePart(Part part)
-  {
-    Object result = part;
-    if (attr != null)
-    {
-      if (isMatchingAttribute(WSDLConstants.TYPE_ATTRIBUTE))
-      {
-        result = part.getTypeDefinition();
-      }
-      else if (isMatchingAttribute(WSDLConstants.ELEMENT_ATTRIBUTE))
-      {
-        result = part.getElement();
-      }
-    }
-    else if (part.getEnclosingDefinition() == definition)
-    {
-      result = part.getTypeDefinition() != null ? (Object)part.getTypeDefinition() : (Object)part.getElement();
-    }
-    return result;
-  }
-
-  public Object casePort(Port port)
-  {
-    Object result = port;
-    if (isMatchingAttribute(WSDLConstants.BINDING_ATTRIBUTE))
-    {
-      result = port.getEBinding();
-
-    }
-    return result;
-  }
-
-  public Object caseFault(Fault fault)
-  {
-    Object result = fault;
-    if (isMatchingAttribute(WSDLConstants.MESSAGE_ATTRIBUTE))
-    {
-      result = fault.getMessage();
-    }
-    return result;
-  }
-
-  public Object caseInput(Input input)
-  {
-    Object result = input;
-    if (isMatchingAttribute(WSDLConstants.MESSAGE_ATTRIBUTE))
-    {
-      result = input.getMessage();
-    }
-    return result;
-  }
-
-  public Object caseOutput(Output output)
-  {
-    Object result = output;
-
-    if (isMatchingAttribute(WSDLConstants.MESSAGE_ATTRIBUTE))
-    {
-      result = output.getMessage();
-    }
-    return result;
-  }
-
-  public Object caseImport(Import theImport)
-  {
-    Object result = theImport.getEDefinition();
-    if (result == null)
-    {
-      result = theImport.getESchema();
-      if (result == null)
-      {
-        // Need to resolve imports because the model doesn't automatically
-        // do it for us
-        ((ImportImpl)theImport).importDefinitionOrSchema();
-        result = theImport.getESchema();
-      }
-    }
-    return result;
-  }
-
-  public Object caseWSDLElement(WSDLElement wsdlElement)
-  {
-    return wsdlElement;
-  }
-
-  private boolean isMatchingAttribute(String value)
-  {
-    return attr != null && value.equals(attr.getName());
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ReferenceManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ReferenceManager.java
deleted file mode 100644
index 8f41539..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ReferenceManager.java
+++ /dev/null

@@ -1,363 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-        
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-
-
-public class ReferenceManager
-{                            
-  protected static InternalAdapterFactory internalAdapterFactory = new InternalAdapterFactory();
-
-                                                 
-  public interface Listener
-  {
-    public void bindingsChanged( Operation operation);
-  }     
-
-            
-  public static void adaptDefinition(Definition definition)
-  {
-    internalAdapterFactory.adapt(definition);
-    for (Iterator i = definition.getEBindings().iterator(); i.hasNext(); )
-    {
-      Binding binding = (Binding)i.next();
-      internalAdapterFactory.adaptBinding(binding);
-    }
-  }
-
-                               
-  public static void addBindingListener(Operation operation, Listener listener)
-  {                 
-    OperationAdapter adapter = (OperationAdapter)internalAdapterFactory.adapt(operation);
-    if (adapter != null)
-    {
-      adapter.addListener(listener); 
-    }
-  }
-
-
-  public static void removeBindingListener(Operation operation, Listener listener)
-  { 
-    OperationAdapter adapter = (OperationAdapter)internalAdapterFactory.adapt(operation);
-    if (adapter != null)
-    {
-      adapter.removeListener(listener); 
-    }
-  }
-
-  protected static void fireNotificationForPortType(PortType portType)
-  {
-    // get the adapter for each operation and notify listeners
-    if (portType != null)
-    {
-      for (Iterator i = portType.getEOperations().iterator();  i.hasNext(); )
-      {
-        fireNotificationForOperation((Operation)i.next());
-      }
-    }
-  }
-
-
-  protected static void fireNotificationForOperation(Operation operation)
-  {
-    if (operation != null)
-    {
-      OperationAdapter adapter = (OperationAdapter)internalAdapterFactory.adapt(operation);
-      adapter.fireBindingsChanged();
-    }
-  }
-
-
-  public static class InternalAdapterFactory extends AdapterFactoryImpl
-  {                     
-    public Adapter createAdapter(Notifier target)
-    {                     
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {                
-      	public Object caseBinding(Binding binding)
-        {   
-          return createBindingAdapter();
-	      }
-
- 	      public Object caseBindingFault(BindingFault bindingFault)
-        {                                      
-          return createBindingFaultAdapter();
-        }   
-
-	      public Object caseBindingOperation(BindingOperation bindingOperation)
-        {   
-          return createBindingOperationAdapter();
-	      } 
-   
-      	public Object caseDefinition(Definition definition)
-        {   
-          return createDefinitionAdapter();
-	      }  
-
-      	public Object caseOperation(Operation operation)
-        {   
-          return createOperationAdapter();
-	      }                
-      };   
-
-      Object o = wsdlSwitch.doSwitch((EObject)target);
-
-      Adapter result = null;
-      if (o instanceof Adapter)
-      {
-        result  = (Adapter)o;
-      }
-      else
-      {          
-        System.out.println("did not create adapter for target : " + target);
-        Thread.dumpStack();
-      }                   
-      //System.out.println("createAdapter(" + target + ") " + result);
-      return result;
-    }      
-                               
-               
-  	public Adapter createBindingAdapter()
-    {
-      return new BindingAdapter();
-    }        
-
- 	  public Adapter createBindingFaultAdapter()
-    {                                      
-      return new BindingFaultAdapter();
-    }     
-
-    public Adapter createBindingOperationAdapter()
-    {     
-      return new BindingOperationAdapter();
-    }      
-
-  	public Adapter createDefinitionAdapter() 
-    {
-		  return new DefinitionAdapter();
-	  } 
-
-  	public Adapter createOperationAdapter() 
-    {
-		  return new OperationAdapter();
-	  }                                      
-
-    public Adapter adapt(Notifier target)
-    {
-      return target != null ? adapt(target, internalAdapterFactory) : null;
-    }
-
-    protected void adaptBinding(Binding binding)     
-    {
-      adapt(binding); 
-      for (Iterator i = binding.getEBindingOperations().iterator(); i.hasNext(); )
-      {
-        BindingOperation bindingOperation = (BindingOperation)i.next();
-        adapt(bindingOperation);    
-        for (Iterator j = bindingOperation.getEBindingFaults().iterator(); j.hasNext(); )
-        {
-          BindingFault bindingFault = (BindingFault)j.next();
-          adapt(bindingFault);  
-        }
-      }
-    }  
-  }  
-  
-
-  protected static abstract class BaseAdapter extends AdapterImpl
-  {
-    public boolean isAdapterForType(Object type)
-    {
-      return type == internalAdapterFactory;
-    }   
-
-    public WSDLPackage getPackage()
-    {
-      return WSDLPackage.eINSTANCE;                        
-    }
-  }
-
-    
-  // DefinitionAdapter
-  //
-  protected static class DefinitionAdapter extends BaseAdapter
-  {                                                                                  
-    public void notifyChanged(Notification msg)
-    {                                
-      if ((EStructuralFeature)msg.getFeature() == getPackage().getDefinition_EBindings())
-      {                           
-        Object newValue = msg.getNewValue();
-        switch (msg.getEventType())
-        {
-          case Notification.ADD:
-          {                                 
-            handleAdd((Binding)newValue);
-            break;
-          }
-          case Notification.ADD_MANY:
-          {
-            for (Iterator newValues = ((Collection)newValue).iterator();  newValues.hasNext(); )
-            {
-              handleAdd((Binding)newValues.next());
-            }
-            break;
-          }       
-        }                                           
-      }    
-    }     
-
-    protected void handleAdd(Binding binding)
-    {  
-      internalAdapterFactory.adaptBinding(binding);
-      PortType portType = binding.getEPortType();
-      if (portType != null)
-      {
-        fireNotificationForPortType(portType);
-      }
-    }
-  }     
-          
-  
-  protected static class BindingAdapter extends BaseAdapter
-  {                      
-    public void notifyChanged(Notification msg)
-    { 
-      if ((EStructuralFeature)msg.getFeature() == getPackage().getBinding_EPortType())
-      {
-        // fireNotifcation for all of the operation of the old and new portType
-        fireNotificationForPortType((PortType)msg.getNewValue());
-        fireNotificationForPortType((PortType)msg.getOldValue());
-      }                                                                        
-      else if ((EStructuralFeature)msg.getFeature() == getPackage().getBinding_EBindingOperations())
-      {
-        // fireNotifcation for all operations that were added or removed
-        Object newValue = msg.getNewValue();
-        Object oldValue = msg.getNewValue();
-        switch (msg.getEventType())
-        {
-          case Notification.ADD:
-          {                                                                    
-            handleAdd((BindingOperation)newValue);
-            break;
-          }
-          case Notification.ADD_MANY:
-          {
-            for (Iterator newValues = ((Collection)newValue).iterator();  newValues.hasNext(); )
-            {
-              handleAdd((BindingOperation)newValues.next());
-            }
-            break;
-          }       
-          case Notification.REMOVE:
-          {                                                                    
-            handleRemove((BindingOperation)oldValue);
-            break;
-          }
-          case Notification.REMOVE_MANY:
-          {
-            for (Iterator oldValues = ((Collection)oldValue).iterator();  oldValues.hasNext(); )
-            {
-              handleRemove((BindingOperation)oldValues.next());
-            }
-            break;
-          }  
-        }                  
-      }
-    }    
-
-    protected void handleAdd(BindingOperation bindingOperation)
-    {
-      internalAdapterFactory.adapt(bindingOperation);
-      Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);                                                            
-      fireNotificationForOperation(operation);
-    }               
-
-    protected void handleRemove(BindingOperation bindingOperation)
-    {                 
-      if (bindingOperation != null)
-      {
-        Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);                                                            
-        fireNotificationForOperation(operation);
-      }
-    }   
-  }       
-  
-
-
-  protected static class BindingOperationAdapter extends BaseAdapter
-  {                                      
-    public void notifyChanged(Notification msg)
-    {                                
-      BindingOperation bindingOperation = (BindingOperation)getTarget();
-      Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);                                                            
-      fireNotificationForOperation(operation);
-    }                
-  }
-  
-
-  protected static class BindingFaultAdapter extends BaseAdapter
-  {                                  
-    public void notifyChanged(Notification msg)
-    {                                       
-      BindingFault bindingFault = (BindingFault)getTarget();
-      BindingOperation bindingOperation = (BindingOperation)bindingFault.eContainer();
-      Operation operation = ComponentReferenceUtil.computeOperation(bindingOperation);                                                            
-      fireNotificationForOperation(operation);
-    }                
-  } 
-  
-
-  protected static class OperationAdapter extends BaseAdapter 
-  {     
-    protected Definition definition;
-    protected List listeners = new ArrayList();
-
-    public void addListener(Listener listener)
-    {
-      listeners.add(listener);
-    }
-
-    public void removeListener(Listener listener)
-    {
-      listeners.remove(listener);
-    }   
-
-    public void fireBindingsChanged()
-    {                            
-      Operation operation = (Operation)getTarget();
-      for (Iterator i = listeners.iterator(); i.hasNext(); )
-      {                                   
-        Listener listener = (Listener)i.next();
-        listener.bindingsChanged(operation);
-      }
-    }         
-  }   
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/SelectionAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/SelectionAdapter.java
deleted file mode 100644
index 9f1fda4..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/SelectionAdapter.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-// This class is used to help syncronize selections between two models.
-//
-public abstract class SelectionAdapter implements ISelectionProvider
-{ 
-  protected List listenerList = new ArrayList();
-  protected ISelection selection = new StructuredSelection();
-  protected ISelectionProvider eventSource;
-
-  public void setEventSource(ISelectionProvider eventSource)
-  {
-    this.eventSource = eventSource;
-  }
-
-  public void addSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.add(listener);
-  }
-
-  public void removeSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.remove(listener);
-  }                    
-
-  public ISelection getSelection() 
-  {
-    return selection;
-  }    
-  
-  /**
-   * This method should be specialized to return the correct object that corresponds to the 'other' model
-   */
-  abstract protected Object getObjectForOtherModel(Object object);
-
-    
-  public void setSelection(ISelection modelSelection)  
-  { 
-    List otherModelObjectList = new ArrayList();
-    if (modelSelection instanceof IStructuredSelection)
-    {
-      for (Iterator i = ((IStructuredSelection)modelSelection).iterator(); i.hasNext(); )
-      {
-        Object modelObject = i.next(); 
-        Object otherModelObject = getObjectForOtherModel(modelObject);       
-        if (otherModelObject != null)
-        { 
-          otherModelObjectList.add(otherModelObject);
-        }
-      }
-    }                
-      
-    StructuredSelection nodeSelection = new StructuredSelection(otherModelObjectList);
-    selection = nodeSelection;
-    SelectionChangedEvent event = new SelectionChangedEvent(eventSource != null ? eventSource : this, nodeSelection);
-
-    for (Iterator i = listenerList.iterator(); i.hasNext(); )
-    {
-      ISelectionChangedListener listener = (ISelectionChangedListener)i.next();
-      listener.selectionChanged(event);
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java
deleted file mode 100644
index 6779322..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java
+++ /dev/null

@@ -1,405 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class ValidateHelper
-{
-  // XML Lang can have many different valid formats
-  // 1) xx      ie. en, fr, de
-  // 2) xx-xx   ie. en-US, en-FR
-  // 3) I-xx    ie. I-en
-  // 4) X-xx    ie. X-en
-  public static String checkXMLLang(String lang)
-  {
-    if (lang.length() == 0) 
-      return null;
-    
-    if (lang.length() == 1) 
-    {
-      char ch0 = lang.charAt(0);
-      if ((ch0 >= 'a' && ch0 <= 'z') || (ch0 >= 'A' && ch0 <= 'Z'))
-        return UIPlugin.getResourceString("_WARN_LANG_TOO_SHORT");
-      else
-        return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch0 + 
-        UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");          
-    }
-    
-    int offset;
-
-    char ch0 = lang.charAt(0);
-    if (lang.charAt(1) == '-') 
-    {
-      if (ch0 == 'i' || ch0 == 'I' || ch0 == 'x' || ch0 == 'X') 
-        offset = 1;
-      else
-        return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch0 + 
-        UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
-    }
-    else
-    {
-      char ch1 = lang.charAt(1);
-      if ((ch0 >= 'a' && ch0 <= 'z') || (ch0 >= 'A' && ch0 <= 'Z'))
-        if ((ch1 >= 'a' && ch1 <= 'z') || (ch1 >= 'A' && ch1 <= 'Z'))
-          offset = 2;
-        else
-          return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch1 + 
-          UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
-      else
-        return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch0 + 
-        UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
-    }
-
-    if (lang.length() > offset) 
-    {
-      char ch = lang.charAt(offset++);
-      if (ch != '-') 
-        return UIPlugin.getResourceString("_WARN_HYPHEN_NEEDED") + Integer.toString(offset-1);        
-      else 
-      {
-        while (true) 
-        {
-          if (ch == '-') 
-          {
-            if (lang.length() == offset) 
-              return UIPlugin.getResourceString("_WARN_HYPHEN_ENDING");
-            
-            ch = lang.charAt(offset++);
-            if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z')) 
-              return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch + 
-              UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");
-            
-            if (lang.length() == offset)
-              return null;
-          } 
-          else if ((ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z')) 
-            return UIPlugin.getResourceString("_WARN_NAME_INVALID_CHAR") + ch + 
-            UIPlugin.getResourceString("_UI_NAME_INVALID_CHAR_END");             
-          else if (lang.length() == offset)
-            return null;
-          ch = lang.charAt(offset++);
-        }
-      }
-    }
-
-    return null;
-  }
-  
-  /**
-   * Check to see if the min value is correct.
-   * A minimum value must be non-negative and < maxValue
-   */
-  public static String isValidMinValue(String minValue, String maxValue)
-  {
-    int min;
-
-    if (minValue == null || minValue.equals(""))
-    {
-      // Nothing to check
-      return null;
-    }
-
-    try
-    {
-      min = Integer.parseInt(minValue);
-    }
-    catch (NumberFormatException ex)
-    {
-      return UIPlugin.getResourceString("_ERROR_MIN_NOT_POSITIVE");
-    }
-
-    if (min < 0) 
-    {
-      return UIPlugin.getResourceString("_ERROR_MIN_NOT_POSITIVE");
-    }
-
-    try
-    {
-      int max = Integer.parseInt(maxValue);
-      if (min > max) 
-      {
-        return UIPlugin.getResourceString("_ERROR_MIN_VALUE");
-      }
-    }
-    catch (NumberFormatException ex)
-    {
-      // Max is not accurate. Don't compare it.
-    }
-    return null;
-  }
-
-  /**
-   * Check to see if the max value is correct.
-   * A maximum value must be non-negative and > minValue
-   *
-   * It can also be set the string "unbounded"
-   */
-  public static String isValidMaxValue(String maxValue, String minValue)
-  {
-    int max;
-
-    if (maxValue == null || maxValue.equals("")) 
-    {
-      // Nothing to check
-      return null;
-    }
-
-    if (maxValue.equals("unbounded"))
-    {
-      return null;
-    }
-
-    try
-    {
-      max = Integer.parseInt(maxValue);
-    }
-    catch (NumberFormatException ex)
-    {
-      return UIPlugin.getResourceString("_ERROR_MAX_NOT_POSITIVE");
-    }
-
-    if (max < 0) 
-    {
-      return UIPlugin.getResourceString("_ERROR_MAX_NOT_POSITIVE");
-    }
-
-    try
-    {
-      int min = Integer.parseInt(minValue);
-      if (max < min) 
-      {
-        return UIPlugin.getResourceString("_ERROR_MAX_VALUE");
-      }
-    }
-    catch (NumberFormatException ex)
-    {
-      // Min is not accurate. Don't compare it.
-    }
-    return null;
-  }
-
-  /**
-   * Validate the name conforms to the XML spec
-   */
-  public static String checkXMLName(String name, boolean allowEntityRef)
-  {
-    int length = name.length();
-    char character;
-
-    if (length == 0) 
-    {
-      return WSDLEditorPlugin.getWSDLString("_WARN_NAME_MUST_CONTAIN_AT_LEAST_ONE_CHAR");
-    }
-    
-    if (name.indexOf(" ") >= 0)
-    {
-      return(WSDLEditorPlugin.getWSDLString("_WARN_NAME_HAS_SPACE"));
-    }
-
-    int index = 0;
-    if (length > 0 &&
-        name.charAt(0) == '%')
-    {
-      if (allowEntityRef) 
-      {
-        // skip over the first character 
-        index++;
-      } // end of if ()
-      else
-      {
-        return WSDLEditorPlugin.getWSDLString("_WARN_NAME_INVALID_FIRST");
-      } // end of else
-    }
-    
-    for(; index < length; index++)
-    {
-      character = name.charAt(index);
-
-      if(index == 0)
-      {
-        if( !isXMLNameStart(character) )
-        {
-          return WSDLEditorPlugin.getWSDLString("_WARN_NAME_INVALID_FIRST");
-        }
-      }
-      else
-      {
-        if(!isXMLNameChar(character))
-        {
-          if ((index == length - 1) && //check if the last character is a ';'
-              allowEntityRef &&
-              character == ';')
-          {
-            // we're still ok then
-            continue;
-          } // end of if ()
-          else 
-          {
-            return WSDLEditorPlugin.getWSDLString("_WARN_NAME_INVALID_CHAR") + character + 
-            WSDLEditorPlugin.getWSDLString("_UI_NAME_INVALID_CHAR_END");
-          } // end of else
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Validate the name conforms to the XML spec
-   */
-  public static String checkXMLName(String name)
-  {
-    return checkXMLName(name, false);
-  }
-
-  /**
-   * isXMLNameStart
-   **/
-  private static boolean isXMLNameStart(char ch)
-  {
-    return (ch == '_' || ch == ':' || Character.isLetter(ch) );
-  }
-
-  /**
-   * isXMLNameChar
-   **/
-  private static boolean isXMLNameChar(char ch)
-  {
-    return (Character.isLetterOrDigit(ch) || ch == '.' || ch == '-' || ch == '_' || ch == ':');
-  }
-
-  /**
-   * isXMLPrefixStart
-   **/
-//  private static boolean isXMLPrefixStart(char ch)
-//  {
-//    return (ch == '_' || Character.isLetter(ch) );
-//  }
-
-  /**
-   * isXMLPrefixChar
-   **/
-  private static boolean isXMLPrefixChar(char ch)
-  {
-    return (Character.isLetterOrDigit(ch) || ch == '.' || ch == '-' || ch == '_');
-  }
-
-  /**
-   * parseElementText
-   */
-  public static String parseElementText(String text)
-  {
-    if (text.indexOf('<') != -1 || text.indexOf('>') != -1)
-    {
-      return UIPlugin.getResourceString("_WARN_ELEMENT_INVALID_CHAR");
-    }
-    return null;
-  }
-
-  /**
-   * parseAttributeValue
-   */
-  public static String parseAttributeValue(String value)
-  {
-    if (value.indexOf('"') != -1 || value.indexOf('<') != -1 || value.indexOf('>') != -1)
-    {
-      return UIPlugin.getResourceString("_WARN_ATTRIBUTE_INVALID_CHAR");
-
-    }
-    return null;
-  }
-
-  /**
-   * parseADATASection
-   */
-  public static String parseCDATASection(String section)
-  {
-    if (section.indexOf("]]>") != -1)
-    {
-      return UIPlugin.getResourceString("_WARN_CDATA_INVALID_STRING");
-
-    }
-    return null;
-  }
-
-  /**
-   * parseProcessiingInstruction
-   */
-  public static String parseProcessingInstructionData(String data)
-  {
-    if (data.indexOf("?>") != -1)
-    {
-      return UIPlugin.getResourceString("_WARN_PROCESSING_INVALID_STRING");
-
-    }
-    return null;
-  }
-
-  /**
-   * parseProcessingInstructionTarget
-   */
-  public static String parseProcessingInstructionTarget(String target)
-  {
-    if (target.length() == 3 && (target.indexOf("XML") != -1 || target.indexOf("XMl") != -1 || target.indexOf("XmL") != -1 ||
-        target.indexOf("xML") != -1 || target.indexOf("Xml") != -1 || target.indexOf("xMl") != -1 ||
-        target.indexOf("xmL") != -1 || target.indexOf("xml") != -1))
-    {
-      return UIPlugin.getResourceString("_WARN_PROCESSING_TARGET_INVALID_STRING");
-
-    }
-    return checkXMLName(target);
-  }
-
-  /**
-   * parsComment
-   */
-  public static String parseComment(String comment)
-  {
-    if (comment.indexOf("--") != -1)
-    {
-      return UIPlugin.getResourceString("_WARN_COMMENT_INVALID_STRING");
-    }
-    return null;
-  }
-  
-  /**
-   * Validate the prefix conforms to the XML spec
-   */
-  public static String checkXMLPrefix(String prefix)
-  {
-    int length = prefix.length();
-    if (length == 0)
-    {
-      return null;
-    }
-    char character;
-    
-    if (prefix.indexOf(" ") >= 0)
-    {
-      return(UIPlugin.getResourceString("_WARN_PREFIX_HAS_SPACE"));
-    }
-    
-    for(int index = 0; index < length; index++)
-    {
-      character = prefix.charAt(index);
-
-      if(!isXMLPrefixChar(character))
-      {
-        return UIPlugin.getString("_WARN_PREFIX_INVALID_CHAR", String.valueOf(character));
-      }
-    }
-    return null;
-  }
-
-}
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java
deleted file mode 100644
index e821b95..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLEditorUtil extends WSDLConstants
-{
-  protected static WSDLEditorUtil instance;
-  protected NodeAssociationManager nodeAssociationManager = new NodeAssociationManager();
-
-  protected HashMap elementNameToTypeMap = new HashMap();
-
-  public static WSDLEditorUtil getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new WSDLEditorUtil();
-    }
-    return instance;
-  }
-
-  public WSDLEditorUtil()
-  {
-    elementNameToTypeMap.put(BINDING_ELEMENT_TAG, new Integer(BINDING));
-    elementNameToTypeMap.put(DEFINITION_ELEMENT_TAG, new Integer(DEFINITION));
-    elementNameToTypeMap.put(DOCUMENTATION_ELEMENT_TAG, new Integer(DOCUMENTATION));
-    elementNameToTypeMap.put(FAULT_ELEMENT_TAG, new Integer(FAULT));
-    elementNameToTypeMap.put(IMPORT_ELEMENT_TAG, new Integer(IMPORT));
-    elementNameToTypeMap.put(INPUT_ELEMENT_TAG, new Integer(INPUT));
-    elementNameToTypeMap.put(MESSAGE_ELEMENT_TAG, new Integer(MESSAGE));
-    elementNameToTypeMap.put(OPERATION_ELEMENT_TAG, new Integer(OPERATION));
-    elementNameToTypeMap.put(OUTPUT_ELEMENT_TAG, new Integer(OUTPUT));
-    elementNameToTypeMap.put(PART_ELEMENT_TAG, new Integer(PART));
-    elementNameToTypeMap.put(PORT_ELEMENT_TAG, new Integer(PORT));
-    elementNameToTypeMap.put(PORT_TYPE_ELEMENT_TAG, new Integer(PORT_TYPE));
-    elementNameToTypeMap.put(SERVICE_ELEMENT_TAG, new Integer(SERVICE));
-    elementNameToTypeMap.put(TYPES_ELEMENT_TAG, new Integer(TYPES));
-  }
-
-  public int getWSDLType(Element element)
-  {
-    int result = -1;
-
-    Integer integer = (Integer)elementNameToTypeMap.get(element.getLocalName());
-    if (integer != null)
-    {
-      result = integer.intValue();
-    }
-    return result;
-  }
-
-  protected List getParentElementChain(Element element)
-  {
-    List list = new ArrayList();
-    while (element != null)
-    {
-      list.add(0, element);
-      Node node = element.getParentNode();
-      element = (node != null && node.getNodeType() == Node.ELEMENT_NODE) ? (Element)node : null;
-    }
-    return list;
-  }
-
-  public Object findModelObjectForElement(Definition definition, Element targetElement)
-  {
-    Object o = nodeAssociationManager.getModelObjectForNode(definition, targetElement);
-    return o;
-  }
-
-  public Element getElementForObject(Object o)
-  {
-    return ((org.eclipse.wst.wsdl.WSDLElement)o).getElement();
-  }
-
-  public Node getNodeForObject(Object o)
-  {
-    return nodeAssociationManager.getNode(o);
-  }
-
-  // Provide a mapping between Definitions and ITypeSystemProviders
-  private Hashtable typeSystemProviders = new Hashtable();
-  
-  public ITypeSystemProvider getTypeSystemProvider(Definition definition)
-  {
-    return (ITypeSystemProvider)typeSystemProviders.get(definition);
-  }
-
-  public void setTypeSystemProvider(Definition definition, ITypeSystemProvider typeSystemProvider)
-  {
-    typeSystemProviders.put(definition,typeSystemProvider);
-  }
-
-  public static QName createQName(Definition definition, String prefixedName)
-  {
-    QName qname = null;
-    if (prefixedName != null)
-    {
-      int index = prefixedName.indexOf(":");
-      String prefix = (index == -1) ? null : prefixedName.substring(0, index);
-      if (prefix != null)
-      {
-        String namespace = definition.getNamespace(prefix);
-        if (namespace != null)
-        {
-          String localPart = prefixedName.substring(index + 1);
-          qname = new QName(namespace, localPart);
-        }
-      }
-    }
-    return qname;
-  }
-
-  public List getExtensibilityElementNodes(ExtensibleElement extensibleElement)
-  {
-    // For Types, I need to get all the schemas
-    if (extensibleElement instanceof Types)
-    {
-      Types xsdEE = (Types)extensibleElement;
-      return xsdEE.getSchemas();
-    }
-    /*
-    List childList = new ArrayList();
-
-    Element parentElement = getElementForObject(extensibleElement);
-    if (parentElement != null)
-    {
-
-      NodeList nodeList = parentElement.getChildNodes();
-      int nodeListLength = nodeList.getLength();
-      for (int i = 0; i < nodeListLength; i++)
-      {
-        childList.add(nodeList.item(i));
-      }
-      HashMap extensibleElementTable = new HashMap();
-      for (Iterator i = extensibleElement.getEExtensibilityElements().iterator(); i.hasNext();)
-      {
-        ExtensibilityElement extensibilityElement = (ExtensibilityElement)i.next();
-        if (extensibilityElement != null)
-        {
-          Element element = getElementForObject(extensibilityElement);
-          if (element != null)
-          {
-            extensibleElementTable.put(element, element);
-          }
-        }
-      }
-
-      for (Iterator i = childList.iterator(); i.hasNext();)
-      {
-        Object o = i.next();
-        if (extensibleElementTable.get(o) == null)
-        {
-          i.remove();
-        }
-      }
-    }
-    return childList;
-    */
-    return extensibleElement.getEExtensibilityElements();
-  }
-
-  /*
-   * Returns a list of 'children' of the given object model (WSDLElement).
-   */
-  public static List getModelGraphViewChildren(Object object) {
-  	List childList = new ArrayList();
-  	
-  	if (object instanceof PortType) {
-  		PortType portType = (PortType) object;
-        childList.addAll(portType.getOperations());
-  	}
-  	else if (object instanceof Operation) {
-  		Operation operation = (Operation) object;
-  		
-  		if (operation.getEInput() != null) {
-  			childList.add(operation.getEInput());
-  		}
-  		if (operation.getEOutput() != null) {
-  			childList.add(operation.getEOutput());
-  		}
-  		childList.addAll(operation.getFaults().values());
-  	}
-  	else if (object instanceof MessageReference) {
-  		MessageReference messageReference = (MessageReference) object;
-  		childList.add(messageReference.getEMessage());
-  	}  	
-  	
-  	return childList;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLModelLocatorAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLModelLocatorAdapterFactory.java
deleted file mode 100644
index 60724ab..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLModelLocatorAdapterFactory.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator;
-
-public class WSDLModelLocatorAdapterFactory extends AdapterFactoryImpl
-{
-  protected CustomWSDLModelLocator customWSDLModelLocator = new CustomWSDLModelLocator();
-  
-  class CustomWSDLModelLocator extends AdapterImpl implements WSDLModelLocator
-  {
-    public String resolveURI(String baseLocation, String namespace, String location)
-    {
-      return URIResolverPlugin.createResolver().resolve(baseLocation, namespace, location);
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == WSDLModelLocator.class;
-    }
-  }
-
-  public boolean isFactoryForType(Object type)
-  {
-    return type == WSDLModelLocator.class;
-  }
-
-  public Adapter adaptNew(Notifier target, Object type)
-  {
-    return customWSDLModelLocator;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLNodeAssociationProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLNodeAssociationProvider.java
deleted file mode 100644
index ddc3353..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLNodeAssociationProvider.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;      
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeAssociationProvider;
-import org.eclipse.xsd.impl.XSDComponentImpl;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLNodeAssociationProvider implements INodeAssociationProvider
-{                    
-  public Object getModelObject(Object parentModelObject, Element[] elementChain, int start, int[] end)
-  {                 
-    Object currentObject = parentModelObject;
-    for (int i = start; i < elementChain.length; i++)
-    {
-      Object o = getModelObjectHelper(currentObject, elementChain[i]);
-      if (o == null)
-      {              
-        end[0] = i;
-        break;
-      }            
-      else
-      {              
-        currentObject = o;
-      }
-    }                                                               
-    return currentObject != parentModelObject ? currentObject : null;                                                  
-  }
-
-  public Node getNode(Object modelObject)
-  {
-    if (modelObject instanceof WSDLElement)
-      return ((WSDLElementImpl)modelObject).getElement();
-    else
-      return null;
-  }
-      
-  protected Object getModelObjectHelper(Object parentObject, Element elementNode)
-  {          
-		Object result = null;
-		Collection childComponentList = ((WSDLElementImpl) parentObject).getWSDLContents();
-		for (Iterator i = childComponentList.iterator(); i.hasNext();)
-		{
-			Object o = i.next();
-			Element element = null;
-
-      if (o != null)
-      {
-        if (o instanceof WSDLElementImpl)
-        {
-          element = ((WSDLElementImpl)o).getElement();
-        }
-        else if (o instanceof XSDComponentImpl)
-        {
-          element = ((XSDComponentImpl)o).getElement();
-        }
-      }
-      
-			if (element == elementNode)
-			{
-				result = o;
-				break;
-			}
-		}
-		return result;
-  }
-}    

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLPreferencePage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLPreferencePage.java
deleted file mode 100644
index a51b5e8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLPreferencePage.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class WSDLPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-  public WSDLPreferencePage()
-  {
-    super(FieldEditorPreferencePage.FLAT);
-    setPreferenceStore(WSDLEditorPlugin.getInstance().getPreferenceStore());
-  }
-
-  public void init(IWorkbench workbench)
-  {
-  }
-
-  protected void createFieldEditors()
-  {
-    Composite parent = getFieldEditorParent();
-	GridLayout parentLayout = new GridLayout();
-	parentLayout.marginWidth = 0;
-	parent.setLayout(parentLayout);
-	
-//    WorkbenchHelp.setHelp(getControl(), some context id here); 
-
-	Group group = new Group(parent, SWT.NULL);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    layout.numColumns = 2;
-    group.setLayout(layout);
-    group.setText(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_CREATING_FILES"));
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    group.setLayoutData(data);
-    
-    Composite composite = new Composite(group, SWT.NULL);
-    GridData data1 = new GridData();
-    data1.verticalAlignment = GridData.FILL;
-    data1.horizontalAlignment = GridData.FILL;
-    data1.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(data1);
-	
-	String namespaceLabel = WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"); 
-    StringFieldEditor targetNamespace = new StringFieldEditor(namespaceLabel, namespaceLabel, composite); // Externalize
-    GridLayout compositeLayout = (GridLayout)composite.getLayout();
-    compositeLayout.marginWidth = 5;   // Default value
-    compositeLayout.numColumns = 2;
-    addField(targetNamespace);
-    targetNamespace.setFocus();
-	
-	String generateLabel = WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING");
-	BooleanFieldEditor generateBindingOnSave = new BooleanFieldEditor(generateLabel, generateLabel, parent);
-	addField(generateBindingOnSave);
-	
-	String showGenerateDialogLabel = "Prompt Regenerate Binding on save";   // TODO: Externalize
-	BooleanFieldEditor showGenerateDialog = new BooleanFieldEditor(showGenerateDialogLabel, showGenerateDialogLabel, parent);
-	addField(showGenerateDialog);
-
-    /* Do we need this preference below?  If so, change WSDLEditorPlugin.java and use this preference in:
-       HttpContentGenerator.java
-       SoapContentGenerator.java
-       SoapPortOptionsPage.java
-    */
-//    HttpPortOptionsPage.java    StringFieldEditor location = new StringFieldEditor("Defualt Location:", "Default Location:", editorGroup1); // Externalize
-//    addField(location);    
-    
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java
deleted file mode 100644
index 8b1dd18..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.w3c.dom.Element;
-
-
-public class WSDLResourceUtil
-{
-  public static void reloadDirectives(Definition definition)
-  {
-    Resource rootResource = definition.eResource();
-    ResourceSet resourceSet = rootResource.getResourceSet();
-
-    for (Iterator i = resourceSet.getResources().iterator(); i.hasNext();)
-    {
-      Resource resource = (Resource) i.next();
-      if (resource != rootResource)
-      {
-        //  TODO... consider unloading the resources  	
-        //  resource.unload();		      
-        i.remove();
-      }
-    }
-    ReloadDirectiveVisitor visitor = new ReloadDirectiveVisitor();
-    visitor.visitDefinition(definition);
-  }
-
-  static class ReloadDirectiveVisitor
-  {
-
-    public void visitImport(Import theImport)
-    {
-      // force the import to reload
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(theImport);
-      if (element != null)
-      {
-        ((WSDLElementImpl)theImport).elementChanged(element);
-      }
-    }
-
-    public void visitXSDSchemaDirective(XSDSchemaDirective directive)
-    {
-      // force the schema directive to reload
-      Element element = directive.getElement();
-      if (element != null)
-      {
-        directive.elementAttributesChanged(element);
-      }
-    }
-
-    public void visitDefinition(Definition definition)
-    {
-      if (definition != null)
-      {
-        for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-        {
-          visitImport((Import) i.next());
-        }
-        Types types = definition.getETypes();
-        if (types != null)
-        {
-
-          for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
-          {
-            Object o = i.next();
-            if (o instanceof XSDSchemaExtensibilityElement)
-            {
-              XSDSchemaExtensibilityElement e = (XSDSchemaExtensibilityElement) o;
-              if (e.getSchema() != null)
-              {
-                visitSchema(e.getSchema());
-              }
-            }
-          }
-        }
-      }
-    }
-
-    public void visitSchema(XSDSchema schema)
-    {
-      for (Iterator i = schema.getContents().iterator(); i.hasNext();)
-      {
-        Object o = i.next();
-        if (o instanceof XSDSchemaDirective)
-        {
-          visitXSDSchemaDirective((XSDSchemaDirective) o);
-        }
-      }
-    }
-  }
-
-
-  public static class InternalURIResolver implements WSDLModelLocator
-  {
-    //IdResolver idResolver = new IdResolverImpl(null, true);
-    org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver resolver = URIResolverPlugin.createResolver();
-
-    InternalURIResolver()
-    {  
-    }
-
-    public String resolveURI(String baseLocation, String namespace, String location)
-    {
-      String resolvedLocation = resolver.resolve(baseLocation, namespace, location);
-
-      // here's an ugly hack... Platform.resolve() returns Windows files with the pattern "file:D:/hello.xsd"
-      // but EMF's URI class expects a pattern like this "file:///D:/hello.xsd"
-      //        
-      if (resolvedLocation != null)
-      {
-		String fileProtocol = "file:";      	
-        if (resolvedLocation.startsWith(fileProtocol) && !resolvedLocation.startsWith(fileProtocol + "/"))
-        {
-          resolvedLocation = resolvedLocation.substring(fileProtocol.length());
-        }
-        resolvedLocation = URIHelper.addImpliedFileProtocol(resolvedLocation);
-      }
-      // end ugly hack
-      return resolvedLocation;
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XMLQuickScan.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XMLQuickScan.java
deleted file mode 100644
index 7f338b7..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XMLQuickScan.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.transform.TransformerFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- *
- */
-public class XMLQuickScan
-{            
-  public static String getTargetNamespaceURIForSchema(String uri)
-  {
-    String result = null;
-    try
-    {             
-      URL url = new URL(uri);
-      InputStream inputStream = url.openStream();
-      result = XMLQuickScan.getTargetNamespaceURIForSchema(inputStream); 
-    }
-    catch (Exception e)
-    {      
-    }  
-    return result;
-  }
-
-  public static String getTargetNamespaceURIForSchema(InputStream input)
-  {  
-    TargetNamespaceURIContentHandler handler = new TargetNamespaceURIContentHandler();                                                                  
-    ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
-    Thread.currentThread().setContextClassLoader(XMLQuickScan.class.getClassLoader());
-    // Line below is a hack to get XMLReader working
-    TransformerFactory transformerFactory = TransformerFactory.newInstance();
-    try
-    {
-    	XMLReader reader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
-    	reader.setContentHandler(handler);
-    	reader.parse(new InputSource(input));
-    }
-    catch (Exception e)
-    {      
-    }
-    finally
-    {
-      Thread.currentThread().setContextClassLoader(prevClassLoader);
-    }
-    return handler.targetNamespaceURI;
-  }  
-
-  protected static class TargetNamespaceURIContentHandler extends DefaultHandler
-  {       
-    public String targetNamespaceURI;
-
-    public void startElement(String uri, String localName, String qName, Attributes attributes)  throws SAXException
-    {            
-      if (localName.equals("schema") || localName.equals("definitions"))
-      {               
-        int nAttributes = attributes.getLength();
-        for (int i = 0; i < nAttributes; i++)
-        {
-          if (attributes.getLocalName(i).equals("targetNamespace"))
-          {
-            targetNamespaceURI = attributes.getValue(i);
-            break;
-          }
-        }
-      }                                    
-      // todo there's a ice way to do this I'm sure    
-      // here I intentially cause an exception... 
-      String x = null;
-      x.length();
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java
deleted file mode 100644
index 64b9ae8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.xsd.util.XSDSchemaLocationResolver;
-
-public class XSDSchemaLocationResolverAdapterFactory extends AdapterFactoryImpl
-{
-    protected XSDSchemaLocationResolverImpl schemaLocator = new XSDSchemaLocationResolverImpl();
-
-    public boolean isFactoryForType(Object type)
-    {
-      return type == XSDSchemaLocationResolver.class;
-    }
-
-    public Adapter adaptNew(Notifier target, Object type)
-    {
-      return schemaLocator;
-    }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverImpl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverImpl.java
deleted file mode 100644
index 306a2e8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/XSDSchemaLocationResolverImpl.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDSchemaLocationResolver;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocationResolverImpl extends AdapterImpl implements XSDSchemaLocationResolver
-{
-    public String resolveSchemaLocation(XSDSchema xsdSchema, String namespaceURI, String schemaLocationURI)
-    {
-      String baseLocation = xsdSchema.getSchemaLocation();      
-      String result = URIResolverPlugin.createResolver().resolve(baseLocation, namespaceURI, schemaLocationURI);
-      if (result == null) {
-      	result = namespaceURI;
-      }
-      if (result == null) {
-      	result = "";
-      }
-
-      return result;
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }  
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageHeader.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageHeader.java
deleted file mode 100644
index b479354..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageHeader.java
+++ /dev/null

@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-
-public class FlatPageHeader extends Canvas implements IPropertyChangeListener 
-{
-	private Image backgroundImage;  
-	private String text;
-	private Image buttonImage;
-	private Color imageBackgroundColor;
-	private Color textForegroundColor;
-	private int textHMargin = 10;
-	private int textVMargin = 5;
-	private Font headerFont;
-
-	private List listeners;
-	private int buttonImageX;
-	private int buttonImageY;
-	
-  // Usage: 
-  //    See org.eclipse.wst.common.ui.FlatViewUtility.createFlatPageHeader() 
-  //    methods.
-  //
-  //  Ex)
-  //  Composite parent = ... ;
-  //  Image image = ... ;
-  //  Layout layout = ... ;
-  //  String title = ... ;
-  //  WidgetFactory factory = ... ;
-  //
-  //  header = new FlatPageHeader(parent,SWT.NONE);
-  //  header.setLayout(layout);
-  //  header.setBackgroundImage(image);
-  //  header.setText(title);
-  //  Composite formParent = factory.createComposite(header);
-  //  
-  //  GridLayout gl = new GridLayout();
-  //  gl.numColumns = 1;
-  //  formParent.setLayout(gl);
-  //  formParent.setLayoutData(new GridData(GridData.FILL_BOTH));
-  //
-	public FlatPageHeader(Composite parent, int style) 
-  {
-		super(parent, style);
-		
-		// The default image background color is white
-		// The default text forekground color is black
-		imageBackgroundColor = new Color(null, 255, 255, 255);
-		textForegroundColor = new Color(null, 0, 0, 0);
-		setBackground(imageBackgroundColor);
-		
-		// The default text font is Header font
-		headerFont = JFaceResources.getHeaderFont();
-		
-		// Need to dispose the Color
-		addDisposeListener
-      (new DisposeListener() 
-        {
-			    public void widgetDisposed(DisposeEvent e) 
-          {
-				    FlatPageHeader.this.widgetDisposed(e);
-			    }
-		    } 
-      );
-		 
-		// need to paint
-		addPaintListener
-      (new PaintListener() 
-        {
-			    public void paintControl(PaintEvent e) 
-          {
-			      FlatPageHeader.this.paintControl(e);
-			    }
-		    }
-      );
-
-		// create a list of listeners
-		listeners = new ArrayList();
-
-		// add a mouse listener
-		this.addMouseListener
-      (new MouseAdapter() 
-        {
-			    public void mouseDown(MouseEvent event) 
-          {
-				    handleMouseDown(event);
-			    }
-		    }
-      );	
-		
-		JFaceResources.getFontRegistry().addListener(this);
-	}  
-
-	// Compute size of the widget
-	public Point computeSize(int wHint, int hHint, boolean changed) 
-  {
-		int width = getParent().getClientArea().width;
-		int height = 0;
-		if (backgroundImage != null) 
-    {
-			Rectangle bounds = backgroundImage.getBounds();
-			height = bounds.height;
-		}
-		if (text != null) 
-    {
-			GC gc = new GC(this);
-			int textHeight = getTextHeight(gc);
-			gc.dispose();
-			height = Math.max(height, textHeight);
-		}
-		if (buttonImage != null) 
-    { 
-			Rectangle bounds = buttonImage.getBounds();
-			if (height < bounds.height)
-				height = bounds.height;
-		}
-		if (wHint != SWT.DEFAULT) width = wHint;
-		if (hHint != SWT.DEFAULT) height = hHint;          
-		return new Point(width + 2, height + 2);     
-	}	
-
-	protected void paintControl(PaintEvent e) 
-  {
-		GC gc = e.gc;
-		if (backgroundImage != null) 
-    {
-			Rectangle imageBounds = backgroundImage.getBounds();
-			int y = 0;
-			int x = 0;
-
-			if (imageBackgroundColor != null) 
-      {
-				gc.setBackground(imageBackgroundColor);
-				gc.fillRectangle(0, 0, imageBounds.width, imageBounds.height);
-			}
-
-			if (SWT.getPlatform().equals("motif")==false) 
-      {
-				gc.drawImage(backgroundImage, x, y);
-			}
-			if (textForegroundColor != null)
-				gc.setForeground(textForegroundColor);
-			gc.setFont(headerFont);
-//			gc.setFont(getFont());	
-			gc.drawText(text, textHMargin, textVMargin, true);
-			if (buttonImage != null) 
-      {
-				Rectangle parentBounds = getParent().getClientArea();
-				Rectangle buttonBounds = buttonImage.getBounds();
-				int p = parentBounds.x + parentBounds.width;
-				buttonImageX = p - buttonBounds.width - 4;
-				buttonImageY = 4;
-				gc.drawImage(buttonImage, buttonImageX, buttonImageY);
-			}
-		}		
-	}
-	
-	public void addSelectionListener(SelectionListener listener) 
-  {
-		listeners.add(listener);
-	}
-       
-	public void removeSelectionListener(SelectionListener listener) 
-  {
-		listeners.remove(listener);
-	}	
-	
-	protected void handleMouseDown(MouseEvent event) 
-  {
-		if (buttonImage == null)
-			return;
-		// chekc if the Button image is clicked
-		int x = event.x;
-		int y = event.y;
-		if (x < buttonImageX || x > buttonImageX + buttonImage.getBounds().width) 
-    {
-			return;
-		}
-		if (y < buttonImageY || y > buttonImageY + buttonImage.getBounds().height) 
-    {
-			return;
-		}
-		
-		int size = listeners.size();
-		for (int i = 0; i < size; i++) 
-    {
-			SelectionListener listener = (SelectionListener)listeners.get(i);
-			listener.widgetSelected(null);
-		}
-	}
-	
-	protected void widgetDisposed(DisposeEvent e) 
-  {
-		if (imageBackgroundColor != null) imageBackgroundColor.dispose();
-		if (textForegroundColor != null) textForegroundColor.dispose();
-		if (backgroundImage != null) backgroundImage.dispose();
-	}
-	
-	// getters and setters
-	public Image getBackgroundImage() 
-  {
-		return backgroundImage;
-	}
-      
-	public void setBackgroundImage(Image backgroundImage) 
-  {
-		this.backgroundImage = backgroundImage;
-		redraw();
-	}
-
-	public Image getButtonImage() 
-  {
-		return buttonImage;
-	}
-      
-	public void setButtonImage(Image buttonImage) 
-  {
-		this.buttonImage = buttonImage;
-		redraw();
-	}
-      
-	public String getText() 
-  {
-		return text;
-	}
-      
-	public void setText(String text) 
-  {
-		this.text = text;
-		redraw();
-	}
-	
-	public int getTextHMargin() 
-  {
-		return textHMargin;
-	}
-	
-	public void setTextHMargin(int textHMargin) 
-  {
-		this.textHMargin = textHMargin;
-	}
-	
-	public int getTextVMargin() 
-  {
-		return textVMargin;
-	}
-	
-	public void setTextVMargin(int textVMargin) 
-  {
-		this.textVMargin = textVMargin;
-	}
-	
-	public Color getImageBackgroundColor() 
-  {
-		return imageBackgroundColor;
-	}
-	
-	public void setImageBackgroundColor(Color imageBackgroundColor) 
-  {
-		if (imageBackgroundColor == null)
-			return;
-		this.imageBackgroundColor = imageBackgroundColor;
-		redraw();
-	}
-	
-	public Color getTextForegroundColor() 
-  {
-		return textForegroundColor;
-	}
-	
-	public void setTextForegroundColor(Color textForegroundColor) 
-  {
-		if (textForegroundColor == null)
-			return;
-		this.textForegroundColor = textForegroundColor;
-		redraw();
-	}
-
-	private int getTextHeight(GC gc) 
-  {
-		int imageHeight = 0;
-		if (backgroundImage!= null && SWT.getPlatform().equals("motif")==false) 
-    {
-			imageHeight = backgroundImage.getBounds().height;
-		}
-		gc.setFont(headerFont);
-//		gc.setFont(getFont());
-		FontMetrics fm = gc.getFontMetrics();
-		int fontHeight = fm.getHeight();
-		int height =  fontHeight + textVMargin + textVMargin;
-		return Math.max(height, imageHeight);
-	}
-
-//	private int getTextWidth(GC gc) 
-//  {
-//		int imageWidth = 0;
-//		if (backgroundImage!= null && SWT.getPlatform().equals("motif")==false) 
-//    {
-//			imageWidth = backgroundImage.getBounds().width;
-//		}
-//		gc.setFont(headerFont);
-////		gc.setFont(getFont());
-//		FontMetrics fm = gc.getFontMetrics();
-//		int fontWidth = fm.getAverageCharWidth() + 5;
-//		int width =  fontWidth * text.length() + textHMargin + textHMargin;
-//		return Math.max(width, imageWidth);
-//	}
-	
-	public void handleEvent(Event e) 
-  {
-//		Widget source = e.widget;	
-	}
-	
-	public void propertyChange(PropertyChangeEvent event) 
-  {
-		if(event.getProperty() == JFaceResources.HEADER_FONT && this.isDisposed() == false)
-		{
-			headerFont = JFaceResources.getFontRegistry().get(JFaceResources.HEADER_FONT);
-			this.layout(true);
-			this.redraw();
-		}
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageSection.java
deleted file mode 100644
index 7ef2e6c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/FlatPageSection.java
+++ /dev/null

@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-
-//public abstract class FormSection implements IPropertyChangeListener, IModelChangedListener {
-public abstract class FlatPageSection extends ViewForm implements IPropertyChangeListener {
-	public static final int SELECTION = 1;
-//	private PDEFormPage formPage;
-	private String headerColorKey = WidgetFactory.DEFAULT_HEADER_COLOR;
-	private String headerText;
-	private Control client;
-	protected Label header;
-	protected Control separator;
-//	private SectionChangeManager sectionManager;
-	private java.lang.String description;
-	private boolean dirty;
-	protected Label descriptionLabel;
-	private ToggleControl toggle;
-	private boolean readOnly;
-	private boolean titleAsHyperlink;
-	private boolean addSeparator=true;
-	private boolean descriptionPainted=true;
-	private boolean headerPainted=true;
-	private boolean collapsable=false;
-	private Composite control;
-	
-	
-/*
- * This is a special layout for the section. Both the
- * header and the description labels will wrap and
- * they will use client's size to calculate needed
- * height. This kind of behaviour is not possible
- * with stock grid layout.
- */
-class SectionLayout extends Layout {
-	int vspacing = 3;
-	int sepHeight = 2;
-
-
-	protected Point computeSize(Composite parent, int wHint, int hHint, boolean flush) {
-		int width = 0;
-		int height = 0;
-		int cwidth = 0;
-		int collapsedHeight = 0;
-	
-		if (wHint != SWT.DEFAULT)
-		   width = wHint;
-		if (hHint != SWT.DEFAULT)
-			height = hHint;
-
-		cwidth = width;
-				
-		if (client != null) {
-			Point csize = client.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
-			if (width == 0) {
-				width = csize.x;
-				cwidth = width;
-			}
-			if (height==0) height = csize.y;
-		}
-		
-		Point toggleSize = null;
-		
-		if (collapsable && toggle!=null) 
-		    toggleSize = toggle.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
-		
-		if (hHint== SWT.DEFAULT && headerPainted && header!=null) {
-			int hwidth = cwidth;
-			if (toggleSize!=null)
-			   hwidth = cwidth - toggleSize.x - 5;
-			Point hsize = header.computeSize(hwidth, SWT.DEFAULT, flush);
-			height += hsize.y;
-			collapsedHeight = hsize.y;
-			height += vspacing;
-		}
-		
-		if (hHint==SWT.DEFAULT && addSeparator) {
-			height += sepHeight;
-			height += vspacing;
-			collapsedHeight += vspacing + sepHeight;
-		}
-		if (hHint == SWT.DEFAULT && descriptionPainted && descriptionLabel!=null) {
-			Point dsize = descriptionLabel.computeSize(cwidth, SWT.DEFAULT, flush);
-			height += dsize.y;
-			height += vspacing;
-		}
-		if (toggle!=null && toggle.getSelection()) {
-			// collapsed state
-			height = collapsedHeight;
-		}
-		return new Point(width, height);
-	}
-	protected void layout(Composite parent, boolean flush) {
-		int width = parent.getClientArea().width;
-		int height = parent.getClientArea().height;
-		int y = 0;
-		Point toggleSize=null;
-		
-		if (collapsable) {
-			toggleSize = toggle.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
-		}
-
-		if (headerPainted && header!=null) {
-			Point hsize;
-			
-			if (titleAsHyperlink) {
-				hsize = header.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
-				header.setBounds(0, y, hsize.x, hsize.y);
-			}
-			else {
-				int availableWidth = width;
-				if (toggleSize!=null)
-				   availableWidth = width - toggleSize.x - 5;
-				hsize = header.computeSize(availableWidth, SWT.DEFAULT, flush);
-
-        int hx = 0;
-		   	if (toggle!=null) {
-	   			int ty = y + hsize.y - toggleSize.y; // + vspacing;
-		   	  toggle.setBounds(0, ty, toggleSize.x, toggleSize.y);
-          hx = toggleSize.x;
-		   	}
-			  header.setBounds(hx, y, availableWidth, hsize.y);
-			}
-			y += hsize.y + vspacing;
-		}
-		if (addSeparator && separator!=null) {
-			separator.setBounds(0, y, width, 2);
-			y += sepHeight + vspacing;
-		}
-		if (toggle!=null && toggle.getSelection()) {
-			return;
-		}
-		if (descriptionPainted && descriptionLabel!=null) {
-			Point dsize = descriptionLabel.computeSize(width, SWT.DEFAULT, flush);
-			descriptionLabel.setBounds(0, y, width, dsize.y);
-			y += dsize.y + vspacing;
-		}
-		if (client!=null) {
-			client.setBounds(0, y, width, height - y);
-		}
-	}
-}
-	
-	
-public FlatPageSection(Composite parent) {
-	// Description causes problems re word wrapping
-	// and causes bad layout in schema and
-	// component editors when in Motif - turning off
-	
-	super(parent, SWT.FLAT);
-	if (SWT.getPlatform().equals("motif")) {
-		descriptionPainted = false;
-	}
-	JFaceResources.getFontRegistry().addListener(this);
-}
-public void commitChanges(boolean onSave) {
-}
-public abstract Composite createClient(Composite parent, WidgetFactory factory);
-public final Control createControl(
-	Composite parent,
-	WidgetFactory factory) {
-	Composite section = factory.createComposite(parent);
-	SectionLayout slayout = new SectionLayout();
-	section.setLayout(slayout);
-	section.setData(this);
-
-	if (headerPainted) {
-		Color headerColor = factory.getColor(getHeaderColorKey());
-		header = factory.createHeadingLabel(section, getHeaderText(), headerColor, SWT.WRAP);
-		if (titleAsHyperlink) {
-			factory.turnIntoHyperlink(header, new HyperlinkAdapter() {
-				public void linkActivated(Control label) {
-					titleActivated();
-				}
-			});
-		}
-		if (collapsable) {
-			toggle = new ToggleControl(section, SWT.NULL);
-			toggle.setBackground(factory.getBackgroundColor());
-			toggle.setActiveDecorationColor(factory.getHyperlinkColor());
-			toggle.setDecorationColor(factory.getColor(WidgetFactory.COLOR_COMPOSITE_SEPARATOR));
-			toggle.setActiveCursor(factory.getHyperlinkCursor());
-			toggle.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					
-					boolean collapsed = toggle.getSelection();
-					reflow();
-					if (descriptionLabel!=null)
-						descriptionLabel.setVisible(!collapsed);
-					if (client!=null)
-						client.setVisible(!collapsed);
-				}
-			});
-		}
-	}
-
-
-	if (addSeparator) {
-        //separator = factory.createSeparator(section, SWT.HORIZONTAL);
-		separator = factory.createCompositeSeparator(section);
-	}
-	
-	if (descriptionPainted && description != null) {
-		descriptionLabel = factory.createLabel(section, description, SWT.WRAP);
-	}
-	client = createClient(section, factory);
-	section.setData(this);
-	control = section;
-	return section;
-}
-
-protected void reflow() {
-	control.layout(true);
-	control.getParent().layout(true);
-
-  Widget grandParent = control.getParent().getParent();
-  if (grandParent != null && grandParent instanceof Composite)
-	  ((Composite)grandParent).layout(true);
-/*
-	SectionForm form = formPage.getForm();
-	if (form instanceof ScrollableSectionForm) {
-		((ScrollableSectionForm)form).updateScrollBars();
-	}
-*/
-}
-
-protected Text createText(Composite parent, String label, WidgetFactory factory) {
-	return createText(parent, label, factory, 1);
-}
-protected Text createText(Composite parent, String label, WidgetFactory factory, int span) {
-	factory.createLabel(parent, label);
-	Text text = factory.createText(parent, "");
-	GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_CENTER);
-	gd.grabExcessHorizontalSpace = true;
-	gd.horizontalSpan=span;
-	text.setLayoutData(gd);
-	return text;
-}
-protected Text createText(Composite parent, WidgetFactory factory, int span) {
-	Text text = factory.createText(parent, "");
-	GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_CENTER);
-	gd.grabExcessHorizontalSpace = true;
-	gd.horizontalSpan=span;
-	text.setLayoutData(gd);
-	return text;
-}
-public void dispose() {
-	JFaceResources.getFontRegistry().removeListener(this);
-	super.dispose();
-}
-public void doGlobalAction(String actionId) {}
-public void expandTo(Object object) {}
-/*
-public final void fireChangeNotification(int changeType, Object changeObject) {
-	if (sectionManager == null)
-		return;
-	sectionManager.dispatchNotification(this, changeType, changeObject);
-}
-public final void fireSelectionNotification(Object changeObject) {
-	fireChangeNotification(SELECTION, changeObject);
-}
-*/
-public java.lang.String getDescription() {
-	return description;
-}
-/*
-public PDEFormPage getFormPage() {
-	return formPage;
-}
-*/
-
-public java.lang.String getHeaderColorKey() {
-	return headerColorKey;
-}
-public java.lang.String getHeaderText() {
-	return headerText;
-}
-public void initialize(Object input) {}
-
-public boolean isDirty() {
-	return dirty;
-}
-
-public boolean isReadOnly() {
-	return readOnly;
-}
-public boolean isTitleAsHyperlink() {
-	return titleAsHyperlink;
-}
-/*
-public void modelChanged(IModelChangedEvent e) {
-}
-*/
-public void sectionChanged(FlatPageSection source, int changeType, Object changeObject) {}
-public void setAddSeparator(boolean newAddSeparator) {
-	addSeparator = newAddSeparator;
-}
-
-
-private String trimNewLines(String text) {
-	StringBuffer buff = new StringBuffer();
-	for (int i=0; i<text.length(); i++) {
-		char c = text.charAt(i);
-		if (c=='\n')
-		   buff.append(' ');
-		else
-		   buff.append(c);
-	}
-	return buff.toString();
-}
-	
-public void setDescription(java.lang.String newDescription) {
-	// we will trim the new lines so that we can
-	// use layout-based word wrapping instead
-	// of hard-coded one
-	description = trimNewLines(newDescription);
-	//description = newDescription;
-	if (descriptionLabel!=null) descriptionLabel.setText(newDescription);
-}
-public void setDescriptionPainted(boolean newDescriptionPainted) {
-	descriptionPainted = newDescriptionPainted;
-}
-public void setDirty(boolean newDirty) {
-	dirty = newDirty;
-}
-/*
-public void setFocus() {
-}
-*/
-public void setHeaderColorKey(java.lang.String newHeaderColorKey) {
-	headerColorKey = newHeaderColorKey;
-}
-public void setHeaderPainted(boolean newHeaderPainted) {
-	headerPainted = newHeaderPainted;
-}
-public void setHeaderText(java.lang.String newHeaderText) {
-	headerText = newHeaderText;
-	if (header!=null) header.setText(headerText);
-}
-/*
-void setManager(SectionChangeManager manager) {
-	this.sectionManager = manager;
-}
-*/
-public void setReadOnly(boolean newReadOnly) {
-	readOnly = newReadOnly;
-}
-public void setTitleAsHyperlink(boolean newTitleAsHyperlink) {
-	titleAsHyperlink = newTitleAsHyperlink;
-}
-public void titleActivated() {
-}
-/*
-public void update() {}
-*/
-
-public void propertyChange(PropertyChangeEvent arg0) {
-	if (control!=null && header!=null) {
-	  if (!header.isDisposed())
-		header.setFont(JFaceResources.getBannerFont());
-	  if (!control.isDisposed())
-		control.layout(true);
-	}
-}
-
-
-	/**
-	 * Gets the collapsable.
-	 * @return Returns a boolean
-	 */
-	public boolean getCollapsable() {
-		return collapsable;
-	}
-
-	/**
-	 * Sets the collapsable.
-	 * @param collapsable The collapsable to set
-	 */
-	public void setCollapsable(boolean collapsable) {
-		this.collapsable = collapsable;
-	}
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkAdapter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkAdapter.java
deleted file mode 100644
index 4e52bb9..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkAdapter.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-public class HyperlinkAdapter implements IHyperlinkListener{
-
-public HyperlinkAdapter() {
-    super();
-}
-public void linkActivated(org.eclipse.swt.widgets.Control linkLabel) {}
-public void linkEntered(org.eclipse.swt.widgets.Control linkLabel) {}
-public void linkExited(org.eclipse.swt.widgets.Control linkLabel) {}
-}
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkHandler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkHandler.java
deleted file mode 100644
index bcd3c33..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/HyperlinkHandler.java
+++ /dev/null

@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.MouseTrackListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-
-public class HyperlinkHandler implements MouseListener, MouseTrackListener, PaintListener {
-
-  	public static final int UNDERLINE_NEVER = 1;
-    public static final int UNDERLINE_ROLLOVER = 2;
-    public static final int UNDERLINE_ALWAYS = 3;
-
-    private static Cursor hyperlinkCursor;
-    private static Cursor busyCursor;
-    private boolean hyperlinkCursorUsed=true;
-    private int hyperlinkUnderlineMode=UNDERLINE_ALWAYS;
-    private Color background;
-    private Color foreground;
-    private Color activeBackground;
-    private Color activeForeground;
-    private Hashtable hyperlinkListeners;
-    private Control lastLink;
-
-public HyperlinkHandler() {
-    hyperlinkListeners = new Hashtable();
-    if (hyperlinkCursor == null)
-    {
-      hyperlinkCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);
-      busyCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_WAIT);
-    }
-}
-public void dispose() {
-    hyperlinkCursor.dispose();
-    busyCursor.dispose();
-}
-public org.eclipse.swt.graphics.Color getActiveBackground() {
-    return activeBackground;
-}
-public org.eclipse.swt.graphics.Color getActiveForeground() {
-    return activeForeground;
-}
-public org.eclipse.swt.graphics.Color getBackground() {
-    return background;
-}
-public org.eclipse.swt.graphics.Cursor getBusyCursor() {
-    return busyCursor;
-}
-public org.eclipse.swt.graphics.Color getForeground() {
-    return foreground;
-}
-public org.eclipse.swt.graphics.Cursor getHyperlinkCursor() {
-    return hyperlinkCursor;
-}
-public int getHyperlinkUnderlineMode() {
-    return hyperlinkUnderlineMode;
-}
-public org.eclipse.swt.widgets.Control getLastLink() {
-    return lastLink;
-}
-public boolean isHyperlinkCursorUsed() {
-    return hyperlinkCursorUsed;
-}
-        public void mouseDoubleClick(MouseEvent e) {
-        }
-public void mouseDown(MouseEvent e) {
-    if (e.button == 1)
-        return;
-    lastLink = (Control)e.widget;
-}
-public void mouseEnter(MouseEvent e) {
-    Control control = (Control) e.widget;
-    if (isHyperlinkCursorUsed())
-        control.setCursor(hyperlinkCursor);
-    if (activeBackground != null)
-        control.setBackground(activeBackground);
-    if (activeForeground != null)
-        control.setForeground(activeForeground);
-    if (hyperlinkUnderlineMode==UNDERLINE_ROLLOVER) underline(control, true);    
-
-    IHyperlinkListener action =
-        (IHyperlinkListener) hyperlinkListeners.get(control);
-    if (action != null)
-        action.linkEntered(control);
-}
-public void mouseExit(MouseEvent e) {
-    Control control = (Control) e.widget;
-    if (isHyperlinkCursorUsed())
-        control.setCursor(null);
-    if (hyperlinkUnderlineMode==UNDERLINE_ROLLOVER)
-        underline(control, false);
-    if (background != null)
-        control.setBackground(background);
-    if (foreground != null)
-        control.setForeground(foreground);
-    IHyperlinkListener action =
-        (IHyperlinkListener) hyperlinkListeners.get(control);
-    if (action != null)
-        action.linkExited(control);
-}
-        public void mouseHover(MouseEvent e) {
-        }
-public void mouseUp(MouseEvent e) {
-    if (e.button != 1)
-        return;
-    IHyperlinkListener action =
-        (IHyperlinkListener) hyperlinkListeners.get(e.widget);
-    if (action != null) {
-        Control c = (Control) e.widget;
-        c.setCursor(busyCursor);
-        action.linkActivated(c);
-        if (!c.isDisposed()) 
-           c.setCursor(isHyperlinkCursorUsed()?hyperlinkCursor:null);
-    }
-}
-public void paintControl(PaintEvent e) {
-    Control label = (Control) e.widget;
-    if (hyperlinkUnderlineMode == UNDERLINE_ALWAYS)
-        HyperlinkHandler.underline(label, true);
-}
-public void registerHyperlink(Control control, IHyperlinkListener listener) {
-    if (background != null)
-        control.setBackground(background);
-    if (foreground != null)
-        control.setForeground(foreground);
-    control.addMouseListener(this);
-    control.addMouseTrackListener(this);
-    if (hyperlinkUnderlineMode == UNDERLINE_ALWAYS)
-        control.addPaintListener(this);
-    hyperlinkListeners.put(control, listener);
-    removeDisposedLinks();
-}
-private void removeDisposedLinks() {
-    for (Enumeration keys = hyperlinkListeners.keys(); keys.hasMoreElements();) {
-        Control control = (Control)keys.nextElement();
-        if (control.isDisposed()) {
-            hyperlinkListeners.remove(control);
-        }
-    }
-}
-public void reset() {
-    hyperlinkListeners.clear();
-}
-public void setActiveBackground(org.eclipse.swt.graphics.Color newActiveBackground) {
-    activeBackground = newActiveBackground;
-}
-public void setActiveForeground(org.eclipse.swt.graphics.Color newActiveForeground) {
-    activeForeground = newActiveForeground;
-}
-public void setBackground(org.eclipse.swt.graphics.Color newBackground) {
-    background = newBackground;
-}
-public void setForeground(org.eclipse.swt.graphics.Color newForeground) {
-    foreground = newForeground;
-}
-public void setHyperlinkCursorUsed(boolean newHyperlinkCursorUsed) {
-    hyperlinkCursorUsed = newHyperlinkCursorUsed;
-}
-public void setHyperlinkUnderlineMode(int newHyperlinkUnderlineMode) {
-    hyperlinkUnderlineMode = newHyperlinkUnderlineMode;
-}
-public static void underline(Control control, boolean inside) {
-    if (!(control instanceof Label))
-        return;
-    Composite parent = control.getParent();
-    Rectangle bounds = control.getBounds();
-    GC gc = new GC(parent);
-    Color color = inside? control.getForeground() : control.getBackground();
-    gc.setForeground(color);
-    int y = bounds.y + bounds.height;
-    gc.drawLine(bounds.x, y, bounds.x+bounds.width, y);
-    gc.dispose();
-}
-}
-
-
-
-
-
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/IHyperlinkListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/IHyperlinkListener.java
deleted file mode 100644
index 03dfbad..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/IHyperlinkListener.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import org.eclipse.swt.widgets.Control;
-
-public interface IHyperlinkListener {
-
-  public void linkActivated(Control linkLabel);
-  public void linkEntered(Control linkLabel);
-  public void linkExited(Control linkLabel);
-}
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/ToggleControl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/ToggleControl.java
deleted file mode 100644
index 3149fef..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/ToggleControl.java
+++ /dev/null

@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlEvent;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseTrackAdapter;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TypedListener;
-
-public class ToggleControl extends Canvas {
-  private boolean fCollapsed;
-  private Color fDecorationColor;
-  private Color fActiveColor;
-  private Cursor fActiveCursor;
-  private boolean fHasFocus;
-  private boolean fHover = false;
-  private static final int MARGIN_WIDTH = 2;
-  private static final int MARGIN_HEIGHT = 2;
-
-  private static final int DEFAULT_HEIGHT = 8;
-  private static final int[] EXPANDED_POINTS = { 0, 2, 8, 2, 4, 6 }; 
-  private static final int[] COLLAPSED_POINTS = { 2, 0, 2, 8, 6, 4 }; 
-  private int fHeight = DEFAULT_HEIGHT;  
-
-  /* accessibility */
-  private String fName;
-  private String fDescription;
-
-  public ToggleControl(Composite parent, int style) {
-    super(parent, style);
-    initAccessible();
-
-    addPaintListener(new PaintListener() {
-      public void paintControl(PaintEvent e) {
-        paint(e);
-      }
-    });
-    addMouseListener(new MouseAdapter() {
-      public void mouseDown(MouseEvent e) {
-        notifyListeners(SWT.Selection);
-      }
-    });
-    addKeyListener(new KeyAdapter() {
-      public void keyPressed(KeyEvent e) {
-        if (e.character == '\r' || e.character == ' ') {
-          // Activation
-          notifyListeners(SWT.Selection);
-        }
-      }
-    });
-    addListener(SWT.Traverse, new Listener() {
-      public void handleEvent(Event e) {
-        if (e.detail != SWT.TRAVERSE_RETURN)
-          e.doit = true;
-      }
-    });
-    addFocusListener(new FocusListener() {
-      public void focusGained(FocusEvent e) {
-        if (!fHasFocus) {
-          fHasFocus = true;
-          redraw();
-        }
-      }
-      public void focusLost(FocusEvent e) {
-        if (fHasFocus) {
-          fHasFocus = false;
-          redraw();
-        }
-      }
-    });
-
-    addSelectionListener(new SelectionAdapter() {
-      public void widgetSelected(SelectionEvent e) {
-        fCollapsed = !fCollapsed;
-        redraw();
-      }
-    });
-
-    addMouseTrackListener(new MouseTrackAdapter() {
-      public void mouseEnter(MouseEvent e) {
-        fHover = true;
-        if (fActiveCursor != null)
-          setCursor(fActiveCursor);
-        redraw();
-      }
-      public void mouseExit(MouseEvent e) {
-        fHover = false;
-        if (fActiveCursor != null)
-          setCursor(null);
-        redraw();
-      }
-    });
-  }
-
-  public void addSelectionListener(SelectionListener listener) {
-    checkWidget();
-    if (listener != null)
-      addListener(SWT.Selection, new TypedListener(listener));
-  }
-
-  public void setDecorationColor(Color decorationColor) {
-    this.fDecorationColor = decorationColor;
-  }
-
-  public Color getDecorationColor() {
-    return fDecorationColor;
-  }
-
-  public void setActiveDecorationColor(Color activeColor) {
-    this.fActiveColor = activeColor;
-  }
-
-  public void removeSelectionListener(SelectionListener listener) {
-    checkWidget();
-    if (listener != null)
-      removeListener(SWT.Selection, listener);
-  }
-
-  public void setActiveCursor(Cursor activeCursor) {
-    this.fActiveCursor = activeCursor;
-  }
-
-  public Color getActiveDecorationColor() {
-    return fActiveColor;
-  }
-
-  public Point computeSize(int wHint, int hHint, boolean changed) {
-
-    return new Point((wHint != SWT.DEFAULT ? wHint : fHeight + 2 * MARGIN_WIDTH), (hHint != SWT.DEFAULT ? hHint : fHeight + 2 * MARGIN_HEIGHT));
-  }
-
-  protected void paint(PaintEvent e) {
-    GC gc = e.gc;
-    Point size = getSize();
-    gc.setFont(getFont());
-    paint(gc);
-    if (fHasFocus) {
-      gc.setForeground(getForeground());
-      gc.drawFocus(0, 0, size.x, size.y);
-    }
-  }
-
-  /*
-   * @see SelectableControl#paint(GC)
-   */
-  protected void paint(GC gc) {
-    if (fHover && fActiveColor != null)
-      gc.setBackground(fActiveColor);
-    else if (fDecorationColor != null)
-      gc.setBackground(fDecorationColor);
-    else
-      gc.setBackground(getForeground());
-    Point size = getSize();
-    gc.fillPolygon(translate((fCollapsed ? COLLAPSED_POINTS : EXPANDED_POINTS), ((size.x - fHeight) / 2), ((size.y - fHeight) / 2)));
-    gc.setBackground(getBackground());
-  }
-
-  private int[] translate(int[] data, int x, int y) {
-    int[] target = new int[data.length];
-    for (int i = 0; i < data.length; i += 2) {
-      target[i] = data[i]*fHeight/DEFAULT_HEIGHT + x;
-    }
-    for (int i = 1; i < data.length; i += 2) {
-      target[i] = data[i]*fHeight/DEFAULT_HEIGHT + y;
-    }
-    return target;
-  }
-  
-  public void setHeight(int y) {
-    fHeight = y;
-  }
-
-  private void notifyListeners(int eventType) {
-    Event event = new Event();
-    event.type = eventType;
-    event.widget = this;
-    notifyListeners(eventType, event);
-  }
-
-  public boolean getSelection() {
-    return fCollapsed;
-  }
-
-  public void setSelection(boolean selection) {
-    this.fCollapsed = selection;
-  }
-
-  public void setName(String name) {
-    fName = name;
-  }
-
-  public void setDescription(String description) {
-    fDescription = description;
-  }
-
-  private void initAccessible() {
-    getAccessible().addAccessibleListener(new AccessibleAdapter() {
-
-      public void getName(AccessibleEvent e) {
-        e.result = fName;
-      }
-
-      public void getDescription(AccessibleEvent e) {
-        e.result = fDescription;
-      }
-    });
-
-    getAccessible().addAccessibleControlListener(new AccessibleControlAdapter() {
-
-      public void getLocation(AccessibleControlEvent e) {
-        Rectangle location = getBounds();
-        Point pt = toDisplay(new Point(location.x, location.y));
-        e.x = pt.x;
-        e.y = pt.y;
-        e.width = location.width;
-        e.height = location.height;
-      }
-
-      public void getChildCount(AccessibleControlEvent e) {
-        e.detail = 0;
-      }
-
-      public void getRole(AccessibleControlEvent e) {
-        e.detail = ACC.ROLE_TREE;
-      }
-
-      public void getState(AccessibleControlEvent e) {
-        e.detail = fCollapsed ? ACC.STATE_COLLAPSED : ACC.STATE_EXPANDED;
-      }
-
-    });
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/WidgetFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/WidgetFactory.java
deleted file mode 100644
index c099982..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/flatui/WidgetFactory.java
+++ /dev/null

@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.flatui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.custom.TableTree;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class WidgetFactory {	
-  public static final String DEFAULT_HEADER_COLOR = "__default__header__";
-  public static final String COLOR_BACKGROUND = "__bg";
-  public static final String COLOR_BORDER = "__border";
-  public static final String COLOR_COMPOSITE_SEPARATOR = "__compSep";
-  public static final String COLOR_HYPERLINK="__hyperlink";
-    
-  private Hashtable colorRegistry = new Hashtable();
-  private Color backgroundColor;
-  private Color clientAreaColor;
-  private Color foregroundColor;
-  private Color fReadOnlyColor;
-  private Display fDisplay;
-  public static final int BORDER_STYLE = SWT.NONE;
-  private BorderPainter borderPainter;
-  private Color borderColor;
-  private HyperlinkHandler hyperlinkHandler;
-  private static Image fBanner;
-  
-
-  class BorderPainter implements PaintListener {
-        public void paintControl(PaintEvent event) {
-            Composite composite = (Composite) event.widget;
-            Control[] children = composite.getChildren();
-            for (int i = 0; i < children.length; i++) {
-                Control c = children[i];
-                //if (c.isEnabled()==false) continue;
-                if (c instanceof Text
-                    || c instanceof Canvas
-                    || c instanceof CCombo) {
-                    Rectangle b = c.getBounds();
-                    GC gc = event.gc;
-                    gc.setForeground(c.getBackground());
-                    gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
-                    gc.setForeground(foregroundColor);
-                    gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-                }
-                else if (c instanceof Table
-                    || c instanceof Tree
-                    || c instanceof TableTree) {
-                    Rectangle b = c.getBounds();
-                    GC gc = event.gc;
-                    gc.setForeground(borderColor);
-                    //gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-                    gc.drawRectangle(b.x-1, b.y-1, b.width+2, b.height+2);
-                }
-            }
-        }
-    }
-
-
-public WidgetFactory() {
- 	fDisplay = Display.getDefault();
-    initialize();
-}
-
-public Button createButton(Composite parent, String text, int style) {
-    int flatStyle = BORDER_STYLE == SWT.BORDER ? SWT.NULL : SWT.FLAT;
-    //int flatStyle = SWT.NULL;
-    Button button = new Button(parent, style | flatStyle);
-    button.setBackground(backgroundColor);
-    button.setForeground(foregroundColor);
-    if (text!=null) button.setText(text);
-    return button;
-}
-public Composite createComposite(Composite parent) {
-    return createComposite(parent, SWT.NULL);
-}
-public Composite createComposite(Composite parent, int style) {
-    Composite composite = new Composite(parent, style);
-    composite.setBackground(backgroundColor);
-    return composite;
-}
-public Composite createCompositeSeparator(Composite parent) {
-    Composite composite = new Composite(parent, SWT.NONE);
-    composite.setBackground(getColor(COLOR_COMPOSITE_SEPARATOR));
-    return composite;
-}
-public Group createGroup(Composite parent, String text) {
-	Group group = new Group(parent, SWT.SHADOW_NONE);
-	group.setText(text);
-    group.setBackground(backgroundColor);
-    group.setForeground(foregroundColor);
-	return group;
-}
-public Label createHeadingLabel(Composite parent, String text, Color bg) {
-    return createHeadingLabel(parent, text, bg, SWT.NONE);
-}
-public Label createHeadingLabel(Composite parent, String text, Color bg, int style) {
-    Label label = new Label(parent, style);
-    label.setText(text);
-    label.setBackground(backgroundColor);
-    label.setForeground(foregroundColor);
-    label.setFont(JFaceResources.getFontRegistry().get(JFaceResources.BANNER_FONT));
-    return label;
-}
-public Label createHyperlinkLabel(Composite parent, String text, IHyperlinkListener listener) {
-    return createHyperlinkLabel(parent, text, listener, SWT.NULL);
-}
-public Label createHyperlinkLabel(Composite parent, String text, IHyperlinkListener listener, int style) {
-    Label label = createLabel(parent, text, style);
-    turnIntoHyperlink(label, listener);
-    return label;
-}
-public Label createLabel(Composite parent, String text) {
-    return createLabel(parent, text, SWT.NONE);
-}
-public Label createLabel(Composite parent, String text, int style) {
-    Label label = new Label(parent, style);
-    if (text!=null) label.setText(text);
-    label.setBackground(backgroundColor);
-    label.setForeground(foregroundColor);
-    return label;
-}
-public Label createSeparator(Composite parent, int style) {
-    Label label = new Label(parent, SWT.SEPARATOR | style);
-    label.setBackground(backgroundColor);
-    label.setForeground(borderColor);
-    return label;
-}
-public ScrolledComposite createScrolledComposite (Composite parent) {
-	ScrolledComposite scrolledcomposite = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
-    scrolledcomposite.setBackground(backgroundColor);
-    scrolledcomposite.setForeground(foregroundColor);
-    return scrolledcomposite;
-}
-public Table createTable(Composite parent, int style) {
-    Table table = new Table(parent, BORDER_STYLE | style);
-    table.setBackground(backgroundColor);
-    table.setForeground(foregroundColor);
-    //hookDeleteListener(table);
-    return table;
-}
-public Text createText(Composite parent, String value) {
-    return createText(parent, value, BORDER_STYLE | SWT.SINGLE);
-}
-public Text createText(Composite parent, String value, int style) {
-    Text text = new Text(parent, style);
-    text.setText(value);
-    text.setBackground(clientAreaColor);
-    text.setForeground(foregroundColor);
-    if ((style & SWT.READ_ONLY) != 0)
-    	text.setForeground(fReadOnlyColor);
-    return text;
-}
-public Tree createTree(Composite parent, int style) {
-    Tree tree = new Tree(parent, BORDER_STYLE | style);
-    tree.setBackground(backgroundColor);
-    tree.setForeground(foregroundColor);
-    //hookDeleteListener(tree);
-    return tree;
-}
-/* 
-private void deleteKeyPressed(Widget widget) {
-    if (!(widget instanceof Control)) return;
-    Control control = (Control)widget;
-    for (Control parent = control.getParent();
-        parent != null;
-        parent = parent.getParent()) {
-        if (parent.getData() instanceof FormSection) {
-            FormSection section = (FormSection) parent.getData();
-            section.doGlobalAction(IWorkbenchActionConstants.DELETE);
-            break;
-        }
-    }
-}
-*/
-public ViewForm createViewForm(Composite parent) {
-	ViewForm viewForm = new ViewForm(parent, SWT.NULL);
-    viewForm.setBackground(clientAreaColor);
-    viewForm.setForeground(foregroundColor);
-    return viewForm;
-}
-public void dispose() {
-    Enumeration colors= colorRegistry.elements();
-    while (colors.hasMoreElements()) {
-        Color c = (Color)colors.nextElement();
-        c.dispose();
-    }
-    hyperlinkHandler.dispose();
-    colorRegistry=null;
-    if (fBanner != null)
-    {
-      fBanner.dispose();
-      fBanner = null;
-    }
-}
-public Color getBackgroundColor() {
-    return backgroundColor;
-}
-public Image getBanner() {
-  if (fBanner == null)
-  {
-    try {
-      fBanner = (ImageDescriptor.createFromURL(new URL((WSDLEditorPlugin.getInstance().getDescriptor().getInstallURL()), "icons\form_banner.gif"))).createImage();
-      System.out.println("Created Image!!!! ");
-    } catch (MalformedURLException e) {
-      System.out.println("Exception!!!! " + e);
-    }
-  }
-  return fBanner;
-}
-public Color getBorderColor() {
-    return borderColor;
-}
-public Cursor getBusyCursor() {
-    return hyperlinkHandler.getBusyCursor();
-}
-public Color getClientAreaColor() {
-    return clientAreaColor;
-}
-public Color getColor(String key) {
-    return (Color)colorRegistry.get(key);
-}
-public Color getForegroundColor() {
-    return foregroundColor;
-}
-public Color getHyperlinkColor() {
-    return hyperlinkHandler.getForeground();
-}
-public Cursor getHyperlinkCursor() {
-    return hyperlinkHandler.getHyperlinkCursor();
-}
-public Color getHyperlinkHoverColor() {
-    return hyperlinkHandler.getActiveForeground();
-}
-public int getHyperlinkUnderlineMode() {
-    return hyperlinkHandler.getHyperlinkUnderlineMode();
-}
-/*
-public void hookDeleteListener(Control control) {
-    if (deleteListener == null) {
-        deleteListener = new KeyAdapter() {
-            public void keyPressed(KeyEvent event) {
-                if (event.character == SWT.DEL && event.stateMask == 0) {
-                    deleteKeyPressed(event.widget);
-                }
-            }
-        };
-    }
-    control.addKeyListener(deleteListener);
-}
-*/
-  private void initStaticColors()
-  {
-    if (colorRegistry == null)
-    {
-      colorRegistry = new Hashtable();
-      registerColor(COLOR_BACKGROUND, 0xff, 0xfe, 0xf9);
-      registerColor(COLOR_BORDER, 195, 191, 179);
-      registerColor(COLOR_COMPOSITE_SEPARATOR, 152, 170, 203);
-      registerColor(DEFAULT_HEADER_COLOR, 0x48, 0x70, 0x98);
-      registerColor(COLOR_HYPERLINK, 0, 0, 153);
-    }
-  }
-
-private void initialize() {
-    clientAreaColor = fDisplay.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-    fReadOnlyColor = fDisplay.getSystemColor(SWT.COLOR_DARK_GRAY);
-    initStaticColors();
-    backgroundColor = clientAreaColor;
-    borderColor = getColor(COLOR_BORDER);
-    foregroundColor = fDisplay.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-    hyperlinkHandler = new HyperlinkHandler();
-    hyperlinkHandler.setForeground(getColor(COLOR_HYPERLINK));
-    hyperlinkHandler.setBackground(backgroundColor);
-}
-public void paintBordersFor(Composite parent) {
-    if (BORDER_STYLE == SWT.BORDER) return;
-    if (borderPainter==null) borderPainter = new BorderPainter();
-    parent.addPaintListener(borderPainter);
-}
-public Color registerColor(String key, int r, int g, int b) {
-    Color c = new Color(fDisplay, r, g, b);
-    colorRegistry.put(key, c);
-    return c;
-}
-
-public void setClientAreaColor(Color color)
-{
-  clientAreaColor = color;
-  backgroundColor = clientAreaColor;
-}
-
-public void setHyperlinkColor(Color color) {
-    hyperlinkHandler.setForeground(color);
-}
-public void setHyperlinkHoverColor(org.eclipse.swt.graphics.Color hoverColor) {
-    hyperlinkHandler.setActiveForeground(hoverColor);
-}
-public void setHyperlinkUnderlineMode(int newHyperlinkUnderlineMode) {
-    hyperlinkHandler.setHyperlinkUnderlineMode(newHyperlinkUnderlineMode);
-}
-public void turnIntoHyperlink(Control control, IHyperlinkListener listener) {
-    hyperlinkHandler.registerHyperlink(control, listener);
-}
-
-}
-
-
-
-
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BaseDesignWindow.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BaseDesignWindow.java
deleted file mode 100644
index 4d30cf1..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BaseDesignWindow.java
+++ /dev/null

@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.ui;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-
-abstract public class BaseDesignWindow extends Viewer
-{
-  protected ScrolledComposite mainUIComponent;
-  protected Composite controlsContainer;
-
-  protected boolean pageComplete = true;
-  protected Object input;
-
-  private IStatusLineManager statusLine;
-
-  public BaseDesignWindow(IStatusLineManager statusLine)
-  {
-    this.statusLine = statusLine;
-  }
-
-  protected void setStatusLine(IStatusLineManager statusLine)
-  {
-    this.statusLine = statusLine;
-  }
-
-  protected IStatusLineManager getStatusLine()
-  {
-    if (statusLine == null)
-    {
-      //statusLine = WorkbenchUtility.getStatusLineManager();
-
-      IWorkbench workbench = UIPlugin.getDefault().getWorkbench();
-      IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-      IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-      
-      try
-      {                       
-        EditorActionBarContributor contributor = (EditorActionBarContributor)editorPart.getEditorSite().getActionBarContributor();
-        statusLine = contributor.getActionBars().getStatusLineManager();
-      }
-      catch (Exception e)
-      {
-      }  
-    }
-    return statusLine;
-  }
-
-  public Object getInput()
-  {
-    return input;
-  }
-
-  public void setInput(Object input)
-  {
-    if (this.input != input) 
-    {
-      setErrorMessage("");
-    }
-    
-    this.input = input;
-  }
-
-  public ISelection getSelection()
-  {
-    return null;
-  }
-
-  public void setSelection(ISelection selection, boolean reveal)
-  {
-  }
-
-  public void refresh()
-  {
-  }
-
-  /**
-   * A design view that has a main area for controls, and a message line at
-   * the bottom
-   */
-  protected Control createDesignPane(Composite parent, int numColumns)
-  {
-    // Create the main UI container
-    mainUIComponent= new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL)
-    {
-      public void setVisible(boolean visible)
-      {
-        super.setVisible(visible);
-        if (visible == false && !currentMessage.equals(""))
-        {
-          showMessageInStatusLine(visible == true);
-        }
-      }
-    };
-
-//    mainUIComponent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-    controlsContainer = new Composite(mainUIComponent, SWT.NONE);
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    controlsContainer.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    controlsContainer.setLayoutData(data);
-    
-    // TODO: Remove above line and uncomment the following two when XSDEditor views
-    // are rewritten.  Also refer do related TODO in DTDEditor's BaseWindow.
-    // FlatViewUtility flatViewUtility = new FlatViewUtility();
-    // controlsContainer = flatViewUtility.createComposite(mainUIComponent, numColumns);
-
-    mainUIComponent.setContent(controlsContainer);
-
-    return mainUIComponent;
-  }
-
-  public void setScrollComposite()
-  {
-    Point p = controlsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    mainUIComponent.setExpandHorizontal(true);
-    mainUIComponent.setExpandVertical(true);
-    mainUIComponent.setMinSize(p);
-  }
-
-  public Composite getControlsContainer()
-  {
-    return controlsContainer;
-  }
-
-  /**
-   * Sets the complete state of the page.
-   * If false, then client is not allowed to move to next page
-   */
-  public void setPageComplete(boolean complete)
-  {
-    pageComplete= complete;
-  }
-
-  /**
-   * Returns whether the page is complete or not.
-   */
-  public boolean isPageComplete()
-  {
-    return pageComplete;
-  }
-
-  private String currentMessage = "";
-  protected void showMessageInStatusLine(boolean show)
-  {
-    if (getStatusLine() == null)
-      return;
-    
-    if (show) 
-    {
-      getStatusLine().setErrorMessage(currentMessage);
-    }
-    else 
-    {
-      getStatusLine().setErrorMessage("");
-    }
-    
-    
-    getStatusLine().update(false);
-  }
-  
-  /**
-   * Sets the message line
-   */
-  public void setMessage(String message)
-  {
-    currentMessage = message;
-    if (getStatusLine() != null)
-    {
-      getStatusLine().setErrorMessage(currentMessage);
-      getStatusLine().update(false);
-    }
-  }
-
-  /**
-   * Clears a message.
-   */
-  public void clearMessage()
-  {
-    currentMessage = "";
-    if (getStatusLine() != null)
-    {
-      getStatusLine().setErrorMessage(currentMessage);
-      getStatusLine().update(false);
-    }
-  }
-
-  public void setErrorMessage(String message)
-  {
-    setMessage(message);
-    setPageComplete(false);
-  }
-
-  public void clearErrorMessage()
-  {
-    clearMessage();
-    setPageComplete(true);
-  }
-
-  public String getErrorMessage()
-  {
-    return currentMessage;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BorderPainter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BorderPainter.java
deleted file mode 100644
index 47bdeb5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/BorderPainter.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.TableTree;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-
-public class BorderPainter implements PaintListener
-{
-  Color backgroundColor, foregroundColor;
-  static Color borderColor;
-
-  public BorderPainter()
-  {
-    Display display = Display.getCurrent();
-    if (borderColor == null)
-    {
-      borderColor = new Color(Display.getCurrent(), 195, 191, 179);  	
-    }
-    backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-    foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);	
-  }
-	
-  public void paintControl(PaintEvent event)
-  {
-    Composite composite = (Composite) event.widget;
-    Control[] children = composite.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      Control c = children[i];
-      if (c.isEnabled()==false)
-      {
-        if (c instanceof Text
-          || c instanceof Canvas
-          || c instanceof List
-          || c instanceof CCombo)
-        {
-          Rectangle b = c.getBounds();
-          GC gc = event.gc;
-          gc.setForeground(backgroundColor);
-//        gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
-          gc.setForeground(borderColor);
-          gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-        }
-        continue;
-      }
-      if (c instanceof Text
-//        || c instanceof Canvas
-        || c instanceof List
-        || c instanceof CCombo)
-      {
-        Rectangle b = c.getBounds();
-        GC gc = event.gc;
-        gc.setForeground(backgroundColor);
-        gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
-        gc.setForeground(foregroundColor);
-        gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-      }
-      else if (c instanceof Table
-        || c instanceof Tree
-        || c instanceof TableTree) {
-        Rectangle b = c.getBounds();
-        GC gc = event.gc;
-        gc.setForeground(foregroundColor);
-        //gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-        gc.drawRectangle(b.x-1, b.y-1, b.width+2, b.height+2);
-      }
-    }
-  }
-}
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/FlatViewUtility.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/FlatViewUtility.java
deleted file mode 100644
index f0b9fb5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/util/ui/FlatViewUtility.java
+++ /dev/null

@@ -1,902 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.util.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.FlatPageHeader;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.WidgetFactory;
-
-public class FlatViewUtility implements PaintListener
-{
-  Color backgroundColor, foregroundColor;
-  Color comboBackgroundColor, comboDisabledColor;
-  static Color borderColor;
-
-  // Added for createFlatPageHeader()
-  private boolean headingVisible=true;
-  private Image headingImage = null;
-  private Composite headerControl = null;
-  private int TITLE_VMARGIN = 5;
-
-  private KeyboardHandler keyboardHandler;
-
-  public static final int H_SCROLL_INCREMENT = 5;
-  public static final int V_SCROLL_INCREMENT = 64;
-  
-  // this defaults to the flat style, but users can change it if they wish
-  private int flatStyle = SWT.FLAT;
-  private int border = 0;
-
-  public FlatViewUtility()
-  { 
-    Display display = Display.getCurrent();
-    if (borderColor == null)
-    {
-      borderColor = new Color(Display.getCurrent(), 195, 191, 179);  	
-    }
-    backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-    foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-    comboBackgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-    comboDisabledColor = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-    keyboardHandler = new KeyboardHandler();
-  }
-  
-  public FlatViewUtility(boolean isFlat)
-  {
-    this();
-    
-    setFlat(isFlat);
-  }
-  
-  public void setFlat(boolean flat)
-  {
-    Display display = Display.getCurrent();
-    if (flat)
-    {
-      flatStyle = SWT.FLAT;
-      backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-      foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);  
-    }
-    else
-    {
-      flatStyle = 0;
-      border = SWT.BORDER;
-      backgroundColor = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-      foregroundColor = display.getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);
-    }
-  }
-  
-  public void setColor(Control c)
-  {
-    if (flatStyle == SWT.FLAT)
-    {
-      c.setBackground(backgroundColor);
-    }
-  }
-  
-  public void paintControl(PaintEvent event)
-  {
-    Control c = (Control) event.widget;
-    if (c.isEnabled()==false)
-    {
-      if (c instanceof Text
-//      || c instanceof Canvas
-          || c instanceof List
-          || c instanceof CCombo)
-      {
-        GC gc = event.gc;
-        gc.setForeground(backgroundColor);
-//      gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);
-        gc.setForeground(borderColor);
-//        gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
-      }
-    }              
-
-    // Defect 252891 : this causes some major problems on Linux GTK
-    // This looks rather dodgy in any case since an cyclic painting behaviour
-    // is likely occuring here
-    //if (c.getParent() != null)
-    //{
-    //  c.getParent().redraw();
-    //}
-  }
-
-  private static Font font;
-
-  public static Font getFont()
-  {
-    if (font == null)
-    {
-      font = new Font(Display.getCurrent(), "ms sans serif", 8, SWT.NORMAL);
-    }
-    return font;
-  }
-
-  public static void setFont(Font newFont)
-  {
-    font = newFont;
-  }
-
-  public static void setComposite(Composite comp)
-  {
-    // deprecated.  Remove later
-  }
-
-  public Composite createSimpleComposite(Composite parent, int style)
-  {
-    Composite composite = new Composite(parent, style | flatStyle);
-    composite.setFont(getFont());
-    setColor(composite);
-
-    GridLayout layout = new GridLayout();
-    composite.setLayout(layout);
-    return composite;
-  }
-
-  public Composite createComposite(Composite parent, int numColumns)
-  {
-    Composite composite = new Composite(parent, SWT.NONE | flatStyle);
-    composite.setFont(getFont());
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    composite.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    composite.setLayoutData(data);
-    setColor(composite);
-    if (flatStyle == SWT.FLAT)
-    {
-      composite.addPaintListener(new BorderPainter());
-    }
-    return composite;
-  }
-
-  public Composite createComposite(Composite parent, int numColumns, boolean horizontalFill)
-  {
-    if (!horizontalFill)
-    {
-      createComposite(parent, numColumns);
-    }
-
-    Composite composite = new Composite(parent, SWT.NONE | flatStyle);
-    composite.setFont(getFont());
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    composite.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(data);
-    setColor(composite);
-    if (flatStyle == SWT.FLAT)
-    {
-      composite.addPaintListener(new BorderPainter());
-    }
-    return composite;
-  }
-
-  public Composite createComposite(Composite parent, int numColumns, boolean horizontalFill, boolean verticalFill)
-  {
-    if (!horizontalFill && !verticalFill)
-    {
-      createComposite(parent, numColumns);
-    }
-
-    Composite composite = new Composite(parent, SWT.NONE | flatStyle);
-    composite.setFont(getFont());
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    composite.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.grabExcessVerticalSpace = true;
-    composite.setLayoutData(data);
-    setColor(composite);
-    if (flatStyle == SWT.FLAT)
-    {
-      composite.addPaintListener(new BorderPainter());
-    }
-    return composite;
-  }
-
-  public SashForm createSashForm(Composite parent, int style)
-  {
-    SashForm sashForm = new SashForm(parent, style | flatStyle);
-    setColor(sashForm);
-    return sashForm;
-  }
-
-  public PageBook createPageBook(Composite parent, int style)
-  {
-    PageBook pageBook = new PageBook(parent, style | flatStyle);
-    setColor(pageBook);
-    if (flatStyle == SWT.FLAT)
-    {
-      pageBook.addPaintListener(new BorderPainter());
-    }
-    return pageBook;
-  }
-
-  public Label createHeadingLabel(Composite parent, String text, Color bg) {
-    return createHeadingLabel(parent, text, bg, SWT.NONE);
-  }
-  public Label createHeadingLabel(Composite parent, String text, Color bg, int style) {
-    Label label = new Label(parent, style);
-    label.setText(text);
-    setColor(label);
-    if (flatStyle == SWT.FLAT)
-    {
-      label.setForeground(foregroundColor);
-    }
-    label.setFont(JFaceResources.getFontRegistry().get(JFaceResources.BANNER_FONT));
-    return label;
-  }
-
-  public Label createHorizontalFiller(Composite parent, int horizontalSpan)
-  {
-    Label label = new Label(parent, SWT.LEFT | flatStyle);
-    setColor(label);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.horizontalSpan = horizontalSpan;
-    label.setLayoutData(data);
-    return label;
-  }
-
-  /**
-   * Helper method for creating labels.
-   */
-  public Label createLabel(Composite parent, int style, String text)
-  {
-    Label label = new Label(parent, style | flatStyle);
-    setColor(label);
-    label.setText(text);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(data);
-    return label;
-  }
-
-  public Label createLabel(Composite parent, String text)
-  {
-    Label label = new Label(parent, SWT.LEFT | flatStyle);
-    setColor(label);
-    label.setText(text);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(data);
-    return label;
-  }
-
-  public Label createLabel(Composite parent, String text, int alignment)
-  {
-    Label label = new Label(parent, SWT.LEFT | flatStyle);
-    label.setText(text);
-    setColor(label);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = alignment;
-    label.setLayoutData(data);
-    return label;
-  }
-
-  /**
-   * Helper method for creating buttons.
-   */
-  public Button createPushButton(Composite parent, String label)
-  {
-    Button button = new Button(parent, SWT.PUSH | flatStyle);
-    button.setText(label);
-    setColor(button);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    button.setLayoutData(data);
-    button.addKeyListener(keyboardHandler);
-
-    return button;
-  }
-
-  public Table createTable(Composite parent)
-  {
-    Table table = new Table(parent, SWT.SINGLE | SWT.BORDER | flatStyle);
-    setColor(table);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    table.setLayoutData(data);
-    return table;
-  }
-
-  /**
-   * Create radio button
-   */
-  public Button createRadioButton(Composite parent, String label)
-  {
-    Button button = new Button(parent, SWT.RADIO | flatStyle);
-    button.setText(label);
-    setColor(button);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    button.setLayoutData(data);
-    button.addKeyListener(keyboardHandler);
-
-    return button;
-  }
-
-  /**
-   * Helper method for creating check box
-   */
-  public Button createCheckBox(Composite parent, String label)
-  {
-    Button button = new Button(parent, SWT.CHECK | flatStyle);
-    button.setText(label);
-    setColor(button);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    button.setLayoutData(data);
-    return button;
-  }
-
-  public Combo createComboBox(Composite parent)
-  {
-    return createComboBox(parent, true);
-  }
-
-  public Combo createComboBox(Composite parent, boolean isReadOnly)
-  {
-    int style = isReadOnly == true ? SWT.READ_ONLY : SWT.DROP_DOWN;
-
-    Combo combo = new Combo(parent, style | flatStyle | border);
-    setColor(combo);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    combo.setLayoutData(data);
-    return combo;
-  }
-
-  public CCombo createCComboBox(Composite parent)
-  {
-    return createCComboBox(parent, true);
-  }
-
-  public CCombo createCComboBox(Composite parent, boolean isReadOnly)
-  {
-    int style = isReadOnly == true ? SWT.READ_ONLY : SWT.DROP_DOWN;
-
-    CCombo combo = new CCombo(parent, style | flatStyle | border);
-    // setColor(combo);
-    // Always use List Background
-    combo.setBackground(comboBackgroundColor);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    combo.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      combo.addPaintListener(this);
-    }
-    else                        
-    {                           
-      /*   
-       // Defect 252891 : I'm not sure if this code will also cause problems on Linux GTK
-       // But since its potentially cyclic ... I'm commenting it out for now
-       combo.addPaintListener(new PaintListener()
-       {
-       public void paintControl(PaintEvent event)
-       {
-       Control c = (Control) event.widget;
-       if (c.isEnabled()==true)
-       {
-       c.setBackground(comboBackgroundColor);
-       }
-       else
-       {
-       c.setBackground(comboDisabledColor); 
-       }
-       final Control con = c;
-       Runnable delayedUpdate = new Runnable()
-       {
-       public void run()
-       {
-       if (con != null)
-       {
-       if (!con.isDisposed())  // it gets disposed
-       {
-       con.redraw();
-       }
-       }
-       }
-       };
-       Display.getCurrent().asyncExec(delayedUpdate);
-       }
-       });*/
-    }
-    return combo;
-  }
-
-  public List createListBox(Composite parent, int width, boolean isMultiSelect)
-  {
-    int style = isMultiSelect ? SWT.MULTI : SWT.SINGLE;
-    List list = new List(parent, style  | flatStyle | border);
-    setColor(list);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.widthHint = width;
-    list.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      list.addPaintListener(this);
-    }
-    return list;
-  }
-
-  public List createListBox(Composite parent, int width, boolean isMultiSelect, boolean verticalFill)
-  {
-    int style = isMultiSelect ? SWT.MULTI : SWT.SINGLE;
-    List list = new List(parent, style  | flatStyle | border);
-    setColor(list);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.grabExcessVerticalSpace = verticalFill;
-    data.widthHint = width;
-    list.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      list.addPaintListener(this);
-    }
-    return list;
-  }
-
-  public List createListBox(Composite parent, int style)
-  {
-    List list = new List(parent, style | flatStyle | border);
-    setColor(list);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.grabExcessVerticalSpace = true;
-    list.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      list.addPaintListener(this);
-    }
-    return list;
-  }
-
-  public Text createTextField(Composite parent)
-  {
-    Text text = new Text(parent, SWT.SINGLE | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    text.addKeyListener(keyboardHandler);
-    return text;
-  }
-
-  public Text createTextField(Composite parent, int width)
-  {
-    Text text = new Text(parent, SWT.SINGLE | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.widthHint = width;
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    text.addKeyListener(keyboardHandler);
-    return text;
-  }
-
-  public Text createTextField(Composite parent, int width, int style)
-  {
-    Text text = new Text(parent, style | SWT.SINGLE | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.widthHint = width;
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    return text;
-  }
-
-  /**
-   * <code>createWrappedMultiTextField</code> creates a wrapped multitext field
-   *
-   * @param parent a <code>Composite</code> value
-   * @param width an <code>int</code> value
-   * @param numLines an <code>int</code> value representing number of characters in height
-   * @param verticalFill a <code>boolean</code> value
-   * @return a <code>Text</code> value
-   */
-  public Text createWrappedMultiTextField(Composite parent, int width, int numLines, boolean verticalFill)
-  {
-    Text text = new Text(parent, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }
-    data.widthHint = width;
-    FontData[] fontData = getFont().getFontData();
-    // hack for now where on Windows, only 1 fontdata exists
-    data.heightHint = numLines * fontData[0].getHeight();
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    return text;
-  }
-
-  public Text createMultiTextField(Composite parent, int width, int height, boolean verticalFill)
-  {
-    Text text = new Text(parent, SWT.MULTI |  SWT.H_SCROLL | SWT.V_SCROLL | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }
-    data.widthHint = width;
-    data.heightHint = height;
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    return text;
-  }
-
-  public Text createMultiTextField(Composite parent, boolean verticalFill)
-  {
-    Text text = new Text(parent, SWT.MULTI |  SWT.H_SCROLL | SWT.V_SCROLL | flatStyle | border);
-    setColor(text);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }
-    text.setLayoutData(data);
-    if (flatStyle == SWT.FLAT)
-    {
-      text.addPaintListener(this);
-    }
-    return text;
-  }
-
-  public Group createGroup(Composite parent, int numColumns, String text, boolean verticalFill)
-  {
-    Group group = new Group(parent, SWT.SHADOW_ETCHED_IN  | flatStyle);
-    group.setText(text);
-    setColor(group);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }
-    group.setLayoutData(data);
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    group.setLayout(layout);
-    if (flatStyle == SWT.FLAT)
-    {
-      group.addPaintListener(new BorderPainter());
-    }
-    return group;
-  }
-
-  public Group createGroup(Composite parent, int numColumns, String text, boolean verticalFill, int alignment)
-  {
-    Group group = new Group(parent, SWT.SHADOW_ETCHED_IN | flatStyle);
-    group.setText(text);
-    setColor(group);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.verticalAlignment = alignment;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }
-    group.setLayoutData(data);
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    group.setLayout(layout);
-    if (flatStyle == SWT.FLAT)
-    {
-      group.addPaintListener(new BorderPainter());
-    }
-    return group;
-  }
-
-  public Label createVerticalFiller(Composite parent, int verticalSpan)
-  {
-    Label label = new Label(parent, SWT.LEFT | flatStyle);
-    label.setFont(getFont());
-    setColor(label);
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.verticalSpan = verticalSpan;
-    label.setLayoutData(data);
-
-    return label;
-  }
-
-  //
-  // FlatPageHeader
-  //
-
-  // This will use the default background image.
-  public Composite createFlatPageHeader
-  (Composite parent,
-      String title)
-  {
-    Image bgImage = createDefaultImage();
-    return createFlatPageHeader(parent,bgImage,title);
-  }
-
-  // Provide your own background image.
-  public Composite createFlatPageHeader
-  (Composite parent,
-      Image bgImage,
-      String title)
-  {
-    FlatPageHeader header = new FlatPageHeader(parent,SWT.NONE);
-    header.setLayout(new PageLayout());
-    header.setBackgroundImage(bgImage);
-    header.setText(title);
-    WidgetFactory factory = new WidgetFactory();
-    Composite formParent = factory.createComposite(header);
-    //Composite formParent = createComposite(header,1);
-    createPageContent(formParent);
-    headerControl = header; // this is used in getTitleHeight()
-    return formParent;
-  }
-
-  public void updateFlatPageHeaderTitle(String title)
-  {
-    ((FlatPageHeader)headerControl).setText(title);
-  }
-
-  private void createPageContent(Composite parent) 
-  {
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout(layout);
-    parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-  }
-
-  class PageLayout extends Layout 
-  {
-    protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) 
-    {
-      if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
-        return new Point(wHint, hHint);
-
-      Control client = composite.getChildren()[0];
-      Point csize = client.computeSize(SWT.DEFAULT, SWT.DEFAULT, flushCache);
-      if (headingVisible) csize.y += getTitleHeight();
-      
-      return csize;
-    }
-    
-    protected void layout(Composite composite, boolean flushCache) 
-    {
-      Rectangle clientArea = composite.getClientArea();
-      Control client = composite.getChildren()[0];
-      int theight = headingVisible ? getTitleHeight() : 0;
-      client.setBounds(clientArea.x, clientArea.y + theight, clientArea.width, clientArea.height - theight);
-    }
-  }
-
-  private int getTitleHeight() 
-  {
-    int imageHeight = 0;
-    // Note - Find out why headingImage is always null.
-    if (headingImage != null && SWT.getPlatform().equals("motif") == false) 
-      imageHeight = headingImage.getBounds().height;
-
-    GC gc = new GC(headerControl);
-    gc.setFont(JFaceResources.getHeaderFont());
-    FontMetrics fm = gc.getFontMetrics();
-    int fontHeight = fm.getHeight();
-    gc.dispose();
-
-    int height = fontHeight + TITLE_VMARGIN + TITLE_VMARGIN;
-    return Math.max(height,imageHeight);
-  }
-
-
-  private Image createDefaultImage()
-  {
-    return ImageDescriptor.createFromFile
-    (WSDLEditorPlugin.class,
-        "icons/page_banner.gif").createImage();
-  }
-  /**
-   * Returns the backgroundColor.
-   * @return Color
-   */
-  public Color getBackgroundColor()
-  {
-    return backgroundColor;
-  }
-  
-  public class KeyboardHandler extends KeyAdapter
-  {
-    public void keyPressed(KeyEvent e)
-    {
-      Widget w = e.widget;
-      if (w instanceof Control)
-      {
-        processKey(e.keyCode, (Control) w);
-      }
-    }
-
-    private void scrollVertical(ScrolledComposite scomp, boolean up)
-    {
-      scroll(scomp, 0, up ? -V_SCROLL_INCREMENT : V_SCROLL_INCREMENT);
-    }
-
-    private void scrollHorizontal(ScrolledComposite scomp, boolean left)
-    {
-      scroll(scomp, left ? -H_SCROLL_INCREMENT : H_SCROLL_INCREMENT, 0);
-    }
-
-    private void scrollPage(ScrolledComposite scomp, boolean up)
-    {
-      Rectangle clientArea = scomp.getClientArea();
-      int increment = up ? -clientArea.height : clientArea.height;
-      scroll(scomp, 0, increment);
-    }
-
-    private void scroll(ScrolledComposite scomp, int xoffset, int yoffset)
-    {
-      Point origin = scomp.getOrigin();
-      Point contentSize = scomp.getContent().getSize();
-      int xorigin = origin.x + xoffset;
-      int yorigin = origin.y + yoffset;
-      xorigin = Math.max(xorigin, 0);
-      xorigin = Math.min(xorigin, contentSize.x - 1);
-      yorigin = Math.max(yorigin, 0);
-      yorigin = Math.min(yorigin, contentSize.y - 1);
-      scomp.setOrigin(xorigin, yorigin);
-    }
-    
-    protected ScrolledComposite getScrolledComposite(Control c)
-    {
-      Composite parent = c.getParent();
-      
-      while (parent != null)
-      {
-        if (parent instanceof ScrolledComposite)
-        {
-          return (ScrolledComposite) parent;
-        }
-        parent = parent.getParent();
-      }
-      return null;
-    }
-    
-    protected void processKey(int keyCode, Control c)
-    {
-      ScrolledComposite scomp = getScrolledComposite(c);
-      if (scomp != null)
-      {
-        switch (keyCode)
-        {
-        case SWT.ARROW_DOWN :
-          scrollVertical(scomp, false);
-          break;
-        case SWT.ARROW_UP :
-          scrollVertical(scomp, true);
-          break;
-        case SWT.ARROW_LEFT :
-          scrollHorizontal(scomp, true);
-          break;
-        case SWT.ARROW_RIGHT :
-          scrollHorizontal(scomp, false);
-          break;
-        case SWT.PAGE_UP :
-          scrollPage(scomp, true);
-          break;
-        case SWT.PAGE_DOWN :
-          scrollPage(scomp, false);
-          break;
-        }
-      }
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BaseViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BaseViewer.java
deleted file mode 100644
index 83a118b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BaseViewer.java
+++ /dev/null

@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.BaseDesignWindow;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.BorderPainter;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.FlatViewUtility;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class BaseViewer extends BaseDesignWindow implements Listener, SelectionListener
-{
-//  protected Object input; 
-
-  // for use in subclasses
-  protected FlatViewUtility flatViewUtility = new FlatViewUtility(true);
-
-  public BaseViewer(IStatusLineManager statusLine)
-  {
-    super(statusLine);
-  }
-
-  public Object getInput()
-  {
-    return input;
-  }
-
-  // gets called only if we currently are not handling an event
-  abstract public void doSetInput(Object input);
-  
-  /**
-   * @see org.eclipse.jface.viewers.Viewer#setInput(Object)
-   */
-  static Object oldInput = null;
-  ModelAdapterListener oldModelAdapterListener = null;
-
-  public void setInput(Object input)
-  {
-    super.setInput(input);
-
-    doSetInput(input);
-/*
-    if (!isInDoHandle() && !getControl().isDisposed())
-    {
-      final Object obj = input;
-      getControl().getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          doSetInput(obj);
-        }
-      });
-    }
-*/
-  }
-
-
-  boolean listenerEnabled = true;
-  /**
-   * Get the value of listenerEnabled.
-   * @return value of listenerEnabled.
-   */
-  public boolean isListenerEnabled() 
-  {
-    return listenerEnabled;
-  }
-  
-  /**
-   * Set the value of listenerEnabled.
-   * @param v  Value to assign to listenerEnabled.
-   */
-  public void setListenerEnabled(boolean  v) 
-  {
-    this.listenerEnabled = v;
-  }
-
-
-  public void handleEvent(Event event)
-  {
-    if (isListenerEnabled() &&
-        getInput() != null &&
-        !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      startDelayedEvent(event);
-      isInDoHandle = false;
-    } // end of if ()
-  }
-
-  abstract public void doHandleEvent(Event event);
-  abstract public void createControl(Composite parent);
-
-  protected DelayedEvent delayedTask;
-  
-  protected void startDelayedEvent(Event e)
-  {
-    if (delayedTask == null ||
-      delayedTask.getEvent() == null)
-    {
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500,delayedTask);
-    }
-    else
-    {
-      Event delayedEvent = delayedTask.getEvent();
-      
-      if (e.widget == delayedEvent.widget &&
-        e.type == delayedEvent.type)
-      {
-        // same event, just different data, delay new event
-        delayedTask.setEvent(null);
-      }
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500,delayedTask);
-    }
-  }
-  
-  class DelayedEvent implements Runnable
-  {
-    protected Event event;
-    
-    /*
-     * @see Runnable#run()
-     */
-    public void run()
-    {
-      if (event != null)
-      {
-        isInDoHandle = true;
-        doHandleEvent(event);
-        isInDoHandle = false;
-        event = null;
-      }
-    }
-    
-    /**
-     * Gets the event.
-     * @return Returns a Event
-     */
-    public Event getEvent()
-    {
-      return event;
-    }
-
-    /**
-     * Sets the event.
-     * @param event The event to set
-     */
-    public void setEvent(Event event)
-    {
-      this.event = event;
-    }
-
-  }
-
-
-  boolean isInDoHandle;
-  /**
-   * Get the value of isInDoHandle.
-   * @return value of isInDoHandle.
-   */
-  public boolean isInDoHandle() 
-  {
-    return isInDoHandle;
-  }
-
-  /*
-   * @see Viewer#getControl()
-   */
-  public Control getControl()
-  {
-    return mainUIComponent;
-  }
-
-
-  /*
-   * @see BaseDesignWindow#createDesignPane(Composite, int)
-   */
-  protected Control createDesignPane(Composite arg0, int arg1)
-  {
-    Control control = super.createDesignPane(arg0, arg1);
-    
-    Composite client = super.getControlsContainer();
-    
-    client.addPaintListener(new BorderPainter());
-    
-    client.setBackground(new Color(Display.getCurrent(),255,255,255));
-
-    return control;
-  }
-
-
-  public ISelection getSelection()
-  {
-    return null;
-  }
-  
-  public void refresh()
-  {
-  }
-
-  public void setSelection(ISelection selection, boolean reveal) 
-  {
-  }
-   
-  
-//  public abstract Control getControl();
-
-
-  public Node getNode()
-  {
-    return (Node) getInput();
-  }
-
-
-  public void doWidgetDefaultSelected(SelectionEvent e)
-  {}
-  
-  public void doWidgetSelected(SelectionEvent e)
-  {}
-  
-  /**
-   * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-   */
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-    if (isListenerEnabled() &&
-        getInput() != null &&
-        !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      doWidgetDefaultSelected(e);
-      isInDoHandle = false;
-    }
-    
-  }
-
-  /**
-   * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (isListenerEnabled() &&
-        getInput() != null &&
-        !isInDoHandle) 
-    {
-      isInDoHandle = true;
-      doWidgetSelected(e);
-      isInDoHandle = false;
-    }
-    
-  }
-
-  public Node getChildNode(Element parent, String childName)
-  {
-    NodeList list = null;
-    if (parent != null)
-    {
-      list = parent.getChildNodes();
-    }
-   
-    if (list != null)
-    {
-      // Performance issue perhaps?
-      for (int i = 0; i < list.getLength(); i++)
-      {
-        if (list.item(i) instanceof Element)
-        {
-          if (list.item(i).getLocalName().equals(childName))
-          {
-            return list.item(i);
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-
-  protected Element performAddElement(Node parentNode, String namespaceName, String localName)
-  {
-    if (parentNode != null)
-    {                              
-      Element newElement = createElement(parentNode, namespaceName, localName);
-      parentNode.appendChild(newElement);       
-      format(parentNode);
-      return newElement;
-    }  
-    return null;
-  }
-
-  protected Element createElement(Node parentNode, String namespaceName, String localName)
-  {
-    Document document = parentNode.getOwnerDocument();
-    Element element = document.createElement(localName);
-    return element;   
-  }   
-
-  protected void addAttributes(Element newElement, String attr, String value)
-  {                                              
-    newElement.setAttribute(attr, value);
-  }
-
-  protected void format(Node parentNode)
-  {
-    if (parentNode instanceof IDOMNode) 
-    {
-      // format selected node                                                    
-      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-      formatProcessorXML.formatNode((IDOMNode)parentNode);
-    }
-  }
-  
-  static protected IEditorPart getActiveEditor()
-  {
-    IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
-    IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-    IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-
-    return editorPart;
-  }
-  
-  static protected IStatusLineManager getStatusLineManager(IEditorPart editorPart)
-  { 
-    IStatusLineManager result = null;
-    try
-    {                       
-      EditorActionBarContributor contributor = (EditorActionBarContributor)editorPart.getEditorSite().getActionBarContributor();
-      result = contributor.getActionBars().getStatusLineManager();
-    }
-    catch (Exception e)
-    {
-    }  
-    return result;
-  }
-  
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingInputOutputFaultViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingInputOutputFaultViewer.java
deleted file mode 100644
index 5c7d396..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingInputOutputFaultViewer.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class BindingInputOutputFaultViewer extends NamedComponentViewer 
-{                    
-  public BindingInputOutputFaultViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  { 
-    String result = "";
-    if (input instanceof BindingInput)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_INPUT");
-    }
-    else if (input instanceof BindingOutput)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_OUTPUT");
-    }
-    else if (input instanceof BindingFault)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_FAULT");
-    }            
-    return result;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingOperationViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingOperationViewer.java
deleted file mode 100644
index f10337b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingOperationViewer.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class BindingOperationViewer extends NamedComponentViewer 
-{                    
-  public BindingOperationViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_OPERATION"); //$NON-NLS-1$
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingViewer.java
deleted file mode 100644
index 79d8bce..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/BindingViewer.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public class BindingViewer extends NamedComponentViewer 
-{                      
-  protected CCombo componentNameCombo;      
-  protected ComponentNameComboHelper componentNameComboHelper;
-  InvokeDialogButton button;
-
-  public BindingViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING");  //$NON-NLS-1$
-  }
-
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-    Composite composite = super.populatePrimaryDetailsSection(parent);
-                   
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE")); //$NON-NLS-1$
-
-    componentNameCombo = flatViewUtility.createCComboBox(composite);
-    componentNameCombo.addListener(SWT.Modify, this); 
-                                                                  
-
-    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-    {
-      protected List getComponentNameList(ComponentReferenceUtil util)
-      {
-        return util.getPortTypeNames();
-      }
-
-      protected String getAttributeName()
-      {
-        return WSDLConstants.TYPE_ATTRIBUTE;
-      }
-    };
-
-    button = new InvokeDialogButton(composite, getInput());
-    button.setEditor(editorPart);
-
-    return composite;
-  }  
-
-  protected void update()
-  {
-    super.update();                                                     
-    componentNameComboHelper.update(input);
-    button.setInput(input);
-  }
-
-  protected void handleEventHelper(Element element, Event event)
-  {                        
-    super.handleEventHelper(element, event);
-    componentNameComboHelper.handleEventHelper(element, event);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/DefinitionViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/DefinitionViewer.java
deleted file mode 100644
index 5384c1d..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/DefinitionViewer.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.EditNamespacesAction;
-
-public class DefinitionViewer extends NamedComponentViewer 
-{                     
-  public DefinitionViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  { 
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_DEFINITION"); //$NON-NLS-1$
-  }  
-    
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-	  Composite composite = super.populatePrimaryDetailsSection(parent);
-	  flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_NAMESPACES")); //$NON-NLS-1$
-	  Button button = flatViewUtility.createPushButton(composite, WSDLEditorPlugin.getWSDLString("_UI_EDIT_NAMESPACES"));
-	  SelectionListener listener = new SelectionListener()
-	  {
-		  public void widgetDefaultSelected(SelectionEvent event)
-		  {    		
-		  }
-		  
-		  public void widgetSelected(SelectionEvent event)
-		  {
-			  EditNamespacesAction action = new EditNamespacesAction((Definition)getInput());					
-			  action.run();	
-		  }	
-	  };
-	  button.addSelectionListener(listener);
-	  return composite;	
-  }	    
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/EmptyViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/EmptyViewer.java
deleted file mode 100644
index e4e2541..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/EmptyViewer.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-
-public class EmptyViewer extends BaseViewer
-{                                      
-  protected Composite control;
-
-  public EmptyViewer(Composite parent, int style)
-  {
-    super(getStatusLineManager(getActiveEditor()));
-    createControl(parent);
-  }
-
-  public void createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    control.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    control.setLayoutData(data);
-  }                                    
-
-  public Control getControl()
-  {
-    return control;
-  }
-
-  public void doSetInput(Object input)
-  {
-    
-  }
-
-  /*
-   * @see BaseWindow#doHandleEvent(Event)
-   */
-  public void doHandleEvent(Event event)
-  {
-    if (event.type == SWT.Modify)
-    {
-    }
-  }  
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibilityElementViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibilityElementViewer.java
deleted file mode 100644
index 0f3a170..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibilityElementViewer.java
+++ /dev/null

@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.AttributesTable;
-import org.w3c.dom.Node;
-
-public class ExtensibilityElementViewer extends BaseViewer implements ModelAdapterListener
-{             
-  protected Composite control;   
-  protected IEditorPart editorPart;   
-  protected AttributesTable attributesTable;
-  boolean isForTabbedProperties = false;
-  
-  public ExtensibilityElementViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(getStatusLineManager(editorPart));    
-    this.editorPart = editorPart;                  
-
-    createControl(parent);   
-  }
-  
-  public ExtensibilityElementViewer(Composite parent, IEditorPart editorPart, boolean isForTabbedProperties)
-  {
-    super(getStatusLineManager(editorPart));    
-    this.editorPart = editorPart;                  
-    this.isForTabbedProperties = isForTabbedProperties;
-    if (isForTabbedProperties)
-    {
-      createControlForTabbedPropertySheet(parent);
-    }
-    else
-    {
-      createControl(parent);
-    }
-  } 
-
-  protected String getHeadingText()
-  { 
-    String result = "";                            
-    if (input != null)
-    {
-      Node node = ((WSDLElement)input).getElement();
-      result = node.getNodeName();
-      if (result == null || result.length() == 0)
-      {
-        result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_UNKNOWN_EXTENSIBILITY_ELEMENT"); //$NON-NLS-1$ 
-      }
-    }
-    return result;
-  }         
-  
-  // TODO... move this method down to BaseViewer!
-  public void doHandleEvent(Event event)
-  {
-  }
-
-  public void createControlForTabbedPropertySheet(Composite parent)
-  { 
-    attributesTable = new AttributesTable(editorPart, parent);
-  }  
-
-  public void createControl(Composite parent)
-  { 
-    control = flatViewUtility.createComposite(parent, 1, true);   
-	  control.setBackground (new Color(null,255,0,0));
-	  GridData gd= new GridData();
-	  gd.horizontalAlignment= GridData.FILL;
-	  gd.grabExcessHorizontalSpace= true;
-	  gd.verticalAlignment= GridData.FILL;
-	  gd.grabExcessVerticalSpace= true;
-	  
-    control.setLayoutData(gd);
-
-
-    GridLayout layout = (GridLayout)control.getLayout();
-    layout.verticalSpacing = 0;
-    layout.marginHeight = 0;
-    layout.marginWidth = 0;
-                                      
-    flatViewUtility.createFlatPageHeader(control, "");
-
-    Composite c = flatViewUtility.createComposite(control, 1, true);
-    GridData cGD= new GridData();
-    cGD.horizontalAlignment= GridData.FILL;
-    cGD.grabExcessHorizontalSpace= true;
-    cGD.verticalAlignment= GridData.FILL;
-    cGD.grabExcessVerticalSpace= true;
-    
-    c.setLayoutData(cGD);                                 
-    attributesTable = new AttributesTable(editorPart, c);
-
-    GridData attributesTableGD= new GridData();
-    attributesTableGD.horizontalAlignment= GridData.FILL;
-    attributesTableGD.grabExcessHorizontalSpace= true;
-    attributesTableGD.verticalAlignment= GridData.FILL;
-    attributesTableGD.grabExcessVerticalSpace= true;
-
-    attributesTable.getControl().setLayoutData(attributesTableGD);
-  }  
-
-  public Control getControl()
-  {
-    return control;
-  } 
-   
-
-  public void doSetInput(Object input)
-  {
-    if (!isForTabbedProperties)
-    {
-      flatViewUtility.updateFlatPageHeaderTitle(getHeadingText());
-    }
-    setListenerEnabled(false);                          
-               
-    attributesTable.setInput(((WSDLElement)input).getElement());
- 
-    setListenerEnabled(true);
-
-    if (oldInput != null)
-    {
-      WSDLModelAdapterFactory.removeModelAdapterListener(oldInput, this);
-    }
-    WSDLModelAdapterFactory.addModelAdapterListener(input, this);
-
-    oldInput = input;
-  }
-
-  public void propertyChanged(Object object, String property)
-  {
-    if (isListenerEnabled())
-    {
-      setListenerEnabled(false);
-      update();
-      setListenerEnabled(true);
-    }
-  }  
-
-  protected void update()
-  {                          
-    Runnable runnable = new Runnable()
-    { 
-      public void run()
-      {           
-        if (!attributesTable.getControl().isDisposed())
-        {
-          attributesTable.refresh();
-        }
-      }
-    };               
-    Display.getCurrent().asyncExec(runnable);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibleDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibleDetailsViewerProvider.java
deleted file mode 100644
index 2c6057f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ExtensibleDetailsViewerProvider.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IDetailsViewerProvider;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-
-public class ExtensibleDetailsViewerProvider implements IDetailsViewerProvider
-{
-  protected WSDLEditorExtension[] extensions;
-  protected IDetailsViewerProvider[] detailsViewerProviders;
-
-  protected final static Object[] EMPTY_ARRAY = {};
-
-  public ExtensibleDetailsViewerProvider(WSDLEditor wsdlEditor)
-  {  	
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    extensions = registry.getRegisteredExtensions(WSDLEditorExtension.DETAILS_VIEWER_PROVIDER); 
-    detailsViewerProviders = new IDetailsViewerProvider[extensions.length]; 
-    for (int i = 0; i < extensions.length; i++)
-    {
-      detailsViewerProviders[i] = (IDetailsViewerProvider)extensions[i].createExtensionObject(WSDLEditorExtension.DETAILS_VIEWER_PROVIDER, wsdlEditor);
-    }
-  }          
-      
-
-  protected IDetailsViewerProvider getApplicableDetailsProvider(Object object)
-  {                             
-    IDetailsViewerProvider provider = null;
-    for (int i = 0; i < extensions.length; i++)
-    {
-      if (extensions[i].isApplicable(object))
-      {
-        provider = detailsViewerProviders[i];
-        if (provider != null)
-        {
-          break;
-        }
-      }
-    }
-    return provider;
-  }
-   
-  
-  public Object getViewerKey(Object object)
-  {
-    IDetailsViewerProvider provider = getApplicableDetailsProvider(object);
-    return provider != null ? provider.getViewerKey(object) : null;
-  }
-  
-
-  public Viewer createViewer(Object object, Composite parent, IEditorPart editorPart)
-  {
-    IDetailsViewerProvider provider = getApplicableDetailsProvider(object);
-    return provider != null ? provider.createViewer(object, parent, editorPart) : null;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ImportViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ImportViewer.java
deleted file mode 100644
index 1419425..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ImportViewer.java
+++ /dev/null

@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.XMLQuickScan;
-import org.w3c.dom.Element;
-
-
-public class ImportViewer extends BaseViewer implements ModelAdapterListener
-{
-  protected Composite control;
-  protected IEditorPart editorPart;
-  
-  protected Text namespaceText;
-  protected Text prefixText;
-  protected Text locationText;
-  Button selectButton;
-
-  /**
-   * Constructor for ImportViewer.
-   * @param parent
-   * @param editorPart
-   */
-  public ImportViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(getStatusLineManager(editorPart));
-    this.editorPart = editorPart;
-    createControl(parent);
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.ui.internal.viewers.NamedComponentViewer#getHeadingText()
-   */
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_IMPORT"); //$NON-NLS-1$
-  }
-
-  public void createControl(Composite parent)
-  { 
-    control = flatViewUtility.createComposite(parent, 1, true);                 
-    GridLayout layout = (GridLayout)control.getLayout();
-    layout.verticalSpacing = 0;
-                                      
-    flatViewUtility.createFlatPageHeader(control, getHeadingText());
-
-    Composite c = flatViewUtility.createComposite(control, 1, true);
-
-    Label bogus = flatViewUtility.createLabel(c, 0, "");
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    
-    bogus.setLayoutData(gd);
-
-    Composite composite = flatViewUtility.createComposite(c, 2, true); 
-    GridLayout layout2 = new GridLayout();
-    layout2.makeColumnsEqualWidth  = false;
-    layout2.numColumns = 3;
-    layout2.marginHeight = 3;
-    composite.setLayout(layout2);
-
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAMESPACE")); //$NON-NLS-1$
-    namespaceText = flatViewUtility.createTextField(composite);
-    namespaceText.setEnabled(false);
-
-    // place holder
-    Control con= flatViewUtility.createLabel(composite, 0, "");
-    gd = new GridData();
-    gd.grabExcessHorizontalSpace = false;
-    con.setLayoutData(gd);
-
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX")); //$NON-NLS-1$
-    prefixText = flatViewUtility.createTextField(composite);
-    prefixText.addListener(SWT.Modify,this);
-    prefixText.setEnabled(false);    
-
-    // place holder
-    Control con2= flatViewUtility.createLabel(composite, 0, "");
-    gd = new GridData();
-    gd.grabExcessHorizontalSpace = false;
-    con2.setLayoutData(gd);
-
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_LOCATION")); //$NON-NLS-1$
-    locationText = flatViewUtility.createTextField(composite);
-    locationText.setEnabled(false);
-
-    selectButton = flatViewUtility.createPushButton(composite, "...");
-    gd = new GridData();
-    gd.horizontalAlignment = GridData.BEGINNING;
-    gd.grabExcessHorizontalSpace = false;
-    selectButton.setLayoutData(gd);
-    selectButton.addSelectionListener(this);
-  }  
-
-  public void doSetInput(Object input)
-  {    
-    setListenerEnabled(false);                          
-    try
-    {          
-//      Node node = WSDLEditorUtil.getInstance().getNodeForObject(input);
-      update();
-    }
-    finally
-    {
-      setListenerEnabled(true);
-    }
-
-    if (oldInput != null)
-    {
-      WSDLModelAdapterFactory.removeModelAdapterListener(oldInput, this);
-    }
-
-    WSDLModelAdapterFactory.addModelAdapterListener(input, this);
-    oldInput = input;
-  }
-
-  protected void handleEventHelper(Element element, Event event)
-  {                        
-    if (event.type == SWT.Modify)
-    {  
-    }
-  }
-
-  protected void update()
-  {
-    Element element = ((WSDLElement)input).getElement();                           
-    flatViewUtility.updateFlatPageHeaderTitle(getHeadingText());
-    prefixText.setText("");
-    locationText.setText("");
-    namespaceText.setText("                                                                  ");
-    namespaceText.getParent().layout();    
-    namespaceText.setText("");
-    String locationValue = element.getAttribute("location");
-    locationText.setText(locationValue != null ? locationValue : "");  
-
-    String namespaceValue = element.getAttribute("namespace");
-    namespaceText.setText(namespaceValue != null ? namespaceValue : "");
-    
-    String prefix = ((Import)input).getEnclosingDefinition().getPrefix(namespaceValue);
-    prefixText.setText(prefix != null ? prefix : "");
-  }
-
-  public Control getControl()
-  {
-    return control;
-  }
-
-  /*
-   * @see BaseWindow#doHandleEvent(Event)
-   */
-  public void doHandleEvent(Event event)
-  {
-//    if (event.widget == prefixText)
-//    {
-//      String newPrefix = prefixText.getText();
-//      String errorMessage = ValidateHelper.checkXMLPrefix(newPrefix);
-//    
-//      if (errorMessage == null || errorMessage.length() == 0)
-//      {
-//        Import importObj = (Import)input;
-//        org.w3c.dom.Element importElement = WSDLUtil.getInstance().getElementForObject(importObj);
-//        
-//        Definition definition = importObj.getEnclosingDefinition();
-//        org.w3c.dom.Element definitionElement = WSDLUtil.getInstance().getElementForObject(definition);
-//  
-//        String nsFromModel = importObj.getNamespaceURI();
-//        String nsFromDOM = importElement.getAttribute("namespace");
-//        System.out.println(nsFromModel);
-//        System.out.println(nsFromDOM);
-//  
-//        String oldPrefix = definition.getPrefix(nsFromModel);
-//        definitionElement.removeAttribute("xmlns:" + oldPrefix);
-//        definitionElement.setAttribute("xmlns:" + newPrefix, nsFromModel);
-//      }
-//    }
-  }             
-
-  public void propertyChanged(Object object, String property)
-  {
-    if (isListenerEnabled())
-    {
-      setListenerEnabled(false);
-      update();
-      setListenerEnabled(true);
-    }
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-
-  }
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == selectButton)
-    {
-// TODO: port check
-      WSDLEditor editor = (WSDLEditor)editorPart;
-      IFile currentWSDLFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-      
-      SelectSingleFileDialog dialog = new SelectSingleFileDialog(WSDLEditorPlugin.getShell(), null, true);
-      String [] filters = { "xsd", "wsdl" };
-      IFile [] excludedFiles = { currentWSDLFile };
-      
-      dialog.addFilterExtensions(filters, excludedFiles);
-      dialog.create();
-      dialog.getShell().setText(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT")); //$NON-NLS-1$
-      dialog.setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT_FILE")); //$NON-NLS-1$
-      dialog.setMessage(WSDLEditorPlugin.getWSDLString("_UI_DESCRIPTION_SELECT_WSDL_OR_XSD")); //$NON-NLS-1$
-      int rc = dialog.open();
-      if (rc == IDialogConstants.OK_ID)
-      {
-        IFile selectedFile = dialog.getFile();
-                
-        //if (selectedFile.getLocation().toOSString().equals(currentWSDLFile.getLocation().toOSString()))
-        //{
-        //  System.out.println("SAME FILE:" + currentWSDLFile.getLocation());
-        //}
-
-        String location = ComponentReferenceUtil.computeRelativeURI(selectedFile, currentWSDLFile, true);
-
-        Import importObj = (Import)input;
-        org.w3c.dom.Element importElement = WSDLEditorUtil.getInstance().getElementForObject(importObj);
-        Definition definition = importObj.getEnclosingDefinition();
-        org.w3c.dom.Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-        
-        String importTargetNamespace = "";
-        String prefix = prefixText.getText();
-        String uniquePrefix = "";
-      
-		URI uri = URI.createPlatformResourceURI(selectedFile.getFullPath().toString());      
-
-		// note that the getTargetNamespaceURIForSchema works for both schema and wsdl files
-		// I should change the name of this convenience method
-        importTargetNamespace =  XMLQuickScan.getTargetNamespaceURIForSchema(uri.toString());
-
-        if (prefix.trim().equals(""))
-        {
-          uniquePrefix = getUniquePrefix(definition, uri.fileExtension());
-        }
-        else
-        {
-          uniquePrefix = prefix; 
-        }
-       
-        
-        if (importTargetNamespace == null ||
-           (importTargetNamespace != null && importTargetNamespace.trim().length() == 0))
-        {
-          return;  // what to do with no namespace docs?
-        }
-
-        importElement.setAttribute("location", location);
-        importElement.setAttribute("namespace", importTargetNamespace);
-
-        definitionElement.setAttribute("xmlns:" + uniquePrefix, importTargetNamespace);
-
-        namespaceText.setText(importTargetNamespace);
-        locationText.setText(location);
-        prefixText.setText(uniquePrefix);
-      }
-    }
-  }
-
-  private String getUniquePrefix(Definition definition, String initPrefix)
-  {
-    String uniquePrefix;
-    Map map = definition.getNamespaces();
-
-    if (definition.getNamespace(initPrefix) == null)
-    {
-      uniquePrefix = initPrefix;
-    }
-    else // if used, then try to create a unique one
-    {
-      String tempPrefix = initPrefix;
-      int i = 1;
-      while(map.containsKey(tempPrefix + i))
-      {
-        i++;
-      }
-      uniquePrefix = tempPrefix + i;
-    }
-    return uniquePrefix;    
-  } 
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/InputOutputFaultViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/InputOutputFaultViewer.java
deleted file mode 100644
index bcd529b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/InputOutputFaultViewer.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public class InputOutputFaultViewer extends NamedComponentViewer 
-{                     
-  protected CCombo componentNameCombo; 
-  protected ComponentNameComboHelper componentNameComboHelper;
-  InvokeDialogButton button;
-
-  public InputOutputFaultViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  { 
-    String result = "";
-
-    if (input instanceof Input)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_INPUT"); //$NON-NLS-1$
-    }
-    else if (input instanceof Output)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_OUTPUT"); //$NON-NLS-1$
-    }
-    else if (input instanceof Fault)
-    {
-      result = WSDLEditorPlugin.getWSDLString("_UI_LABEL_FAULT"); //$NON-NLS-1$
-    }                 
-
-    return result;
-  }      
-
-  public boolean isObjectExtensible()
-  {
-    return false;
-  }
-
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-    Composite composite = super.populatePrimaryDetailsSection(parent);
-                   
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE")); //$NON-NLS-1$
-
-    componentNameCombo = flatViewUtility.createCComboBox(composite);
-    componentNameCombo.addListener(SWT.Modify, this);      
-
-    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-    {
-      protected List getComponentNameList(ComponentReferenceUtil util)
-      {
-        return util.getMessageNames();
-      }
-
-      protected String getAttributeName()
-      {
-        return WSDLConstants.MESSAGE_ATTRIBUTE;
-      }
-    };
-
-    button = new InvokeDialogButton(composite, getInput());
-    button.setEditor(editorPart);
-
-    return composite;
-  }
-
-
-  protected void update()
-  {
-    super.update();                                                     
-    componentNameComboHelper.update(input);
-    button.setInput(input);
-  }
-
-  protected void handleEventHelper(Element element, Event event)
-  {                        
-    super.handleEventHelper(element, event);
-    componentNameComboHelper.handleEventHelper(element, event);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/MessageViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/MessageViewer.java
deleted file mode 100644
index 3a8e0c8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/MessageViewer.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class MessageViewer extends NamedComponentViewer 
-{                     
-  public MessageViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  { 
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE"); //$NON-NLS-1$
-  }     
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/NamedComponentViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/NamedComponentViewer.java
deleted file mode 100644
index 80a5065..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/NamedComponentViewer.java
+++ /dev/null

@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public abstract class NamedComponentViewer extends BaseViewer implements ModelAdapterListener
-{                                    
-  protected Composite control;
-  protected Text nameField;  
-  protected IEditorPart editorPart;
-
-  public NamedComponentViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(getStatusLineManager(editorPart));    
-    this.editorPart = editorPart;                  
-
-    createControl(parent);
-  } 
-
-  protected abstract String getHeadingText();  
-
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-  	Composite group = flatViewUtility.createComposite(parent, 2, true);
- 	
-  	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    Composite nameFieldComposite = flatViewUtility.createComposite(group, 2, true);
-	((GridLayout)nameFieldComposite.getLayout()).marginWidth = 0;
-    ((GridLayout)nameFieldComposite.getLayout()).marginHeight = 0; 	
-	 
-    GridLayout layout = new GridLayout();
-    layout.makeColumnsEqualWidth  = false;
-    layout.numColumns = 3;
-    layout.marginHeight = 4;
-    layout.marginWidth = 0;
-
-    nameFieldComposite.setLayout(layout);      
-    GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-    gd.horizontalSpan = 1;
-    gd.verticalAlignment = GridData.BEGINNING;
-    nameFieldComposite.setLayoutData(gd);
-
-
-    flatViewUtility.createLabel(nameFieldComposite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME")); //$NON-NLS-1$
-    nameField = flatViewUtility.createTextField(nameFieldComposite);  
-    nameField.addListener(SWT.Modify, this);  
-    
-    // place holder
-    Control c = flatViewUtility.createLabel(nameFieldComposite, 0, "");
-    c.setBackground(new Color(null, 0, 255, 100));
-    gd = new GridData();
-    gd.grabExcessHorizontalSpace = false;
-    gd.heightHint = 0;
-    gd.widthHint = 0;
-    c.setLayoutData(gd);
-    	
-    return nameFieldComposite;
-  } 
-
-  public void createControl(Composite parent)
-  { 
-	SashForm sashForm = new SashForm(parent, SWT.BORDER);
-	sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-	control = sashForm;
-	sashForm.setOrientation(SWT.HORIZONTAL);
-	
-    Composite composite = flatViewUtility.createComposite(sashForm, 1, true);        
-	composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-    GridLayout layout = (GridLayout)composite.getLayout();
-    layout.verticalSpacing = 0;
-    layout.marginHeight = 0;
-    layout.marginWidth = 0;
-                       
-    flatViewUtility.createFlatPageHeader(composite, getHeadingText());
-       
-    populatePrimaryDetailsSection(composite);
-    
-	TabbedViewer tabbedViewer = new TabbedViewer((WSDLEditor)editorPart);
-
-	Control c = tabbedViewer.createControl(sashForm);
-	c.setLayoutData(new GridData(GridData.FILL_BOTH));  	     	
-  }
-              
-  public void doSetInput(Object input)
-  {    
-    setListenerEnabled(false);                          
-    try
-    {          
-//      Node node = WSDLEditorUtil.getInstance().getNodeForObject(input);
-      update();
-    }
-    finally
-    {
-      setListenerEnabled(true);
-    }
-
-    if (oldInput != null)
-    {
-      WSDLModelAdapterFactory.removeModelAdapterListener(oldInput, this);
-    }
-
-    WSDLModelAdapterFactory.addModelAdapterListener(input, this);
-    oldInput = input;
-  }
-
-  protected void update()
-  {
-    Element element = ((WSDLElement)input).getElement();                          
-    flatViewUtility.updateFlatPageHeaderTitle(getHeadingText());
-
-    nameField.setText("");
-    String nameValue = element.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
-    nameField.setText(nameValue != null ? nameValue : "");  
-  }
-
-  public Control getControl()
-  {
-    return control;
-  }
-
-  /*
-   * @see BaseWindow#doHandleEvent(Event)
-   */
-  public void doHandleEvent(Event event)
-  {
-    setListenerEnabled(false);
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(input);
-    handleEventHelper(element, event);   
-    setListenerEnabled(true);
-  }             
-
-  protected void handleEventHelper(Element element, Event event)
-  {                          
-    if (event.type == SWT.Modify)
-    {  
-      if (event.widget == nameField)
-      { 
-        new SmartRenameAction(input, nameField.getText()).run();
-      }
-    }
-  }
-
-  public void propertyChanged(Object object, String property)
-  {
-    if (isListenerEnabled())
-    {
-      setListenerEnabled(false);
-      if (!control.isDisposed())
-      {      
-        update();
-      }  
-      setListenerEnabled(true);
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/OperationViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/OperationViewer.java
deleted file mode 100644
index c0c326e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/OperationViewer.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class OperationViewer extends NamedComponentViewer 
-{                    
-  public OperationViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION");  //$NON-NLS-1$
-  }  
-
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-    Composite composite = super.populatePrimaryDetailsSection(parent);
-                   
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_PARAMETER_ORDER"));  //$NON-NLS-1$
-    Text parameterOrderField = flatViewUtility.createTextField(composite);  
-    parameterOrderField.addListener(SWT.Modify, this);  
-                              
-    //Button button = new Button(composite, SWT.FLAT);
-    //button.setText("...");
-
-    return composite;
-  }  
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PartViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PartViewer.java
deleted file mode 100644
index f509a79..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PartViewer.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.w3c.dom.Element;
-
-public class PartViewer extends NamedComponentViewer
-{   
-  protected CCombo componentNameCombo;
-  protected CCombo referenceKindCombo; 
-  protected Label componentNameLabel;
-  InvokeDialogButton button;
-//  Button importButton;
-  
-
-  public PartViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PART");  //$NON-NLS-1$
-  } 
-
-  public boolean isObjectExtensible()
-  {
-    return false;
-  }
-    
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-    Composite composite = super.populatePrimaryDetailsSection(parent);
-     
-    flatViewUtility.createLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_REFERENCE_KIND")); //$NON-NLS-1$
-    referenceKindCombo = flatViewUtility.createCComboBox(composite);
-    referenceKindCombo.add("element");
-    referenceKindCombo.add("type");
-    referenceKindCombo.setText("type");
-    referenceKindCombo.addListener(SWT.Modify, this);
-
-    flatViewUtility.createLabel(composite, ""); 
-    
-    componentNameLabel = flatViewUtility.createLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT"));   //$NON-NLS-1$
-
-    componentNameCombo = flatViewUtility.createCComboBox(composite);
-    componentNameCombo.addListener(SWT.Modify, this);
-    componentNameCombo.addSelectionListener(this);
-
-    button = new InvokeDialogButton(composite, getInput());
-    
-    return composite;
-  }  
-          
-  protected void update()
-  {                    
-    try
-    {
-      Part part = (Part)input;
-      boolean isType = ComponentReferenceUtil.isType(part);
-      String value = ComponentReferenceUtil.getPartComponentReference(part);
-
-      // update the combo-box content
-      //
-      componentNameCombo.removeAll(); 
-      List compList = ComponentReferenceUtil.getComponentNameList(part, isType);
-      if (compList != null)
-      {
-        for (Iterator iterator =  compList.iterator(); iterator.hasNext();)
-        {
-          componentNameCombo.add((String)iterator.next());
-        }
-      } 
-      
-      if (isType)
-      {                                                 
-        referenceKindCombo.setText("type");
-        componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE"));  //$NON-NLS-1$
-        componentNameCombo.setText(value != null ? value : "");
-        button.setReferenceKind("type");
-      }
-      else
-      {
-        referenceKindCombo.setText("element");
-        componentNameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT"));  //$NON-NLS-1$
-        componentNameCombo.setText(value != null ? value : "");
-        button.setReferenceKind("element");
-      }                                                        
-      button.setInput(input);
-      button.setEditor(editorPart);
-      super.update();  
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }       
-      
-     
-  protected void handleEventHelper(Element element, Event event)
-  {  
-    super.handleEventHelper(element, event);
-    if (event.type == SWT.Modify)
-    {  
-      if (event.widget == referenceKindCombo)
-      {                        
-        // TODO... I have no idea why we need to use a delayed runnable to get 
-        // updating working properly .... this is something we need to revisit
-        DelayedRenameRunnable runnable = new DelayedRenameRunnable((Part)input);
-        Display.getCurrent().asyncExec(runnable);  
-      } 
-    }
-  }      
-
-  protected class DelayedRenameRunnable implements Runnable
-  {                       
-    Part part;
-
-    DelayedRenameRunnable(Part part)
-    {
-      this.part = part;
-    }
-
-    public void run()                  
-    {                                                               
-      boolean isType = referenceKindCombo.getText().equals("type");
-      ComponentReferenceUtil.setComponentReference(part, isType, null);    
-    }
-  }  
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == componentNameCombo)
-    {                                                      
-      Part part = (Part)input;
-      boolean isType = referenceKindCombo.getText().equals("type");
-      ComponentReferenceUtil.setComponentReference(part, isType, componentNameCombo.getText());          
-    }
-  } 
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortTypeViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortTypeViewer.java
deleted file mode 100644
index d85fdfc..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortTypeViewer.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class PortTypeViewer extends NamedComponentViewer 
-{                    
-  public PortTypeViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE"); //$NON-NLS-1$
-  }
-
-  public boolean isObjectExtensible()
-  {
-    return false;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortViewer.java
deleted file mode 100644
index 8e5f3d0..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/PortViewer.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.ComponentNameComboHelper;
-import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.InvokeDialogButton;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-public class PortViewer extends NamedComponentViewer 
-{  
-  protected CCombo componentNameCombo;     
-  protected ComponentNameComboHelper componentNameComboHelper;
-  InvokeDialogButton button;
-
-  public PortViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORT"); //$NON-NLS-1$
-  }
-
-  protected Composite populatePrimaryDetailsSection(Composite parent)
-  {
-    Composite composite = super.populatePrimaryDetailsSection(parent);
-                   
-    flatViewUtility.createLabel(composite, 0, WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING")); //$NON-NLS-1$
-
-    componentNameCombo = flatViewUtility.createCComboBox(composite);
-    componentNameCombo.addListener(SWT.Modify, this);   
-
-    componentNameComboHelper = new ComponentNameComboHelper(componentNameCombo)
-    {
-      protected List getComponentNameList(ComponentReferenceUtil util)
-      {
-        return util.getBindingNames();
-      }
-
-      protected String getAttributeName()
-      {
-        return WSDLConstants.BINDING_ATTRIBUTE;
-      }
-    };
-                              
-    button = new InvokeDialogButton(composite, getInput());
-    button.setEditor(editorPart);
-
-    return composite;
-  }  
-  
-  protected void update()
-  {
-    super.update();                                                     
-    componentNameComboHelper.update(input);
-    button.setInput(input);
-  }
-
-  protected void handleEventHelper(Element element, Event event)
-  {                        
-    super.handleEventHelper(element, event);
-    componentNameComboHelper.handleEventHelper(element, event);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ServiceViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ServiceViewer.java
deleted file mode 100644
index 01b23cc..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/ServiceViewer.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class ServiceViewer extends NamedComponentViewer 
-{                    
-  public ServiceViewer(Composite parent, IEditorPart editorPart)
-  {
-    super(parent, editorPart);    
-  } 
-
-  protected String getHeadingText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_SERVICE"); //$NON-NLS-1$
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/TabbedViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/TabbedViewer.java
deleted file mode 100644
index c44135e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/TabbedViewer.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;                                     
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementAction;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.xsd.XSDComponent;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class TabbedViewer implements ISelectionChangedListener
-{                                  
-  protected WSDLEditor editor;
-  protected CTabFolder tabFolder;
-  protected Text documentationField;
-  protected DocumentationListener documentationListener;
-  protected boolean listenerEnabled;
-
-  public TabbedViewer(WSDLEditor editor)
-  {
-    this.editor = editor;                            
-  }     
-
-  public Control createControl(Composite parent)
-  { 
-    tabFolder = new CTabFolder(parent, 0);
-
-    CTabItem tab = new CTabItem(tabFolder, SWT.NONE);
-    tab.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_DOCUMENTION")); //$NON-NLS-1$
-    documentationField = new Text(tabFolder, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP);
-    tab.setControl(documentationField);
-    tabFolder.setSelection(tab);
-    
-    documentationListener = new DocumentationListener();
-    listenerEnabled = true;
-    documentationField.addModifyListener(documentationListener);
-    
-    editor.getSelectionManager().addSelectionChangedListener(this);
-
-    return tabFolder;
-  }  
-
-  public void setInput(Object object)
-  {
-    listenerEnabled = false;
-    documentationListener.setInput(object);
-    documentationField.setEnabled(true);
-    documentationField.setText("");
-    
-    if (object instanceof XSDComponent || !(object instanceof WSDLElement))
-    {
-      documentationField.setEnabled(false);
-      listenerEnabled = true;
-      return;
-    }
-
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(object);
-    if (element != null)
-    {
-      if (element.getLocalName().equals("documentation"))
-      {
-        documentationField.setEnabled(false);
-        listenerEnabled = true;
-        return;
-      }
-
-      Node docNode = getChildNode(element, element.getPrefix(), "documentation");
-      if (docNode != null)
-      {
-        Node textNode = docNode.getFirstChild();
-        if (textNode != null)
-        {                            
-          String textNodeValue = textNode.getNodeValue();
-          documentationField.setText(textNodeValue != null ? textNodeValue : "");          
-        }
-      }
-    }
-    listenerEnabled = true;
-// There appears to be a defect in the model...it doesn't return
-// the documentationElement even though it exists
-//    if (object instanceof WSDLElement)
-//    {
-//      WSDLElement elem = (WSDLElement)object;
-//      System.out.println("elem = " + elem);
-//
-//      if (elem != null)
-//      {
-//        Element doc = elem.getDocumentationElement();
-//        System.out.println("docNode = " + doc);
-//        if (doc != null)
-//        {
-//          Node textNode = doc.getFirstChild();
-//          if (textNode != null)
-//          {
-//            documentationField.setText(textNode.getNodeValue());
-//          }
-//        }
-//      }
-//    }
-  }
-   
-  public void selectionChanged(SelectionChangedEvent event)  
-  {                                 
-    ISelection selection = event.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      Object o = ((IStructuredSelection)selection).getFirstElement();
-      if (o != null)
-      {
-        setInput(o); 
-      }
-    }
-  }   
-
-  public Node getChildNode(Element parent, String prefix, String childName)
-  {
-    NodeList list = null;
-    if (parent != null)
-    {
-      list = parent.getChildNodes();
-    }
-    String targetName;
-    if (prefix != null && prefix.length() > 0)
-    {
-      targetName = prefix + ":" + childName;
-    }
-    else
-    {
-      targetName = childName;
-    }  
-   
-    if (list != null)
-    {
-      // Performance issue perhaps?
-      for (int i = 0; i < list.getLength(); i++)
-      {
-        if (list.item(i) instanceof Element)
-        {
-          if (list.item(i).getNodeName().equals(targetName))
-          {
-            return list.item(i);
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-
-
-  class DocumentationListener implements ModifyListener
-  {
-    Object object;
-    
-    public void setInput(Object object)
-    {
-      this.object = object;
-    }
-
-    /**
-     * @see org.eclipse.swt.events.ModifyListener#modifyText(ModifyEvent)
-     */
-    public void modifyText(ModifyEvent e)
-    {
-      if (listenerEnabled)
-      {
-        Element element = WSDLEditorUtil.getInstance().getElementForObject(object);
-        if (element != null)
-        {
-          Node docNode = getChildNode(element, element.getPrefix(), "documentation");
-          if (docNode != null)
-          {
-            Node textNode = docNode.getFirstChild();
-            if (textNode != null)
-            {
-              textNode.setNodeValue(documentationField.getText());
-            }
-            else
-            {
-              if (documentationField.getText() != null && documentationField.getText().length() > 0)
-              {
-                Document document = docNode.getOwnerDocument();
-                org.w3c.dom.Text newTextNode = document.createTextNode(documentationField.getText());
-                docNode.appendChild(newTextNode);
-              }
-            }
-          }
-          else
-          {
-            AddElementAction action = new AddElementAction(element, element.getPrefix(), "documentation", element.getFirstChild());
-            action.run();
-            Element newDocumentation = action.getNewElement();
-            
-            Document document = newDocumentation.getOwnerDocument();
-            org.w3c.dom.Text newTextNode = document.createTextNode(documentationField.getText());
-            newDocumentation.appendChild(newTextNode);
-          }
-        }
-      }
-    }
-  }
-}
-                      
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewer.java
deleted file mode 100644
index 35c8d23..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewer.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-                                              
-import java.util.HashMap;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.xsd.XSDSchema;
-
-
-public class WSDLDetailsViewer implements ISelectionChangedListener
-{                                  
-  protected WSDLEditor editor;
-  protected Composite client;  
-  protected PageBook pageBook;
-  protected ExtensibleDetailsViewerProvider detailsViewerProvider;  
-  protected HashMap viewerMap = new HashMap();
-
-  protected final static String EMPTY_VIEWER_KEY = "EMPTY_VIEWER_KEY";
-  protected Viewer emptyViewer;
-
-  public WSDLDetailsViewer(WSDLEditor editor)
-  {
-    this.editor = editor;                            
-    detailsViewerProvider = new ExtensibleDetailsViewerProvider(editor);    
-    editor.getSelectionManager().addSelectionChangedListener(this);
-  }
-  
-  public Control createControl(Composite parent)
-  {
-    client = pageBook = new PageBook(parent, 0);
-	pageBook.setLayoutData(new GridData(GridData.FILL_BOTH));
-    emptyViewer = new EmptyViewer(pageBook, SWT.NONE);
-    viewerMap.put(EMPTY_VIEWER_KEY, emptyViewer);
-    pageBook.showPage(emptyViewer.getControl());
-    return client;
-  }  
-
-  public void setInput(Object object)
-  {                                 
-    try
-    {
-      Object key = detailsViewerProvider.getViewerKey(object);  
-      
-      if (key == null)
-      {
-        key = EMPTY_VIEWER_KEY;
-      }
-      Viewer viewer = (Viewer)viewerMap.get(key);
-      if (viewer == null)
-      {
-        viewer = detailsViewerProvider.createViewer(object, pageBook, editor);
-        if (viewer != null)
-        {
-          viewerMap.put(key, viewer);
-          if (viewer instanceof OperationViewer)
-          {
-
-          }
-        }
-      }
-      
-      if (viewer != null)
-      {
-        if (object instanceof XSDSchemaExtensibilityElement)
-        {
-          XSDSchemaExtensibilityElement schema = (XSDSchemaExtensibilityElement)object;
-          XSDSchema xsdSchema = schema.getSchema();
-          if (xsdSchema != null)
-          {
-            viewer.setInput(xsdSchema.getElement());
-          }
-        }
-        else
-        {
-          viewer.setInput(object);
-        }
-        pageBook.showPage(viewer.getControl());        
-      }
-    }
-    catch (Exception e)
-    {
-    	e.printStackTrace();
-    }
-  }   
-
-  public void selectionChanged(SelectionChangedEvent event)  
-  {                                 
-    ISelection selection = event.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      Object o = ((IStructuredSelection)selection).getFirstElement();
-      if (o instanceof WSDLGroupObject)
-      {
-      	o = ((WSDLGroupObject)o).getDefinition();
-      }
-      setInput(o);       
-    }
-  }   
-}
-                      
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewerProvider.java
deleted file mode 100644
index 216af1e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/WSDLDetailsViewerProvider.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.ui.internal.extension.IDetailsViewerProvider;
-
-public class WSDLDetailsViewerProvider implements IDetailsViewerProvider
-{
-  public Object getViewerKey(Object modelObject)
-  {                              
-    Object result = null;   
-                        
-    // todo.... use a switch
-    if (modelObject instanceof Message)
-    {
-      result = "message";
-    }
-    else if (modelObject instanceof Binding)
-    {
-      result = "binding";
-    }
-    else if (modelObject instanceof BindingOperation)
-    {
-      result = "bindingOperation";
-    }
-    else if (modelObject instanceof Operation)
-    {
-      result = "operation";
-    }
-    else if (modelObject instanceof Definition)
-    {
-      result = "definition";
-    }
-    else if (modelObject instanceof Part)
-    {
-      result = "part";
-    }
-    else if (modelObject instanceof Port)
-    {
-      result = "port";
-    }
-    else if (modelObject instanceof Input || 
-             modelObject instanceof Output ||
-             modelObject instanceof Fault)
-    {
-      result = "inputOutputFault";
-    }    
-    else if (modelObject instanceof BindingInput || 
-             modelObject instanceof BindingOutput || 
-             modelObject instanceof BindingFault) 
-    {
-      result = "bindingInputOutputFault";
-    }
-    else if (modelObject instanceof PortType)
-    {
-      result = "portType";
-    }
-    else if (modelObject instanceof Service)
-    {
-      result = "service";
-    }
-    else if (modelObject instanceof ExtensibilityElement)
-    {
-      result = "extensibilityElement";
-    }
-    else if (modelObject instanceof Import)
-    {
-      result = "import"; 
-    }
-    else
-    {
-      result = "empty";
-    }
-    return result;
-  }                                                                
-
-
-  public Viewer createViewer(Object modelObject, Composite parent, IEditorPart editorPart)
-  {                                       
-    Viewer viewer = null;
-    Object key = getViewerKey(modelObject);
-    if (key != null)     
-    {
-      if (key.equals("message"))
-      {
-        viewer = new MessageViewer(parent, editorPart); 
-      } 
-      else if (key.equals("binding"))
-      {
-        viewer = new BindingViewer(parent, editorPart);
-      }
-      else if (key.equals("definition"))
-      {
-        viewer = new DefinitionViewer(parent, editorPart); 
-      }
-      else if (key.equals("bindingOperation"))
-      {
-        viewer = new BindingOperationViewer(parent, editorPart);
-      }
-      else if (key.equals("operation"))
-      {
-        viewer = new OperationViewer(parent, editorPart);
-      }
-      else if (key.equals("part"))
-      {
-        viewer = new PartViewer(parent, editorPart);
-      }
-      else if (key.equals("port"))
-      {
-        viewer = new PortViewer(parent, editorPart);
-      }
-      else if (key.equals("inputOutputFault"))
-      {
-        viewer = new InputOutputFaultViewer(parent, editorPart); 
-      }    
-      else if (key.equals("bindingInputOutputFault"))
-      {
-        viewer = new BindingInputOutputFaultViewer(parent, editorPart); 
-      }        
-      else if (key.equals("service"))
-      {
-        viewer = new ServiceViewer(parent, editorPart); 
-      }
-      else if (key.equals("extensibilityElement"))
-      {
-        viewer = new ExtensibilityElementViewer(parent, editorPart); 
-      }  
-      else if (key.equals("portType"))
-      {
-        viewer = new PortTypeViewer(parent, editorPart); 
-      }
-      else if (key.equals("import"))
-      {
-        viewer = new ImportViewer(parent, editorPart);
-      }
-      else
-      {
-        viewer = new EmptyViewer(parent, 0); 
-      }
-    }   
-    return viewer;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/AttributesTable.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/AttributesTable.java
deleted file mode 100644
index 26b04cc..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/AttributesTable.java
+++ /dev/null

@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-public class AttributesTable extends TableViewer implements ICellModifier
-{                           
-  protected static final String PROPERTY = WSDLEditorPlugin.getWSDLString("_UI_LABEL_PROPERTY"); //$NON-NLS-1$
-  protected static final String VALUE = WSDLEditorPlugin.getWSDLString("_UI_LABEL_VALUE"); //$NON-NLS-1$
-
-  protected IEditorPart editorPart;
-  protected String[] columnProperties = {PROPERTY, VALUE};
-  protected PropertyTableProvider tableProvider = new PropertyTableProvider(this);
-  protected CellEditor textCellEditor;
-  //protected StringComboBoxCellEditor comboCellEditor;
-  protected IPropertySource propertySource;
-  
-
-  public AttributesTable(IEditorPart editorPart, Composite parent)
-  {
-    super(new Table(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.FLAT));   
-  	this.editorPart = editorPart;               
-    getTable().setLinesVisible(true);
-    getTable().setHeaderVisible(true);  
-    
-    setContentProvider(tableProvider);
-    setLabelProvider(tableProvider);
-    setColumnProperties(columnProperties);
-
-    for (int i = 0; i < columnProperties.length; i++)
-    {
-      TableColumn column = new TableColumn(getTable(), SWT.NONE, i);
-      column.setText(columnProperties[i]);
-      column.setAlignment(SWT.LEFT);
-    }      
-
-    TableLayout layout = new TableLayout(); 
-    ColumnWeightData data = new ColumnWeightData(40, 40, true);
-    layout.addColumnData(data);
-    
-    ColumnWeightData data2 = new ColumnWeightData(80, 80, true);
-    layout.addColumnData(data2);                       
-
-    getTable().setLayout(layout);
-         
-    textCellEditor = new TextCellEditor(getTable());                            
- 	resetCellEditors();	    
-
-    setCellModifier(this);    
-  }  
-      
-  protected void hookControl(Control control) {
-  	// we need to hook up our own mouse listener first
-  	// so that we can update the cellEditors before
-  	// the 'internal' listener tries to get hold of them
-	Table tableControl = (Table)control;
-	  tableControl.addMouseListener(new MouseAdapter() {
-		  public void mouseDown(MouseEvent e) {
-			updateCellEditors();
-		  }
-	  });	  	  	
-	  super.hookControl(control);
-  }                                
-
-  // ICellModifier
-  public boolean canModify(Object element, String property)
-  {
-    return property.equals(VALUE);
-  }  
-
-  public Object getValue(Object element, String property)
-  {
-    int column = 0;
-    if (property.equals(columnProperties[0]))
-    {
-      column = 0;
-    }
-    else if (property.equals(columnProperties[1]))
-    {
-      column = 1;
-    }    
-    return tableProvider.getColumnText(element, column);
-  }
-
-  public void modify(Object element, String property, Object value)
-  {  
-  	TableItem item = (TableItem)element;
-	IPropertyDescriptor propertyDescriptor = (IPropertyDescriptor)item.getData();
-		
-	// if the new value is the same as the old value, the user has only clicked
-	// on the cell in the course of 'browsing' ... so don't edit the value
-	Object oldValue = getValue(propertyDescriptor, property);	
-	if (value != null && !value.equals(oldValue)) 
-	{	
-		// we assume the value is empty that the attribute should be removed
-		// todo... we probably need to look at this in more detail
-		if (value instanceof String && ((String)value).length() == 0)
-		{
-			value = null;
-		}		  	
-		propertySource.setPropertyValue(propertyDescriptor.getId(), value);   
-		refresh(item.getData());
-	}	  		
-  } 
-   
-   
-  protected void updateCellEditors()
-  {                
-	CellEditor[] cellEditors = new CellEditor[2];
-	cellEditors[0] = textCellEditor;
-	cellEditors[1] = textCellEditor;
-
-	IPropertyDescriptor[] propertyDescriptors = propertySource.getPropertyDescriptors();
-	int index = getTable().getSelectionIndex();
-	if (index >= 0 && index < propertyDescriptors.length)
-	{
-	  CellEditor[] oldCellEditors = getCellEditors();
-	  CellEditor oldCellEditor = (oldCellEditors.length > 1) ? oldCellEditors[1] : null;
-	  if (oldCellEditor != null && oldCellEditor != textCellEditor)
-	  {
-	   oldCellEditor.deactivate();
-	   oldCellEditor.dispose();
-	  }
-	  cellEditors[1] = propertyDescriptors[index].createPropertyEditor(getTable());     
-	}  
-	setCellEditors(cellEditors);     
-  }
-                 
-
-  public String[] getStringArray(List list)
-  {
-    String[] result = new String[list.size()];
-    for (int i = 0; i < result.length; i++)
-    {
-      result[i] = (String)list.get(i);
-    }
-    return result;
-  }
-                                   
-  protected void resetCellEditors()
-  {
-	CellEditor[] cellEditors = new CellEditor[2];
-	cellEditors[0] = textCellEditor;
-	cellEditors[1] = textCellEditor;
-	setCellEditors(cellEditors);  
-  }
-
-
-  class PropertyTableProvider extends LabelProvider implements ITableLabelProvider, IStructuredContentProvider
-  {                  
-    protected TableViewer viewer;
-
-    PropertyTableProvider(TableViewer viewer)
-    {
-      this.viewer = viewer;
-    }
-
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)  
-    {
-	  resetCellEditors();		    	
-      if (newInput instanceof IDOMElement)
-      {      
-	      propertySource = new ExtensiblePropertySource(editorPart, (IDOMElement)newInput);
-      } 
-      else if (newInput instanceof Element)
-      {
-      	propertySource = new ReadOnlyPropertySource(editorPart, (Element)newInput);
-      }
-      else
-      {
-      	propertySource = null;
-      }   	
-    }
-
-    public Image getColumnImage(Object element, int columnIndex)
-    {  
-      return null;
-    }      
-
-    public String getColumnText(Object o, int columnIndex)  
-    { 
-	  IPropertyDescriptor propertyDescriptor = (IPropertyDescriptor)o;	
-      return (columnIndex == 0) ? propertyDescriptor.getId().toString() : propertySource.getPropertyValue(propertyDescriptor.getId()).toString();
-    }  
-
-    public Object[] getElements(Object o)
-    {         
-   	  Object[] result = propertySource.getPropertyDescriptors();
-   	  // For some strange reson the ViewerSorter doesn't seem to be working for this table
-   	  // As a workaround we sort them in this method before returning them to the viewer
-   	  if (result.length > 0)
-   	  {
-   	  	Arrays.sort(result, new InternalComparator());
-   	  }
-   	  return result;
-    }
-  }
-  
-  class InternalComparator implements Comparator
-  {
-	public int compare(Object e1, Object e2) 
-	{
-		IPropertyDescriptor p1 = (IPropertyDescriptor)e1;
-		IPropertyDescriptor p2 = (IPropertyDescriptor)e2;
-		return Collator.getInstance().compare(p1.getDisplayName(), p2.getDisplayName());
-	}  	
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentNameComboHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentNameComboHelper.java
deleted file mode 100644
index 224ce56..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentNameComboHelper.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.w3c.dom.Element;
-
-
-// A convenience class
-//
-public abstract class ComponentNameComboHelper
-{                      
-  protected CCombo componentNameCombo;
-
-  public ComponentNameComboHelper(CCombo componentNameCombo)
-  {
-    this.componentNameCombo = componentNameCombo;
-  }       
-
-  public void update(Object input)
-  {                                   
-    Element element = ((WSDLElement)input).getElement();
-    componentNameCombo.removeAll();
-    String value = element.getAttribute(getAttributeName());
-    componentNameCombo.setText(value != null ? value : "");
-
-    if (input instanceof WSDLElement)
-    {
-      Definition definition = ((WSDLElement)input).getEnclosingDefinition();
-      ComponentReferenceUtil componentReferenceUtil = new ComponentReferenceUtil(definition);
-      java.util.List list = getComponentNameList(componentReferenceUtil);
-      for (Iterator iter = list.iterator(); iter.hasNext();)
-      {
-        componentNameCombo.add((String)iter.next());
-      }
-    }
-  }  
-
-  public void handleEventHelper(Element element, Event event)
-  {                        
-    if (event.type == SWT.Modify)
-    {  
-      if (event.widget == componentNameCombo)
-      {
-        element.setAttribute(getAttributeName(), componentNameCombo.getText());
-      }
-    }
-  }
-
-  protected abstract List getComponentNameList(ComponentReferenceUtil util);
-
-  protected abstract String getAttributeName();
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentsSection.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentsSection.java
deleted file mode 100644
index 57225be..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ComponentsSection.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.FlatPageSection;
-import org.eclipse.wst.wsdl.ui.internal.util.flatui.WidgetFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.ui.FlatViewUtility;
-
-public class ComponentsSection extends FlatPageSection
-{
-  protected CCombo namesCombo;
-  protected Button newButton;
-  protected Button importButton;
-  protected String title;
-    
-  public ComponentsSection(Composite parent, FlatViewUtility flatViewUtility, String title)
-  {                            
-    this(parent, title);
-
-    WidgetFactory factory = new WidgetFactory();
-    factory.setClientAreaColor(flatViewUtility.getBackgroundColor());
-
-    Control section = createControl(this, factory);
-    setContent(section);
-
-    GridData gridData = new GridData();
-    gridData.horizontalAlignment = GridData.FILL;
-    gridData.verticalAlignment = GridData.FILL;
-    gridData.grabExcessHorizontalSpace = true;
-    setLayoutData(gridData);        
-  }
-
-
-  public ComponentsSection(Composite parent, String title)
-  {
-    super(parent);
-    setCollapsable(true);
-    setHeaderText(title);
-    setAddSeparator(true);                                                   
-  }         
-
-  public CCombo getNamesCombo()
-  {
-    return namesCombo;
-  }
-  
-  public Button getNewMessageButton()
-  {
-     return newButton;
-  }
-
-  public Button getImportMessageButton()
-  {
-     return importButton;
-  }
-
-  /*
-   * @see FlatPageSection#createClient(Composite, WidgetFactory)
-   */
-  public Composite createClient(Composite parent, WidgetFactory factory)
-  {
-    FlatViewUtility flatViewUtility = new FlatViewUtility(true);
-
-    Composite client = flatViewUtility.createComposite(parent, 1);
-
-    namesCombo = flatViewUtility.createCComboBox(client);
-                  
-    Composite buttonComposite = flatViewUtility.createComposite(client, 3, true);
-    GridLayout gridLayout = (GridLayout)buttonComposite.getLayout();
-    gridLayout.marginWidth = 3;
-    gridLayout.marginHeight = 3;
-    gridLayout.makeColumnsEqualWidth = true;
-    
-    Label filler = flatViewUtility.createHorizontalFiller(buttonComposite, 1);
-    GridData gd = (GridData)filler.getLayoutData();
-    gd.grabExcessHorizontalSpace = true;
-    newButton = flatViewUtility.createPushButton(buttonComposite, WSDLEditorPlugin.getWSDLString("_UI_BUTTON_NEW")); //$NON-NLS-1$
-    importButton = flatViewUtility.createPushButton(buttonComposite, WSDLEditorPlugin.getWSDLString("_UI_BUTTON_IMPORT")); //$NON-NLS-1$
-
-    return client;
-  }  
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ExtensiblePropertySource.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ExtensiblePropertySource.java
deleted file mode 100644
index b6e6f30..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ExtensiblePropertySource.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.properties.section.IPropertyDescriptorProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.ui.internal.properties.XMLPropertySource;
-import org.w3c.dom.Element;
-
-public class ExtensiblePropertySource extends XMLPropertySource
-{
-	protected IEditorPart editorPart;
-	private INodeNotifier nodeNotifier;
-			
-	public ExtensiblePropertySource(IEditorPart editorPart, INodeNotifier target) 
-	{
-		super(target);
-		this.editorPart = editorPart;
-		this.nodeNotifier = target;
-  	}
-  	
-  	
-  	    
-	protected IPropertyDescriptor createPropertyDescriptor(CMAttributeDeclaration attrDecl) 
-	{
-		IPropertyDescriptor result = null;		
-		CMDocument cmDocument = (CMDocument)attrDecl.getProperty("CMDocument");
-		if (cmDocument != null)
-		{
-			String namespaceURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI");   
-			if (namespaceURI != null)
-			{
-				IPropertyDescriptorProvider provider = (IPropertyDescriptorProvider)WSDLEditorPlugin.getInstance().getPropertyDescriptorProviderRegistry().getProperty(namespaceURI, "");
-				if (provider != null)
-				{
-				  result = provider.getPropertyDescriptor(editorPart, (Element) nodeNotifier, namespaceURI, attrDecl.getNodeName());
-				}
-			}
-		}
-		if (result == null)
-		{
-		  result = super.createPropertyDescriptor(attrDecl);
-		}
-		return result;			
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/InvokeDialogButton.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/InvokeDialogButton.java
deleted file mode 100644
index 5b1906b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/InvokeDialogButton.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-
-// instead of using a Button directly (which causes sizing/layout problems)
-// we use this class
-public class InvokeDialogButton extends Composite implements SelectionListener
-{ 
-  protected Button button;
-  protected Object input;
-  protected Composite parent;
-  protected IEditorPart editorPart;
-  protected String kind;
-                                             
-  public InvokeDialogButton(Composite parent, Object input)
-  {
-    super(parent, SWT.NONE);
-    this.parent = parent;
-    this.input = input;
-    GridData gd = new GridData();
-    gd.grabExcessHorizontalSpace = false;
-    gd.grabExcessVerticalSpace = false;
-    setLayoutData(gd);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    layout.marginHeight = 0;
-    setLayout(layout);
-
-    button = new Button(this, SWT.NONE);
-    gd = new GridData();
-    gd.grabExcessHorizontalSpace = false;
-    gd.heightHint = 17;
-    gd.widthHint = 24;
-    button.setLayoutData(gd);
-    button.setText("...");
-    button.addSelectionListener(this);
-  }                         
-
-  public Button getButton() 
-  {
-    return button;
-  }
-  
-  public void setInput(Object input)
-  {
-    this.input = input;
-  }
-
-  public void setEditor(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart; 
-  }
-  
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-  
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == button)
-    {
-      InvokeSetDialog dialog = new InvokeSetDialog();
-      if (input instanceof Part)
-      {
-        dialog.setReferenceKind(kind);
-      }
-      dialog.run(input, editorPart);
-    }
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-    
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ReadOnlyPropertySource.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ReadOnlyPropertySource.java
deleted file mode 100644
index 7f48c94..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/viewers/widgets/ReadOnlyPropertySource.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.viewers.widgets;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class ReadOnlyPropertySource implements IPropertySource
-{
-    protected Element element;
-
-    public ReadOnlyPropertySource(IEditorPart editPart, Element element)
-    {
-        this.element = element;
-    }
-
-    public Object getEditableValue()
-    {
-        return null;
-    }
-
-    public IPropertyDescriptor[] getPropertyDescriptors()
-    {
-        List list = new ArrayList();
-        NamedNodeMap map = element.getAttributes();
-        int mapLength = map.getLength();
-        for (int i = 0; i < mapLength; i++)
-        {
-            Attr attr = (Attr) map.item(i);
-            list.add(new PropertyDescriptor(attr.getName(), attr.getName()));
-        }
-        IPropertyDescriptor[] result = new IPropertyDescriptor[list.size()];
-        list.toArray(result);
-        return result;
-    }
-
-    public Object getPropertyValue(Object id)
-    {
-        Object result = null;
-        if (id instanceof String)
-        {
-            result = element.getAttribute((String) id);
-        }
-        return result != null ? result : "";
-    }
-
-    public boolean isPropertySet(Object id)
-    {
-        return false;
-    }
-
-    public void resetPropertyValue(Object id)
-    {
-    }
-
-    public void setPropertyValue(Object id, Object value)
-    {
-    }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java
deleted file mode 100644
index f92d942..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-public abstract class BaseRenamer extends WSDLVisitor
-{
-  protected String newName;
-  protected WSDLElement globalComponent;
-  
-  public BaseRenamer(WSDLElement globalComponent, String newName)
-  {
-    super(globalComponent.getEnclosingDefinition());
-    this.globalComponent = globalComponent;
-    this.newName = newName;
-  }
-  
-  public String getNewQName()
-  {
-    String qName = null;
-    if (newName != null)
-    {
-      Definition definition = globalComponent.getEnclosingDefinition();
-      qName = definition.getPrefix(definition.getTargetNamespace());
-      qName += ":" + newName;
-    }
-    else
-    {
-      qName = newName;
-    }
-    
-    return qName;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java
deleted file mode 100644
index b85cf04..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class BindingRenamer extends BaseRenamer
-{
-  /**
-   * Constructor for BindingRenamer.
-   * @param globalComponent
-   * @param newName
-   */
-  public BindingRenamer(WSDLElement globalComponent, String newName)
-  {
-    super(globalComponent, newName);
-  }
-  
-  public void visitPort(Port port)
-  {
-    super.visitPort(port);
-    Binding binding = port.getEBinding();
-    if (globalComponent.equals(binding))
-    {
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(port);
-      element.setAttribute("binding", getNewQName());
-    }
-  }
-  
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java
deleted file mode 100644
index 75cf21e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class MessageRenamer extends BaseRenamer
-{
-  /**
-   * Constructor for MessageRenamer.
-   * @param globalComponent
-   * @param newName
-   */
-  public MessageRenamer(WSDLElement globalComponent, String newName)
-  {
-    super(globalComponent, newName);
-  }
-
-  public void visitInput(Input input)
-  {
-    super.visitInput(input);
-    Message message = input.getEMessage();
-    if (globalComponent.equals(message))
-    {
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(input);
-      element.setAttribute("message", getNewQName());
-    }
-  }
-
-  public void visitOutput(Output output)
-  {
-    super.visitOutput(output);
-    if (globalComponent.equals(output))
-    {
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(output);
-      element.setAttribute("message", getNewQName());
-    }
-  }
-
-  public void visitFault(Fault fault)
-  {
-    super.visitFault(fault);
-    if (globalComponent.equals(fault))
-    {
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(fault);
-      element.setAttribute("message", getNewQName());
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java
deleted file mode 100644
index da4d029..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class PortTypeRenamer extends BaseRenamer
-{
-  /**
-   * Constructor for PortTypeRenamer.
-   * @param globalComponent
-   * @param newName
-   */
-  public PortTypeRenamer(WSDLElement globalComponent, String newName)
-  {
-    super(globalComponent, newName);
-  }
-
-  public void visitBinding(Binding binding)
-  {
-    super.visitBinding(binding);
-    PortType portType = binding.getEPortType();
-
-    if (globalComponent.equals(portType))
-    {
-      Element element = WSDLEditorUtil.getInstance().getElementForObject(binding);
-      element.setAttribute("type", getNewQName());
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java
deleted file mode 100644
index 8100d4e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java
+++ /dev/null

@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.visitor;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-
-public class WSDLVisitor
-{
-  protected Definition definition;
-
-
-  public WSDLVisitor(Definition definition)
-  {
-    this.definition = definition;
-  }
-  
-  
-  public void visitDefinition()
-  {
-    visitBindings();
-    visitMessages();
-    visitPortTypes();
-    visitServices();
-  }
-
-  public void visitBindings()
-  {
-    for (Iterator iterator = definition.getEBindings().iterator(); iterator.hasNext(); )
-    {
-      Binding binding = (Binding)iterator.next();
-      visitBinding(binding);
-    }
-  }
-
-  public void visitMessages()
-  {
-    for (Iterator iterator = definition.getEMessages().iterator(); iterator.hasNext(); )
-    {
-      Message message = (Message)iterator.next();
-      visitMessage(message); 
-    }
-  }
-  
-  public void visitPortTypes()
-  {
-    for (Iterator iterator = definition.getEPortTypes().iterator(); iterator.hasNext(); )
-    {
-      PortType portType = (PortType)iterator.next();
-      visitPortType(portType);
-    }
-  }
-  
-  public void visitServices()
-  {
-    for (Iterator iterator = definition.getEServices().iterator(); iterator.hasNext(); )
-    {
-      Service service = (Service)iterator.next();
-      visitService(service);
-    }
-  }
-
-  public void visitBinding(Binding binding)
-  {
-    PortType portType = binding.getEPortType();
-    if (portType != null)
-    {
-      visitPortType(portType);
-    }
-
-    for (Iterator iterator = binding.getEBindingOperations().iterator(); iterator.hasNext(); )
-    {
-      BindingOperation bindingOperation = (BindingOperation)iterator.next();
-      visitBindingOperation(bindingOperation); 
-    }
-  }
-
-  public void visitPortType(PortType portType)
-  {
-    for (Iterator iterator = portType.getEOperations().iterator(); iterator.hasNext(); )
-    {
-      Operation operation = (Operation)iterator.next();
-      visitOperation(operation); 
-    }
-  }
-
-  public void visitBindingOperation(BindingOperation bindingOperation)
-  {
-//    BindingInput bindingInput = bindingOperation.getEBindingInput();
-//    BindingOutput bindingOutput = bindingOperation.getEBindingOutput();         
-  }
-
-  public void visitOperation(Operation operation)
-  {
-    Input input = operation.getEInput();
-    Output output = operation.getEOutput();
-    
-    if (input != null)
-    {
-      visitInput(input);
-    }
-    if (output != null)
-    {
-      visitOutput(output);
-    }
-    
-    for (Iterator iterator = operation.getEFaults().iterator(); iterator.hasNext(); )
-    {
-      Fault fault = (Fault)iterator.next();
-      if (fault != null)
-      {
-        visitFault(fault);
-      }
-    }
-
-  }
-
-  public void visitPart(Part part)
-  {
-//    XSDTypeDefinition type = part.getTypeDefinition();
-  }
-
-  public void visitMessage(Message message)
-  {
-    for (Iterator iterator = message.getEParts().iterator(); iterator.hasNext(); )
-    {
-      Part part = (Part)iterator.next();
-      visitPart(part);
-    }
-  }  
-
-  public void visitInput(Input input)
-  {
-    Message message = input.getEMessage();
-    if (message != null)
-    {
-      visitMessage(message);
-    }
-  }
-
-  public void visitOutput(Output output)
-  {
-    Message message = output.getEMessage();
-    if (message != null)
-    {
-      visitMessage(message);
-    }
-  }
-
-  public void visitFault(Fault fault)
-  {
-    Message message = fault.getEMessage();
-    if (message != null)
-    {
-      visitMessage(message);
-    }
-  }
-
-  public void visitPort(Port port)
-  {
-    Binding binding = port.getEBinding();
-    if (binding != null)
-    {
-      visitBinding(binding);
-    }
-  }
-
-  public void visitService(Service service)
-  {
-    for (Iterator iterator = service.getEPorts().iterator(); iterator.hasNext(); )
-    {
-      Port port = (Port)iterator.next();
-      visitPort(port);
-    }
-    
-  }  
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentDialog.java
deleted file mode 100644
index d9595b1..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentDialog.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.widgets;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class NewComponentDialog extends Dialog implements ModifyListener
-{
-  protected Text nameField; 
-  protected Button okButton;
-  protected String name;                             
-  protected String title;
-  protected Label errorMessageLabel;
-  protected List usedNames;
-
-  public NewComponentDialog(Shell parentShell, String title, String defaultName) 
-  {
-    super(parentShell);
-    setShellStyle(getShellStyle() | SWT.RESIZE);
-    name = defaultName;      
-    this.title = title;
-  }
-  
-  public NewComponentDialog(Shell parentShell, String title, String defaultName, List usedNames) 
-  {
-    super(parentShell);
-    setShellStyle(getShellStyle() | SWT.RESIZE);
-    name = defaultName;      
-    this.title = title;
-    this.usedNames = usedNames;
-  }
-
-  public int createAndOpen()
-  {
-    create();
-    getShell().setText(title);
-    setBlockOnOpen(true);
-    return open();
-  }
-
-  protected Control createContents(Composite parent)  
-  {
-    Control control = super.createContents(parent);
-    nameField.forceFocus();
-    nameField.selectAll();  
-    updateErrorMessage();
-    return control;
-  }
-
-
-  protected void createButtonsForButtonBar(Composite parent) 
-  {
-    okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-    createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-  }
-
-  protected void createExtendedContent(Composite parent)
-  {
-  }  
-
-
-  protected Control createDialogArea(Composite parent) 
-  {
-    Composite dialogArea = (Composite)super.createDialogArea(parent);
-
-    Composite composite = new Composite(dialogArea, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    layout.marginWidth = 0;
-    composite.setLayout(layout);
-
-    GridData gdFill= new GridData();
-    gdFill.horizontalAlignment= GridData.FILL;
-    gdFill.grabExcessHorizontalSpace= true;
-    gdFill.verticalAlignment= GridData.FILL;
-    gdFill.grabExcessVerticalSpace= true;
-    composite.setLayoutData(gdFill);
-
-    Label nameLabel = new Label(composite, SWT.NONE);
-    nameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME")); //$NON-NLS-1$
-
-    nameField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    gd.widthHint = 200;
-    nameField.setLayoutData(gd);
-    nameField.setText(name);
-    nameField.addModifyListener(this);
-
-    createExtendedContent(dialogArea);
-
-    // error message
-    errorMessageLabel = new Label(dialogArea, SWT.NONE);
-    errorMessageLabel.setText("error message goes here");         
-    GridData gd2 = new GridData();
-    gd2.horizontalAlignment= GridData.FILL;
-    gd2.grabExcessHorizontalSpace= true;
-    gd2.widthHint = 200;
-    errorMessageLabel.setLayoutData(gd2);          
-//    Color color = new Color(errorMessageLabel.getDisplay(), 200, 0, 0);
-//    errorMessageLabel.setForeground(color);
-
-    return dialogArea;
-  }
-  
-  public void modifyText(ModifyEvent e) 
-  {                        
-    updateErrorMessage();
-  }        
-
-  protected String computeErrorMessage(String name)
-  {
-  	if (usedNames == null)
-  		return null;
-  	
-  	Iterator iterator = usedNames.iterator();
-  	while (iterator.hasNext()) {
-  		if (name.equalsIgnoreCase((String) iterator.next())) {
-  			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_WARNING_DUPLICATE_NAME_EXISTS");
-  		}
-  	}
-  	
-  	return null;
-  }
-
-  protected void updateErrorMessage()
-  {                 
-    String errorMessage = null;
-    String name = nameField.getText().trim();
-    if (name.length() > 0)
-    {                                
-      errorMessage = computeErrorMessage(name);
-    }   
-    else
-    {
-      errorMessage = "";
-    }  
-    errorMessageLabel.setText(errorMessage != null ? errorMessage : "");
-//    okButton.setEnabled(errorMessage == null);
-  }
- 
-  protected void buttonPressed(int buttonId) 
-  {
-    if (buttonId == IDialogConstants.OK_ID)
-    {
-      name = nameField.getText();
-    }
-    super.buttonPressed(buttonId);
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-}
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentWithChildDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentWithChildDialog.java
deleted file mode 100644
index 4c50919..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/NewComponentWithChildDialog.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.widgets;
-
-import java.util.List;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-/*
- * This class extends NewComponentDialog to allow additional widgets.  More
- * specifically, the 'create sub-components' checkbox
- */
-public class NewComponentWithChildDialog extends NewComponentDialog {
-	protected Button createMessageCheckBox;
-	private boolean createMessageBoolean;
-
-	public NewComponentWithChildDialog(Shell parentShell, String title, String defaultName) {
-		super(parentShell, title, defaultName);
-	}
-	
-	public NewComponentWithChildDialog(Shell parentShell, String title, String defaultName, List usedNames) {
-		super(parentShell, title, defaultName, usedNames);
-	}
-	
-	protected void createExtendedContent(Composite parent) {
-		Composite child = new Composite (parent, SWT.NONE);
-	    GridLayout layout = new GridLayout();
-	    layout.numColumns = 1;
-	    layout.marginWidth = 0;
-	    layout.marginHeight = 0;
-	    child.setLayout(layout);
-		
-	    createMessageCheckBox = new Button(child, SWT.CHECK);
-	    createMessageCheckBox.setSelection(true);
-	    createMessageCheckBox.setText(WSDLEditorPlugin.getWSDLString("_UI_CREATE_MESSAGE_CHECKBOX_LABEL"));
-	}
-
-	public boolean createSubComponents() {
-		return createMessageBoolean;
-	}
-	
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			createMessageBoolean = createMessageCheckBox.getSelection();
-		}
-		super.buttonPressed(buttonId);
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java
deleted file mode 100644
index 53c9905..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/widgets/ProtocolComponentControl.java
+++ /dev/null

@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.extension.ContentGeneratorExtensionFactoryRegistry;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage;
-
-public abstract class ProtocolComponentControl extends Composite implements SelectionListener, ModifyListener
-{
-  protected BaseGenerator generator;
-
-  protected Text componentNameField;
-  protected Combo refNameCombo;
-  protected Button refBrowseButton;
-  protected Combo protocolCombo;
-  protected Button overwriteButton;
-  protected PageBook pageBook;
-  protected Composite emptySettingsPage;
-  protected Map pageMap = new HashMap();
-
-  // List of ContentGenerators for each Protocol found in protocolCombo
-  protected List contentGenerators;
-  
-  //protected boolean isBindingComponent = true;
-  //protected boolean isNewComponent = true;
-  protected String name;
-  protected String refName;
-
-  protected String UNSPECIFIED = WSDLEditorPlugin.getWSDLString("_UI_UNSPECIFIED");
-  //protected BindingGenerator bindingGenerator;
-
-  public ProtocolComponentControl(Composite parent, BaseGenerator generator, boolean showOverwriteButton)
-  {
-    super(parent, SWT.NONE);
-    this.generator = generator;
-	contentGenerators = new ArrayList();
-
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    setLayout(layout);
-    setLayoutData(createGridData(true, 1));
-
-    Composite labelValueComposite = new Composite(this, SWT.NONE);
-    labelValueComposite.setLayout(new GridLayout(2, false));
-    labelValueComposite.setLayoutData(createGridData(false, 1));
-
-    // row 1
-    //
-    Label componentNameLabel = new Label(labelValueComposite, SWT.NONE);
-    componentNameLabel.setText(getComponentNameLabelText()); //$NON-NLS-1$
-
-    componentNameField = new Text(labelValueComposite, SWT.BORDER);
-    GridData gdName= new GridData();
-    gdName.horizontalAlignment= GridData.FILL;
-    gdName.grabExcessHorizontalSpace= true;
-    componentNameField.setLayoutData(gdName);
-    componentNameField.addModifyListener(this);
-    //createPlaceHolder(labelValueComposite);
-
-    // row 2
-    //
-    Label refNameLabel = new Label(labelValueComposite, SWT.NONE);
-    refNameLabel.setText(getRefNameLabelText()); //$NON-NLS-1$	
-    refNameCombo = new Combo(labelValueComposite, SWT.READ_ONLY);
-    GridData gdRefName= new GridData();
-    gdRefName.horizontalAlignment= GridData.FILL;
-    gdRefName.grabExcessHorizontalSpace= true;
-    refNameCombo.setLayoutData(gdRefName);
-    refNameCombo.addSelectionListener(this);
-
-    //refBrowseButton = new Button(labelValueComposite, SWT.NONE);
-    //refBrowseButton.setText("  ...  ");
-    //GridData gd = new GridData();
-    //gd.grabExcessHorizontalSpace = false;
-    //gd.heightHint = 17;
-    //gd.widthHint = 24;
-    //refBrowseButton.setLayoutData(gd);
-    //refBrowseButton.addSelectionListener(this);
-    //createPlaceHolder(labelValueComposite);
-
-    // row 3
-    //
-    Label protocolLabel = new Label(labelValueComposite, SWT.NONE);
-    protocolLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_PROTOCOL")); //$NON-NLS-1$
-    protocolCombo = new Combo(labelValueComposite, SWT.READ_ONLY);
-    GridData gdProtocol= new GridData();
-    gdProtocol.horizontalAlignment= GridData.FILL;
-    gdProtocol.grabExcessHorizontalSpace= true;
-    protocolCombo.setLayoutData(gdProtocol);
-    protocolCombo.addSelectionListener(this);
-    //createPlaceHolder(labelValueComposite);
-
-    // optional overwrite button
-    //
-    if (showOverwriteButton)
-    {
-      overwriteButton = new Button(this, SWT.CHECK);
-      overwriteButton.setText(WSDLEditorPlugin.getWSDLString("_UI_CHECKBOX_OVERWRITE")); //$NON-NLS-1$
-      overwriteButton.addSelectionListener(this);
-    }
-
-    // protocol specific settings
-    //
-    pageBook = new PageBook(this, SWT.NONE);
-    GridData gdFill= new GridData();
-    gdFill.horizontalAlignment= GridData.FILL;
-    gdFill.grabExcessHorizontalSpace= true;
-    gdFill.verticalAlignment= GridData.FILL;
-    gdFill.grabExcessVerticalSpace= true;
-    pageBook.setLayoutData(gdFill);
-
-    emptySettingsPage = new Composite(pageBook, SWT.NONE);
-    for (int i = 0; i < 6; i++)
-    {
-      new Label(emptySettingsPage, SWT.NONE);
-    }
-  }
-
-  public void initFields()
-  {
-    // prime the fields
-    //
-    componentNameField.setText(getDefaultName());
-    updateRefNameCombo();
-    updateProtocolCombo();
-    updatePageBook(generator.getProtocol());
-  }
-
-  public Text getComponentNameField()
-  {
-    return componentNameField;
-  }
-
-  public String getComponentNameLabelText()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAME");
-  }
-
-  private GridData createGridData(boolean both, int span)
-  {
-    GridData gd = new GridData(both ? GridData.FILL_BOTH : GridData.FILL_HORIZONTAL);
-    gd.horizontalSpan = span;
-    return gd;
-  }
-
-//  private Control createPlaceHolder(Composite parent)
-//  {
-//    Label label = new Label(parent, SWT.NONE);
-//    return label;
-//  }
-  public BaseGenerator getGenerator()
-  {
-    return generator;
-  }
-
-  // implements SelectionListener
-  //
-  public void widgetDefaultSelected(SelectionEvent event)
-  {
-  }
-
-  public void widgetSelected(SelectionEvent event)
-  {
-    if (event.widget == overwriteButton && overwriteButton != null)
-    {
-      getGenerator().setOverwrite(overwriteButton.getSelection());
-    }
-    else if (event.widget == refNameCombo)
-    {
-      int index = refNameCombo.getSelectionIndex();
-      String refName = refNameCombo.getItem(index);
-	  if (refName.equals(UNSPECIFIED)) {
-	      getGenerator().setRefName("");
-	  }
-	  else {
-	      getGenerator().setRefName(refName);
-	  }
-    }
-    else if (event.widget == protocolCombo)
-    {
-      int index = protocolCombo.getSelectionIndex();
-      String protocol = (index != -1) ? protocolCombo.getItem(index) : null;
-	  getGenerator().setContentGenerator((ContentGenerator) contentGenerators.get(index));
-      updatePageBook(protocol);
-    }
-  }
-
-  private static final String IS_OVERWRITE_APPLICABLE = "IS_OVERWRITE_APPLICABLE";
-  protected void updatePageBook(String protocol)
-  {
-    if (protocol != null)
-    {
-	  ContentGeneratorOptionsPage page = (ContentGeneratorOptionsPage) pageMap.get(protocol);
-      if (page == null)
-      {
-        page = createContentGeneratorOptionsPage(protocol);
-
-        if (page != null)
-        {
-          page.init(getGenerator());
-          Control control = page.createControl(pageBook);
-          control.setData(IS_OVERWRITE_APPLICABLE, new Boolean(page.isOverwriteApplicable()));
-          pageMap.put(protocol, page);
-        }
-
-//        if (page != null)
-//        {
-//          pageMap.put(protocol, page);
-//        }
-      }
-
-      boolean enableOverwriteButton = true;
-      if (page != null)
-      {
-        if (overwriteButton != null)
-        {
-          Boolean data = (Boolean) page.getControl().getData(IS_OVERWRITE_APPLICABLE);
-          enableOverwriteButton = data == null || data.equals(Boolean.TRUE);
-        }
-        pageBook.showPage(page.getControl());
-        pageBook.layout();
-        pageBook.getParent().layout();
-		
-		page.setOptionsOnGenerator();
-      }
-      else
-      {
-        pageBook.showPage(emptySettingsPage);
-      }
-
-      if (overwriteButton != null)
-      {
-        if (enableOverwriteButton)
-        {
-          overwriteButton.setEnabled(true);
-          overwriteButton.setSelection(generator.getOverwrite());
-        }
-        else
-        {
-          overwriteButton.setEnabled(false);
-          overwriteButton.setSelection(true);
-        }
-      }
-    }
-  }
-
-  protected void updateProtocolCombo()
-  {
-    protocolCombo.removeAll();
-
-    List list = new ArrayList();
-    list.add(UNSPECIFIED);
-//    list.addAll(WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getBindingExtensionNames());
-	list.addAll(ContentGeneratorExtensionFactoryRegistry.getInstance().getBindingExtensionNames());
-	
-    String protocolText = generator.getProtocol();
-
-    for (Iterator i = list.iterator(); i.hasNext();)
-    {
-      String protocol = (String) i.next();
-      protocolCombo.add(protocol);
-	  
-	  if (protocol.equals(UNSPECIFIED)) {
-		  contentGenerators.add(null);
-	  }
-	  else {
-		  ContentGenerator gen = ContentGeneratorExtensionFactoryRegistry.getInstance().getGeneratorClassFromName(protocol);
-		  contentGenerators.add(gen);  
-	  }
-    }
-
-    if (protocolText == null && protocolCombo.getItemCount() > 0)
-    {
-      protocolText = protocolCombo.getItem(0);
-//      generator.setProtocol(!UNSPECIFIED.equals(protocolText) ? protocolText : null);
-    }
-    protocolCombo.setText(protocolText);
-
-	ContentGenerator gen = ContentGeneratorExtensionFactoryRegistry.getInstance().getGeneratorClassFromName(protocolText);
-	generator.setContentGenerator(gen);
-  }
-
-  protected void updateRefNameCombo()
-  {
-    refNameCombo.removeAll();
-
-    refNameCombo.add(UNSPECIFIED);
-    for (Iterator i = getRefNames().iterator(); i.hasNext();)
-    {
-      refNameCombo.add((String) i.next());
-    }
-
-    if (refNameCombo.getItemCount() > 0)
-    {
-      String refText = generator.getRefName();
-      refNameCombo.setText(refText != null ? refText : UNSPECIFIED);
-    }
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-    generator.setName(componentNameField.getText());
-  }
-
-  public abstract List getRefNames();
-  public abstract String getRefNameLabelText();
-  public abstract String getDefaultName();
-  public abstract ContentGeneratorOptionsPage createContentGeneratorOptionsPage(String protocol);
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java
deleted file mode 100644
index 087a051..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java
+++ /dev/null

@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.HttpBindingOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.SoapBindingOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.ProtocolComponentControl;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class BindingWizard extends Wizard
-{
-  protected BindingGenerator bindingGenerator;
-  protected BindingWizardOptionsPage specifyBindingPage;
-
-  protected Document document;
-  protected int kind;
-
-  public static final int KIND_NEW_BINDING = 1;
-  public static final int KIND_REGENERATE_BINDING = 2;
-
-  protected Definition definition;
-  
-  /*
-   * Constructor used when are creating a brand new Binding
-   */
-  public BindingWizard(Definition definition)
-  {
-    this(definition, null, KIND_NEW_BINDING);
-  }
-
-  /*
-   * Constructor used when are creating a brand new Binding
-   */
-  public BindingWizard(Definition definition, Document document)
-  {
-    this(definition, null, KIND_NEW_BINDING);
-    this.document = document;
-  }
-  
-  /*
-   * Constructor used when there is an existing Binding we wish to modify/regenerate
-   */
-  public BindingWizard(Definition definition, Binding binding, int kind)
-  {
-    super();
-	this.definition = definition;
-    this.kind = kind;	
-	bindingGenerator = new BindingGenerator(definition, binding);
-
-    setWindowTitle(WSDLEditorPlugin.getWSDLString("_UI_BINDING_WIZARD")); //$NON-NLS-1$
-    //setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/NewXML.gif"));
-  }
-
-  public void setBindingName(String bindingName)
-  {
-//    QName qname = new QName(definition.getTargetNamespace(), bindingName);
-    bindingGenerator.setName(bindingName);
-/*
- 	// Binding binding = (Binding) definition.getBinding(qname);
-	if (binding != null)
-    {
-	  List eeList = binding.getEExtensibilityElements();
-      if (eeList.size() > 0)
-      {
-        ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);
-        Element element = WSDLEditorUtil.getInstance().getElementForObject(ee);
-        String namespace = element.getNamespaceURI();
-        if (namespace != null)
-        {
-          ContentGeneratorExtension extension = WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getExtensionForNamespace(namespace);
-
-          if (extension != null)
-          {
-            bindingGenerator.setProtocol(extension.getName());
-          }
-        }
-      }
-    }
-    */
-  }
-
-  public void setPortTypeName(String portTypeName)
-  {
-    bindingGenerator.setRefName(portTypeName);
-  }
-
-  public BindingGenerator getBindingGenerator()
-  {
-    return bindingGenerator;
-  }
-
-  /**
-   * Return true if wizard setup is successful, false otherwise
-   */
-  public boolean setup()
-  {
-    return true;
-  }
-
-  public void addPages()
-  {
-    specifyBindingPage = new BindingWizardOptionsPage();
-    addPage(specifyBindingPage);
-  }
-
-  public boolean performFinish()
-  {
-  	boolean recordingStarted = false;
-  	if (definition.getElement() == null || (document != null && document.getChildNodes().getLength() == 0)) {
-  		recordingStarted = true;
-  		beginRecording();
-  		
-  		// Create the Definitions element with proper namespace
-  	    Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-  		String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-  	    if (charSet == null || charSet.trim().equals(""))
-  	    {
-  	    	charSet = "UTF-8";
-  	    }
-  	    document.appendChild(document.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"" + charSet + "\""));
-  		Element root = document.createElement("wsdl:definitions");  		
-  		document.appendChild(root);
-
-  		// Add various namespace attributes here. 
-  		root.setAttribute("xmlns:soap", "http://schemas.xmlsoap.org/wsdl/soap/");
-  		root.setAttribute("xmlns:tns", getDefaultNamespace(definition));
-  		root.setAttribute("xmlns:wsdl", "http://schemas.xmlsoap.org/wsdl/");
-  		root.setAttribute("xmlns:xsd", "http://www.w3.org/2001/XMLSchema");
-  		root.setAttribute("name", getFileName(definition));
-  		root.setAttribute("targetNamespace", getDefaultNamespace(definition));
-
-  		definition.setElement(root);	
-  	}
-
-	// Generate/re-generate the Binding
-    try
-    {
-		Binding binding = bindingGenerator.generateBinding();
-		
-      if (binding != null)
-      {
-        IEditorPart editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-        ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-        if (selectionProvider != null)
-        {
-          selectionProvider.setSelection(new StructuredSelection(binding));
-        }
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    finally {
-    	if (recordingStarted)
-    		endRecording();
-    }
-
-    return true;
-  }
-  
-  private String getDefaultNamespace(Definition definition)
-  {
-    String namespace = WSDLEditorPlugin.getInstance().getPreferenceStore().getString(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"));
-    if (!namespace.endsWith("/")) {
-    	namespace = namespace.concat("/");
-    }
-    
-    namespace += getFileName(definition) + "/";
-
-    return namespace;
-  }
-  
-  private String getFileName(Definition definition) {
-    String fileLocation = definition.getLocation();
-  	IPath filePath = new Path(fileLocation);
-  	return filePath.removeFileExtension().lastSegment().toString();
-  }
-  
-  private void beginRecording() {
-    Node node = document;
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_BINDING"));  
-    }
-  }
-  
-  private void endRecording() {
-    Node node = document; 
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-
-  class BindingWizardOptionsPage extends WizardPage
-  {
-    protected ProtocolComponentControl protocolComponentControl;
-
-    public BindingWizardOptionsPage()
-    {
-      super("SpecifyBindingPage");
-      setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_BINDING_DETAILS"));
-      setDescription(WSDLEditorPlugin.getWSDLString("_UI_SPECIFY_BINDING_DETAILS_LABEL"));
-    }
-
-    protected BindingGenerator getBindingGenerator()
-    {
-      return ((BindingWizard) getWizard()).getBindingGenerator();
-    }
-
-    public void createControl(Composite parent)
-    {
-      ProtocolComponentControl protocolComponentControl = new BindingProtocolComponentControl(parent, bindingGenerator, true);
-      protocolComponentControl.initFields();
-      setControl(protocolComponentControl);
-    }
-  }
-
-  public static class BindingProtocolComponentControl extends ProtocolComponentControl
-  {
-    public BindingProtocolComponentControl(Composite parent, BindingGenerator generator)
-    {
-      this(parent, generator, true);
-    }
-
-    public BindingProtocolComponentControl(Composite parent, BindingGenerator generator, boolean showOverwriteButton)
-    {
-      super(parent, generator, showOverwriteButton);
-
-      if (generator.getName() != null)
-      {
-        componentNameField.setEditable(false);
-      }
-    }
-
-    public String getRefNameLabelText()
-    {
-      return WSDLEditorPlugin.getWSDLString("_UI_PORT_TYPE");
-    }
-
-    public List getRefNames()
-    {
-      return new ComponentReferenceUtil(generator.getDefinition()).getPortTypeNames();
-    }
-
-    public String getDefaultName()
-    {
-      String bindingName = generator.getName();
-      return bindingName != null ? bindingName : NameUtil.buildUniqueBindingName(generator.getDefinition(), null);
-    }
-
-    public ContentGeneratorOptionsPage createContentGeneratorOptionsPage(String protocol)
-    {
-      ContentGeneratorOptionsPage optionsPage = null;
-	  String protocolSelection = protocolCombo.getItem(protocolCombo.getSelectionIndex());
-	  if (protocolSelection.equals("SOAP")) {
-		  optionsPage = new SoapBindingOptionsPage();
-	  }
-	  else if (protocolSelection.equals("HTTP")) {
-		  optionsPage = new HttpBindingOptionsPage();
-	  }
-//      ContentGeneratorExtension extension = WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getContentGeneratorExtension(protocol);
-//      if (extension != null)
-//      {
-//        optionsPage = extension.createBindingContentGeneratorOptionsPage();
-//      }
-      return optionsPage;
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java
deleted file mode 100644
index 1ea47f6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java
+++ /dev/null

@@ -1,701 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.wst.common.ui.internal.viewers.NavigableTableViewer;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditNamespaceInfoDialog;
-import org.eclipse.wst.xml.ui.internal.dialogs.UpdateListener;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonResources;
- 
-public class NamespaceTable extends Composite
-{
-  protected static final String NAMESPACE_URI = XMLCommonResources.getInstance().getString("_UI_LABEL_NAMESPACE_NAME"); //$NON-NLS-1$
-  protected static final String PREFIX = XMLCommonResources.getInstance().getString("_UI_LABEL_PREFIX"); //$NON-NLS-1$
-  protected static final String INCLUDE = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SELECT"); //$NON-NLS-1$
-    
-  protected List namespaceInfoList = new Vector();
-  protected List checkedList = new Vector();
-  protected NamespaceNavigableTableViewer tableViewer;    
-  protected Button addButton;
-
-  protected NamespaceInfoTableLabelProvider provider;
-  protected UpdateListener updateListener;   
-  protected IPath resourceLocation;  
-  protected int visibleRows = -1;  
-  protected boolean dummyRowsRemoved = false;
-  Table table;
-
-  public NamespaceTable(Composite parent)
-  {  
-    this(parent, -1, -1, -1);
-  }    
-
-  public NamespaceTable(Composite parent, int visibleRows)
-  {
-    this(parent, -1, -1, visibleRows);
-  }
-
-  public NamespaceTable(Composite parent, int widthHint, int heightHint)
-  {
-    this(parent, widthHint, heightHint, -1);
-  }
-
-  public NamespaceTable(Composite parent, int widthHint, int heightHint, int visibleRows)
-  {
-    super(parent, SWT.NONE);                                                               
-    setLayout(createGridLayout());                                 
-    GridData fillGD= new GridData();
-    fillGD.horizontalAlignment= GridData.FILL;
-    fillGD.grabExcessHorizontalSpace= true;
-    fillGD.verticalAlignment= GridData.FILL;
-    fillGD.grabExcessVerticalSpace= true;
-    
-    setLayoutData(fillGD);             
-    
-    Group namespaceInfoGroup = new Group(this, SWT.NONE);
-    namespaceInfoGroup.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_NAMESPACE_URIS_TO_BE_INCLUDED")); //$NON-NLS-1$
-    namespaceInfoGroup.setLayout(new GridLayout());   
-    GridData gd = fillGD;
-    if (widthHint != -1)
-    {
-      gd.widthHint = widthHint;
-    }   
-    if (heightHint != -1)
-    {
-      gd.heightHint = heightHint;
-    }
-    namespaceInfoGroup.setLayoutData(gd); 
-    //WorkbenchHelp.setHelp(namespaceInfoGroup, new ControlContextComputer(namespaceInfoGroup, XMLBuilderContextIds.XMLC_NAMESPACE_GROUP));
-                    
-    String[] titleArray = {INCLUDE, PREFIX, NAMESPACE_URI};
-
-    table = new Table(namespaceInfoGroup, SWT.FULL_SELECTION);
-    table.setHeaderVisible(true);
-    
-    table.setLayoutData(fillGD);
-    table.setLinesVisible(true);
-    table.addMouseListener(new MouseAdapter()
-    {
-      public void mouseDown(MouseEvent e)
-      {
-        TableItem item = table.getItem(new Point(e.x, e.y));
-        if (item != null)
-        {
-          Object obj = item.getData();
-          if (obj != null)
-          {
-            TableElement holder = (TableElement)obj;
-            TableColumn col = table.getColumn(0);
-            if (e.x < col.getWidth()) // if the point falls within the Select column then perform check/uncheck
-            {
-              String currentState = holder.getChecked();
-              if (currentState.equals("true")) //$NON-NLS-1$
-              {
-                holder.setChecked("false"); //$NON-NLS-1$
-                checkedList.set(holder.getIndex(), "false"); //$NON-NLS-1$
-              }  
-              else if (currentState.equals("false")) //$NON-NLS-1$
-              {
-                holder.setChecked("true");  //$NON-NLS-1$
-                checkedList.set(holder.getIndex(), "true"); //$NON-NLS-1$
-              }
-              tableViewer.refresh();
-              if (updateListener != null)
-              {
-                updateListener.updateOccured(this, namespaceInfoList);
-              }
-            }
-          }
-        }        
-      }
-    });
-
-    tableViewer = new NamespaceNavigableTableViewer(table);
-    provider = new NamespaceInfoTableLabelProvider();
-    tableViewer.setContentProvider(provider);   
-    tableViewer.setLabelProvider(provider);
-    tableViewer.setColumnProperties(titleArray);
-    tableViewer.setCellModifier(new NamespaceInfoCellModifier());
-
-                    
-    int[] widthArray = {10, 20, 50};
-    TableLayout layout = new TableLayout();  
-
-    for (int i = 0; i < titleArray.length; i++)
-    {
-      TableColumn column = new TableColumn(table, i);
-      column.setText(titleArray[i]);
-      column.setAlignment(SWT.LEFT);
-      layout.addColumnData(new ColumnWeightData(widthArray[i], true));
-    }         
-    this.visibleRows = visibleRows;
-    for (int i = 0; i < visibleRows; i++)
-    {
-      TableItem item = new TableItem(table, SWT.NONE); 
-      item.setText("#######"); //$NON-NLS-1$
-    }
-    table.setLayout(layout);  
-    
-    CellEditor[] cellEditors = new CellEditor[titleArray.length];
-    cellEditors[0] = new NamespaceInfoCheckboxCellEditor(table);
-    cellEditors[1] = new TextCellEditor(table);
-    tableViewer.setCellEditors(cellEditors);
-
-//    createButtons(namespaceInfoGroup);            
-
-    initialize();    
-  }    
-
-  public void setUpdateListener(UpdateListener updateListener)
-  {
-    this.updateListener = updateListener;
-  }
-
-  public void setNamespaceInfoList(List namespaceInfoList)
-  {    
-    this.namespaceInfoList = namespaceInfoList;
-    update();
-  }                       
-
-  public List getNamespaceInfoList()
-  {
-    return namespaceInfoList;
-  }  
-
-  public List getNamespaceCheckedList()
-  {
-    return checkedList;
-  }  
-
-  public String getWSDLPrefix()
-  {
-    return ((NamespaceInfo)(namespaceInfoList.get(0))).prefix;
-  }
-
-  public void setResourceLocation(IPath resourceLocation)
-  {
-    this.resourceLocation = resourceLocation;
-  }
-
-  public GridLayout createGridLayout()
-  {
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginWidth = 0;
-    gridLayout.horizontalSpacing = 0;
-    return gridLayout;
-  }
-    
-  protected void initialize()
-  {
-    // better way to do this....
-    NamespaceInfo info1 = new NamespaceInfo();
-    info1.prefix = "wsdl"; //$NON-NLS-1$
-    info1.uri = "http://schemas.xmlsoap.org/wsdl/"; //$NON-NLS-1$
-    namespaceInfoList.add(info1);
-    checkedList.add("true"); //$NON-NLS-1$
-    NamespaceInfo info2 = new NamespaceInfo();
-    info2.prefix = "soap"; //$NON-NLS-1$
-    info2.uri = "http://schemas.xmlsoap.org/wsdl/soap/"; //$NON-NLS-1$
-    namespaceInfoList.add(info2);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info3 = new NamespaceInfo();
-    info3.prefix = "http";  //$NON-NLS-1$
-    info3.uri = "http://schemas.xmlsoap.org/wsdl/http/"; //$NON-NLS-1$
-    namespaceInfoList.add(info3);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info4 = new NamespaceInfo();
-    info4.prefix = "mime"; //$NON-NLS-1$
-    info4.uri = "http://schemas.xmlsoap.org/wsdl/mime/"; //$NON-NLS-1$
-    namespaceInfoList.add(info4);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info5 = new NamespaceInfo();
-    info5.prefix = "soapenc"; //$NON-NLS-1$
-    info5.uri = "http://schemas.xmlsoap.org/soap/encoding/"; //$NON-NLS-1$
-    namespaceInfoList.add(info5);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info6 = new NamespaceInfo();
-    info6.prefix = "soapenv"; //$NON-NLS-1$
-    info6.uri = "http://schemas.xmlsoap.org/soap/envelope/"; //$NON-NLS-1$
-    namespaceInfoList.add(info6);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info7 = new NamespaceInfo();
-    info7.prefix = "xsi"; //$NON-NLS-1$
-    info7.uri = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
-    namespaceInfoList.add(info7);
-    checkedList.add("false"); //$NON-NLS-1$
-    NamespaceInfo info8 = new NamespaceInfo();
-    info8.prefix = "xsd"; //$NON-NLS-1$
-    info8.uri = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
-    namespaceInfoList.add(info8);
-    checkedList.add("true"); //$NON-NLS-1$
-    update();
-  }
-
-  protected void createButtons(Composite parent)
-  {
-    Composite composite = new Composite(parent, SWT.NONE);
-    GridData hFillGD = new GridData();
-    hFillGD.horizontalAlignment= GridData.FILL;
-    hFillGD.grabExcessHorizontalSpace= true;
-    
-    composite.setLayoutData(hFillGD);
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.numColumns = 2;
-    gridLayout.marginHeight = 0;
-    gridLayout.marginWidth = 0;
-    composite.setLayout(gridLayout);
-
-    GridData gd = new GridData();
-    gd.horizontalAlignment = GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    
-    Button hiddenButton = new Button(composite, SWT.NONE);
-    hiddenButton.setLayoutData(gd);
-    hiddenButton.setVisible(false);
-    hiddenButton.setEnabled(false);
-
-    SelectionListener selectionListener = new SelectionAdapter()
-    {
-      public void widgetSelected(SelectionEvent e)
-      {  
-        if (e.widget == addButton)
-        {
-          performNew();
-        }
-      }
-    };   
-    
-    // create a composite to hold the three buttons
-    Composite buttonComposite = new Composite(composite, SWT.NONE);
-
-    buttonComposite.setLayoutData(hFillGD);
-    GridLayout buttonGridLayout = new GridLayout();
-    buttonGridLayout.numColumns = 1;
-    buttonGridLayout.makeColumnsEqualWidth = true;
-    buttonComposite.setLayout(buttonGridLayout);
-
-    // add the New button
-    //
-    gd = new GridData();
-    gd.horizontalAlignment = GridData.FILL;
-    gd.grabExcessHorizontalSpace = true;
-
-    addButton = new Button(buttonComposite, SWT.NONE);
-    addButton.setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD")); //$NON-NLS-1$
-    addButton.setLayoutData(gd);//ViewUtility.createHorizontalFill());
-    addButton.addSelectionListener(selectionListener);
-  }
-
-  public void performNew()
-  {
-    NamespaceInfo info = new NamespaceInfo();
-    EditNamespaceInfoDialog dialog = invokeDialog(XMLCommonResources.getInstance().getString("_UI_LABEL_NEW_NAMESPACE_INFORMATION"), info); //$NON-NLS-1$
-    if (dialog.getReturnCode() == Dialog.OK)
-    {
-      namespaceInfoList.add(info);
-      checkedList.add("true"); //$NON-NLS-1$
-      performDelayedUpdate();
-    }
-  } 
-                     
-  protected EditNamespaceInfoDialog invokeDialog(String title, NamespaceInfo info)
-  {
-    Shell shell = XMLCommonResources.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-    EditNamespaceInfoDialog dialog = new EditNamespaceInfoDialog(shell, info);
-    dialog.create();
-    dialog.getShell().setText(title);
-    dialog.setBlockOnOpen(true);
-    dialog.setResourceLocation(resourceLocation);
-    dialog.open();      
-    return dialog;
-  }
-
-  protected void performDelayedUpdate()
-  {
-    Runnable delayedUpdate = new Runnable()
-    {
-      public void run()
-      {
-        update();
-      }
-    };
-    Display.getCurrent().asyncExec(delayedUpdate);
-
-    if (updateListener != null)
-    {
-      updateListener.updateOccured(this, namespaceInfoList);
-    }
-  }
- 
-  protected NamespaceInfo getTargetNamespaceInfo()
-  {
-    return (namespaceInfoList != null && namespaceInfoList.size() > 0) ? 
-           (NamespaceInfo)namespaceInfoList.get(0) :
-           null;
-  }    
-
-                    
-  public void update()
-  {
-    updateHelper(namespaceInfoList);
-  }
-                           
-  public void updateHelper(List namespaceInfoList)
-  {                                      
-    if (visibleRows != -1 && !dummyRowsRemoved)
-    {
-//      dummyRowsRemoved = true;
-//      tableViewer.getTable().removeAll();
-    }                                                      
-    ISelection selection = tableViewer.getSelection();
-    tableViewer.setInput(namespaceInfoList);
-    if (selection.isEmpty())
-    {                     
-      if (namespaceInfoList.size() > 0)
-      {
-        tableViewer.setSelection(new StructuredSelection(namespaceInfoList.get(0)));
-      }
-    }
-    else
-    {
-      tableViewer.setSelection(selection);
-    }
-  }
-
-  protected class NamespaceInfoCheckboxCellEditor extends CheckboxCellEditor implements MouseListener
-  {
-    public NamespaceInfoCheckboxCellEditor(Composite parent)
-    {
-      super(parent);
-    }
-
-    protected void doSetValue(Object value)
-    {
-    }
-
-    public void activate()
-    {
-       super.activate();
-       deactivate();
-       Display.getCurrent().getFocusControl().redraw();
-    }
-
-    public void mouseDown(MouseEvent e)   
-    {      
-      if (tableViewer.getTable().getItem(new Point(e.x, e.y)) != null)
-      {
-      }
-    }    
-    public void mouseDoubleClick(MouseEvent e) {}
-    public void mouseUp(MouseEvent e) {}
-
-
-  }
-
-
-  protected class NamespaceInfoCellModifier implements ICellModifier
-  {
-    public NamespaceInfoCellModifier()
-    {
-      
-    }
-    
-    public boolean canModify(Object element, String property)
-    {
-      if (property.equals(INCLUDE))
-      {
-        return true;
-      }
-      else if (property.equals(PREFIX))
-      {
-        return true;
-      }
-      return false;      
-    }
-
-    public Object getValue(Object element, String property)
-    {
-      int column = 0;
-      if (property.equals(INCLUDE))
-      {
-        column = 0;
-      }
-      else if (property.equals(PREFIX))
-      {
-        column = 1;
-      }
-      else if (property.equals(NAMESPACE_URI))
-      {
-        column = 2;
-      }
-
-      if (element instanceof TableElement)
-      {
-        return provider.getColumnText(element, column);
-      }
-      else
-      {
-        return null;
-      }
-    }
-
-    public void modify(Object element, String property, Object value)
-    {
-      TableItem item = (TableItem)element;
-      if (item != null)
-      {
-        Object obj = item.getData();
-        if (obj != null)
-        {
-          TableElement holder = (TableElement)obj;
-          NamespaceInfo info = holder.getNamespaceInfo();
-          if (property.equals(INCLUDE))
-          {
-            if (value instanceof Boolean)
-            {
-              if (((Boolean)value).booleanValue())
-              {
-                holder.setChecked("true");
-                checkedList.set(holder.getIndex(), "true");
-              }
-              else
-              {
-                holder.setChecked("false");
-                checkedList.set(holder.getIndex(), "false");
-              }
-            }
-          }
-          else if (property.equals(PREFIX))
-          {
-            info.prefix = ((String)value).trim();
-          }
-
-          Runnable delayedUpdate = new Runnable()
-          {
-            public void run()
-            {
-              tableViewer.refresh();
-            }
-          };
-          Display.getCurrent().asyncExec(delayedUpdate);
-          if (updateListener != null)
-          {
-            updateListener.updateOccured(this, namespaceInfoList);
-          }
-
-//          performDelayedUpdate();
-        }
-      }
-    }
-  }                   
-
-  protected class TableElement
-  {
-    NamespaceInfo info;
-    int index;
-    String checked = "true";
-    
-    TableElement(NamespaceInfo info, int index)
-    {
-      this.info = info;
-      this.index = index;
-    }
-    
-    public NamespaceInfo getNamespaceInfo()
-    {
-      return info;
-    }
-    
-    public int getIndex()
-    {
-      return index;
-    }
-    
-    public String getChecked()
-    {
-      return checked;
-    }
-    
-    public void setChecked(String checked)
-    {
-      this.checked = checked;
-    }
-  }
-
-  /**
-   * NamespaceInfoTableLabelProvider
-   */
-  protected class NamespaceInfoTableLabelProvider implements ITableLabelProvider, IStructuredContentProvider
-  {
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-    }
-
-    public boolean isLabelProperty(Object element, String property)
-    {
-      return false;
-    }
-
-    public boolean isDeleted(Object element)
-    {
-      return false;
-    }
-
-    public Object[] getElements(Object inputElement)
-    {
-      Vector v = new Vector();
-      for (int i = 0; i < namespaceInfoList.size(); i++)
-      {
-        NamespaceInfo info = (NamespaceInfo)namespaceInfoList.get(i);
-        TableElement holder = new TableElement(info, i);
-        holder.setChecked((String)checkedList.get(i));
-        v.add(holder);
-      }
-      return v.toArray();
-    }
-
-    public String getColumnText(Object object, int column)
-    {
-      TableElement holder = (TableElement)object;
-      NamespaceInfo info = holder.getNamespaceInfo();
-      String result = null;
-      switch (column)
-      {
-        case 1: { result = info.prefix; break; }
-        case 2: { result = info.uri; break; }
-      }
-      result = result != null ? result.trim() : "";
-      if (result.equals(""))
-      {
-        switch (column)
-        {
-          case 2: 
-          { 
-            result = XMLCommonResources.getInstance().getString("_UI_NO_NAMESPACE_NAME");  //$NON-NLS-1$
-            break; 
-          }
-        }
-      }
-      return result;
-    }
-
-//    private String getDefaultPrefix()
-//    {
-//      String defaultPrefix = "p";
-//      if (namespaceInfoList == null)
-//        return defaultPrefix;
-//
-//      Vector v = new Vector();
-//      for (int i=0; i<namespaceInfoList.size(); i++)
-//      {
-//        NamespaceInfo nsinfo = (NamespaceInfo)namespaceInfoList.get(i);
-//        if (nsinfo.prefix != null)
-//          v.addElement(nsinfo.prefix);
-//      }
-//
-//      if (v.contains(defaultPrefix))
-//      {
-//        String s = defaultPrefix;
-//        for (int j=0; v.contains(s); j++)
-//        {
-//          s = defaultPrefix + Integer.toString(j);
-//        }
-//        return s;
-//      }
-//      else
-//        return defaultPrefix;
-//    }
-
-    public Image getColumnImage(Object object, int columnIndex)
-    {
-      if (columnIndex == 0)  // Output Column
-      {
-        if (object instanceof TableElement)
-        {
-          TableElement holder = (TableElement) object;
-          String result = holder.getChecked();
-          if (result.equals("true")) //$NON-NLS-1$
-          {
-            return WSDLEditorPlugin.getInstance().getImage("icons/output_yes.gif"); //$NON-NLS-1$
-          }
-          else
-          {
-            return WSDLEditorPlugin.getInstance().getImage("icons/output_no.gif"); //$NON-NLS-1$
-          }
-        }
-      }
-      return null;
-    }
-
-    public boolean isLabelProperty(Object object, Object property)
-    {
-      return false;
-    }
-
-    public void addListener(ILabelProviderListener listener)
-    {
-    }
-
-    public void removeListener(ILabelProviderListener listener)
-    {
-    }
-
-    public void dispose()
-    {
-    }
-  }
-
-  class NamespaceNavigableTableViewer extends NavigableTableViewer
-  {
-    public NamespaceNavigableTableViewer(Table parent)
-    {
-      super(parent);
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java
deleted file mode 100644
index 8c73cbe..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java
+++ /dev/null

@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.CreateWSDLElementHelper;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.DOMValidator;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.w3c.dom.Element;
-
-public class NewWSDLWizard extends Wizard implements INewWizard {
-	private WSDLNewFilePage newFilePage;
-	private WSDLNewFileOptionsPage optionsPage;
-	private IStructuredSelection selection;
-
-	/**
-	 * Constructor for NewWSDLWizard.
-	 */
-	public NewWSDLWizard() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		IFile file = newFilePage.createNewFile();
-
-		Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-		String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-		if (charSet == null || charSet.trim().equals("")) {
-			charSet = "UTF-8";
-		}
-
-		String wsdlPrefix = "wsdl";
-		Vector namespaces = optionsPage.getNamespaceInfo();
-
-		String prefix = optionsPage.getPrefix();
-		String definitionName = optionsPage.getDefinitionName();
-
-		URI uri2 = URI.createPlatformResourceURI(file.getFullPath().toOSString());
-		ResourceSet resourceSet = new ResourceSetImpl();
-		WSDLResourceImpl resource = (WSDLResourceImpl) resourceSet.createResource(URI.createURI("*.wsdl"));
-		resource.setURI(uri2);
-		
-		WSDLFactoryImpl factory = new WSDLFactoryImpl();
-		DefinitionImpl definition = (DefinitionImpl) factory.createDefinition();
-		resource.getContents().add(definition);
-		
-		definition.setTargetNamespace(optionsPage.getTargetNamespace());
-		definition.setLocation(file.getLocation().toString());
-		definition.setEncoding(charSet);
-		definition.setQName(new QName(wsdlPrefix, definitionName));
-		definition.addNamespace(prefix, optionsPage.getTargetNamespace());
-
-		for (int i = 0; i < namespaces.size(); i++) {
-			NamespaceInfo info = (NamespaceInfo) namespaces.get(i);
-
-			if (info.prefix.length() > 0) {
-				definition.addNamespace(info.prefix, info.uri);
-			}
-			else {
-				definition.addNamespace(null, info.uri);
-			}
-		}
-		// TODO : cs... why do we need this?  these calls are evil!
-		definition.updateElement(true);
-		try {
-			if (optionsPage.getCreateSkeletonBoolean()) {
-				if (optionsPage.isSoapDocLiteralProtocol()) {
-					CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.PART_INFO_ELEMENT_DECLARATION;
-				}
-				else {
-					CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.PART_INFO_TYPE_DEFINITION;
-				}
-
-				CreateWSDLElementHelper.serviceName = definitionName;
-				CreateWSDLElementHelper.portName = definitionName + optionsPage.getProtocol();
-				Service service = CreateWSDLElementHelper.createService(definition);
-
-
-				// Generate Binding
-				Iterator bindingIt = definition.getEBindings().iterator();
-				Binding binding = null;
-				if (bindingIt.hasNext()) {
-					binding = (Binding) bindingIt.next();
-				}
-				BindingGenerator bindingGenerator = new BindingGenerator(definition, binding, SOAPConstants.SOAP_NAMESPACE_URI);
-				Port port = (Port) service.getEPorts().iterator().next();
-				bindingGenerator.setName(ComponentReferenceUtil.getName(port.getEBinding()));
-				bindingGenerator.setRefName(ComponentReferenceUtil.getPortTypeReference(port.getEBinding()));
-				bindingGenerator.setOverwrite(true);
-				
-				if (optionsPage.getProtocol().equals("SOAP")) {
-					String namespace = SOAPConstants.SOAP_NAMESPACE_URI;
-					bindingGenerator.setContentGenerator(BindingGenerator.getContentGenerator(namespace));
-
-					SOAPContentGenerator soapGen = (SOAPContentGenerator) bindingGenerator.getContentGenerator();
-					Boolean booleanValue = (Boolean) optionsPage.getProtocolOptions()[0];
-					Boolean booleanValue2 = (Boolean) optionsPage.getProtocolOptions()[2];
-					if (booleanValue.booleanValue()) {
-						// Document Literal
-						soapGen.setStyle(SOAPContentGenerator.STYLE_DOCUMENT);
-						soapGen.setUse(SOAPContentGenerator.USE_LITERAL);
-					}
-					else if (booleanValue2.booleanValue()){
-						// RPC Literal
-						soapGen.setStyle(SOAPContentGenerator.STYLE_RPC);
-						soapGen.setUse(SOAPContentGenerator.USE_LITERAL);
-					}
-					else {
-						// RPC Encoded
-						soapGen.setStyle(SOAPContentGenerator.STYLE_RPC);
-						soapGen.setUse(SOAPContentGenerator.USE_ENCODED);
-					}
-				}
-				else if (optionsPage.getProtocol().equals("HTTP")) {
-					String namespace = HTTPConstants.HTTP_NAMESPACE_URI;
-					bindingGenerator.setContentGenerator(BindingGenerator.getContentGenerator(namespace));
-
-					Boolean booleanValue = (Boolean) optionsPage.getProtocolOptions()[0];
-					if (booleanValue.booleanValue()) {
-						// Post
-						((HTTPContentGenerator) bindingGenerator.getContentGenerator()).setVerb(HTTPContentGenerator.VERB_POST);
-					}
-					else {
-						// Get
-						((HTTPContentGenerator) bindingGenerator.getContentGenerator()).setVerb(HTTPContentGenerator.VERB_GET);
-					}
-				}
-				
-				bindingGenerator.generateBinding();
-				bindingGenerator.generatePortContent();				
-			}
-			resource.save(null);
-		}
-		catch (Exception e) {
-			System.out.println("\nCould not write new WSDL file in WSDL Wizard: " + e);
-		}
-
-		/*
-		 * if (file != null) { final ISelection selection = new
-		 * StructuredSelection(file); if (selection != null) { IWorkbench
-		 * workbench = UIPlugin.getDefault().getWorkbench(); final
-		 * IWorkbenchWindow workbenchWindow =
-		 * workbench.getActiveWorkbenchWindow(); final IWorkbenchPart
-		 * focusPart = workbenchWindow.getActivePage().getActivePart(); if
-		 * (focusPart instanceof ISetSelectionTarget) {
-		 * Display.getCurrent().asyncExec (new Runnable() { public void run() {
-		 * ((ISetSelectionTarget)focusPart).selectReveal(selection); } }); } } }
-		 */
-		openEditor(file);
-
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench,
-	 *      IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.selection = selection;
-
-		// Need new icon
-		this.setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(WSDLEditor.class, "icons/new_wsdl_wiz.gif"));
-		this.setWindowTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_NEW_WSDL_FILE")); //$NON-NLS-1$
-	}
-
-	public void addPages() {
-		newFilePage = new WSDLNewFilePage(selection);
-		optionsPage = new WSDLNewFileOptionsPage(WSDLEditorPlugin.getWSDLString("_UI_TITLE_OPTIONS"), WSDLEditorPlugin.getWSDLString("_UI_TITLE_OPTIONS"), null); //$NON-NLS-1$ //$NON-NLS-2$
-		addPage(newFilePage);
-		addPage(optionsPage);
-	}
-
-	public IPath getNewFilePath() {
-		String fileName = newFilePage.getFileName();
-		return fileName != null ? new Path(fileName) : null;
-	}
-
-	public boolean canFinish() {
-		if (newFilePage.isPageComplete() && optionsPage.isPageComplete()) {
-			return true;
-		}
-		return false;
-	}
-
-	static public void openEditor(final IFile iFile) {
-		if (iFile != null) {
-			IWorkbench workbench = UIPlugin.getDefault().getWorkbench();
-			final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					try {
-						workbenchWindow.getActivePage().openEditor(new FileEditorInput(iFile), "org.eclipse.wst.wsdl.ui.internal.WSDLEditor");
-					}
-					catch (PartInitException ex) {
-						// B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception
-						// encountered when attempting to open file: " + iFile
-						// + "\n\n" + ex);
-					}
-				}
-			});
-		}
-	}
-
-	public class AvailableContentCMVisitor extends CMVisitor {
-		public static final int INCLUDE_ATTRIBUTES = ModelQuery.INCLUDE_ATTRIBUTES;
-		public static final int INCLUDE_CHILD_NODES = ModelQuery.INCLUDE_CHILD_NODES;
-		public static final int INCLUDE_SEQUENCE_GROUPS = ModelQuery.INCLUDE_SEQUENCE_GROUPS;
-
-		public Hashtable childNodeTable = new Hashtable();
-		public Hashtable attributeTable = new Hashtable();
-		public Element rootElement;
-		public CMElementDeclaration rootElementDeclaration;
-		public boolean isRootVisited;
-		protected boolean includeSequenceGroups;
-		public DOMValidator validator;
-
-		public AvailableContentCMVisitor(Element rootElement, CMElementDeclaration rootElementDeclaration) {
-			this.rootElement = rootElement;
-			this.rootElementDeclaration = rootElementDeclaration;
-			validator = new DOMValidator();
-		}
-
-		protected String getKey(CMNode cmNode) {
-			String key = cmNode.getNodeName();
-			CMDocument cmDocument = (CMDocument) cmNode.getProperty("CMDocument");
-			if (cmDocument != null) {
-				String namespaceURI = (String) cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI");
-				if (namespaceURI != null) {
-					key = "[" + namespaceURI + "]" + key;
-				}
-			}
-			return key;
-		}
-
-		public List computeAvailableContent(int includeOptions) {
-			Vector v = new Vector();
-
-			int contentType = rootElementDeclaration.getContentType();
-			includeSequenceGroups = ((includeOptions & INCLUDE_SEQUENCE_GROUPS) != 0);
-			visitCMNode(rootElementDeclaration);
-
-			if ((includeOptions & INCLUDE_ATTRIBUTES) != 0) {
-				v.addAll(attributeTable.values());
-				CMAttributeDeclaration nillableAttribute = (CMAttributeDeclaration) rootElementDeclaration.getProperty("http://org.eclipse.wst/cm/properties/nillable");
-				if (nillableAttribute != null) {
-					v.add(nillableAttribute);
-				}
-			}
-
-			if ((includeOptions & INCLUDE_CHILD_NODES) != 0) {
-				if (contentType == CMElementDeclaration.MIXED || contentType == CMElementDeclaration.ELEMENT) {
-					v.addAll(childNodeTable.values());
-				}
-				else if (contentType == CMElementDeclaration.ANY) {
-					CMDocument cmDocument = (CMDocument) rootElementDeclaration.getProperty("CMDocument");
-					if (cmDocument != null) {
-						CMNamedNodeMap elements = cmDocument.getElements();
-						for (Iterator i = elements.iterator(); i.hasNext();) {
-							v.add((CMElementDeclaration) i.next());
-						}
-					}
-				}
-
-				if (contentType == CMElementDeclaration.MIXED || contentType == CMElementDeclaration.PCDATA || contentType == CMElementDeclaration.ANY) {
-					CMDataType dataType = rootElementDeclaration.getDataType();
-					if (dataType != null) {
-						v.add(dataType);
-					}
-				}
-			}
-			return v;
-		}
-
-		/*
-		 * public void visitCMAnyElement(CMAnyElement anyElement) { String uri =
-		 * anyElement.getNamespaceURI(); List list =
-		 * getCMDocumentList(rootElement, rootElementDeclaration, uri); for
-		 * (Iterator iterator = list.iterator(); iterator.hasNext(); ) {
-		 * CMDocument cmdocument = (CMDocument)iterator.next(); if (cmdocument !=
-		 * null) { CMNamedNodeMap map = cmdocument.getElements(); int size =
-		 * map.getLength(); for (int i = 0; i < size; i++) { CMNode ed =
-		 * map.item(i);
-		 * 
-		 * childNodeTable.put(getKey(ed), ed); } } } }
-		 */
-		public void visitCMAttributeDeclaration(CMAttributeDeclaration ad) {
-			super.visitCMAttributeDeclaration(ad);
-			attributeTable.put(ad.getNodeName(), ad);
-		}
-
-		public void visitCMElementDeclaration(CMElementDeclaration ed) {
-			if (ed == rootElementDeclaration && !isRootVisited) {
-				isRootVisited = true;
-				super.visitCMElementDeclaration(ed);
-			}
-			else {
-				if (!Boolean.TRUE.equals(ed.getProperty("Abstract"))) {
-					childNodeTable.put(getKey(ed), ed);
-				}
-
-				CMNodeList substitutionGroup = (CMNodeList) ed.getProperty("SubstitutionGroup");
-				if (substitutionGroup != null) {
-					handleSubstitutionGroup(substitutionGroup);
-				}
-			}
-		}
-
-		protected void handleSubstitutionGroup(CMNodeList substitutionGroup) {
-			int substitutionGroupLength = substitutionGroup.getLength();
-			if (substitutionGroupLength > 1) {
-				for (int i = 0; i < substitutionGroupLength; i++) {
-					CMNode ed = substitutionGroup.item(i);
-					if (!Boolean.TRUE.equals(ed.getProperty("Abstract"))) {
-						childNodeTable.put(getKey(ed), ed);
-					}
-				}
-			}
-		}
-
-		public void visitCMGroup(CMGroup group) {
-			if (includeSequenceGroups) {
-				if (group.getOperator() == CMGroup.SEQUENCE && group.getChildNodes().getLength() > 1 && includesRequiredContent(group)) {
-					childNodeTable.put(group, group);
-				}
-			}
-			super.visitCMGroup(group);
-		}
-
-		public boolean includesRequiredContent(CMGroup group) {
-			List list = getValidator().createContentSpecificationList(group);
-			return list.size() > 1;
-		}
-
-		public DOMValidator getValidator() {
-			return validator;
-		}
-	} // ///////////////////////// here
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java
deleted file mode 100644
index 4ccf3c6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.internal.generator.PortGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.ContentGeneratorOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui.SoapBindingOptionsPage;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.ProtocolComponentControl;
-
-public class PortWizard extends Wizard
-{
-  protected final static int STYLE_NEW_BINDING = 1;
-  protected final static int STYLE_EXISTING_BINDING = 1 << 1;
-  protected final static int STYLE_DEFAULT = STYLE_NEW_BINDING | STYLE_EXISTING_BINDING;
-
-  protected PortGenerator portGenerator;
-  protected PortWizardOptionsPage specifyBindingPage;
-  protected int style;
-
-  /**
-   * Constructor for PortWizard.
-   */
-  public PortWizard(Service service)
-  {
-    this(service, 0);
-  }
-
-  public PortWizard(Service service, int style)
-  {
-    super();
-    portGenerator = new PortGenerator(service);
-    setWindowTitle(WSDLEditorPlugin.getWSDLString("_UI_PORT_WIZARD")); //$NON-NLS-1$
-    //setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/NewXML.gif"));
-  }
-
-  /**
-   * Return true if wizard setup is successful, false otherwise
-   */
-  public boolean setup()
-  {
-    return true;
-  }
-
-  public void addPages()
-  {
-    specifyBindingPage = new PortWizardOptionsPage(style);
-    addPage(specifyBindingPage);
-  }
-
-  public boolean performFinish()
-  {
-    Object object = portGenerator.generatePort();
-
-    try
-    {
-      if (object != null)
-      {
-        IEditorPart editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-        ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-        if (selectionProvider != null)
-        {
-          selectionProvider.setSelection(new StructuredSelection(object));
-        }
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    return true;
-  }
-
-  class PortWizardOptionsPage extends WizardPage
-  {
-
-    protected ProtocolComponentControl protocolComponentControl;
-
-    public PortWizardOptionsPage(int style)
-    {
-      super("SpecifyPortPage");
-      setTitle(WSDLEditorPlugin.getWSDLString("_UI_SPECIFY_PORT_DETAILS"));
-      setDescription(WSDLEditorPlugin.getWSDLString("_UI_SPECIFY_PORT_DETAILS_TO_BE_CREATED"));
-    }
-
-    public PortGenerator getGenerator()
-    {
-      return portGenerator;
-    }
-
-    public void createControl(Composite parent)
-    {
-      ProtocolComponentControl protocolComponentControl = new PortProtocolComponentControl(parent, portGenerator);
-      protocolComponentControl.initFields();
-      setControl(protocolComponentControl);
-    }
-  }
-
-  class PortProtocolComponentControl extends ProtocolComponentControl
-  {
-
-    public PortProtocolComponentControl(Composite parent, PortGenerator generator)
-    {
-      super(parent, generator, false);
-    }
-
-    public String getRefNameLabelText()
-    {
-      return WSDLEditorPlugin.getWSDLString("_UI_BINDING");
-    }
-
-    public List getRefNames()
-    {
-      return new ComponentReferenceUtil(portGenerator.getDefinition()).getBindingNames();
-    }
-
-    public String getDefaultName()
-    {
-      Service service = portGenerator.getService();
-      return NameUtil.buildUniquePortName(service, null);
-    }
-
-    public ContentGeneratorOptionsPage createContentGeneratorOptionsPage(String protocol)
-    {
-      ContentGeneratorOptionsPage optionsPage = null;	  
-	  String protocolSelection = protocolCombo.getItem(protocolCombo.getSelectionIndex());
-	  if (protocolSelection.equals("SOAP")) {
-		  optionsPage = new SoapBindingOptionsPage();
-	  }
-	  else if (protocolSelection.equals("HTTP")) {
-		  optionsPage = new SoapBindingOptionsPage();
-	  }	  
-//      ContentGeneratorExtension extension = WSDLEditorPlugin.getInstance().getContentGeneratorExtensionRegistry().getContentGeneratorExtension(protocol);
-//      if (extension != null)
-//      {
-//        optionsPage = extension.createPortContentGeneratorOptionsPage();
-//      }
-      return optionsPage;
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java
deleted file mode 100644
index ba906c0..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java
+++ /dev/null

@@ -1,610 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.ValidateHelper;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.dialogs.UpdateListener;
-
-public class WSDLNewFileOptionsPage extends WizardPage implements ModifyListener, UpdateListener, SelectionListener
-{
-  protected Text targetNamespaceText;
-  protected Text prefixText;
-  protected boolean updatePortOpFieldBoolean = true;
-  
-  protected PageBook protocolPageBook;
-  protected Combo protocolCombo;
-  protected Composite soapPage;
-  protected Composite httpPage;
-  protected Button docLitRadio;
-  protected Button rpcLitRadio;
-  protected Button rpcEncRadio;
-  protected Button httpGetRadio;
-  protected Button httpPostRadio;
-  
-//  private BindingGenerator generator;
-
-  /**
-   * Constructor for WSDLNewFileOptionsPage.
-   * @param pageName
-   */
-  public WSDLNewFileOptionsPage(String pageName)
-  {
-    super(pageName);
-  }
-  /**
-   * Constructor for WSDLNewFileOptionsPage.
-   * @param pageName
-   * @param title
-   * @param titleImage
-   */
-  public WSDLNewFileOptionsPage(String pageName, String title, ImageDescriptor titleImage)
-  {
-    super(pageName, title, titleImage);
-    setDescription(WSDLEditorPlugin.getWSDLString("_UI_DESCRIPTION_NEW_WSDL_FILE")); //$NON-NLS-1$
-  }
-  /**
-   * @see org.eclipse.jface.dialogs.IDialogPage#createControl(Composite)
-   */
-  public void createControl(Composite parent)
-  {
-    Composite base = new Composite(parent, SWT.NONE);
-    WorkbenchHelp.setHelp(base, WSDLEditorPlugin.getWSDLString("_UI_HELP")); //$NON-NLS-1$
-    base.setLayout(new GridLayout());
-
-    //  Group wsdlGroup = ViewUtility.createGroup(base, 2, "WSDL", false);
-    Composite wsdlGroup = new Composite(base, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    wsdlGroup.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    wsdlGroup.setLayoutData(data);
-    
-    GridData gd = (GridData)wsdlGroup.getLayoutData();
-    gd.grabExcessHorizontalSpace = true;
-
-    Label targetNamespace = new Label(wsdlGroup, SWT.LEFT);
-    targetNamespace.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_TARGET_NAMESPACE")); //$NON-NLS-1$
-    GridData nsData = new GridData();
-    nsData.horizontalAlignment = GridData.FILL;
-    targetNamespace.setLayoutData(nsData);
-    
-    targetNamespaceText = new Text(wsdlGroup, SWT.SINGLE | SWT.BORDER);
-    GridData textData = new GridData();
-    textData.horizontalAlignment = GridData.FILL;
-    textData.grabExcessHorizontalSpace = true;
-    textData.widthHint = 10;
-    targetNamespaceText.setLayoutData(textData);
-    
-    targetNamespaceText.addModifyListener(this);
-
-    Label prefix = new Label(wsdlGroup, SWT.LEFT);
-    prefix.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_PREFIX_WITH_COLON")); //$NON-NLS-1$\
-
-    GridData prefixData = new GridData();
-    prefixData.horizontalAlignment = GridData.FILL;
-    prefix.setLayoutData(prefixData);
-    
-    prefixText = new Text(wsdlGroup, SWT.SINGLE | SWT.BORDER);
-    GridData prefixTextData = new GridData();
-    prefixTextData.horizontalAlignment = GridData.FILL;
-    prefixTextData.grabExcessHorizontalSpace = true;
-    prefixTextData.widthHint = 10;
-    prefixText.setLayoutData(prefixTextData);
-
-    prefixText.addModifyListener(this);
-    
-    //    XMLCatalog xmlCatalog = XMLCatalogRegistry.getInstance().lookupOrCreateXMLCatalog("default");
-    //    SelectXMLCatalogIdPanel catalog = new SelectXMLCatalogIdPanel(base, xmlCatalog);
-
-//  Determine if the user wishes to create a skeleton WSDL.  If yes, present the user with input fields.
-    createSkeletonCheckBox = new Button(base, SWT.CHECK);
-    createSkeletonCheckBox.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATE_WSDL_SKELETON"));
-    createSkeletonCheckBox.setSelection(true);
-    
-    wsdlSkeletonGroup = new Composite(base, SWT.NONE);
-    GridLayout layout2 = new GridLayout();
-    layout2.numColumns = 2;
-    wsdlSkeletonGroup.setLayout(layout2);
-
-    GridData data2 = new GridData();
-    data2.verticalAlignment = GridData.FILL;
-    data2.horizontalAlignment = GridData.FILL;
-    wsdlSkeletonGroup.setLayoutData(data2);
-
-   createLabel(wsdlSkeletonGroup, WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_PROTOCOL"));
-   protocolCombo = new Combo(wsdlSkeletonGroup, SWT.READ_ONLY);
-   GridData dataC = new GridData();
-   dataC.horizontalAlignment = GridData.FILL;
-   dataC.grabExcessHorizontalSpace = true;
-   protocolCombo.setLayoutData(dataC);
-   protocolCombo.add(SOAP_PROTOCOL);
-   protocolCombo.add(HTTP_PROTOCOL);
-   protocolCombo.select(0);
-   protocolCombo.addModifyListener(this);
-   
-   sepLabel = new Label(base, SWT.SEPARATOR | SWT.HORIZONTAL);
-   GridData sepData = new GridData();
-   sepData.horizontalAlignment = GridData.FILL;
-   sepData.grabExcessHorizontalSpace = true;
-   sepLabel.setLayoutData(sepData);
-   
-   
-   // Create PageBook and pages/controls for the PageBook
-   protocolPageBook = new PageBook(base, SWT.NONE);
-
-   ///////////////////////// Soap Page
-   soapPage = new Composite(protocolPageBook, SWT.NONE);
-   GridLayout pbLayout = new GridLayout();
-   soapPage.setLayout(pbLayout);
-
-   GridData pbData = new GridData();
-   pbData.verticalAlignment = GridData.FILL;
-   pbData.horizontalAlignment = GridData.FILL;
-   soapPage.setLayoutData(pbData);
-
-   createLabel(soapPage, WSDLEditorPlugin.getWSDLString("_UI_LABEL_SOAP_BINDING_OPTIONS"));
-   docLitRadio = new Button(soapPage, SWT.RADIO);
-   rpcLitRadio = new Button(soapPage, SWT.RADIO);
-   rpcEncRadio = new Button(soapPage, SWT.RADIO);
-   docLitRadio.setText(SOAP_DOCUMENT_LITERAL);
-   rpcLitRadio.setText(SOAP_RPC_LITERAL);
-   rpcEncRadio.setText(SOAP_RPC_ENCODED);
-   docLitRadio.setSelection(true);
-   
-   ///////////////////////// Http Page
-   httpPage = new Composite(protocolPageBook, SWT.NONE);
-   pbLayout = new GridLayout();
-   httpPage.setLayout(pbLayout);
-
-   pbData = new GridData();
-   pbData.verticalAlignment = GridData.FILL;
-   pbData.horizontalAlignment = GridData.FILL;
-   httpPage.setLayoutData(pbData);
-   
-   createLabel(httpPage, WSDLEditorPlugin.getWSDLString("_UI_LABEL_HTTP_BINDING_OPTIONS")); // Already Externalized
-   httpGetRadio = new Button(httpPage, SWT.RADIO);
-   httpPostRadio = new Button(httpPage, SWT.RADIO);
-   httpGetRadio.setText(HTTP_GET);
-   httpPostRadio.setText(HTTP_POST);
-   httpGetRadio.setSelection(true);
-   
-   wsdlSkeletonGroup.setVisible(true);
-   sepLabel.setVisible(true);
-   protocolPageBook.showPage(soapPage);
-   protocolPageBook.setVisible(true);
-   
-   ////////////////////////// Add Selection Listeners
-   createSkeletonCheckBox.addSelectionListener(this);
-   
-//   BindingProtocolComponentControl component = new BindingProtocolComponentControl(base, generator, false);
-//   component.initFields();
-   
-    setControl(base);
-  }
-
-  private NewWSDLWizard getNewWSDLWizard()
-  {
-    return (NewWSDLWizard)getWizard();
-  }
-
-  private String computeDefaultDefinitionName()
-  {
-    String name = "DefaultName";
-    IPath path = getNewWSDLWizard().getNewFilePath();
-    if (path != null)
-    {
-      name = path.removeFileExtension().lastSegment().toString();
-    }
-    return name;
-  }
-
-  private String computeDefaultNamespaceName()
-  {
-    String namespace = WSDLEditorPlugin.getInstance().getPreferenceStore().getString(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"));
-    if (!namespace.endsWith("/")) {
-    	namespace = namespace.concat("/");
-    }
-    
-    IPath path = getNewWSDLWizard().getNewFilePath();
-    if (path != null)
-    {
-      namespace += path.removeFileExtension().toString() + "/";
-    }
-    return namespace;
-  }
-
-  public void setVisible(boolean visible)
-  {
-    super.setVisible(visible);
-
-    if (visible)
-    {
-      // prime the fields    
-      targetNamespaceText.setText(computeDefaultNamespaceName());
-      prefixText.setText("tns");
-    }
-  }
-
-  public String getTargetNamespace()
-  {
-    return targetNamespaceText.getText();
-  }
-
-  public String getPrefix()
-  {
-    return prefixText.getText().trim();
-  }
-
-  public String getDefinitionName()
-  {
-  	return computeDefaultDefinitionName();
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-    if (e.widget == targetNamespaceText)
-    {
-      startDelayedEvent(e);
-    }
-    else if (e.widget == prefixText)
-    {
-      setPageComplete(isPageComplete());
-    }
-	else if (e.widget == protocolCombo) {
-		// Update what page/control we show in the PageBook
-		if (protocolCombo.getText().equals("SOAP")) {
-			protocolPageBook.showPage(soapPage);
-		}
-		else if (protocolCombo.getText().equals("HTTP")) {
-			protocolPageBook.showPage(httpPage);
-		}
-	}
-  }
-
-  public void updateOccured(Object arg1, Object arg2)
-  {
-    setPageComplete(isPageComplete());
-  }
-
-  public boolean isPageComplete()
-  {
-    boolean ready = true;
-
-    setErrorMessage(null);
-
-    // so that the page doesn't immediately show up with an error
-    if (targetNamespaceText.getText().trim().equals(""))
-    {
-      if (ready)
-      {
-        setErrorMessage(null);
-      }
-      return false;
-    }
-
-    if (!validateTargetNamespace(targetNamespaceText.getText()))
-    {
-      ready = false;
-    }
-    
-    return ready;
-  }
-
-  protected boolean validatePrefix(String prefix)
-  {
-    String errorMessage = ValidateHelper.checkXMLPrefix(prefix);
-
-    if (errorMessage == null || errorMessage.length() == 0)
-    {
-      return true;
-    }
-    return false;
-  }
-
-  protected boolean validateXMLName(String xmlName)
-  {
-    String errorMessage = ValidateHelper.checkXMLName(xmlName);
-
-    if (errorMessage == null || errorMessage.length() == 0)
-    {
-      return true;
-    }
-    setErrorMessage(errorMessage);
-    return false;
-  }
-
-  protected boolean validateTargetNamespace(String ns)
-  {
-    boolean test = true;
-    try
-    {
-    	new URI(ns);
-//      URI testURI = new URI(ns);
-      //      if (!testURI.isGenericURI())
-      //      {
-      //        setErrorMessage(WSDLEditorPlugin.getInstance().getWSDLString("_UI_ERROR_NAMESPACE_INVALID")); //$NON-NLS-1$
-      //        test = false;
-      //      }
-    }
-    catch (URISyntaxException e)
-    {
-      //			String errorMessage = ValidateHelper.checkXMLName(ns);
-      //			if (errorMessage == null || errorMessage.length() == 0)
-      //			{
-      //				test = true;
-      //			}
-      //			else
-      //			{
-      setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_NAMESPACE_INVALID")); //$NON-NLS-1$
-      test = false;
-      //			}
-    }
-
-    return test;
-  }
-
-  /*
-  private boolean arePrefixesUniqueAndValid()
-  {
-    java.util.List infoList = namespaceInfo.getNamespaceInfoList();
-    java.util.List checkedList = namespaceInfo.getNamespaceCheckedList();
-
-    Vector prefixList = new Vector();
-    boolean test = true;
-    boolean isOneBlank = false;
-
-    String currentPrefix = prefixText.getText().trim();
-    if (currentPrefix.length() == 0)
-    {
-      isOneBlank = true;
-    }
-    else
-    {
-      if (validatePrefix(currentPrefix))
-      {
-        prefixList.add(currentPrefix);
-      }
-      else
-      {
-        setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_PREFIX_IS_INVALID", currentPrefix)); //$NON-NLS-1$
-        return false;
-      }
-    }
-
-    for (int i = 0; i < infoList.size(); i++)
-    {
-      NamespaceInfo info = (NamespaceInfo)infoList.get(i);
-      if (((String)checkedList.get(i)).equals("true")) //$NON-NLS-1$
-      {
-        String aPrefix = info.prefix.trim();
-        if (aPrefix.length() > 0)
-        {
-          if (!prefixList.contains(aPrefix))
-          {
-            if (validatePrefix(aPrefix))
-            {
-              prefixList.add(aPrefix);
-            }
-            else
-            {
-              setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_PREFIX_IS_INVALID", info.prefix)); //$NON-NLS-1$
-              test = false;
-              break;
-            }
-          }
-          else
-          {
-            setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_PREFIX_IS_A_DUPLICATE", info.prefix)); //$NON-NLS-1$
-            test = false;
-            break;
-          }
-        }
-        else
-        {
-          if (!isOneBlank)
-          {
-            isOneBlank = true;
-          }
-          else
-          {
-            setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_MORE_THAN_ONE_PREFIX_IS_BLANK")); //$NON-NLS-1$
-            test = false;
-            break;
-          }
-        }
-      }
-    }
-    return test;
-  }
-  */
-
-  protected DelayedEvent delayedTask;
-  protected void startDelayedEvent(ModifyEvent e)
-  {
-    if (delayedTask == null || delayedTask.getEvent() == null)
-    {
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500, delayedTask);
-    }
-    else
-    {
-      ModifyEvent delayedEvent = delayedTask.getEvent();
-
-      if (e.widget == delayedEvent.widget)
-      {
-        // same event, just different data, delay new event
-        delayedTask.setEvent(null);
-      }
-      delayedTask = new DelayedEvent();
-      delayedTask.setEvent(e);
-      Display.getDefault().timerExec(500, delayedTask);
-    }
-  }
-
-  class DelayedEvent implements Runnable
-  {
-    protected ModifyEvent event;
-
-    /*
-     * @see Runnable#run()
-     */
-    public void run()
-    {
-      if (event != null)
-      {
-        setPageComplete(isPageComplete());
-        event = null;
-      }
-    }
-
-    public ModifyEvent getEvent()
-    {
-      return event;
-    }
-
-    public void setEvent(ModifyEvent event)
-    {
-      this.event = event;
-    }
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e) {
-  }
-
-  public void widgetSelected(SelectionEvent e) {
-  	 if (e.widget == createSkeletonCheckBox) {
-  	 	if (createSkeletonCheckBox.getSelection()) {
-  	 		wsdlSkeletonGroup.setVisible(true);
-  	 		sepLabel.setVisible(true);
-  	 		protocolPageBook.setVisible(true);
-  	 	}
-  	 	else {
-  	 		wsdlSkeletonGroup.setVisible(false);
-  	 		sepLabel.setVisible(false);
-  	 		protocolPageBook.setVisible(false);
-  	 	}
-  	 }
-  }
-  
-  private static final String SOAP_PROTOCOL = "SOAP";
-  private static final String HTTP_PROTOCOL = "HTTP";
-  private static final String SOAP_RPC_ENCODED = WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_ENCODED");
-  private static final String SOAP_RPC_LITERAL = WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_LITERAL");
-  private static final String SOAP_DOCUMENT_LITERAL = WSDLEditorPlugin.getWSDLString("_UI_RADIO_DOCUMENT_LITERAL");
-  private static final String HTTP_POST = "HTTP POST";
-  private static final String HTTP_GET = "HTTP GET";
-
-  Composite wsdlSkeletonGroup;
-  Button createSkeletonCheckBox;
-  
-  Label sepLabel;
-  
-  private Label createLabel(Composite comp, String labelString) {
-    Label label = new Label(comp, SWT.LEFT);
-    label.setText(labelString);
-    GridData nsData = new GridData();
-    nsData.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(nsData);
-    
-    return label;
-  }
-  
-  public Vector getNamespaceInfo() {
-		Vector namespaces = new Vector();
-  		
-  		// Add Default Namespaces
-		NamespaceInfo info1 = new NamespaceInfo();
-		info1.prefix = "wsdl";
-		info1.uri = "http://schemas.xmlsoap.org/wsdl/";
-		namespaces.addElement(info1);
-		
-		NamespaceInfo info8 = new NamespaceInfo();
-		info8.prefix = "xsd";
-		info8.uri = "http://www.w3.org/2001/XMLSchema";
-		namespaces.addElement(info8);
-		
-		return namespaces;
-  }
-  
-  public boolean getCreateSkeletonBoolean() {
-  	return createSkeletonCheckBox.getSelection();
-  }
-  
-  public String getProtocol() {
-  	return protocolCombo.getText();
-  }
-  
-  public Object[] getProtocolOptions() {
-  	Object bool[] = new Boolean[3];
-  	if (protocolCombo.getText().equals(SOAP_PROTOCOL)) {
-  		if (docLitRadio.getSelection()) {
-  			bool[0] = new Boolean(true);
-  		}
-  		else {
-  			bool[0] = new Boolean(false);
-  		}
-  		
-  		if (rpcLitRadio.getSelection()) {
-  			bool[2] = new Boolean(true);
-  		}
-  		else {
-  			bool[2] = new Boolean(false);
-  		}
-  	}
-  	else if (protocolCombo.getText().equals(HTTP_PROTOCOL)){
-  		if (httpGetRadio.getSelection()) {
-  			bool[0] = new Boolean(false);
-  		}
-  		else {
-  			bool[0] = new Boolean(true);
-  		}
-  	}
-  	
-  	return bool;
-  }
-  
-  public boolean isSoapDocLiteralProtocol() {
-  	if (getProtocol().equals(SOAP_PROTOCOL) && docLitRadio.getSelection()) {
-  		return true;
-  	}
-  	else {
-  		return false;
-  	}
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java
deleted file mode 100644
index c506447..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.wizards;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class WSDLNewFilePage extends WizardNewFileCreationPage
-{
-  public WSDLNewFilePage(IStructuredSelection selection) 
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_TITLE_NEW_WSDL_FILE"), selection); //$NON-NLS-1$
-    setTitle(WSDLEditorPlugin.getWSDLString("_UI_TITLE_NEW_WSDL_FILE")); //$NON-NLS-1$
-    setDescription(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATE_NEW_WSDL_FILE")); //$NON-NLS-1$
-  }
-
-  public void createControl(Composite parent) 
-  {
-    // inherit default container and name specification widgets
-    super.createControl(parent);
-    this.setFileName(computeDefaultFileName());
-
-    setPageComplete(validatePage());
-  }
-  
-  protected boolean validatePage()
-  {
-    Path newName = new Path(getFileName());
-    String fullFileName = getFileName();
-    String extension = newName.getFileExtension();
-    if (extension == null || !extension.equalsIgnoreCase("wsdl"))  //$NON-NLS-1$
-    {
-      setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_FILE_MUST_END_WITH_WSDL")); //$NON-NLS-1$
-      return false;
-    }
-    else 
-    {
-      setErrorMessage(null);
-    }
-
-    // check for file should be case insensitive
-    String sameName = existsFileAnyCase(fullFileName);
-    if (sameName != null) 
-    {
-//       String qualifiedFileName = getContainerFullPath().toString() + '/' + fullFileName;
-       setErrorMessage(WSDLEditorPlugin.getWSDLString("_UI_ERROR_FILE_ALREADY_EXISTS",  sameName)); //$NON-NLS-1$
-       return false;
-    }
-
-    
-    return super.validatePage();
-  }
-
-  public String defaultName = "NewWSDLFile"; //$NON-NLS-1$
-  public String defaultFileExtension = ".wsdl"; //$NON-NLS-1$
-  public String[] filterExtensions = { "*.wsdl"}; //$NON-NLS-1$
-
-
-  protected String computeDefaultFileName()
-  {
-    int count = 0;
-    String fileName = defaultName + defaultFileExtension;
-    IPath containerFullPath = getContainerFullPath();
-    if (containerFullPath != null)
-    {
-      while (true)
-      {
-        IPath path = containerFullPath.append(fileName);
-        // if (WorkbenchUtility.getWorkspace().getRoot().exists(path))
-        if (ResourcesPlugin.getWorkspace().getRoot().exists(path))
-        {
-          count++;
-          fileName = defaultName + count + defaultFileExtension;
-        }
-        else
-        {
-          break;
-        }
-      }
-    }
-    return fileName;
-  }
-
-  // returns true if file of specified name exists in any case for selected container
-  protected String existsFileAnyCase(String fileName)
-  {
-    if ( (getContainerFullPath() != null) && (getContainerFullPath().isEmpty() == false)
-          && (fileName.compareTo("") != 0))
-    {
-      //look through all resources at the specified container - compare in upper case
-      IResource parent = ResourcesPlugin.getWorkspace().getRoot().findMember(getContainerFullPath());
-      if (parent instanceof IContainer)
-      {
-        IContainer container = (IContainer) parent;
-        try
-        {
-          IResource[] members = container.members();
-          String enteredFileUpper = fileName.toUpperCase();
-          for (int i=0; i<members.length; i++)
-          {
-            String resourceUpperName = members[i].getName().toUpperCase();
-            if (resourceUpperName.equals(enteredFileUpper))
-            {  
-              return members[i].getName();    
-            }
-          }
-        }
-        catch (CoreException e)
-        {
-        }
-      }
-    }
-    return null;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDDetailsViewerProvider.java
deleted file mode 100644
index 073604d..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDDetailsViewerProvider.java
+++ /dev/null

@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-
-
-public class XSDDetailsViewerProvider // implements IDetailsViewerProvider
-{
-//  public Object getViewerKey(Object modelObject)
-//  {                              
-//    Object result = null;   
-//
-//    if (modelObject instanceof XSDConcreteComponent)
-//    {
-//      Element input = ((XSDConcreteComponent)modelObject).getElement();
-//
-//      if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, false))
-//      {
-//        result = "element";
-//      }
-//      else if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, true))
-//      {
-//        result = "elementRef";
-//      }
-//      else if (inputEquals(input, XSDConstants.SEQUENCE_ELEMENT_TAG, false) ||
-//                inputEquals(input, XSDConstants.CHOICE_ELEMENT_TAG, false) ||
-//                inputEquals(input, XSDConstants.ALL_ELEMENT_TAG, false))
-//      {
-//        result = "sequenceChoiceAll";
-//      }
-//      else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, false))
-//      {
-//        result = "attribute";
-//      }
-//      else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true))
-//      {
-//        result = "attributeRef";
-//      }
-//      else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, false))
-//      {
-//        result = "attributeGroup";
-//      }
-//      else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, true))
-//      {
-//        result = "attributeGroupRef";
-//      }
-//      else if (inputEquals(input, XSDConstants.NOTATION_ELEMENT_TAG, false))
-//      {
-//        result = "notation";
-//      }
-//      else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, false))
-//      {
-//        result = "group";
-//      }
-//      else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, true))
-//      {
-//        result = "groupRef";
-//      }
-//      else if (inputEquals(input, XSDConstants.SCHEMA_ELEMENT_TAG, false))
-//      {
-//        result = "schema";
-//      }
-//      else if (inputEquals(input, XSDConstants.COMPLEXTYPE_ELEMENT_TAG, false))
-//      {
-//        result = "complexType";
-//      }
-//      else if (inputEquals(input, XSDConstants.DOCUMENTATION_ELEMENT_TAG, false))
-//      {
-//        result = "documentation";
-//      }
-//      else if (inputEquals(input, XSDConstants.APPINFO_ELEMENT_TAG, false))
-//      {
-//        result = "appInfo";
-//      }
-//      else if (inputEquals(input, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-//      {
-//        if (input != null && input instanceof Element)
-//        {
-//          Element parentElement = (Element)input;
-//          XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-//          Element derivedByNode = xsdDOMHelper.getDerivedByElement(parentElement);
-//          if (derivedByNode != null)
-//          {
-//            if (inputEquals(derivedByNode, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-//            {
-//              result = "simpleContent";
-//            }
-//            else if (inputEquals(derivedByNode, XSDConstants.EXTENSION_ELEMENT_TAG, false))
-//            {
-//              result = "simpleContent";
-//            }
-//          }
-//          else
-//          {
-//            result = "xsd";
-//          }
-//        }
-//      }
-//      else if (inputEquals(input, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-//      {
-//        if (input != null && input instanceof Element)
-//        {
-//          Element parentElement = (Element)input;
-//          XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-//          Element derivedByNode = xsdDOMHelper.getDerivedByElement(parentElement);
-//          if (derivedByNode != null)
-//          {
-//            result = "simpleContent";
-//          }
-//          else
-//          {
-//            result = "xsd";
-//          }
-//        }
-//      }
-//      else if (inputEquals(input, XSDConstants.INCLUDE_ELEMENT_TAG, false))
-//      {
-//        result = "includeXSD";
-//      }
-//      else if (inputEquals(input, XSDConstants.IMPORT_ELEMENT_TAG, false))
-//      {
-//        result = "importXSD";
-//      }
-//      else if (inputEquals(input, XSDConstants.REDEFINE_ELEMENT_TAG, false))
-//      {
-//        result = "redefine";
-//      }
-//      else if (inputEquals(input, XSDConstants.LIST_ELEMENT_TAG, false))
-//      {
-//        result = "simpleBase";
-//      }
-//      else if (inputEquals(input, XSDConstants.UNION_ELEMENT_TAG, false))
-//      {
-//        result = "simpleBase";
-//      }
-//      else if (inputEquals(input, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-//      {
-//        result = getKeyForRestrictWindow(input);
-//      }
-//      else if (XSDDOMHelper.isFacet(input))
-//      {
-//        if (input != null && input instanceof Element)
-//        {
-//          Node parentElement = ((Element)input).getParentNode();
-//          if (inputEquals(parentElement, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-//          {
-//            result = getKeyForRestrictWindow(input);
-//          } 
-//        }
-//      }
-//      else if (inputEquals(input, XSDConstants.EXTENSION_ELEMENT_TAG, false))
-//      {
-//        if (input != null && input instanceof Element)
-//        {
-//          Node parentElement = ((Element)input).getParentNode();
-//          if (inputEquals(parentElement, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-//          {
-//            result = "simpleContent";
-//          }
-//          else if (inputEquals(parentElement, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-//          {
-//            result = "simpleContent";
-//          }
-//          else
-//          {
-//            result = "xsd";            
-//          }
-//        }
-//      }
-//      else if (inputEquals(input, XSDConstants.PATTERN_ELEMENT_TAG, false))
-//      {
-//        result = "pattern";
-//      }
-//      else if (inputEquals(input, XSDConstants.ENUMERATION_ELEMENT_TAG, false))
-//      {
-//        result = "enum";
-//      }
-//      else if (inputEquals(input, XSDConstants.ANY_ELEMENT_TAG, false))
-//      {
-//        result = "anyElement";
-//      }
-//      else if (inputEquals(input, XSDConstants.ANYATTRIBUTE_ELEMENT_TAG, false))
-//      {
-//        result = "anyAttribute";
-//      }
-//      else if (inputEquals(input, XSDConstants.UNIQUE_ELEMENT_TAG, false))
-//      {
-//        result = "unique";
-//      }
-//      else if (inputEquals(input, XSDConstants.KEYREF_ELEMENT_TAG, false))
-//      {
-//        result = "keyRef";
-//      }
-//      else if (inputEquals(input, XSDConstants.SELECTOR_ELEMENT_TAG, false))
-//      {
-//        result = "selector";
-//      }
-//      else if (inputEquals(input, XSDConstants.FIELD_ELEMENT_TAG, false))
-//      {
-//        result = "field";
-//      }
-//      else if (inputEquals(input, XSDConstants.KEY_ELEMENT_TAG, false))
-//      {
-//        result = "key";
-//      }
-//      else
-//      {
-//        result = "xsd";
-//      }      
-//    }  
-//    else if (modelObject instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement)
-//    {
-//      result = "schema";
-//    }
-//
-//    return result;
-//  }                                                                
-//
-//
-//  public Viewer createViewer(Object modelObject, Composite parent, IEditorPart editorPart)
-//  {                                       
-//    Viewer viewer = null;
-//
-//    
-//    DesignViewer designViewer = new DesignViewer(editorPart);
-//    designViewer.setControl(parent);    
-//    if (modelObject instanceof XSDConcreteComponent)
-//    {
-//      Element elem = ((XSDConcreteComponent)modelObject).getElement();
-//      viewer = designViewer.createViewer(elem);
-////TODO port
-////      ((BaseWindow)viewer).setModelObject(modelObject);
-////      viewer.setInput(elem);
-//    }
-//    else if (modelObject instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement)
-//    {
-//      XSDSchemaExtensibilityElement schema = (XSDSchemaExtensibilityElement)modelObject;
-//      XSDSchema xsdSchema = schema.getSchema();
-//      Element elem = xsdSchema.getElement();
-//      viewer = designViewer.createViewer(elem);
-////TODO port
-////      ((BaseWindow)viewer).setModelObject(modelObject);
-////      viewer.setInput(elem);      
-//    }
-//    return viewer;
-//  }
-//
-//  protected boolean inputEquals(Object input, String tagname, boolean isRef)
-//  {
-//    return XSDDOMHelper.inputEquals(input, tagname, isRef);
-//  }
-//
-//  protected String getKeyForRestrictWindow(Object input)
-//  {
-//    // special case where SimpleType restriction is different than SimpleContent restriction
-//
-//    if (input != null && input instanceof Element)
-//    {
-//      Node parentElement = ((Element)input).getParentNode();
-//      if (inputEquals(parentElement, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false))
-//      {
-//        return "simpleRestrict";
-//      }
-//      else if (inputEquals(parentElement, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-//      {
-//        return "simpleRestrict";
-//      }
-//      else if (inputEquals(parentElement, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-//      {
-//        return "simpleContent";
-//      }
-//    }
-//    return "xsd";
-//  }
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtension.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtension.java
deleted file mode 100644
index fa840f5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtension.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-                                           
-
-// import org.eclipse.emf.edit.provider.ItemProvider;
-// import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-// import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.xsd.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.graph.model.Category;
-import org.eclipse.wst.xsd.ui.internal.provider.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDAdapterFactoryLabelProvider;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDModelAdapterFactoryImpl;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-
-//
-//
-public class XSDExtension implements WSDLEditorExtension
-{
-  XSDModelAdapterFactoryImpl xsdModelAdapterFactory;
-  XSDAdapterFactoryLabelProvider adapterFactoryLabelProvider;
-  
-  public XSDExtension()
-  {
-    xsdModelAdapterFactory = new XSDModelAdapterFactoryImpl();
-    adapterFactoryLabelProvider = new XSDAdapterFactoryLabelProvider(xsdModelAdapterFactory);
-  }
-  
-  public boolean isExtensionTypeSupported(int type)
-  {
-    return 
-           //CS comment these out until the port is complete
-           type == OUTLINE_TREE_CONTENT_PROVIDER || 
-           type == OUTLINE_LABEL_PROVIDER ||
-           type == PROPERTY_SOURCE_PROVIDER ||
-           type == PROPERTY_SECTION_DESCRIPTOR_PROVIDER ||
-           type == MENU_ACTION_CONTRIBUTOR ||
-           type == DETAILS_VIEWER_PROVIDER ||
-           type == EDIT_PART_FACTORY || 
-           type == TYPE_SYSTEM_PROVIDER ||
-           type == NODE_RECONCILER ||
-           type == NODE_ASSOCIATION_PROVIDER ||
-           type == MODEL_QUERY_CONTRIBUTOR;
-  }                                       
-
-  public boolean isApplicable(Object object)
-  {                     
-    return (object instanceof XSDSchemaExtensibilityElement || 
-            object instanceof XSDConcreteComponent ||
-            object instanceof CategoryAdapter ||
-            object instanceof Category);
-            // || object instanceof ItemProvider);
-  } 
-
-  public Object createExtensionObject(int type, WSDLEditor wsdlEditor)
-  {
-    Object result = null;
-    switch (type)
-    {
-      case OUTLINE_TREE_CONTENT_PROVIDER :
-      {
-        result = new XSDModelAdapterContentProvider(xsdModelAdapterFactory); 
-//        result = new XSDModelAdapterContentProvider();
-        // result = new AdapterFactoryContentProvider(XSDExtensionPlugin.getXSDSemanticItemProviderAdapterFactory());
-        break;
-      }
-      case OUTLINE_LABEL_PROVIDER :
-      {
-        result = new XSDLabelProvider(adapterFactoryLabelProvider);
-        // result = new AdapterFactoryLabelProvider(XSDExtensionPlugin.getXSDSemanticItemProviderAdapterFactory());
-        break;
-      }
-      case DETAILS_VIEWER_PROVIDER :
-      {
-        // result = new XSDDetailsViewerProvider();
-        result = null;
-        break;
-      }
-      case MENU_ACTION_CONTRIBUTOR :
-      {
-        result = new XSDMenuActionContributor(wsdlEditor);
-        break;
-      }
-      case TYPE_SYSTEM_PROVIDER :
-      {
-        result = new XSDTypeSystemProvider();
-        break;
-      }    
-      case EDIT_PART_FACTORY :
-      {
-        result = new XSDExtensionEditPartFactory();
-        break;
-      }
-      case NODE_RECONCILER :
-      {
-        result = new XSDNodeReconciler();
-        break;
-      }   
-      case NODE_ASSOCIATION_PROVIDER :
-      {
-        result = new XSDNodeAssociationProvider();
-        break;
-      }  
-      case MODEL_QUERY_CONTRIBUTOR :
-      {
-        //result = new XSDModelQueryContributor(wsdlEditor);
-        break;
-      }
-      case PROPERTY_SOURCE_PROVIDER:
-      {
-        result = new XSDPropertySourceProvider();
-        break;
-      }
-      case PROPERTY_SECTION_DESCRIPTOR_PROVIDER:
-      {
-        result = new XSDSectionDescriptorProvider();
-        break;
-      }
-      case XSD_DELETE_ACTION:
-      {
-        result = new DeleteAction(XSDEditorPlugin.getXSDString("_UI_ACTION_DELETE"));
-        break;
-      }
-    }
-    return result;
-  }
-} 
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtensionEditPartFactory.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtensionEditPartFactory.java
deleted file mode 100644
index 43c50c1..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDExtensionEditPartFactory.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts.XSDSchemaDrillDownEditPart;
-import org.eclipse.wst.xsd.ui.internal.graph.editparts.XSDEditPartFactory;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDExtensionEditPartFactory extends XSDEditPartFactory
-{
-  public EditPart createEditPart(EditPart parent, Object model)
-  {
-    EditPart editPart = null;
-            
-    if (model instanceof XSDSchema && parent.getModel() instanceof WSDLGroupObject)
-    {         
-      editPart = new XSDSchemaDrillDownEditPart();
-      editPart.setModel(model);
-      editPart.setParent(parent);
-    }
-    else
-    {
-      editPart = super.createEditPart(parent, model);
-    }
- 
-    return editPart;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDLabelProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDLabelProvider.java
deleted file mode 100644
index 66474aa..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDLabelProvider.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDAdapterFactoryLabelProvider;
-import org.eclipse.xsd.XSDSchema;
-
-
-
-/**
- * This version of the XSDLabelProvider is a modified version of the one in XSDEditor.
- * This provider only needs to handle nodes in the XML Schema namespace.
- * Other XML nodes (including comments, PIs etc) get handled by the 'main' provider.
- */
-public class XSDLabelProvider extends LabelProvider
-{
-  XSDAdapterFactoryLabelProvider adapterFactoryLabelProvider;
-  
-  /**
-   * Constructor for XSDLabelProvider.
-   */
-  public XSDLabelProvider(XSDAdapterFactoryLabelProvider adapterFactoryLabelProvider)
-  {
-    super();
-    this.adapterFactoryLabelProvider = adapterFactoryLabelProvider;
-  }
-  
-  /*
-   * @see ILabelProvider#getImage(Object)
-   */
-  public Image getImage(Object element)
-  {
-    if (element instanceof XSDSchemaExtensibilityElement)
-    {
-      element = ((XSDSchemaExtensibilityElement)element).getSchema().getElement();
-    }
-    return adapterFactoryLabelProvider.getImage(element);
-  }
-    
-  /*
-   * @see ILabelProvider#getText(Object)
-   */
-  public String getText(Object element)
-  {
-    // override text for xsd schema
-    if (element instanceof XSDSchema)
-    {
-      return ((XSDSchema)element).getTargetNamespace();
-    }
-    else
-    {
-    	// We don't call "adapterFactoryLabelProvider.getText(element)" because it will return a object.toString() if
-    	// there is no labelProvider....  but we don't want to display this 'garbage' info to the user.    	
-    	AdapterFactory adapterFactory = adapterFactoryLabelProvider.getAdapterFactory();
-        ILabelProvider labelProvider = (ILabelProvider)adapterFactory.adapt(element, ILabelProvider.class);
-        String text = "";
-        if (labelProvider != null) {
-        	text = labelProvider.getText(element);
-        }
-        
-        return text;
-    }
-  }
-
-}
-
-

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDMenuActionContributor.java
deleted file mode 100644
index 444acb5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDMenuActionContributor.java
+++ /dev/null

@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-                                      
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.gef.EditPart;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.xsd.actions.AddSchemaAction;
-import org.eclipse.wst.wsdl.ui.internal.xsd.actions.BackAction;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.XSDMenuListener;
-import org.eclipse.wst.xsd.ui.internal.actions.CreateElementAction;
-import org.eclipse.wst.xsd.ui.internal.actions.CreateGroupAction;
-import org.eclipse.wst.xsd.ui.internal.actions.DOMAttribute;
-import org.eclipse.wst.xsd.ui.internal.gef.util.editparts.AbstractComponentViewerRootEditPart;
-import org.eclipse.wst.xsd.ui.internal.graph.editparts.TopLevelComponentEditPart;
-import org.eclipse.wst.xsd.ui.internal.graph.model.Category;
-import org.eclipse.wst.xsd.ui.internal.provider.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDMenuActionContributor implements IMenuActionContributor
-{
-  Element currElement;
-  Document currDocument;
-//  XSDSchema xsdSchema;
-//  protected ISelectionProvider iSelectionProvider;
-  WSDLEditor wsdlEditor;
-
-  public XSDMenuActionContributor(WSDLEditor wsdlEditor)
-  {
-    this.wsdlEditor = wsdlEditor;
-  }
-
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object)
-  {
-    XSDMenuExtensionListener xsdMenuListener = new XSDMenuExtensionListener(wsdlEditor.getSelectionManager());
-    xsdMenuListener.contributeMenuActions(manager, node, object);
-  }
-
-  class XSDMenuExtensionListener extends XSDMenuListener
-  {
-    public XSDMenuExtensionListener(ISelectionProvider selectionProvider)
-    {
-      super(selectionProvider);
-    }
-    
-    protected boolean isSchemaReadOnly()
-    {
-    	Iterator eeIt = wsdlEditor.getDefinition().getETypes().getEExtensibilityElements().iterator();
-    	while (eeIt.hasNext()) {
-    		XSDSchemaExtensibilityElement ee = (XSDSchemaExtensibilityElement) eeIt.next();
-    		XSDSchema schema = ee.getSchema();
-    		if (schema == xsdSchema) {
-    			return false;
-    		}
-    	}
-    	
-    	
-    	return true;
-    }
-
-    /*
-     * TODO: For now, just return the first inline schema we have.
-     */
-    protected XSDSchema getCurrentSchemaInEditor()
-    {
-    	Iterator eeIt = wsdlEditor.getDefinition().getETypes().getEExtensibilityElements().iterator();
-    	while (eeIt.hasNext()) {
-    		XSDSchemaExtensibilityElement ee = (XSDSchemaExtensibilityElement) eeIt.next();
-    		return ee.getSchema();    		
-    	}
-    
-      return null;
-    }
-    
-    public void contributeMenuActions(IMenuManager manager, Node node, Object object)
-    {
-      updateXSDSchema();
-      AbstractComponentViewerRootEditPart editPart = (AbstractComponentViewerRootEditPart)wsdlEditor.getGraphViewer().getComponentViewer().getRootEditPart().getContents();
-//    iSelectionProvider = ((WSDLContentOutlinePage)(wsdlEditor.getWSDLTextEditor().getContentOutlinePage())).getTreeViewer();
-      EditPart focusEditPart = wsdlEditor.getGraphViewer().getComponentViewer().getFocusEditPart();
-
-      if (object instanceof WSDLGroupObject)
-      {
-        WSDLGroupObject group = (WSDLGroupObject)object;
-        if (group.getType() == WSDLGroupObject.TYPES_GROUP)
-        {
-          boolean typesExist = group.getParent().getTypes() != null;
-          
-          Element typesElement = null;
-          if (typesExist)
-          {
-            Types types = group.getParent().getETypes();
-            typesElement = types.getElement();
-          }
-          if (manager != null)
-          {
-            Document document = null;
-            if (editPart.getViewer() instanceof WSDLComponentViewer) {
-              WSDLComponentViewer wsdlComponentViewer = (WSDLComponentViewer) editPart.getViewer();
-              document = wsdlComponentViewer.getWSDLEditor().getXMLDocument();
-            }
-
-            manager.add(new AddSchemaAction(group.getDefinition(), (Element)node, typesElement, document));
-          }
-        }
-      } 
-      else if (object instanceof Types)
-      {
-        // IMenuManager menu = manager.findMenuUsingPath("addchild");
-
-        if (manager != null)
-        {
-          Types types = (Types)object;
-          manager.add(new AddSchemaAction(types.getEnclosingDefinition(), (Element)node));
-        }
-      }
-      
-      if (xsdSchema == null)
-      {
-        return;
-      }
-      
-      ArrayList attributes = null;
-      Node relativeNode = null;
-      
-      BackAction backAction;
-      
-      if (object instanceof XSDSchema || focusEditPart instanceof TopLevelComponentEditPart || object instanceof Category)
-      {
-        backAction = new BackAction(WSDLEditorPlugin.getWSDLString("_UI_BACK_TO_DEFINITION"));
-        backAction.setDefinition(wsdlEditor.getDefinition());
-        backAction.setSelectionProvider(selectionProvider);
-        backAction.setRootEditPart(editPart);
-        backAction.setGraphViewer(wsdlEditor.getGraphViewer());
-        manager.add(backAction);
-        manager.add(new Separator());
-      }
-      else if (object instanceof XSDConcreteComponent)
-      {
-        backAction = new BackAction(XSDEditorPlugin.getXSDString("_UI_ACTION_BACK_TO_SCHEMA_VIEW"));
-        // backAction.setXSDSchema(((XSDConcreteComponent)object).getSchema());
-        backAction.setXSDSchema(xsdSchema);
-        backAction.setSelectionProvider(selectionProvider);
-        backAction.setRootEditPart(editPart);
-        backAction.setGraphViewer(wsdlEditor.getGraphViewer());
-        manager.add(backAction);
-        manager.add(new Separator());
-      }
-
-      // CS: I'm removing the 'object instanceof Element' case from this test
-      // for now the menu actions are driven from 'model' objects
-      if (object instanceof XSDConcreteComponent || (object instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement))
-      {
-        Element parent;
-        if (object instanceof XSDConcreteComponent)
-        {
-          parent = ((XSDConcreteComponent)object).getElement();
-          xsdSchema = ((XSDConcreteComponent)object).getSchema();
-        }
-        else if (object instanceof Element)
-        {
-          manager.add(new Separator());
-          parent = (Element)object; 
-        }
-        else if (object instanceof org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement)
-        {
-          XSDSchemaExtensibilityElement schema = (XSDSchemaExtensibilityElement)object;
-          xsdSchema = schema.getSchema();
-          manager.add(new Separator());
-          parent = xsdSchema.getElement();
-        }
-        else
-        {
-          return;
-        }
-        
-        currElement = parent;
-        currDocument = parent.getOwnerDocument();
-        
-//        if (!(currDocument instanceof DocumentImpl))
-//        {
-//          return;
-//        }
-        
-        addContextItems(manager, currElement, null);
-
-        if (!(object instanceof XSDSchema) ||
-           	(object instanceof XSDSchema && !(wsdlEditor.getGraphViewer().getComponentViewer().getInput() instanceof XSDSchema))) {
-           	IStructuredSelection selections = (IStructuredSelection) wsdlEditor.getSelectionManager().getSelection();
-           	manager.add(new Separator());
-           	org.eclipse.wst.wsdl.ui.internal.actions.DeleteWSDLAndXSDAction deleteWSDLAndXSDAction = new org.eclipse.wst.wsdl.ui.internal.actions.DeleteWSDLAndXSDAction(selections.toList(), currElement, wsdlEditor);
-           	deleteWSDLAndXSDAction.setEnabled(!isReadOnly);
-           	manager.add(deleteWSDLAndXSDAction);
-        }
-      }
-      else if (object instanceof Category
-            || object instanceof CategoryAdapter)
-      {
-        int groupType = -1;
-
-        if (object instanceof Category)
-        {
-          Category cg = (Category)object;
-          xsdSchema = cg.getXSDSchema();
-          groupType = cg.getGroupType();
-        }
-        else  // CategoryAdapter
-        {
-          CategoryAdapter category = (CategoryAdapter)object;
-          groupType = category.getGroupType();
-          xsdSchema = category.getXSDSchema();
-        }
-        Element parent = xsdSchema.getElement();
-        currElement = parent;
-        currDocument = parent.getOwnerDocument();
-        switch (groupType)
-        {
-          case Category.TYPES:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE, getNewGlobalTypeName("ComplexType")));
-            Action action = addCreateElementAction(manager, XSDConstants.COMPLEXTYPE_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_COMPLEX_TYPE"), attributes, parent, relativeNode);
-            ((CreateElementAction)action).setIsGlobal(true);
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE, getNewGlobalTypeName("SimpleType")));
-            Action action2 = addCreateSimpleTypeAction(manager, XSDConstants.SIMPLETYPE_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_SIMPLE_TYPE"), attributes, parent, relativeNode);
-            ((CreateElementAction)action2).setIsGlobal(true);
-            break;
-          }
-          case Category.ELEMENTS:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
-                                            getNewGlobalName(XSDConstants.ELEMENT_ELEMENT_TAG, "GlobalElement")));
-            attributes.add(new DOMAttribute(XSDConstants.TYPE_ATTRIBUTE, getBuiltInStringQName()));
-            Action action = addCreateElementAction(manager, XSDConstants.ELEMENT_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_ELEMENT"), attributes, parent, relativeNode);
-            ((CreateElementAction)action).setIsGlobal(true);
-            break;
-          }
-          case Category.GROUPS:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
-                                            getNewGlobalName(XSDConstants.GROUP_ELEMENT_TAG, "Group")));
-            CreateGroupAction groupAction = addCreateGroupAction(manager, XSDConstants.GROUP_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_GROUP"), attributes, parent, relativeNode);
-            groupAction.setIsGlobal(true);
-            break;
-          }
-          case Category.ATTRIBUTES:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
-                                            getNewGlobalName(XSDConstants.ATTRIBUTE_ELEMENT_TAG, "GlobalAttribute")));
-            attributes.add(new DOMAttribute(XSDConstants.TYPE_ATTRIBUTE, getBuiltInStringQName()));
-            Action action = addCreateElementAction(manager, XSDConstants.ATTRIBUTE_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_GLOBAL_ATTRIBUTE"), attributes, parent, relativeNode);
-            ((CreateElementAction)action).setIsGlobal(true);
-            break;
-          }
-          case Category.ATTRIBUTE_GROUPS:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE,
-                                            getNewGlobalName(XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, "AttributeGroup")));
-            Action action = addCreateElementAction(manager, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_ATTRIBUTE_GROUP"), attributes, parent, relativeNode);
-            ((CreateElementAction)action).setIsGlobal(true);
-            break; 
-          }
-          case Category.NOTATIONS:
-          {
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.NAME_ATTRIBUTE, 
-                           getNewGlobalName(XSDConstants.NOTATION_ELEMENT_TAG, "Notation")));
-            attributes.add(new DOMAttribute(XSDConstants.PUBLIC_ATTRIBUTE, ""));
-            Action action = addCreateElementAction(manager, XSDConstants.NOTATION_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_NOTATION"), attributes, parent, relativeNode);
-            ((CreateElementAction)action).setIsGlobal(true);
-            break;
-          }
-          case Category.DIRECTIVES:
-          {
-            boolean b = true;
-            NodeList children = parent.getChildNodes();
-            Node effectiveRelativeNode = parent.getFirstChild();
-            for (int i=0; i < children.getLength() && b; i++)
-            {
-              Node child = children.item(i);
-              if (child != null && child instanceof Element)
-              {
-                if (XSDDOMHelper.inputEquals((Element)child, XSDConstants.INCLUDE_ELEMENT_TAG, false) ||
-                    XSDDOMHelper.inputEquals((Element)child, XSDConstants.IMPORT_ELEMENT_TAG, false) ||
-                    XSDDOMHelper.inputEquals((Element)child, XSDConstants.REDEFINE_ELEMENT_TAG, false) ||
-                    XSDDOMHelper.inputEquals((Element)child, XSDConstants.ANNOTATION_ELEMENT_TAG, false))
-                {
-                  effectiveRelativeNode = child;
-                }
-                else
-                {
-                  b = false;
-                }
-              }
-            }
-            relativeNode = effectiveRelativeNode != null ? effectiveRelativeNode.getNextSibling() : null;
-            attributes = new ArrayList();
-            attributes.add(new DOMAttribute(XSDConstants.SCHEMALOCATION_ATTRIBUTE, ""));
-
-            addCreateElementAction(manager, XSDConstants.INCLUDE_ELEMENT_TAG,XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_INCLUDE"), attributes, parent, relativeNode);
-            addCreateElementAction(manager, XSDConstants.IMPORT_ELEMENT_TAG,XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_IMPORT"), null, parent, relativeNode);
-            addCreateElementAction(manager, XSDConstants.REDEFINE_ELEMENT_TAG,XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_REDEFINE"), attributes, parent, relativeNode);
-            
-            
-            break;
-          }
-        }
-      }
-    }    
-
-    protected IFile getFileResource()
-    {
-  ///// WSDL TODO
-  //    if (getEditor() != null)
-  //      return getEditor().getFileResource();
-      return null;
-    }
-
-//    protected Object getSelectedElement()
-//    {
-//      return currElement;
-//    }
-
-    protected XSDSchema getXSDSchema()
-    {
-      return xsdSchema;
-    }
-  
-    protected IDOMModel getXMLModel()
-    {
-      if (currElement != null)
-      {
-        Object obj = currElement.getOwnerDocument();
-        if (obj instanceof DocumentImpl)
-        {
-          DocumentImpl xmlDoc = (DocumentImpl) currElement.getOwnerDocument();
-          return xmlDoc.getModel();
-        }
-      }
-      return null;
-    }
-  }
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDModelAdapterContentProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDModelAdapterContentProvider.java
deleted file mode 100644
index 4271d78..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDModelAdapterContentProvider.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDContentProvider;
-import org.eclipse.wst.xsd.ui.internal.provider.XSDModelAdapterFactoryImpl;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-
-public class XSDModelAdapterContentProvider extends XSDContentProvider
-{  
-  public XSDModelAdapterContentProvider(XSDModelAdapterFactoryImpl xsdModelAdapterFactory)
-  {
-    super(xsdModelAdapterFactory);
-  }
-
-  public Object[] getChildren(Object parentObject)
-  {                                     
-    XSDConcreteComponent xsdComp = null;
-    if (parentObject instanceof XSDSchemaExtensibilityElement)
-    {
-      XSDSchemaExtensibilityElement xsdSchemaExtensibilityElement = (XSDSchemaExtensibilityElement)parentObject;
-      xsdComp = xsdSchemaExtensibilityElement.getSchema();
-      return super.getChildren(xsdComp);
-    }
-    return super.getChildren(parentObject);    
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java
deleted file mode 100644
index 81367fd..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-                                                                    
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeAssociationProvider;
-import org.eclipse.wst.xsd.ui.internal.graph.model.Category;
-import org.eclipse.wst.xsd.ui.internal.provider.CategoryAdapter;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-class XSDNodeAssociationProvider implements INodeAssociationProvider
-{                    
-  public Object getModelObject(Object parentModelObject, Element[] elementChain, int start, int[] end)
-  {   
-    Object result = null;
-    if (parentModelObject instanceof XSDSchemaExtensibilityElement)
-    {
-      XSDSchemaExtensibilityElement extensibilityElement = (XSDSchemaExtensibilityElement)parentModelObject;
-      XSDSchema schema = extensibilityElement.getSchema();
-      if (schema != null)
-      {          
-        Element targetElement = elementChain[elementChain.length - 1];
-        result = schema.getCorrespondingComponent(targetElement);
-      }
-    }
-    else if (parentModelObject instanceof CategoryAdapter)
-    {
-      result = ((CategoryAdapter)parentModelObject).getXSDSchema();
-    }
-    else if (parentModelObject instanceof Category)
-    {
-      result = ((Category)parentModelObject).getXSDSchema();
-    }
-
-    return result;
-  }
-
-  public Node getNode(Object modelObject)
-  {        
-    Node node = null;
-    if (modelObject instanceof XSDSchemaExtensibilityElement)
-    {           
-      XSDSchemaExtensibilityElement extensibilityElement = (XSDSchemaExtensibilityElement)modelObject;
-      XSDSchema schema = extensibilityElement.getSchema();
-      if (schema != null)
-      {
-        node = schema.getElement();
-      }
-    }        
-    else if (modelObject instanceof XSDConcreteComponent)
-    {
-      node = ((XSDConcreteComponent)modelObject).getElement();
-    }
-    else if (modelObject instanceof CategoryAdapter)
-    {
-      node = ((CategoryAdapter)modelObject).getXSDSchema().getElement();
-    }
-    else if (modelObject instanceof Category)
-    {
-      node = ((Category)modelObject).getXSDSchema().getElement();
-    }
-    
-    return node;
-  }      
-} 
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeReconciler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeReconciler.java
deleted file mode 100644
index d4a77c6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeReconciler.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-                                           
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.extension.INodeReconciler;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-
-
-public class XSDNodeReconciler implements INodeReconciler
-{                    
-  public void notifyChanged(Object modelObject, Element element, int eventType, Object feature, Object oldValue, Object newValue, int index)
-  {                         
-    XSDConcreteComponent component = null;
-    if (modelObject instanceof XSDConcreteComponent)
-    {
-      component = (XSDConcreteComponent)modelObject;
-    }
-    else if (modelObject instanceof XSDSchemaExtensibilityElement)
-    {           
-      XSDSchemaExtensibilityElement extensibilityElement = (XSDSchemaExtensibilityElement)modelObject;
-      component = extensibilityElement.getSchema();
-    }   
-
-    if (component != null)
-    {
-      switch (eventType)
-      {
-        case INodeNotifier.CHANGE:
-        {                           
-          component.elementAttributesChanged(element); 
-          break;
-        }
-        case INodeNotifier.STRUCTURE_CHANGED:
-        {                              
-          component.elementContentsChanged(element);
-          break;
-        }
-        case INodeNotifier.CONTENT_CHANGED:
-        {                              
-          component.elementChanged(element);
-          break;
-        }
-      }                   
-    }
-  }
-}                                                                   
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDPropertySourceProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDPropertySourceProvider.java
deleted file mode 100644
index 95ff36e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDPropertySourceProvider.java
+++ /dev/null

@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.ui.provider.PropertySource;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.properties.AnyAttributePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AnyElementPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AppInfoPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AttributeGroupRefPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.AttributePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.BasePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ComplexTypePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.DocumentationPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ElementPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.EnumerationPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.GroupRefPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ImportPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.IncludePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.KeyrefPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.ModelGroupPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.NamePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.NotationPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.PatternPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SchemaPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleContentPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleRestrictPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleTypeListPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleTypePropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.SimpleTypeUnionPropertySource;
-import org.eclipse.wst.xsd.ui.internal.properties.XPathPropertySource;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class XSDPropertySourceProvider implements IPropertySourceProvider
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.views.properties.IPropertySourceProvider#getPropertySource(java.lang.Object)
-   */
-  public IPropertySource getPropertySource(Object object)
-  {
-// Using XSD's item providers
-//    XSDItemProviderAdapterFactory adapterFactory = XSDExtensionPlugin.getXSDItemProviderAdapterFactory();
-//   
-//    IItemPropertySource itemPropertySource =
-//      (IItemPropertySource)
-//        (object instanceof EObject && ((EObject)object).eClass() == null ?
-//          null :
-//          adapterFactory.adapt(object, IItemPropertySource.class));
-//    return 
-//    itemPropertySource != null ?  createPropertySource(object, itemPropertySource) : null;
-    
-    if (object == null) return null;
-    
-    if (object instanceof XSDSchemaExtensibilityElement)
-    {
-      object = ((XSDSchemaExtensibilityElement)object).getSchema();
-    }
-    if (object instanceof XSDConcreteComponent)
-    {
-      BasePropertySource bps = (BasePropertySource)getXSDPropertySource(object);
-      Element input = ((XSDConcreteComponent)object).getElement();
-      bps.setInput(input);
-      return bps;
-    }
-    return null;
-  }
-
-  protected IPropertySource createPropertySource(Object object, IItemPropertySource itemPropertySource)
-  {
-    return new PropertySource(object, itemPropertySource);
-  }
-  
-  protected boolean inputEquals(Object input, String tagname, boolean isRef)
-  {
-    return XSDDOMHelper.inputEquals(input, tagname, isRef);
-  }
-
-  boolean showParent = false;
-  
-  // TODO: We should use adapters to do this.  Do as we complete 'model'-based port
-  public IPropertySource getXSDPropertySource(Object object)
-  {
-    XSDSchema xsdSchema = ((XSDConcreteComponent)object).getSchema();
-    Element input = ((XSDConcreteComponent)object).getElement();
-
-    if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, false))
-    {
-      return new ElementPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ELEMENT_ELEMENT_TAG, true))
-    {
-      return new GroupRefPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.SEQUENCE_ELEMENT_TAG, false) ||
-              inputEquals(input, XSDConstants.CHOICE_ELEMENT_TAG, false) ||
-              inputEquals(input, XSDConstants.ALL_ELEMENT_TAG, false))
-    {
-      return new ModelGroupPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, false))
-    {
-      return new AttributePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true))
-    {
-      return new AttributeGroupRefPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, false))
-    {
-      return new NamePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, true))
-    {
-      return new AttributeGroupRefPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.NOTATION_ELEMENT_TAG, false))
-    {
-      return new NotationPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false))
-    {
-      return new SimpleTypePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, false))
-    {
-      return new NamePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.GROUP_ELEMENT_TAG, true))
-    {
-      return new GroupRefPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.SCHEMA_ELEMENT_TAG, false))
-    {
-      return new SchemaPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.COMPLEXTYPE_ELEMENT_TAG, false))
-    {
-      return new ComplexTypePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.DOCUMENTATION_ELEMENT_TAG, false))
-    {
-      return new DocumentationPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.APPINFO_ELEMENT_TAG, false))
-    {
-      return new AppInfoPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-    {
-      if (input != null && input instanceof Element)
-      {
-        Element parent = (Element)input;
-        XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-        Element derivedByNode = xsdDOMHelper.getDerivedByElement(parent);
-        if (derivedByNode != null)
-        {
-          if (inputEquals(derivedByNode, XSDConstants.RESTRICTION_ELEMENT_TAG, false) || 
-              inputEquals(derivedByNode, XSDConstants.EXTENSION_ELEMENT_TAG, false))
-          {
-            return new SimpleContentPropertySource(xsdSchema);
-          }
-        }
-        else
-        {
-          return null;
-        }
-      }
-    }
-    else if (inputEquals(input, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-    {
-      if (input != null && input instanceof Element)
-      {
-        Element parent = (Element)input;
-        XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-        Element derivedByNode = xsdDOMHelper.getDerivedByElement(parent);
-        if (derivedByNode != null)
-        {
-          return new SimpleContentPropertySource(xsdSchema);
-        }
-        else
-        {
-          return null;
-        }
-      }
-    }
-    else if (inputEquals(input, XSDConstants.INCLUDE_ELEMENT_TAG, false))
-    {
-//      if (editor instanceof XSDEditor)
-//      {
-//        IFile inputFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-        IFile inputFile = null;
-        return new IncludePropertySource(xsdSchema, inputFile);
-//      }
-//      return null;
-    }
-    else if (inputEquals(input, XSDConstants.IMPORT_ELEMENT_TAG, false))
-    {
-//      if (editor instanceof XSDEditor)
-//      {
-//        IFile inputFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-      IFile inputFile = null;
-        return new ImportPropertySource(xsdSchema, inputFile);
-//      }
-//      return null;
-    }
-    else if (inputEquals(input, XSDConstants.REDEFINE_ELEMENT_TAG, false))
-    {
-//      if (editor instanceof XSDEditor)
-//       {
-//        IFile inputFile = ((IFileEditorInput)editor.getEditorInput()).getFile();
-      IFile inputFile = null;
-        return new IncludePropertySource(xsdSchema, inputFile);
-//      }
-//      return null;
-    }
-    else if (inputEquals(input, XSDConstants.LIST_ELEMENT_TAG, false))
-    {
-      return new SimpleTypeListPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.UNION_ELEMENT_TAG, false))
-    {
-      return new SimpleTypeUnionPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-    {
-      return createRestrictWindow(input, xsdSchema);
-    }
-    else if (XSDDOMHelper.isFacet(input))
-    {
-      if (input != null && input instanceof Element)
-      {
-        Node parent = ((Element)input).getParentNode();
-        if (inputEquals(parent, XSDConstants.RESTRICTION_ELEMENT_TAG, false))
-        {
-          return createRestrictWindow(input, xsdSchema);
-        } 
-      }
-    }
-    else if (inputEquals(input, XSDConstants.EXTENSION_ELEMENT_TAG, false))
-    {
-      if (input != null && input instanceof Element)
-      {
-        Node parent = ((Element)input).getParentNode();
-        if (inputEquals(parent, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false)
-            || inputEquals(parent, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-        {
-          showParent = true;
-          return new SimpleContentPropertySource(xsdSchema);
-        }
-      }
-    }
-    else if (inputEquals(input, XSDConstants.PATTERN_ELEMENT_TAG, false))
-    {
-      return new PatternPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ENUMERATION_ELEMENT_TAG, false))
-    {
-      return new EnumerationPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ANY_ELEMENT_TAG, false))
-    {
-      return new AnyElementPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.ANYATTRIBUTE_ELEMENT_TAG, false))
-    {
-      return new AnyAttributePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.UNIQUE_ELEMENT_TAG, false))
-    {
-      return new NamePropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.KEYREF_ELEMENT_TAG, false))
-    {
-      return new KeyrefPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.SELECTOR_ELEMENT_TAG, false))
-    {
-      return new XPathPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.FIELD_ELEMENT_TAG, false))
-    {
-      return new XPathPropertySource(xsdSchema);
-    }
-    else if (inputEquals(input, XSDConstants.KEY_ELEMENT_TAG, false))
-    {
-      return new NamePropertySource(xsdSchema);
-    }
-    else
-    {
-      return null;
-    }
-    return null;
-  }
-  
-  protected IPropertySource createRestrictWindow(Object input, XSDSchema xsdSchema)
-  {
-    // special case where SimpleType restriction is different than SimpleContent restriction
-
-    if (input != null && input instanceof Element)
-    {
-      Node parent = ((Element)input).getParentNode();
-      if (inputEquals(parent, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false))
-      {
-        return new SimpleRestrictPropertySource(xsdSchema);
-      }
-      else if (inputEquals(parent, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-      {
-        return new SimpleRestrictPropertySource(xsdSchema);
-      }
-      else if (inputEquals(parent, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-      {
-        showParent = true;
-        return new SimpleContentPropertySource(xsdSchema);
-      }
-    }
-    return null;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java
deleted file mode 100644
index 9b5f5a1..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider;
-
-public class XSDSectionDescriptorProvider implements ISectionDescriptorProvider
-{
-  org.eclipse.wst.xsd.ui.internal.properties.section.XSDSectionDescriptorProvider descriptor;
-  /**
-   * 
-   */
-  public XSDSectionDescriptorProvider()
-  {
-    super();
-    descriptor = new org.eclipse.wst.xsd.ui.internal.properties.section.XSDSectionDescriptorProvider();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider#getSectionDescriptors()
-   */
-  public ISectionDescriptor[] getSectionDescriptors()
-  {
-    return descriptor.getSectionDescriptors();
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTempDetailsViewer.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTempDetailsViewer.java
deleted file mode 100644
index 1b01ef6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTempDetailsViewer.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-                                 
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.wst.wsdl.ui.internal.viewers.BaseViewer;
-       
-
-public class XSDTempDetailsViewer extends BaseViewer
-{   
-  protected Composite control;
-
-  public XSDTempDetailsViewer(Composite parent)
-  { 
-    super(null);
-    createControl(parent);
-  }
-              
-  public void doSetInput(Object input)
-  {    
-  }
-
-  public void createControl(Composite parent)
-  {
-    control = flatViewUtility.createComposite(parent, 1, true); 
-                                      
-    flatViewUtility.createFlatPageHeader(control, "XSDViewer");
-  }
-  
-  protected void update()
-  {
-  }
-
-  public Control getControl()
-  {
-    return control;
-  }
-
-  public void doHandleEvent(Event event)
-  {
-
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTypeSystemProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTypeSystemProvider.java
deleted file mode 100644
index 2d8fadf..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDTypeSystemProvider.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.extension.ITypeSystemProvider;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.impl.XSDImportImpl;
-
-//
-//
-public class XSDTypeSystemProvider implements ITypeSystemProvider
-{
-    public List getPrefixes(Definition definition, String namespace)
-    {
-        List list = new ArrayList();
-        Map map = definition.getNamespaces();
-        for (Iterator i = map.keySet().iterator(); i.hasNext();)
-        {
-            String prefix = (String) i.next();
-            String theNamespace = (String) map.get(prefix);
-            if (theNamespace != null && theNamespace.equals(namespace))
-            {
-                list.add(prefix);
-            }
-        }
-        return list;
-    }
-
-    public List getPrefixedNames(Definition definition, String namespace, String localName)
-    {
-        List list = new ArrayList();
-        for (Iterator i = getPrefixes(definition, namespace).iterator(); i.hasNext();)
-        {
-            String prefix = (String) i.next();
-            String name = (prefix != null && prefix.length() > 0) ? prefix + ":" + localName : localName;
-            list.add(name);
-        }
-        return list;
-    }
-
-    protected void addNamedComponents(Definition definition, List list, List namedComponents)
-    {
-        for (Iterator i = namedComponents.iterator(); i.hasNext();)
-        {
-            XSDNamedComponent component = (XSDNamedComponent) i.next();
-            list.addAll(getPrefixedNames(definition, component.getTargetNamespace(), component.getName()));
-        }
-    }
-
-    public void initWSIStyleImports(XSDSchema xsdSchema)
-    {
-        if (xsdSchema.getTargetNamespace() == null)
-        {
-            for (Iterator i = xsdSchema.getContents().iterator(); i.hasNext();)
-            {
-                XSDSchemaContent content = (XSDSchemaContent) i.next();
-                if (content instanceof XSDImportImpl)
-                {
-                    XSDImportImpl xsdImport = (XSDImportImpl) content;
-					XSDSchema schema = (XSDSchema)xsdImport.getResolvedSchema();					
-					if (schema == null)
-					{
-						schema = xsdImport.importSchema();
-					}             
-                }
-            }
-        }
-    }
-
-    public List getAvailableTypeNames(Definition definition, int typeNameCategory)
-    {
-        List list = new ArrayList();
-        
-        if (typeNameCategory == ITypeSystemProvider.BUILT_IN_TYPE) {
-        	list = getBuiltInTypeNamesList(definition);        	
-        }
-        else {
-        	Types types = definition.getETypes();
-        	if (types != null)
-        	{
-        		for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
-        		{
-        			Object o = i.next();
-        			if (o instanceof XSDSchemaExtensibilityElement)
-        			{
-        				XSDSchema schema = ((XSDSchemaExtensibilityElement) o).getSchema();
-        				if (schema != null)
-        				{
-        					initWSIStyleImports(schema);
-        					addNamedComponents(definition, list, schema.getTypeDefinitions());
-        				}
-        			}
-        		}
-        	}
-        
-        	for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-        	{
-        		Import theImport = (Import) i.next();
-        		XSDSchema schema = theImport.getESchema();
-        		if (schema != null)
-        		{
-        			addNamedComponents(definition, list, schema.getTypeDefinitions());
-        		}
-        	}
-        	list.addAll(getBuiltInTypeNamesList(definition));
-        }
-        
-		return list;        
-    }
-    
-    public List getAvailableTypes(Definition definition, XSDSchema schema, int typeNameCategory)
-    {
-        List keepTypes = new ArrayList();
-        Iterator typeIterator = schema.getTypeDefinitions().iterator();
-        // Filter out unwanted Types
-        if (typeNameCategory == ITypeSystemProvider.USER_DEFINED_COMPLEX_TYPE) {
-        	while (typeIterator.hasNext()) {
-        		Object type = typeIterator.next();
-        		if (type instanceof XSDComplexTypeDefinition) {
-        			keepTypes.add(type);
-        		}
-        	}
-        }
-        else if (typeNameCategory == ITypeSystemProvider.USER_DEFINED_SIMPLE_TYPE) {
-        	while (typeIterator.hasNext()) {
-        		Object type = typeIterator.next();
-        		if (type instanceof XSDSimpleTypeDefinition) {
-        			keepTypes.add(type);
-        		}
-        	}
-        }
-        
-        //addNamedComponents(definition, list, keepTypes);        
-        //return list;
-        return keepTypes;
-    }
-
-    public java.util.List getBuiltInTypeNamesList(Definition definition)
-    {
-        List items = new ArrayList();
-        if (definition != null)
-        {
-            List prefixes = getPrefixes(definition, WSDLConstants.XSD_NAMESPACE_URI);
-            for (Iterator i = prefixes.iterator(); i.hasNext();)
-            {
-                String prefix = (String) i.next();
-                for (int j = 0; j < XSDDOMHelper.dataType.length; j++)
-                {
-                    String localName = XSDDOMHelper.dataType[j][0];
-                    String name = (prefix != null && prefix.length() > 0) ? prefix + ":" + localName : localName;
-                    items.add(name);
-                }
-            }
-        }
-        return items;
-    }
-    public List getAvailableElementNames(Definition definition)
-    {
-        List list = new ArrayList();
-        Types types = definition.getETypes();
-        if (types != null)
-        {
-            for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
-            {
-                Object o = i.next();
-                if (o instanceof XSDSchemaExtensibilityElement)
-                {
-                    XSDSchema schema = ((XSDSchemaExtensibilityElement) o).getSchema();
-                    if (schema != null)
-                    {
-						initWSIStyleImports(schema);
-                        addNamedComponents(definition, list, schema.getElementDeclarations());
-                    }
-                }
-            }
-        }
-        
-        for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-        {
-            Import theImport = (Import) i.next();
-            XSDSchema schema = theImport.getESchema();
-            if (schema != null)
-            {
-                addNamedComponents(definition, list, schema.getElementDeclarations());
-            }
-        }
-        return list;
-    }
-    public int getCategoryForTypeName(Definition definition, String typeName)
-    {
-        return 0;
-    }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/AddSchemaAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/AddSchemaAction.java
deleted file mode 100644
index 9037b3c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/AddSchemaAction.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.actions;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementAction;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class AddSchemaAction extends AddElementAction
-{
-  protected String targetNamespace;
-  protected boolean createTypesElement = false;
-
-  public AddSchemaAction(Definition definition, Element definitionElement)
-  {
-    this(definition, definitionElement, false);
-  }
-
-  public AddSchemaAction(Definition definition, Element definitionElement, boolean createTypesElement)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SCHEMA"), "icons/xsd_obj.gif", definitionElement, "xsd:schema");                       
-    this.createTypesElement = createTypesElement;
-    targetNamespace = definition.getTargetNamespace();    
-  }
-
-  public AddSchemaAction(Definition definition, Element definitionElement, Element typesElement)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SCHEMA"), "icons/xsd_obj.gif", definitionElement, "xsd:schema");                       
-    if (typesElement != null)
-    {
-      parentNode =  typesElement;
-      this.createTypesElement = false;
-    }
-    else
-    {
-      this.createTypesElement = true;      
-    }
-    targetNamespace = definition.getTargetNamespace();    
-  }
-
-  public AddSchemaAction(Definition definition, Element definitionElement, Element typesElement, Document document)
-  {
-  	this(definition, definitionElement, typesElement);
-  	this.definition = definition;
-  	this.document = document;
-  }
-  
-  protected boolean showDialog()
-  {
-    return true;
-  }
-
-  protected void addAttributes(Element newElement)
-  {                                               
-    newElement.setAttribute("xmlns:xsd", XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-    newElement.setAttribute("elementFormDefault", "qualified");
-    newElement.setAttribute("targetNamespace", targetNamespace);
-  }
-
-  public void run()
-  {
-  	beginRecording();
-  	if (parentNode == null || (document != null && document.getChildNodes().getLength() == 0)) {
-  		createDefinitionStub();
-  		prefix = null;
-  		targetNamespace = definition.getTargetNamespace();
-  	}
-  	
-    if (createTypesElement)
-    {
-      AddElementAction addTypesAction = new AddElementAction("", "icons/xsd_obj.gif", parentNode, parentNode.getPrefix(), "types");
-      addTypesAction.setComputeTopLevelRefChild(true);
-      addTypesAction.run();
-      parentNode =  addTypesAction.getNewElement();
-    } 
-    super.run();
-    endRecording();
-  }     
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/BackAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/BackAction.java
deleted file mode 100644
index 9757904..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/BackAction.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLGraphViewer;
-import org.eclipse.wst.xsd.ui.internal.gef.util.editparts.AbstractComponentViewerRootEditPart;
-import org.eclipse.xsd.XSDSchema;
-
-public class BackAction extends Action
-{
-  ISelectionProvider selectionProvider;
-  XSDSchema xsdSchema;
-  Definition definition;
-  WSDLGraphViewer graphViewer;
-  
-  /**
-   * 
-   */
-  public BackAction()
-  {
-    super();
-  }
-
-  /**
-   * @param text
-   */
-  public BackAction(String text)
-  {
-    super(text);
-  }
-
-  /**
-   * @param text
-   * @param image
-   */
-  public BackAction(String text, ImageDescriptor image)
-  {
-    super(text, image);
-  }
-
-  /**
-   * @param text
-   * @param style
-   */
-  public BackAction(String text, int style)
-  {
-    super(text, style);
-  }
-
-  public void setSelectionProvider(ISelectionProvider selectionProvider)
-  {
-    this.selectionProvider = selectionProvider;
-  }
-  
-  AbstractComponentViewerRootEditPart editPart;
-  public void setRootEditPart(AbstractComponentViewerRootEditPart editPart)
-  {
-    this.editPart = editPart;
-  }
-
-  public void setDefinition(Definition definition)
-  {
-    this.definition = definition;
-  }
-  
-  public void setXSDSchema(XSDSchema xsdSchema)
-  {
-    this.xsdSchema = xsdSchema;
-  }
-  
-  public void setGraphViewer(WSDLGraphViewer graphViewer)
-  {
-    this.graphViewer = graphViewer;
-  }
-  
-  /*
-   * @see IAction#run()
-   */
-  public void run()
-  {
-    if (xsdSchema != null)
-    {
-      StructuredSelection selection = new StructuredSelection(xsdSchema);
-      selectionProvider.setSelection(selection);
-      // editPart.setInput(xsdSchema);
-      graphViewer.setInput(xsdSchema);
-    }
-    else if (definition != null)
-    {
-      StructuredSelection selection = new StructuredSelection(definition);
-      selectionProvider.setSelection(selection);
-      // editPart.setInput(definition);
-      graphViewer.setInput(definition);
-    }
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/DeleteAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/DeleteAction.java
deleted file mode 100644
index b4e8fcf..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/actions/DeleteAction.java
+++ /dev/null

@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.actions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.actions.DeleteInterfaceAction;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-// Should try to use xsdeditor's delete action....
-
-public class DeleteAction extends Action implements DeleteInterfaceAction
-{
-  XSDSchema xsdSchema;
-  Definition definition;
-  List deleteList;
-  
-  /**
-   * Constructor for DeleteAction.
-   * @param text
-   */
-  public DeleteAction(String text)
-  {
-    super(XSDEditorPlugin.getXSDString("_UI_ACTION_DELETE"));
-  }
-
-  public XSDSchema getSchema()
-  {
-    return xsdSchema;
-  }
-
-  public void setSchema(XSDSchema xsdSchema)
-  {
-    this.xsdSchema = xsdSchema;
-  }
-
-  public void setDeleteList(List list) {
-  	deleteList = list;
-  }
-  
-  public List getDeleteList() {
-  	return deleteList;
-  }
-
-  /*
-   * @see IAction#run()
-   */
-  public void run()
-  {
-    List selections = getDeleteList();
-    
-    if (selections.isEmpty())
-    {
-      return;
-    }
-    
-    Iterator iter = selections.iterator();
-    DocumentImpl doc = null;
-    while (iter.hasNext())
-    {
-      Object obj = iter.next();
-      Element node;
-      if (obj instanceof Element)
-      {
-        node = (Element)obj;
-        Object elem = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, node);
-        if (elem instanceof XSDComponent)
-        {
-          xsdSchema = ((XSDComponent)elem).getSchema();
-        }        
-      }
-      else if (obj instanceof XSDComponent)
-      {
-        node = ((XSDComponent)obj).getElement();
-        xsdSchema = ((XSDComponent)obj).getSchema();
-      }
-      else if (obj instanceof XSDConcreteComponent) {
-      	node = ((XSDConcreteComponent)obj).getElement();
-      	xsdSchema = ((XSDConcreteComponent)obj).getSchema();
-      }
-      else
-      {
-        return; 
-      }
-        
-      if (!XSDDOMHelper.inputEquals(node, XSDConstants.SCHEMA_ELEMENT_TAG, false))
-      {
-        
-        if (doc == null)
-        {
-          doc = (DocumentImpl) node.getOwnerDocument();
-          doc.getModel().beginRecording(this, XSDEditorPlugin.getXSDString("_UI_ACTION_DELETE_NODES"));
-        }
-  
-        boolean refresh = cleanupReferences(node);
-        XSDDOMHelper.removeNodeAndWhitespace(node);
-        
-        // Workaround to reset included elements in XSD model
-        if (refresh)
-        {
-// TODO
-//          getEditor().reparseSchema();
-//          getEditor().getGraphViewer().setSchema(getEditor().getXSDSchema());
-        }
-      }
-    }
-    if (doc != null)
-    {
-      doc.getModel().endRecording(this);
-    }
-  }
-
-  protected boolean cleanupReferences(Node deletedNode)
-  {
-    boolean refresh = false;
-    XSDConcreteComponent comp = getSchema().getCorrespondingComponent(deletedNode);
-    
-    if (comp instanceof XSDInclude ||
-        comp instanceof XSDImport ||
-        comp instanceof XSDRedefine)
-    {
-//      XSDSchema resolvedSchema = ((XSDSchemaDirective)comp).getResolvedSchema();
-      XSDSchema referencedSchema = null;
-      if (comp instanceof XSDInclude)
-      {
-        referencedSchema = ((XSDInclude)comp).getIncorporatedSchema();
-        refresh = true;
-      }
-      else if (comp instanceof XSDRedefine)
-      {
-        referencedSchema = ((XSDRedefine)comp).getIncorporatedSchema();
-        refresh = true;
-      }
-      else if (comp instanceof XSDImport)
-      {
-         referencedSchema = ((XSDImport)comp).getResolvedSchema();
-      }
-
-      if (referencedSchema != null)
-      {
-//        XSDExternalFileCleanup cleanHelper = new XSDExternalFileCleanup(referencedSchema);
-//        cleanHelper.visitSchema(getSchema());
-//        // populate messages
-//// TODO
-////        getEditor().createTasksInTaskList(cleanHelper.getMessages());
-      }
-      if (comp instanceof XSDImport)
-      {
-        TypesHelper typesHelper = new TypesHelper(getSchema());
-        typesHelper.updateMapAfterDelete((XSDImport)comp);
-      }
-    }
-    else if (getSchema().equals(comp.getContainer()))
-    {
-//      BaseGlobalCleanup cleanHelper = null;
-   //   Only need to clean up references if the component being deleted is global scoped
-//      if (comp instanceof XSDElementDeclaration)
-//      {
-//        cleanHelper = new GlobalElementCleanup(comp);
-//      }
-//      else if (comp instanceof XSDModelGroupDefinition)
-//      {
-//        cleanHelper = new GlobalGroupCleanup(comp);
-//      }
-//      else if (comp instanceof XSDTypeDefinition)
-//      {
-//        cleanHelper = new GlobalSimpleOrComplexTypeCleanup(comp);
-//      }
-//      else if (comp instanceof XSDAttributeDeclaration)
-//      {
-//        cleanHelper = new GlobalAttributeCleanup(comp);
-//      }
-//      else if (comp instanceof XSDAttributeGroupDefinition)
-//      {
-//        cleanHelper = new GlobalAttributeGroupCleanup(comp);
-//      }
-//      
-//      
-//      if (cleanHelper != null)
-//      {
-//        cleanHelper.visitSchema(getSchema());
-//        // populate messages
-//// TODO
-////        getEditor().createTasksInTaskList(cleanHelper.getMessages());
-//      }
-    }
-    return refresh;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaDrillDownEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaDrillDownEditPart.java
deleted file mode 100644
index 9a6acfc..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaDrillDownEditPart.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts;
-         
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.DrillDownEditPart;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.xsd.XSDSchema;
-
-
-public class XSDSchemaDrillDownEditPart extends DrillDownEditPart 
-{                                 
-  protected IFigure createFigure()
-  {                                     
-    IFigure figure = super.createFigure();
-    label.setIcon(XSDEditorPlugin.getXSDImage("icons/XSDFile.gif"));
-    return figure;
-  }   
-
-  protected void refreshVisuals()
-  {                                       
-    XSDSchema schema = (XSDSchema)getModel();
-    String ns = schema.getTargetNamespace() != null ? schema.getTargetNamespace() : "";
-    label.setText(ns);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaExtensibilityElementEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaExtensibilityElementEditPart.java
deleted file mode 100644
index c10245b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/graph/editparts/XSDSchemaExtensibilityElementEditPart.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.xsd.graph.editparts;
-         
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.ContainerFigure;
-
-
-public class XSDSchemaExtensibilityElementEditPart extends AbstractGraphicalEditPart 
-{                                 
-  protected EditPartFactory factory;
-
-  public XSDSchemaExtensibilityElementEditPart(EditPartFactory factory)
-  {
-    this.factory = factory;
-  }
-
-  protected IFigure createFigure()
-  {                                     
-    ContainerFigure figure = new ContainerFigure();    
-    return figure;
-  }    
-
-  protected EditPart createChild(Object model) 
-  {
-    return factory.createEditPart(this, model);
-  }      
-
-  protected List getModelChildren() 
-  { 
-    XSDSchemaExtensibilityElement e = (XSDSchemaExtensibilityElement)getModel();
-    List result = new ArrayList();
-    result.add(e.getSchema());
-    return result;
-  }
- 
-  protected void createEditPolicies() 
-  {
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/.classpath b/bundles/org.eclipse.wst.wsdl.validation/.classpath
deleted file mode 100644
index 908fab1..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/.classpath
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/wsdlvalidateui"/>
-	<classpathentry kind="src" path="src/wsdlvalidate"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.wst.wsdl.validation/.cvsignore b/bundles/org.eclipse.wst.wsdl.validation/.cvsignore
deleted file mode 100644
index 02b1ce4..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wsdlvalidate.jar
-wsdlvalidateui.jar

diff --git a/bundles/org.eclipse.wst.wsdl.validation/.project b/bundles/org.eclipse.wst.wsdl.validation/.project
deleted file mode 100644
index 9190c37..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsdl.validation</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
deleted file mode 100644
index c115add..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,38 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.wsdl.validation; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsdlvalidateui.jar,
- wsdlvalidate.jar
-Bundle-Activator: org.eclipse.wst.wsdl.validation.internal.ui.eclipse.ValidateWSDLPlugin
-Bundle-Vendor: %_PROVIDER_NAME
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.wst.wsdl.validation.internal,
- org.eclipse.wst.wsdl.validation.internal.exception,
- org.eclipse.wst.wsdl.validation.internal.resolver,
- org.eclipse.wst.wsdl.validation.internal.ui,
- org.eclipse.wst.wsdl.validation.internal.ui.ant,
- org.eclipse.wst.wsdl.validation.internal.ui.eclipse,
- org.eclipse.wst.wsdl.validation.internal.ui.text,
- org.eclipse.wst.wsdl.validation.internal.util,
- org.eclipse.wst.wsdl.validation.internal.wsdl11,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.http,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.mime,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.soap,
- org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd,
- org.eclipse.wst.wsdl.validation.internal.wsdl20,
- org.eclipse.wst.wsdl.validation.internal.xml
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.ui,
- org.apache.ant,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.validation,
- org.wsdl4j,
- org.apache.xerces;visibility:=reexport,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.xml.ui
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.wst.wsdl.validation.internal.ui.eclipse.ValidateWSDLPlugin

diff --git a/bundles/org.eclipse.wst.wsdl.validation/about.html b/bundles/org.eclipse.wst.wsdl.validation/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/build.properties b/bundles/org.eclipse.wst.wsdl.validation/build.properties
deleted file mode 100644
index 1a9437c..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/build.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-bin.includes = META-INF/,\
-               plugin.properties,\
-               plugin.xml,\
-               wsdlvalidateui.jar,\
-               wsdlvalidate.jar,\
-               about.html
-src.includes = exsd/,\
-               build.properties
-source.wsdlvalidateui.jar = src/wsdlvalidateui/
-jars.compile.order = wsdlvalidate.jar,\
-                     wsdlvalidateui.jar
-source.wsdlvalidate.jar = src/wsdlvalidate/

diff --git a/bundles/org.eclipse.wst.wsdl.validation/exsd/extvalidator.exsd b/bundles/org.eclipse.wst.wsdl.validation/exsd/extvalidator.exsd
deleted file mode 100644
index 75dd048..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/exsd/extvalidator.exsd
+++ /dev/null

@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.validation">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.wsdl.validation" id="extvalidator" name="WSDL Extension Validator"/>
-      </appInfo>
-      <documentation>
-         An extension point to allow pluggin in extension validators to run post WSDL validation.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="extvalidator"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="extvalidator">
-      <complexType>
-         <attribute name="namespace" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="resourcebundle" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/bundles/org.eclipse.wst.wsdl.validation/exsd/uriresolver.exsd b/bundles/org.eclipse.wst.wsdl.validation/exsd/uriresolver.exsd
deleted file mode 100644
index 5b864dc..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/exsd/uriresolver.exsd
+++ /dev/null

@@ -1,99 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.validation">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.wsdl.validation" id="uriresolver" name="WSDL URI Resolver"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="uriresolver"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="uriresolver">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/bundles/org.eclipse.wst.wsdl.validation/exsd/wsdl11validator.exsd b/bundles/org.eclipse.wst.wsdl.validation/exsd/wsdl11validator.exsd
deleted file mode 100644
index 337bb8c..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/exsd/wsdl11validator.exsd
+++ /dev/null

@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.validation">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.wsdl.validation" id="wsdl11validator" name="WSDL 1.1 Extension Validator"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="wsdl11validator"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="wsdl11validator">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="namespace" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="resourcebundle" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/bundles/org.eclipse.wst.wsdl.validation/exsd/xmlcatalog.exsd b/bundles/org.eclipse.wst.wsdl.validation/exsd/xmlcatalog.exsd
deleted file mode 100644
index 5ce49b3..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/exsd/xmlcatalog.exsd
+++ /dev/null

@@ -1,121 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.wsdl.validation">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.wsdl.validation" id="xmlcatalog" name="WSDL XML Catalog"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <choice>
-               <element ref="entity"/>
-               <element ref="schemadir"/>
-            </choice>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="entity">
-      <complexType>
-         <attribute name="publicId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="location" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="schemadir">
-      <complexType>
-         <attribute name="location" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/bundles/org.eclipse.wst.wsdl.validation/lib/.cvsignore b/bundles/org.eclipse.wst.wsdl.validation/lib/.cvsignore
deleted file mode 100644
index d392f0e..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/lib/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-*.jar

diff --git a/bundles/org.eclipse.wst.wsdl.validation/plugin.properties b/bundles/org.eclipse.wst.wsdl.validation/plugin.properties
deleted file mode 100644
index 383ed8a..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/plugin.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-!-- properties file for org.eclipse.wst.wsdl.validation
-!-- Tool Name
-
-_PLUGIN_NAME                               = WSDL Validator
-_PROVIDER_NAME                             = Eclipse.org
-
-!-- UI Menu Item
-_UI_MENU_VALIDATE_WSDL                     = Validate WSDL File
-_UI_WSDL_VALIDATOR                         = WSDL Validator
-

diff --git a/bundles/org.eclipse.wst.wsdl.validation/plugin.xml b/bundles/org.eclipse.wst.wsdl.validation/plugin.xml
deleted file mode 100644
index dbdd0c5..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/plugin.xml
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <!-- WSDL extension validator. This is an extension that will run
-        after WSDL validation if WSDL validation is successful.  -->
-   <extension-point id="extvalidator" name="WSDL Extension Validator" schema="exsd/extvalidator.exsd"/>
-   
-   <!-- WSDL 1.1 validator extension. To provide a namespace specific WSDL 1.1
-        validator. -->
-   <extension-point id="wsdl11validator" name="WSDL 1.1 Extension Validator" schema="exsd/wsdl11validator.exsd"/>
-   
-   <!-- An extension to add XML catalog entries to the WSDL validator.
-        Many entires can be added as seen below. -->
-   <extension-point name="WSDL XML Catalog" id="xmlcatalog" schema="exsd/xmlcatalog.exsd"/>
-
-   <!-- An extension to add a URI resolver to the WSDL validator. URI resolvers
-        are used to resolve the location of imported documents such as WSDL and
-        XSD through the WSDL and schema import mechanisms. 
-        This is how this extension point is used.
-        <extension point="org.eclipse.wsdl.validate.uriresolver">
-          <uriresolver class="full name of your class"/>
-        </extension>                                                             -->
-   <extension-point name="WSDL URI Resolver" id="uriresolver" schema="exsd/uriresolver.exsd"/>
-
-   <!-- ====================================================== -->
-   <!-- Set the Validate WSDL File context menu item. This     -->
-   <!-- menu item should be removed once the validation        -->
-   <!-- framework is modified to create the item.              -->
-   <!-- ====================================================== -->
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.wst.wsdl.validation.wsdlaction">
-         <action
-               label="%_UI_MENU_VALIDATE_WSDL"
-               class="org.eclipse.wst.wsdl.validation.internal.ui.eclipse.ValidateWSDLActionDelegate"
-               enablesFor="1"
-               id="org.eclipse.wst.wsdl.validation.internal.ui.eclipse.ValidateWSDLActionDelegate">
-         </action>
-      </objectContribution>
-   </extension>
-   
-   <!-- ====================================================== -->
-   <!-- Set the XML Catalog entries.                           -->
-   <!-- These entries are commented out until such time as     -->
-   <!-- permission is granted to include them in this plugin.  -->
-   <!-- ====================================================== -->
-   <!--extension point="org.eclipse.wst.wsdl.validation.xmlcatalog"-->
-     <!--entity
-       publicId="http://schemas.xmlsoap.org/wsdl/" 
-       location="xsd/wsdl.xsd" /-->
-     <!--entity
-       publicId="http://schemas.xmlsoap.org/wsdl/http/" 
-       location="xsd/http.xsd" /-->
-     <!--entity
-       publicId="http://schemas.xmlsoap.org/wsdl/soap/" 
-       location="xsd/soap.xsd" /-->
-     <!--entity
-       publicId="http://schemas.xmlsoap.org/wsdl/mime/" 
-       location="xsd/wsdl-mime.xsd" /-->
-     <!--entity 
-       publicId="http://schemas.xmlsoap.org/soap/encoding/" 
-       location="xsd/soapenc.xsd" /-->
-     <!-- The xml-soap does not exist but is used in certain documents.
-          It is included here so the validator will recognize it. -->
-     <!--entity
-       publicId="http://xml.apache.org/xml-soap" 
-       location="xsd/xml-soap.xsd" /-->
-   <!--/extension-->
-   
-   <!-- ====================================================== -->
-   <!-- An extension for adding the URI resolver from          -->
-   <!-- org.eclipse.wst.common.uriresolver to the WSDL         -->
-   <!-- validator.											   -->
-   <!-- ====================================================== -->
-   <extension point="org.eclipse.wst.wsdl.validation.uriresolver">
-     <uriresolver class="org.eclipse.wst.wsdl.validation.internal.ui.eclipse.URIResolverWrapper"/>
-   </extension>
-   
-   <!-- ====================================================== -->
-   <!-- An extension for adding the WSDL validator to the      -->
-   <!-- validation framework. 						           -->										   -->
-   <!-- ====================================================== -->
-   <extension
-         id="wsdlValidator"
-         name="%_UI_WSDL_VALIDATOR"
-         point="org.eclipse.wst.validation.validator">
-      <validator>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               caseSensitive="false"
-               nameFilter="*.wsdl">
-         </filter>
-         <helper
-               class="org.eclipse.wst.xml.core.internal.validation.core.Helper">
-         </helper>
-         <run
-               class="org.eclipse.wst.wsdl.validation.internal.ui.eclipse.Validator">
-         </run>
-      </validator>
-   </extension>
-</plugin>

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/Constants.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/Constants.java
deleted file mode 100644
index 0c2ca7e..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/Constants.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-/**
- * Set constants that the validator makes use of.
- */
-public interface Constants
-{
-  /**
-   * The name of the validator properties file.
-   */
-  public final static String WSDL_VALIDATOR_PROPERTIES_FILE = "validatewsdl";
-
-  /**
-   * The SOAP 1.1 namespace.
-   */
-  public final static String NS_SOAP11 = "http://schemas.xmlsoap.org/wsdl/soap/";
-
-  /**
-   * The HTTP namespace.
-   */
-  public final static String NS_HTTP = "http://schemas.xmlsoap.org/wsdl/http/";
-
-  /**
-   * The MIME namespace.
-   */
-  public final static String NS_MIME = "http://schemas.xmlsoap.org/wsdl/mime/";
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ControllerValidationInfo.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ControllerValidationInfo.java
deleted file mode 100644
index 34f4d51..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ControllerValidationInfo.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-
-/**
- * An interface for the validation info that allows for starting and
- * completing WSDL and WS-I validation.
- */
-public interface ControllerValidationInfo extends IValidationInfo
-{
-  
-  /**
-   * Perform the necessary steps to complete WSDL validation.
-   */
-  public void completeWSDLValidation();
-  
-//  /**
-//   * Perform the necessary steps to complete WS-I WSDL validation.
-//   */
-//  public void completeWSIValidation();
-  
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java
deleted file mode 100644
index 34e1581..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-
-/**
- * An interface representing the current validation information.
- * This interface is not meant to be implemented by clients.
- */
-public interface IValidationInfo extends IValidationReport
-{
-  
-  /**
-   * Add an error message for this file. (Uses the URI from this validation info object.)
-   * 
-   * @param message The message for the error.
-   * @param line The line location of the error in the file.
-   * @param column The column location of the error in the file.
-   * @deprecated
-   */
-  public void addError(String message, int line, int column);
-  
-  /**
-   * Add an error message.
-   * 
-   * @param message The message for the error.
-   * @param line The line location of the error in the file.
-   * @param column The column location of the error in the file.
-   * @param uri The URI of the file that contains the error.
-   */
-  public void addError(String message, int line, int column, String uri);
-  
-  /**
-   * Add a warning message for this file. (Uses the URI from this validation info object.)
-   * 
-   * @param message The message for the warning.
-   * @param line The line location of the warning in the file.
-   * @param column The column location of the warning in the file.
-   * @deprecated
-   */
-  public void addWarning(String message, int line, int column);
-  
-  /**
-   * Add a warning message.
-   * 
-   * @param message The message for the warning.
-   * @param line The line location of the warning in the file.
-   * @param column The column location of the warning in the file.
-   * @param uri The URI of the file that contains the error.
-   */
-  public void addWarning(String message, int line, int column, String uri);
-  
-  /**
-   * Get the URI resolver in use for this validation. The URI resolver
-   * returned is actually a URI resolver handler that will 
-   * iterate through all of the registered URI resolvers.
-   * 
-   * @return The URI resolver handler.
-   */
-  public URIResolver getURIResolver();
-  
-  /**
-   * Get the attribute with the given name. If the attribute
-   * has not been registered, return null.
-   * 
-   * @param name The name of the attribute being requested.
-   * @return The attribute value if the attribute has been registered, null otherwise.
-   */
-  public Object getAttribute(String name);
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationMessage.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationMessage.java
deleted file mode 100644
index 3f5a9af..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationMessage.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.QualifiedName;
-
-/**
- * An interface for a validation message. A validation message contains information
- * for the message, its severity and where it's located.
- */
-public interface IValidationMessage
-{
-  public static final QualifiedName ERROR_MESSAGE_MAP_QUALIFIED_NAME = new QualifiedName("org.eclipse.wsdl.validate", "errorMessageMap");
-  /**
-   * Severity error.
-   */
-  public static final int SEV_ERROR = 0;
-  /**
-   * Severity warning.
-   */
-  public static final int SEV_WARNING = 1;
-  
-  /**
-   * Returns the URI for the file that contains the validation message.
-   * 
-   * @return The URI for the file that contains the validation message.
-   */
-  public String getURI();
-  
-  /**
-   * Return the message for this validation message.
-   * 
-   * @return The message for this validation message.
-   */
-  public String getMessage();
-  
-  /**
-   * Return the severity of this validation message.
-   * 
-   * @return The severity of this validation message.
-   */
-  public int getSeverity();
-  
-  /**
-   * Return the line where this validation message is located.
-   * 
-   * @return The line where this validation message is located.
-   */
-  public int getLine();
-  
-  /**
-   * Return the column where this validation message is located.
-   * 
-   * @return The column where this validation message is located.
-   */
-  public int getColumn();
-  
-  /**
-   * Get the list of nested validation messages.
-   * 
-   * @return The list of nested validation messages.
-   */
-  public List getNestedMessages();
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationReport.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationReport.java
deleted file mode 100644
index ced4bd8..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IValidationReport.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.HashMap;
-
-/**
- * An interface for a WSDL validation report.
- */
-public interface IValidationReport
-{
-  /**
-   * Returns the URI for the file the report refers to.
-   * 
-   * @return The URI for the file the report refers to.
-   */
-  public String getFileURI();
-  
-  /**
-   * Returns whether the file is valid according to the WSDL specification.
-   * 
-   * @return True if the file is WSDL valid, false otherwise.
-   */
-  public boolean isWSDLValid();
-
-  /**
-   * Returns an array of validation messages.
-   * 
-   * @return An array of validation messages.
-   */
-  public IValidationMessage[] getValidationMessages();
-  
-  /**
-   * Returns true if there are errors, false otherwise.
-   * 
-   * @return True if there are errors, false otherwise.
-   */
-  public boolean hasErrors();
-  
-  public HashMap getNestedMessages();
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IWSDLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IWSDLValidator.java
deleted file mode 100644
index 3278e9d..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/IWSDLValidator.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.exception.ValidateWSDLException;
-import org.w3c.dom.Document;
-
-/**
- * An interface for a WSDL validator. This is the interface for a top level validator 
- * component such as a WSDL 1.1 validator, WSDL 1.2 validator or WS-I Basic Profile validator.
- */
-public interface IWSDLValidator
-{
-  /**
-   * Validate the file with the given name.
-   * 
-   * @param domModel A DOM model of the file to be validated.
-   * @param valInfo The information for the validation that is being performed.
-   * @throws ValidateWSDLException
-   */
-  public void validate(Document domModel, IValidationInfo valInfo) throws ValidateWSDLException;
-
-  /**
-   * setResourceBundle
-   * Set the ResourceBundle for this validator. Allows the use of difference 
-   * ResourceBundles for different validators.
-   * 
-   * @param rb The resource bundle to set.
-   */
-  public void setResourceBundle(ResourceBundle rb);
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationController.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationController.java
deleted file mode 100644
index ddba6aa..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationController.java
+++ /dev/null

@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.apache.xerces.impl.XMLErrorReporter;
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.parsers.StandardParserConfiguration;
-import org.apache.xerces.xni.XNIException;
-import org.eclipse.wst.wsdl.validation.internal.exception.ValidateWSDLException;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.xml.AbstractXMLConformanceFactory;
-import org.eclipse.wst.wsdl.validation.internal.xml.DefaultXMLValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.IXMLValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.LineNumberDOMParser;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-/**
- * This is the main entrypoint to the WSDL Validator. The controller is
- * responsible for calling the reader, the XML conformance check, the WSDL
- * validation and the WS-I validation if selected. The controller contains any
- * errors and warnings generated as well.
- */
-public class ValidationController
-{
-  protected final String _ERROR_PROBLEM_WSDL_VALIDATOR = "_ERROR_PROBLEM_WSDL_VALIDATOR";
-  protected final String _ERROR_NO_WSDL_VALIDATOR = "_ERROR_NO_WSDL_VALIDATOR";
-  protected final String _ERROR_PROBLEM_EXT_VALIDATOR = "_ERROR_PROBLEM_EXT_VALIDATOR";
-
-  protected ValidatorRegistry ver;
-  protected ResourceBundle resourcebundle;
-  protected MessageGenerator messagegenerator;
-  protected URIResolver uriResolver;
-  protected Hashtable attributes = new Hashtable();
-
-  //protected String wsdlNamespace = null;
-
-  /**
-   * The ResourceBundle needs to be set so it can be passed to the reader.
-   * 
-   * @param rb
-   *            The resource bundle for this validator.
-   */
-  public ValidationController(ResourceBundle rb, URIResolver uriResolver)
-  {
-    resourcebundle = rb;
-    messagegenerator = new MessageGenerator(resourcebundle);
-    this.uriResolver = uriResolver;
-
-    ver = ValidatorRegistry.getInstance();
-  }
-  
-  /**
-   * Add the attributes specified to the validation.
-   * 
-   * @param attributes The attributes to add to the validation.
-   */
-  public void setAttributes(Hashtable attributes)
-  {
-  	this.attributes.putAll(attributes);
-  }
-
-  /**
-   * Validate the WSDL file. Check the file for XML conformance. If it is XML
-   * conformant, read the file and check it for WSDL conformance. If it is WSDL
-   * conformant and WS-I conformance is set to suggest or require, check the
-   * file for WS-I conformance.
-   * 
-   * @param uri
-   *            The uri where the WSDL document is located.
-   * @param wsiLevel
-   *            The level of WS-I conformance to use for validation.
-   * @return A validation report with the validation info for the file.
-   */
-//  public IValidationReport validate(String uri)
-//  { return validate(uri, null);
-//  }
-  
-  /**
-   * Validate the WSDL file with the stream. This method will run the check of the 
-   * WSDL document. The validation is broken up into three stages: XML conformance,
-   * WSDL semantic, and post validation.
-   * 
- * @param uri The URI of the WSDL document to be validated.
- * @param inputStream The contents of the WSDL document to be validated.
- * @return A validation report with the validation info for the file.
- */
-  public IValidationReport validate(String uri, InputStream inputStream)
-  {
-    
-    InputStream xmlValidateStream = null;
-    InputStream wsdlValidateStream = null;
-    if (inputStream != null)
-    { //copy the inputStream so we can use it more than once
-      String contents = createStringForInputStream(inputStream);
-      xmlValidateStream = new ByteArrayInputStream(contents.getBytes());
-      wsdlValidateStream = new ByteArrayInputStream(contents.getBytes());
-    }
-    
-    ControllerValidationInfo valInfo = new ValidationInfoImpl(uri, messagegenerator);
-    ((ValidationInfoImpl)valInfo).setURIResolver(uriResolver);
-    ((ValidationInfoImpl)valInfo).setAttributes(attributes);
-
-    if (validateXML(valInfo, xmlValidateStream))
-    {
-      Document wsdldoc = getDocument(uri, wsdlValidateStream);
-      String wsdlns = getWSDLNamespace(wsdldoc);
-      if (validateWSDL(wsdldoc, valInfo, wsdlns))
-      {
-        validateExtensionValidators(wsdldoc, valInfo, wsdlns);
-      }
-    }
-    return (IValidationReport)valInfo;
-  }
-
-  /**
-   * Validate the file for XML conformance.
-	 * @param valInfo information about the validation
-   * @param inputStream the inputStream to validate
-   * @return True if the file is conformant, false otherwise.
-   */
-  protected boolean validateXML(ControllerValidationInfo valInfo, InputStream inputStream)
-  {
-    IXMLValidator xmlValidator = AbstractXMLConformanceFactory.getInstance().getXMLValidator();
-    xmlValidator.setURIResolver(uriResolver);
-    xmlValidator.setFile(valInfo.getFileURI());
-    if (xmlValidator instanceof DefaultXMLValidator)
-    {
-        ((DefaultXMLValidator)xmlValidator).setInputStream(inputStream);
-    }
-    //xmlValidator.setValidationInfo(valInfo);
-    xmlValidator.run();
-    // if there are no xml conformance problems go on to check the wsdl stuff
-    if (xmlValidator.hasErrors())
-    {
-      // temp handling of XML errors until validator is updated.
-      List errors = xmlValidator.getErrors();
-      Iterator errorsIter = errors.iterator();
-      while (errorsIter.hasNext())
-      {
-        IValidationMessage valMes = (IValidationMessage)errorsIter.next();
-        
-        if (valMes instanceof ValidationMessageImpl && valInfo instanceof ValidationInfoImpl)
-        {   String errorKey = ((ValidationMessageImpl)valMes).getErrorKey();
-            Object[] messageArgs = ((ValidationMessageImpl)valMes).getMessageArguments();
-            ((ValidationInfoImpl)valInfo).addError(valMes.getMessage(), valMes.getLine(), valMes.getColumn(), valMes.getURI(), errorKey, messageArgs);
-        }
-        else
-        {
-            valInfo.addError(valMes.getMessage(), valMes.getLine(), valMes.getColumn(), valMes.getURI());
-        }
-      }
-      return false;
-    }
-    //wsdlNamespace = xmlValidator.getWSDLNamespace();
-    return true;
-  }
-  
-  /**
-   * Validate the file for XML conformance.
-	 * @param valInfo information about the validation
-   * @return True if the file is conformant, false otherwise.
-   */
-  protected boolean validateXML(ControllerValidationInfo valInfo)
-  { return validateXML(valInfo, null);
-  }
-
-  /**
-   * Validate the WSDL file. Set the errors and warning appropriately.
-   * 
-   * @param wsdldoc A W3C document representation of the WSDL document.
-   * @param valInfo The current validation information.
-   * @param wsdlNamespace The WSDL namespace to validate.
-   * @return True if the file is valid, false otherwise.
-   */
-  protected boolean validateWSDL(Document wsdldoc, ControllerValidationInfo valInfo, String wsdlNamespace)
-  {
-    WSDLValidatorDelegate[] wsdlVals = ver.queryValidatorRegistry(wsdlNamespace, ValidatorRegistry.WSDL_VALIDATOR);
-    if (wsdlVals != null)
-    {
-      for (int i = 0; i < wsdlVals.length; i++)
-      {
-        WSDLValidatorDelegate wsdlvaldel = wsdlVals[i];
-        IWSDLValidator wsdlVal = wsdlvaldel.getValidator();
-
-        // If the wsdl validator isn't null, validate.
-        if (wsdlVal != null)
-        {
-          try
-          {
-            wsdlVal.validate(wsdldoc, valInfo);
-          }
-          catch (ValidateWSDLException e)
-          {
-            valInfo.addError(messagegenerator.getString(_ERROR_PROBLEM_WSDL_VALIDATOR, wsdlNamespace), 1, 1, valInfo.getFileURI());
-          }
-        }
-        // If the validator is null and the namespace isn't create an error.
-        // If the namespace is null the file is empty (and the XML validator
-        // has let it go)
-        // so it is valid but does not need to be validated.
-        else
-        {
-          valInfo.addError(
-            messagegenerator.getString(_ERROR_NO_WSDL_VALIDATOR, wsdlNamespace),
-            1,
-            1,
-            valInfo.getFileURI());
-        }
-      }
-    }
-    // No validators registered.
-    else
-    {
-      valInfo.addError(messagegenerator.getString(_ERROR_NO_WSDL_VALIDATOR, wsdlNamespace), 1, 1, valInfo.getFileURI());
-    }
-    valInfo.completeWSDLValidation();
-
-    return valInfo.isWSDLValid();
-  }
-
-  /**
-   * Validate the WSDL file with the extension validator. Set the errors and warning appropriately.
-   * 
-   * @param wsdldoc A W3C document representation of the WSDL document.
-   * @param valInfo The current validation information.
-   * @param wsdlNamespace The WSDL namespace to validate.
-   * @return True if the file is valid, false otherwise.
-   */
-  protected void validateExtensionValidators(Document wsdldoc, ControllerValidationInfo valInfo, String wsdlNamespace)
-  {
-    WSDLValidatorDelegate[] extVals = ver.queryValidatorRegistry(wsdlNamespace, ValidatorRegistry.EXT_VALIDATOR);
-    if(extVals != null)
-    {
-      int numvals = extVals.length;
-      for(int i = 0; i < numvals; i++)
-      {
-        WSDLValidatorDelegate extvaldel = extVals[i];
-        IWSDLValidator extval = extvaldel.getValidator();
-        if(extval != null)
-        {
-          try
-          {
-          extval.validate(wsdldoc, valInfo);
-          }
-          catch(Throwable  t)
-          {
-            valInfo.addWarning(messagegenerator.getString(_ERROR_PROBLEM_EXT_VALIDATOR,  extvaldel.getValidatorClassName(), wsdlNamespace), 1, 1, valInfo.getFileURI());
-            // This error should be logged and not displayed to the user.
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Set the ResourceBundle for this ValidatorManager.
-   * 
-   * @param rb
-   *            The resource bundle to set.
-   * @see #getResourceBundle
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    resourcebundle = rb;
-  }
-
-  /**
-   * Get the ResourceBundle for this ValidationController.
-   * 
-   * @return The resource bundle set for this ValidationController.
-   * @see #setResourceBundle
-   */
-  public ResourceBundle getResourceBundle()
-  {
-    return resourcebundle;
-  }
-  
-  /**
-   * Get a DOM document representation of the WSDL document.
-   * 
-   * @param uri The uri of the file to read
-   * @return The DOM model of the WSDL document or null if the document can't be read.
-   */
-  private Document getDocument(String uri, InputStream inputStream)
-  {
-    try
-    {
-      // Catch a premature EOF error to allow empty WSDL files to be considered valid.
-      StandardParserConfiguration configuration = new StandardParserConfiguration()
-      {
-        protected XMLErrorReporter createErrorReporter()
-        {
-          return new XMLErrorReporter()
-          {
-            public void reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
-            {
-              boolean reportError = true;
-              if (key.equals("PrematureEOF"))
-              {         
-                reportError = false;
-              }
-
-              if (reportError)
-              {
-                super.reportError(domain, key, arguments, severity);
-              }
-            }
-          };
-        }
-      };
-      
-      InputSource inputSource = null;
-      if (inputStream != null)
-      { //then we want to create a DOM from the inputstream
-        inputSource = new InputSource(inputStream);
-      }
-      else
-      { inputSource = new InputSource(uri);
-      }
-      
-      DOMParser builder = new LineNumberDOMParser(configuration);
-      builder.parse(inputSource);
-      Document doc = builder.getDocument();
-
-      return doc;
-    }
-    catch (Throwable t)
-    {
-    	// TODO: Log error if the parser fails to read the WSDL document.
-    	// In this case the validator will fail with an unexplained error message
-    	// about a null WSDL namespace. This error should be addressed as well.
-    	System.out.println(t);
-    }
-    return null;
-  }
-  
-  private String getWSDLNamespace(Document doc)
-  {
-    String wsdlns = null;
-    if(doc != null)
-    {
-      Element definitions = doc.getDocumentElement();
-      if(definitions.getLocalName().equals("definitions"))
-      {
-        wsdlns = definitions.getNamespaceURI();
-      }
-    }
-    return wsdlns;
-  }
-  
-  
-  
-  private final String createStringForInputStream(InputStream inputStream)
-  {
-    // Here we are reading the file and storing to a stringbuffer.
-    StringBuffer fileString = new StringBuffer();
-    try
-    {
-      InputStreamReader inputReader = new InputStreamReader(inputStream);
-      BufferedReader reader = new BufferedReader(inputReader);
-      char[] chars = new char[1024];
-      int numberRead = reader.read(chars);
-      while (numberRead != -1)
-      {
-        fileString.append(chars, 0, numberRead);
-        numberRead = reader.read(chars);
-      }
-    }
-    catch (Exception e)
-    {
-      //TODO: log error message
-      //e.printStackTrace();
-    }
-    return fileString.toString();
-  }
-  
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java
deleted file mode 100644
index f215875..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java
+++ /dev/null

@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-
-/**
- * An implementation of the validation info interface.
- */
-public class ValidationInfoImpl implements IValidationReport, ControllerValidationInfo
-{
-  private boolean WRAPPER_ERROR_SUPPORT_ENABLED = true;
-  private final String _WARN_NO_VALDIATOR = "_WARN_NO_VALDIATOR";
-  private final String _REF_FILE_ERROR_MESSAGE = "_REF_FILE_ERROR_MESSAGE";
-  private String validating_file_uri = null;
-  private URL validating_file_url = null;
-  private boolean wsdlValid = false;
-  private List messages = new Vector();
-  private List schemas = new Vector();
-  private List nsNoVals = new Vector();
-  private MessageGenerator messagegenerator = null;
-  private boolean haserrors = false;
-  private HashMap nestedMessages = new HashMap();
-  private URIResolver uriResolver = null;
-  private Hashtable attributes = new Hashtable();
-
-  /**
-   * Constructor.
-   * 
-   * @param uri
-   *            The URI of the file for the validation.
-   */
-  public ValidationInfoImpl(String uri, MessageGenerator messagegenerator)
-  {
-    this.validating_file_uri = uri;
-    if(uri != null)
-    {
-      uri = uri.replaceAll("%20"," ");
-      this.validating_file_uri = uri;
-      try
-      {
-        this.validating_file_url = new URL(uri);
-      } catch (MalformedURLException e)
-      {
-      }
-    }
-    this.messagegenerator = messagegenerator;
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#getFileURI()
-   */
-  public String getFileURI()
-  {
-    return validating_file_uri;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#isWSDLValid()
-   */
-  public boolean isWSDLValid()
-  {
-    return wsdlValid;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addError(java.lang.String,
-   *      int, int)
-   */
-  public void addError(String message, int line, int column)
-  {
-    addError(message, line, column, validating_file_uri);
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addError(java.lang.String,
-   *      int, int)
-   */
-  public void addError(String message, int line, int column, String uri)
-  {
-    if(addMessage(message, line, column, uri, ValidationMessageImpl.SEV_ERROR))
-    {
-      haserrors = true;
-    }
-  }
-
-  public void addError(String message, int line, int column, String uri, String errorKey, Object[] messageArguments)
-  {
-    if(addMessage(message, line, column, uri, ValidationMessageImpl.SEV_ERROR, errorKey, messageArguments))
-    {
-      haserrors = true;
-    }
-  }
-  
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addWarning(java.lang.String,
-   *      int, int)
-   */
-  public void addWarning(String message, int line, int column)
-  {
-    addWarning(message, line, column, validating_file_uri);
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addWarning(java.lang.String,
-   *      int, int)
-   */
-  public void addWarning(String message, int line, int column, String uri)
-  {
-    addMessage(message, line, column, uri, ValidationMessageImpl.SEV_WARNING);
-  }
-  
-  /**
-   * Add a message to the list. A message may not be added to the list in 
-   * certain circumstances such as when the URI is invalid or the message 
-   * is null.
-   * 
-   * @param message The message to add.
-   * @param line The line location of the message.
-   * @param column The column location of the message.
-   * @param uri The URI of the file that contains the message.
-   * @param severity The severity of the message.
-   * @return True if the message was able to be added, false otherwise.
-   */
-  private boolean addMessage(String message, int line, int column, String uri, int severity)
-  {
-      return this.addMessage(message, line, column, uri, severity, null, null);
-  }
-  
-  /**
-   * Add a message to the list. A message may not be added to the list in 
-   * certain circumstances such as when the URI is invalid or the message 
-   * is null.
-   * 
-   * @param message The message to add.
-   * @param line The line location of the message.
-   * @param column The column location of the message.
-   * @param uri The URI of the file that contains the message.
-   * @param severity The severity of the message.
-   * @param errorKey The Xerces Error Key
-   * @param messageArguments The Xerces arguments used to create the error message
-   * @return True if the message was able to be added, false otherwise.
-   */
-  private boolean addMessage(String message, int line, int column, String uri, int severity, String errorKey, Object[] messageArguments)
-  {
-    boolean successfullyAdded = false;
-    // If the message is null there is nothing to report.
-    if(message == null)
-    {
-      return successfullyAdded;
-    }
-    String errorURI = uri;
-    URL errorURL = null;
-    if (errorURI != null)
-    {
-      try
-      {
-        errorURI = errorURI.replaceAll("%20", " ");
-        errorURL = new URL(errorURI);
-      } catch (MalformedURLException e)
-      {
-      }
-      //errorURI = normalizeURI(errorURI);
-    }
-//    else
-//    {
-//      errorURI = validating_file_uri;
-//      errorURL = validating_file_url;
-//    }
-    //boolean doDialog = true;
-    if (errorURL != null)
-    {
-      successfullyAdded = true;
-      // Add to the appropriate list if nested error support is off or
-      // this message is for the current file.
-      if (!WRAPPER_ERROR_SUPPORT_ENABLED || validating_file_url.sameFile(errorURL))
-      {
-
-        ValidationMessageImpl valmes = new ValidationMessageImpl(message, line,
-            column, severity, uri, errorKey, messageArguments);
-        messages.add(valmes);
-      }
-      // If nested error support is enabled create a nested error.
-      else if (WRAPPER_ERROR_SUPPORT_ENABLED)
-      {
-        String nesteduri = errorURL.toExternalForm();
-        ValidationMessageImpl nestedmess = new ValidationMessageImpl(message, line,
-            column, severity, nesteduri);
-
-        ValidationMessageImpl container = (ValidationMessageImpl) nestedMessages.get(nesteduri);
-        if(container == null)
-        {
-          // Initially set the nested error to a warning. This will automatically be changed
-          // to an error if a nested message has a severity of error.
-          container = new ValidationMessageImpl(messagegenerator.getString(_REF_FILE_ERROR_MESSAGE, nesteduri), 1, 0, IValidationMessage.SEV_WARNING, nesteduri);
-          nestedMessages.put(nesteduri, container);
-          messages.add(container);
-        }
-        container.addNestedMessage(nestedmess);
-      }
-    }
-
-    return successfullyAdded;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#getValidationMessages()
-   */
-  public IValidationMessage[] getValidationMessages()
-  {
-    return (IValidationMessage[])messages.toArray(new IValidationMessage[messages.size()]);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationInfo#addNamespaceWithNoValidator(java.lang.String)
-   */
-  public void addNamespaceWithNoValidator(String namespace)
-  {
-    // If the list doesn't already contain this namespace, add it to the list
-    // and create a warning message.
-    if (!nsNoVals.contains(namespace))
-    {
-      nsNoVals.add(namespace);
-      addWarning(messagegenerator.getString(_WARN_NO_VALDIATOR, namespace), 1, 0);
-
-    }
-
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.ControllerValidationInfo#completeWSDLValidation()
-   */
-  public void completeWSDLValidation()
-  {
-    if (haserrors)
-    {
-      wsdlValid = false;
-    }
-    else
-    {
-      wsdlValid = true;
-    }
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationReport#hasErrors()
-   */
-  public boolean hasErrors()
-  {
-    return haserrors;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.ValidationReport#getNestedMessages()
-   */
-  public HashMap getNestedMessages()
-  {
-    return nestedMessages;
-  }
-  
-  public void setURIResolver(URIResolver uriResolver)
-  {
-  	this.uriResolver = uriResolver;
-  }
-  
-  public URIResolver getURIResolver()
-  {
-  	return uriResolver;
-  }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wsdl.validate.ValidationInfo#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String name) 
-	{
-		return attributes.get(name);
-	}
-	
-	public void setAttributes(Hashtable attributes)
-	{
-		this.attributes.putAll(attributes);
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationMessageImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationMessageImpl.java
deleted file mode 100644
index aa7fc1a..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidationMessageImpl.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * A validation message is created when there is information to report from
- * validating a WSDL document.
- */
-public class ValidationMessageImpl implements IValidationMessage
-{
-  protected String message;
-  protected int lineNumber;
-  protected int columnNumber;
-  protected String uri;
-  protected int severity = SEV_ERROR;
-  protected List nestedErrors;
-  protected String errorKey = null;
-  protected Object[] messageArguments = null;
-
-  /**
-   * Constructor.
-   * 
-   * @param message The validation message.
-   * @param lineNumber The line where the message should be displayed.
-   * @param columnNumber The column where the message should be displayed.
-   * @deprecated Use contructor with URI parameter.
-   */
-  public ValidationMessageImpl(String message, int lineNumber, int columnNumber, int severity)
-  {
-    this(message, lineNumber, columnNumber, severity, null);
-  }
-
-  /**
-   * Constructor.
-   * Allows specifying a uri for the reference that the message refers to.
-   * 
-   * @param message The validation message.
-   * @param lineNumber The line where the message should be displayed.
-   * @param columnNumber The column where the message should be displayed.
-   * @param uri The uri of the reference file for the message.
-   */
-  public ValidationMessageImpl(String message, int lineNumber, int columnNumber, int severity, String uri)
-  {
-      this(message, lineNumber, columnNumber, severity, uri, null, null);
-  }
-  
-  /**
-   * Constructor.
-   * Allows specifying a uri for the reference that the message refers to.
-   * 
-   * @param message The validation message.
-   * @param lineNumber The line where the message should be displayed.
-   * @param columnNumber The column where the message should be displayed.
-   * @param uri The uri of the reference file for the message.
-   * @param errorKey The Xerces Error key
-   * @param messageArguments The values used to "fill in the blanks" of a Xerces error Message
-   */
-  public ValidationMessageImpl(String message, int lineNumber, int columnNumber, int severity, String uri, String errorKey, Object[] messageArguments)
-  {
-    this.message = message;
-    this.lineNumber = lineNumber;
-    this.columnNumber = columnNumber;
-    this.severity = severity;
-    this.uri = uri;
-    this.errorKey = errorKey;
-    this.messageArguments = messageArguments;
-  }
-
-  /**
-   * Returns the validation message.
-   * 
-   * @return The validation message.
-   */
-  public String getMessage()
-  {
-    return message;
-  }
-
-  /**
-   * Returns the column number.
-   * 
-   * @return The column number where the message is located.
-   */
-  public int getColumn()
-  {
-    return columnNumber;
-  }
-
-  /**
-   * Returns the line number.
-   * 
-   * @return The line number where the message is located.
-   */
-  public int getLine()
-  {
-    return lineNumber;
-  }
-
-  /**
-   * returns the uri of the reference file for the validation message.
-   * 
-   * @return The uri of the resource that the message refers to.
-   */
-  public String getURI()
-  {
-    return uri;
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.IValidationMessage#getSeverity()
-   */
-  public int getSeverity()
-  {
-    return severity;
-  }
-  
-  /**
-   * Set the severity of the message.
-   * 
-   * @param severity The severity of the message.
-   */
-  public void setSeverity(int severity)
-  {
-    if(severity == SEV_ERROR || severity == SEV_WARNING)
-    {
-      this.severity = severity;
-    }
-  }
-  
-  /**
-   * Add a nested validation message to this validation message.
-   * 
-   * @param validationMessage The validation message to add as a nested message.
-   */
-  public void addNestedMessage(IValidationMessage validationMessage)
-  {
-    if (nestedErrors == null)
-    {
-      nestedErrors = new ArrayList();
-    }
-    nestedErrors.add(validationMessage);
-    int validaitonmessageSeverity = validationMessage.getSeverity();
-    if(validaitonmessageSeverity == SEV_ERROR)
-    {
-      setSeverity(SEV_ERROR);
-    }
-  }
-
-  /**
-   * Get the list of nested validation messages.
-   * 
-   * @return The list of nested validation messages.
-   */
-  public List getNestedMessages()
-  {
-    return nestedErrors != null ? nestedErrors : Collections.EMPTY_LIST;
-  }
-  /**
-   * @return the error key
-   */
-  public String getErrorKey()
-  {
-    return errorKey;
-  }
-  
-  /**
-   * @param errorKey the error key to set
-   */
-  public void setErrorKey(String errorKey)
-  {
-    this.errorKey = errorKey;
-  }
-  /**
-   * @return the Xerces message arguments used to "fill in the blanks" of the messages
-   */
-  public Object[] getMessageArguments()
-  {
-    return messageArguments;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java
deleted file mode 100644
index e82ca77..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-
-/**
- * A registry of IWSDLValidator validators. This holds the top level WSDL and WS-I validators.
- * Validators are registered by the namespace they validate.
- */
-public class ValidatorRegistry
-{
-  /**
-   * The WSDL validator type.
-   */
-  public final static Integer WSDL_VALIDATOR = new Integer(0);
-  /**
-   * The WS-I validator type.
-   */
-  public final static Integer EXT_VALIDATOR = new Integer(1);
-  protected static ValidatorRegistry verInstance;
-  /*
-    This is a Map of Maps. The top-level Map is keyed by (Class)parentType,
-    and the inner Maps are keyed by (QName)elementType.
-    This idea is the same as is done in WSDL4J
-  */
-  protected Map validatorReg = new Hashtable();
-
-  protected Iterator defaultValidatorIterator;
-
-  /**
-   * Constructor.
-   */
-  protected ValidatorRegistry()
-  {
-  }
-
-  /**
-   * Returns the instance of the registry.
-   * 
-   * @return The instance of the registry.
-   */
-  public static ValidatorRegistry getInstance()
-  {
-    if (verInstance == null)
-    {
-      verInstance = new ValidatorRegistry();
-    }
-    return verInstance;
-  }
-  /**
-   * Register this validator of the given type with the given namespace.
-   * 
-   * @param namespace The namespace the validator validates.
-   * @param valDelegate The validator delegate to register.
-   * @param type The type of validator.
-   */
-  public void registerValidator(String namespace, WSDLValidatorDelegate valDelegate, Integer type)
-  {
-    // allow the null namespace but make it the empty string
-    if (namespace == null)
-    {
-      namespace = "";
-    }
-
-    // get the hastable for the type of validator we want
-    Hashtable typeValidatorReg = (Hashtable)validatorReg.get(type);
-    // if it's null if means we haven't defined this type of validator yet
-    if (typeValidatorReg == null)
-    {
-      typeValidatorReg = new Hashtable();
-      validatorReg.put(type, typeValidatorReg);
-    }
-    
-      List namespacevals = (List)typeValidatorReg.get(namespace);
-      if(namespacevals == null)
-      {
-        namespacevals = new Vector();
-        typeValidatorReg.put(namespace, namespacevals);
-      }
-      namespacevals.add(valDelegate);
-
-  }
-  /**
-   * Ask for the validator associated with this namespace. If none is found
-   * return null.
-   * 
-   * @param namespace The namespace for the validator that is being requested.
-   * @param type The type of validator that is being requested.
-   * @return An array of validator delegates if at least one is registered, null otherwise.
-   */
-  public WSDLValidatorDelegate[] queryValidatorRegistry(String namespace, Integer type)
-  {
-    IWSDLValidator wsdlval = null;
-    // if the namespace is null allow it and treat it as the empty string
-    if (namespace == null)
-    {
-      namespace = "";
-    }
-    Hashtable typeValidatorReg = (Hashtable)validatorReg.get(type);
-    if (typeValidatorReg == null)
-    {
-      return null;
-
-    }
-
-    List valdels = (List)typeValidatorReg.get(namespace);
-    if(valdels != null)
-    {
-      return (WSDLValidatorDelegate[])valdels.toArray(new WSDLValidatorDelegate[valdels.size()]);
-    }
-
-    return null;
-  }
-
-  /**
-   * Returns true if there is a validator registered of the given type with the given namespace.
-   * 
-   * @param namespace The namespace of the validator.
-   * @param type The type of the validator.
-   * @return True if there is a validator registered for the namespace, false otherwise.
-   */
-  public boolean hasRegisteredValidator(String namespace, Integer type)
-  {
-    if (queryValidatorRegistry(namespace, type) != null)
-    {
-      return true;
-    }
-    return false;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java
deleted file mode 100644
index b3dbf4d..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.io.InputStream;
-import java.util.Hashtable;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11BasicValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorController;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.http.HTTPValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.mime.MIMEValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.soap.SOAPValidator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaValidator;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * An main WSDL validator class. The WSDL validator validates WSDL documents.
- */
-public class WSDLValidator
-{
-  private static String VALIDATOR_RESOURCE_BUNDLE = "validatewsdl";
-  private static String VALIDATOR_HTTP_RESOURCE_BUNDLE = "validatewsdlhttp";
-  private static String VALIDATOR_SOAP_RESOURCE_BUNDLE = "validatewsdlsoap";
-  private static String VALIDATOR_MIME_RESOURCE_BUNDLE = "validatewsdlmime";
-  private ValidationController validationController;
-  private URIResolver uriResolver;
-  private Hashtable attributes = new Hashtable();
-  
-  /**
-   * Constructor.
-   */
-  public WSDLValidator()
-  {
-    ResourceBundle rb = ResourceBundle.getBundle(VALIDATOR_RESOURCE_BUNDLE);
-    uriResolver = new URIResolver();
-    validationController = new ValidationController(rb, uriResolver);
-    
-    //Register the default validators.
-    ValidatorRegistry registry = ValidatorRegistry.getInstance();
-    // Register the WSDL 1.1 validator controller and validators.
-    WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(WSDL11ValidatorController.class.getName(), VALIDATOR_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registry.registerValidator(Constants.NS_URI_WSDL, delegate, ValidatorRegistry.WSDL_VALIDATOR);
-    WSDL11ValidatorDelegate delegate1 = new WSDL11ValidatorDelegate(WSDL11BasicValidator.class.getName(), VALIDATOR_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registerWSDL11Validator(Constants.NS_URI_WSDL, delegate1);
-    delegate1 = new WSDL11ValidatorDelegate(HTTPValidator.class.getName(), VALIDATOR_HTTP_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registerWSDL11Validator(org.eclipse.wst.wsdl.validation.internal.Constants.NS_HTTP, delegate1);
-    delegate1 = new WSDL11ValidatorDelegate(SOAPValidator.class.getName(), VALIDATOR_SOAP_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registerWSDL11Validator(org.eclipse.wst.wsdl.validation.internal.Constants.NS_SOAP11, delegate1);
-    delegate1 = new WSDL11ValidatorDelegate(MIMEValidator.class.getName(), VALIDATOR_MIME_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registerWSDL11Validator(org.eclipse.wst.wsdl.validation.internal.Constants.NS_MIME, delegate1);
-   
-    // The WSDL 1.1 schema validator is a special case as it is registered for three namespaces.
-    delegate1 = new WSDL11ValidatorDelegate(InlineSchemaValidator.class.getName(), VALIDATOR_RESOURCE_BUNDLE, getClass().getClassLoader());
-    registerWSDL11Validator(Constants.NS_URI_XSD_1999, delegate1);
-    registerWSDL11Validator(Constants.NS_URI_XSD_2000, delegate1);
-    registerWSDL11Validator(Constants.NS_URI_XSD_2001, delegate1);
-  }
-  
-  /**
-   * Validate the WSDL file at the given location.
-   * 
-   * @param uri The location of the WSDL file to validate.
-   * @return A validation report summarizing the results of the validation.
-   */
-  public IValidationReport validate(String uri)
-  {
-   return validate(uri, null);
-  }
-  
-  /**
-   * 
-   * Validate the inputStream
-   * @param uri The location of the WSDL file being validated
-   * @param inputStream The stream to validate
-   * @return A Validation report summarizing the results of the validation
-   */
-  public IValidationReport validate(String uri, InputStream inputStream)
-  {
-    if(uri == null) 
-      return null;
-    validationController.setAttributes(attributes);
-    return validationController.validate(uri, inputStream);
-  }
-  
-  /**
-   * Add a URI resolver to the WSDL validator.
-   * 
-   * @param uriResolver The URI resolver to add to the WSDL validator.
-   */
-  public void addURIResolver(IExtensibleURIResolver uriResolver)
-  {
-  	this.uriResolver.addURIResolver(uriResolver);
-  }
-  
-  /**
-   * Set an attribute on the validator. An attribute is
-   * defined by a name and a value pair. An attribute may
-   * be defined for any validator, built in or an extension.
-   * Extension validators can probe the attributes set on
-   * the WSDL validator to customize the way in which they
-   * validate.
-   * 
-   * @param name The attribute identifier.
-   * @param value The attribute itself.
-   */
-  public void setAttribute(String name, Object value)
-  {
-  	attributes.put(name, value);
-  }
-  
-  /**
-   * Register an extension WSDL validator delegate with this validator.
-   * 
-   * @param namespace The namespace the validator validates for. This is the WSDL namespace.
-   * @param delegate The delegate that holds the validator.
-   */
-  public void registerWSDLExtensionValidator(String namespace, WSDLValidatorDelegate delegate)
-  {
-    ValidatorRegistry.getInstance().registerValidator(namespace, delegate, ValidatorRegistry.EXT_VALIDATOR);
-  }
-  
-  /**
-   * Register a WSDL 1.1 validator delegate with this validator.
-   * 
-   * @param namespace The namespace the validator validates for.
-   * @param delegate The delegate that holds the validator.
-   */
-  public void registerWSDL11Validator(String namespace, WSDL11ValidatorDelegate delegate)
-  {
-    org.eclipse.wst.wsdl.validation.internal.wsdl11.ValidatorRegistry.getInstance().registerValidator(namespace, delegate);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidatorDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidatorDelegate.java
deleted file mode 100644
index ab4075f..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/WSDLValidatorDelegate.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-
-/**
- * A delegate holds a validator's information and can instantiate it
- * when requested to.
- */
-public class WSDLValidatorDelegate
-{
-  private String validatorClassname = null;
-  private String resourceBundle = null;
-  private ClassLoader classLoader = null;
-  private IWSDLValidator validator = null;
-
-  /**
-   * Create a delegate for a validator by its class name and resource bundle name.
-   * 
-   * @param validatorClassname The name of the validator class.
-   * @param resourceBundle The name of the validator base resource bundle.
-   */
-  public WSDLValidatorDelegate(String validatorClassname, String resourceBundle)
-  {
-    this.validatorClassname = validatorClassname;
-    this.resourceBundle = resourceBundle;
-  }
-
-  /**
-   * Create a delegate for a validator by its class name, resource bundle name and 
-   * a class loader to load the validator and bundle.
-   * 
-   * @param validatorClassname The name of the validator class.
-   * @param resourceBundle The name of the validator base resource bundle.
-   * @param classLoader The class loader to use to load the validator and bundle.
-   */
-  public WSDLValidatorDelegate(String validatorClassname, String resourceBundle, ClassLoader classLoader)
-  {
-    this(validatorClassname, resourceBundle);
-    this.classLoader = classLoader;
-  }
-
-  /**
-   * Get the validator specified in this delegate.
-   * 
-   * @return The WSDL validator specified by this delegate.
-   */
-  public IWSDLValidator getValidator()
-  {
-    if (validator == null)
-     {
-      if(classLoader == null)
-       {
-        classLoader = getClass().getClassLoader();
-      }
-      try
-      {
-        Class validatorClass =
-        classLoader != null ? classLoader.loadClass(validatorClassname) : Class.forName(validatorClassname);
-
-        validator = (IWSDLValidator)validatorClass.newInstance();
-        
-        if (resourceBundle != null)
-        {
-         ResourceBundle validatorBundle = ResourceBundle.getBundle(resourceBundle, Locale.getDefault(), classLoader);
-         validator.setResourceBundle(validatorBundle);
-       }
-      }
-      catch (Exception e)
-      {
-        // TODO: add logging
-        System.err.println(e);
-      }
-      catch(Throwable t)
-      {
-        System.err.println(t);
-      }
-    }
-    return validator;
-  }
-  
-  /**
-   * Return the validator class name.
-   * @return The validator class name.
-   */
-  public String getValidatorClassName()
-  {
-    return validatorClassname;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.java
deleted file mode 100644
index 33d1b48..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.exception;
-
-/**
- * Custom exception for WSDL validation.
- */
-public class ValidateWSDLException extends Exception
-{
-	/**
-   * Required serial version uid.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * Constructor.
-   * 
-   * @param message The exception message
-   */
-  public ValidateWSDLException(String message)
-	{
-	  super(message);
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java
deleted file mode 100644
index 2030ae7..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-/**
- * An interface for the WSDL validator's URI resolver mechanism. The URI resolver
- * is used to find the location of an entity.
- */
-public interface IExtensibleURIResolver
-{
- /**
-  * Resolve the location of the entity described by the publicId and systemId.
-  * 
-  * @param baseLocation The location of the resource that contains the uri.
-  * @param publicId An optional public identifier (i.e. namespace name), or null if none.
-  * @param systemId An absolute or relative URI, or null if none.
-  * @param result The result of the resolution.
-  */
-  public void resolve(String baseLocation, String publicId, String systemId, IURIResolutionResult result);
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java
deleted file mode 100644
index 236bb11..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-/**
- * The representation of a URI resolution result. This interface is not meant to
- * be implemented by clients.
- *
- */
-public interface IURIResolutionResult 
-{
-  /**
-   * Get the logical location of the resolution result.
-   * 
-   * @return The logical location of the resolution result.
-   */
-  public String getLogicalLocation();
-  
-  /**
-   * Set the logical location of the resolution result.
-   * 
-   * @param logicalLocation The logical location of the resolution result.
-   */
-  public void setLogicalLocation(String logicalLocation);
-  
-  /**
-   * Get the physical location of the resolution result.
-   * 
-   * @return The physical location of the resolution result.
-   */
-  public String getPhysicalLocation();
-  
-  /**
-   * Set the physical location of the resolution result.
-   * 
-   * @param physicalLocation The physical location of the resolution result.
-   */
-  public void setPhysicalLocation(String physicalLocation);
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java
deleted file mode 100644
index 07df0c6..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-/**
- * This class holds the URI resolution results.
- *
- */
-public class URIResolutionResult implements IURIResolutionResult
-{
-  private String logicalLocation = null;
-  private String physicalLocation = null;
-  
-  /**
-   * Constructor.
-   */
-  public URIResolutionResult()
-  {
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#getLogicalLocation()
-   */
-  public String getLogicalLocation()
-  {
-	return logicalLocation;
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#setLogicalLocation(java.lang.String)
-   */
-  public void setLogicalLocation(String logicalLocation)
-  {
-	this.logicalLocation = logicalLocation;
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#getPhysicalLocation()
-   */
-  public String getPhysicalLocation()
-  {
-	return physicalLocation;
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult#setPhysicalLocation(java.lang.String)
-   */
-  public void setPhysicalLocation(String physicalLocation)
-  {
-	this.physicalLocation = physicalLocation;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java
deleted file mode 100644
index 9e4b86f..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java
+++ /dev/null

@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.wsdl.validation.internal.util.LazyURLInputStream;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog;
-
-/**
- * This is the main URI resolver that calls out to all of the registered
- * external URI resolvers to locate an entity. If none of the external resolvers
- * can locate the entity the resolver will ask the internal WSDL validator XML
- * catalog to resolve the location.
- */
-public class URIResolver implements IExtensibleURIResolver, XMLEntityResolver
-{
-  private List extURIResolversList = new ArrayList();
-
-  /**
-   * Constructor. 
-   */
-  public URIResolver()
-  {
-  }
-
-
-  /**
-   * Add an extension URI resolver.
-   * 
-   * @param uriResolver
-   *          The extension URI resolver.
-   */
-  public void addURIResolver(IExtensibleURIResolver uriResolver)
-  {
-    extURIResolversList.add(uriResolver);
-  }
-
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver#resolve(java.lang.String, java.lang.String, java.lang.String, org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult)
-   */
-  public void resolve(String baseLocation, String publicId, String systemId, IURIResolutionResult result)
-  {
-    Iterator resolverIter = extURIResolversList.iterator();
-    while(resolverIter.hasNext())
-    {
-      IExtensibleURIResolver resolver = (IExtensibleURIResolver)resolverIter.next();
-      if (resolver == null)
-      {
-        continue;
-      }
-      resolver.resolve(baseLocation, publicId, systemId, result);
-      if (result.getLogicalLocation() != null && !result.getPhysicalLocation().equals(systemId))
-      {
-        break;
-      }
-    }
-
-    // If we haven't been able to locate the result yet ask the internal XML
-    // catalog.
-    if (result.getLogicalLocation() == null && (publicId != null || systemId != null))
-    {
-      String tempresult = XMLCatalog.getInstance().resolveEntityLocation(publicId, systemId);
-      if(tempresult != null)
-      {
-    	result.setLogicalLocation(tempresult);
-    	result.setPhysicalLocation(tempresult);
-      }
-    }
-    if(result.getLogicalLocation() == null)
-    {
-      result.setLogicalLocation(normalize(baseLocation, systemId));
-      result.setPhysicalLocation(result.getLogicalLocation());
-    }
-  }
-  
-  public IURIResolutionResult resolve(String baseLocation, String publicId, String systemId)
-  {
-	IURIResolutionResult result= new URIResolutionResult();
-	resolve(baseLocation, publicId, systemId, result);
-	return result;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) throws XNIException, IOException
-  {
-    String publicId = resourceIdentifier.getPublicId();
-    String systemId = resourceIdentifier.getLiteralSystemId();
-    if (publicId == null || publicId.equals(""))
-    {
-      publicId = resourceIdentifier.getNamespace();
-    }
-    IURIResolutionResult result = resolve(resourceIdentifier.getBaseSystemId(), publicId, systemId);
-    XMLInputSource xmlInputSource = null;
-    if (result != null)
-    {
-      LazyURLInputStream is = new LazyURLInputStream(result.getPhysicalLocation());
-      xmlInputSource = new XMLInputSource(publicId, result.getLogicalLocation(), result.getLogicalLocation(), is, null);
-    }
-    return xmlInputSource;
-  }
-  
-  /**
-   * Normalize the systemId. Make it absolute with respect to the
-   * baseLocation if necessary.
-   * 
-   * @param baseLocation The base location of the file.
-   * @param systemId The system id of the file.
-   * @return A normalized version of the system id.
-   */
-  protected String normalize(String baseLocation, String systemId)
-  {
-  	if(systemId == null)
-  	{
-  	  return systemId;
-  	}
-  	// Try to find a scheme in the systemId.
-  	int schemaLoc = systemId.indexOf(':');
-  	if(schemaLoc != -1 && systemId.charAt(schemaLoc+1) == '/')
-  	{
-  	  // A scheme has been found. The systemId is an
-  	  // absolute location so return it.
-  	  return systemId;
-  	}
-  	if(baseLocation == null)
-  	{
-  	  return baseLocation;
-  	}
-  	
-  	String result = "";
-  	
-  	// Ensure all slashes in the locations are /.
-  	baseLocation = baseLocation.replace('\\','/');
-  	systemId = systemId.replace('\\','/');
-  	
-  	// Remove the trailing section of the baseLocation.
-	int lastSlash = baseLocation.lastIndexOf('/');
-  	String tempresult = baseLocation.substring(0, lastSlash+1);
-  	
-  	if(systemId.startsWith("/"))
-  	{
-  	  systemId = systemId.substring(1);
-  	}
-  	
-  	// Join the base location with the systemid
-  	tempresult = tempresult + systemId;
-  	
-  	// While the relative location starts with a ../ or ./ change
-  	// the result and the relative location.
-  	int loc;
-  	while((loc = tempresult.lastIndexOf("./")) != -1)
-  	{
-  	  result = tempresult.substring(loc + 2) + result;
-  	  if(tempresult.charAt(loc - 1) == '.')
-  	  {
-  	  	if(tempresult.charAt(loc - 2) == '/')
-  	  	{
-  	  	  String temp = tempresult.substring(0, loc - 2);
-  	  	  int loc2 = temp.lastIndexOf('/');
-  	  	  if(loc2 == -1)
-  	  	  {
-  	  	  	// If there is no other / before this the URL must start with scheme:/../
-  	  	  	result = "../" + result;
-  	  	  	tempresult = tempresult.substring(0, loc - 1);
-  	  	  }
-  	  	  else
-  	  	  {
-  	  	  	// Remove the section that comes before this one from tempresult unless it's ../.
-  	  	    tempresult = tempresult.substring(0, loc - 1);
-  	  	    int numSectsToRemove = 1;
-  	  	    
-  	  	    while(tempresult.endsWith("./"))
-  	  	    {
-  	  	      int tempreslen = tempresult.length();
-  	  	      if(tempreslen > 2 && tempresult.charAt(tempreslen -3) == '.')
-  	  	      {
-  	  	      	if(tempreslen > 3 && tempresult.charAt(tempreslen - 4) == '/')
-  	  	      	{
-  	  	      	  numSectsToRemove++;
-  	  	      	  tempresult = tempresult.substring(0, tempresult.length() -3);
-  	  	        }
-  	  	      	else
-  	  	      	{
-  	  	      	  break;
-  	  	      	}
-  	  	      }
-  	  	      else
-  	  	      {
-  	  	      	if(tempresult.charAt(tempresult.length() -2) == '/')
-  	  	      	{
-  	  	      	  tempresult = tempresult.substring(0, tempresult.length() -2);
-  	  	      	}
-  	  	      	else
-  	  	      	{
-  	  	      	  break;
-  	  	      	}
-  	  	      }
-  	  	    }
-  	  	    // Remove the sections.
-  	  	    for(int i = 0; i < numSectsToRemove; i++)
-  	  	    {
-  	  	      String temp2 = tempresult.substring(0,tempresult.length()-1);
-  	  	      int loc3 = temp2.lastIndexOf('/');
-  	  	      if(loc3 == -1)
-  	  	      {
-  	  	      	break;
-  	  	      }
-  	  	      tempresult = tempresult.substring(0, loc3+1);
-  	  	    }
-  	  	  } 
-  	  	}
-  	  	else
-  	  	{
-  	  	  // The URI is of the form file://somedir../ so copy it as is
-  	  	  String temp = tempresult.substring(0, loc - 1);
-	  	  int loc2 = temp.lastIndexOf('/');
-	  	  if(loc2 == -1)
-	  	  {
-	  	  	// The URI must look like file:../ or ../ so copy over the whole tempresult.
-	  	  	result = tempresult.substring(0,loc+2) + result;
-	  	  	tempresult = "";
-	  	  }
-	  	  else
-	  	  {
-	  	  	// Copy over the whole somedir../
-	  	  	result = tempresult.substring(loc2 + 1, tempresult.length());
-	  	    tempresult = tempresult.substring(0, loc2+1);
-	  	  }
-  	  	}
-  	  }
-  	  else
-  	  {
-  	    if(tempresult.charAt(loc -1 ) == '/')
-	  	{
-  	  	  // Result is of the form file://something/./something so remove the ./
-  	      tempresult = tempresult.substring(0,loc);
-	  	}
-  	    else
-  	    {
-  	      // Result URI is of form file://somedir./ so copy over the whole section.
-    	  String temp = tempresult.substring(0, loc - 1);
-  	  	  int loc2 = temp.lastIndexOf('/');
-  	  	  if(loc2 == -1)
-  	  	  {
-  	  	  	// The URI must look like file:./ or ./ so copy over the whole tempresult.
-  	  	  	result = tempresult.substring(0, loc) + result;
-  	  	  	tempresult = "";
-  	  	  }
-  	  	  else
-  	  	  {
-  	  	  	// Copy over the whole somedir./
-  	  	  	result = tempresult.substring(loc2 + 1, tempresult.length());
-  	  	    tempresult = tempresult.substring(0, loc2+1);
-  	  	  }
-  	    }
-  	  }
-  	}
-  	result = tempresult + result;
-  	return result;
-  }
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java
deleted file mode 100644
index 80a9992..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-
-/**
- * A delegate to hold information about an extension URI resolver.
- */
-public class URIResolverDelegate
-{
-  private String classname;
-  private ClassLoader classloader;
-  private IExtensibleURIResolver resolver = null;
-  
-  
-  /**
-   * Constructor.
-   * 
-   * @param classname The class name of the URI resolver.
-   * @param classloader The class loader to use to load the URI resolver.
-   */
-  public URIResolverDelegate(String classname, ClassLoader classloader)
-  {
-    this.classname = classname;
-    this.classloader = classloader;
-  }
-  
-  /**
-   * Get the URI resolver described by this delegate.
-   * 
-   * @return The URI resolver described by this delegate.
-   */
-  public IExtensibleURIResolver getURIResolver()
-  {
-    if(resolver == null)
-    {
-      try
-      {
-        resolver = (IExtensibleURIResolver)classloader.loadClass(classname).newInstance();
-      }
-      catch(Exception e)
-      {
-        try
-        {
-          resolver = (IExtensibleURIResolver)getClass().getClassLoader().loadClass(classname).newInstance();
-        }
-        catch(Exception e2)
-        {
-        }
-      }
-    }
-    return resolver;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/ErrorMessage.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/ErrorMessage.java
deleted file mode 100644
index 81bdc0e..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/ErrorMessage.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.util;
-
-/**
- * A class to hold validation messages. In this case an error message is a generic
- * term for any kind of validation message.
- */
-public class ErrorMessage
-{
-  private int errorLine, errorColumn, severity;
-  private String errorString, uri;
-  private int startOffset = -1;
-  private int endOffset = -1;
-
-  /**
-   * Constructor.
-   */
-  public ErrorMessage()
-  {
-  }
-
-  /**
-   * Sets the message.
-   * 
-   * @param error The message to set.
-   * @see #getErrorMessage
-   */
-  public void setErrorMessage(String error)
-  {
-    errorString = error;
-  }
-
-  /**
-   * Sets the severity of the message.
-   * 
-   * @param severity The severity of the message.
-   * @see #getSeverity
-   */
-  public void setSeverity(int severity)
-  {
-    this.severity = severity;
-  }
-
-  /**
-   * Sets the severity of the message using string names for the severity.
-   * 
-   * @param severity The string representation of the severity.
-   * @see #getSeverity
-   */
-  public void setSeverity(String severity)
-  {
-    if (severity.equals("warning"))
-    {
-      this.severity = 0;
-    }
-    else if (severity.equals("error"))
-    {
-      this.severity = 1;
-    }
-    else if (severity.equals("fatal"))
-    {
-      this.severity = 2;
-    }
-  }
-
-  /**
-   * Sets the line where the error is located.
-   * 
-   * @param line The line where the error is located.
-   * @see #getErrorLine
-   */
-  public void setErrorLine(int line)
-  {
-    errorLine = line;
-  }
-
-  /**
-   * Sets the column where the error is located.
-   * 
-   * @param column The column where the error is located.
-   * @see #getErrorColumn
-   */
-  public void setErrorColumn(int column)
-  {
-    errorColumn = column;
-  }
-
-  /**
-   * Returns the error message.
-   * 
-   * @return The error message.
-   * @see #setErrorMessage
-   */
-  public String getErrorMessage()
-  {
-    return errorString;
-  }
-
-  /**
-   * Returns the severity of the error.
-   * 
-   * @return The severity of the error.
-   * @see #setSeverity
-   */
-  public int getSeverity()
-  {
-    return severity;
-  }
-
-  /**
-   * Returns the line location of the error.
-   * 
-   * @return The line location of the error.
-   * @see #setErrorLine
-   */
-  public int getErrorLine()
-  {
-    return errorLine;
-  }
-
-  /**
-   * Returns the column location of the error.
-   * 
-   * @return The column location of the error.
-   * @see #setErrorColumn
-   */
-  public int getErrorColumn()
-  {
-    return errorColumn;
-  }
-
-  /**
-   * Sets the start offset.
-   * 
-   * @param start The start offset.
-   * @see #getErrorStartOffset
-   */
-  public void setErrorStartOffset(int start)
-  {
-    startOffset = start;
-  }
-
-  /**
-   * Returns the error start offset.
-   * 
-   * @return The error start offset.
-   * @see #setErrorStartOffset
-   */
-  public int getErrorStartOffset()
-  {
-    return startOffset;
-  }
-
-  /**
-   * Sets the end offset.
-   * 
-   * @param end The end offset.
-   * @see #getErrorEndOffset
-   */
-  public void setErrorEndOffset(int end)
-  {
-    endOffset = end;
-  }
-
-  /**
-   * Returns the error end offset.
-   * 
-   * @return The error end offset.
-   * @see #setErrorEndOffset
-   */
-  public int getErrorEndOffset()
-  {
-    return endOffset;
-  }
-
-  /**
-   * Adds a new line ot the error message.
-   * 
-   * @param newLine The new line to add to the error message.
-   */
-  public void addNewErrorMessageLine(String newLine)
-  {
-    errorString += "\n" + newLine;
-  }
-  
-  /**
-   * Set the URI of the error message.
-   * 
-   * @param uri The URI to set.
-   */
- 
-  public void setURI(String uri)
-  {
-    this.uri = uri;
-  }
-  
-  /**
-   * Get the URI of the error message.
-   * 
-   * @return The URI of the error message.
-   */
-  public String getURI()
-  {
-    return uri;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java
deleted file mode 100644
index 1bc6ab1..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.util;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-
-/**
- * This class allows InputStreams to be created and returned to xerces without
- * actually opening file handles or network connections until it is absolutely
- * neccessary.
- */
-public class LazyURLInputStream extends InputStream
-{  
-  private static int debugTotalOpenStreamCount = 0; 
-  protected InputStream inner;
-  protected String url;
-  protected boolean error;
-  boolean hasMarks;
-  boolean pretendFileIsStillOpen;
-
-  public LazyURLInputStream(String url)
-  {
-    this.url = url;
-	inner = null;
-	pretendFileIsStillOpen = false;
-  }
-
-  private void createInnerStreamIfRequired() throws IOException
-  {
-    if (inner == null && !error)
-    {
-      debugTotalOpenStreamCount++;
-      //System.out.println("Creating stream (" + debugTotalOpenStreamCount + ")-- " + url);
-      try
-      {
-        inner = new URL(url).openStream();
-		pretendFileIsStillOpen = false;
-		hasMarks = false;
-      }
-      finally 
-      {
-        if (inner == null)
-        {  
-          error = true;
-        }
-      }
-    }
-  }
-
-	protected void closeStream() throws IOException {
-		if (inner != null && !pretendFileIsStillOpen) {
-			inner.close();
-			pretendFileIsStillOpen = true;
-		}
-  	}
-
-  public int available() throws IOException
-  {
-	if (pretendFileIsStillOpen) return 0;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	return inner.available();
-  }
-
-  public void close() throws IOException
-  {
-	if (pretendFileIsStillOpen) {
-		// Stop behaving as if the stream were still open.
-		pretendFileIsStillOpen = false;
-	} else {
-		if (inner != null) {
-			debugTotalOpenStreamCount--;
-		      //System.out.println("Closing stream (" + debugTotalOpenStreamCount + ") -- " + url);
-			inner.close();
-		}
-	}
-  }
-
-  public void mark(int readlimit)
-  {
-	if (pretendFileIsStillOpen) return;
-	hasMarks = true;
-	try {
-		createInnerStreamIfRequired();
-		inner.mark(readlimit);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-  }
-
-  public boolean markSupported()
-  {
-	if (pretendFileIsStillOpen) return false;
-	try {
-		createInnerStreamIfRequired();
-		if (inner == null) return false;
-		return inner.markSupported();
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-	return false;
-  }
-
-  public int read() throws IOException
-  {
-	if (pretendFileIsStillOpen) return -1;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	int bytesRead = inner.read();
-	if (bytesRead == -1 && !hasMarks) closeStream();
-	return bytesRead;
-  }
-
-
-	public int read(byte[] b) throws IOException {
-		if (pretendFileIsStillOpen) return -1;
-		createInnerStreamIfRequired();
-		if (inner == null) throw new IOException("Stream not available");
-		int bytesRead = inner.read(b);
-		if (bytesRead == -1 && !hasMarks) closeStream();
-		return bytesRead;
-	}
-
-  public int read(byte[] b, int off, int len) throws IOException
-  {    
-	if (pretendFileIsStillOpen) return -1;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	int bytesRead = inner.read(b, off, len);
-	if (bytesRead == -1 && !hasMarks) closeStream();
-	return bytesRead;
-  }
-
-  public void reset() throws IOException
-  {
-	if (pretendFileIsStillOpen) return;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	inner.reset();
-  }
-
-  public long skip(long n) throws IOException
-  {   
-	if (pretendFileIsStillOpen) return 0;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	return inner.skip(n);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/MessageGenerator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/MessageGenerator.java
deleted file mode 100644
index 0b78cb9..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/util/MessageGenerator.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.util;
-
-import java.util.ResourceBundle;
-import java.text.MessageFormat;
-
-/**
- * A convenience class for working with resources in a resource bundle.
- */
-public class MessageGenerator
-{
-  protected ResourceBundle resourcebundle;
-
-  /**
-   * Constructor.
-   * 
-   * @param rb The resource bundle to work with.
-   */
-  public MessageGenerator(ResourceBundle rb)
-  {
-    resourcebundle = rb;
-  }
-
-  /**
-  * Set the resourcebundle to the one specified.
-  * 
-  * @param rb The resource bundle to set.
-  */
-  protected void setResourceBundle(ResourceBundle rb)
-  {
-    resourcebundle = rb;
-  }
-
-  /**
-  * Gets the string resource for the given key.
-  * 
-  * @param key The key for the resource.
-  * @return The string from the resource bundle.
-  */
-  public String getString(String key)
-  {
-    return resourcebundle.getString(key);
-  }
-
-  /**
-   * Gets the string resource for the given key and does one substitution.
-   * 
-   * @param key The key for the resource.
-   * @param s1 The substitution to perform.
-   * @return The string from the resource bundle.
-   */
-  public String getString(String key, Object s1)
-  {
-    return MessageFormat.format(getString(key), new Object[] { s1 });
-  }
-
-  /**
-   * Gets the string resource for the given key and does two substitutions.
-   * 
-   * @param key The key for the resource.
-   * @param s1 The first substitution to perform.
-   * @param s2 The second substitution to perform.
-   * @return The string from the resource bundle.
-   */
-  public String getString(String key, Object s1, Object s2)
-  {
-    return MessageFormat.format(getString(key), new Object[] { s1, s2 });
-  }
-
-  /**
-   *  Gets the string resource for the given key and does three substitutions.
-   * 
-   * @param key The key for the resource.
-   * @param s1 The first substitution to perform.
-   * @param s2 The second substitution to perform.
-   * @param s3 The third substitution to perform.
-   * @return The string from the resource bundle.
-   */
-  public String getString(String key, Object s1, Object s2, Object s3)
-  {
-    return MessageFormat.format(getString(key), new Object[] { s1, s2, s3 });
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java
deleted file mode 100644
index 0c1bc4f..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Hashtable;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-/**
- * An interface for WSDL 1.1 validation information. Uses an existing
- * validation info object and provides methods to set and retrieve
- * schemas and convenience methods for setting errors with objects.
- */
-public interface IWSDL11ValidationInfo
-{
-  /**
-   * Returns the URI of the file being validated.
-   * 
-   * @return The URI of the file being validated.
-   */
-  public String getFileURI();
-  
-  /**
-   * Add a schema to the list of schemas available for this WSDL document.
-   * 
-   * @param xsModel The schema to add to the list.
-   */
-  public void addSchema(XSModel xsModel);
-  
-  /**
-   * Get an array of all the schemas available for this WSDL document.
-   * 
-   * @return An array of all the schemas available for this WSDL document.
-   */
-  public XSModel[] getSchemas();
-  
-  /**
-   * Clear all the stored schemas.
-   */
-  public void clearSchemas();
-  
-  /**
-   * Set the element locations hashtable.
-   * 
-   * @param elementLocations The hashtable to set with the element locations.
-   */
-  public void setElementLocations(Hashtable elementLocations);
-  
-  /**
-   * Convenience method for extensibly validators to add error messages.
-   * 
-   * @param message The error to add.
-   * @param element The object to add the error for.
-   */
-  public void addError(String message, Object element);
-  
-  /**
-   * Convenience method for extensibly validators to add error messages.
-   * 
-   * @param message The error to add.
-   * @param element The object to add the error for.
-   * @param errorKey The error key for this message
-   * @param messageArguments The strings used to create the message.
-   */
-  public void addError(String message, Object element, String errorKey, Object[] messageArguments);
-  
-  /**
-   * Add an error message at the given line and column.
-   * 
-   * @param message The error to add.
-   * @param line The line location of the error.
-   * @param column The column location of the error.
-   * @param uri The uri of the file containing the error.
-   */
-  public void addError(String message, int line, int column, String uri);
-  
-  /**
-   * Convenience method for extensibly validators to add warning messages.
-   * 
-   * @param message The warning to add.
-   * @param element The object to add the warning for.
-   */
-  public void addWarning(String message, Object element);
-  
-  /**
-   * Add a warning message at the given line and column.
-   * 
-   * @param message The warning to add.
-   * @param line The line location of the warning.
-   * @param column The column location of the warning.
-   * @param uri The uri of the file containing the warning.
-   */
-  public void addWarning(String message, int line, int column, String uri);
-  
-  /**
-   * Get the URI resolver in use for this validation. The URI resolver
-   * returned is actually a URI resolver handler that will 
-   * iterate through all of the registered URI resolvers.
-   * 
-   * @return The URI resolver handler.
-   */
-  public URIResolver getURIResolver();
-}
-

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11Validator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11Validator.java
deleted file mode 100644
index a6bd2e2..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11Validator.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.List;
-import java.util.ResourceBundle;
-
-/**
- * Interface for a validator plugged into the WSDL 1.1 validator.
- */
-public interface IWSDL11Validator
-{
-  /**
-   * Validate the given element.
-   * 
-   * @param element The element to validate.
-   * @param parents A list of parents of this element.
-   * @param valInfo The current validation information.
-   */
-  public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo);
-
-  /**
-   * Set the resource bundle of the validator.
-   * 
-   * @param rb The resource bundle to set.
-   */
-  public void setResourceBundle(ResourceBundle rb);
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java
deleted file mode 100644
index 205bc9b..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java
+++ /dev/null

@@ -1,602 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.WSDLException;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult;
-import org.eclipse.wst.wsdl.validation.internal.util.ErrorMessage;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.XSDValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.AbstractXMLConformanceFactory;
-import org.eclipse.wst.wsdl.validation.internal.xml.IXMLValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalogResolver;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.util.StringUtils;
-import com.ibm.wsdl.util.xml.DOMUtils;
-import com.ibm.wsdl.util.xml.QNameUtils;
-
-/**
- * A class to hold and parse an import element.
- */
-public class ImportHolder implements Comparable
-{
-  private MessageGenerator messagegenerator;
-  
-  private WSDLDocument importingWSDLDoc = null;
-  private WSDLDocument wsdlDocument = null;
-  private Definition importingDef = null;
-  private Element importingDocImportElement = null;
-  private String namespace = null;
-  private String location = null;
-  private String classpathURI = null;
-  private String contextURI = null;
-  private int depth;
-  private Element element = null;
-  private List schemas = new ArrayList();
-  private boolean isWSDLFileImport = true;
-  private boolean importInvalid = false;
-  private Import importDef = null;
-  private IWSDL11ValidationInfo valinfo;
-  
-  /**
-   * Constructor.
-   * 
-   * @param namespace The namespace of the import.
-   * @param location The location of the import.
-   * @param contextURI The context URI for resolving the import location.
-   * @param wsdlDoc The WSDLDocument that contains the import.
-   * @param depth The depth of the import.
-   * @param importingDocImportElement The element representing the import in the encapsulating WSDLDocument.
-   * @param messagegenerator A messagegenerator for obtaining strings.
-   * @param valinfo The WSDL11ValidationInfo for reporting messages.
-   */
-  public ImportHolder(String namespace, String location, String contextURI, WSDLDocument importingWSDLDoc, int depth, Element importingDocImportElement, MessageGenerator messagegenerator, IWSDL11ValidationInfo valinfo)
-  {
-    this.messagegenerator = messagegenerator;
-    this.valinfo = valinfo;
-    this.importingWSDLDoc = importingWSDLDoc;
-    if(importingWSDLDoc != null)
-    {
-      this.importingDef = importingWSDLDoc.getDefinition();
-    }
-    this.importingDocImportElement = importingDocImportElement;
-    this.depth = depth;
-    this.namespace = namespace;
-    this.location = location;
-    
-    //  Allow WSDL imports to have no location attribute even though it is required.
-    // Schema will normally catch the problem but this allows users to override the
-    // schema and have the validator run.
-    if (this.location == null)
-    {
-      this.location = namespace;
-    }
-    this.contextURI = contextURI;
-    
-    this.location = this.location.replace('\\','/');
-    IURIResolutionResult classpathURI = valinfo.getURIResolver().resolve(this.contextURI, this.namespace, this.location);
-    if(classpathURI.getLogicalLocation() != null)
-    {
-      this.location = classpathURI.getLogicalLocation();
-    }
-    if(classpathURI.getPhysicalLocation() != null)
-    {
-      this.classpathURI = classpathURI.getPhysicalLocation();
-      this.contextURI = null;
-    } 
-  }
-  
-  public void initialize()
-  {
-    Element documentElement = null;
-    try
-    {
-      documentElement = getElement();
-    }
-    catch(WSDLException e)
-    {
-    }
-    if(documentElement != null)
-    {
-  	  // Handle WSDL imports.
-      if (QNameUtils.matches(Constants.Q_ELEM_DEFINITIONS, documentElement))
-      {
-        if(isXMLValid(this.classpathURI))
-        {
-          try
-          {
-            wsdlDocument = new WSDLDocument(this.location, documentElement, this.depth, this.messagegenerator, this.valinfo);
-            createWSDLImport(wsdlDocument);
-          }
-          catch(WSDLException e)
-          {
-            valinfo.addError(messagegenerator.getString("_UNABLE_TO_IMPORT_BAD_LOCATION", "'" + importDef.getLocationURI() + "'"), importingDocImportElement);
-          }
-        }
-      }
-      // Handle schema imports.
-      else if (QNameUtils.matches(Constants.Q_ELEM_XSD_2001, documentElement))
-      {
-        createXSDImport();
-      }
-    }
-  }
-  
-  protected boolean isXMLValid(String uri)
-  {
-    IXMLValidator xmlValidator = AbstractXMLConformanceFactory.getInstance().getXMLValidator();
-    xmlValidator.setFile(uri);
-    //xmlValidator.setValidationInfo(valInfo);
-    xmlValidator.run();
-    // if there are no xml conformance problems go on to check the wsdl stuff
-    if (xmlValidator.hasErrors())
-    {
-      // temp handling of XML errors until validator is updated.
-      List errors = xmlValidator.getErrors();
-      Iterator errorsIter = errors.iterator();
-      while (errorsIter.hasNext())
-      {
-        IValidationMessage valMes = (IValidationMessage)errorsIter.next();
-        valinfo.addError(valMes.getMessage(), valMes.getLine(), valMes.getColumn(), valMes.getURI());
-      }
-      importInvalid = true;
-      return false;
-    }
-    return true;
-  }
-  
-  /**
-   * Get the importing WSDLDocument.
-   * 
-   * @return The importing WSDLDocument.
-   */
-  public WSDLDocument getImportingDocument()
-  {
-    return importingWSDLDoc;
-  }
-  
-  /**
-   * Get the WSDL document this import represents.
-   * 
-   * @return The WSDL document this import represents.
-   */
-  public WSDLDocument getWSDLDocument()
-  {
-    return wsdlDocument;
-  }
-  
-  /**
-   * Get the namespace.
-   * 
-   * @return The namespace.
-   */
-  public String getNamespace()
-  {
-    return namespace;
-  }
-  
-  /**
-   * Get the location.
-   * 
-   * @return The location.
-   */
-  public String getLocation()
-  {
-    return location;
-  }
-  
-  /**
-   * Get the context URI.
-   * 
-   * @return The context URI.
-   */
-  public String getContextURI()
-  {
-    return contextURI;
-  }
-  
-  /**
-   * Get the depth in the WSDL tree.
-   * 
-   * @return The depth in the WSDL tree.
-   */
-  public int getDepth()
-  {
-    return depth;
-  }
-  
-  /**
-   * Get the containing defintions element.
-   * 
-   * @return The containing definitions element.
-   */
-  public Definition getImportingDefinition()
-  {
-    return importingDef;
-  }
-  
-  /**
-   * Get the element for this import.
-   * 
-   * @return The element for this import.
-   * @throws WSDLException
-   */
-  public Element getElement() throws WSDLException
-  {
-    if(element != null)
-    {
-      return element;
-    }
-    
-    String locationURI = location;
-    String namespaceURI = namespace;
-    //Import importDef = importingDef.createImport();
-    
-    //  Allow locating WSDL documents using any registered URI resolver.
-    //String classpathURI = URIResolver.getInstance().resolve(contextURI, namespaceURI, locationURI);
-//    if (!classpathURI.equals(locationURI))
-//    {
-//      locationURI = classpathURI;
-//      contextURI = null;
-//    }
-    Reader reader = null;
-    if (locationURI != null)
-    {
-        try
-        {
-          //String contextURI = def.getDocumentBaseURI();
-          //Definition importedDef = null;
-          
-          InputSource inputSource = null;
-          URL url = null;
-
-          
-            URL contextURL = (contextURI != null) ? StringUtils.getURL(null, contextURI) : null;
-
-            url = StringUtils.getURL(contextURL, locationURI);
-            
-            // Handle file:// urls. The correct format should be file:/// or file:/.
-            String urlAuthority = url.getAuthority();
-            String urlProtocol = url.getProtocol();
-            if(urlAuthority !=null && urlProtocol.equalsIgnoreCase("file") && !urlAuthority.equals(""))
-             {
-              url = new URL(urlProtocol,"","/" + urlAuthority + url.getFile());
-            }
-            
-            String urlString = url.toString();
-			// Test for case sensitivity on local files.
-			if(urlString.startsWith("file:"))
-			{
-			  File testfile = new File(url.getFile());
-			  String testfileString = testfile.getAbsolutePath();
-			  String canonicalfileString = testfile.getCanonicalPath();
-
-              if (!testfileString.equals(canonicalfileString))
-              {
-				if (!String.valueOf(testfileString.charAt(0)).equalsIgnoreCase
-				    (String.valueOf(canonicalfileString.charAt(0)))
-				    || !testfileString.substring(1,testfileString.length()).equals
-					(canonicalfileString.substring(1,canonicalfileString.length())))
-				{
-                  urlString = "";
-                  url = null;
-				}
-              }
-			}
-			if(url != null)
-			{
-			  try
-			  {
-                reader = StringUtils.getContentAsReader(url);
-			  }
-			  catch(IOException e)
-			  {
-			    // No need to do anything here. The error will be handled below.
-			  }
-			}
-            if (reader != null)
-            {
-              inputSource = new InputSource(reader);
-              if(classpathURI != null && !classpathURI.equals(location))
-  			  {
-  			    inputSource.setByteStream(new URL(classpathURI).openStream());
-  			  }
-            }
-
-            if (inputSource == null)
-            {
-              // Get the actual location from the element.
-              String actualLocation = DOMUtils.getAttribute(importingDocImportElement, Constants.ATTR_LOCATION);
-              if(actualLocation == null)
-              {
-              	actualLocation = DOMUtils.getAttribute(importingDocImportElement, "schemaLocation");
-              }
-              if(actualLocation == null)
-              {
-              	actualLocation = namespace;
-              }
-              importingWSDLDoc.addReaderWarning(
-                  importingDef,
-                  importingDocImportElement,
-                  messagegenerator.getString("_UNABLE_TO_IMPORT_BAD_LOCATION", "'" + actualLocation + "'"));
-              importInvalid = true;
-               
-              // TODO: modify the reader error to show in all the correct locations.
-              throw new WSDLException(
-                WSDLException.OTHER_ERROR,
-                "Unable to locate imported document "
-                  + "at '"
-                  + locationURI
-                  + "'"
-                  + (contextURI == null ? "." : ", relative to '" + contextURI + "'."));
-            }
-            Document doc = null;
-            try
-            {
-              doc = WSDLReaderImpl.getDocument(inputSource, locationURI);
-            }
-            catch(WSDLException e)
-            {
-              // The File is invalid and cannot be read. 
-              // Perform XML validation.
-              isXMLValid(locationURI);
-//              importingWSDLDoc.addReaderError(
-//                  importingDef,
-//                  importingDocImportElement,
-//                  messagegenerator.getString("_UNABLE_TO_IMPORT_INVALID", "'" + location + "'"));
-              throw e;
-            }
-            element = doc.getDocumentElement();
-            if(!QNameUtils.matches(Constants.Q_ELEM_DEFINITIONS, element))
-            {
-              isWSDLFileImport = false;
-            }
-            // Ensure that the imported document has the same namespace as the import element states.
-            String importTargetNS = element.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-            if(!importTargetNS.equals(namespace))
-            {
-              importingWSDLDoc.addReaderWarning(
-                  importingDef,
-                  importingDocImportElement,
-                  messagegenerator.getString("_WARN_WRONG_NS_ON_IMPORT", "'" + namespace + "'", "'" + importTargetNS + "'"));
-              element = null;
-              importInvalid = true;
-            }
-          }
-        
-        catch(Exception e)
-        {
-        }
-        finally
-        {
-          if(reader != null)
-          {
-            try
-            {
-              reader.close();
-            }
-            catch(IOException e)
-            {}
-          }
-        }
-      
-    }
-    return element;
-  }
-  
-  /**
-   * Create an import element for a WSDL import of a WSDL document.
-   * 
-   * @param wsdlDocument The document of the import.
-   * @return The newly created import element.
-   */
-  public Import createWSDLImport(WSDLDocument wsdlDocument)
-  {
-    if(importDef != null)
-    {
-      return importDef;
-    }
-    importDef = getNewImport();
-  
-    if (importDef != null)
-    {
-      importDef.setDefinition(wsdlDocument.getDefinition());
-      schemas.addAll(wsdlDocument.getSchemas());
-      importingWSDLDoc.addSchemas(schemas);
-    }
-
-    return importDef;
-  }
-  
-  /**
-   * Create an import element for a WSDL import of a schema import of a schema document.
-   * 
-   * @return The newly created import element.
-   */
-  public Import createXSDImport()
-  {
-    if(importDef != null)
-    {
-      return importDef;
-    }
-    importDef = getNewImport();
-    XSDValidator xsdvalidator = new XSDValidator();
-
-    xsdvalidator.validate(location, XMLCatalogResolver.getInstance());
-    if (xsdvalidator.isValid())
-    {
-      XSModel schema = xsdvalidator.getXSModel();
-      if (schema != null)
-      {
-        schemas.add(schema);
-      }
-    }
-    else
-    {
-     // addReaderWarning(
-//        def,
-//        importDef,
-//        messagegenerator.getString("_UNABLE_TO_IMPORT_INVALID", "'" + importDef.getLocationURI() + "'"));
-      Iterator errors = xsdvalidator.getErrors().iterator();
-      while (errors.hasNext())
-      {
-        ErrorMessage err = (ErrorMessage) errors.next();
-        String uri = err.getURI();
-        int line = err.getErrorLine();
-        String errmess = err.getErrorMessage();
-        valinfo.addError(errmess, line, err.getErrorColumn(), uri);
-      }
-    }
-    importingWSDLDoc.addSchemas(schemas);
-    return importDef;
-  }
-  
-  /**
-   * Get the import element if it has been created.
-   * 
-   * @return The import element if it has been created or null.
-   */
-  public Import getImport()
-  {
-    return importDef;
-  }
-  
-  /**
-   * Get a new import element.
-   * 
-   * @return A new import element.
-   */
-  private Import getNewImport()
-  {
-    if(importInvalid)
-    {
-      return null;
-    }
-    Import importDef = importingDef.createImport(); 
-    
-    if (namespace != null)
-    {
-      importDef.setNamespaceURI(namespace);
-    }
-
-    if (location != null)
-    {
-      importDef.setLocationURI(location);
-    }
-    
-    if(element != null)
-    {
-      Element tempEl = DOMUtils.getFirstChildElement(element);
-
-      while (tempEl != null)
-      {
-        if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-        {
-          importDef.setDocumentationElement(tempEl);
-        }
-
-        tempEl = DOMUtils.getNextSiblingElement(tempEl);
-      }
-    }
-
-    return importDef;
-  }
-  
-  /**
-   * Get the schemas corresponding to this import.
-   * 
-   * @return The schemas corresponding to this import.
-   */
-  public List getSchemas()
-  {
-    return schemas;
-  }
-  
-  /**
-   * Returns true if this import imports a WSDL document, false otherwise.
-   * 
-   * @return True if this import imports a WSDL document, false otherwise.
-   */
-  public boolean isWSDLFileImport()
-  {
-    return isWSDLFileImport;
-  }
-  
-  /* (non-Javadoc)
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
-  public boolean equals(Object obj)
-  {
-    if(obj.getClass() == ImportHolder.class)
-    {
-      ImportHolder otherImport = (ImportHolder)obj;
-      
-      if(getNamespace().equals(otherImport.getNamespace()) && getLocation().equals(otherImport.getLocation()))
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-  
-  /* (non-Javadoc)
-   * @see java.lang.Comparable#compareTo(java.lang.Object)
-   */
-  public int compareTo(Object obj)
-  {
-    if(obj == null)
-    {
-      throw new NullPointerException();
-    }
-    
-    ImportHolder otherImport = (ImportHolder)obj;
-      
-    return (getNamespace()+getLocation()).compareTo((otherImport.getNamespace()+otherImport.getLocation()));
-  }
-  
-  /**
-   * Set the messagegenerator for the import holder.
-   * 
-   * @param mg The message generator to set.
-   */
-  public void setMessageGenerator(MessageGenerator mg)
-  {
-    messagegenerator = mg;
-  }
-  
-  /**
-   * Return true if the import is invalid, false otherwise.
-   * 
-   * @return True if the import is invalid, false otherwise.
-   */
-  public boolean isImportInvalid()
-  {
-    return importInvalid;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/LocationHolder.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/LocationHolder.java
deleted file mode 100644
index 1def333..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/LocationHolder.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-/**
- * Holds the location information for an element in a document.
- */
-public class LocationHolder
-{
-  private int line;
-  private int column;
-  private String uri;
-  
-  /**
-   * Constructor.
-   * 
-   * @param line The line number.
-   * @param column The column number.
-   * @param uri The URI of the document.
-   */
-  public LocationHolder(int line, int column, String uri)
-  {
-    this.line = line;
-    this.column = column;
-    this.uri = uri;
-  }
-  
-  /**
-   * Get the line number.
-   * 
-   * @return The line number.
-   */
-  public int getLine()
-  {
-    return line;
-  }
-  
-  /**
-   * Get the column number.
-   * 
-   * @return The column number.
-   */
-  public int getColumn()
-  {
-    return column;
-  }
-  
-  /**
-   * Get the file URI.
-   * 
-   * @return The file URI.
-   */
-  public String getURI()
-  {
-    return uri;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ReaderError.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ReaderError.java
deleted file mode 100644
index 36b4e44..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ReaderError.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-/**
- * Holds an error created when reading a WSDL document.
- */
-public class ReaderError
-{
-  protected Object parentObject; // the object of the parent of the object with the error
-  protected Object object; // the object the error is associated with
-  protected String error; // the error associated with the object 
-
-  /**
-   * Constructor.
-   * 
-   * @param parentObject the parent object of the object with the error
-   * @param object the object with the error
-   * @param error the error
-   */
-  public ReaderError(Object parentObject, Object object, String error)
-  {
-    this.parentObject = parentObject;
-    this.object = object;
-    this.error = error;
-  }
-
-  /**
-   * Returns the parent object of the object with the error.
-   * 
-   * @return the parent object of the object with the error
-   */
-  public Object getParentObject()
-  {
-    return parentObject;
-  }
-
-  /**
-   * Returns the object with the error.
-   * 
-   * @return the object with the error
-   */
-  public Object getObject()
-  {
-    return object;
-  }
-
-  /**
-   * Returns the error message.
-   * 
-   * @return the error message
-   */
-  public String getError()
-  {
-    return error;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java
deleted file mode 100644
index 90564f4..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-
-/**
- * A registry to hold all the WSDL 1.1 validators.
- */
-public class ValidatorRegistry
-{
-
-  protected static ValidatorRegistry verInstance;
-
-  protected Map validatorReg = new Hashtable();
-
-  /**
-   * Constructor.
-   */
-  protected ValidatorRegistry()
-  {
-  }
-
-  /**
-   * Returns the instance of this registry.
-   * 
-   * @return The instance of this registry.
-   */
-  public static ValidatorRegistry getInstance()
-  {
-    if (verInstance == null)
-    {
-      verInstance = new ValidatorRegistry();
-    }
-    return verInstance;
-  }
-
-  /**
-   * Register this validator delegate with the given namespace.
-   * 
-   * @param namespace The namespace the validator is associated with.
-   * @param valDelegate The validator delegate to register.
-   */
-  public void registerValidator(String namespace, WSDL11ValidatorDelegate valDelegate)
-  {
-    // allow the null namespace but make it the empty string
-    if (namespace == null)
-    {
-      namespace = "";
-    }
-
-    // add the validator to the hashtable
-    validatorReg.put(namespace, valDelegate);
-  }
-
-  /**
-   * Ask for the validator associated with this namespace. If none is found
-   * return null.
-   * 
-   * @param namespace The namespace of the validator.
-   * @return The WSDL 1.1 validator for the given namespace.
-   */
-  public IWSDL11Validator queryValidatorRegistry(String namespace)
-  {
-    // if the namespace is null allow it and treat it as the empty string
-    if (namespace == null)
-    {
-      namespace = "";
-    }
-    WSDL11ValidatorDelegate delegate = (WSDL11ValidatorDelegate)validatorReg.get(namespace);
-    if(delegate != null)
-    {  
-      return delegate.getValidator();
-    }
-    return null;
-  }
-
-  /**
-   * Convenience method that tells whether a validator for a given namespace is registered.
-   * 
-   * @param namespace The namespace to check.
-   * @return True if there is a validator registered, false otherwise.
-   */
-  public boolean hasRegisteredValidator(String namespace)
-  {
-    if (queryValidatorRegistry(namespace) != null)
-    {
-      return true;
-    }
-    return false;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java
deleted file mode 100644
index 4d7b0c2..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java
+++ /dev/null

@@ -1,691 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.SchemaAttributeTable;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.XSDValidator;
-
-import com.ibm.wsdl.Constants;
-/**
- * Validate the elements defined in a WSDL 1.1 Document.
- */
-public class WSDL11BasicValidator implements IWSDL11Validator
-{
-  protected final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces";
-  protected final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation";
-  protected final String SCHEMA_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/schema";
-  protected final String SCHEMA_FULL_CHECKING_FEATURE_ID =
-    "http://apache.org/xml/features/validation/schema-full-checking";
-  protected final String CONTINUE_AFTER_FATAL_ERROR_ID = "http://apache.org/xml/features/continue-after-fatal-error";
-  protected final String SOAP_ENCODING_URI = "http://schemas.xmlsoap.org/soap/encoding/";
-  
-  // Error and Warning Keys
-  private final String _PORT_NAME_NOT_UNIQUE = "_PORT_NAME_NOT_UNIQUE";
-  private final String _NO_BINDING_FOR_PORT = "_NO_BINDING_FOR_PORT";
-  private final String _NO_ADDRESS_PORT = "_NO_ADDRESS_PORT";
-  private final String _MORE_THEN_ONE_ADDRESS_PORT = "_MORE_THEN_ONE_ADDRESS_PORT"; //TODO should be _MORE_THAN_ONE_ADDRESS_PORT, not THEN
-  private final String _PORTTYPE_UNDEFINED_FOR_BINDING = "_PORTTYPE_UNDEFINED_FOR_BINDING";
-  private final String _OPERATION_UNDEFINED_FOR_PORTTYPE = "_OPERATION_UNDEFINED_FOR_PORTTYPE";
-  private final String _OPERATION_NO_INPUT_OR_OUTPUT = "_OPERATION_NO_INPUT_OR_OUTPUT";
-  private final String _INPUT_NAME_NOT_UNIQUE = "_INPUT_NAME_NOT_UNIQUE";
-  private final String _MESSAGE_UNDEFINED_FOR_INPUT = "_MESSAGE_UNDEFINED_FOR_INPUT";
-  private final String _OUTPUT_NAME_NOT_UNIQUE = "_OUTPUT_NAME_NOT_UNIQUE";
-  private final String _MESSAGE_UNDEFINED_FOR_OUTPUT = "_MESSAGE_UNDEFINED_FOR_OUTPUT";
-  private final String _MESSAGE_UNDEFINED_FOR_FAULT = "_MESSAGE_UNDEFINED_FOR_FAULT";
-  private final String _PART_NO_ELEMENT_OR_TYPE = "_PART_NO_ELEMENT_OR_TYPE";
-  private final String _PART_BOTH_ELEMENT_AND_TYPE = "_PART_BOTH_ELEMENT_AND_TYPE";
-  private final String _PART_INVALID_ELEMENT = "_PART_INVALID_ELEMENT";
-  private final String _PART_INVALID_TYPE = "_PART_INVALID_TYPE";
-  private final String _WARN_SOAPENC_IMPORTED_PART = "_WARN_SOAPENC_IMPORTED_PART";
-
-  private final int ELEMENT = 0;
-  private final int TYPE = 1;
-  
-  private final String REQUEST = "Request";
-  private final String RESPONSE = "Response";
-  private final String QUOTE = "'";
-  private final String EMPTY_STRING = "";
-  
-
-  //protected WSDL11ValidatorController validatorcontroller;
-  protected MessageGenerator messagegenerator;
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.wsdl11.IWSDL11ValidationInfo)
-   */
-  public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    //this.validatorcontroller = validatorcontroller;
-    //setDefaultResourceBundleIfNeeded(validatorcontroller);
-    Definition wsdlDefinition = (Definition)element;
-    //validateTypes(wsdlDefinition, valInfo);
-    validateServices(wsdlDefinition, valInfo);
-    validateBindings(wsdlDefinition, valInfo);
-    validatePortTypes(wsdlDefinition, valInfo);
-    validateMessages(wsdlDefinition, valInfo);
-
-  }
-
-  /**
-   * Takes a list of ExtensibilityElements and checks if there's a validator 
-   * associated with each element and if so calls the validator.
-   * 
-   * @param parents The list of parents of the elements.
-   * @param extensibilityElements The list of elements to validate.
-   * @param validatorcontroller The validator controller.
-   * @param wsdlDefinition The defnintions element for this document.
-   */
-  protected void validateExtensibilityElementList(
-    List parents,
-    List extensibilityElements,
-    IWSDL11ValidationInfo valInfo)
-  {
-    ValidatorRegistry ver = ValidatorRegistry.getInstance();
-    Iterator extElems = extensibilityElements.iterator();
-    while (extElems.hasNext())
-    {
-      ExtensibilityElement element = (ExtensibilityElement)extElems.next();
-      String namespace = element.getElementType().getNamespaceURI();
-      IWSDL11Validator val = ver.queryValidatorRegistry(namespace);
-      if (val != null)
-       {
-        val.validate(element, parents, valInfo);
-      }
-//      else
-//       {
-//        valInfo.addNamespaceWithNoValidator(namespace);
-//      }
-    }
-  }
-
-  /**
-   * If the resourcebundle hasn't been set, set it to the one registered with the ValidatorController.
-   * 
-   * @param validatorcontroller The validator controller to get the resource bundle from.
-   */
-  //  protected void setDefaultResourceBundleIfNeeded(WSDL11ValidatorController validatorcontroller)
-  //  {
-  //    if (messagegenerator == null)
-  //    {
-  //      setResourceBundle(validatorcontroller.getResourceBundle());
-  //    }
-  //  }
-
-  /**
-   * Set the resourcebundle to the one specified.
-   * 
-   * @param rb The resource bundle to set.
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    messagegenerator = new MessageGenerator(rb);
-  }
-
-  /**
-   * Ensure that the Types element is correct. 
-   * 
-   * @param wsdlDefinition The definitions element from the current document.
-   */
-
-  protected void validateTypes(Definition wsdlDefinition, IWSDL11ValidationInfo valInfo)
-  {
-    Types types = wsdlDefinition.getTypes();
-    // ensure that types is defined
-    if (types != null)
-    {
-      List parents = new Vector();
-      parents.add(wsdlDefinition);
-      Object extensibleElements[] = types.getExtensibilityElements().toArray();
-      parents.add(0, types);
-      validateExtensibilityElementList(parents, types.getExtensibilityElements(), valInfo);
-      parents.remove(0);
-    }
-  }
-
-  /**
-   * Validates all of the declared services for the definition.
-   * 
-   * @param wsdlDefinition The WSDL definitions element.
-   */
-  protected void validateServices(Definition wsdlDefinition, IWSDL11ValidationInfo valInfo)
-  {
-    if (wsdlDefinition.getServices() == null)
-      return;
-    Object services[] = wsdlDefinition.getServices().values().toArray();
-    List parents = new Vector();
-    parents.add(wsdlDefinition);
-    Hashtable allPorts = new Hashtable();
-
-    //TODO: check that ports in other imported files don't conflict with ports in this one
-    //    // register all of the imported ports
-    //    Iterator imports = wsdlDefinition.getImports().values().iterator();
-    //    while(imports.hasNext())
-    //    {
-    //      Iterator impservices = ((Import)imports.next()).getDefinition().getServices().values().iterator();
-    //      while(impservices.hasNext())
-    //      {
-    //        Iterator impports = ((Service)impservices.next()).getPorts().values().iterator();
-    //        while(impports.hasNext())
-    //        {
-    //          Port tempP = (Port)impports.next();
-    //          allPorts.put(tempP.getName(),tempP);	
-    //        }
-    //      }
-    //    }
-    for (int i = 0; i < services.length; i++)
-    {
-      Service s = (Service)services[i];
-      parents.add(0, s);
-      Object ports[] = s.getPorts().values().toArray();
-      HashSet portInputs = new HashSet();
-      HashSet portOutputs = new HashSet();
-      for (int j = 0; j < ports.length; j++)
-      {
-        Port p = (Port)ports[j];
-        parents.add(0, p);
-        // a Port name must be unique within the entire WDSL document
-        if (allPorts.contains(p.getName()))
-        {  String[] args = {p.getName()};
-          
-          valInfo.addError(messagegenerator.getString(_PORT_NAME_NOT_UNIQUE, QUOTE + args[0] + QUOTE),
-                            p, _PORT_NAME_NOT_UNIQUE, args);
-        }
-        else
-        {
-          allPorts.put(p.getName(), p);
-
-          // get the binding for this port and see if the PortType for the binding
-          // is defined
-          if (p.getBinding() == null || p.getBinding().isUndefined())
-          {
-            String bindingName = EMPTY_STRING;
-            if (p.getBinding() != null)
-            {
-              bindingName = p.getBinding().getQName().getLocalPart();
-            }
-            String args[] = {p.getName()};
-            valInfo.addError(
-              messagegenerator.getString(_NO_BINDING_FOR_PORT, QUOTE + args[0] + QUOTE, QUOTE + bindingName + QUOTE),
-              p, _NO_BINDING_FOR_PORT, args);
-          }
-          else
-          {
-            // TODO: Check that the output of one port isn't the input of another and vice versa
-            // extensibility elements the port
-            // there can only be one and must be one extensibility element defined for a port
-            List extelems = p.getExtensibilityElements();
-            if (extelems.size() < 1)
-            { String args[]= {p.getName()};
-              valInfo.addError(messagegenerator.getString(_NO_ADDRESS_PORT, QUOTE + args[0] + QUOTE),
-                  p, _NO_ADDRESS_PORT, args);
-            }
-            else if (extelems.size() > 1)
-            {
-              for (int k = 1; k < extelems.size(); k++)
-              {
-                String[] args = {p.getName()};
-                valInfo.addError(
-                  messagegenerator.getString(_MORE_THEN_ONE_ADDRESS_PORT, QUOTE + args[0] + QUOTE),
-                  extelems.get(k), _MORE_THEN_ONE_ADDRESS_PORT, args);
-              }
-            }
-            validateExtensibilityElementList(parents, p.getExtensibilityElements(), valInfo);
-          }
-        }
-
-        parents.remove(0);
-      }
-      // extensibility elements for the service
-      validateExtensibilityElementList(parents, s.getExtensibilityElements(), valInfo);
-      parents.remove(0);
-    }
-  }
-
-  /**
-   * Checks that the bindings refer to valid PortTypes and all of the operations
-  // in a given binding refer to a defined operation within the corresponding
-  // PortType.
-   * 
-   * @param wsdlDefinition The WSDL definitions element.
-   */
-  protected void validateBindings(Definition wsdlDefinition, IWSDL11ValidationInfo valInfo)
-  {
-    if (wsdlDefinition.getBindings() == null)
-      return;
-    Object bindings[] = wsdlDefinition.getBindings().values().toArray();
-    List parents = new Vector();
-    parents.add(wsdlDefinition);
-    for (int i = 0; i < bindings.length; i++)
-    {
-      Binding b = (Binding)bindings[i];
-      parents.add(0, b);
-      PortType portType = b.getPortType();
-
-      if (portType == null)
-      {
-        continue;
-      }
-      // the PortType is not defined so don't bother checking the operations
-      if (portType.isUndefined())
-      { String[] args = {portType.getQName().getLocalPart(), b.getQName().getLocalPart()};
-        valInfo.addError(
-          messagegenerator.getString(
-            _PORTTYPE_UNDEFINED_FOR_BINDING,
-            QUOTE + args[0] + QUOTE,
-            QUOTE + args[1] + QUOTE),
-          b, _PORTTYPE_UNDEFINED_FOR_BINDING, args);
-      }
-      else
-      {
-        // the PortType is defined so now we have to check that the operations are defined
-        Object bindingOperations[] = b.getBindingOperations().toArray();
-
-        // check if the operation is defined for each BindingOperation
-        for (int k = 0; k < bindingOperations.length; k++)
-        {
-          BindingOperation bo = (BindingOperation)bindingOperations[k];
-          parents.add(0, bo);
-          if (bo.getOperation() == null || bo.getOperation().isUndefined())
-          {
-            String[] args = {b.getQName().getLocalPart(), portType.getQName().getLocalPart()};
-            valInfo.addError(
-              messagegenerator.getString(
-                _OPERATION_UNDEFINED_FOR_PORTTYPE,
-                QUOTE + args[0] + QUOTE,
-                QUOTE + args[1] + QUOTE),
-              bo, _OPERATION_UNDEFINED_FOR_PORTTYPE, args);
-            // nice idea to add suggestions to other elements to fix the error
-            // but it doesn't work with multipe files like this
-            //addValidationMessage(warningList,portType,portType.getQName().getLocalPart() + "Define an operation here to correspond with the operation in: " + bo.getName());
-          }
-          // take care of all the extensibility elements in the binding operation, binding inputs, outputs and faults
-          else
-          {
-            BindingInput binput = bo.getBindingInput();
-            if (binput != null)
-            {
-              parents.add(0, binput);
-              // extensibility elements for binding operation input
-              validateExtensibilityElementList(
-                parents,
-                bo.getBindingInput().getExtensibilityElements(),
-                valInfo);
-              parents.remove(0);
-            }
-            BindingOutput boutput = bo.getBindingOutput();
-            if (boutput != null)
-            {
-              parents.add(0, boutput);
-              // extensibility elements for binding operation output
-              validateExtensibilityElementList(
-                parents,
-                bo.getBindingOutput().getExtensibilityElements(),
-                valInfo);
-              parents.remove(0);
-            }
-            // no input or output has been defined for the operation
-            if (binput == null && boutput == null)
-            { String[] args = { bo.getName() };
-              valInfo.addError(
-                messagegenerator.getString(_OPERATION_NO_INPUT_OR_OUTPUT, QUOTE + args[0] + QUOTE),
-                bo, _OPERATION_NO_INPUT_OR_OUTPUT, args);
-            }
-            // extensibility elements for each binding operation fault
-            Iterator faults = bo.getBindingFaults().values().iterator();
-            while (faults.hasNext())
-            {
-              BindingFault bf = (BindingFault)faults.next();
-              parents.add(0, bf);
-              validateExtensibilityElementList(parents, bf.getExtensibilityElements(), valInfo);
-              parents.remove(0);
-            }
-          }
-          // extensibility elements for binding operation
-          validateExtensibilityElementList(parents, bo.getExtensibilityElements(), valInfo);
-          parents.remove(0);
-        }
-      }
-      // extensibility elements for the binding
-      validateExtensibilityElementList(parents, b.getExtensibilityElements(), valInfo);
-      parents.remove(0);
-    }
-
-  }
-
-  /**
-   * Check that all of the PortTypes have valid messages associated with their
-  // operation input, output and fault types.
-   * 
-   * @param wsdlDefinition The WSDL definitions element.
-   */
-  protected void validatePortTypes(Definition wsdlDefinition, IWSDL11ValidationInfo valInfo)
-  {
-    if (wsdlDefinition.getPortTypes() == null)
-      return;
-    Object porttypes[] = wsdlDefinition.getPortTypes().values().toArray();
-
-    for (int i = 0; i < porttypes.length; i++)
-    {
-      PortType p = (PortType)porttypes[i];
-      Object operations[] = p.getOperations().toArray();
-      List inAndOutNames = new Vector();
-      for (int j = 0; j < operations.length; j++)
-      {
-        Operation o = (Operation)operations[j];
-        if (o == null || o.isUndefined())
-        {
-          continue;
-        }
-
-        // check that the messages are defined for the input, output and faults
-        Message m;
-        Input input = o.getInput();
-        if (input != null)
-        {
-          String inputName = input.getName();
-          // if the name isn't defined it defaults to this
-          if (inputName == null)
-          {
-            inputName = o.getName() + REQUEST;
-          }
-          if (inAndOutNames.contains(inputName))
-          { String[] args = {inputName, p.getQName().getLocalPart() };
-            valInfo.addError(
-              messagegenerator.getString(
-                _INPUT_NAME_NOT_UNIQUE,
-                QUOTE + args[0] + QUOTE,
-                QUOTE + args[1] + QUOTE),
-              input, _INPUT_NAME_NOT_UNIQUE, args);
-          }
-          else
-          {
-            inAndOutNames.add(inputName);
-          }
-
-          m = input.getMessage();
-          if (m != null && m.isUndefined())
-          {
-            String messName = EMPTY_STRING;
-            QName messQName = m.getQName();
-            if (messQName != null)
-            {
-              messName = messQName.getLocalPart();
-            }
-            String[] args = {messName};
-            valInfo.addError(messagegenerator.getString(_MESSAGE_UNDEFINED_FOR_INPUT, QUOTE + args[0] + QUOTE),
-                input, _MESSAGE_UNDEFINED_FOR_INPUT, args);
-          }
-        }
-        Output output = o.getOutput();
-        if (output != null)
-        {
-          String outputName = output.getName();
-          // if the name isn't defined it defaults to this
-          if (outputName == null)
-          {
-            outputName = o.getName() + RESPONSE;
-          }
-
-          if (inAndOutNames.contains(outputName))
-          {
-            String[] args = {outputName, p.getQName().getLocalPart()};
-            
-            valInfo.addError(
-              messagegenerator.getString(
-                _OUTPUT_NAME_NOT_UNIQUE,
-                QUOTE + args[0] + QUOTE,
-                QUOTE + args[1] + QUOTE),
-              output, _OUTPUT_NAME_NOT_UNIQUE, args);
-          }
-          else
-          {
-            inAndOutNames.add(outputName);
-          }
-
-          m = output.getMessage();
-          if (m != null && m.isUndefined())
-          {
-            String messName = EMPTY_STRING;
-            QName messQName = m.getQName();
-            if (messQName != null)
-            {
-              messName = messQName.getLocalPart();
-            }
-            String[] args = {messName};
-            valInfo.addError(messagegenerator.getString(_MESSAGE_UNDEFINED_FOR_OUTPUT, QUOTE + args[0] + QUOTE),
-                output, _MESSAGE_UNDEFINED_FOR_OUTPUT, args);
-          }
-        }
-
-        Object faults[] = o.getFaults().values().toArray();
-
-        //List faultNames = new Vector();
-        for (int k = 0; k < faults.length; k++)
-        {
-          Fault f = (Fault)faults[k];
-          m = f.getMessage();
-          if (m != null && m.isUndefined())
-          {
-            String messName = EMPTY_STRING;
-            QName messQName = m.getQName();
-            if (messQName != null)
-            {
-              messName = messQName.getLocalPart();
-            }
-            String args[] = {messName};
-            valInfo.addError(messagegenerator.getString(_MESSAGE_UNDEFINED_FOR_FAULT, QUOTE + args[0] + QUOTE),
-                f, _MESSAGE_UNDEFINED_FOR_FAULT, args);
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Check that all the messages defined in the WSDL document are valid.
-   * 
-   * @param wsdlDefinition The WSDL definitions element.
-   */
-  protected void validateMessages(Definition wsdlDefinition, IWSDL11ValidationInfo valInfo)
-  {
-    if (wsdlDefinition.getMessages() == null)
-      return;
-    Iterator messages = wsdlDefinition.getMessages().values().iterator();
-
-    while (messages.hasNext())
-    {
-      Message m = (Message)messages.next();
-      if (!m.isUndefined())
-      {
-        // if the message has a part (and it doesn't have to)
-        // ensure each message part has either an element or a type
-        if (!m.getParts().isEmpty())
-        {
-          Iterator parts = m.getParts().values().iterator();
-          while (parts.hasNext())
-          {
-            Part p = (Part)parts.next();
-            QName elementName = p.getElementName();
-            QName typeName = p.getTypeName();
-            Map extAtts = p.getExtensionAttributes();
-            // TODO:This will have to be extended as parts can have extensibility elements
-            //ensure the part has a type or an element defined
-            if (elementName == null && typeName == null && (extAtts == null || extAtts.isEmpty()))
-            { String[] args = { p.getName()};
-              valInfo.addError(messagegenerator.getString(_PART_NO_ELEMENT_OR_TYPE, QUOTE + args[0] + QUOTE),
-                  p, _PART_NO_ELEMENT_OR_TYPE, args);
-            }
-            //here the part has both the element and type defined and it can only have one defined	
-            else if (elementName != null && typeName != null)
-            { String[] args = {p.getName()};
-              valInfo.addError(messagegenerator.getString(_PART_BOTH_ELEMENT_AND_TYPE, QUOTE + args[0] + QUOTE),
-                  p, _PART_BOTH_ELEMENT_AND_TYPE, args);
-            }
-            else if (elementName != null)
-            {
-              if (!checkPartConstituent(elementName.getNamespaceURI(),
-                elementName.getLocalPart(),
-                ELEMENT,
-                p,
-                valInfo))
-              { String[] args = {p.getName(), elementName.getLocalPart()};
-                valInfo.addError(
-                  messagegenerator.getString(
-                    _PART_INVALID_ELEMENT,
-                    QUOTE + args[0] + QUOTE,
-                    QUOTE + args[1] + QUOTE),
-                  p, _PART_INVALID_ELEMENT, args);
-              }
-            }
-            else if (typeName != null)
-            {
-              // check that the type itself is defined properly
-              if (!checkPartConstituent(typeName.getNamespaceURI(), typeName.getLocalPart(), TYPE, p, valInfo))
-              { String[] args = {p.getName(), typeName.getLocalPart() }; 
-                valInfo.addError(
-                  messagegenerator.getString(
-                    _PART_INVALID_TYPE,
-                    QUOTE + args[0] + QUOTE,
-                    QUOTE + args[1] + QUOTE),
-                  p, _PART_INVALID_TYPE, args);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Checks whether the given name is defined in the namespace for the part.  A part is an
-   * ELEMENT or a TYPE.
-   * 
-   * @param namespace The namespace to check.
-   * @param name The name to check.
-   * @param part The part to check, either ELEMENT or TYPE.
-   * @param partObject The object representing the given part.
-   * @return True if the part element of type is defined, false otherwise.
-   */
-  protected boolean checkPartConstituent(
-    String namespace,
-    String name,
-    int part,
-    Part partObject,
-    IWSDL11ValidationInfo valInfo)
-  {
-
-    boolean partvalid = false;
-    // First take care of the situation where it's from the schema namespace.
-    // The 1999, 2000 and 2001 schema namespaces are all accepted.
-    if (namespace.equals(Constants.NS_URI_XSD_2001)
-      || namespace.equals(Constants.NS_URI_XSD_1999)
-      || namespace.equals(Constants.NS_URI_XSD_2000))
-    {
-      SchemaAttributeTable xsdTable = new SchemaAttributeTable();
-      if (xsdTable.containsSymbol(name))
-      {
-        partvalid = true;
-      }
-    }
-    // check inline and imported schema
-    else
-    {
-      XSModel[] schemas = valInfo.getSchemas();
-      int numSchemas = schemas.length;
-      //Iterator schemasIter = schemas.iterator();
-      for (int i = 0; i < numSchemas; i++)
-      {
-        XSModel schema = schemas[i];
-        if (schema != null)
-        {
-          if (part == ELEMENT && schema.getElementDeclaration(name, namespace) != null)
-          {
-            partvalid = true;
-            break;
-          }
-          else if (part == TYPE && schema.getTypeDefinition(name, namespace) != null)
-          {
-            partvalid = true;
-            break;
-          }
-        }
-      }
-    }
-    // If the SOAP encoding namespace hasn't been explicitly imported do so
-	// now.
-    // Allow the SOAP encoding namespace to be automatically imported but mark
-	// it as a warning.
-    if (!partvalid && namespace.equals(SOAP_ENCODING_URI))
-    {
-      try
-      {
-        XSDValidator xsdVal = new XSDValidator();
-        String soapEnc = valInfo.getURIResolver().resolve(null, SOAP_ENCODING_URI, null).getPhysicalLocation();
-        if(soapEnc != null)
-        {
-          xsdVal.validate(soapEnc, null);
-          // sanity check in case something goes wrong
-          if (xsdVal.isValid())
-          {
-            XSModel xsModel = xsdVal.getXSModel();
-
-            if (part == ELEMENT && xsModel.getElementDeclaration(name, namespace) != null)
-            {
-              partvalid = true;
-            }
-            else if (part == TYPE && xsModel.getTypeDefinition(name, namespace) != null)
-            {
-              partvalid = true;
-            }
-            valInfo.addWarning(messagegenerator.getString(_WARN_SOAPENC_IMPORTED_PART, QUOTE + name + QUOTE), partObject);
-          }
-        }
-      }
-      catch (Exception e)
-      {
-        //TODO: log the error message
-        //System.out.println(e);
-      }
-    }
-    return partvalid;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java
deleted file mode 100644
index 4b30f09..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.ValidationInfoImpl;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-/**
- * An implemenation of WSDL11ValidationInfo.
- */
-public class WSDL11ValidationInfoImpl implements IWSDL11ValidationInfo
-{
-  private IValidationInfo valinfo = null;
-  private Hashtable elementlocations = null;
-  private List schemas = new Vector();
-  
-  public WSDL11ValidationInfoImpl(IValidationInfo valinfo)
-  {
-    this.valinfo = valinfo;
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#getFileURI()
-   */
-  public String getFileURI()
-  {
-    return valinfo.getFileURI();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addSchema(org.apache.xerces.xs.XSModel)
-   */
-  public void addSchema(XSModel xsModel)
-  {
-    if (xsModel != null)
-    {
-      schemas.add(xsModel);
-    }
-
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#getSchemas()
-   */
-  public XSModel[] getSchemas()
-  {
-    return (XSModel[])schemas.toArray(new XSModel[schemas.size()]);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo#cleardSchemas()
-   */
-  public void clearSchemas()
-  {
-    schemas.clear();
-  }
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#setElementLocations(java.util.Hashtable)
-   */
-  public void setElementLocations(Hashtable elementLocations)
-  {
-    this.elementlocations = elementLocations;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addError(java.lang.String, java.lang.Object)
-   */
-  public void addError(String message, Object element)
-  {
-    addError(message, element, null, null);
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addError(java.lang.String, java.lang.Object, java.lang.String, java.lang.Object[])
-   */
-  public void addError(String message, Object element, String errorKey, Object[] messageArguments)
-  {
-    LocationHolder location;
-    if (elementlocations.containsKey(element))
-    {
-      location = (LocationHolder)elementlocations.get(element);
-      addError(message, location.getLine(), location.getColumn(), location.getURI(), errorKey, messageArguments);
-    }
-    // if we give it an element that hasn't been defined we'll set the location
-    // at (0,0) so the error shows up but no line marker in the editor
-    else
-    {
-      addError(message, 0, 1, getFileURI());
-    }
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addWarning(java.lang.String, java.lang.Object)
-   */
-  public void addWarning(String message, Object element)
-  {
-    LocationHolder location;
-    if (elementlocations.containsKey(element))
-    {
-      location = (LocationHolder)elementlocations.get(element);
-      addWarning(message, location.getLine(), location.getColumn(), location.getURI());
-    }
-    // if we give it an element that hasn't been defined we'll set the location
-    // at (0,0) so the error shows up but no line marker in the editor
-    else
-    {
-      addWarning(message, 0, 1, getFileURI());
-    }
-
-  }
-
-  /**
-   * @see org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo#addNamespaceWithNoValidator(java.lang.String)
-   */
-//  public void addNamespaceWithNoValidator(String namespace)
-//  {
-//    valinfo.addNamespaceWithNoValidator(namespace);
-//
-//  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addError(java.lang.String, int, int)
-   */
-  public void addError(String message, int line, int column, String uri)
-  {
-    addError(message, line, column, uri, null, null);
-  }
-
-  public void addError(String message, int line, int column, String uri, String errorKey, Object[] messageArguments)
-  { 
-    try
-    { ((ValidationInfoImpl)valinfo).addError(message, line, column, uri, errorKey, messageArguments);
-    }
-    catch (ClassCastException e)
-    { System.err.println(e);
-      valinfo.addError(message, line, column, uri);
-    }
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo#addWarning(java.lang.String, int, int)
-   */
-  public void addWarning(String message, int line, int column, String uri)
-  {
-    valinfo.addWarning(message, line, column, uri);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo#getURIResolver()
-   */
-  public URIResolver getURIResolver() 
-  {
-	return valinfo.getURIResolver();
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorController.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorController.java
deleted file mode 100644
index aa46e81..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorController.java
+++ /dev/null

@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.IWSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.exception.ValidateWSDLException;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.w3c.dom.Document;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * The validator controller is the head of validation. 
- */
-public class WSDL11ValidatorController implements IWSDLValidator
-{
-  protected final String _WARN_NO_VALDIATOR = "_WARN_NO_VALDIATOR";
-//  protected final int ERROR_MESSAGE = 0;
-//  protected final int WARNING_MESSAGE = 1;
-//  protected String fileURI;
-//  protected List schemas = new Vector();
-//  protected Definition wsdlDefinition;
-  protected MessageGenerator messagegenerator = null;
-  //protected ValidationController validationController;
-  protected ValidatorRegistry ver = ValidatorRegistry.getInstance();
-
-  /**
-   * Constructor.
-   */
-  public WSDL11ValidatorController()
-  {
-  }
-
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.IWSDLValidator#validate(org.w3c.dom.Document, org.eclipse.wsdl.validate.ValidationInfo)
-   */
-  public void validate(Document domModel, IValidationInfo valInfo) throws ValidateWSDLException
-  {
-    // reset the variables
-//    reset();
-//    fileURI = valInfo.getFileURI();
-    //this.validationController = validationcontroller;
-
-    IWSDL11ValidationInfo wsdlvalinfo = new WSDL11ValidationInfoImpl(valInfo);
-    WSDLDocument[] wsdlDocs = readWSDLDocument(domModel, valInfo.getFileURI(), getMessageGenerator(), wsdlvalinfo);
-    // Don't validate an null definitions element. Either the file is emtpy and valid or
-    // had an error when reading.
-    if(wsdlDocs != null)
-    {  
-      int numWSDLDocs = wsdlDocs.length;
-      for(int i = 0; i < numWSDLDocs; i++)
-      {
-        WSDLDocument tempDoc = wsdlDocs[i];
-        Definition wsdlDefinition = tempDoc.getDefinition();
-        // Register the schemas.
-        List xsdList = tempDoc.getSchemas();
-        Iterator xsdIter = xsdList.iterator();
-        while (xsdIter.hasNext())
-        {
-          wsdlvalinfo.addSchema((XSModel)xsdIter.next());
-        }
-        // Set the element locations table.
-        wsdlvalinfo.setElementLocations(tempDoc.getElementLocations());
-        // Set any reader errors. This needs to be done after the element locations table is set.
-        List readerErrors = tempDoc.getReaderErrors();
-        if (readerErrors != null)
-        {
-          Iterator readerErrorsI = readerErrors.iterator();
-          while (readerErrorsI.hasNext())
-          {
-            ReaderError re = (ReaderError)readerErrorsI.next();
-            wsdlvalinfo.addError(re.getError(), re.getObject());
-          }
-        }
-        List readerWarnings = tempDoc.getReaderWarnings();
-        if (readerWarnings != null)
-        {
-          Iterator readerWarningsI = readerWarnings.iterator();
-          while (readerWarningsI.hasNext())
-          {
-            ReaderError re = (ReaderError)readerWarningsI.next();
-            wsdlvalinfo.addWarning(re.getError(), re.getObject());
-          }
-        }
-        validateWSDLElement(Constants.NS_URI_WSDL, wsdlDefinition, new Vector(), wsdlvalinfo);
-        wsdlvalinfo.clearSchemas();
-      }
-    }
-    
-  }
-  
-  /**
-   * Validate an imported WSDL document. Allows the calling class to have access to the internal
-   * components of the validation.
-   * 
-   * @param wsdlvalinfo The WSDL 1.1 validation info object to use.
-   * @return The definitions element for the import.
-   * @throws ValidateWSDLException
-   */
-//  protected Definition validateImport(WSDL11ValidationInfo wsdlvalinfo)
-//  {
-//    WSDLDocument[] wsdlDocs = null;
-//    try
-//    {
-//      wsdlDocs = readWSDLDocument(null, wsdlvalinfo.getFileURI(), getMessageGenerator(), wsdlvalinfo);
-//    }
-//    catch(ValidateWSDLException e)
-//    {
-//      // supress any validation issues with imported documents
-//    }
-//    // Don't validate an null definitions element. Either the file is emtpy and valid or
-//    // had an error when reading.
-//    if(wsdlDocs != null)
-//     {  
-//      validateWSDLElement(Constants.NS_URI_WSDL, wsdlDefinition, new Vector(), wsdlvalinfo);
-//    }
-//    return wsdlDefinition;
-//  }
-  
-  /**
-   * Read in the WSDL document and set the model and imported schemas.
-   * 
-   * @param domModel A DOM model of the document to be read.
-   * @param file The file to read.
-   * @param messagegenerator The messagegenerator the reader should use for any messages produced.
-   * @param wsdlvalinfo The validation information for the current validation.
-   * @return The definitions element for the WSDL document.
-   * @throws ValidateWSDLException
-   */
-  protected WSDLDocument[] readWSDLDocument(Document domModel, String file, MessageGenerator messagegenerator, IWSDL11ValidationInfo wsdlvalinfo) throws ValidateWSDLException
-  {
-    WSDLDocument[] wsdlDocs = null;
-    try
-    {
-
-      WSDLReaderImpl wsdlReader = new WSDLReaderImpl(wsdlvalinfo);
-      wsdlReader.setMessageGenerator(messagegenerator);
-      if(domModel != null)
-      {
-        wsdlDocs = wsdlReader.readWSDL(file, domModel);
-      }
-      else
-      {  
-        wsdlDocs = wsdlReader.readWSDL(file);
-      }
-      //wsdlvalinfo.setElementLocations(wsdlReader.getElementLocationsHashtable());
-//      List readerErrors = wsdlReader.getReaderErrors();
-//      if (readerErrors != null)
-//       {
-//        Iterator readerErrorsI = readerErrors.iterator();
-//        while (readerErrorsI.hasNext())
-//         {
-//          ReaderError re = (ReaderError)readerErrorsI.next();
-//          wsdlvalinfo.addError(re.getError(), re.getObject());
-//        }
-//      }
-//      if (wsdlReader.hasImportSchemas())
-//      {
-//        List xsdList = wsdlReader.getImportSchemas();
-//        Iterator xsdIter = xsdList.iterator();
-//        while (xsdIter.hasNext())
-//        {
-//          wsdlvalinfo.addSchema((XSModel)xsdIter.next());
-//        }
-//
-//      }
-
-    }
-    catch (WSDLException e)
-    {
-      throw new ValidateWSDLException(e.getMessage() + " " + e.getFaultCode());
-    }
-
-    catch (Exception e)
-    {
-      throw new ValidateWSDLException("unable to read file" + e.getMessage() + " " + e.toString());
-    }
-    return wsdlDocs;
-  }
-
-  /**
-   * Given a WSDL element, call ValidateElement for it.
-   * 
-   * @param namespace The namespace of the element to validate.
-   * @param element The element to validate.
-   * @param parents The list of parents for this element.
-   */
-  public void validateWSDLElement(String namespace, Object element, List parents, IWSDL11ValidationInfo wsdlvalinfo)
-  {
-    IWSDL11Validator val = ver.queryValidatorRegistry(namespace);
-    if (val != null)
-    {
-      val.validate(element, parents, wsdlvalinfo);
-    }
-    else
-    {
-	  //TODO: Add this as a preference.
-      //wsdlvalinfo.addWarning(messagegenerator.getString(_WARN_NO_VALDIATOR, namespace), element);
-    }
-  }
-
-  /**
-   * Add a schema to the list of schemas.
-   * 
-   * @param xsModel The schema to add.
-   */
-//  public void addSchema(XSModel xsModel)
-//  {
-//    if (xsModel != null)
-//    {
-//      schemas.add(xsModel);
-//    }
-//  }
-
-  /**
-   * Return the list containing the schemas.
-   * 
-   * @return The list of schemas.
-   */
-//  public List getSchemas()
-//  {
-//    return schemas;
-//  }
-
-  /**
-  	* Get the ResourceBundle for this ValidatorManager.
-  	* 
-  	* @return The resource bundle registered for this controller.
-  	* @see #setResourceBundle
-  	*/
-//  public ResourceBundle getResourceBundle()
-//  {
-//    return resourcebundle;
-//  }
-
-  /**
-   * Set the ResourceBundle for this ValidatorManager.
-   * 
-   * @param rb The resource bundle to set.
-   * @see #getResourceBundle
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    if (messagegenerator == null)
-    {
-      messagegenerator = new MessageGenerator(rb);
-    }
-
-  }
-  
-  /**
-   * Set the message generator for this controller.
-   * 
-   * @param mesgen The message generator to set for this controller.
-   */
-  public void setMessageGenerator(MessageGenerator mesgen)
-  {
-    messagegenerator = mesgen;
-  }
-
-  /**
-   * Get the message generator registered for this controller.
-   * 
-   * @return The message generator registered for this controller.
-   */
-  public MessageGenerator getMessageGenerator()
-  {
-    return messagegenerator;
-  }
-
-  /**
-   * Return the filename for the file currently being validated. Some validators require this.
-   * 
-   * @return The filename for the file being validated.
-   */
-//  public String getFilename()
-//  {
-//    return fileURI;
-//  }
-
-  /**
-   * Convenience method for extensibly validators to add error messages.
-   * 
-   * @param object The object to add the error for.
-   * @param error The error to add.
-   */
-//  public void addErrorMessage(Object object, String error)
-//  {
-//    addValidationMessage(ERROR_MESSAGE, object, error);
-//    errors = true;
-//  }
-
-  /**
-   * Method for extensibly validators to add error messages when they know
-   * line and column numbers.
-   * 
-   * @param line The line where the error message is located.
-   * @param column The column where the error message is located.
-   * @param error The error message.
-   */
-//  public void addErrorMessage(int line, int column, String error)
-//  {
-//    addValidationMessage(ERROR_MESSAGE, line, column, error);
-//    errors = true;
-//  }
-
-  /**
-   * Convenience method for extensibly validators to add warning messages.
-   * 
-   * @param object The object to add the warning message.
-   * @param warning The warning message.
-   */
-//  public void addWarningMessage(Object object, String warning)
-//  {
-//    addValidationMessage(WARNING_MESSAGE, object, warning);
-//  }
-
-  /**
-   * Method for extensibly validators to add warning messages when they know
-   * line and column numbers.
-   * 
-   * @param line The line where the error message is located.
-   * @param column The column where the error message is located.
-   * @param warning The warning message.
-   */
-//  public void addWarningMessage(int line, int column, String warning)
-//  {
-//    addValidationMessage(WARNING_MESSAGE, line, column, warning);
-//  }
-
-  /**
-   * If you have an object read in by the reader for this
-   * validatorcontroller the object can be passed in here and the line and column
-   * information will be abstracted from it.
-   * 
-   * @param type The type of message to add.
-   * @param o The object that has the error (used to get the location).
-   * @param message The message to add.
-   */
-//  protected void addValidationMessage(int type, Object o, String message)
-//  {
-//    int[] location;
-//    if (elementLocations.containsKey(o))
-//    {
-//      location = (int[])elementLocations.get(o);
-//    }
-//    // if we give it an element that hasn't been defined we'll set the location
-//    // at (0,0) so the error shows up but no line marker in the editor
-//    else
-//    {
-//      location = new int[] { 0, 0 };
-//    }
-//    addValidationMessage(type, location[0], location[1], message);
-//  }
-
-  /**
-    * Creates a validation message of the specified type.
-    * 
-  	* @param type The type of validation message to add.
-  	* @param line The line where the error message is located.
-  	* @param column The line where the column message is located.
-  	* @param message The message to add.
-  	*/
-//  protected void addValidationMessage(int type, int line, int column, String message)
-//  {
-//    if (message != null)
-//    {
-//      if (type == ERROR_MESSAGE)
-//      {
-//        validationController.addErrorMessage(line, column, message);
-//      }
-//      else if (type == WARNING_MESSAGE)
-//      {
-//        validationController.addWarningMessage(line, column, message);
-//      }
-//    }
-//  }
-
-  /**
-   * @see org.eclipse.wsdl.validate.controller.IWSDLValidator#isValid()
-   */
-//  public boolean isValid()
-//  {
-//    return !errors;
-//  }
-
-  /**
-   * Reset the validator controller.
-   */
-//  protected void reset()
-//  {
-//    schemas = new Vector();
-//    fileURI = "";
-//    wsdlDefinition = null;
-//    elementLocations = null;
-//    resourcebundle = null;
-//    //validationController = null;
-//    errors = false;
-//  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorDelegate.java
deleted file mode 100644
index e627a78..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorDelegate.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-
-/**
- * The WSDL 1.1 validator delegate holds a reference to a validator to be instantiated at
- * a later point.
- */
-public class WSDL11ValidatorDelegate
-{
-  private String validatorClassname = null;
-  private String resourceBundle = null;
-  private ClassLoader classLoader = null;
-  private IWSDL11Validator validator = null;
-
-  /**
-   * Create a delegate for a validator by its class name and resource bundle name.
-   * 
-   * @param validatorClassname The name of the validator class.
-   * @param resourceBundle The name of the validator base resource bundle.
-   */
-  public WSDL11ValidatorDelegate(String validatorClassname, String resourceBundle)
-  {
-    this.validatorClassname = validatorClassname;
-    this.resourceBundle = resourceBundle;
-  }
-
-  /**
-   * Create a delegate for a validator by its class name, resource bundle name and 
-   * a class loader to load the validator and bundle.
-   * 
-   * @param validatorClassname The name of the validator class.
-   * @param resourceBundle The name of the validator base resource bundle.
-   * @param classLoader The class loader to use to load the validator and bundle.
-   */
-  public WSDL11ValidatorDelegate(String validatorClassname, String resourceBundle, ClassLoader classLoader)
-  {
-    this(validatorClassname, resourceBundle);
-    this.classLoader = classLoader;
-  }
-
-  /**
-   * Get the validator specified in this delegate.
-   * 
-   * @return The WSDL 1.1 validator specified by this delegate.
-   */
-  public IWSDL11Validator getValidator()
-  {
-    if (validator == null)
-    {
-      if(classLoader == null)
-      {
-      	classLoader = getClass().getClassLoader();
-      }
-      try
-      {
-        Class validatorClass =
-          classLoader != null ? classLoader.loadClass(validatorClassname) : Class.forName(validatorClassname);
-
-        validator = (IWSDL11Validator)validatorClass.newInstance();
-        if (resourceBundle != null)
-        {
-          ResourceBundle validatorBundle = ResourceBundle.getBundle(resourceBundle, Locale.getDefault(), classLoader);
-          validator.setResourceBundle(validatorBundle);
-        }
-      }
-      catch (ClassNotFoundException e)
-      {
-        // TODO: add logging
-        System.err.println(e);
-      }
-      catch (IllegalAccessException e)
-      {
-        // TODO: add logging
-        System.err.println(e);
-      }
-      catch (InstantiationException e)
-      {
-        // TODO: add logging
-        System.err.println(e);
-      }
-    }
-    return validator;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
deleted file mode 100644
index ebb1131..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java
+++ /dev/null

@@ -1,2000 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.OperationType;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.ExtensionDeserializer;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.dom.ElementImpl;
-import org.apache.xerces.dom.ElementNSImpl;
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaValidator;
-import org.eclipse.wst.wsdl.validation.internal.xml.ElementLocation;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.util.StringUtils;
-import com.ibm.wsdl.util.xml.DOMUtils;
-import com.ibm.wsdl.util.xml.QNameUtils;
-import com.ibm.wsdl.util.xml.XPathUtils;
-
-/**
- * A WSDL document that knows how to parse itself.
- */
-public class WSDLDocument
-{
-  private static final List STYLE_ONE_WAY = Arrays.asList(new String[] { Constants.ELEM_INPUT });
-  private static final List STYLE_REQUEST_RESPONSE =
-    Arrays.asList(new String[] { Constants.ELEM_INPUT, Constants.ELEM_OUTPUT });
-  private static final List STYLE_SOLICIT_RESPONSE =
-    Arrays.asList(new String[] { Constants.ELEM_OUTPUT, Constants.ELEM_INPUT });
-  private static final List STYLE_NOTIFICATION = Arrays.asList(new String[] { Constants.ELEM_OUTPUT });
-  
-  private static final String _ERROR_MULTIPLE_TYPES_DEFINED = "_ERROR_MULTIPLE_TYPES_DEFINED";
-  private static final String _UNABLE_TO_IMPORT_NO_LOCATION = "_UNABLE_TO_IMPORT_NO_LOCATION";
-
-  protected ExtensionRegistry extReg = null;
-  protected String factoryImplName = null;
-
-  // store the element locations within the file - line and column numbers
-  // the location info is stored as an int array of length 2 {linenumber, colnumber}
-  protected Hashtable elementLocations = new Hashtable();
-  
-  // hold the reader errors
-  protected List readerErrors = new ArrayList();
-  protected List readerWarnings = new ArrayList();
-  protected MessageGenerator messagegenerator;
-  
-  private Definition def = null;
-  private Set importedDefs = new TreeSet();
-  private Element typesEl = null;
-  private List messages = new ArrayList();
-  private List porttypes = new ArrayList();
-  private List bindings = new ArrayList();
-  private List services = new ArrayList();
-  private List extelements = new ArrayList();
-  private int depth;
-  // Hold the schemas that are imported or declared inline in this wsdl document.
-  private List schemas = new ArrayList();
-  private IWSDL11ValidationInfo valinfo;
-  
-  /**
-   * Constructor. Performs a preparse of the document and handles imports and types.
-   * 
-   * @param documentBaseURI The URI of this WSDL document.
-   * @param defEl The definitions element.
-   * @param depth The depth of this document in a document tree.
-   * @param messagegenerator A messagegenerator used for retrieving strings.
-   * @param valinfo A WSDL11ValidationInfo object for reporting messages.
-   * @throws WSDLException
-   */
-  public WSDLDocument(String documentBaseURI, Element defEl, int depth, MessageGenerator messagegenerator, IWSDL11ValidationInfo valinfo) throws WSDLException
-  {
-    this.messagegenerator = messagegenerator;
-    this.valinfo = valinfo;
-    this.depth = depth;
-    
-    checkElementName(defEl, Constants.Q_ELEM_DEFINITIONS);
-    
-    WSDLFactory factory =
-      (factoryImplName != null) ? WSDLFactory.newInstance(factoryImplName) : WSDLFactory.newInstance();
-    def = factory.newDefinition();
-
-    if (extReg != null)
-    {
-      def.setExtensionRegistry(extReg);
-    }
-
-    String name = DOMUtils.getAttribute(defEl, Constants.ATTR_NAME);
-    String targetNamespace = DOMUtils.getAttribute(defEl, Constants.ATTR_TARGET_NAMESPACE);
-    NamedNodeMap attrs = defEl.getAttributes();
-
-    if (documentBaseURI != null)
-    {
-      def.setDocumentBaseURI(documentBaseURI);
-    }
-
-    if (name != null)
-    {
-      def.setQName(new QName(targetNamespace, name));
-    }
-
-    if (targetNamespace != null)
-    {
-      def.setTargetNamespace(targetNamespace);
-    }
-
-    int size = attrs.getLength();
-
-    for (int i = 0; i < size; i++)
-    {
-      Attr attr = (Attr)attrs.item(i);
-      String namespaceURI = attr.getNamespaceURI();
-      String localPart = attr.getLocalName();
-      String value = attr.getValue();
-
-      if (namespaceURI != null && namespaceURI.equals(Constants.NS_URI_XMLNS))
-      {
-        if (localPart != null && !localPart.equals(Constants.ATTR_XMLNS))
-        {
-          def.addNamespace(localPart, value);
-        }
-        else
-        {
-          def.addNamespace(null, value);
-        }
-      }
-    }
-
-    // There are problems when the model is created and the order of elements is not
-    // Import - Types - Message - PortType - Binding - Service so we need to read them
-    // into the model in that order
-    // Performance wise this should be modified as we have to make 5 extra loops through
-    // all of the elements as a result
-
-    // take care of Imports, Types, Documentation and extensibleelements together - saves a pass for Documentation 
-    // later and Docs don't effect anything else - Imports and Types are essentially the same thing
-    // no preconceived ideas about extensible elements
-    Element tempEl = DOMUtils.getFirstChildElement(defEl);
-
-    while (tempEl != null)
-    {
-
-      if (QNameUtils.matches(Constants.Q_ELEM_IMPORT, tempEl))
-      {
-        String namespaceURI = DOMUtils.getAttribute(tempEl, Constants.ATTR_NAMESPACE);
-        String locationURI = DOMUtils.getAttribute(tempEl, Constants.ATTR_LOCATION);
-        if(locationURI == null || locationURI.equals(""))
-        {
-          addReaderError(def, tempEl, messagegenerator.getString(_UNABLE_TO_IMPORT_NO_LOCATION));
-        }
-        else
-        {
-          ImportHolder ih = new ImportHolder(namespaceURI, locationURI, def.getDocumentBaseURI(), this, depth+1, tempEl, messagegenerator, valinfo);
-          importedDefs.add(ih);
-        }
-        setLocation(tempEl, tempEl);
-//        if (importedDefs == null)
-//        {
-//          importedDefs = new Hashtable();
-//        }
-//        if (documentBaseURI != null)
-//        {
-//          importedDefs.put(documentBaseURI, def);
-//        }
-//        def.addImport(parseImport(tempEl, def, importedDefs));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        def.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_TYPES, tempEl))
-      {
-        if(typesEl != null)
-        {
-          setLocation(tempEl, tempEl);
-          addReaderError(def, tempEl, messagegenerator.getString(_ERROR_MULTIPLE_TYPES_DEFINED));
-        }
-        else
-        {
-          typesEl = tempEl;
-          parseTypes();
-        }
-//        def.setTypes(parseTypes(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_MESSAGE, tempEl))
-      {
-        messages.add(tempEl);
-        //def.addMessage(parseMessage(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_PORT_TYPE, tempEl))
-      {
-        porttypes.add(tempEl);
-        //             PortType pt = parsePortType(tempEl, def);
-        //             if(pt != null)
-        //             {
-        //          def.addPortType(pt);
-        //             }
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_BINDING, tempEl))
-      {
-        bindings.add(tempEl);
-        //def.addBinding(parseBinding(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_SERVICE, tempEl))
-      {
-        services.add(tempEl);
-        //def.addService(parseService(tempEl, def));
-      }
-      else
-      {
-        extelements.add(tempEl);
-        //        def.addExtensibilityElement(
-        //          parseExtensibilityElement(Definition.class, tempEl, def));
-      }
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-  }
-  
-  /**
-   * Get the definitions element for this document.
-   * 
-   * @return The definitions element for this document.
-   */
-  public Definition getDefinition()
-  {
-    return def;
-  }
-  
-  /**
-   * Get a set of the imports in this document.
-   * 
-   * @return A set of the imports in this document.
-   */
-  public Set getImports()
-  {
-    return importedDefs;
-  }
-  
-  /**
-   * 
-   * @param def
-   * @param doc
-   * @param namespace
-   * @param location
-   */
-//  public void setImport(Definition def, Element doc, String namespace, String location)
-//  {
-//    if(location == null || location.equals(""))
-//    {
-//      valinfo.addError()_UNABLE_TO_IMPORT_NO_LOCATION 
-//    }
-//    Import imp = def.createImport();
-//    imp.setDefinition(def);
-//    imp.setDocumentationElement(doc);
-//    imp.setNamespaceURI(namespace);
-//    imp.setLocationURI(location);
-//    def.addImport(imp);
-//  }
-  
-  /**
-   * Parse the types in the WSDL document. Handles documentation, import and schema
-   * elements.
-   */
-  public void parseTypes()
-  {
-    Types types = def.createTypes();
-
-    Element tempEl = DOMUtils.getFirstChildElement(typesEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        types.setDocumentationElement(tempEl);
-      }
-      else if (tempEl.getLocalName().equalsIgnoreCase("import"))
-        //else if (QNameUtils.matches(Constants.Q_ELEM_IMPORT, tempEl))
-      {
-        // this shouldn't really be used here but a little hack will make
-        // life easier
-        //parseImport(tempEl, def, (Map)new Hashtable());
-        String namespaceURI = DOMUtils.getAttribute(tempEl, Constants.ATTR_NAMESPACE);
-        String locationURI = DOMUtils.getAttribute(tempEl, "schemaLocation");
-        importedDefs.add(new ImportHolder(namespaceURI, locationURI, def.getDocumentBaseURI(), this, depth+1, tempEl, messagegenerator, valinfo));
-        try
-        {
-          types.addExtensibilityElement(parseExtensibilityElement(Types.class, tempEl, def));
-        }
-        catch(WSDLException e)
-        {
-          
-        }
-      }
-      else
-      {
-        try
-        {
-          ExtensibilityElement extElem = parseExtensibilityElement(Types.class, tempEl, def);
-          types.addExtensibilityElement(extElem);
-        }
-        catch(WSDLException e)
-        {
-          
-        }
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-    def.setTypes(types);
-    
-    valinfo.setElementLocations(elementLocations);
-    List typesElems = types.getExtensibilityElements();
-    if(typesElems != null)
-    {
-      Iterator typesElemsIter = typesElems.iterator();
-      while(typesElemsIter.hasNext())
-      {
-        ExtensibilityElement typeElement = (ExtensibilityElement)typesElemsIter.next();
-        
-        InlineSchemaValidator xsdVal = new InlineSchemaValidator();
-        xsdVal.setMessageGenerator(messagegenerator);
-    
-        List parents = new ArrayList();
-        parents.add(def);
-        parents.add(0,types);
-        xsdVal.validate(typeElement, parents,valinfo);
-        XSModel[] typesSchemas = valinfo.getSchemas();
-        List typesSchemaList = new ArrayList();
-        for(int i = 0; i < typesSchemas.length; i++)
-        {  
-          typesSchemaList.add(typesSchemas[i]);
-        }
-        schemas.addAll(typesSchemaList);
-        valinfo.clearSchemas();
-      }
-    }
-    valinfo.setElementLocations(null);
-  }
-  
-  /**
-   * Parse the messages in this document.
-   */
-  public void parseMessages()
-  {
-    for (int i = 0; i < messages.size(); i++)
-    {
-      try
-      {
-        def.addMessage(parseMessage((Element)messages.get(i), def));
-      }
-      catch(WSDLException e)
-      {}
-    }
-  }
-  
-  /**
-   * Parse the portTypes in this document.
-   */
-  public void parsePorttypes()
-  {
-    for (int i = 0; i < porttypes.size(); i++)
-    {
-      try
-      {
-        PortType pt = parsePortType((Element)porttypes.get(i), def);
-        if (pt != null)
-        {
-          def.addPortType(pt);
-        }
-      }
-      catch(WSDLException e)
-      {}
-    }
-  }
-  
-  /**
-   * Parse the bindings in this document.
-   */
-  public void parseBindings()
-  {
-    for (int i = 0; i < bindings.size(); i++)
-    {
-      try
-      {
-        def.addBinding(parseBinding((Element)bindings.get(i), def));
-      }
-      catch(WSDLException e)
-      {}
-    }
-  }
-  
-  /**
-   * Parse the services in this document.
-   */
-  public void parseServices()
-  {
-    for (int i = 0; i < services.size(); i++)
-    {
-      try
-      {
-        def.addService(parseService((Element)services.get(i), def));
-      }
-      catch(WSDLException e)
-      {}
-    }
-  }
-  
-  /**
-   * Parse the extensibility elements in this document.
-   */
-  public void parseExtensibilityElements()
-  {
-    for (int i = 0; i < extelements.size(); i++)
-    {
-      try
-      {
-        def.addExtensibilityElement(parseExtensibilityElement(Definition.class, (Element)extelements.get(i), def));
-      }
-      catch(WSDLException e)
-      {}
-    }
-  }
-  
-  /**
-   * Add the given list of schemas to the schemas for this document.
-   * 
-   * @param schemas The list of schemas to add to this document's schemas.
-   */
-  public void addSchemas(List schemas)
-  {
-    this.schemas.addAll(schemas);
-  }
-  
-  /**
-   * Get the schemas associated with this document.
-   * 
-   * @return The schemas associated with this document.
-   */
-  public List getSchemas()
-  {
-    return schemas;
-  }
-  
-  /**
-   * Parse the specified binding.
-   * 
-   * @param bindingEl The binding element.
-   * @param def The definitions element.
-   * @return A WSDL binding element.
-   * @throws WSDLException
-   */
-  protected Binding parseBinding(Element bindingEl, Definition def) throws WSDLException
-  {
-    Binding binding = null;
-    String name = DOMUtils.getAttribute(bindingEl, Constants.ATTR_NAME);
-    QName portTypeName;
-    try
-    {
-      portTypeName = DOMUtils.getQualifiedAttributeValue(bindingEl, Constants.ATTR_TYPE, Constants.ELEM_BINDING, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the message name
-      portTypeName = new QName(null, DOMUtils.getAttribute(bindingEl, "type"));
-    }
-
-    PortType portType = null;
-
-    if (name != null)
-    {
-      QName bindingName = new QName(def.getTargetNamespace(), name);
-
-      binding = def.getBinding(bindingName);
-
-      if (binding == null)
-      {
-        binding = def.createBinding();
-        binding.setQName(bindingName);
-      }
-      // report an error if a binding with this name has already been defined
-      else if (!binding.isUndefined())
-      {
-        //addReaderError(def,bindingEl, "_BINDING_NAME_ALREADY_DEFINED");       
-        addReaderError(
-          def,
-          bindingEl,
-          messagegenerator.getString("_BINDING_NAME_ALREADY_DEFINED", "'" + binding.getQName().getLocalPart() + "'"));
-      }
-    }
-    else
-    {
-      binding = def.createBinding();
-    }
-
-    // Whether it was retrieved or created, the definition has been found.
-    binding.setUndefined(false);
-
-    if (portTypeName != null)
-    {
-      portType = def.getPortType(portTypeName);
-
-      if (portType == null)
-      {
-        portType = def.createPortType();
-        portType.setQName(portTypeName);
-        def.addPortType(portType);
-      }
-
-      binding.setPortType(portType);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        binding.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_OPERATION, tempEl))
-      {
-        binding.addBindingOperation(parseBindingOperation(tempEl, portType, def));
-      }
-      else
-      {
-        binding.addExtensibilityElement(parseExtensibilityElement(Binding.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(binding, bindingEl);
-
-    return binding;
-  }
-
-  /**
-   * Parse a specific binding operation.
-   * 
-   * @param bindingOperationEl The binding operation element.
-   * @param portType The portType the binding references.
-   * @param def The definitions element.
-   * @return A WSDL binding operation element.
-   * @throws WSDLException
-   */
-  protected BindingOperation parseBindingOperation(Element bindingOperationEl, PortType portType, Definition def)
-    throws WSDLException
-  {
-    BindingOperation bindingOperation = def.createBindingOperation();
-    String name = DOMUtils.getAttribute(bindingOperationEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      bindingOperation.setName(name);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingOperationEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        bindingOperation.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_INPUT, tempEl))
-      {
-        bindingOperation.setBindingInput(parseBindingInput(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_OUTPUT, tempEl))
-      {
-        bindingOperation.setBindingOutput(parseBindingOutput(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, tempEl))
-      {
-        bindingOperation.addBindingFault(parseBindingFault(tempEl, def));
-      }
-      else
-      {
-        bindingOperation.addExtensibilityElement(parseExtensibilityElement(BindingOperation.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    if (portType != null)
-    {
-      BindingInput bindingInput = bindingOperation.getBindingInput();
-      BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-      String inputName = (bindingInput != null ? bindingInput.getName() : null);
-      String outputName = (bindingOutput != null ? bindingOutput.getName() : null);
-
-      // hack code to get at operations that are defined with the same name but different
-      // inputs and outputs 
-      Operation op = null;
-      List operations = portType.getOperations();
-      // get a list of all operations with matching names
-      List matchingOperations = new Vector();
-      Iterator iOperations = operations.iterator();
-      while (iOperations.hasNext())
-      {
-        Operation oper = (Operation)iOperations.next();
-        if (oper.getName().equalsIgnoreCase(bindingOperation.getName()))
-        {
-          matchingOperations.add(oper);
-        }
-      }
-
-      if (matchingOperations != null)
-      {
-        // If there's only one matching operation this is what we're referring to.
-        // Only matching if binding operation input name and output name are
-        // both null or the same as the portType operation input and output names.
-        // the portType operation name
-        if (matchingOperations.size() == 1)
-        {
-          // only say the single operation is the one we're looking for if the names
-          // of the binding input and output are not specified
-          Operation tempOp = (Operation)matchingOperations.get(0);
-          boolean inputOK = false;
-          boolean outputOK = false;
-          Input tempInput = tempOp.getInput();
-          Output tempOutput = tempOp.getOutput();
-
-          // order is important in these conditions. condition 2 must fail for 3 to work
-          // check the input
-          if (tempInput == null && bindingInput == null)
-          {
-            inputOK = true;
-          }
-          else if (bindingInput == null || bindingInput.getName() == null)
-          {
-            inputOK = true;
-          }
-          else if (tempInput != null && bindingInput.getName().equals(tempInput.getName()))
-          {
-            inputOK = true;
-          }
-          // check the output
-          if (tempOutput == null && bindingOutput == null)
-          {
-            outputOK = true;
-          }
-          else if (bindingOutput == null || bindingOutput.getName() == null)
-          {
-            outputOK = true;
-          }
-          else if (tempOutput != null && bindingOutput.getName().equals(tempOutput.getName()))
-          {
-            outputOK = true;
-          }
-          if (inputOK && outputOK)
-          {
-            op = tempOp;
-          }
-          //          op = (Operation) matchingOperations.get(0);
-        }
-        // otherwise find the operation with the same name, inputname, outputname signature
-        if (matchingOperations != null && op == null)
-        {
-          Iterator iMatchingOperations = matchingOperations.iterator();
-          while (iMatchingOperations.hasNext())
-          {
-
-            boolean inputNamesEqual = false;
-            boolean outputNamesEqual = false;
-            Operation oper = (Operation)iMatchingOperations.next();
-            //          if (oper.getName().equalsIgnoreCase(bindingOperation.getName()))
-            //          {
-            Input opInput = oper.getInput();
-            if (opInput != null && bindingInput != null)
-            {
-              String opInputName = opInput.getName();
-              String bindingInputName = bindingInput.getName();
-              if (opInputName != null && opInputName.equalsIgnoreCase(bindingInputName))
-              {
-                inputNamesEqual = true;
-              }
-              else if (opInputName == null && bindingInputName == null)
-              {
-                inputNamesEqual = true;
-              }
-            }
-            else if (opInput == null && bindingInput == null)
-            {
-              inputNamesEqual = true;
-            }
-            Output opOutput = oper.getOutput();
-            if (opOutput != null && bindingOutput != null)
-            {
-              String opOutputName = opOutput.getName();
-              String bindingOutputName = bindingOutput.getName();
-              if (opOutputName != null && opOutputName.equalsIgnoreCase(bindingOutputName))
-              {
-                outputNamesEqual = true;
-              }
-              else if (opOutputName == null && bindingOutputName == null)
-              {
-                outputNamesEqual = true;
-              }
-            }
-            else if (opOutput == null && bindingOutput == null)
-            {
-              outputNamesEqual = true;
-            }
-            if (inputNamesEqual && outputNamesEqual)
-            {
-              op = oper;
-              break;
-            }
-            //}
-          }
-        }
-      }
-      //Operation op = portType.getOperation(name, inputName, outputName);
-
-      if (op == null)
-      {
-        op = def.createOperation();
-        op.setName(name);
-        portType.addOperation(op);
-      }
-
-      bindingOperation.setOperation(op);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(bindingOperation, bindingOperationEl);
-
-    return bindingOperation;
-  }
-  
-  /**
-   * Parse a specific binding input element.
-   * 
-   * @param bindingInputEl The binding input element.
-   * @param def The definitions element.
-   * @return A WSDL binding input element.
-   * @throws WSDLException
-   */
-  protected BindingInput parseBindingInput(Element bindingInputEl, Definition def) throws WSDLException
-  {
-    BindingInput bindingInput = def.createBindingInput();
-    String name = DOMUtils.getAttribute(bindingInputEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      bindingInput.setName(name);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingInputEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        bindingInput.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        bindingInput.addExtensibilityElement(parseExtensibilityElement(BindingInput.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(bindingInput, bindingInputEl);
-
-    return bindingInput;
-  }
-
-  /**
-   * Parse a specific binding output element.
-   * 
-   * @param bindingOutputEl The binding output element.
-   * @param def The definitions element.
-   * @return A WSDL binding output element.
-   * @throws WSDLException
-   */
-  protected BindingOutput parseBindingOutput(Element bindingOutputEl, Definition def) throws WSDLException
-  {
-    BindingOutput bindingOutput = def.createBindingOutput();
-    String name = DOMUtils.getAttribute(bindingOutputEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      bindingOutput.setName(name);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingOutputEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        bindingOutput.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        bindingOutput.addExtensibilityElement(parseExtensibilityElement(BindingOutput.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(bindingOutput, bindingOutputEl);
-
-    return bindingOutput;
-  }
-
-  /**
-   * Parse a specific binding fault element.
-   * 
-   * @param bindingFaultEl The binding fault element.
-   * @param def The definitions element.
-   * @return A WSDL binding fault element.
-   * @throws WSDLException
-   */
-  protected BindingFault parseBindingFault(Element bindingFaultEl, Definition def) throws WSDLException
-  {
-    BindingFault bindingFault = def.createBindingFault();
-    String name = DOMUtils.getAttribute(bindingFaultEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      bindingFault.setName(name);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingFaultEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        bindingFault.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        bindingFault.addExtensibilityElement(parseExtensibilityElement(BindingFault.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(bindingFault, bindingFaultEl);
-
-    return bindingFault;
-  }
-
-  /**
-   * Parse a specific message element.
-   * 
-   * @param msgEl The message element.
-   * @param def The definitions element.
-   * @return A WSDL message element.
-   * @throws WSDLException
-   */
-  protected Message parseMessage(Element msgEl, Definition def) throws WSDLException
-  {
-    Message msg = null;
-    String name = DOMUtils.getAttribute(msgEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      QName messageName = new QName(def.getTargetNamespace(), name);
-
-      msg = def.getMessage(messageName);
-
-      if (msg == null)
-      {
-        msg = def.createMessage();
-        msg.setQName(messageName);
-      }
-      else if (!msg.isUndefined())
-      {
-        // produce an error message as a message with this name has already been defined
-        addReaderError(
-          def,
-          msgEl,
-          messagegenerator.getString("_MESSAGE_NAME_ALREADY_DEFINED", "'" + msg.getQName().getLocalPart() + "'"));
-      }
-    }
-    else
-    {
-      msg = def.createMessage();
-    }
-
-    // Whether it was retrieved or created, the definition has been found.
-    msg.setUndefined(false);
-
-    Element tempEl = DOMUtils.getFirstChildElement(msgEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        msg.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_PART, tempEl))
-      {
-        msg.addPart(parsePart(tempEl, def));
-      }
-      else
-      {
-        // XML Validation will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(msg, msgEl);
-
-    return msg;
-  }
-
-  /**
-   * Parse a specific part element.
-   * 
-   * @param partEl The part element.
-   * @param def The definitions element.
-   * @return A WSDL part element.
-   * @throws WSDLException
-   */
-  protected Part parsePart(Element partEl, Definition def) throws WSDLException
-  {
-    Part part = def.createPart();
-    String name = DOMUtils.getAttribute(partEl, Constants.ATTR_NAME);
-
-    QName elementName;
-    try
-    {
-      elementName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_ELEMENT, Constants.ELEM_MESSAGE, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the element name
-      elementName = new QName(null, DOMUtils.getAttribute(partEl, "element"));
-    }
-
-    QName typeName;
-    try
-    {
-      typeName = DOMUtils.getQualifiedAttributeValue(partEl, Constants.ATTR_TYPE,
-        // Corrected - was ATTR_ELEMENT
-  Constants.ELEM_MESSAGE, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the element attribute
-      typeName = new QName(null, DOMUtils.getAttribute(partEl, "name"));
-    }
-
-    if (name != null)
-    {
-      part.setName(name);
-    }
-
-    if (elementName != null)
-    {
-      part.setElementName(elementName);
-    }
-
-    if (typeName != null)
-    {
-      part.setTypeName(typeName);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(partEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        part.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        // XML Validation will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    Map extensionAttributes = part.getExtensionAttributes();
-
-    extensionAttributes.putAll(getPartAttributes(partEl, def));
-
-    // Need to do something here to locate part definition.
-
-    // add the location of this element to elementLocations 
-    setLocation(part, partEl);
-
-    return part;
-  }
-
-  /**
-   * Get a map of the part attributes.
-   * 
-   * @param el The part attributes element.
-   * @param def The defintions element.
-   * @return A map containing the part attributes.
-   * @throws WSDLException
-   */
-  protected Map getPartAttributes(Element el, Definition def) throws WSDLException
-  {
-    Map attributes = new HashMap();
-    NamedNodeMap nodeMap = el.getAttributes();
-    int atts = nodeMap.getLength();
-
-    for (int a = 0; a < atts; a++)
-    {
-      Attr attribute = (Attr)nodeMap.item(a);
-      String lName = attribute.getLocalName();
-      String nSpace = attribute.getNamespaceURI();
-      String prefix = attribute.getPrefix();
-      QName name = new QName(nSpace, lName);
-
-      if (nSpace != null && !nSpace.equals(Constants.NS_URI_WSDL))
-      {
-        if (!nSpace.equals(Constants.NS_URI_XMLNS))
-        {
-          String strValue = attribute.getValue();
-          QName qValue = null;
-
-          try
-          {
-            qValue = DOMUtils.getQName(strValue, el);
-          }
-          catch (WSDLException e)
-          {
-            qValue = new QName(strValue);
-          }
-
-          attributes.put(name, qValue);
-
-          String tempNSUri = def.getNamespace(prefix);
-
-          while (tempNSUri != null && !tempNSUri.equals(nSpace))
-          {
-            prefix += "_";
-            tempNSUri = def.getNamespace(prefix);
-          }
-
-          def.addNamespace(prefix, nSpace);
-        }
-      }
-      else if (
-        !lName.equals(Constants.ATTR_NAME)
-          && !lName.equals(Constants.ATTR_ELEMENT)
-          && !lName.equals(Constants.ATTR_TYPE))
-      {
-        WSDLException wsdlExc =
-          new WSDLException(
-            WSDLException.INVALID_WSDL,
-            "Encountered illegal "
-              + "part extension "
-              + "attribute '"
-              + name
-              + "'. Extension "
-              + "attributes must be in "
-              + "a namespace other than "
-              + "WSDL's.");
-
-        wsdlExc.setLocation(XPathUtils.getXPathExprFromNode(el));
-        //throw wsdlExc;
-      }
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(attributes, el);
-
-    return attributes;
-  }
-
-  /**
-   * Parse a specific portType element.
-   * 
-   * @param portTypeEl The portType element.
-   * @param def The defintions element.
-   * @return A WSDL portType element.
-   * @throws WSDLException
-   */
-  protected PortType parsePortType(Element portTypeEl, Definition def) throws WSDLException
-  {
-
-    PortType portType = null;
-    String name = DOMUtils.getAttribute(portTypeEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      QName portTypeName = new QName(def.getTargetNamespace(), name);
-
-      portType = def.getPortType(portTypeName);
-
-      if (portType == null)
-      {
-        portType = def.createPortType();
-        portType.setQName(portTypeName);
-      }
-      else if (!portType.isUndefined())
-      {
-        // if the PortType has already been defined produce an error and return null
-        addReaderError(
-          def,
-          portTypeEl,
-          messagegenerator.getString("_PORTTYPE_NAME_ALREADY_DEFINED", "'" + portType.getQName().getLocalPart() + "'"));
-        return null;
-      }
-    }
-    else
-    {
-      portType = def.createPortType();
-    }
-
-    // Whether it was retrieved or created, the definition has been found.
-    portType.setUndefined(false);
-
-    Element tempEl = DOMUtils.getFirstChildElement(portTypeEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        portType.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_OPERATION, tempEl))
-      {
-        // modified so duplicate operations will not be added to porttype 
-        Operation op = parseOperation(tempEl, portType, def);
-        if (op != null)
-        {
-          portType.addOperation(op);
-        }
-        //portType.addOperation(parseOperation(tempEl, portType, def));
-      }
-      else
-      {
-        // something else that shouldn't be here
-        // NEED TO ADD TO ERROR LIST
-        //DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(portType, portTypeEl);
-
-    return portType;
-  }
-
-  /**
-   * Parse a specific operation element.
-   * 
-   * @param opEl The operation element.
-   * @param portType The portType element.
-   * @param def The definitions element.
-   * @return A WSDL operation element.
-   * @throws WSDLException
-   */
-  protected Operation parseOperation(Element opEl, PortType portType, Definition def) throws WSDLException
-  {
-    Operation op = null;
-    String name = DOMUtils.getAttribute(opEl, Constants.ATTR_NAME);
-    String parameterOrderStr = DOMUtils.getAttribute(opEl, Constants.ATTR_PARAMETER_ORDER);
-    Element tempEl = DOMUtils.getFirstChildElement(opEl);
-    List messageOrder = new Vector();
-    Element docEl = null;
-    Input input = null;
-    Output output = null;
-    List faults = new Vector();
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        docEl = tempEl;
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_INPUT, tempEl))
-      {
-        input = parseInput(tempEl, def);
-        messageOrder.add(Constants.ELEM_INPUT);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_OUTPUT, tempEl))
-      {
-        output = parseOutput(tempEl, def);
-        messageOrder.add(Constants.ELEM_OUTPUT);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, tempEl))
-      {
-        faults.add(parseFault(tempEl, def));
-      }
-      else
-      {
-        // invalid element in the operation
-        // XML check will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    if (name != null)
-    {
-      String inputName = (input != null ? input.getName() : null);
-      String outputName = (output != null ? output.getName() : null);
-
-      boolean opDefined = false;
-
-      try
-      {
-
-        //op = portType.getOperation(name, inputName, outputName);
-
-        //Operation op = null;
-        List operations = portType.getOperations();
-        if (operations != null)
-        {
-
-          Iterator iOperations = operations.iterator();
-          while (iOperations.hasNext())
-          {
-            boolean inputNamesEqual = false;
-            boolean outputNamesEqual = false;
-            Operation oper = (Operation)iOperations.next();
-            if (oper.getName().equalsIgnoreCase(name))
-            {
-              Input opInput = oper.getInput();
-              if (opInput != null && input != null)
-              {
-                String opInputName = opInput.getName();
-                if (opInputName != null && inputName != null && opInputName.equalsIgnoreCase(inputName))
-                {
-                  inputNamesEqual = true;
-                }
-                else if (opInputName == null && inputName == null)
-                {
-                  inputNamesEqual = true;
-                }
-              }
-              else if (opInput == null && input == null)
-              {
-                inputNamesEqual = true;
-              }
-              Output opOutput = oper.getOutput();
-              if (opOutput != null && output != null)
-              {
-                String opOutputName = opOutput.getName();
-                if (opOutputName != null && outputName != null && opOutputName.equalsIgnoreCase(outputName))
-                {
-                  outputNamesEqual = true;
-                }
-                else if (opOutputName == null && outputName == null)
-                {
-                  outputNamesEqual = true;
-                }
-              }
-              else if (opOutput == null && output == null)
-              {
-                outputNamesEqual = true;
-              }
-              if (inputNamesEqual && outputNamesEqual)
-              {
-                op = oper;
-                break;
-              }
-            }
-          }
-        }
-      }
-      catch (Exception e)
-      {
-        opDefined = true;
-      }
-
-      if (op != null /*&& !op.isUndefined()*/
-        )
-      {
-        //op = null;
-        opDefined = true;
-
-      }
-
-      if (op != null && !opDefined)
-      {
-        if (inputName == null)
-        {
-          Input tempIn = op.getInput();
-
-          if (tempIn != null)
-          {
-            if (tempIn.getName() != null)
-            {
-              //op = null;
-              opDefined = true;
-            }
-          }
-        }
-      }
-
-      if (op != null && !opDefined)
-      {
-        if (outputName == null)
-        {
-          Output tempOut = op.getOutput();
-
-          if (tempOut != null)
-          {
-            if (tempOut.getName() != null)
-            {
-              //op = null;
-              opDefined = true;
-            }
-          }
-        }
-      }
-
-      if (opDefined)
-      {
-        // instead of creating a new one with the same name we're going to return null.
-        // According to the WSDL 1.2 working draft operation overloading is no longer allowed.
-        // Going to use that here to save a lot of work
-        setLocation(op, opEl);
-        addReaderError(
-          portType,
-          op,
-          messagegenerator.getString(
-            "_DUPLICATE_OPERATION_FOR_PORTTYPE",
-            "'" + op.getName() + "'",
-            "'" + portType.getQName().getLocalPart() + "'"));
-        return null;
-      }
-      if (op == null)
-      {
-        op = def.createOperation();
-        op.setName(name);
-
-      }
-    }
-    else
-    {
-      op = def.createOperation();
-    }
-
-    // Whether it was retrieved or created, the definition has been found.
-    op.setUndefined(false);
-
-    if (parameterOrderStr != null)
-    {
-      op.setParameterOrdering(StringUtils.parseNMTokens(parameterOrderStr));
-    }
-
-    if (docEl != null)
-    {
-      op.setDocumentationElement(docEl);
-    }
-
-    if (input != null)
-    {
-      op.setInput(input);
-    }
-
-    if (output != null)
-    {
-      op.setOutput(output);
-    }
-
-    if (faults.size() > 0)
-    {
-      Iterator faultIterator = faults.iterator();
-
-      while (faultIterator.hasNext())
-      {
-        Fault f = (Fault)faultIterator.next();
-        // if the fault isn't defined yet
-        if (op.getFault(f.getName()) == null)
-        {
-          op.addFault(f);
-        }
-        else
-        {
-          addReaderError(
-            op,
-            f,
-            messagegenerator.getString("_DUPLICATE_FAULT_NAME", "'" + f.getName() + "'", "'" + op.getName() + "'"));
-          //faultErrors.add(new Object[]{f,"Duplicate Name",op});
-        }
-      }
-    }
-
-    OperationType style = null;
-
-    if (messageOrder.equals(STYLE_ONE_WAY))
-    {
-      style = OperationType.ONE_WAY;
-    }
-    else if (messageOrder.equals(STYLE_REQUEST_RESPONSE))
-    {
-      style = OperationType.REQUEST_RESPONSE;
-    }
-    else if (messageOrder.equals(STYLE_SOLICIT_RESPONSE))
-    {
-      style = OperationType.SOLICIT_RESPONSE;
-    }
-    else if (messageOrder.equals(STYLE_NOTIFICATION))
-    {
-      style = OperationType.NOTIFICATION;
-    }
-
-    if (style != null)
-    {
-      op.setStyle(style);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(op, opEl);
-
-    // modified to remove duplicate operations
-    //    if(opDefined)
-    //    {
-    //      addReaderError(portType,op,ValidateWSDLPlugin.getInstance().getString("_DUPLICATE_OPERATION_FOR_PORTTYPE","'"+op.getName()+"'","'"+portType.getQName().getLocalPart()+"'"));
-    //      return null;
-    //    }
-    return op;
-  }
-
-  /**
-   * Parse a specific service element.
-   * 
-   * @param serviceEl The service element.
-   * @param def The defintions element.
-   * @return A WSDL service element.
-   * @throws WSDLException
-   */
-  protected Service parseService(Element serviceEl, Definition def) throws WSDLException
-  {
-    Service service = def.createService();
-    String name = DOMUtils.getAttribute(serviceEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      service.setQName(new QName(def.getTargetNamespace(), name));
-    }
-    Service s;
-    // a service with this name has already been defined
-    if ((s = def.getService(service.getQName())) != null)
-    {
-      addReaderError(
-        def,
-        serviceEl,
-        messagegenerator.getString("_SERVICE_NAME_ALREADY_DEFINED", "'" + s.getQName().getLocalPart() + "'"));
-      return s;
-    }
-    Element tempEl = DOMUtils.getFirstChildElement(serviceEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        service.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_PORT, tempEl))
-      {
-        service.addPort(parsePort(tempEl, def));
-      }
-      else
-      {
-        service.addExtensibilityElement(parseExtensibilityElement(Service.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(service, serviceEl);
-
-    return service;
-  }
-  
-  /**
-   * Parse a specific port element.
-   * 
-   * @param portEl The port element.
-   * @param def The definitions element.
-   * @return A WSDL port element.
-   * @throws WSDLException
-   */
-  protected Port parsePort(Element portEl, Definition def) throws WSDLException
-  {
-    Port port = def.createPort();
-    String name = DOMUtils.getAttribute(portEl, Constants.ATTR_NAME);
-    QName bindingStr;
-    try
-    {
-      bindingStr = DOMUtils.getQualifiedAttributeValue(portEl, Constants.ATTR_BINDING, Constants.ELEM_PORT, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the message name
-      bindingStr = new QName(null, DOMUtils.getAttribute(portEl, "binding"));
-    }
-
-    if (name != null)
-    {
-      port.setName(name);
-    }
-
-    if (bindingStr != null)
-    {
-      Binding binding = def.getBinding(bindingStr);
-
-      if (binding == null)
-      {
-        binding = def.createBinding();
-        binding.setQName(bindingStr);
-        def.addBinding(binding);
-      }
-
-      port.setBinding(binding);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(portEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        port.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        port.addExtensibilityElement(parseExtensibilityElement(Port.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(port, portEl);
-
-    return port;
-  }
-
-  /**
-   * Parse a specific extensibility element.
-   * 
-   * @param parentType The parent type of the extensibility element.
-   * @param el The extensibility element.
-   * @param def The definitions element.
-   * @return A WSDL extensibility element.
-   * @throws WSDLException
-   */
-  protected ExtensibilityElement parseExtensibilityElement(Class parentType, Element el, Definition def)
-    throws WSDLException
-  {
-    QName elementType = QNameUtils.newQName(el);
-
-    try
-    {
-      ExtensionRegistry extReg = def.getExtensionRegistry();
-
-      if (extReg == null)
-      {
-        throw new WSDLException(
-          WSDLException.CONFIGURATION_ERROR,
-          "No ExtensionRegistry set for this "
-            + "Definition, so unable to deserialize "
-            + "a '"
-            + elementType
-            + "' element in the "
-            + "context of a '"
-            + parentType.getName()
-            + "'.");
-      }
-
-      ExtensionDeserializer extDS = extReg.queryDeserializer(parentType, elementType);
-
-      // asign the ExtensibilityElement to a var so we can add it to the locations
-      ExtensibilityElement extElem = extDS.unmarshall(parentType, elementType, el, def, extReg);
-      // add the location of this element to elementLocations 
-      // this might not work properly
-      setLocation(extElem, el);
-
-      // register all of the child Elements so we can find them later
-      // used for inline schema validation
-      registerChildElements(extElem);
-
-      return extElem;
-    }
-    catch (WSDLException e)
-    {
-      if (e.getLocation() == null)
-      {
-        e.setLocation(XPathUtils.getXPathExprFromNode(el));
-      }
-      throw e;
-    }
-  }
-
-  /**
-   * Parse a specific input element.
-   * 
-   * @param inputEl The input element.
-   * @param def The defintions element.
-   * @return A WSDL input element.
-   * @throws WSDLException
-   */
-  protected Input parseInput(Element inputEl, Definition def) throws WSDLException
-  {
-
-    Input input = def.createInput();
-    String name = DOMUtils.getAttribute(inputEl, Constants.ATTR_NAME);
-    QName messageName = null;
-    try
-    {
-      messageName = DOMUtils.getQualifiedAttributeValue(inputEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the message name
-      messageName = new QName(null, DOMUtils.getAttribute(inputEl, "message"));
-    }
-
-    if (name != null)
-    {
-      input.setName(name);
-    }
-
-    if (messageName != null)
-    {
-      Message message = def.getMessage(messageName);
-
-      if (message == null)
-      {
-        message = def.createMessage();
-        message.setQName(messageName);
-        def.addMessage(message);
-      }
-
-      input.setMessage(message);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(inputEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        input.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        // XML Validation will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(input, inputEl);
-
-    return input;
-  }
-
-  /**
-   * Parse a specific output element.
-   * 
-   * @param outputEl The output element.
-   * @param def The defintions element.
-   * @return A WSDL output element.
-   * @throws WSDLException
-   */
-  protected Output parseOutput(Element outputEl, Definition def) throws WSDLException
-  {
-    Output output = def.createOutput();
-    String name = DOMUtils.getAttribute(outputEl, Constants.ATTR_NAME);
-    QName messageName = null;
-    try
-    {
-      messageName = DOMUtils.getQualifiedAttributeValue(outputEl, Constants.ATTR_MESSAGE, Constants.ELEM_OUTPUT, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the message name
-      messageName = new QName(null, DOMUtils.getAttribute(outputEl, "message"));
-    }
-
-    if (name != null)
-    {
-      output.setName(name);
-    }
-
-    if (messageName != null)
-    {
-      Message message = def.getMessage(messageName);
-
-      if (message == null)
-      {
-        message = def.createMessage();
-        message.setQName(messageName);
-        def.addMessage(message);
-      }
-
-      output.setMessage(message);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(outputEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        output.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        // XML Validation will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(output, outputEl);
-
-    return output;
-  }
-
-  /**
-   * Parse a specific fault element.
-   * 
-   * @param faultEl The fault element to parse.
-   * @param def The definitions element.
-   * @return A WSDL fault element.
-   * @throws WSDLException
-   */
-  protected Fault parseFault(Element faultEl, Definition def) throws WSDLException
-  {
-    Fault fault = def.createFault();
-    String name = DOMUtils.getAttribute(faultEl, Constants.ATTR_NAME);
-    QName messageName = null;
-    try
-    {
-      messageName = DOMUtils.getQualifiedAttributeValue(faultEl, Constants.ATTR_MESSAGE, Constants.ELEM_INPUT, false);
-    }
-    catch (Exception e)
-    {
-      //the call above fails if there is no qualified namespace for the message name
-      messageName = new QName(null, DOMUtils.getAttribute(faultEl, "message"));
-    }
-
-    if (name != null)
-    {
-      fault.setName(name);
-    }
-
-    if (messageName != null)
-    {
-      Message message = def.getMessage(messageName);
-
-      if (message == null)
-      {
-        message = def.createMessage();
-        message.setQName(messageName);
-        def.addMessage(message);
-      }
-
-      fault.setMessage(message);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(faultEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        fault.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        // XML Validation will catch this
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    // add the location of this element to elementLocations 
-    setLocation(fault, faultEl);
-
-    return fault;
-  }
-  
-  /**
-   * Set the messagegenerator for the reader.
-   * 
-   * @param mg The message generator to set.
-   */
-  public void setMessageGenerator(MessageGenerator mg)
-  {
-    messagegenerator = mg;
-  }
-
-  /**
-   * Add the refObject to the elementLocation hashtable with the location defined in element.
-   * 
-   * @param refObject The object to add.
-   * @param element The element that contains the location information.
-   */
-  protected void setLocation(Object refObject, Element element)
-  {
-    try
-    {
-      ElementImpl elementImpl = (ElementImpl)element;
-      ElementLocation elementLocation = (ElementLocation)elementImpl.getUserData();
-      if (elementLocation != null)
-      {
-
-        elementLocations.put(
-          refObject,
-          new LocationHolder(elementLocation.getLineNumber(), elementLocation.getColumnNumber(), def.getDocumentBaseURI()));
-      }
-    }
-    catch (ClassCastException e)
-    {
-    }
-  }
-  /**
-   * Add a reader error to the list.
-   * 
-   * @param parentobject The parent object of the object with the error.
-   * @param object The object with the error.
-   * @param error The error message.
-   */
-  protected void addReaderError(Object parentobject, Object object, String error)
-  {
-    readerErrors.add(new ReaderError(parentobject, object, error));
-  }
-  
-  /**
-   * Add a reader warning to the list.
-   * 
-   * @param parentobject The parent object of the object with the error.
-   * @param object The object with the error.
-   * @param warning The warning message.
-   */
-  protected void addReaderWarning(Object parentobject, Object object, String warning)
-  {
-    readerWarnings.add(new ReaderError(parentobject, object, warning));
-  }
-  
-  /**
-   * Register all of the locations of the child elements of the extensibility
-   * element given.
-   * 
-   * @param extElem The extensibility element whose child elements will be registered.
-   */
-
-  protected void registerChildElements(ExtensibilityElement extElem)
-  {
-    // only add those that are of type unknown. if they're known they 
-    // will take care of themselves
-    if (extElem instanceof UnknownExtensibilityElement)
-    {
-      Element elem = ((UnknownExtensibilityElement)extElem).getElement();
-      registerChildElementsRecursively(elem);
-    }
-  }
-
-  /**
-   * Register the location of all of the child elements of elem.
-   * 
-   * @param elem The element whose child elements will be registered.
-   */
-  protected void registerChildElementsRecursively(Element elem)
-  {
-    if (elem instanceof ElementNSImpl)
-    {
-      setLocation(elem, elem);
-
-      // call the method recursively for each child element
-      NodeList childNodes = elem.getChildNodes();
-
-      for (int i = 0; i < childNodes.getLength() || i < 5; i++)
-      {
-        Node n = childNodes.item(i);
-        // we only want nodes that are Elements
-        if (n instanceof Element)
-        {
-          Element child = (Element)n;
-          registerChildElementsRecursively(child);
-        }
-      }
-    }
-  }
-  /**
-   * Check that an element name matches the expected name.
-   * 
-   * @param el The element with the name to check.
-   * @param qname The name to check against.
-   * @throws WSDLException
-   */
-  private static void checkElementName(Element el, QName qname) throws WSDLException
-  {
-    if (!QNameUtils.matches(qname, el))
-    {
-      WSDLException wsdlExc = new WSDLException(WSDLException.INVALID_WSDL, "Expected element '" + qname + "'.");
-
-      wsdlExc.setLocation(XPathUtils.getXPathExprFromNode(el));
-
-      throw wsdlExc;
-    }
-  }
-  
-  /**
-   * Get the element locations hashtable.
-   * 
-   * @return The element locations hashtable.
-   */
-  public Hashtable getElementLocations()
-  {
-    return elementLocations;
-  }
-  
-  /**
-   * Get the reader errors.
-   * 
-   * @return The reader errors.
-   */
-  public List getReaderErrors()
-  {
-    return readerErrors;
-  }
-  
-  /**
-   * Get reader warnings.
-   * 
-   * @return The reader warnings.
-   */
-  public List getReaderWarnings()
-  {
-    return readerWarnings;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java
deleted file mode 100644
index 4e6ecd6..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java
+++ /dev/null

@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11;
-
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.wsdl.Import;
-import javax.wsdl.WSDLException;
-
-import org.apache.xerces.impl.XMLErrorReporter;
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.parsers.StandardParserConfiguration;
-import org.apache.xerces.xni.XNIException;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.xml.LineNumberDOMParser;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import com.ibm.wsdl.DefinitionImpl;
-import com.ibm.wsdl.util.StringUtils;
-
-/**
- * A WSDL reader that supports cyclic WSDL imports, schema imports and inline schemas.
- * This reader is based on the WSDLReaderImpl from WSDL4J. 
- */
-public class WSDLReaderImpl
-{
-  protected MessageGenerator messagegenerator;
-  protected IWSDL11ValidationInfo wsdlvalinfo;
-  
-  /**
-   * Constructor.
-   * 
-   * @param wsdlvalinfo The WSDL 1.1 validation info object to use.
-   */
-  public WSDLReaderImpl(IWSDL11ValidationInfo wsdlvalinfo)
-  {
-    this.wsdlvalinfo = wsdlvalinfo;
-  }
-  
-  /**
-   * Parse the root document. This method will find all imports and parse them as 
-   * well creating a WSDLDocument for each unique WSDL file. This method supports
-   * cyclic WSDL import statements such that file A can import file B and file B
-   * can import file A.
-   * 
-   * @param documentBaseURI The base URI of the root document.
-   * @param defEl The definition element of the root document.
-   * @return An array of WSDLDocuments containing all of the unique files in the description.
-   * @throws WSDLException
-   */
-  protected WSDLDocument[] parseDocument(String documentBaseURI, Element defEl) throws WSDLException
-  {
-    int initialImportArraySize = 20;
-    List[] filesAtDepth = new ArrayList[initialImportArraySize];
-    Map filesImporting = new Hashtable();
-    SortedSet parsedImports = new TreeSet();
-    SortedSet importsToParse = new TreeSet();
-    int maxdepth = 0;
-
-    WSDLDocument rootdoc = new WSDLDocument(documentBaseURI, defEl, 0, messagegenerator, wsdlvalinfo);
-    String targetNamespace = rootdoc.getDefinition().getTargetNamespace();
-    ImportHolder rootImport = new ImportHolder(targetNamespace, documentBaseURI, documentBaseURI, rootdoc, 0, null, messagegenerator, wsdlvalinfo);
-    rootImport.createWSDLImport(rootdoc);
-    parsedImports.add(rootImport);
-    List rootList = new ArrayList();
-    filesImporting.put(rootImport.getLocation(), new ArrayList());
-    rootList.add(rootdoc);
-    filesAtDepth[0] = rootList;
-    importsToParse.addAll(rootdoc.getImports());
-    Set imps = rootdoc.getImports();
-    Iterator impIter = imps.iterator();
-    while(impIter.hasNext())
-    {
-      ImportHolder imp = (ImportHolder)impIter.next();
-      List tempList = new ArrayList();
-      tempList.add(imp.getImportingDocument());
-      filesImporting.put(imp.getLocation(), tempList);
-    }
-    
-    while(!importsToParse.isEmpty())
-    {
-      ImportHolder imp = (ImportHolder)importsToParse.first();
-      // It's important to initialize the import here so each import
-      // is only created once. In the case of reciprical imports this
-      // avoids an infinite loop.
-      imp.initialize();
-      WSDLDocument impDoc = imp.getWSDLDocument();
-      
-      importsToParse.remove(imp);
-      
-      parsedImports.add(imp);
-      
-      // Add new imports to the list of imports to parse.
-      // Remove all the imports that have already been parsed.
-      if(impDoc != null)
-      {
-        // Increate import array if necessary.
-        if(imp.getDepth() >= initialImportArraySize)
-        {
-          List[] tempArray = new List[filesAtDepth.length + initialImportArraySize];
-          System.arraycopy(filesAtDepth, 0, tempArray, 0, filesAtDepth.length);
-          filesAtDepth = tempArray;
-        }
-        // Create the list for the depth if necessary.
-        int impDepth = imp.getDepth();
-        if(filesAtDepth[impDepth] == null)
-        {
-          if(maxdepth < impDepth)
-          {
-            maxdepth = impDepth;
-          }
-          filesAtDepth[impDepth] = new ArrayList();
-        }
-        filesAtDepth[imp.getDepth()].add(impDoc);
-        
-        Set imports = impDoc.getImports();
-        ImportHolder[] importsArray = (ImportHolder[])imports.toArray(new ImportHolder[imports.size()]);
-        for(int i = 0; i < importsArray.length; i++)
-        {
-          ImportHolder ih = importsArray[i];
-          // If already parsed, add the definition importing this file to the list.
-          if(filesImporting.containsKey(ih.getLocation()))
-          {
-            ((List)filesImporting.get(ih.getLocation())).add(ih.getImportingDocument());
-          }
-          // Otherwise add it to the list to parse.
-          else
-          {
-            // Add this import to the list of files importing list.
-            List tempList = new ArrayList();
-            tempList.add(ih.getImportingDocument());
-            filesImporting.put(ih.getLocation(), tempList);
-            importsToParse.add(ih);
-          }
-        }
-      }
-    }
-    
-    // Add all of the imports to the respective documents.
-    Iterator importElementsIter = parsedImports.iterator();
-    while(importElementsIter.hasNext())
-    {
-      ImportHolder imp = (ImportHolder)importElementsIter.next();
-      List files = (List)filesImporting.get(imp.getLocation());
-      Iterator filesIter = files.iterator();
-      while(filesIter.hasNext())
-      {
-        WSDLDocument doc = (WSDLDocument)filesIter.next();
-        
-        DefinitionImpl def = (DefinitionImpl)doc.getDefinition();
-        Import impElem = imp.getImport();
-        if(impElem != null)
-        {
-          def.addImport(impElem);
-          if(!imp.isWSDLFileImport())
-          {
-            doc.addSchemas(imp.getSchemas());
-          }
-        }
-        
-      }
-    }
-    
-    // Parse the WSDL documents.
-    // Parse the Messages.
-    for(int i = maxdepth; i >=0; i--)
-    {
-      List docs = filesAtDepth[i];
-      Iterator docsIter = docs.iterator();
-      while(docsIter.hasNext())
-      {
-        WSDLDocument doc = (WSDLDocument)docsIter.next();
-        doc.parseMessages();
-      }
-    }
-    // Parse the Porttypes.
-    for(int i = maxdepth; i >=0; i--)
-    {
-      List docs = filesAtDepth[i];
-      Iterator docsIter = docs.iterator();
-      while(docsIter.hasNext())
-      {
-        WSDLDocument doc = (WSDLDocument)docsIter.next();
-        doc.parsePorttypes();
-      }
-    }
-    // Parse the Bindings.
-    for(int i = maxdepth; i >=0; i--)
-    {
-      List docs = filesAtDepth[i];
-      Iterator docsIter = docs.iterator();
-      while(docsIter.hasNext())
-      {
-        WSDLDocument doc = (WSDLDocument)docsIter.next();
-        doc.parseBindings();
-      }
-    }
-    // Parse the Services.
-    for(int i = maxdepth; i >=0; i--)
-    {
-      List docs = filesAtDepth[i];
-      Iterator docsIter = docs.iterator();
-      while(docsIter.hasNext())
-      {
-        WSDLDocument doc = (WSDLDocument)docsIter.next();
-        doc.parseServices();
-      }
-    }
-    // Parse the Extensibility Elements.
-    for(int i = maxdepth; i >=0; i--)
-    {
-      List docs = filesAtDepth[i];
-      Iterator docsIter = docs.iterator();
-      while(docsIter.hasNext())
-      {
-        WSDLDocument doc = (WSDLDocument)docsIter.next();
-        doc.parseExtensibilityElements();
-      }
-    }
-    
-    List wsdlDocs = new ArrayList();
-    for(int i = maxdepth; i >=0; i--)
-    {
-      List docs = filesAtDepth[i];
-      Iterator docsIter = docs.iterator();
-      while(docsIter.hasNext())
-      {
-        WSDLDocument doc = (WSDLDocument)docsIter.next();
-        wsdlDocs.add(doc);
-      }
-    }
-    
-    return (WSDLDocument[])wsdlDocs.toArray(new WSDLDocument[wsdlDocs.size()]);
-  }
-  
-  /**
-   * Get the WSDL document.
-   * 
-   * @param inputSource The source of the document being retrieved.
-   * @param desc The description of the document being retrieved.
-   * @return The WSDL document.
-   * @throws WSDLException
-   */
-  public static Document getDocument(InputSource inputSource, String desc) throws WSDLException
-  {
-    try
-    {
-      StandardParserConfiguration configuration = new StandardParserConfiguration()
-      {
-        protected XMLErrorReporter createErrorReporter()
-        {
-          return new XMLErrorReporter()
-          {
-            public void reportError(String domain, String key, Object[] arguments, short severity) throws XNIException
-            {
-              boolean reportError = true;
-              if (key.equals("PrematureEOF"))
-               {         
-                reportError = false;
-              }
-
-              if (reportError)
-               {
-                super.reportError(domain, key, arguments, severity);
-              }
-            }
-          };
-        }
-      };
-      
-      ErrorHandler errorHandler = new ErrorHandler()
-      {
-            /* (non-Javadoc)
-           * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-           */
-          public void error(SAXParseException exception) throws SAXException
-          {
-            // TODO Auto-generated method stub
-
-          }
-          /* (non-Javadoc)
-           * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-           */
-          public void fatalError(SAXParseException exception) throws SAXException
-          {
-            // TODO Auto-generated method stub
-
-          }
-          /* (non-Javadoc)
-           * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-           */
-          public void warning(SAXParseException exception) throws SAXException
-          {
-            // TODO Auto-generated method stub
-
-          }
-      };
-
-      DOMParser builder = new LineNumberDOMParser(configuration);
-      builder.setErrorHandler(errorHandler);
-      builder.parse(inputSource);
-      Document doc = builder.getDocument();
-
-      return doc;
-    }
-    catch (Throwable t)
-    {
-      throw new WSDLException(WSDLException.PARSER_ERROR, "Problem parsing '" + desc + "'.", t);
-    }
-  }
-
-  /**
-   * Read a WSDL document using a context URI and file URI.
-   * 
-   * @param contextURI The context URI to use.
-   * @param wsdlURI The WSDL URI to use.
-   * @return An array of WSDLDocuments.
-   * @throws WSDLException
-   */
-  public WSDLDocument[] readWSDL(String contextURI, String wsdlURI) throws WSDLException
-  {
-    try
-    {
-      URL contextURL = (contextURI != null) ? StringUtils.getURL(null, contextURI) : null;
-      URL url = StringUtils.getURL(contextURL, wsdlURI);
-      Reader reader = StringUtils.getContentAsReader(url);
-      InputSource inputSource = new InputSource(reader);
-      Document doc = getDocument(inputSource, wsdlURI);
-      reader.close();
-      WSDLDocument[] wsdlDocs = null;
-      // only parse the document if it isn't empty
-      if(doc.getDocumentElement() != null)
-       {      
-        wsdlDocs = readWSDL(url.toString(), doc);
-      }
-      return wsdlDocs;
-    }
-    catch (WSDLException e)
-    {
-      throw e;
-    }
-    catch (Throwable t)
-    {
-      throw new WSDLException(
-        WSDLException.OTHER_ERROR,
-        "Unable to resolve imported document at '" + wsdlURI + "'.",
-        t);
-    }
-  }
-
-  /**
-   * Set the messagegenerator for the reader.
-   * 
-   * @param mg The message generator to set.
-   */
-  public void setMessageGenerator(MessageGenerator mg)
-  {
-    messagegenerator = mg;
-  }
-  
-  /**
-   * Read the WSDL document accessible via the specified
-   * URI into a WSDL definition.
-   *
-   * @param wsdlURI A URI pointing to a WSDL file.
-   * @return An array of WSDLDocuments.
-   */
-  public WSDLDocument[] readWSDL(String wsdlURI) throws WSDLException
-  {
-    return readWSDL(null, wsdlURI);
-  }
-
-  /**
-   * Read the WSDL document described by a URI and its definitions element.
-   * 
-   * @param documentBaseURI The URI of the WSDL document.
-   * @param definitionsElement The definitions element for the WSDL document.
-   * @return An array of WSDLDocuments.
-   * @throws WSDLException
-   */
-  protected WSDLDocument[] readWSDL(String documentBaseURI,
-                                Element definitionsElement)
-                                  throws WSDLException
-  {
-    return parseDocument(documentBaseURI, definitionsElement);
-  }
-
-  /**
-   * Read the specified WSDL document.
-   *
-   * @param documentBaseURI The document base URI.
-   * @param wsdlDocument The WSDL document.
-   * @return An array of WSDLDocuments.
-   */
-  public WSDLDocument[] readWSDL(String documentBaseURI, Document wsdlDocument)
-    throws WSDLException
-  {
-    return readWSDL(documentBaseURI, wsdlDocument.getDocumentElement());
-  }
-  
-  
-  
-}
-

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/http/HTTPValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/http/HTTPValidator.java
deleted file mode 100644
index 6780e48..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/http/HTTPValidator.java
+++ /dev/null

@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.http;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPOperation;
-
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo;
-
-import com.ibm.wsdl.BindingImpl;
-import com.ibm.wsdl.BindingInputImpl;
-import com.ibm.wsdl.BindingOperationImpl;
-import com.ibm.wsdl.PortImpl;
-import com.ibm.wsdl.extensions.http.HTTPAddressImpl;
-import com.ibm.wsdl.extensions.http.HTTPBindingImpl;
-import com.ibm.wsdl.extensions.http.HTTPOperationImpl;
-import com.ibm.wsdl.extensions.http.HTTPUrlEncodedImpl;
-import com.ibm.wsdl.extensions.http.HTTPUrlReplacementImpl;
-
-/**
- * The HTTP validator is an extension WSDL validator that validates all elements in the HTTP
- * namespace.
- */
-public class HTTPValidator implements IWSDL11Validator
-{
-  private final String _ERROR_INVALID_PORT_ELEMENT = "_ERROR_INVALID_PORT_ELEMENT";
-  private final String _ERROR_INVALID_BINDING_ELEMENT = "_ERROR_INVALID_BINDING_ELEMENT";
-  private final String _ERROR_INVALID_BINDING_OPERATION_ELEMENT = "_ERROR_INVALID_BINDING_OPERATION_ELEMENT";
-  private final String _ERROR_INVALID_BINDING_INPUT_ELEMENT = "_ERROR_INVALID_BINDING_INPUT_ELEMENT";
-  private final String _ERROR_INVALID_HTTP_ELEMENT_FOR_LOCATION = "_ERROR_INVALID_HTTP_ELEMENT_FOR_LOCATION";
-  private final String _ERROR_NO_LOCATION_FOR_ADDRESS = "_ERROR_NO_LOCATION_FOR_ADDRESS";
-  private final String _ERROR_NO_HTTPBINDING_FOR_ADDRESS = "_ERROR_NO_HTTPBINDING_FOR_ADDRESS";
-  private final String _ERROR_INVALID_BINDING_VERB = "_ERROR_INVALID_BINDING_VERB";
-  private final String _ERROR_INVALID_LOCATION_URI = "_ERROR_INVALID_LOCATION_URI";
-  private final String _ERROR_NO_HTTPBINDING_FOR_OPERATION = "_ERROR_NO_HTTPBINDING_FOR_OPERATION";
-  private final String _ERROR_NOT_ONLY_ELEMENT_DEFINED = "_ERROR_NOT_ONLY_ELEMENT_DEFINED";
-  private final String _ERROR_NO_HTTPOPERATION_FOR_URL = "_ERROR_NO_HTTPOPERATION_FOR_URL";
-
-  private final String GET = "GET";
-  private final String POST = "POST";
-
-  private final String QUOTE = "'";
-  private final String EMPTY_STRING = "";
-
-  private MessageGenerator messagegenerator;
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.wsdl11.IWSDL11ValidationInfo)
-   */
-  public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    // Port HTTP definition
-    // make sure every port has only one address element defined
-    // if it is an address element, validate it
-    if (parents.get(0).getClass() == PortImpl.class)
-    {
-      if (element.getClass() == HTTPAddressImpl.class)
-      {
-        validateAddress(element, parents, valInfo);
-      }
-      else
-      {
-        ExtensibilityElement e = (ExtensibilityElement)element;
-        valInfo.addError(
-          messagegenerator.getString(_ERROR_INVALID_PORT_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE),
-          element);
-      }
-    }
-
-    // Binding HTTP definition
-    // A HTTP Binding must have a verb of GET or POST
-    else if (parents.get(0).getClass() == BindingImpl.class)
-    {
-      if (element.getClass() == HTTPBindingImpl.class)
-      {
-        validateBinding(element, parents, valInfo);
-      }
-      else
-      {
-        ExtensibilityElement e = (ExtensibilityElement)element;
-        valInfo.addError(
-          messagegenerator.getString(_ERROR_INVALID_BINDING_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE),
-          element);
-      }
-    }
-    // Binding Operation HTTP definition
-    // A HTTP Operation has a location uri defined
-    else if (parents.get(0).getClass() == BindingOperationImpl.class)
-    {
-      if (element.getClass() == HTTPOperationImpl.class)
-      {
-        validateOperation(element, parents, valInfo);
-      }
-      else
-      {
-        ExtensibilityElement e = (ExtensibilityElement)element;
-        valInfo.addError(
-          messagegenerator.getString(
-            _ERROR_INVALID_BINDING_OPERATION_ELEMENT,
-            QUOTE + e.getElementType().getLocalPart() + QUOTE),
-          element);
-      }
-
-    }
-    else if (parents.get(0).getClass() == BindingInputImpl.class)
-    {
-      // validate the HTTP urlEncoded and urlReplacement
-      if (element.getClass() == HTTPUrlEncodedImpl.class || element.getClass() == HTTPUrlReplacementImpl.class)
-      {
-        validateHttpUrl(element, parents, valInfo);
-      }
-      else
-      {
-        ExtensibilityElement e = (ExtensibilityElement)element;
-        valInfo.addError(
-          messagegenerator.getString(_ERROR_INVALID_BINDING_INPUT_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE),
-          element);
-      }
-    }
-
-    // in this case there has been a HTTP element defined that is not defined for this point in the HTTP namespace
-    else
-    {
-      ExtensibilityElement e = (ExtensibilityElement)element;
-      valInfo.addError(
-        messagegenerator.getString(
-          _ERROR_INVALID_HTTP_ELEMENT_FOR_LOCATION,
-          QUOTE + e.getElementType().getLocalPart() + QUOTE),
-        element);
-    }
-
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.validator.IWSDL11Validator#setResourceBundle(java.util.ResourceBundle)
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    if (messagegenerator == null)
-    {
-      messagegenerator = new MessageGenerator(rb);
-    }
-  }
-
-  /**
-   * Ensure that the HTTP address has a value specified for it's uri and that there is a HTTP Binding defined
-   * for the Binding specified in the port.
-   * 
-   * @param element The HTTP address element.
-   * @param parents The list of parents of the HTTP address element.
-   * @param validatorcontroller The validator controller in charge of validation.
-   */
-  protected void validateAddress(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    HTTPAddressImpl ha = (HTTPAddressImpl)element;
-
-    String uri = ha.getLocationURI();
-    if (uri == null || uri.equalsIgnoreCase(EMPTY_STRING))
-    {
-      valInfo.addError(messagegenerator.getString(_ERROR_NO_LOCATION_FOR_ADDRESS), ha);
-    }
-
-    Port port = (Port)parents.get(0);
-
-    Binding binding = port.getBinding();
-
-    if (!hasHttpBinding(binding))
-    {
-      valInfo.addError(
-        messagegenerator.getString(
-          _ERROR_NO_HTTPBINDING_FOR_ADDRESS,
-          QUOTE + binding.getQName().getLocalPart() + QUOTE,
-          QUOTE + port.getName() + QUOTE),
-        ha);
-    }
-  }
-
-  /**
-   * Ensure the HTTP Binding defined is valid. A HTTP Binding must have a verb of GET or POST.
-   * 
-   * @param element The HTTP binding element.
-   * @param parents The list of parents of the HTTP binding element.
-   * @param validatorcontroller The validator controller in charge of validation.
-   */
-  protected void validateBinding(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    HTTPBindingImpl hb = (HTTPBindingImpl)element;
-
-    String verb = hb.getVerb();
-
-    if (verb != null && !verb.equals(GET) && !verb.equals(POST))
-    {
-      valInfo.addError(messagegenerator.getString(_ERROR_INVALID_BINDING_VERB, QUOTE + verb + QUOTE), element);
-    }
-  }
-
-  /**
-   * An operation must have a location defined. A HTTP Binding must be specified to use an operation.
-   * 
-   * @param element The HTTP operation element.
-   * @param parents The list of parents of the HTTP operation element.
-   * @param validatorcontroller The validator controller in charge of validation.
-   */
-  protected void validateOperation(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    HTTPOperation ho = (HTTPOperation)element;
-
-    String locationURI = ho.getLocationURI();
-
-    if (locationURI != null && locationURI.equalsIgnoreCase(EMPTY_STRING))
-    {
-      valInfo.addError(messagegenerator.getString(_ERROR_INVALID_LOCATION_URI), element);
-    }
-
-    Binding binding = (Binding)parents.get(1);
-    if (!hasHttpBinding(binding))
-    {
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_NO_HTTPBINDING_FOR_OPERATION, QUOTE + binding.getQName().getLocalPart() + QUOTE),
-        ho);
-    }
-  }
-
-  /**
-   * Validate the HTTP urlReplacement or urlEncoded. Ensure the HTTP operation has been defined. 
-   * Ensure that either element is the only element specified.
-   * 
-   * @param element The HTTP binding operation element.
-   * @param parents The list of parents of the HTTP binding operation element.
-   * @param validatorcontroller The validator controller in charge of validation.
-   */
-  protected void validateHttpUrl(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    BindingOperation operation = (BindingOperation)parents.get(1);
-
-    String elementName;
-    if (element.getClass() == HTTPUrlEncodedImpl.class)
-    {
-      elementName = "urlEncoded";
-    }
-    else if (element.getClass() == HTTPUrlReplacementImpl.class)
-    {
-      elementName = "urlReplacement";
-    }
-    else
-    {
-      elementName = EMPTY_STRING;
-    }
-
-    BindingInput input = (BindingInput)parents.get(0);
-    if (input.getExtensibilityElements().size() != 1)
-    {
-      valInfo.addError(messagegenerator.getString(_ERROR_NOT_ONLY_ELEMENT_DEFINED, elementName), element);
-    }
-
-    if (!hasHttpOperation(operation))
-    {
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_NO_HTTPOPERATION_FOR_URL, QUOTE + operation.getName() + QUOTE, elementName),
-        element);
-    }
-  }
-
-  /**
-   * Given a BindingOperation tells whether it has a HTTP operation defined for it.
-   * 
-   * @param binding The HTTP binding operation element.
-   * @return True if there is an HTTP operation defined, false otherwise.
-   */
-  protected boolean hasHttpOperation(BindingOperation operation)
-  {
-    if (operation != null)
-    {
-      List extelems = operation.getExtensibilityElements();
-      if (extelems != null)
-      {
-        Iterator iextelems = extelems.iterator();
-        while (iextelems.hasNext())
-        {
-          if (iextelems.next().getClass() == HTTPOperationImpl.class)
-          {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Given a binding returns true if it has a HTTP binding defined.
-   * 
-   * @param binding The binding to check.
-   * @return True if there is an HTTP binding defined.
-   */
-  protected boolean hasHttpBinding(Binding binding)
-  {
-    if (binding != null)
-    {
-      List extelems = binding.getExtensibilityElements();
-      if (extelems != null)
-      {
-        Iterator iextelems = extelems.iterator();
-        while (iextelems.hasNext())
-        {
-          if (iextelems.next().getClass() == HTTPBindingImpl.class)
-          {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/mime/MIMEValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/mime/MIMEValidator.java
deleted file mode 100644
index 54fcea8..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/mime/MIMEValidator.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.mime;
-
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo;
-
-/**
- * The MIME validator plugs into the WSDL validator to provide
- * validation for all elements in a WSDL document within the MIME namespace.
- */
-public class MIMEValidator implements IWSDL11Validator
-{
-  protected MessageGenerator messagegenerator;
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.wsdl11.IWSDL11ValidationInfo)
-   */
-  public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.validator.IWSDL11Validator#setResourceBundle(java.util.ResourceBundle)
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    if (messagegenerator == null)
-    {
-      messagegenerator = new MessageGenerator(rb);
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/soap/SOAPValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/soap/SOAPValidator.java
deleted file mode 100644
index b3a9549..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/soap/SOAPValidator.java
+++ /dev/null

@@ -1,603 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.soap;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo;
-
-import com.ibm.wsdl.BindingFaultImpl;
-import com.ibm.wsdl.BindingImpl;
-import com.ibm.wsdl.BindingInputImpl;
-import com.ibm.wsdl.BindingOperationImpl;
-import com.ibm.wsdl.BindingOutputImpl;
-import com.ibm.wsdl.PortImpl;
-import com.ibm.wsdl.extensions.soap.SOAPAddressImpl;
-import com.ibm.wsdl.extensions.soap.SOAPBindingImpl;
-import com.ibm.wsdl.extensions.soap.SOAPBodyImpl;
-import com.ibm.wsdl.extensions.soap.SOAPFaultImpl;
-import com.ibm.wsdl.extensions.soap.SOAPHeaderFaultImpl;
-import com.ibm.wsdl.extensions.soap.SOAPHeaderImpl;
-import com.ibm.wsdl.extensions.soap.SOAPOperationImpl;
-
-/**
- * The SOAP validator plugs into the WSDL validator to provide
- * validation for all elements in a WSDL document within the SOAP namespace.
- *
- */
-public class SOAPValidator implements IWSDL11Validator
-{
-  private final String _ERROR_INVALID_PORT_ELEMENT = "_ERROR_INVALID_PORT_ELEMENT";
-  private final String _ERROR_INVALID_BINDING_ELEMENT = "_ERROR_INVALID_BINDING_ELEMENT";
-  private final String _ERROR_INVALID_BINDING_OPERATION_ELEMENT = "_ERROR_INVALID_BINDING_OPERATION_ELEMENT";
-  private final String _ERROR_INVALID_HEADER_BODY_ELEMENT = "_ERROR_INVALID_HEADER_BODY_ELEMENT";
-  private final String _ERROR_INVALID_FAULT_ELEMENT = "_ERROR_INVALID_FAULT_ELEMENT";
-  private final String _ERROR_INVALID_SOAP_ELEMENT_FOR_LOCATION = "_ERROR_INVALID_SOAP_ELEMENT_FOR_LOCATION";
-  private final String _ERROR_NO_LOCATION_FOR_ADDRESS = "_ERROR_NO_LOCATION_FOR_ADDRESS";
-  private final String _ERROR_NO_SOAPBINDING_FOR_ADDRESS = "_ERROR_NO_SOAPBINDING_FOR_ADDRESS";
-  private final String _ERROR_INVALID_BINDING_STYLE = "_ERROR_INVALID_BINDING_STYLE";
-  private final String _ERROR_INVALID_BINDING_URI = "_ERROR_INVALID_BINDING_URI";
-  private final String _ERROR_INVALID_OPERATION_STYLE = "_ERROR_INVALID_OPERATION_STYLE";
-  private final String _ERROR_NO_SOAPBINDING_FOR_OPERATION = "_ERROR_NO_SOAPBINDING_FOR_OPERATION";
-  private final String _ERROR_INVALID_BODY_ENCODING_STYLE = "_ERROR_INVALID_BODY_ENCODING_STYLE";
-  private final String _ERROR_INVALID_BODY_NAMESPACE_FOR_ENCODED = "_ERROR_INVALID_BODY_NAMESPACE_FOR_ENCODED";
-  private final String _ERROR_INVALID_BODY_USE = "_ERROR_INVALID_BODY_USE";
-  private final String _ERROR_INVALID_BODY_PART_NOT_TYPE = "_ERROR_INVALID_BODY_PART_NOT_TYPE";
-  private final String _ERROR_INVALID_BODY_PART_UNDEFINED = "_ERROR_INVALID_BODY_PART_UNDEFINED";
-  private final String _ERROR_NO_SOAPBINDING_FOR_BODY = "_ERROR_NO_SOAPBINDING_FOR_BODY";
-  private final String _ERROR_HEADER_MESSAGE_UNDEFINED = "_ERROR_HEADER_MESSAGE_UNDEFINED";
-  private final String _ERROR_HEADER_PART_UNDEFINED = "_ERROR_HEADER_PART_UNDEFINED";
-  private final String _ERROR_HEADER_USE_UNDEFINED = "_ERROR_HEADER_USE_UNDEFINED";
-  private final String _ERROR_HEADER_ENCODINGSTYLE_UNDEFINED = "_ERROR_HEADER_ENCODINGSTYLE_UNDEFINED";
-  private final String _ERROR_HEADER_NAMESPACE_UNDEFINED = "_ERROR_HEADER_NAMESPACE_UNDEFINED";
-  private final String _ERROR_NO_SOAPBINDING_FOR_HEADER = "_ERROR_NO_SOAPBINDING_FOR_HEADER";
-  private final String _ERROR_HEADERFAULT_MESSAGE_UNDEFINED = "_ERROR_HEADERFAULT_MESSAGE_UNDEFINED";
-  private final String _ERROR_HEADERFAULT_PART_UNDEFINED = "_ERROR_HEADERFAULT_PART_UNDEFINED";
-  private final String _ERROR_HEADERFAULT_USE_UNDEFINED = "_ERROR_HEADERFAULT_USE_UNDEFINED";
-  private final String _ERROR_HEADERFAULT_ENCODINGSTYLE_UNDEFINED = "_ERROR_HEADERFAULT_ENCODINGSTYLE_UNDEFINED";
-  private final String _ERROR_HEADERFAULT_NAMESPACE_UNDEFINED = "_ERROR_HEADERFAULT_NAMESPACE_UNDEFINED";
-  private final String _ERROR_INVALID_FAULT_NAME = "_ERROR_INVALID_FAULT_NAME";
-  private final String _ERROR_INVALID_FAULT_ENCODING_STYLE = "_ERROR_INVALID_FAULT_ENCODING_STYLE";
-  private final String _ERROR_INVALID_FAULT_NAMESPACE_FOR_ENCODED = "_ERROR_INVALID_FAULT_NAMESPACE_FOR_ENCODED";
-  
-  private final String ENCODED = "encoded";
-  private final String LITERAL = "literal";
-  private final String RPC = "rpc";
-  private final String DOCUMENT = "document";
-  
-  private final String QUOTE = "'";
-  private final String EMPTY_STRING = "";
-
-  protected MessageGenerator messagegenerator;
- 
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.wsdl11.IWSDL11ValidationInfo)
-   */
-  public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    // Port SOAP definition
-    // make sure every port has only one address element defined
-    // if it is an address element, validate it
-    if (parents.get(0).getClass() == PortImpl.class)
-    {
-      if (element.getClass() == SOAPAddressImpl.class)
-      {
-        validateAddress(element, parents, valInfo);
-      }
-      else
-      {
-        ExtensibilityElement e = (ExtensibilityElement)element;
-        valInfo.addError(
-          messagegenerator.getString(_ERROR_INVALID_PORT_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
-      }
-    }
-
-    // Binding SOAP definition
-    // A SOAP Binding must have a style or rpc or document or no style defined - defaults to document
-    // Must have a transport uri defined - check if the uri is empty
-    else if (parents.get(0).getClass() == BindingImpl.class)
-    {
-      if (element.getClass() == SOAPBindingImpl.class)
-      {
-        validateBinding(element, parents, valInfo);
-      }
-      else
-      {
-        ExtensibilityElement e = (ExtensibilityElement)element;
-        valInfo.addError(
-          messagegenerator.getString(_ERROR_INVALID_BINDING_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
-      }
-    }
-    // Binding Operation SOAP definition
-    // A SOAP Operation may have a style defined in which case it must be document or rpc
-    // and may have a soapAction uri defined
-    else if (parents.get(0).getClass() == BindingOperationImpl.class)
-    {
-      if (element.getClass() == SOAPOperationImpl.class)
-      {
-        validateOperation(element, parents, valInfo);
-      }
-      else
-      {
-        ExtensibilityElement e = (ExtensibilityElement)element;
-        valInfo.addError(
-          messagegenerator.getString(
-              _ERROR_INVALID_BINDING_OPERATION_ELEMENT,
-            QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
-      }
-
-    }
-    else if (
-      parents.get(0).getClass() == BindingInputImpl.class || parents.get(0).getClass() == BindingOutputImpl.class)
-    {
-      // validate the SOAP body
-      if (element.getClass() == SOAPBodyImpl.class)
-      {
-        validateBody(element, parents, valInfo);
-      }
-      // valiate the SOAP header
-      else if (element.getClass() == SOAPHeaderImpl.class)
-      {
-        validateHeader(element, parents, valInfo);
-      }
-      else
-      {
-        ExtensibilityElement e = (ExtensibilityElement)element;
-        valInfo.addError(
-          messagegenerator.getString(_ERROR_INVALID_HEADER_BODY_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
-      }
-    }
-    else if (parents.get(0).getClass() == BindingFaultImpl.class)
-    {
-      if (element.getClass() == SOAPFaultImpl.class)
-      {
-        validateFault(element, parents, valInfo);
-      }
-      else
-      {
-        ExtensibilityElement e = (ExtensibilityElement)element;
-        valInfo.addError(
-          messagegenerator.getString(_ERROR_INVALID_FAULT_ELEMENT, QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
-      }
-    }
-    // in this case there has been a SOAP element defined that is not defined for this point in the SOAP namespace
-    else
-    {
-      ExtensibilityElement e = (ExtensibilityElement)element;
-      valInfo.addError(
-        messagegenerator.getString(
-          _ERROR_INVALID_SOAP_ELEMENT_FOR_LOCATION,
-          QUOTE + e.getElementType().getLocalPart() + QUOTE), element);
-    }
-
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.validator.IWSDL11Validator#setResourceBundle(java.util.ResourceBundle)
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    if (messagegenerator == null)
-    {
-      messagegenerator = new MessageGenerator(rb);
-    }
-  }
-
-  /**
-   * Ensure that the SOAP address has a value specified for it's uri and that the binding has a SOAP
-   * Binding defined.
-   * 
-   * @param element The SOAP address element.
-   * @param parents A list of parents of the SOAP address element.
-   * @param valInfo The validation info for this validation.
-   */
-  protected void validateAddress(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    SOAPAddressImpl sa = (SOAPAddressImpl)element;
-
-    String uri = sa.getLocationURI();
-    if (uri == null || uri.equalsIgnoreCase(EMPTY_STRING))
-    {
-      valInfo.addError(messagegenerator.getString(_ERROR_NO_LOCATION_FOR_ADDRESS), sa);
-    }
-
-    Port port = (Port)parents.get(0);
-
-    Binding binding = port.getBinding();
-
-    if (!hasSoapBinding(binding))
-    {
-      valInfo.addError(
-        messagegenerator.getString(
-          _ERROR_NO_SOAPBINDING_FOR_ADDRESS,
-          QUOTE + binding.getQName().getLocalPart() + QUOTE,
-          QUOTE + port.getName() + QUOTE), sa);
-    }
-  }
-
-  /**
-   * Ensure the SOAP Binding defined is valid. A SOAP Binding must have a style of rpc or document
-   * or no style defined (defaults to document.)  A valid (non empty) URI must also be specified.
-   * 
-   * @param element The SOAP binding element.
-   * @param parents A list of parents of the SOAP binding element.
-   * @param valInfo The validation info for this validation.
-   */
-  protected void validateBinding(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    SOAPBindingImpl sb = (SOAPBindingImpl)element;
-
-    String style = sb.getStyle();
-    String uri = sb.getTransportURI();
-
-    if (style != null && !style.equalsIgnoreCase(RPC) && !style.equalsIgnoreCase(DOCUMENT))
-    {
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_INVALID_BINDING_STYLE, QUOTE + sb.getStyle() + QUOTE), element);
-    }
-    if (uri.equalsIgnoreCase(EMPTY_STRING))
-    {
-      valInfo.addError(messagegenerator.getString(_ERROR_INVALID_BINDING_URI), element);
-    }
-  }
-
-  /**
-   * An operation may have a style defined. If it is defined it must be rpc or document. It may also have a
-   * uri defined which must be non empty.  It may have a soapAction defined as well.
-   * 
-   * @param element The SOAP operation element.
-   * @param parents A list of parents of the SOAP operation element.
-   * @param valInfo The validation info for this validation.
-   */
-  protected void validateOperation(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    SOAPOperation so = (SOAPOperation)element;
-
-    String soapStyle = so.getStyle();
-
-    if (soapStyle != null && !soapStyle.equalsIgnoreCase(RPC) && !soapStyle.equalsIgnoreCase(DOCUMENT))
-    {
-      valInfo.addError(messagegenerator.getString(_ERROR_INVALID_OPERATION_STYLE), element);
-    }
-
-    Binding binding = (Binding)parents.get(1);
-    if (!hasSoapBinding(binding))
-    {
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_NO_SOAPBINDING_FOR_OPERATION, QUOTE + binding.getQName().getLocalPart() + QUOTE), so);
-    }
-  }
-
-  /**
-   * Validate the SOAP body. If encoded a body must have an encodingStyle. Also,
-   * if specified, all of the parts listed must be defined parts and in the encoding use case, the parts
-   * must have types defined.
-   * 
-   * @param element The SOAP body element.
-   * @param parents A list of parents of the SOAP body element.
-   * @param valInfo The validation info for this validation.
-   */
-  protected void validateBody(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    SOAPBodyImpl sb = (SOAPBodyImpl)element;
-
-    String use = sb.getUse();
-
-    // if the use = encoded then there must be encodingStyles.
-    if (use != null && use.equalsIgnoreCase(ENCODED))
-    {
-      List encodingStyles = sb.getEncodingStyles();
-      if (encodingStyles == null || encodingStyles.size() == 0)
-      {
-        valInfo.addError(messagegenerator.getString(_ERROR_INVALID_BODY_ENCODING_STYLE), sb);
-      }
-    }
-    else if (use != null && !use.equalsIgnoreCase(LITERAL))
-    {
-      valInfo.addError(messagegenerator.getString(_ERROR_INVALID_BODY_USE, QUOTE + use + QUOTE), sb);
-    }
-
-    //Check that the parts are valid
-    // parts must be defined in the message specified for the operation
-    List parts = sb.getParts();
-
-    if (parts != null)
-    {
-      Iterator partsIterator = parts.iterator();
-      while (partsIterator.hasNext())
-      {
-        String part = (String)partsIterator.next();
-        BindingOperation bo = (BindingOperation)parents.get(1);
-        Operation o = bo.getOperation();
-
-        if (o != null && !o.isUndefined())
-        {
-          // get the message from the input or output if it exists
-          Message mess = null;
-          if (parents.get(0).getClass() == BindingInputImpl.class)
-          {
-            Input input = o.getInput();
-
-            if (input != null)
-            {
-              mess = input.getMessage();
-            }
-          }
-          else if (parents.get(0).getClass() == BindingOutputImpl.class)
-          {
-            Output output = o.getOutput();
-
-            if (output != null)
-            {
-              mess = output.getMessage();
-            }
-          }
-
-          if (mess != null && !mess.isUndefined())
-          {
-            Part p = mess.getPart(part);
-
-            if (p != null)
-            {
-              // if the use is encoded the parts must all have a type defined
-              if (use != null && use.equalsIgnoreCase(ENCODED))
-              {
-                if (p.getTypeName() == null)
-                {
-                  // part error - part needs to be type and isn't	
-                  valInfo.addError(
-                    messagegenerator.getString(_ERROR_INVALID_BODY_PART_NOT_TYPE, QUOTE + part + QUOTE), sb);
-                }
-              }
-            }
-            else
-            {
-              //part error - part isn't defined	
-              valInfo.addError(
-                messagegenerator.getString(_ERROR_INVALID_BODY_PART_UNDEFINED, QUOTE + part + QUOTE), sb);
-            }
-          }
-          else
-          {
-            //part error - input isn't defined
-            valInfo.addError(
-              messagegenerator.getString(_ERROR_INVALID_BODY_PART_UNDEFINED, QUOTE + part + QUOTE), sb);
-          }
-        }
-        else
-        {
-          // parts error - operation isn't defined
-          valInfo.addError(
-            messagegenerator.getString(_ERROR_INVALID_BODY_PART_UNDEFINED, QUOTE + part + QUOTE), sb);
-        }
-      }
-    }
-
-    Binding binding = (Binding)parents.get(2);
-    if (!hasSoapBinding(binding))
-    {
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_NO_SOAPBINDING_FOR_BODY, QUOTE + binding.getQName().getLocalPart() + QUOTE), sb);
-    }
-  }
-
-  /**
-   * A SOAP header must have a message, part and use defined. If the use is encoded, must
-   * also have a non-empty encodingStyle and namespace defined.
-   * A SOAP header may have headerfaults defined as well.
-   * 
-   * @param element The SOAP header element.
-   * @param parents A list of parents of the SOAP header element.
-   * @param valInfo The validation info for this validation.
-   */
-  protected void validateHeader(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    SOAPHeaderImpl soapHeader = (SOAPHeaderImpl)element;
-
-    QName messageQName = soapHeader.getMessage();
-    Message message = ((Definition)parents.get(parents.size() - 1)).getMessage(messageQName);
-    if (message == null)
-    {
-      // message undefined
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_HEADER_MESSAGE_UNDEFINED, QUOTE + messageQName.getLocalPart() + QUOTE), soapHeader);
-    }
-    else
-    {
-      String partname = soapHeader.getPart();
-      Part part = message.getPart(partname);
-      if (part == null)
-      {
-        // part undefined
-        valInfo.addError(
-          messagegenerator.getString(
-            _ERROR_HEADER_PART_UNDEFINED,
-            QUOTE + partname + QUOTE,
-            QUOTE + messageQName.getLocalPart() + QUOTE), soapHeader);
-      }
-    }
-
-    String use = soapHeader.getUse();
-    if (use != null && !use.equalsIgnoreCase(LITERAL) && !use.equalsIgnoreCase(ENCODED))
-    {
-      // use undefined
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_HEADER_USE_UNDEFINED, QUOTE + use + QUOTE), soapHeader);
-    }
-
-    if (use.equalsIgnoreCase(ENCODED))
-    {
-      List encodingStyles = soapHeader.getEncodingStyles();
-      if (encodingStyles == null || encodingStyles.isEmpty())
-      {
-        // no encodingStyle defined
-        valInfo.addError(messagegenerator.getString(_ERROR_HEADER_ENCODINGSTYLE_UNDEFINED), soapHeader);
-      }
-
-      String namespace = soapHeader.getNamespaceURI();
-      if (namespace == null || namespace.equalsIgnoreCase(EMPTY_STRING))
-      {
-        // no namespace defined
-        valInfo.addError(messagegenerator.getString(_ERROR_HEADER_NAMESPACE_UNDEFINED), soapHeader);
-      }
-    }
-
-    List headerFaults = soapHeader.getSOAPHeaderFaults();
-    if (headerFaults != null)
-    {
-      Iterator iheaderFaults = headerFaults.iterator();
-      while (iheaderFaults.hasNext())
-      {
-        validateHeaderFault(iheaderFaults.next(), parents, valInfo);
-      }
-    }
-
-    Binding binding = (Binding)parents.get(2);
-    if (!hasSoapBinding(binding))
-    {
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_NO_SOAPBINDING_FOR_HEADER, QUOTE + binding.getQName().getLocalPart() + QUOTE), soapHeader);
-    }
-  }
-  
-  /**
-   * A SOAP headerfault must have a message, part and use defined. If the use is encoded, must
-   * also have a non-empty encodingStyle and namespace defined.
-   * 
-   * @param element The SOAP header fault element.
-   * @param parents A list of parents of the SOAP header fault element.
-   * @param valInfo The validation info for this validation.
-   */
-  protected void validateHeaderFault(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    SOAPHeaderFaultImpl soapHeaderFault = (SOAPHeaderFaultImpl)element;
-
-    QName messageQName = soapHeaderFault.getMessage();
-    Message message = ((Definition)parents.get(parents.size() - 1)).getMessage(messageQName);
-    if (message == null)
-    {
-      // message undefined
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_HEADERFAULT_MESSAGE_UNDEFINED, QUOTE + messageQName.getLocalPart() + QUOTE), soapHeaderFault);
-    }
-    else
-    {
-      String partname = soapHeaderFault.getPart();
-      Part part = message.getPart(partname);
-      if (part == null)
-      {
-        // part undefined
-        valInfo.addError(
-          messagegenerator.getString(
-            _ERROR_HEADERFAULT_PART_UNDEFINED,
-            QUOTE + partname + QUOTE,
-            QUOTE + messageQName.getLocalPart() + QUOTE), soapHeaderFault);
-      }
-    }
-
-    String use = soapHeaderFault.getUse();
-    if (use != null && !use.equalsIgnoreCase(LITERAL) && !use.equalsIgnoreCase(ENCODED))
-    {
-      // use undefined
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_HEADERFAULT_USE_UNDEFINED, QUOTE + use + QUOTE), soapHeaderFault);
-    }
-
-    if (use.equalsIgnoreCase(ENCODED))
-    {
-      List encodingStyles = soapHeaderFault.getEncodingStyles();
-      if (encodingStyles == null || encodingStyles.isEmpty())
-      {
-        // no encodingStyle defined
-        valInfo.addError(
-          messagegenerator.getString(_ERROR_HEADERFAULT_ENCODINGSTYLE_UNDEFINED), soapHeaderFault);
-      }
-
-      String namespace = soapHeaderFault.getNamespaceURI();
-      if (namespace == null || namespace.equalsIgnoreCase(EMPTY_STRING))
-      {
-        // no namespace defined
-        valInfo.addError(
-          messagegenerator.getString(_ERROR_HEADERFAULT_NAMESPACE_UNDEFINED), soapHeaderFault);
-      }
-    }
-  }
-
-  /**
-  * Validate the SOAP fault. A SOAP fault must have a name defined that corresponds with the name
-  * specified in the portType.  If encoded a fault must have an encodingStyle and a namespaceURI. 
-  * 
-  * @param element The SOAP fault element.
-   * @param parents A list of parents of the SOAP fault element.
-   * @param validationInfo The validation info for this validation.
-  */
-  protected void validateFault(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-    SOAPFaultImpl fault = (SOAPFaultImpl)element;
-
-    String name = fault.getName();
-
-    String parentName = ((BindingFault)parents.get(0)).getName();
-
-    if (!name.equals(parentName))
-    {
-      valInfo.addError(
-        messagegenerator.getString(_ERROR_INVALID_FAULT_NAME, QUOTE + name + QUOTE, QUOTE + parentName + QUOTE), fault);
-    }
-
-  }
-
-  /**
-   * Method hasSoapBinding. - helper Method
-   * Given a binding returns true if it has a SOAP binding defined.
-   * 
-   * @param binding - the SOAP binding to check
-   * @return true if a binding has a SOAP binding defined, false otherwise
-   */
-  protected boolean hasSoapBinding(Binding binding)
-  {
-    if (binding != null)
-    {
-      List extelems = binding.getExtensibilityElements();
-      if (extelems != null)
-      {
-        Iterator iextelems = extelems.iterator();
-        while (iextelems.hasNext())
-        {
-          if (iextelems.next().getClass() == SOAPBindingImpl.class)
-          {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java
deleted file mode 100644
index 329b111..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-/**
- * This interface is used to signify error levels that are the result of
- * XMLParseException. They conceptually correspond to org.w3c.dom.DOMError but
- * we use our own interface, since DOMError is not in Java 1.4, and its
- * package changes from Xerces 2.6.2 and Xerces 2.7.0.
- */
-
-public interface DOMError {
-	int SEVERITY_WARNING = 1;
-	int SEVERITY_ERROR = 2;
-	int SEVERITY_FATAL_ERROR = 3;
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java
deleted file mode 100644
index 2119778..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.wsdl.validation.internal.util.LazyURLInputStream;
-
-/**
- * Entity resolve to resolve file entities.
- */
-public class FileEntityResolver implements XMLEntityResolver
-{
-
-  /**
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resource) throws XNIException, IOException
-  {
-    String publicId = resource.getPublicId();
-    String systemId = resource.getExpandedSystemId();
-    String namespace = resource.getNamespace();
-    String url = null;
-    if(systemId != null)
-    {
-      url = systemId;
-    }
-    else if(publicId != null)
-    {
-      url = publicId;
-    }
-    else if(namespace != null)
-    {
-      url = namespace;
-    }
-    if(url != null)
-    {
-      InputStream is = new LazyURLInputStream(url);
-      return new XMLInputSource(publicId, resource.getExpandedSystemId(), resource.getExpandedSystemId(), is, null);
-    }
-    return null;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java
deleted file mode 100644
index 6902be3..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java
+++ /dev/null

@@ -1,656 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Vector;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * Generate a String representation of a schema for an inline schema. Will add imports for unresolved
- * namespaces.
- */
-public class InlineSchemaGenerator
-{
-  protected static final String SOAP_ENCODING_URI = "http://schemas.xmlsoap.org/soap/encoding/";
-  protected static final String FILE_PREFIX = "file:///";
-  protected static final String XMLNS = "xmlns";
-  protected static final String TARGETNAMESPACE = "targetNamespace";
-  protected static final String NAMESPACE = "namespace";
-  protected static final String IMPORT = "import";
-  protected static final String INCLUDE = "include";
-  protected static final String SCHEMA = "schema";
-  protected static final String SCHEMALOCATION = "schemaLocation";
-  protected static final String TYPE = "type";
-  protected static final String NAME = "name";
-  protected static final String[] ignoreNamespaces =
-    { Constants.NS_URI_XSD_1999, Constants.NS_URI_XSD_2000, Constants.NS_URI_XSD_2001 };
-
-  protected static InlineSchemaGenerator instance = null;
-
-  /**
-   * Constructor.
-   */
-  protected InlineSchemaGenerator()
-  {
-  }
-
-  /**
-   * Get the instance of the InlineSchemaGenerator.
-   * 
-   * @return The instance of the inline schema generator.
-   */
-  protected static InlineSchemaGenerator getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new InlineSchemaGenerator();
-    }
-    return instance;
-  }
-  
-  /**
-   * Create a string representation of a schema from the element provided.
-   * 
-   * @param element The root element of the schema.
-   * @param elements A list of the elements in the schema in order.
-   * @param filelocation The URI of the file that contains the schema.
-   * @param validImportNSs A set of namespaces for which it's valid to create import statements.
-   * @return A string representation of a schema.
-   */
-  public static String createXSDString(Element element, List elements, String filelocation, Set validImportNSs)
-  {
-	  return InlineSchemaGenerator.createXSDString(element, elements, filelocation, new Hashtable(), validImportNSs);
-  }
-  
-  /**
-  	* Creates a String representing the schema model with the root element of
-  	* extElem. Calls createXSDStringRecursively to take care of building the String
-  	* after it obtains the Element from the UnknownExtensibilityElement.
-  	* 
-  	* @param element The root element of the schema.
-  	* @param elements A list to contain the elements in the schema in order.
-  	* @param filelocation The location of the file the schema is located in.
-  	* @param parentNSs A hashtable of parent namespaces to used to resolve prefixes.
-  	* @param validImportNSs A set of namespaces for which it's valid to create import statements.
-  	* @return A string representation of the schema with the root element 'element'.
-  	*/
-  public static String createXSDString(Element element, List elements, String filelocation, Hashtable parentNSs, Set validImportNSs)
-  {
-	Set importNSs = new TreeSet(); 
-    importNSs.addAll(validImportNSs); 
-    importNSs.add(SOAP_ENCODING_URI); 
-
-    InlineSchemaGenerator schemaGenerator = InlineSchemaGenerator.getInstance();
-    Hashtable nsResolver = schemaGenerator.getNSResolver(element);
-    List reqns = schemaGenerator.getRequiredNamespaces(element);
-    Hashtable reqNSDecl = schemaGenerator.resolveNamespaces(reqns, nsResolver, parentNSs);
-    //Hashtable reqNSDecl = schemaGenerator.getRequiredNSDeclarations(reqns, nsResolver, parentNSs);
-    List importNS = schemaGenerator.getImportNamespaces(element);
-    reqns = schemaGenerator.removeImports(reqns, importNS);
-    reqns = schemaGenerator.removeLocalNamespaces(reqns, element);
-	reqns = schemaGenerator.restrictImports(reqns, validImportNSs);
-    return schemaGenerator.createXSDStringRecursively(element, elements, reqns, reqNSDecl, filelocation);
-  }
-  /**
-   * Returns true if the SOAP encoding namespace is required but not imported.
-   * 
-   * @param element The root element of the schema.
-   * @param filelocation The location of the file containing the schema.
-   * @param parentNSs A hashtable of the parent namespaces.
-   * @return True if the soap encoding namespace is required but not imported, false otherwise.
-   */
-  public static boolean soapEncodingRequiredNotImported(Element element, String filelocation, Hashtable parentNSs)
-  {
-    InlineSchemaGenerator schemaGenerator = InlineSchemaGenerator.getInstance();
-    Hashtable nsResolver = schemaGenerator.getNSResolver(element);
-    List reqns = null;
-
-    reqns = schemaGenerator.getRequiredNamespaces(element);
-    schemaGenerator.resolveNamespaces(reqns, nsResolver, parentNSs);
-    //schemaGenerator.resolveUndeclaredNamespaces(reqns, parentNSs);
-    List importNS = schemaGenerator.getImportNamespaces(element);
-    reqns = schemaGenerator.removeImports(reqns, importNS);
-    reqns = schemaGenerator.removeLocalNamespaces(reqns, element);
-    return schemaGenerator.checkSOAPEncodingRequired(reqns);
-  }
-  /**
-   * Resolve the undeclared namespaces.
-   * 
-   * @param unresolvedNSs A list of unresolved namespaces.
-   * @param nsResolver The namespace resolver to use.
-   * @return A hashtable of prefixes and namespaces.
-   */
-//  protected Hashtable resolveUndeclaredNamespaces(List unresolvedNSs, Hashtable nsResolver)
-//  {
-//    Hashtable namespaces = new Hashtable();
-//    if (unresolvedNSs != null && !unresolvedNSs.isEmpty() && nsResolver != null)
-//    {
-//      for (int i = unresolvedNSs.size() - 1; i >= 0; i--)
-//      {
-//        String ns = (String)unresolvedNSs.get(i);
-//        if (ns.equals(""))
-//        {
-//          ns = XMLNS;
-//        }
-//        else
-//        {
-//          ns = XMLNS + ":" + ns;
-//        }
-//        if (nsResolver.containsKey(ns))
-//        {
-//          //namespaces.remove(i);
-//          //namespaces.add(i, nsResolver.get(ns));
-//          namespaces.put(ns, nsResolver.get(ns));
-//          unresolvedNSs.remove(i);
-//          unresolvedNSs.add(i, nsResolver.get(ns));
-//        }
-//      }
-//    }
-//    return namespaces;
-//  }
-
-  /**
-   * This recursive method creates the schema String from the root Element.
-   * 
-   * @param elem The root element of the schema.
-   * @param elements A list to be created of the elements in the schema in order.
-   * @param requiredNamespaces A list of required namespaces.
-   * @param reqNSDecl A hashtable of required namespace declarations.
-   * @param filelocation The uri of the file that contains this schema.
-   * @return A string representation of this schema.
-   */
-  protected String createXSDStringRecursively(
-    Element elem,
-    List elements,
-    List requiredNamespaces,
-    Hashtable reqNSDecl,
-    String filelocation)
-  {
-    if (elem == null)
-      return ""; // just in case
-
-    elements.add(elem);
-
-    StringBuffer xsdString = new StringBuffer();
-    String elementName = elem.getTagName();
-    xsdString.append("<").append(elementName);
-
-    boolean foundSchemaLocation = false; // flag if schemalocation is defined
-    String namespace = ""; // the namespace if we're checking an import or include
-    String namePrefix = ""; // the xmlns prefix used for the elements
-    // Get all of the attributes for this element and append them to the xsdString
-    NamedNodeMap atts = elem.getAttributes();
-    for (int i = 0; i < atts.getLength(); i++)
-    {
-      Node n = atts.item(i);
-      xsdString.append(" ").append(n.getNodeName()).append("=\"");
-      String nodeName = n.getNodeName();
-      if (nodeName.equalsIgnoreCase(SCHEMALOCATION) && filelocation != null)
-      {
-        foundSchemaLocation = true;
-        String relativePath = n.getNodeValue();
-        xsdString.append(relativePath).append("\"");   
-      }
-      else
-      {
-        String nodeValue = n.getNodeValue();
-        if (nodeName.equalsIgnoreCase(NAMESPACE))
-        {
-          namespace = nodeValue;
-        }
-        // get the name prefix for this schema to use in generating import statements
-        else if (nodeName.indexOf(XMLNS) != -1)
-        {
-
-          if (nodeValue.equalsIgnoreCase(elem.getNamespaceURI()))
-          {
-            namePrefix = nodeName;
-            if (namePrefix.equalsIgnoreCase(XMLNS))
-            {
-              namePrefix = "";
-            }
-            else
-            {
-              namePrefix = namePrefix.substring(6) + ":";
-            }
-          }
-        }
-        // Replace old schema namespaces with the new schema namespace.
-        if(nodeValue.equals(Constants.NS_URI_XSD_1999) || nodeValue.equals(Constants.NS_URI_XSD_2000))
-         {
-          nodeValue = Constants.NS_URI_XSD_2001;
-        }
-        xsdString.append(nodeValue).append("\"");
-      }
-    }
-    if (elementName.equalsIgnoreCase("import") && !foundSchemaLocation)
-    {
-      xsdString.append(" ").append(SCHEMALOCATION).append("=\"").append(namespace).append("\"");
-    }
-    // add in any required NS declarations from parent elements
-    if (reqNSDecl != null)
-    {
-      Enumeration keys = reqNSDecl.keys();
-      while (keys.hasMoreElements())
-      {
-        String key = (String)keys.nextElement();
-        String declNS = (String)reqNSDecl.get(key);
-        if(declNS.equals(Constants.NS_URI_XSD_1999) || declNS.equals(Constants.NS_URI_XSD_2000))
-         {
-          declNS = Constants.NS_URI_XSD_2001;
-        }
-        xsdString.append(" ").append(key).append("=\"").append(declNS).append("\"");
-      }
-
-    }
-    xsdString.append(">");
-    if (requiredNamespaces != null)
-    {
-      Iterator iRequiredNamespaces = requiredNamespaces.iterator();
-      while (iRequiredNamespaces.hasNext())
-      {
-        String ns = (String)iRequiredNamespaces.next();
-
-        xsdString
-          .append("<")
-          .append(namePrefix)
-          .append(IMPORT)
-          .append(" ")
-          .append(NAMESPACE)
-          .append("=\"")
-          .append(ns)
-          .append("\" ")
-          .append(SCHEMALOCATION)
-          .append("=\"")
-          .append(ns)
-          .append("\"/>");
-      }
-
-    }
-    xsdString.append("\n");
-
-    // call the method recursively for each child element
-    NodeList childNodes = elem.getChildNodes();
-
-    for (int i = 0; i < childNodes.getLength() || i < 5; i++)
-    {
-      Node n = childNodes.item(i);
-      // we only want nodes that are Elements
-      if (n instanceof Element)
-      {
-        Element child = (Element)n;
-        xsdString.append(createXSDStringRecursively(child, elements, null, null, filelocation));
-      }
-    }
-
-    xsdString.append("</").append(elem.getTagName()).append(">");
-
-    return xsdString.toString();
-
-  }
-  /**
-   * Get a list of all the namespaces that are used for elements or types in the schema.
-   * These are the required namespaces in order to ensure that all the elments are valid.
-   * 
-   * @param elem The element to check for required namespaces.
-   * @return A list of required namespaces for the element and all its children.
-   */
-  protected List getRequiredNamespaces(Element elem)
-  {
-    List namespace = new Vector();
-
-    // call the method recursively for each child element
-    // register all the child types first
-    NodeList childNodes = elem.getChildNodes();
-    int numChildren = childNodes.getLength();
-    // TODO: why is there a < 5 condition?
-    for (int i = 0; i < numChildren /*|| i < 5*/; i++)
-    {
-      Node n = childNodes.item(i);
-      // we only want nodes that are Elements
-      if (n instanceof Element)
-      {
-        Element child = (Element)n;
-        List childns = getRequiredNamespaces(child);
-        for (int j = childns.size() - 1; j >= 0; j--)
-        {
-          String ns = (String)childns.get(j);
-          
-          if (!namespace.contains(ns))
-          {
-            namespace.add(ns);
-          }
-        }
-      }
-    }
-    // Add the namespace of the current element
-    String elemNS = elem.getPrefix();
-    // if there is no namespace prefix set it to the empty prefix.
-    if(elemNS == null)
-    {
-      elemNS = "";
-    }
-    if (!namespace.contains(elemNS))
-     {
-      namespace.add(elemNS);
-    }
-    // now add all of the current element's namespaces
-    // don't include import and schema elements
-    String localname = elem.getLocalName();
-    if (!localname.equals(IMPORT) && !localname.equals(INCLUDE) && !localname.equals(SCHEMA))
-    {
-      NamedNodeMap atts = elem.getAttributes();
-      for (int i = 0; i < atts.getLength(); i++)
-      {
-        Node n = atts.item(i);
-
-        String nodeName = n.getNodeName();
-        // removed restriction that we're only looking at types
-        //		if (nodeName.equalsIgnoreCase(TYPE))
-        //		{
-        // don't take namespace info from attributes defining namespaces.
-        // that includes xmlns, targetNamespace
-        // don't take namespace info from name attributes
-        if (nodeName.indexOf(XMLNS) != -1 || nodeName.equals(TARGETNAMESPACE) || nodeName.equals(NAME))
-        {
-          continue;
-        }
-        String nodeValue = n.getNodeValue();
-        
-        
-        int colonIndex = nodeValue.indexOf(":");
-        // Don't take namespace info from attributes with the default namespace, that is attributes
-        // that are not prefixed. (colonIndex == -1)
-        // If the colonIndex is followed by a / then it is a URI and not
-        // namespace qualified.
-		if (colonIndex == -1 || (colonIndex + 1 < nodeValue.length() && nodeValue.charAt(colonIndex + 1) == '/'))
-        {
-          continue;
-        }
-        // here we have found a colon delimiter so we need the namespace defined here
-        else
-        {
-          nodeValue = nodeValue.substring(0, colonIndex);
-        }
-        if (!namespace.contains(nodeValue))
-        {
-
-          namespace.add(nodeValue);
-        }
-        //		}
-      }
-    }
-
-    return namespace;
-
-  }
-
-  /**
-   * Get a list of all the namespaces that have an import statement.
-   * 
-   * @param elem The root element of the schema.
-   * @return A list of all the namespaces that are imported.
-   */
-  protected List getImportNamespaces(Element elem)
-  {
-    List namespace = new Vector();
-
-    // call the method recursively for each child element
-    // register all the child types first
-    NodeList childNodes = elem.getChildNodes();
-
-    for (int i = 0; i < childNodes.getLength() || i < 5; i++)
-    {
-      Node n = childNodes.item(i);
-      // we only want nodes that are Elements
-      if (n instanceof Element)
-      {
-        Element child = (Element)n;
-        List childns = getImportNamespaces(child);
-        for (int j = childns.size() - 1; j >= 0; j--)
-        {
-          String ns = (String)childns.get(j);
-          if (!namespace.contains(ns))
-          {
-            namespace.add(ns);
-          }
-        }
-      }
-    }
-    // if this is an import element get the namespace and add it to the list
-    if (elem.getLocalName().equalsIgnoreCase(IMPORT))
-    {
-      NamedNodeMap atts = elem.getAttributes();
-      for (int i = 0; i < atts.getLength(); i++)
-      {
-        Node n = atts.item(i);
-
-        String nodeName = n.getNodeName();
-        if (nodeName.equalsIgnoreCase(NAMESPACE))
-        {
-          String nodeValue = n.getNodeValue();
-          if (!namespace.contains(nodeValue))
-          {
-
-            namespace.add(nodeValue);
-          }
-        }
-      }
-    }
-
-    return namespace;
-
-  }
-
-  /**
-   * Return a Hashtable with namespace prefixes as keys from the given element.
-   * 
-   * @param elem The root element of the schema.
-   * @return A hashtable with namespace prefixes mapped to namespaces.
-   */
-  protected Hashtable getNSResolver(Element elem)
-  {
-    Hashtable nsResolver = new Hashtable();
-
-    NamedNodeMap atts = elem.getAttributes();
-    for (int i = 0; i < atts.getLength(); i++)
-    {
-      Node n = atts.item(i);
-
-      String nodeName = n.getNodeName();
-      if (nodeName.indexOf(XMLNS) != -1)
-      {
-        String nodeValue = n.getNodeValue();
-        String namePrefix = nodeName;
-
-        if (namePrefix.equalsIgnoreCase(XMLNS))
-        {
-          namePrefix = "";
-        }
-        else
-        {
-          namePrefix = namePrefix.substring(6);
-        }
-        nsResolver.put(namePrefix, nodeValue);
-
-      }
-    }
-    return nsResolver;
-
-  }
-
-  /**
-   * Resolve the namespaces in the given namespaces list with the two namespace
-   * resolver hashtables provided. Return a list of all the namespace that need
-   * to be declared.
-   * First resolve against the local namespaces with nsResolver.
-   * Next resolve against the parent namespace with parentNSResolver.
-   * A side affect of this method is the namespaces list is left with only those 
-   * namespaces that are resolved and the resolved entities are placed in the 
-   * list instead of the original entries.
-   * For ex. If you provide a list such as {xsd, intf} and only xsd can be resolved
-   * you will end up with the list {http://www.w3.org/2001/XMLSchema}
-   * 
-   * @param namespaces The list of namespaces to resolve.
-   * @param nsResolver The hashtable to be used as the local resolver.
-   * @param parentNSResolver The hashtable to be used as the parent namespace resolver.
-   * @return A Hashtable of namespaces that must be declared.
-   */
-  protected Hashtable resolveNamespaces(List namespaces, Hashtable nsResolver, Hashtable parentNSResolver)
-  {
-  	Hashtable reqNSDecl = new Hashtable();
-    if (namespaces != null && !namespaces.isEmpty() && nsResolver != null)
-    {
-      for (int i = namespaces.size() - 1; i >= 0; i--)
-      {
-        String ns = (String)namespaces.get(i);
-        // Remove the namespace from the list.
-        namespaces.remove(i);
-        // First try to resolve against the local namespace resolver.
-        if (nsResolver.containsKey(ns))
-        {
-          Object resolvedNS = nsResolver.get(ns);
-          // Only add the namespace if it's not already in the list.
-          if(!namespaces.contains(resolvedNS))
-          {
-            namespaces.add(i, nsResolver.get(ns));
-          }
-        }
-        // Next try to resolve against the parent namespace resolver.
-        else
-        {
-        	if (ns.equals(""))
-            {
-              ns = XMLNS;
-            }
-            else
-            {
-              ns = XMLNS + ":" + ns;
-            }
-            if (parentNSResolver.containsKey(ns))
-            {
-              Object resolvedNS = parentNSResolver.get(ns);
-              // Only add the namespace if it's not already in the list.
-              if(!namespaces.contains(resolvedNS))
-              {
-                namespaces.add(i, resolvedNS);
-              }
-              // Still need to declare the namespace though.
-              reqNSDecl.put(ns, resolvedNS);
-            }
-        }
-
-      }
-    }
-    return reqNSDecl;
-  }
-
-  /**
-   * Remove any namespace from the namespaces list if it is in the import list.
-   * 
-   * @param namespaces The namespaces list.
-   * @param importedNamespaces A list of imported namespaces.
-   * @return The list of namespaces without the imported namespaces.
-   */
-  protected List removeImports(List namespaces, List importedNamespaces)
-  {
-    if (namespaces != null && importedNamespaces != null && !importedNamespaces.isEmpty())
-    {
-      Iterator iImportedNS = importedNamespaces.iterator();
-      while (iImportedNS.hasNext())
-      {
-        String iNS = (String)iImportedNS.next();
-
-        namespaces.remove(iNS);
-      }
-    }
-    return namespaces;
-  }
-
-  /**
-   * Remove the local namespace for the schema and the namespaces listed in the ignoreNamespaces
-   * list from the namespaces list provided.
-   * 
-   * @param namespaces The list of local namespaces.
-   * @param elem The root element of the schema.
-   * @return The list of namespaces with the local namespaces removed.
-   */
-  protected List removeLocalNamespaces(List namespaces, Element elem)
-  {
-    if (namespaces != null && elem != null)
-    {
-      String ns = elem.getAttribute(TARGETNAMESPACE);
-      namespaces.remove(ns);
-
-      for (int i = ignoreNamespaces.length - 1; i >= 0; i--)
-      {
-        // keep removing the namespace until it is not in the list
-        if (namespaces.remove(ignoreNamespaces[i]))
-        {
-          i++;
-        }
-      }
-    }
-    return namespaces;
-  }
-  
-  /** 
-   * Remove all the namespaces in the namespaces list that aren't contained in the 
-   * validImportNSs set. 
-   * 
-   * @param namespaces A list of namespaces. 
-   * @param validImportNSs A set of valid namespaces. 
-   * @return A list of namespaces that does not contain any members which aren't in the validImportNSs set. 
-   */ 
-  protected List restrictImports(List namespaces, Set validImportNSs) 
-  { 
-        Iterator nsIter = namespaces.iterator(); 
-        while(nsIter.hasNext()) 
-        { 
-          String ns = (String)nsIter.next(); 
-          if(!validImportNSs.contains(ns)) 
-          { 
-                namespaces.remove(ns); 
-				nsIter = namespaces.iterator();
-          } 
-        } 
-        return namespaces; 
-  } 
-
-  /**
-   * Returns true if the SOAP encoding namespace is in the list of required namespaces,
-   * false otherwise.
-   * 
-   * @param reqns The list of namespaces to check for the SOAP encoding namespace.
-   * @return True if the SOAP encoding namespaces is in the list, false otherwise.
-   */
-  protected boolean checkSOAPEncodingRequired(List reqns)
-  {
-    if (reqns.contains(SOAP_ENCODING_URI))
-    {
-      return true;
-    }
-    return false;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java
deleted file mode 100644
index 5b58f21..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java
+++ /dev/null

@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.wst.wsdl.validation.internal.util.ErrorMessage;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11ValidationInfo;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * Plugin validator for the WSDL Validation framework. Validates inline schema found in a WSDL document.
- */
-public class InlineSchemaValidator implements IWSDL11Validator
-{
-  private final String _WARN_OLD_SCHEMA_NAMESPACE = "_WARN_OLD_SCHEMA_NAMESPACE";
-  private final String _WARN_SOAPENC_IMPORTED_SCHEMA = "_WARN_SOAPENC_IMPORTED_SCHEMA";
-  private final String EMPTY_STRING = "";
-  private final String QUOTE = "'";
-  MessageGenerator messagegenerator = null;
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.wsdl11.WSDL11ValidationInfo)
-   */
-  public void validate(Object element, List parents, IWSDL11ValidationInfo valInfo)
-  {
-  	List elements = new ArrayList();
-    UnknownExtensibilityElement elem = (UnknownExtensibilityElement) element;
-    Definition wsdlDefinition = (Definition) parents.get(parents.size() - 1);
-    String baseLocation = wsdlDefinition.getDocumentBaseURI();
-    // Add in the namespaces defined in the doc already that aren't defined locally in this schema.
-    // There is no need to check for namespaces other then in the defintions and types elements as
-    // inline schema can not have any other parents and must have there two parents.
-    // First take care of the definitions element
-    
-    // create the inline schema string
-	Element w3celement = elem.getElement();
-	Hashtable parentnamespaces = getNamespaceDeclarationsFromParents(wsdlDefinition,w3celement);
-	String targetNamespace = w3celement.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-	// if the targetNamespace hasn't been defined for the schema use the 
-	// targetNamespace of the definitions element
-	if(targetNamespace == null || targetNamespace.equals(EMPTY_STRING))
-	 {
-	  targetNamespace = wsdlDefinition.getTargetNamespace();
-	  w3celement.setAttribute(Constants.ATTR_TARGET_NAMESPACE,targetNamespace);
-	}
-	
-    // If the namespace given is one of the old schema namespaces produce a warning.
-	String namespace = w3celement.getNamespaceURI();
-	if(namespace.equals(Constants.NS_URI_XSD_1999) || namespace.equals(Constants.NS_URI_XSD_2000))
-	 {
-	  valInfo.addWarning(
-	      messagegenerator.getString(_WARN_OLD_SCHEMA_NAMESPACE, QUOTE + Constants.NS_URI_XSD_2001 + QUOTE), element);
-	}
-	
-    // now create and call the validator for the inline schema
-    XSDValidator schemav = new XSDValidator();
-    
-    //String fileLocation = new URL(validatormanager.getFilename()).getPath();
-    InlineXSDResolver inlineEntityResolver =
-      getEntityResolver(wsdlDefinition, (Types) parents.get(0), baseLocation, targetNamespace);
-    //	add in the external XSD Catalog to resolve schemas offline
-    XMLEntityResolverChain entityResolverChain = new XMLEntityResolverChain();
-    entityResolverChain.addEntityResolver(inlineEntityResolver);
-    entityResolverChain.addEntityResolver((XMLEntityResolver)valInfo.getURIResolver());
-    //entityResolverChain.addEntityResolver(XMLCatalogResolver.getInstance());
-    entityResolverChain.addEntityResolver(new FileEntityResolver());
-	
-    //	 Create the string representation of the inline schema. 
-    String xsd = InlineSchemaGenerator.createXSDString(w3celement, elements, baseLocation, parentnamespaces, inlineEntityResolver.getInlineSchemaNSs()); 
-
-	
-    schemav.validateInlineSchema(xsd, targetNamespace, baseLocation, entityResolverChain, inlineEntityResolver);
-    
-//	check if the SOAP Encoding namespace is required but not imported
-		 if (InlineSchemaGenerator.soapEncodingRequiredNotImported(elem.getElement(), baseLocation, parentnamespaces))
-		 {
-		   valInfo.addWarning(messagegenerator.getString(_WARN_SOAPENC_IMPORTED_SCHEMA), element);
-		 }
-
-    // If the schema isn't valid add the error messages produced to valinfo.
-    // Don't add the errors if they are located on another inline schema. These
-	// will be reported when the other schema is validated.
-		 
-    if (!schemav.isValid())
-    {
-      Iterator errors = schemav.getErrors().iterator();
-      while (errors.hasNext())
-      {
-        ErrorMessage err = (ErrorMessage) errors.next();
-        String uri = err.getURI();
-        int line = err.getErrorLine();
-        String errmess = err.getErrorMessage();
-        errmess = replaceNamespace(errmess, namespace);
-        if(line > 0)
-        {
-          if(uri == null || uri.equals(valInfo.getFileURI()))
-          {
-			valInfo.addError(errmess, getObjectAtLine(line - 1, elements));
-          }
-		  else if(!inlineEntityResolver.isInlineSchema(uri) && !uri.equals(valInfo.getFileURI() + InlineXSDResolver.INLINE_SCHEMA_ID))
-          {
-            valInfo.addError(errmess, line, err.getErrorColumn(), uri);
-          }
-        }
-		else if(uri != null && !inlineEntityResolver.isInlineSchema(uri) && !uri.equals(valInfo.getFileURI() + InlineXSDResolver.INLINE_SCHEMA_ID))
-        {
-	      valInfo.addError(errmess, 0,0, uri);
-        }
-      }
-    }
-    // if the schema is valid, assign the model to the validatormanager
-    else
-    {
-      XSModel xsModel = schemav.getXSModel();
-      valInfo.addSchema(xsModel);
-    }
-  }
-
-  /**
-   * Get an entity resolver that will resolve inline schemas.  Every inline schema is preregistered with
-   * the resolver.
-   * 
-   * @param wsdlDefinition The WSDL definitions element.
-   * @param types The types element.
-   * @param referenceLocation The location of the file that contains this schema.
-   * @param targetNamespace The targetNamespace of the schema.
-   * @return An entity resolver that can resolve inline schemas.
-   */
-  protected InlineXSDResolver getEntityResolver(Definition wsdlDefinition, Types types, String referenceLocation, String targetNamespace)
-  {
-    InlineXSDResolver entityResolver = new InlineXSDResolver();
-//    entityResolver.setReferenceLocation(referenceLocation);
-    List schemas = types.getExtensibilityElements();
-    if (schemas != null)
-    {
-      Iterator iSchemas = schemas.iterator();
-	  Set namespaces = new TreeSet(); 
-      while (iSchemas.hasNext()) 
-      { 
-        UnknownExtensibilityElement extElem = (UnknownExtensibilityElement) iSchemas.next(); 
-        String thisNamespace = extElem.getElement().getAttribute(Constants.ATTR_TARGET_NAMESPACE); 
-        if(thisNamespace != null) 
-        { 
-                namespaces.add(thisNamespace); 
-        } 
-      } 
-      iSchemas = schemas.iterator(); 
-
-      while (iSchemas.hasNext())
-      {
-        UnknownExtensibilityElement extElem = (UnknownExtensibilityElement) iSchemas.next();
-        String thisNamespace = extElem.getElement().getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-        if (thisNamespace != null && !thisNamespace.equalsIgnoreCase(targetNamespace))
-        {
-        	
-        	Element element = extElem.getElement();
-			
-//			create the inline schema string
-			 //Element w3celement = elem.getElement();
-			 Hashtable parentnamespaces = getNamespaceDeclarationsFromParents(wsdlDefinition,element);
-			 String xsd = InlineSchemaGenerator.createXSDString(element, new ArrayList(), referenceLocation, parentnamespaces, namespaces);
-        	//addNamespaceDeclarationsFromParents(wsdlDefinition,element);
-          entityResolver.add(thisNamespace, xsd);
-        }
-
-      }
-    }
-    return entityResolver;
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.validator.IWSDL11Validator#setResourceBundle(java.util.ResourceBundle)
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-  	messagegenerator = new MessageGenerator(rb);
-  }
-  
-  public void setMessageGenerator(MessageGenerator messgen)
-  {
-    messagegenerator = messgen;
-  }
-
-  /**
-   * Get the namespace declarations as in the form 
-   * xmlns="somenamespace"
-   * from the definitions and types elements and add them to the schema element so the schema 
-   * validator will have access to them.
-   * 
-   * @param wsdlDefinition The WSDL definitions element.
-   * @param element The types element.
-   * @return A hashtable with the namespace elements from the elements provided.
-   */
-  protected Hashtable getNamespaceDeclarationsFromParents(Definition wsdlDefinition, Element element)
-  {
-  	Hashtable nss = new Hashtable();
-    Iterator nameSpaces = wsdlDefinition.getNamespaces().keySet().iterator();
-
-    String XMLNS = Constants.ATTR_XMLNS;
-    
-    String schemaLocation = "";
-    while (nameSpaces.hasNext())
-    {
-      String nsprefix = XMLNS;
-      String ns = (String) nameSpaces.next();
-      if (!ns.equalsIgnoreCase(""))
-      {
-        nsprefix += ":";
-      }
-      if (!element.hasAttribute(nsprefix + ns))
-      {
-      	nss.put(nsprefix + ns, wsdlDefinition.getNamespace(ns));
-//        element.setAttribute(nsprefix + ns, wsdlDefinition.getNamespace(ns));
-      }
-
-    }
-    // Next handle the parent types element
-    NamedNodeMap atts = element.getParentNode().getAttributes();
-    int attslength = atts.getLength();
-    for (int i = 0; i < attslength; i++)
-    {
-      Node tempnode = atts.item(i);
-      String nodename = tempnode.getNodeName();
-      // if this is a namespace attribute
-      if (nodename.indexOf(XMLNS) != -1)
-      {
-		nss.put(nodename,  tempnode.getNodeValue());
-        //element.setAttribute(nodename, tempnode.getNodeValue());
-      }
-    }
-    return nss;
-  }
-  
-  /**
-   * Given a line number for the schema returns the element found on that line. 
-   * Useful for obtaining elements from schema Strings.
-   * 
-   * @param line The line number for the schema.
-   * @param elements The list of elements to check.
-   * @return The object located at the line or at line 0 if the line is invalid.
-   */
-   protected Object getObjectAtLine(int line, List elements)
-   {
-   	if(line < 0 || line >= elements.size())
-   	{
-   	  line = 0;
-   	}
-	return elements.get(line);
-   }
-   
-  /**
-   * Replace any instance of the 2001 schema namespace in the given message with
-   * the given namespace.
-   * 
-   * @param message The message to replace the namespace in.
-   * @param namespace The namespace used for replacement.
-   * @return The message with the 2001 schema namespace replaced by the given namespace.
-   */
-  private String replaceNamespace(String message, String namespace)
-   {
-     String xsd2001 = Constants.NS_URI_XSD_2001;
-     int start = message.indexOf(xsd2001);
-     int end = start + xsd2001.length();
-     if(start < 0)
-     {
-       return message;
-     }
-     String startString = message.substring(0,start);
-     String endString = message.substring(end,message.length());
-     return startString + namespace + endString;
-   }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.java
deleted file mode 100644
index 5f87b39..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-/**
- * An XMLEntityResolver that allows inline schemas to resolve each other through imports.
- */
-public class InlineXSDResolver implements XMLEntityResolver
-{
-  public static final String INLINE_SCHEMA_ID = "#inlineschema";
-  protected final String FILE_PREFIX = "file:";
-  protected final String XMLNS = "xmlns";
-  protected Hashtable entities = new Hashtable();
-//  protected String refLocation = null;
-  protected XMLEntityResolver externalResolver = null;
-  protected XMLInputSource referringSchemaInputSource = null;
-  protected String referringSchemaNamespace = null;
-  
-  /**
-   * Constuctor.
-   */
-  public InlineXSDResolver()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier)
-		 throws XNIException, IOException {
-	String systemId = resourceIdentifier.getExpandedSystemId();	 
-	String publicId = resourceIdentifier.getPublicId();	
-	String namespace = resourceIdentifier.getNamespace();
-	XMLInputSource is = null;
-	Reader reader = null;
-	String schema = null;
-	if (systemId == null)
-	{
-	  if(publicId == null)
-	  {
-	  	if(namespace == null)
-	  	{	
-	      return null;
-	  	}
-	  	else
-	  	{
-	  		systemId = namespace;
-	  	}
-	  }
-	  else
-	  {	
-	    systemId = publicId;
-	  }
-	}
-	  
-	if(referringSchemaNamespace != null && referringSchemaNamespace.equals(systemId))
-	{
-		if(referringSchemaInputSource!=null)
-		{
-			return referringSchemaInputSource;
-		}
-	}
-	else if ((schema = (String) entities.get(systemId)) != null && !schema.equals(""))
-	{
-		is = new XMLInputSource(publicId, referringSchemaInputSource.getSystemId() + INLINE_SCHEMA_ID, null, new StringReader(schema),null);
-	}
-	
-    //if(is == null)
-    //{
-    //	throw new IOException();
-    //}
-	return is;
-  }
-
-  /**
-   * Add an inline schema.
-   * 
-   * @param targetNamespace - the target namespace of the schema
-   * @param schema - a string representation of the schema
-   */
-  public void add(String targetNamespace, String schema)
-  {
-    entities.put(targetNamespace, schema);
-  }
-  
-  /**
-   * Add the referring inline schema. 
-   * 
-   * @param inputSource - a representation of the inline schema
-   * @param namespace - the namespace of the inline schema
-   */
-  public void addReferringSchema(XMLInputSource inputSource, String namespace)
-  {
-    referringSchemaInputSource = inputSource;
-    referringSchemaNamespace = namespace;
-  }
-  
-  /**
-   * Return true if the namespace corresponds to an inline schema, false otherwise.
-   * 
-   * @param namespace The namespace of the schema.
-   * @return True if the namespace corresponds to an inline schema, false otherwise.
-   */
-  public boolean isInlineSchema(String namespace)
-  {
-    return entities.containsKey(namespace);
-  }
-  
-  /** 
-   * Get the set of the inline schema namespaces. 
-   * 
-   * @return The set of the inline schema namespaces. 
-   */ 
-  public Set getInlineSchemaNSs() 
-  { 
-        return entities.keySet(); 
-  } 
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/SchemaAttributeTable.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/SchemaAttributeTable.java
deleted file mode 100644
index fe43e12..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/SchemaAttributeTable.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import org.apache.xerces.impl.xs.SchemaSymbols;
-import org.apache.xerces.util.SymbolTable;
-/**
- * This class will allow the calling code to see if the attribute is defined in schema.
- * This serves as schema for schema.
- */
-public class SchemaAttributeTable extends SymbolTable
-{
-
-  /**
-   * Constructor.
-   */
-  public SchemaAttributeTable()
-  {
-    // add all of the sybols to the table. SchemaSymbols probably should have
-    // a SymbolTable for these but it doesn't
-
-    super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDANY);
-    super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDLOCAL);
-    super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDOTHER);
-    super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDTARGETNS);
-    super.addSymbol(SchemaSymbols.ATTVAL_POUNDALL);
-    super.addSymbol(SchemaSymbols.ATTVAL_FALSE_0);
-    super.addSymbol(SchemaSymbols.ATTVAL_TRUE_1);
-    super.addSymbol(SchemaSymbols.ATTVAL_ANYSIMPLETYPE);
-    super.addSymbol(SchemaSymbols.ATTVAL_ANYTYPE);
-    super.addSymbol(SchemaSymbols.ATTVAL_ANYURI);
-    super.addSymbol(SchemaSymbols.ATTVAL_BASE64BINARY);
-    super.addSymbol(SchemaSymbols.ATTVAL_BOOLEAN);
-    super.addSymbol(SchemaSymbols.ATTVAL_BYTE);
-    super.addSymbol(SchemaSymbols.ATTVAL_COLLAPSE);
-    super.addSymbol(SchemaSymbols.ATTVAL_DATE);
-    super.addSymbol(SchemaSymbols.ATTVAL_DATETIME);
-    super.addSymbol(SchemaSymbols.ATTVAL_DAY);
-    super.addSymbol(SchemaSymbols.ATTVAL_DECIMAL);
-    super.addSymbol(SchemaSymbols.ATTVAL_DOUBLE);
-    super.addSymbol(SchemaSymbols.ATTVAL_DURATION);
-    super.addSymbol(SchemaSymbols.ATTVAL_ENTITY);
-    super.addSymbol(SchemaSymbols.ATTVAL_ENTITIES);
-    super.addSymbol(SchemaSymbols.ATTVAL_EXTENSION);
-    super.addSymbol(SchemaSymbols.ATTVAL_FALSE);
-    super.addSymbol(SchemaSymbols.ATTVAL_FLOAT);
-    super.addSymbol(SchemaSymbols.ATTVAL_HEXBINARY);
-    super.addSymbol(SchemaSymbols.ATTVAL_ID);
-    super.addSymbol(SchemaSymbols.ATTVAL_IDREF);
-    super.addSymbol(SchemaSymbols.ATTVAL_IDREFS);
-    super.addSymbol(SchemaSymbols.ATTVAL_INT);
-    super.addSymbol(SchemaSymbols.ATTVAL_INTEGER);
-    super.addSymbol(SchemaSymbols.ATTVAL_LANGUAGE);
-    super.addSymbol(SchemaSymbols.ATTVAL_LAX);
-    super.addSymbol(SchemaSymbols.ATTVAL_LIST);
-    super.addSymbol(SchemaSymbols.ATTVAL_LONG);
-    super.addSymbol(SchemaSymbols.ATTVAL_NAME);
-    super.addSymbol(SchemaSymbols.ATTVAL_NEGATIVEINTEGER);
-    super.addSymbol(SchemaSymbols.ATTVAL_MONTH);
-    super.addSymbol(SchemaSymbols.ATTVAL_MONTHDAY);
-    super.addSymbol(SchemaSymbols.ATTVAL_NCNAME);
-    super.addSymbol(SchemaSymbols.ATTVAL_NMTOKEN);
-    super.addSymbol(SchemaSymbols.ATTVAL_NMTOKENS);
-    super.addSymbol(SchemaSymbols.ATTVAL_NONNEGATIVEINTEGER);
-    super.addSymbol(SchemaSymbols.ATTVAL_NONPOSITIVEINTEGER);
-    super.addSymbol(SchemaSymbols.ATTVAL_NORMALIZEDSTRING);
-    super.addSymbol(SchemaSymbols.ATTVAL_NOTATION);
-    super.addSymbol(SchemaSymbols.ATTVAL_OPTIONAL);
-    super.addSymbol(SchemaSymbols.ATTVAL_POSITIVEINTEGER);
-    super.addSymbol(SchemaSymbols.ATTVAL_PRESERVE);
-    super.addSymbol(SchemaSymbols.ATTVAL_PROHIBITED);
-    super.addSymbol(SchemaSymbols.ATTVAL_QNAME);
-    super.addSymbol(SchemaSymbols.ATTVAL_QUALIFIED);
-    super.addSymbol(SchemaSymbols.ATTVAL_REPLACE);
-    super.addSymbol(SchemaSymbols.ATTVAL_REQUIRED);
-    super.addSymbol(SchemaSymbols.ATTVAL_RESTRICTION);
-    super.addSymbol(SchemaSymbols.ATTVAL_SHORT);
-    super.addSymbol(SchemaSymbols.ATTVAL_SKIP);
-    super.addSymbol(SchemaSymbols.ATTVAL_STRICT);
-    super.addSymbol(SchemaSymbols.ATTVAL_STRING);
-    super.addSymbol(SchemaSymbols.ATTVAL_SUBSTITUTION);
-    super.addSymbol(SchemaSymbols.ATTVAL_TIME);
-    super.addSymbol(SchemaSymbols.ATTVAL_TOKEN);
-    super.addSymbol(SchemaSymbols.ATTVAL_TRUE);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNBOUNDED);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNION);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNQUALIFIED);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDBYTE);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDINT);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDLONG);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDSHORT);
-    super.addSymbol(SchemaSymbols.ATTVAL_YEAR);
-    super.addSymbol(SchemaSymbols.ATTVAL_YEARMONTH);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.java
deleted file mode 100644
index fda40a4..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLErrorHandler;
-import org.apache.xerces.xni.parser.XMLParseException;
-import org.eclipse.wst.wsdl.validation.internal.util.ErrorMessage;
-
-/**
- * An implementation of XMLErrorHandler that captures error from Xerces.
- */
-public class ValidateErrorHandler implements XMLErrorHandler
-{
-  ArrayList errorList = new ArrayList();
-
-  
-  
-  /**
-   * Get the error messages created by Xerces.
-   * 
-   * @return The errors list.
-   */
-  public List getErrorMessages()
-  {
-    return errorList;
-  }
-
-  /**
-   * Create a validation message from the exception and severity.
-   * 
-   * @param error The error.
-   * @param severity The severity.
-   * @return An error message.
-   */
-  protected ErrorMessage createValidationMessageForException(XMLParseException error, int severity)
-  {
-    String uri = error.getLiteralSystemId();
-    if(uri == null)
-    {
-      uri = error.getPublicId();
-    }
-    ErrorMessage errorMessage = new ErrorMessage();
-    errorMessage.setErrorLine(error.getLineNumber());
-    errorMessage.setErrorMessage(error.getMessage());
-    errorMessage.setErrorColumn(error.getColumnNumber());
-    errorMessage.setURI(uri);
-    errorMessage.setSeverity(severity);
-    return errorMessage;
-  }
-
-  /**
-   * @see org.apache.xerces.xni.parser.XMLErrorHandler#error(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
-   */
-  public void error(String arg0, String arg1, XMLParseException exception) throws XNIException
-  {
-    errorList.add(createValidationMessageForException(exception, DOMError.SEVERITY_ERROR));
-  }
-
-  /**
-   * @see org.apache.xerces.xni.parser.XMLErrorHandler#fatalError(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
-   */
-  public void fatalError(String arg0, String arg1, XMLParseException exception) throws XNIException
-  {
-    errorList.add(createValidationMessageForException(exception, DOMError.SEVERITY_FATAL_ERROR));
-  }
-
-  /**
-   * @see org.apache.xerces.xni.parser.XMLErrorHandler#warning(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
-   */
-  public void warning(String arg0, String arg1, XMLParseException exception) throws XNIException
-  {
-    errorList.add(createValidationMessageForException(exception, DOMError.SEVERITY_WARNING));
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.java
deleted file mode 100644
index cf93615..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-/**
- * Handle a chain of entity resolvers.
- */
-public class XMLEntityResolverChain implements XMLEntityResolver
-{
-  private List entityResolvers = new Vector();
-  
-  /**
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier xmlResourceIdentifier) throws XNIException, IOException
-  {
-    XMLInputSource is = null;
-    Iterator entityResolverIter = entityResolvers.iterator();
-    while (entityResolverIter.hasNext())
-    {
-      XMLEntityResolver entityResolver = (XMLEntityResolver)entityResolverIter.next();
-      try
-      {
-        is = entityResolver.resolveEntity(xmlResourceIdentifier);
-      }
-      catch (XNIException e)
-      {
-      }
-      catch (IOException e)
-      {
-      }
-      if (is != null)
-      {
-        break;
-      }
-    }
-    // Throw and IOException if the file isn't found
-    if (is == null)
-    {
-      throw new IOException("Unable to locate file");
-    }
-    return is;
-  }
-
-  /**
-   * Add an entity resolver to this chain.
-   * 
-   * @param entityResolver The resolver to add to the chain.
-   */
-  public void addEntityResolver(XMLEntityResolver entityResolver)
-  {
-    entityResolvers.add(entityResolver);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.java
deleted file mode 100644
index 1ed97f6..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.java
+++ /dev/null

@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;
-
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.List;
-
-import org.apache.xerces.parsers.XMLGrammarPreparser;
-import org.apache.xerces.util.XMLGrammarPoolImpl;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-import org.apache.xerces.xni.grammars.XMLGrammarLoader;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.grammars.XSGrammar;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.apache.xerces.xs.XSModel;
-
-
-/**
- * Validate schemas from files or String.
- */
-public class XSDValidator
-{
-  protected final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces";
-  protected final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation";
-  protected final String SCHEMA_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/schema";
-  protected final String SCHEMA_FULL_CHECKING_FEATURE_ID =
-    "http://apache.org/xml/features/validation/schema-full-checking";
-  protected final String CONTINUE_AFTER_FATAL_ERROR_ID = "http://apache.org/xml/features/continue-after-fatal-error";
-  protected final String FILE_PREFIX = "file:";
-  protected final String XMLNS = "xmlns";
-  protected final String TARGETNAMESPACE = "targetNamespace";
-  protected final String NAMESPACE = "namespace";
-  protected final String IMPORT = "import";
-  protected final String SCHEMALOCATION = "schemaLocation";
-  protected final String TYPE = "type";
-  protected final String[] ignoreNamespaces =
-    { "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/1999/XMLSchema" };
-
-  protected XSModel xsModel;
-  protected boolean isValidXSD;
-  protected List errors;
-  protected String filelocation;
-
-  /**
-   * Constructor.
-   */
-  public XSDValidator()
-  {
-    xsModel = null;
-    isValidXSD = false;
-    errors = null;
-  }
-  /**
-   * Validate an inline schema.
-   * 
-   * @param schema A schema represented as a string.
-   * @param targetNamespace The target namespace of the schema.
-   * @param fileloc The uri of the file that contains the schema.
-   */
-  public void validateInlineSchema(String schema, String targetNamespace, String fileloc)
-  {
-    validateInlineSchema(schema, targetNamespace, fileloc, null, null);
-  }
-  
-  /**
-   * Validate an inline schema and specify an entity resolver.
-   * 
-   * @param schema This schema represented as a string.
-   * @param targetNamespace The target namespace of the schema.
-   * @param fileloc The uri of the file that contains this schema.
-   * @param entityResolverChain The entity resolver chain.
-   * @param inlineSchemaEntityResolver An inline schema resolver for this schema.
-   */
-  public void validateInlineSchema(
-    String schema,
-    String targetNamespace,
-    String fileloc,
-    XMLEntityResolver entityResolverChain,
-    XMLEntityResolver inlineSchemaEntityResolver)
-  {
-    filelocation = fileloc;
-    
-    validateXSD(schema, true, entityResolverChain,targetNamespace, inlineSchemaEntityResolver);
-  }
-
-  /**
-   * Validate the file located at the uri specified with the given entity resolver.
-   * 
-   * @param uri An absolute uri for the schema location.
-   * @param entityResolver An entity resolver to be used.
-   */
-  public void validate(String uri, XMLEntityResolver entityResolver)
-  {
-    validateXSD(uri, false, entityResolver, null, null);
-  }
-  
-  /**
-   * Validate the schema.
-   * 
-   * @param schema The schema or it's location.
-   * @param inlineXSD True if an inline schema, false otherwise.
-   * @param entityResolver An entity resolver to use.
-   * @param targetNamespace The target namespace of the schema being validated.
-   * @param inlineSchemaEntityResolver An inline schema entity resolver.
-   */
-  protected void validateXSD(String schema, boolean inlineXSD, XMLEntityResolver entityResolver, String targetNamespace, XMLEntityResolver inlineSchemaEntityResolver)
-  {
-    ValidateErrorHandler errorHandler = new ValidateErrorHandler();
-    errorHandler.getErrorMessages().clear();
-    try
-    {
-		XMLGrammarPreparser grammarPreparser = new XMLGrammarPreparser();
-		XMLGrammarPool grammarPool = new XMLGrammarPoolImpl();
-		grammarPreparser.setGrammarPool(grammarPool);
-	 
-      grammarPreparser.setErrorHandler(errorHandler);
-      if (entityResolver != null)
-      {
-		grammarPreparser.setEntityResolver(entityResolver);
-      }
-
-      try
-      {
-		XMLInputSource is = null;
-        // this allows support for the inline schema in WSDL documents
-        if (inlineXSD)
-        {
-        	
-        	Reader reader = new StringReader(schema);
-			is = new XMLInputSource(null,filelocation,filelocation,reader,null);
-			
-			((InlineXSDResolver)inlineSchemaEntityResolver).addReferringSchema(is,targetNamespace);
-
-        }
-        // get the input source for an external schema file
-        else
-        {
-          is = new XMLInputSource(null,schema,schema);
-        }
-        
-        grammarPreparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA,null/*schemaLoader*/);
-        XMLGrammarLoader schemaLoader = grammarPreparser.getLoader(XMLGrammarDescription.XML_SCHEMA);
-
-		XSGrammar grammar = (XSGrammar)grammarPreparser.preparseGrammar(XMLGrammarDescription.XML_SCHEMA,is);
-		xsModel = grammar.toXSModel();
-      }
-      catch (Exception e)
-      {
-        //parser will return null pointer exception if the document is structurally invalid
-        //TODO: log error message
-        System.out.println(e);
-      }
-
-      errors = errorHandler.getErrorMessages();
-    }
-    catch (Exception e)
-    {
-    	System.out.println(e);
-    }
-    if (errors.isEmpty())
-    {
-      isValidXSD = true;
-    }
-  }
-
-  /**
-   * Returns the XSModel created.
-   * 
-   * @return The XSModel created.
-   */
-
-  public XSModel getXSModel()
-  {
-  	return xsModel;
-  }
-  /**
-   * Returns true if the schema is valid, false otherwise.
-   * 
-   * @return True if the schema is valid, false otherwise.
-   */
-  public boolean isValid()
-  {
-    return isValidXSD;
-  }
-
-  /**
-   * Return the error list.
-   * 
-   * @return A list of error from the schema.
-   */
-  public List getErrors()
-  {
-    return errors;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/IWSDL20Validator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/IWSDL20Validator.java
deleted file mode 100644
index bfc792d..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/IWSDL20Validator.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl20;
-
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-
-/**
- * Interface for a validator plugged into the WSDL 2.0 validator.
- */
-public interface IWSDL20Validator
-{
-  /**
-   * Validate the given element.
-   * 
-   * @param element The element to validate.
-   * @param parents A list of parents of this element.
-   * @param valInfo The validation info for the current validation.
-   */
-  public void validate(Object element, List parents, IValidationInfo valInfo);
-
-  /**
-   * Set the resource bundle of the validator.
-   * 
-   * @param rb The resource bundle to set.
-   */
-  public void setResourceBundle(ResourceBundle rb);
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/ValidatorRegistry.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/ValidatorRegistry.java
deleted file mode 100644
index f983bd9..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/ValidatorRegistry.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl20;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-
-/**
- * A registry to hold all the WSDL 2.0 validators.
- */
-public class ValidatorRegistry
-{
-
-  protected static ValidatorRegistry verInstance;
-
-  protected Map validatorReg = new Hashtable();
-
-  /**
-   * Constructor.
-   */
-  protected ValidatorRegistry()
-  {
-  }
-
-  /**
-   * Returns the instance of this registry.
-   * 
-   * @return The instance of this registry.
-   */
-  public static ValidatorRegistry getInstance()
-  {
-    if (verInstance == null)
-    {
-      verInstance = new ValidatorRegistry();
-    }
-    return verInstance;
-  }
-
-  /**
-   * Register this validator delegate with the given namespace.
-   * 
-   * @param namespace The namespace the validator is associated with.
-   * @param valDelegate The validator delegate to register.
-   */
-  public void registerValidator(String namespace, WSDL20ValidatorDelegate valDelegate)
-  {
-    // allow the null namespace but make it the empty string
-    if (namespace == null)
-    {
-      namespace = "";
-    }
-
-    // add the validator to the hashtable
-    validatorReg.put(namespace, valDelegate);
-  }
-
-  /**
-   * Ask for the validator associated with this namespace. If none is found
-   * return null.
-   * 
-   * @param namespace The namespace of the validator.
-   * @return The WSDL 1.1 validator for the given namespace.
-   */
-  public IWSDL20Validator queryValidatorRegistry(String namespace)
-  {
-    // if the namespace is null allow it and treat it as the empty string
-    if (namespace == null)
-    {
-      namespace = "";
-    }
-    WSDL20ValidatorDelegate delegate = (WSDL20ValidatorDelegate)validatorReg.get(namespace);
-    if(delegate != null)
-    {  
-      return delegate.getValidator();
-    }
-    return null;
-  }
-
-  /**
-   * Convenience method that tells whether a validator for a given namespace is registered.
-   * 
-   * @param namespace The namespace to check.
-   * @return True if there is a validator registered, false otherwise.
-   */
-  public boolean hasRegisteredValidator(String namespace)
-  {
-    if (queryValidatorRegistry(namespace) != null)
-    {
-      return true;
-    }
-    return false;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20BasicValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20BasicValidator.java
deleted file mode 100644
index fa38c99..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20BasicValidator.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl20;
-
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-/**
- * Validate the elements defined in a WSDL 1.1 Document.
- */
-public class WSDL20BasicValidator implements IWSDL20Validator
-{
-  protected final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces";
-  protected final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation";
-  protected final String SCHEMA_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/schema";
-  protected final String SCHEMA_FULL_CHECKING_FEATURE_ID =
-    "http://apache.org/xml/features/validation/schema-full-checking";
-  protected final String CONTINUE_AFTER_FATAL_ERROR_ID = "http://apache.org/xml/features/continue-after-fatal-error";
-  protected final String SOAP_ENCODING_URI = "http://schemas.xmlsoap.org/soap/encoding/";
-
-  protected final int ELEMENT = 0;
-  protected final int TYPE = 1;
-
-  //protected WSDL20ValidatorController validatorcontroller;
-  protected MessageGenerator messagegenerator;
-
-  /**
-   * Constructor.
-   */
-  public WSDL20BasicValidator()
-  {
-  }
-  
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.validator.IWSDL11Validator#validate(java.lang.Object, java.util.List, org.eclipse.wsdl.validate.IValidationInfo)
-   */
-  public void validate(Object element, List parents, IValidationInfo valInfo)
-  {
-    //this.validatorcontroller = validatorcontroller;
-    //setDefaultResourceBundleIfNeeded(validatorcontroller);
-  	
-//    Definitions wsdlDefinitions = (Definitions)element;
-//    validateTypes(wsdlDefinitions, valInfo);
-//    validateServices(wsdlDefinitions, valInfo);
-//    validateBindings(wsdlDefinitions, valInfo);
-//    validateInterfaces(wsdlDefinitions, valInfo);
-
-  }
-
-  /**
-   * Takes a list of ExtensibilityElements and checks if there's a validator 
-   * associated with each element and if so calls the validator.
-   * 
-   * @param parents The list of parents of the elements.
-   * @param extensibilityElements The list of elements to validate.
-   * @param validatorcontroller The validator controller.
-   * @param wsdlDefinition The defnintions element for this document.
-   */
-//  protected void validateExtensibilityElementList(
-//    List parents,
-//    ElementInfoItem[] extensibilityElements,
-//    ValidationInfo valInfo,
-//    Definitions wsdlDefinitions)
-//  {
-//    //TODO: get the validation controller statically to get the extensibility validator
-////    ValidatorRegistry ver = ValidatorRegistry.getInstance();
-////    Iterator extElems = extensibilityElements.iterator();
-////    while (extElems.hasNext())
-////    {
-////      ElementInfoItem element = (ExtensibilityElement)extElems.next();
-////      //      if (ver.hasRegisteredValidator(element.getElementType().getNamespaceURI()))
-////      //      {
-////      validatorcontroller.validateWSDLElement(element.getElementType().getNamespaceURI(), element, parents);
-////      //ver.queryValidatorRegistry(element.getElementType().getNamespaceURI()).validate(element, parents, validatormanager);
-////      //      }
-////    }
-//  }
-
-  /**
-   * If the resourcebundle hasn't been set, set it to the one registered with the ValidatorController.
-   * 
-   * @param validatorcontroller The validator controller to get the resource bundle from.
-   */
-//  protected void setDefaultResourceBundleIfNeeded(WSDL20ValidatorController validatorcontroller)
-//  {
-//    if (messagegenerator == null)
-//    {
-//      setResourceBundle(validatorcontroller.getResourceBundle());
-//    }
-//  }
-  /**
-   * Set the resourcebundle to the one specified.
-   * 
-   * @param rb The resource bundle to set.
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    messagegenerator = new MessageGenerator(rb);
-  }
-
-  /**
-   * Ensure that the Types element is correct. 
-   * 
-   * @param wsdlDefinition The definitions element from the current document.
-   */
-
-//  protected void validateTypes(Definitions wsdlDefinitions, ValidationInfo valInfo)
-//  {
-//    Types types = wsdlDefinitions.getTypes();
-//    // ensure that types is defined
-//    if (types != null)
-//    {
-//      List parents = new Vector();
-//      parents.add(wsdlDefinitions);
-//      ElementInfoItem elementInfoItems[] = types.getElementInfoItems();
-//      parents.add(0, types);
-//      validateExtensibilityElementList(parents, elementInfoItems, valInfo, wsdlDefinitions);
-//      parents.remove(0);
-//    }
-//  }
-
-  /**
-   * Validates all of the declared services for the definition.
-   * 
-   * @param wsdlDefinitions The WSDL definitions element.
-   * @param valInfo Validation info for the current validation.
-   */
-//  protected void validateServices(Definitions wsdlDefinitions, ValidationInfo valInfo)
-//  {
-//
-//  }
-
-  /**
-   * Checks that the bindings refer to valid interfaces and all of the operations
-   * in a given binding refer to a defined operation within the corresponding
-   * interfaces.
-   * 
-   * @param wsdlDefinitions The WSDL definitions element.
-   * @param valInfo Validation info for the current validation.
-   */
-//  protected void validateBindings(Definitions wsdlDefinitions, ValidationInfo valInfo)
-//  {
-//
-//  }
-
-  /**
-   * Check that all of the Interfaces have valid messages associated with their
-   * operation input, output, infault and outfault types.
-   * 
-   * @param wsdlDefinitions The WSDL definitions element.
-   * @param valInfo Validation info for the current validation.
-   */
-//  private void validateInterfaces(Definitions wsdlDefinitions, ValidationInfo valInfo)
-//  {
-//    
-//  }
-
-  /**
-   * Checks whether the given name is defined in the namespace for the part.  A part is an
-   * ELEMENT in WSDL 2.0.
-   * 
-   * @param namespace The namespace to check.
-   * @param name The name to check.
-   * @param valInfo Validation info for the current validation.
-   * @return True if the part element is defined, false otherwise.
-   */
-  protected boolean checkMessage(String namespace, String name, IValidationInfo valInfo)
-  {
-
-    boolean partvalid = false;
-//    // first take care of the situation where it's schema for schema
-//    if (namespace.equalsIgnoreCase(SchemaSymbols.URI_SCHEMAFORSCHEMA))
-//    {
-//      SchemaAttributeTable xsdTable = new SchemaAttributeTable();
-//      if (xsdTable.containsSymbol(name))
-//      {
-//        partvalid = true;
-//      }
-//    }
-//    // check inline and imported schema
-//    else
-//    {
-//      List schemas = validatorcontroller.getSchemas();
-//      Iterator schemasIter = schemas.iterator();
-//      while (schemasIter.hasNext())
-//      {
-//        XSModel schema = (XSModel)schemasIter.next();
-//        if (schema != null)
-//        {
-//          if (schema.getElementDeclaration(name, namespace) != null)
-//          {
-//            partvalid = true;
-//            break;
-//          }
-//         
-//        }
-//      }
-//    }
-    // If the SOAP encoding namespace hasn't been explicitly imported do so now.
-    // Allow the SOAP encoding namespace to be automatically imported but mark it as a warning.
-//    if (!partvalid && namespace.equals(SOAP_ENCODING_URI))
-//    {
-//      try
-//      {
-//        XSDValidator xsdVal = new XSDValidator();
-//        xsdVal.validate(XMLCatalog.getInstance().resolveEntityLocation(SOAP_ENCODING_URI, null), null);
-//        // sanity check in case something goes wrong
-//        if (xsdVal.isValid())
-//        {
-//          XSModel xsModel = xsdVal.getXSModel();
-//
-//          if (xsModel.getElementDeclaration(name, namespace) != null)
-//          {
-//            partvalid = true;
-//          }
-//
-//          validatorcontroller.addWarningMessage(
-//            partObject,
-//            messagegenerator.getString("_WARN_SOAPENC_IMPORTED_PART", "'" + name + "'"));
-//        }
-//      }
-//      catch (Exception e)
-//      {
-//        //TODO: log the error message
-//        //System.out.println(e);
-//      }
-//    }
-    return partvalid;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorController.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorController.java
deleted file mode 100644
index b8175cf..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorController.java
+++ /dev/null

@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl20;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import org.eclipse.wst.wsdl.validation.internal.IWSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.exception.ValidateWSDLException;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.w3c.dom.Document;
-
-/**
- * The validator controller is the head of validation. Has methods for getting 
- * extension validators.
- */
-public class WSDL20ValidatorController implements IWSDLValidator
-{
-  protected final String _WARN_NO_VALDIATOR = "_WARN_NO_VALDIATOR";
-  protected final int ERROR_MESSAGE = 0;
-  protected final int WARNING_MESSAGE = 1;
-  protected String fileURI;
-  protected List schemas = new Vector();
-//  protected Definitions wsdlDefinition;
-  protected Hashtable elementLocations = null;
-  protected ResourceBundle resourcebundle;
-  protected MessageGenerator messagegenerator = null;
-  //protected ValidationController validationController;
-  protected ValidatorRegistry ver = ValidatorRegistry.getInstance();
-  protected boolean errors = false;
-
-  /**
-   * Constructor.
-   * 
-   * @param rb The resource bundle to set for this controller.
-   */
-  public WSDL20ValidatorController(ResourceBundle rb)
-  {
-    setResourceBundle(rb);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.IWSDLValidator#validate(org.w3c.dom.Document, org.eclipse.wsdl.validate.ValidationInfo)
-   */
-  public void validate(Document domModel, IValidationInfo valInfo) throws ValidateWSDLException
-  {
-    // reset the variables
-    //reset();
-    fileURI = valInfo.getFileURI();
-    //this.validationController = validationcontroller;
-
-    
-//    List readerErrors = readWSDLDocument(domModel, fileURI, getMessageGenerator());
-    //		handle any reader errors
-//    if (readerErrors != null)
-//    {
-//      Iterator readerErrorsI = readerErrors.iterator();
-//      while (readerErrorsI.hasNext())
-//      {
-//        ReaderError re = (ReaderError)readerErrorsI.next();
-//        valInfo.addError(re.getMessage(), re.getLine(), re.getColumn(), re.getFileURI());
-//      }
-//    }
-//    validateWSDLElement(Constants.NS_URI_WSDL, wsdlDefinition, new Vector(), valInfo);
-  }
-  
-  /**
-   * Read in the WSDL document and set the model and imported schemas.
-   * 
-   * @param domModel A DOM document model of the file to be read.
-   * @param file The file to read.
-   * @param messagegenerator The messagegenerator the reader should use for any messages produced.
-   * @throws ValidateWSDLException
-   * @return A list of reader errors.
-   */
-//  protected List readWSDLDocument(Document domModel, String file, MessageGenerator messagegenerator) throws ValidateWSDLException
-//  {
-//    List readerErrors = null;
-//    try
-//    {
-//
-//      WSDLReaderImpl wsdlReader = new WSDLReaderImpl();
-//      wsdlDefinition = wsdlReader.readWSDL(file, domModel);
-//
-//      readerErrors = wsdlReader.getReaderErrors();
-//
-//    }
-//    catch (WSDLException e)
-//    {
-//      throw new ValidateWSDLException(e.getMessage() /*+ " " + e.getFaultCode()*/);
-//    }
-//
-//    catch (Exception e)
-//    {
-//      throw new ValidateWSDLException("unable to read file" + e.getMessage() + " " + e.toString());
-//    }
-//    return readerErrors;
-//  }
-
-  /**
-   * Given a WSDL element, call ValidateElement for it.
-   * 
-   * @param namespace The namespace of the element to validate.
-   * @param element The element to validate.
-   * @param parents The list of parents for this element.
-   */
-  public void validateWSDLElement(String namespace, Object element, List parents, IValidationInfo valInfo)
-  {
-    IWSDL20Validator val = ver.queryValidatorRegistry(namespace);
-    if (val != null)
-    {
-      val.validate(element, parents, valInfo);
-    }
-    else
-    {
-      //valInfo.addWarning(messagegenerator.getString(_WARN_NO_VALDIATOR, namespace), element);
-    }
-  }
-
-  /**
-   * Add a schema to the list of schemas.
-   * 
-   * @param xsModel The schema to add.
-   */
-//  public void addSchema(XSModel xsModel)
-//  {
-//    if (xsModel != null)
-//    {
-//      schemas.add(xsModel);
-//    }
-//  }
-
-  /**
-   * Return the list containing the schemas.
-   * 
-   * @return The list of schemas.
-   */
-//  public List getSchemas()
-//  {
-//    return schemas;
-//  }
-
-  /**
-  	* Get the ResourceBundle for this ValidatorManager.
-  	* 
-  	* @return The resource bundle registered for this controller.
-  	* @see #setResourceBundle
-  	*/
-  public ResourceBundle getResourceBundle()
-  {
-    return resourcebundle;
-  }
-
-  /**
-   * Set the ResourceBundle for this ValidatorManager.
-   * 
-   * @param rb The resource bundle to set.
-   * @see #getResourceBundle
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    if (rb != null)
-    {
-      resourcebundle = rb;
-      messagegenerator = new MessageGenerator(rb);
-    }
-
-  }
-
-  /**
-   * Get the message generator registered for this controller.
-   * 
-   * @return The message generator registered for this controller.
-   */
-  public MessageGenerator getMessageGenerator()
-  {
-    return messagegenerator;
-  }
-
-  /**
-   * Return the filename for the file currently being validated. Some validators require this.
-   * 
-   * @return The filename for the file being validated.
-   */
-//  public String getFilename()
-//  {
-//    return fileURI;
-//  }
-
-  /**
-   * Convenience method for extensibly validators to add error messages.
-   * 
-   * @param object The object to add the error for.
-   * @param error The error to add.
-   */
-//  public void addErrorMessage(Object object, String error)
-//  {
-//    addValidationMessage(ERROR_MESSAGE, object, error);
-//    errors = true;
-//  }
-
-  /**
-   * Method for extensibly validators to add error messages when they know
-   * line and column numbers.
-   * 
-   * @param line The line where the error message is located.
-   * @param column The column where the error message is located.
-   * @param error The error message.
-   */
-//  public void addErrorMessage(int line, int column, String error)
-//  {
-//    addValidationMessage(ERROR_MESSAGE, line, column, error);
-//    errors = true;
-//  }
-
-  /**
-   * Convenience method for extensibly validators to add warning messages.
-   * 
-   * @param object The object to add the warning message.
-   * @param warning The warning message.
-   */
-//  public void addWarningMessage(Object object, String warning)
-//  {
-//    addValidationMessage(WARNING_MESSAGE, object, warning);
-//  }
-
-  /**
-   * Method for extensibly validators to add warning messages when they know
-   * line and column numbers.
-   * 
-   * @param line The line where the error message is located.
-   * @param column The column where the error message is located.
-   * @param warning The warning message.
-   */
-//  public void addWarningMessage(int line, int column, String warning)
-//  {
-//    addValidationMessage(WARNING_MESSAGE, line, column, warning);
-//  }
-
-  /**
-   * If you have an object read in by the reader for this
-   * validatorcontroller the object can be passed in here and the line and column
-   * information will be abstracted from it.
-   * 
-   * @param type The type of message to add.
-   * @param o The object that has the error (used to get the location).
-   * @param message The message to add.
-   */
-//  protected void addValidationMessage(int type, Object o, String message)
-//  {
-//    ValidatableElement ve = (ValidatableElement)o;
-////    int[] location;
-////    if (elementLocations.containsKey(o))
-////    {
-////      location = (int[])elementLocations.get(o);
-////    }
-////    // if we give it an element that hasn't been defined we'll set the location
-////    // at (0,0) so the error shows up but no line marker in the editor
-////    else
-////    {
-////      location = new int[] { 0, 0 };
-////    }
-//    addValidationMessage(type, ve.getLine(), ve.getColumn(), message);
-//  }
-
-  /**
-    * Creates a validation message of the specified type.
-    * 
-  	* @param type The type of validation message to add.
-  	* @param line The line where the error message is located.
-  	* @param column The line where the column message is located.
-  	* @param message The message to add.
-  	*/
-//  protected void addValidationMessage(int type, int line, int column, String message)
-//  {
-//    if (message != null)
-//    {
-//      if (type == ERROR_MESSAGE)
-//      {
-//        validationController.addErrorMessage(line, column, message);
-//      }
-//      else if (type == WARNING_MESSAGE)
-//      {
-//        validationController.addWarningMessage(line, column, message);
-//      }
-//    }
-//  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.controller.IWSDLValidator#isValid()
-   */
-  public boolean isValid()
-  {
-    return !errors;
-  }
-
-  /**
-   * Reset the validator controller.
-   */
-//  protected void reset()
-//  {
-//    schemas = new Vector();
-//    fileURI = "";
-//    wsdlDefinition = null;
-//    elementLocations = null;
-//    resourcebundle = null;
-//    //validationController = null;
-//    errors = false;
-//  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorDelegate.java
deleted file mode 100644
index 7661f7d..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/wsdl20/WSDL20ValidatorDelegate.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.wsdl20;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-
-/**
- * The WSDL 1.1 validator delegate holds a reference to a validator to be instantiated at
- * a later point.
- */
-public class WSDL20ValidatorDelegate
-{
-  private String validatorClassname = null;
-  private String resourceBundle = null;
-  private ClassLoader classLoader = null;
-  private IWSDL20Validator validator = null;
-
-  /**
-   * Create a delegate for a validator by its class name and resource bundle name.
-   * 
-   * @param validatorClassname The name of the validator class.
-   * @param resourceBundle The name of the validator base resource bundle.
-   */
-  public WSDL20ValidatorDelegate(String validatorClassname, String resourceBundle)
-  {
-    this.validatorClassname = validatorClassname;
-    this.resourceBundle = resourceBundle;
-  }
-
-  /**
-   * Create a delegate for a validator by its class name, resource bundle name and 
-   * a class loader to load the validator and bundle.
-   * 
-   * @param validatorClassname The name of the validator class.
-   * @param resourceBundle The name of the validator base resource bundle.
-   * @param classLoader The class loader to use to load the validator and bundle.
-   */
-  public WSDL20ValidatorDelegate(String validatorClassname, String resourceBundle, ClassLoader classLoader)
-  {
-    this(validatorClassname, resourceBundle);
-    this.classLoader = classLoader;
-  }
-
-  /**
-   * Get the validator specified in this delegate.
-   * 
-   * @return The WSDL 1.1 validator specified by this delegate.
-   */
-  public IWSDL20Validator getValidator()
-  {
-    if (validator == null)
-    {
-      if(classLoader == null)
-      {
-      	classLoader = getClass().getClassLoader();
-      }
-      try
-      {
-        Class validatorClass =
-          classLoader != null ? classLoader.loadClass(validatorClassname) : Class.forName(validatorClassname);
-
-        validator = (IWSDL20Validator)validatorClass.newInstance();
-        if (resourceBundle != null)
-        {
-          ResourceBundle validatorBundle = ResourceBundle.getBundle(resourceBundle, Locale.getDefault(), classLoader);
-          validator.setResourceBundle(validatorBundle);
-        }
-      }
-      catch (ClassNotFoundException e)
-      {
-        // TODO: add logging
-        System.err.println(e);
-      }
-      catch (IllegalAccessException e)
-      {
-        // TODO: add logging
-        System.err.println(e);
-      }
-      catch (InstantiationException e)
-      {
-        // TODO: add logging
-        System.err.println(e);
-      }
-    }
-    return validator;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/AbstractXMLConformanceFactory.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/AbstractXMLConformanceFactory.java
deleted file mode 100644
index d7cb52e..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/AbstractXMLConformanceFactory.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-/**
- * Factory for generating objects needed for XML Conformance validation.
- */
-public abstract class AbstractXMLConformanceFactory
-{
-  protected static AbstractXMLConformanceFactory instance;
-  
-  /**
-   * Returns the instance of this factory.
-   * 
-   * @return the instance of this factory
-   */
-  public static AbstractXMLConformanceFactory getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new DefaultXMLConformanceFactory();
-    }
-    return instance;
-  }
-  
-  /**
-   * Set the implementation for this factory to use.
-   * 
-   * @param factory - the implementation this factory will use
-   */
-  public static void setImplementation(AbstractXMLConformanceFactory factory)
-  {
-    instance = factory;
-  }
-  
-  /**
-   * Return an XML validator.
-   * 
-   * @return an XML validator
-   */
-  abstract public IXMLValidator getXMLValidator();
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLConformanceFactory.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLConformanceFactory.java
deleted file mode 100644
index 1e4e15c..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLConformanceFactory.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-
-/**
- * The default implementation of AbstractXMLConformanceFactory.
- */
-public class DefaultXMLConformanceFactory extends AbstractXMLConformanceFactory
-{
-
-  /**
-   * Constructor.
-   */
-  public DefaultXMLConformanceFactory()
-  {
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.xml.AbstractXMLConformanceFactory#getXMLValidator()
-   */
-  public IXMLValidator getXMLValidator()
-  {
-    return new DefaultXMLValidator();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java
deleted file mode 100644
index ba8a0c1..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java
+++ /dev/null

@@ -1,561 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.xerces.impl.XMLErrorReporter;
-import org.apache.xerces.jaxp.SAXParserFactoryImpl;
-import org.apache.xerces.parsers.SAXParser;
-import org.apache.xerces.parsers.StandardParserConfiguration;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.wsdl.validation.internal.ValidationMessageImpl;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * The default implementation of IXMLValidator.
- */
-public class DefaultXMLValidator implements IXMLValidator
-{
-  private final String _APACHE_FEATURE_CONTINUE_AFTER_FATAL_ERROR =
-    "http://apache.org/xml/features/continue-after-fatal-error";
-  private final String _APACHE_FEATURE_NAMESPACE_PREFIXES = "http://xml.org/sax/features/namespace-prefixes";
-  private final String _APACHE_FEATURE_NAMESPACES = "http://xml.org/sax/features/namespaces";
-  private final String _APACHE_FEATURE_VALIDATION = "http://xml.org/sax/features/validation";
-  private final String _APACHE_FEATURE_VALIDATION_SCHEMA = "http://apache.org/xml/features/validation/schema";
-  private final String _APACHE_PROPERTY_EXTERNAL_SCHEMALOCATION =
-    "http://apache.org/xml/properties/schema/external-schemaLocation";
-  private final String DEFINITIONS = "definitions";
-  
-  protected static final String IGNORE_ALWAYS = "IGNORE_ALWAYS";
-  protected static final String PREMATURE_EOF = "PrematureEOF";
-  
-  protected Hashtable ingoredErrorKeyTable = new Hashtable();
-
-  protected String uri;
-  protected URIResolver uriResolver = null;
-  protected List errors = new ArrayList();
-  protected StringBuffer schemaLocationString = new StringBuffer();
-  protected List ignoredNamespaceList = new ArrayList();
-  
-  protected InputStream inputStream = null;
-  
-  protected String currentErrorKey = null;
-  protected Object[] currentMessageArguments = null;
-  
-  protected boolean isChildOfDoc = false;
-//  protected String wsdlNamespace = null;
-
-
-
-
-/**
-   * Constructor.
-   */
-  public DefaultXMLValidator()
-  {
-    super();
-    
-    ignoredNamespaceList.add(Constants.NS_URI_XSD_1999);
-    ignoredNamespaceList.add(Constants.NS_URI_XSD_2000);
-    ignoredNamespaceList.add(Constants.NS_URI_XSD_2001);
-    
-    ingoredErrorKeyTable.put(PREMATURE_EOF, IGNORE_ALWAYS);
-  }
-
-  /**
-   * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidatorAction#setFile(IFile)
-   */
-  public void setFile(String uri)
-  {
-    this.uri = uri;
-  }
-  
-  public void setURIResolver(URIResolver uriResolver)
-  {
-  	this.uriResolver = uriResolver;
-  }
-
-  /**
-   * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidatorAction#run()
-   */
-  public void run()
-  {
-    // Validate the XML file.
-    try
-    {
-      Reader reader1 = null; // Used for the preparse.
-      Reader reader2 = null; // Used for validation parse.
-      
-      InputSource validateInputSource; 
-     
-      
-      if (this.inputStream != null)
-      {    
-      
-
-        String string = createStringForInputStream(inputStream);
-        reader1 = new StringReader(string);
-        reader2 = new StringReader(string); 
-          
-        validateInputSource = new InputSource(inputStream);
-        validateInputSource.setCharacterStream(reader2);
-      } else
-      { validateInputSource = new InputSource(uri);
-      }
-      
-      preparse(uri, reader1);
-      
-      SAXParser saxparser = createSAXParser();
-      XMLConformanceDefaultHandler handler = new XMLConformanceDefaultHandler();
-
-      saxparser.setErrorHandler(handler);
-	  saxparser.setEntityResolver(handler);
-	  saxparser.setContentHandler(handler);
-      
-      saxparser.parse(validateInputSource);
-//      wsdlNamespace = handler.getWSDLNamespace();
-    }
-    catch (SAXParseException e)
-    {
-      addError(e.getMessage(), e.getLineNumber(), e.getColumnNumber(), uri);
-    }
-    catch (IOException e)
-    {
-    }
-    catch (Exception e)
-    {
-      //System.out.println(e);
-    }
-  }
-
-  /**
-   * Create and configure a SAX parser.
-   * 
-   * @return The new SAX parser.
-   */
-  protected SAXParser createSAXParser()
-  {
-    SAXParser saxParser = null;
-    try
-    {
-      //SAXParserFactory parserfactory = new SAXParserFactoryImpl();
-      try
-      { MyStandardParserConfiguration configuration = new MyStandardParserConfiguration();
-        saxParser = new org.apache.xerces.parsers.SAXParser(configuration);
-        saxParser.setFeature(_APACHE_FEATURE_CONTINUE_AFTER_FATAL_ERROR, true);
-        saxParser.setFeature(_APACHE_FEATURE_NAMESPACE_PREFIXES, true);
-        saxParser.setFeature(_APACHE_FEATURE_NAMESPACES, true);
-        saxParser.setFeature(_APACHE_FEATURE_VALIDATION, true);
-        saxParser.setFeature(_APACHE_FEATURE_VALIDATION_SCHEMA, true);
-      }
-      catch (SAXNotRecognizedException e)
-      {
-      }
-      catch (SAXNotSupportedException e)
-      {
-      }
-      if (schemaLocationString.length() > 0)
-      {
-        saxParser.setProperty(_APACHE_PROPERTY_EXTERNAL_SCHEMALOCATION, schemaLocationString.toString());
-      }
-    }
-    catch (FactoryConfigurationError e)
-    {
-    }
-    catch (SAXNotRecognizedException e)
-    {
-    }
-    catch (SAXNotSupportedException e)
-    {
-    }
-//    catch (SAXException e)
-//    {
-//    }
-    return saxParser;
-  }
-
-  
-  final String createStringForInputStream(InputStream inputStream)
-  {
-    // Here we are reading the file and storing to a stringbuffer.
-    StringBuffer fileString = new StringBuffer();
-    try
-    {
-      InputStreamReader inputReader = new InputStreamReader(inputStream);
-      BufferedReader reader = new BufferedReader(inputReader);
-      char[] chars = new char[1024];
-      int numberRead = reader.read(chars);
-      while (numberRead != -1)
-      {
-        fileString.append(chars, 0, numberRead);
-        numberRead = reader.read(chars);
-      }
-    }
-    catch (Exception e)
-    {
-      //TODO: log error message
-      //e.printStackTrace();
-    }
-    return fileString.toString();
-  }
-  
-  /**
-   * Preparse the file to find all of the namespaces that are defined in order
-   * to specify the schemalocation.
-   * 
-   * @param uri The uri of the file to parse.
-   */
-  protected void preparse(String uri, Reader characterStream)
-  {
-      javax.xml.parsers.SAXParser saxParser = null;
-    try
-    {
-        
-      InputSource inputSource; 
-      
-      if (characterStream != null)
-      {   
-          inputSource = new InputSource(uri);
-          inputSource.setCharacterStream(characterStream);
-      }
-      else
-      {
-          inputSource = new InputSource(uri);
-      }
-      
-      SAXParserFactory parserfactory = new SAXParserFactoryImpl();
-
-      parserfactory.setFeature(_APACHE_FEATURE_NAMESPACE_PREFIXES, true);
-      parserfactory.setFeature(_APACHE_FEATURE_NAMESPACES, true);
-
-      saxParser = parserfactory.newSAXParser();
-      SchemaStringHandler handler = new SchemaStringHandler(uri);
-      
-      saxParser.parse(inputSource, handler);
-    }
-    catch (FactoryConfigurationError e)
-    {
-    }
-    catch (SAXNotRecognizedException e)
-    {
-    }
-    catch (ParserConfigurationException e)
-    {
-    }
-    catch (SAXNotSupportedException e)
-    {
-    }
-    catch (SAXException e)
-    {
-    }
-    catch (IOException e)
-    {
-    }
-  }
-
-  /**
-   * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidatorAction#hasErrors()
-   */
-  public boolean hasErrors()
-  {
-    return !errors.isEmpty();
-  }
-
-  /**
-   * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidatorAction#getErrorList()
-   */
-  public List getErrors()
-  {
-    return errors;
-  }
-
-  /**
-   * Add an error message.
-   * 
-   * @param error The error message to add.
-   * @param line The line location of the error.
-   * @param column The column location of the error.
-   * @param uri The URI of the file containing the error.
-   */
-  protected void addError(String error, int line, int column, String uri)
-  {
-    errors.add(new ValidationMessageImpl(error, line, column, ValidationMessageImpl.SEV_ERROR, uri, currentErrorKey, currentMessageArguments));
-  }
-
-  /**
-   * The handler for the SAX parser. This handler will obtain the WSDL
-   * namespace, handle errors and resolve entities.
-   */
-  protected class XMLConformanceDefaultHandler extends DefaultHandler
-  {
-    /**
-     * @see org.xml.sax.ErrorHandler#error(SAXParseException)
-     */
-    public void error(SAXParseException arg0) throws SAXException
-    {
-     String tempURI = arg0.getSystemId();
-     if (inputStream!= null && arg0.getSystemId() == null)
-     {
-       //mh: In this case we are validating a stream so the URI may be null in this exception
-       tempURI = uri;       
-     }
-     addError(arg0.getMessage(), arg0.getLineNumber(), arg0.getColumnNumber(), tempURI);
-    }
-
-    /**
-     * @see org.xml.sax.ErrorHandler#fatalError(SAXParseException)
-     */
-    public void fatalError(SAXParseException arg0) throws SAXException
-    {
-      addError(arg0.getMessage(), arg0.getLineNumber(), arg0.getColumnNumber(), arg0.getSystemId());
-    }
-
-    /**
-     * @see org.xml.sax.ErrorHandler#warning(SAXParseException)
-     */
-    public void warning(SAXParseException arg0) throws SAXException
-    {
-      addError(arg0.getMessage(), arg0.getLineNumber(), arg0.getColumnNumber(), arg0.getSystemId());
-    }
-	
-	/**
-	 * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public void endElement(String uri, String localName, String qName)
-			throws SAXException {
-		if(localName.equals("documentation") && (uri.equals(Constants.NS_URI_WSDL) || uri.equals(Constants.NS_URI_XSD_2001)|| uri.equals(Constants.NS_URI_XSD_1999) || uri.equals(Constants.NS_URI_XSD_2000)))
-		{
-		  isChildOfDoc = false;
-		}
-		super.endElement(uri, localName, qName);
-	}
-	/**
-	 * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
-	public void startElement(String uri, String localName, String qName,
-			Attributes atts) throws SAXException {
-		if(localName.equals("documentation") && (uri.equals(Constants.NS_URI_WSDL) || uri.equals(Constants.NS_URI_XSD_2001)|| uri.equals(Constants.NS_URI_XSD_1999) || uri.equals(Constants.NS_URI_XSD_2000)))
-		{
-		  isChildOfDoc = true;
-		}
-		super.startElement(uri, localName, qName, atts);
-	}
-
-    /**
-     * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String,
-     *      java.lang.String)
-     */
-    public InputSource resolveEntity(String publicId, String systemId) throws SAXException
-    {
-      // If we're currently examining a subelement of the 
-	  // WSDL or schema documentation element we don't want to resolve it
-	  // as anything is allowed as a child of documentation.
-	  if(isChildOfDoc)
-	  {
-	    return new InputSource();
-	  }
-    if(publicId == null)
-    {
-      publicId = systemId;
-    }
-      
-    IURIResolutionResult result = uriResolver.resolve(null, publicId, systemId);
-    String uri = result.getPhysicalLocation();
-    if (uri != null && !uri.equals(""))
-    {
-	  try
-	  {
-//	    String entity = systemId;
-//		if(publicId != null)
-//		{
-//		  entity = publicId;
-//		 }
-		URL entityURL = new URL(uri);
-        InputSource is = new InputSource(result.getLogicalLocation());
-		is.setByteStream(entityURL.openStream());
-        if (is != null)
-        {
-          return is;
-        }
-	  }
-	  catch(Exception e)
-	  {
-		 // Do nothing.
-	  }
-    }
-      // This try/catch block with the IOException is here to handle a difference
-      // between different versions of the EntityResolver interface.
-      try
-      {
-        InputSource is = super.resolveEntity(publicId, systemId);
-        if(is == null)
-        {
-          throw new IOException();
-        }
-        return is;
-      }
-      catch(IOException e)
-      {
-      }
-      return null;
-    }
-
-  }
-
-  /**
-   * @see org.eclipse.validate.wsdl.xmlconformance.IXMLValidator#setSchemaLocation(String,
-   *      String)
-   */
-  public void setSchemaLocation(String namespace, String location)
-  {
-    if (namespace != null && location != null && !namespace.equalsIgnoreCase("") && !location.equalsIgnoreCase(""))
-    {
-      schemaLocationString.append(" ").append(namespace).append(" ").append(formatURI(location));
-    }
-  }
-  
-  
-  /**
-   * @param inputStream - set the inputStream to validate
-   */
-  public void setInputStream(InputStream inputStream)
-  {
-      this.inputStream = inputStream;
-  }
-
-  /**
-   * Remove space characters from a String and replace them with %20.
-   * 
-   * @param uri -
-   *            the uri to format
-   * @return the formatted string
-   */
-  protected String formatURI(String uri)
-  {
-    String space = "%20";
-    StringBuffer newUri = new StringBuffer(uri);
-    int newUriLength = newUri.length();
-
-    // work backwards through the stringbuffer in case it grows to the
-    // point
-    // where the last space would be missed.
-    for (int i = newUriLength - 1; i >= 0; i--)
-    {
-      if (newUri.charAt(i) == ' ')
-      {
-        newUri.replace(i, i + 1, space);
-      }
-    }
-
-    return newUri.toString();
-  }
-
-  /**
-   * A handler used in preparsing to get the schemaLocation string.
-   */
-  protected class SchemaStringHandler extends DefaultHandler
-  {
-    private final String XMLNS = "xmlns";
-	  private final String TARGETNAMESPACE = "targetNamespace";
-    private String baselocation = null;
-
-    public SchemaStringHandler(String baselocation)
-    {
-      this.baselocation = baselocation;
-    }
-    /**
-     * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
-     *      java.lang.String, java.lang.String, org.xml.sax.Attributes)
-     */
-    public void startElement(String uri, String localname, String arg2, Attributes attributes) throws SAXException
-    {
-      if (localname.equals(DEFINITIONS))
-      {
-        String targetNamespace = attributes.getValue(TARGETNAMESPACE);
-        int numAtts = attributes.getLength();
-        for (int i = 0; i < numAtts; i++)
-        {
-
-          String attname = attributes.getQName(i);
-          if (attname.startsWith(XMLNS))
-          {
-            String namespace = attributes.getValue(i);
-            if(!(namespace.equals(targetNamespace) || ignoredNamespaceList.contains(namespace)))
-            {
-              String resolvedURI = namespace;
-              setSchemaLocation(namespace, resolvedURI);
-            }
-          }
-        }
-
-      }
-      super.startElement(uri, localname, arg2, attributes);
-
-    }
-  }
-
-  
-  protected class MyStandardParserConfiguration extends StandardParserConfiguration
-  {
-    public MyStandardParserConfiguration()
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.xerces.parsers.DTDConfiguration#createErrorReporter()
-     */
-    protected XMLErrorReporter createErrorReporter()
-    {
-      return new XMLErrorReporter()
-      {
-        /* (non-Javadoc)
-         * @see org.apache.xerces.impl.XMLErrorReporter#reportError(java.lang.String, java.lang.String, java.lang.Object[], short)
-         */
-        public void reportError(String domain, String key, Object[] arguments,
-            short severity) throws XNIException
-        {
-          currentErrorKey = key;
-          currentMessageArguments = arguments;
-          super.reportError(domain, key, arguments, severity);
-        }
-      };
-    }
-  }
-  
-  
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/ElementLocation.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/ElementLocation.java
deleted file mode 100644
index 57d9a3a..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/ElementLocation.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-/**
- * Holds the location information for an element in the model.
- */
-public class ElementLocation
-{  
-  public static final String ID = "location";
-  protected int line;
-  protected int column;
-  /**
-   * Constructor.
-   * 
-   * @param line - the line location of the element
-   * @param column - the column location of the element
-   */
-  public ElementLocation(int line, int column)
-  {
-    this.line = line;
-    this.column = column;
-  }
-  
-  /**
-   * Return the line number for this element.
-   * 
-   * @return the line number for this element
-   */
-  public int getLineNumber()
-  {
-  	return line;
-  }
-  
-  /**
-   * Return the column number for this element.
-   * 
-   * @return the column number for this element
-   */
-  public int getColumnNumber()
-  {
-  	return column;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLCatalog.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLCatalog.java
deleted file mode 100644
index 43f456e..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLCatalog.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-/**
- * An interface for an XML catalog.
- */
-public interface IXMLCatalog
-{
-
-  /**
-   * Add a public id and a location to the catalog.
-   * 
-   * @param publicId -
-   *          the public id of the entry
-   * @param systemId -
-   *          the system id of the entry
-   */
-  public abstract void addEntryToCatalog(String publicId, String systemId);
-
-  /**
-   * Resolve the location of an entity given public and system ids.
-   * 
-   * @param publicId -
-   *          the public id of the entity to be resolved
-   * @param systemId -
-   *          the system id of the entity to be resolved
-   * @return the location of the entity
-   */
-  public abstract String resolveEntityLocation(String publicId, String systemId);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLValidator.java
deleted file mode 100644
index b4cadfe..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/IXMLValidator.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.util.List;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-
-/**
- * An interface for an XML validator.
- */
-public interface IXMLValidator
-{
-  /**
-   * Set the file to be validated.
-   * 
-   * @param uri - the uri of the file to be validated
-   */
-  public void setFile(String uri);
-  
-  /**
-   * Validate the file.
-   */
-  public void run();
-
-  /**
-   * Returns true if there were validation errors, false otherwise.
-   * 
-   * @return true if there were validation errors, false otherwise
-   */
-  public boolean hasErrors();
-  
-  /**
-   * Returns the list of errors.
-   * 
-   * @return the list of errors
-   */
-  public List getErrors();
-  
-  /**
-   * Add a schema location to be schema locatino string used by the XML parser.
-   * 
-   * @param namespace - the namespaces of the schema
-   * @param location - the location of the schema
-   */
-  public void setSchemaLocation(String namespace, String location);
-  
-  /**
-   * Set the URI resolver to use.
-   * 
-   * @param uriResolver The URI resolver to use.
-   */
-  public void setURIResolver(URIResolver uriResolver);
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java
deleted file mode 100644
index 0ade367..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import org.apache.xerces.dom.ElementImpl;
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.util.SymbolTable;
-import org.apache.xerces.xni.Augmentations;
-import org.apache.xerces.xni.NamespaceContext;
-import org.apache.xerces.xni.QName;
-import org.apache.xerces.xni.XMLAttributes;
-import org.apache.xerces.xni.XMLLocator;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.parser.XMLParserConfiguration;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * A DOM parser that will register location information with the elements in the model.
- */
-public class LineNumberDOMParser extends DOMParser
-{
-  XMLLocator locator = null;
-
-  /**
-   * Constructor.
-   */
-  public LineNumberDOMParser()
-  {
-    super();
-    try
-    {
-      setFeature(DEFER_NODE_EXPANSION, false);
-    }
-    catch (SAXNotSupportedException e)
-    {
-      System.out.println(e);
-    }
-    catch (SAXNotRecognizedException e)
-    {
-      System.out.println(e);
-    }
-  }
-
-  /**
-   * Constuctor.
-   * 
-   * @param arg0 The parser configuration.
-   */
-  public LineNumberDOMParser(XMLParserConfiguration arg0)
-  {
-    super(arg0);
-    try
-    {
-      setFeature(DEFER_NODE_EXPANSION, false);
-    }
-    catch (SAXNotSupportedException e)
-    {
-      System.out.println(e);
-    }
-    catch (SAXNotRecognizedException e)
-    {
-      System.out.println(e);
-    }
-  }
-
-  /**
-   * Constructor.
-   * 
-   * @param arg0 A symbol table for the parser.
-   */
-  public LineNumberDOMParser(SymbolTable arg0)
-  {
-    super(arg0);
-  }
-
-  /**
-   * Constructor.
-   * 
-   * @param arg0 A symbol table for the parser.
-   * @param arg1 A grammar pool for the parser.
-   */
-  public LineNumberDOMParser(SymbolTable arg0, XMLGrammarPool arg1)
-  {
-    super(arg0, arg1);
-  }
-
-  /**
-   * @see org.apache.xerces.xni.XMLDocumentHandler#startElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
-   */
-  public void startElement(QName arg0, XMLAttributes arg1, Augmentations arg2) throws XNIException
-  {
-    Element element;
-    // For elements from the Schema namespace we want to preserve them
-    // the way they were entered. Revert the values to the non-normalized values.
-    String ns = arg0.uri;
-    if(ns != null && (ns.equals(Constants.NS_URI_XSD_2001) || ns.equals(Constants.NS_URI_XSD_1999) || ns.equals(Constants.NS_URI_XSD_2000)))
-    {
-      int numatts = arg1.getLength();
-      for(int i = 0; i < numatts; i++)
-      {
-        String nonNormalizedValue = arg1.getNonNormalizedValue(i);
-        arg1.setValue(i, nonNormalizedValue);
-      }
-    }
-    super.startElement(arg0, arg1, arg2);
-    try
-    {
-      element = (Element)getProperty(CURRENT_ELEMENT_NODE);
-      ElementImpl elementImpl = (ElementImpl)element;
-      // Setting the user data with an identifier such as ElementLocation.KEY_NAME
-      // may be a long term good idea. The setUserData method with no id is used 
-      // to support JVMs with alternate versions of Xerces.
-      elementImpl.setUserData(new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()));
-    }
-    // catch SAXNotRecognizedException and SAXNotSupportedException if can't get element
-    catch (ClassCastException e)
-    {
-      //System.out.println(e);
-    }
-    catch (SAXNotRecognizedException e)
-    {
-      //System.out.println(e);
-    }
-    catch (SAXNotSupportedException e)
-    {
-      //System.out.println(e);
-    }
-  }
-
-  /**
-   * @see org.apache.xerces.xni.XMLDocumentHandler#startDocument(org.apache.xerces.xni.XMLLocator, java.lang.String, org.apache.xerces.xni.NamespaceContext, org.apache.xerces.xni.Augmentations)
-   */
-  public void startDocument(XMLLocator arg0, String arg1, NamespaceContext arg2, Augmentations arg3)
-    throws XNIException
-  {
-    locator = arg0;
-    super.startDocument(arg0, arg1, arg2, arg3);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java
deleted file mode 100644
index 0a6cfaf..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java
+++ /dev/null

@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.xerces.jaxp.SAXParserFactoryImpl;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * XMLCatalog This class can be used to register, obtain and delete an instance
- * of an XML catalog. Method definitions are provided for the catalog to set a
- * location in the catalog and resolve an entity from the catalog.
- */
-public class XMLCatalog implements IXMLCatalog
-{
-  private final static String _APACHE_FEATURE_CONTINUE_AFTER_FATAL_ERROR = "http://apache.org/xml/features/continue-after-fatal-error";
-
-  private final static String _APACHE_FEATURE_NAMESPACE_PREFIXES = "http://xml.org/sax/features/namespace-prefixes";
-
-  private final static String _APACHE_FEATURE_NAMESPACES = "http://xml.org/sax/features/namespaces";
-
-  private final static String _APACHE_FEATURE_VALIDATION = "http://xml.org/sax/features/validation";
-
-  private final static String _APACHE_FEATURE_VALIDATION_SCHEMA = "http://apache.org/xml/features/validation/schema";
-  
-  private final static String FILE_PROTOCOL = "file:///";
-
-  private static IXMLCatalog instance = null;
-
-  private static String extxmlcatalogclass = null;
-
-  private static ClassLoader extclassLoader = null;
-
-  private static IXMLCatalog extXMLCatalogInstance = null;
-
-  private static List schemadirs = new ArrayList();
-
-  private static List entities = new ArrayList();
-
-  /**
-   * A hashtable to hold the XML catalog entries.
-   */
-  protected Map catalog = new Hashtable();
-
-  /**
-   * Return an instance of the XML catalog. Assigns all registered schemas to
-   * the XML catalog.
-   * 
-   * @return The instance of the XML catalog.
-   */
-  public static IXMLCatalog getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new XMLCatalog();
-
-      // Add the registered entities to the catalog.
-      Iterator entityIter = entities.iterator();
-      while (entityIter.hasNext())
-      {
-        XMLCatalogEntityHolder entity = (XMLCatalogEntityHolder) entityIter.next();
-        instance.addEntryToCatalog(entity.getPublicId(), entity.getSystemId());
-      }
-
-      // Add the schemas in the schema directories to the catalog.
-      if (schemadirs.size() > 0)
-      {
-        SAXParser saxParser = null;
-        try
-        {
-          SAXParserFactory parserfactory = new SAXParserFactoryImpl();
-          parserfactory.setFeature(_APACHE_FEATURE_NAMESPACE_PREFIXES, true);
-          parserfactory.setFeature(_APACHE_FEATURE_NAMESPACES, true);
-          saxParser = parserfactory.newSAXParser();
-        }
-        catch (FactoryConfigurationError e)
-        {
-        }
-        catch (SAXNotRecognizedException e)
-        {
-        }
-        catch (ParserConfigurationException e)
-        {
-        }
-        catch (SAXNotSupportedException e)
-        {
-        }
-        catch (SAXException e)
-        {
-        }
-        Iterator schemadirIter = schemadirs.iterator();
-        SchemaNamespaceHandler handler = ((XMLCatalog) instance).new SchemaNamespaceHandler();
-        while (schemadirIter.hasNext())
-        {
-          String schemadir = (String) schemadirIter.next();
-          registerSchemasForDir(instance, schemadir, saxParser, handler);
-        }
-      }
-    }
-    return instance;
-  }
-
-  /**
-   * Register the schemas in the given directory and all subdirectories with the
-   * XML catalog.
-   * 
-   * @param catalog
-   *          The catalog to register the schemas with.
-   * @param schemadir
-   *          The schema directory to search for schema files.
-   * @param parser
-   *          The SAXParser to use to parse the schemas for their
-   *          targetNamespace.
-   * @param handler
-   *          The handler to use to get the targetNamespace.
-   */
-  private static void registerSchemasForDir(IXMLCatalog catalog, String schemadir, SAXParser parser,
-      SchemaNamespaceHandler handler)
-  {
-    // Remove file: and file:/ from beginning of file location if they are present.
-    if(schemadir.startsWith("file:"))
-    {
-      schemadir = schemadir.substring(5);
-    }
-    while(schemadir.startsWith("//"))
-    {
-      schemadir = schemadir.substring(1);
-    }
-    
-    File dir = new File(schemadir);
-    if (dir.isDirectory())
-    {
-      File[] files = dir.listFiles();
-      int numfiles = files.length;
-      for (int i = 0; i < numfiles; i++)
-      {
-        File tempfile = files[i];
-        String tempfilepath = tempfile.getAbsolutePath();
-        tempfilepath = tempfilepath.replace('\\','/');
-        while(tempfilepath.startsWith("/"))
-        {
-          tempfilepath = tempfilepath.substring(1);
-        }
-        tempfilepath = FILE_PROTOCOL + tempfilepath;
-        if (tempfile.isDirectory())
-        {
-          registerSchemasForDir(catalog, tempfilepath, parser, handler);
-        } else
-        {
-          handler.reset();
-          try
-          {
-            parser.parse(tempfilepath, handler);
-          }
-          catch (Exception e)
-          {
-            // TODO: log error.
-          }
-          String targetNamespace = handler.getTargetNamespace();
-          if (targetNamespace != null)
-          {
-            catalog.addEntryToCatalog(targetNamespace, tempfilepath);
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Get the instance of the extension XML catalog. Returns the instance if one
-   * is registered and can be created, null otherwise.
-   * 
-   * @return The instance of the extension XML catalog if one is registered,
-   *         null otherwise.
-   */
-  public static IXMLCatalog getExtensionCatalogInstance()
-  {
-    if (extXMLCatalogInstance == null)
-    {
-      if (extxmlcatalogclass != null && extclassLoader != null)
-      {
-        try
-        {
-          Class catalogClass = extclassLoader != null ? extclassLoader.loadClass(extxmlcatalogclass) : Class
-              .forName(extxmlcatalogclass);
-          extXMLCatalogInstance = (IXMLCatalog) catalogClass.newInstance();
-        }
-        catch (Exception e)
-        {
-          //TODO: Log error
-        }
-      }
-    }
-    return extXMLCatalogInstance;
-  }
-
-  /**
-   * Set the class of the XML catalog to be used.
-   * 
-   * @param xmlcatalog
-   *          The class of the XML catalog to be used.
-   * @param classloader
-   *          The classloader to use to load the catalog.
-   */
-  public static void setExtensionXMLCatalog(String xmlcatalog, ClassLoader classloader)
-  {
-    extxmlcatalogclass = xmlcatalog;
-    extclassLoader = classloader;
-  }
-
-  /**
-   * Resets the instance of the XML catalog to null. For deleting the catalog if
-   * necessary.
-   */
-  public static void reset()
-  {
-    instance = null;
-    extxmlcatalogclass = null;
-    extclassLoader = null;
-    extXMLCatalogInstance = null;
-    entities = new ArrayList();
-    schemadirs = new ArrayList();
-  }
-
-  /**
-   * Add a schema directory to be checked for schemas to register in the
-   * catalog.
-   * 
-   * @param schemadir
-   *          The directory to check for schemas.
-   */
-  public static void addSchemaDir(String schemadir)
-  {
-    schemadirs.add(schemadir);
-  }
-
-  /**
-   * Add an entity to the catalog.
-   * 
-   * @param entity
-   *          The entity to add to the catalog.
-   */
-  public static void addEntity(XMLCatalogEntityHolder entity)
-  {
-    entities.add(entity);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wsdl.validate.internal.xml.IXMLCatalog#addEntryToCatalog(java.lang.String,
-   *      java.lang.String)
-   */
-  public void addEntryToCatalog(String publicId, String systemId)
-  {
-    catalog.put(publicId, systemId);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wsdl.validate.internal.xml.IXMLCatalog#resolveEntityLocation(java.lang.String,
-   *      java.lang.String)
-   */
-  public String resolveEntityLocation(String publicId, String systemId)
-  {
-    String resolvedlocation = null;
-    // First try to resolve using the ext catalog.
-    IXMLCatalog extcatalog = getExtensionCatalogInstance();
-    if (extcatalog != null)
-    {
-      resolvedlocation = extcatalog.resolveEntityLocation(publicId, systemId);
-    }
-    if (resolvedlocation == null)
-    {
-      // if there's no system id use the public id
-      if (systemId == null || systemId.equals(""))
-      {
-        systemId = publicId;
-      }
-      resolvedlocation = (String) catalog.get(systemId);
-    }
-    return resolvedlocation;
-  }
-
-  /**
-   * A handler used in parsing to get the targetNamespace string of a schema.
-   */
-  protected class SchemaNamespaceHandler extends DefaultHandler
-  {
-    private final String TARGET_NAMESPACE = "targetNamespace";
-
-    private final String SCHEMA = "schema";
-
-    private String targetNamespace = null;
-
-    /**
-     * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
-     *      java.lang.String, java.lang.String, org.xml.sax.Attributes)
-     */
-    public void startElement(String uri, String localname, String arg2, Attributes attributes) throws SAXException
-    {
-      if (localname.equals(SCHEMA))
-      {
-
-        int numAtts = attributes.getLength();
-        for (int i = 0; i < numAtts; i++)
-        {
-
-          String attname = attributes.getQName(i);
-          if (attname.equals(TARGET_NAMESPACE))
-          {
-            targetNamespace = attributes.getValue(i);
-          }
-        }
-
-      }
-      super.startElement(uri, localname, arg2, attributes);
-    }
-
-    /**
-     * Return the targetNamespace found by parsing the file.
-     * 
-     * @return The targetNamespace found by parsing the file.
-     */
-    public String getTargetNamespace()
-    {
-      return targetNamespace;
-    }
-
-    /**
-     * Reset the state of the handler so it can be reused.
-     */
-    public void reset()
-    {
-      targetNamespace = null;
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogEntityHolder.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogEntityHolder.java
deleted file mode 100644
index 5eca6ac..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogEntityHolder.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-/**
- * A container to hold the entity information until an XML catalog is
- * to be initialized.
- */
-public class XMLCatalogEntityHolder
-{
-  private String publicId;
-  private String systemId;
-  
-  /**
-   * Constructor.
-   * 
-   * @param publicId The public id of the entity.
-   * @param systemId The system id of the entity.
-   */
-  public XMLCatalogEntityHolder(String publicId, String systemId)
-  {
-    this.publicId = publicId;
-    this.systemId = systemId;
-  }
-  
-  /**
-   * Returns the public id of the entity.
-   * @return The public id of the entity.
-   */
-  public String getPublicId()
-  {
-    return publicId;
-  }
-  
-  /**
-   * Returns the system id of the entity.
-   * @return The system id of the entity.
-   */
-  public String getSystemId()
-  {
-    return systemId;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java
deleted file mode 100644
index 0e850c0..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import java.io.IOException;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.wst.wsdl.validation.internal.util.LazyURLInputStream;
-
-/**
- * A resolver to resolver entities from the XML catalog.
- */
-public class XMLCatalogResolver implements XMLEntityResolver
-{
-  protected static XMLCatalogResolver xmlCatalog;
-
-  /**
-   * Constructor.
-   */
-  protected XMLCatalogResolver()
-  {
-  }
-
-  /**
-   * Get the instance of this resolver.
-   * 
-   * @return the instance of this resolver
-   */
-  public static XMLCatalogResolver getInstance()
-  {
-    if (xmlCatalog == null)
-    {
-      xmlCatalog = new XMLCatalogResolver();
-    }
-    return xmlCatalog;
-  }
-
-  /**
-   * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) throws XNIException, IOException
-  {
-    String publicId = resourceIdentifier.getPublicId();
-    if(publicId == null)
-    {
-      publicId = resourceIdentifier.getNamespace();
-    }
-    String systemId = resourceIdentifier.getLiteralSystemId();
-    String location = XMLCatalog.getInstance().resolveEntityLocation(publicId, systemId);
-    if (location != null)
-    {
-      LazyURLInputStream is = new LazyURLInputStream(location);
-      XMLInputSource inputSource = new XMLInputSource(publicId, systemId, systemId, is, null);
-      return inputSource;
-    }
-    // otherwise return null to tell the parser to locate the systemId as a URI
-    return null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLMessageInfoHelper.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLMessageInfoHelper.java
deleted file mode 100644
index 443ab84..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/org/eclipse/wst/wsdl/validation/internal/xml/XMLMessageInfoHelper.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-public class XMLMessageInfoHelper
-{
-  
-  //see org.eclipse.wst.xml.ui.reconcile.DelegatingSourceValidator
-  protected static final String ALL_ATTRIBUTES = "ALL_ATTRIBUTES";
-  protected static final String ATTRIBUTE_NAME ="ATTRIBUTE_NAME";
-  protected static final String ATTRIBUTE_VALUE = "ATTRIBUTE_VALUE";
-  protected static final String START_TAG = "START_TAG";
-  protected static final String TEXT = "TEXT";
-  protected static final String FIRST_NON_WHITESPACE_TEXT = "FIRST_NON_WHITESPACE_TEXT";
-  protected static final String TEXT_ENTITY_REFERENCE = "TEXT_ENTITY_REFERENCE"; 
-  protected static final String VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE = "VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE";
-  
-  
-  public XMLMessageInfoHelper()
-  {
-    super();
-  }
-
-  /**
-   *  returns an array containing information about what should be underlined with the red "squiggles"
-   *  using the errorKey, and the messageArguments
-   *  <br>Position 0 of the array returned contains the selection Strategy,or what DOM Element to underline.  
-   *  For example "ATTRIBUTE_NAME"  
-   *  <br>Position 1 contains the name or value to squiggle.
-   *  <p>For example, if we wanted to squiggle the attribute name of an attribute name
-   *  foo this method would return {"ATTRIBUTE_NAME", "foo"}
-   *  </p>
-   *  @param errorKey the error key given by the Xerces parser
-   *  @param messageArguments the arguments used by Xerces to "fill in the blanks" of their messages
-   *  @return an array containing the squiggle information
-   *  @see org.eclipse.wst.xml.ui.reconcile.DelegatingReconcileValidator
-   *  
-   */
-  public String[] createMessageInfo(String errorKey, Object[] messageArguments)
-  { 
-    String selectionStrategy = null;
-    String nameOrValue = null;
-
-    //XML Errors
-    if (errorKey.equals("cvc-complex-type.2.4.a") || errorKey.equals("cvc-complex-type.2.4.d") || errorKey.equals("cvc-complex-type.2.4.b") || errorKey.equals("MSG_CONTENT_INVALID")
-        | errorKey.equals("MSG_CONTENT_INCOMPLETE") || errorKey.equals("MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED") || errorKey.equals("cvc-complex-type.4"))
-    {
-      selectionStrategy = START_TAG;
-    }
-    else if (errorKey.equals("cvc-type.3.1.3"))
-    {
-      selectionStrategy = TEXT;
-    }
-    else if (errorKey.equals("cvc-complex-type.2.3"))
-    {
-    	selectionStrategy = FIRST_NON_WHITESPACE_TEXT;
-    }
-    else if (errorKey.equals("cvc-type.3.1.1"))
-    {
-      selectionStrategy = ALL_ATTRIBUTES;
-    }
-    else if (errorKey.equals("cvc-complex-type.3.2.2") || errorKey.equals("MSG_ATTRIBUTE_NOT_DECLARED"))
-    {
-      selectionStrategy = ATTRIBUTE_NAME;
-	  //in this case we need nameOrValue to be the name of the attribute to underline
-	  nameOrValue = (String)messageArguments[1];
-    }
-    else if (errorKey.equals("cvc-attribute.3") || errorKey.equals("MSG_ATTRIBUTE_VALUE_NOT_IN_LIST"))
-    {	
-    	selectionStrategy = ATTRIBUTE_VALUE;  
-		//in this case we need nameOrValue to be the name of the Attribute
-    	if (errorKey.equals("cvc-attribute.3"))
-    	{ nameOrValue = (String)messageArguments[1];
-    	}
-    	else if (errorKey.equals("MSG_ATTRIBUTE_VALUE_NOT_IN_LIST"))
-    	{	nameOrValue = (String)messageArguments[0];
-    	}
-    }
-    else if (errorKey.equals("cvc-elt.4.2"))
-    {	selectionStrategy=VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE;
-		//in this case we need nameOrValue to be the value of the attribute we want to unerline
-    	nameOrValue = (String)messageArguments[1];	
-    }
-    else if (errorKey.equals("EntityNotDeclared"))
-    {  	selectionStrategy=TEXT_ENTITY_REFERENCE;
-    }
-    
-    
-    //WSDL Errors
-    else if (errorKey.equals("_MESSAGE_UNDEFINED_FOR_OUTPUT") ||
-               errorKey.equals("_MESSAGE_UNDEFINED_FOR_INPUT") ||
-               errorKey.equals("_MESSAGE_UNDEFINED_FOR_FAULT"))
-    {
-      selectionStrategy=ATTRIBUTE_VALUE;
-      nameOrValue= "message";
-    }
-    else if (errorKey.equals("_PORTTYPE_UNDEFINED_FOR_BINDING"))
-    {
-      selectionStrategy=ATTRIBUTE_VALUE;
-      nameOrValue="type";
-    }
-    else if (errorKey.equals("_OPERATION_UNDEFINED_FOR_PORTTYPE"))
-    {
-      selectionStrategy=ATTRIBUTE_VALUE;
-      nameOrValue="name";
-    }
-    else if (errorKey.equals("_PART_INVALID_ELEMENT"))
-    {
-      selectionStrategy=ATTRIBUTE_VALUE;
-      nameOrValue="element";
-    }
-    else if (errorKey.equals("_NO_BINDING_FOR_PORT"))
-    {
-      selectionStrategy=ATTRIBUTE_VALUE;
-      nameOrValue="binding";
-    }
-    
-    String messageInfo[] = new String[2];
-    messageInfo[0] = selectionStrategy;
-    messageInfo[1] = nameOrValue;
-    return messageInfo;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdl.properties b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdl.properties
deleted file mode 100644
index 73d05de..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdl.properties
+++ /dev/null

@@ -1,55 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-!-- Constants for strings  
-
-!-- Warning Messages
-_WARN_NO_VALDIATOR                         = There is no registered validator for the namespace {0}.
-
-_ERROR_PROBLEM_WSDL_VALIDATOR              = A problem occurred while running the WSDL validator for namespace {0}.
-_ERROR_NO_WSDL_VALIDATOR                   = The namespace {0} specified is not a valid WSDL namespace.
-_ERROR_PROBLEM_EXT_VALIDATOR               = A problem occurred while running the Extension validator {0} for namespace {1}.
-
-!-- Strings for WSDL 1.1 validator
-                                                       
-_UNABLE_TO_IMPORT_BAD_LOCATION             = The {0} document could not be imported. Check that the document exists and that the location is correct.
-_UNABLE_TO_IMPORT_NO_LOCATION              = The location attribute is empty. A location must be specified for the location attribute.
-_UNABLE_TO_IMPORT_INVALID                  = The {0} document could not be imported because it is not valid. The document must be corrected before it can be imported.
-_NO_BINDING_FOR_PORT                       = The {0} port has an invalid binding - {1}. Check that the {1} binding is defined.
-_PORTTYPE_UNDEFINED_FOR_BINDING            = The {0} port type specified for the {1} binding is undefined. Check the {0} port type name and ensure it is defined.
-_OPERATION_UNDEFINED_FOR_PORTTYPE          = The operation specified for the {0} binding is not defined for port type {1}. All operations specified in this binding must be defined in port type {1}.
-_INPUT_NAME_NOT_UNIQUE                     = The name {0} specified for this input element is not unique. The name of an input element must be unique from the names of all other input and output elements defined in the {1} port type.
-_OUTPUT_NAME_NOT_UNIQUE                    = The name {0} specified for this output element is not unique. The name of an output element must be unique from the names of all other inputs and output elements defined in the {1} port type.
-_MESSAGE_UNDEFINED_FOR_INPUT               = The input element is referencing an undefined message {0}. Check that the message name and namespace are correct and that the message has been defined.
-_MESSAGE_UNDEFINED_FOR_OUTPUT              = The output element is referencing an undefined message {0}. Check that the message name and namespace are correct and that the message has been defined.
-_MESSAGE_UNDEFINED_FOR_FAULT               = The fault element is referencing an undefined message {0}. Check that the message name and namespace are correct and that the message has been defined.
-_DUPLICATE_FAULT_NAME                      = A fault with the name {0} has already been defined for the {1} 0peration. Check that every fault defined for this operation has a unique name.
-_PART_NO_ELEMENT_OR_TYPE                   = The part {0} does not have a type defined. Every part must specify a type from some type system. The type can be specified using the built in "element" or "type" attributes or may be specified using an extension attribute.
-_PART_BOTH_ELEMENT_AND_TYPE                = The part {0} has both an element and a type defined. Every part must only have an element or a type defined.
-_PART_INVALID_ELEMENT                      = The part {0} has an invalid value {1} defined for its element. Element declarations must refer to valid values defined in a schema.
-_PART_INVALID_TYPE                         = The part {0} has an invalid value {1} defined for its type. Type declarations must refer to valid values defined in a schema.
-_DUPLICATE_OPERATION_FOR_PORTTYPE          = An operation with the name {0} has already been defined for the {1} port type. Every operation defined for a port type must have a unique name. 
-_SERVICE_NAME_ALREADY_DEFINED              = A Service with the name {0} has already been defined. Every service in the WSDL document must have a unique name.
-_BINDING_NAME_ALREADY_DEFINED              = A binding with the name {0} has already been defined. Every binding in the WSDL document must have a unique name.
-_MESSAGE_NAME_ALREADY_DEFINED              = A message with the name {0} has already been defined. Every message in the WSDL document must have a unique name.
-_PORTTYPE_NAME_ALREADY_DEFINED             = A port type with the name {0} has already been defined. Every port type in the WSDL document must have a unique name.
-_MORE_THEN_ONE_ADDRESS_PORT                = An address has already been defined for port {0}. Each port can have only one address defined.
-_NO_ADDRESS_PORT                           = The port {0} has no address defined. Each port must define one address.
-_PORT_NAME_NOT_UNIQUE                      = A port with the name {0} has already been defined. Every port in the WSDL document must have a unique name.
-_OPERATION_NO_INPUT_OR_OUTPUT              = No input or output element has been defined for the {0} operation. An input element, an output element, or both must be defined for every operation.
-_WARN_SOAPENC_IMPORTED_PART                = The part {0} uses an element or type from the SOAP encoding namespace but the namespace has not been imported. The SOAP encoding namespace should be imported with an import statement before it is used.
-_WARN_SOAPENC_IMPORTED_SCHEMA              = The inline schema uses an element or type from the SOAP encoding namespace but the namespace has not been imported. The SOAP encoding namespace should be imported with an import statement before it is used.
-_REFERENCED_FILE_CONTAINS_ERRORS           = Referenced file contains errors ({0}).
-_WARN_OLD_SCHEMA_NAMESPACE                 = An old version of the schema namespace has been specified. {0} is the schema namespace that should be used.
-_ERROR_MULTIPLE_TYPES_DEFINED              = A types section has already been defined. Only one types element is allowed.
-_WARN_WRONG_NS_ON_IMPORT                   = The file cannot be imported because the namespace {0} does not match the target namespace {1} of the imported document.
-!-- Referenced file error
-!-- Note to translator - _REF_FILE_ERROR_MESSAGE needs a trailing space as another message may follow.
-_REF_FILE_ERROR_MESSAGE          = Referenced file contains errors ({0}). 

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlhttp.properties b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlhttp.properties
deleted file mode 100644
index 7e7afd0..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlhttp.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-_ERROR_NO_LOCATION_FOR_ADDRESS                   = No location has been specified for this address. Every address must have a valid location specified.
-_ERROR_INVALID_PORT_ELEMENT                      = The {0} element defined here is undefined for the HTTP namespace. The only valid element is "address".
-_ERROR_INVALID_BINDING_ELEMENT                   = The {0} element defined here is undefined for the HTTP namespace. The only valid element is "binding".
-_ERROR_INVALID_BINDING_OPERATION_ELEMENT         = The {0} element defined here is undefined for the HTTP namespace. The only valid element is "operation".
-_ERROR_INVALID_BINDING_INPUT_ELEMENT             = The {0} element defined here is undefined for the HTTP namespace. The only valid elements are "urlReplacement" and "urlEncoded".
-_ERROR_INVALID_HTTP_ELEMENT_FOR_LOCATION         = The {0} element cannot be specified here. This element is not defined in the HTTP namespace for use at this point.
-_ERROR_NO_HTTPBINDING_FOR_ADDRESS                = An HTTP address cannot be specified here as the {0} binding that the {1} port refers to does not have an HTTP binding element defined. There must be an HTTP binding element defined in order to specify an HTTP address for a binding.
-_ERROR_INVALID_BINDING_VERB                      = The {0} verb defined for the HTTP binding is invalid. The HTTP binding verb must be "GET" or "POST" and is case sensitive.
-_ERROR_INVALID_LOCATION_URI                      = The location URI is invalid for the HTTP operation. You must specify a valid location URI for every HTTP Operation.
-_ERROR_NO_HTTPBINDING_FOR_OPERATION              = The {0} binding that the HTTP operation is specified for does not have an HTTP binding defined. An HTTP binding must be defined in order to define an HTTP operation here.
-_ERROR_NO_HTTPOPERATION_FOR_URL                  = The {0} operation that the {1} HTTP element is specified for does not have an HTTP operation defined. A HTTP operation must be defined in order to define a {1} HTTP element here.
-_ERROR_NOT_ONLY_ELEMENT_DEFINED                  = The {0} HTTP element defined is not the only element defined for the input element. When {0} is defined it must be the only child element defined for the input element.

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlmime.properties b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlmime.properties
deleted file mode 100644
index 633e7bf..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlmime.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-                                                        

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlsoap.properties b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlsoap.properties
deleted file mode 100644
index 4a2b96e..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidate/validatewsdlsoap.properties
+++ /dev/null

@@ -1,45 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-                                                        
-_ERROR_NO_LOCATION_FOR_ADDRESS                   = No location has been specified for this address. Every address must have a valid location specified.
-_ERROR_INVALID_PORT_ELEMENT                      = The  {0} element defined here is undefined for the SOAP namespace. The only valid element is "address".
-_ERROR_INVALID_BINDING_STYLE                     = The {0} style defined for the SOAP binding in invalid. The SOAP binding style must be "rpc" or "document".
-_ERROR_INVALID_BINDING_URI                       = The transport URI has not been defined for the SOAP binding. You must specify a transport URI for every SOAP binding.
-_ERROR_INVALID_OPERATION_STYLE                   = The style specified for the SOAP operation is invalid. The SOAP operation style must be "rpc" or "document".
-_ERROR_INVALID_BINDING_ELEMENT                   = The {0} element defined here is undefined for the SOAP namespace. The only valid element is "binding".
-_ERROR_INVALID_BINDING_OPERATION_ELEMENT         = The {0} element defined here is undefined for the SOAP namespace. The only valid element is "operation".
-_ERROR_INVALID_HEADER_BODY_ELEMENT               = The {0} element defined here is undefined for the SOAP namespace. The only valid elements are "body", "header" and "headerfault".
-_ERROR_INVALID_FAULT_ELEMENT                     = The {0} element defined here is undefined for the SOAP namespace. The only valid element is "fault".
-
-!-- A SOAP body element in a WSDL document can have an attribute "use" defined to be either literal or encoded. --
-!-- This string is used in an error task in WSAD if the document specifies a use other then literal or encoded. -- 
-!-- For example, if the document specifies the use of the SOAP body as "simple" the output string should be:    --
-!-- The 'simple' use specified for the SOAP body is invalid. The use must be literal or encoded.                --
-_ERROR_INVALID_BODY_USE                          = The {0} use specified for the SOAP body is invalid. The use must be literal or encoded.
-_ERROR_INVALID_BODY_ENCODING_STYLE               = There is no encoding style URI defined for the SOAP body. You must specify at least one URI for the encoding style when the use is encoded.
-_ERROR_INVALID_BODY_PART_UNDEFINED               = The {0} part specified as a part for the SOAP body is undefined.  You can only specify defined parts.
-_ERROR_INVALID_BODY_PART_NOT_TYPE                = The {0} part does not have a type defined and has been specified for a SOAP body with its use encoded. When use is encoded on a SOAP body, all parts defined must only contain a valid type.
-_ERROR_INVALID_SOAP_ELEMENT_FOR_LOCATION         = The {0} element cannot be specified here. This element is not defined in the SOAP namespace for use at this point.
-_ERROR_NO_SOAPBINDING_FOR_ADDRESS                = A SOAP address cannot be specified here as the {0} binding that the {1} port refers to does not have a SOAP binding element defined. There must be a SOAP binding element defined in order to specify a SOAP address for a binding.
-_ERROR_HEADER_MESSAGE_UNDEFINED                  = The {0} message specified for the SOAP header is undefined. The message specified must be defined in the WSDL document.
-_ERROR_HEADER_PART_UNDEFINED                     = The {0} part specified in message {1} for the SOAP header is undefined. Ensure the part is defined in the {1} message.
-_ERROR_HEADER_USE_UNDEFINED                      = The {0} use specified for the SOAP header is invalid. The use must be specified as literal or encoded.
-_ERROR_HEADER_ENCODINGSTYLE_UNDEFINED            = The encoding style for the SOAP header is not specified. When the use is encoded the encoding style must specify at least one URI.
-_ERROR_HEADER_NAMESPACE_UNDEFINED                = The namespace for the SOAP header is not specified. When the use is encoded a namespace URI must be defined.
-_ERROR_HEADERFAULT_MESSAGE_UNDEFINED             = The {0} message specified for the SOAP header fault is undefined. The message specified must be defined in the WSDL document.
-_ERROR_HEADERFAULT_PART_UNDEFINED                = The {0} part specified in message {1} for the SOAP header fault is undefined. Ensure the part is defined in the {1} message. 
-_ERROR_HEADERFAULT_USE_UNDEFINED                 = The {0} use specified for the SOAP header fault is invalid. The use must be specified as literal or encoded.
-_ERROR_HEADERFAULT_ENCODINGSTYLE_UNDEFINED       = The encoding style for the SOAP header fault is not specified. When the use is encoded the encoding style must specify at least one URI.
-_ERROR_HEADERFAULT_NAMESPACE_UNDEFINED           = The namespace for the SOAP header fault is not specified. When the use is encoded a namespace URI must be defined.
-_ERROR_INVALID_FAULT_NAME                        = The {0} name specified for the SOAP fault is invalid. The name specified must be {1}, the name from the fault parent element.
-_ERROR_NO_SOAPBINDING_FOR_OPERATION              = The {0} binding that the SOAP operation is specified for does not have a SOAP binding defined. A SOAP binding must be defined in order to define a SOAP operation here.
-_ERROR_NO_SOAPBINDING_FOR_BODY                   = The {0} binding that the SOAP body is specified for does not have a SOAP binding defined. A SOAP binding must be defined in order to define a SOAP body here.
-_ERROR_NO_SOAPBINDING_FOR_HEADER                 = The {0} binding that the SOAP header is specified for does not have a SOAP binding defined. A SOAP binding must be defined in order to define a SOAP header here.
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/ExtensionValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/ExtensionValidator.java
deleted file mode 100644
index 6b9aa20..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/ExtensionValidator.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-/**
- * An extension Ant WSDL validator.
- */
-public class ExtensionValidator
-{
-  private String classname = null;
-  private String namespace = null;
-  private String resourcebundle = null;
-  
-  public void setClass(String classname)
-  {
-    this.classname = classname;
-  }
-  
-  public String getClassName()
-  {
-    return this.classname;
-  }
-  
-  public void setNamespace(String namespace)
-  {
-    this.namespace = namespace;
-  }
-  
-  public String getNamespace()
-  {
-    return this.namespace;
-  }
-  
-  public void setResourceBundle(String resourcebundle)
-  {
-    this.resourcebundle = resourcebundle;
-  }
-  
-  public String getResourceBundle()
-  {
-    return this.resourcebundle;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/URIResolver.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/URIResolver.java
deleted file mode 100644
index 2d66239..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/URIResolver.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-import org.apache.tools.ant.Task;
-
-/**
- * The URIResolver task allows specifying an extension URI resolver with
- * the WSDLValidate Ant task.
- */
-public class URIResolver extends Task
-{
-  private String clazz = null;
-  
-  /**
-   * Set the class name of the extension URI resolver.
-   * 
-   * @param clazz The class name of the extension URI resolver.
-   */
-  public void setClassName(String clazz)
-  {
-    this.clazz = clazz;
-  }
-  
-  /**
-   * Get the class name of the extension URI resolver.
-   * 
-   * @return The class name of the extension URI resolver.
-   */
-  public String getClassName()
-  {
-    return clazz;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java
deleted file mode 100644
index 5ad53d9..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java
+++ /dev/null

@@ -1,458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-import java.io.File;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.DTDLocation;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.XMLCatalog;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverDelegate;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-
-/**
- * An Ant task to run WSDL validation on a file or a set of files.
- * 
- * Options
- * - file - the file to run validation on (optional if fileset is used)
- * - failonerror - fail the build process on the first file with an error
- * - wsicompliance - how to report WS-I errors - REQUIRE, SUGGEST, IGNORE (defaults to REQUIRE)
- * 
- * Supported Nested Elements
- * - xmlcatalog - an xml catalog
- * - dtd        - a dtd specification as would appear in an xmlcatalog
- * - schema     - a schema specification as would appear in an xmlcatalog
- * - entity     - an entity specification as would appear in an xmlcatalog
- * - fileset    - a set of files to validate
- * - wsdl11validator - an extension WSDL 1.1 validator
- * - uriresolver - an extension URI resolver
- * 
- */
-public class WSDLValidate extends Task
-{
-  protected final String UI_PROPERTIES = "validatewsdlui";
-  protected final String VALIDATOR_PROPERTIES = org.eclipse.wst.wsdl.validation.internal.Constants.WSDL_VALIDATOR_PROPERTIES_FILE;
-  protected final String _ERROR_NO_FILE_SPECIFIED = "_ERROR_NO_FILE_SPECIFIED";
-  protected final String _UI_INFORMATION_DELIMITER = "_UI_INFORMATION_DELIMITER";
-  protected final String _UI_ACTION_VALIDATING_FILE = "_UI_ACTION_VALIDATING_FILE";
-  protected final String _UI_ERROR_MARKER = "_UI_ERROR_MARKER";
-  protected final String _UI_WARNING_MARKER = "_UI_WARNING_MARKER";
-  protected final String _UI_VALID = "_UI_VALID";
-  protected final String _UI_INVALID = "_UI_INVALID";
-  protected final String _EXC_UNABLE_TO_VALIDATE_FILE = "_EXC_UNABLE_TO_VALIDATE_FILE";
-  protected final String _EXC_WSDL_FAIL_ON_ERROR = "_EXC_WSDL_FAIL_ON_ERROR";
-  
-  protected final String FILE_PROTOCOL = "file:///";
-
-  // Global Vars
-  protected List filesets = new ArrayList();
-  protected String file = null;
-  protected Path classpath;
-  protected String xsdDirectory = null;
-  protected boolean failOnError = false;
-  protected XMLCatalog globalXMLCatalog = new XMLCatalog();
-  protected List wsdl11validators = new ArrayList();
-  protected List extvalidators = new ArrayList();
-  protected List extURIResolvers = new ArrayList();
-
-  /**
-   * Constuctor.
-   */
-  public WSDLValidate()
-  {
-  }
-
-  /**
-   * Tells the WSDL validate task to fail the build if an error is encountered.
-   * 
-   * @param failOnError Whether to fail on error or not.
-   */
-  public void setFailOnError(boolean failOnError)
-  {
-    this.failOnError = failOnError;
-  }
-
-  /**
-   * Set the directory where the base schema files for the catalog are located.
-   * 
-   * @param dir - the directory of the base schema files
-   */
-  public void setSchemaDir(String dir)
-  {
-    xsdDirectory = dir;
-  }
-
-  /**
-   * Set a file to run WSDL validation on.
-   * 
-   * @param file - a file to run validation on
-   */
-  public void setFile(String file)
-  {
-    this.file = file;
-  }
-
-  /**
-   * Create a set of files to run WSDL validation on.
-   * 
-   * @return the FileSet of files to run WSDL validation on
-   */
-  public FileSet createFileset()
-  {
-    FileSet fileset = new FileSet();
-    filesets.add(fileset);
-    return fileset;
-  }
-
-  /**
-   * Add an XML catalog to the validator.
-   * 
-   * @param catalog - the catalog to add to the validator
-   */
-  public void addConfiguredXMLCatalog(XMLCatalog catalog)
-  {
-    globalXMLCatalog.addConfiguredXMLCatalog(catalog);
-  }
-  /**
-   * Add an extension validator.
-   * 
-   * @param extVal The extension validator to add.
-   */
-  public void addConfiguredExtensionValidator(ExtensionValidator extVal)
-  {
-    extvalidators.add(extVal);
-  }
-  /**
-   * Add an extension WSDL 1.1 validator.
-   * 
-   * @param extVal The extension WSDL 1.1 validator to add.
-   */
-  public void addConfiguredWSDL11Validator(ExtensionValidator extVal)
-  {
-    wsdl11validators.add(extVal);
-  }
-
-  /**
-   * Allow specification of an entity outside of an XMLCatalog.
-   * 
-   * @return a DTDLocation with the specified entity
-   **/
-  public DTDLocation createEntity()
-  {
-    DTDLocation dtdLoc = new DTDLocation();
-    globalXMLCatalog.addEntity(dtdLoc);
-    return dtdLoc;
-  }
-
-  /**
-   * Allow specification of a DTD outside of an XMLCatalog.
-   * 
-   * @return a DTDLocation with the specified DTD
-   **/
-  public DTDLocation createDTD()
-  {
-    DTDLocation dtdLoc = new DTDLocation();
-    globalXMLCatalog.addEntity(dtdLoc);
-    return dtdLoc;
-  }
-  
-  /**
-   * Create a URIResolver extension.
-   * 
-   * @return A URIResolver.
-   */
-  public URIResolver createURIResolver()
-  {
-    URIResolver urires = new URIResolver();
-    extURIResolvers.add(urires.getClassName());
-    return urires;
-    
-  }
-
-  /**
-   * Get a list of all the files to run WSDL validation on. Takes the file and fileset
-   * and creates the list.
-   * 
-   * @return the list of files to be validated
-   */
-  protected List getFileList()
-  {
-    List files = new ArrayList();
-
-    // if a specific file was specified add it to the list
-    if (file != null)
-    {
-      try
-      {
-        URL url = new URL(file);
-        files.add(url.toExternalForm());
-      }
-      catch(Exception e)
-      {
-        File theFile = new File(file);
-        if(!theFile.isAbsolute())
-        {
-          theFile = new File(getProject().getBaseDir(), file);
-        }
-        String absFile = theFile.toString(); 
-        if(!absFile.startsWith("file:"))
-        {
-          absFile = FILE_PROTOCOL + absFile;
-        }
-        absFile = absFile.replace('\\','/');
-        files.add(absFile);
-      }
-    }
-
-    // go through all filesets specified and add all the files to the list
-    Iterator fsIter = filesets.iterator();
-    while (fsIter.hasNext())
-    {
-      FileSet fileset = (FileSet)fsIter.next();
-      DirectoryScanner ds = fileset.getDirectoryScanner(fileset.getProject());
-      String basedir = ds.getBasedir().toString() + File.separator;
-
-      String[] filelist = ds.getIncludedFiles();
-      int numFiles = filelist.length;
-      if (files != null && numFiles > 0)
-      {
-        for (int i = 0; i < numFiles; i++)
-        {
-          String absFile = FILE_PROTOCOL + basedir + filelist[i];
-          absFile = absFile.replace('\\','/');
-          files.add(absFile);
-        }
-      }
-    }
-    return files;
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.tools.ant.Task#execute()
-   */
-  public void execute() throws BuildException
-  {
-    // the resource bundles for the ui and validator are needed
-    MessageGenerator messGen = null;
-    try
-    {
-      ResourceBundle uiRB = ResourceBundle.getBundle(UI_PROPERTIES);
-      messGen = new MessageGenerator(uiRB);
-    }
-    catch (MissingResourceException e)
-    {
-      // if the resource bundles can't be opened we can't report error so throw an exception
-      throw new BuildException("Unable to open resource bundle. " + e);
-    }
-
-    // Set the XML catalog.
-    org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.setExtensionXMLCatalog(XMLCatalogImpl.class.getName(), getClass().getClassLoader());
-    XMLCatalogImpl xmlCatalog = (XMLCatalogImpl)org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.getExtensionCatalogInstance();
-    xmlCatalog.addXMLCatalog(globalXMLCatalog);
-    
-    WSDLValidator wsdlValidator = new WSDLValidator();
-    
-    // Set the extension URIResolvers.
-    Iterator resolversIter = extURIResolvers.iterator();
-    while(resolversIter.hasNext())
-    {
-      String resolverClass = (String)resolversIter.next();
-      wsdlValidator.addURIResolver(new URIResolverDelegate(resolverClass, getClass().getClassLoader()).getURIResolver());
-    }
-    
-    // Get the list of files to validate.
-    List files = getFileList();
-    
-    // Register the WSDL 1.1 extension validators.
-    Iterator wsdl11extIter = wsdl11validators.iterator();
-    while(wsdl11extIter.hasNext())
-    {
-      ExtensionValidator extVal = (ExtensionValidator)wsdl11extIter.next();
-      WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(extVal.getClassName(), extVal.getResourceBundle());
-      wsdlValidator.registerWSDL11Validator(extVal.getNamespace(), delegate);
-    }
-    
-    // Register the extension validators.
-    Iterator extIter = extvalidators.iterator();
-    while(extIter.hasNext())
-    {
-      ExtensionValidator extVal = (ExtensionValidator)extIter.next();
-      WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(extVal.getClassName(), extVal.getResourceBundle());
-      wsdlValidator.registerWSDLExtensionValidator(extVal.getNamespace(), delegate);
-    }
-
-    // The user didn't specify any files to validate.
-    if (files == null || files.isEmpty())
-    {
-      System.err.println(messGen.getString(_ERROR_NO_FILE_SPECIFIED));
-      return;
-    }
-
-    if (xsdDirectory != null)
-    {
-      org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.addSchemaDir(xsdDirectory);
-    }
-
-    // Validate all the files specified.
-    Iterator iFiles = files.iterator();
-
-    // Common strings needed in validation output.
-    String infoDelim = messGen.getString(_UI_INFORMATION_DELIMITER);
-    String valid = messGen.getString(_UI_VALID);
-    String invalid = messGen.getString(_UI_INVALID);
-    String errormarker = messGen.getString(_UI_ERROR_MARKER);
-    String warningmarker = messGen.getString(_UI_WARNING_MARKER);
-
-    StringBuffer result = null;
-    boolean notvalid = true;
-    while (iFiles.hasNext())
-    {
-      result = new StringBuffer();
-      notvalid = false;
-      String filename = (String)iFiles.next();
-      try
-      {
-        result.append(infoDelim).append("\n");
-        result.append(messGen.getString(_UI_ACTION_VALIDATING_FILE, filename)).append(" - ");
-
-        IValidationReport valReport = wsdlValidator.validate(filename);
-
-        IValidationMessage[] messages = valReport.getValidationMessages();
-
-        if (!valReport.hasErrors())
-        {
-          result.append(valid);
-        }
-        else
-        {
-          result.append(invalid);
-          notvalid = true;
-        }
-        result.append("\n").append(infoDelim).append("\n");
-
-        result.append(reportMessages(messages, errormarker, warningmarker));
-
-        System.out.println(result.toString());
-      }
-      catch (Exception e)
-      {
-        System.err.println(messGen.getString(_EXC_UNABLE_TO_VALIDATE_FILE, filename, e));
-      }
-      finally
-      {
-        if (notvalid && failOnError)
-        {
-          // To fail on error, throw a build exception.
-          throw new BuildException(messGen.getString(_EXC_WSDL_FAIL_ON_ERROR));
-        }
-      }
-    }
-
-    org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog.reset();
-
-  }
-
-  /**
-   * Return a string with formatted output for the messages.
-   * 
-   * @param messages The messages to report.
-   * @param errormarker The marker to use for error messages.
-   * @param warningmarker The marker to use for warning messages.
-   * @return A string with the formatted output.
-   */
-  protected String reportMessages(IValidationMessage[] messages, String errormarker, String warningmarker)
-  {
-    StringBuffer returnBuffer = new StringBuffer();
-
-    if (messages == null)
-      return returnBuffer.toString();
-
-    String prefix = null;
-    int numMessages = messages.length;
-    for(int i = 0; i < numMessages; i++)
-    {
-      IValidationMessage message = messages[i];
-
-      if(message.getSeverity() == IValidationMessage.SEV_ERROR)
-       {
-        prefix = errormarker;
-      }
-      else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
-       {
-        prefix = warningmarker;
-      }
-      else
-       {
-        prefix = "";
-      }if(message.getSeverity() == IValidationMessage.SEV_ERROR)
-       {
-        prefix = errormarker;
-      }
-      else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
-       {
-        prefix = warningmarker;
-      }
-      else
-       {
-        prefix = "";
-      }if(message.getSeverity() == IValidationMessage.SEV_ERROR)
-       {
-        prefix = errormarker;
-      }
-      else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
-       {
-        prefix = warningmarker;
-      }
-      else
-       {
-        prefix = "";
-      }if(message.getSeverity() == IValidationMessage.SEV_ERROR)
-       {
-        prefix = errormarker;
-      }
-      else if(message.getSeverity() == IValidationMessage.SEV_WARNING)
-       {
-        prefix = warningmarker;
-      }
-      else
-       {
-        prefix = "";
-      }
-      returnBuffer
-        .append(prefix)
-        .append(" ")
-        .append(message.getLine())
-        .append(":")
-        .append(message.getColumn())
-        .append(":")
-        .append(message.getMessage())
-        .append("\n");
-    }
-    return returnBuffer.toString();
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java
deleted file mode 100644
index 2f762b1..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-import org.apache.tools.ant.types.DTDLocation;
-import org.apache.tools.ant.types.XMLCatalog;
-import org.xml.sax.InputSource;
-
-/**
- * An implementation of the WSDL Validator's XML Catalog that uses the XML Catalog
- * from ant.
- */
-public class XMLCatalogImpl extends org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog
-{
-  protected XMLCatalog xmlCatalog = new XMLCatalog();
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog#addEntryToCatalog(java.lang.String, java.lang.String)
-   */
-  public void addEntryToCatalog(String publicId, String systemId)
-  {
-    DTDLocation resLoc = new DTDLocation();
-    resLoc.setLocation(systemId);
-    resLoc.setPublicId(publicId);
-    xmlCatalog.addEntity(resLoc);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog#resolveEntityLocation(java.lang.String, java.lang.String)
-   */
-  public String resolveEntityLocation(String publicId, String systemId)
-  {
-    String resolvedId = null;
-
-    try
-    {
-      InputSource is = xmlCatalog.resolveEntity(publicId, systemId);
-      if (is != null)
-      {
-        resolvedId = is.getSystemId();
-      }
-    }
-    // 
-    catch (Exception e)
-    {
-      // Do nothing if the resource can't be resolved.
-    }
-    // needs to return null if it can't resolve the id
-    if (resolvedId != null && resolvedId.equals(""))
-    {
-      resolvedId = null;
-    }
-    return resolvedId;
-  }
-
-  /**
-   * Add a configured XML Catalog to this catalog.
-   * 
-   * @param catalog A configured XML catalog to add to this catalog.
-   */
-  public void addXMLCatalog(XMLCatalog catalog)
-  {
-    xmlCatalog.addConfiguredXMLCatalog(catalog);
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverRegistryReader.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverRegistryReader.java
deleted file mode 100644
index aa85b8d..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverRegistryReader.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverDelegate;
-
-/**
- * Read extension URI resolvers.
- * 
- *  <extension
- *     point="org.eclipse.wst.wsdl.validation.uriresolver">
- *    <uriresolver
- *       class="org.eclipse.wst.wsdl.validation.someclass"/>
- *   </extension>
- *  
- */
-class URIResolverRegistryReader
-{
-  protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.validation";
-  protected static final String EXTENSION_POINT_ID = "uriresolver";
-  protected static final String ATT_CLASS = "class";
-  protected String tagName;
-
-  /**
-   * Constructor.
-   */
-  public URIResolverRegistryReader()
-  {
-  }
-
-  /**
-   * Read from plugin registry and handle the configuration elements that match
-   * the spedified elements.
-   */
-  public List readRegistry()
-  {
-  	List resolverList = new ArrayList();
-    IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
-    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        IExtensibleURIResolver resolver = readElement(elements[i]);
-        if(resolver != null)
-        {
-          resolverList.add(resolver);
-        }
-      }
-    }
-    return resolverList;
-  }
-
-  /**
-   * Parse and deal with the extension points.
-   * 
-   * @param element The extension point element.
-   */
-  protected IExtensibleURIResolver readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(EXTENSION_POINT_ID))
-    {
-      String resolverClass = element.getAttribute(ATT_CLASS);
-
-      if (resolverClass != null)
-      {
-        try
-        {
-          ClassLoader pluginLoader =
-            element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-            
-          return new URIResolverDelegate(resolverClass, pluginLoader).getURIResolver();
-        }
-        catch (Exception e)
-        {
-        }
-      }
-    }
-    return null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverWrapper.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverWrapper.java
deleted file mode 100644
index d00d0d3..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/URIResolverWrapper.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult;
-
-/**
- * An wrapper URI resolver that wraps the Web Standard Tools URI resolver
- * in a WSDL validator URI resolver.
- */
-public class URIResolverWrapper implements IExtensibleURIResolver
-{
-  /**
-   * Constructor.
-   */
-  public URIResolverWrapper()
-  {
-  }
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver#resolve(java.lang.String, java.lang.String, java.lang.String, org.eclipse.wst.wsdl.validation.internal.resolver.IURIResolutionResult)
-   */
-  public void resolve(String baseLocation, String publicId, String systemId, IURIResolutionResult result)
-  {
-    URIResolver resolver = URIResolverPlugin.createResolver();
-    String location = null;
-    if (publicId != null || systemId != null)
-    {  
-      location = resolver.resolve(baseLocation, publicId, systemId);
-    }  
-    
-    if (location != null)
-    {       
-      result.setLogicalLocation(location);
-      String physical = resolver.resolvePhysicalLocation(baseLocation, publicId, location);
-      if(physical != null)
-      {
-        result.setPhysicalLocation(physical);
-      }
-      else
-      {
-        result.setPhysicalLocation(location);
-      }
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLAction.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLAction.java
deleted file mode 100644
index 4a6cfa3..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLAction.java
+++ /dev/null

@@ -1,466 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.ValidationMessageImpl;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLMessageInfoHelper;
-import org.eclipse.wst.xml.ui.internal.validation.core.ValidateAction;
-
-/**
- * Eclipse action for running the WSDL validator. 
- */
-public class ValidateWSDLAction extends ValidateAction
-{
-  private static final String REFERENCED_FILE_ERROR_OPEN = "referencedFileError(";
-
-  private static final String REFERENCED_FILE_ERROR_CLOSE = ")";
-  private final String FILE_PROTOCOL = "file:///";
-
-  private static final String _UI_SAVE_DIRTY_FILE_MESSAGE = "_UI_SAVE_DIRTY_FILE_MESSAGE";
-
-  private static final String _UI_SAVE_DIRTY_FILE_TITLE = "_UI_SAVE_DIRTY_FILE_TITLE";
-  private static final String _UI_REF_FILE_ERROR_MESSAGE = "_UI_REF_FILE_ERROR_MESSAGE";
-  private static final String NESTED_ERRORS = "NESTED_ERRORS";
-
-  private InputStream inputStream = null;
-  /**
-   * Constructor.
-   * 
-   * @param file The file to validate.
-   * @param showDialog Whether to show a dialog with the status upon completion.
-   */
-  public ValidateWSDLAction(IFile file, boolean showDialog)
-  {
-  	super(file, showDialog);
-  }
-
-
-  /**
-   * Validate the given file and assign markers correspondingly to the file. If
-   * required, show a dialog with the results of the validation.
-   * 
-   * @param file The file to validate.
-   */
-  protected void validate(final IFile file)
-  {
-    final ValidationOutcome validationOutcome = new ValidationOutcome();
-    IWorkspaceRunnable op = new IWorkspaceRunnable()
-    {
-      public void run(IProgressMonitor progressMonitor) throws CoreException
-      {
-        WSDLValidator wsdlValidator = WSDLValidator.getInstance();
-        clearMarkers(file);
-        IValidationReport valReport = null;
-
-        String location = null;
-        try
-        {
-          location = file.getLocation().toFile().getCanonicalFile().getAbsolutePath();
-        }
-        catch (IOException e)
-        {
-          location = file.getLocation().toString();
-        }
-        location = location.replace('\\','/');
-        if (location.startsWith("/"))
-        {
-          valReport = wsdlValidator.validate(FILE_PROTOCOL + location.substring(1), inputStream);
-        }
-        else
-        {
-          valReport = wsdlValidator.validate(FILE_PROTOCOL + location, inputStream);
-        }
-        validationOutcome.isWSDLValid = valReport.isWSDLValid();
-        validationOutcome.isValid = !valReport.hasErrors();
-        if (valReport.getValidationMessages().length == 0)
-        {
-          validationOutcome.hasMessages = false;
-        }
-        else
-        {
-          validationOutcome.hasMessages = true;
-        }
-
-        createMarkers(file, convertValidationMessages(valReport.getValidationMessages()));
-        //createMarkers(file, validatormanager.getWarningList(), WARNING_MARKER);
-        
-        //file.setSessionProperty(ValidationMessage.ERROR_MESSAGE_MAP_QUALIFIED_NAME, valReport.getNestedMessages());
-        file.setSessionProperty(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.ERROR_MESSAGE_MAP_QUALIFIED_NAME, convertNestedValidationMessages(valReport.getNestedMessages()));
-      }
-    };
-
-    try
-    {
-      ResourcesPlugin.getWorkspace().run(op, null);
-
-      if (showDialog)
-      {
-        showDialog(validationOutcome);
-      }
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-  
-  /**
-   * Convert WSDL validation messages to validation framework messages.
-   * 
-   * @param messages The WSDL validation messages to convert.
-   * @return The converted validation messages.
-   */
-  private org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[] convertValidationMessages(IValidationMessage[] messages)
-  {
-  	int numMessages = messages.length;
-  	org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[] convertedMessages = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[numMessages];
-  	
-  	for(int i = 0; i < numMessages; i++)
-  	{
-  	  IValidationMessage mess = messages[i];
-      
-      org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage convertMess = null;
-      if (mess instanceof ValidationMessageImpl)
-      {   String errorKey = ((ValidationMessageImpl)mess).getErrorKey();
-          Object[] messageArgs = ((ValidationMessageImpl)mess).getMessageArguments();
-          convertMess = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage(mess.getMessage(), mess.getLine(), mess.getColumn(), mess.getURI(), errorKey, messageArgs);
-      }
-      else
-      {
-         convertMess = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage(mess.getMessage(),mess.getLine(),mess.getColumn(), mess.getURI());
-      }
-  	  if(mess.getSeverity() == IValidationMessage.SEV_WARNING)
-	  {
-	  	convertMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_LOW);
-	  }
-	  else
-	  {
-	  	convertMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_HIGH);
-	  }
-  	  
-  	  // Convert any nested messages.
-  	  List nestedMessages = mess.getNestedMessages();
-  	  if(nestedMessages != null && !nestedMessages.isEmpty())
-  	  {
-  	  	Iterator nestedIter = nestedMessages.iterator();
-  	    while(nestedIter.hasNext())
-        {
-          IValidationMessage nestedMess = (IValidationMessage)nestedIter.next();
-    	  org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage convertNestedMess = new org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage(nestedMess.getMessage(),nestedMess.getLine(),nestedMess.getColumn(), nestedMess.getURI());
-    	  if(nestedMess.getSeverity() == IValidationMessage.SEV_WARNING)
-    	  {
-    	  	convertNestedMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_LOW);
-    	  }
-    	  else
-    	  {
-    	  	convertNestedMess.setSeverity(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage.SEV_HIGH);
-    	  }
-    	  convertMess.addNestedMessage(convertNestedMess);
-        }
-  	  }
-  	  convertedMessages[i] = convertMess;
-  	}
-  	return convertedMessages;
-  }
-  
-  /**
-   * Convert the nested messages hashmap.
-   * 
-   * @param nestedMessages The nested messages hashmap to convert.
-   * @return A hashmap with the converted validation messages.
-   */
-  private HashMap convertNestedValidationMessages(HashMap nestedMessages)
-  {
-  	HashMap convertedMap = new HashMap();
-  	
-  	Set keySet = nestedMessages.keySet();
-  	Iterator keysIter = keySet.iterator();
-  	while(keysIter.hasNext())
-  	{
-  	  String key = (String)keysIter.next();
-  	  IValidationMessage message = (IValidationMessage)nestedMessages.get(key);
-  	  org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage[] convertedMessage = convertValidationMessages(new IValidationMessage[]{message});
-  	  
-  	  convertedMap.put(key, convertedMessage[0]);
-  	}
-  	return convertedMap;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.jface.action.IAction#run()
-   */
-//  public void run()
-//  {
-//    // Only run the validation if the file exists and is available.
-//    if (fileIsOK(file))
-//    {
-//      if (showDialog)
-//      {
-//        // Check if the file is dirty - prompts user to save.
-//        checkIfFileDirty(file);
-//      }
-//      super.run();
-//    }
-//  }
-
-  /**
-   * Test whether the file given is OK to use. A file is OK to use if 1. It is
-   * not null 2. It exists. 3. The project containing the file is accessible.
-   * 
-   * @param file The file to check to see if it is OK to validate.
-   * @return True if the file is OK to validate, false otherwise.
-   */
-//  protected boolean fileIsOK(IFile file)
-//  {
-//    if (file != null && file.exists() && file.getProject().isAccessible())
-//    {
-//      return true;
-//    }
-//    return false;
-//  }
-
-  /**
-   * Check if the file is dirty. A file is dirty if there is an open editor for
-   * the file that contains changes that haven't been saved.
-   * 
-   * @param file The file to check to see if it is dirty.
-   */
-//  protected void checkIfFileDirty(IFile file)
-//  {
-//    IEditorPart[] dirtyEditors = ValidateWSDLPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getDirtyEditors();
-//
-//    int numeditors = dirtyEditors.length;
-//    for (int i = 0; i < numeditors; i++)
-//    {
-//      IEditorInput editorInput = dirtyEditors[i].getEditorInput();
-//      if (editorInput instanceof FileEditorInput)
-//      {
-//        FileEditorInput fileEditorInput = (FileEditorInput) editorInput;
-//        if (fileEditorInput.getFile().equals(file))
-//        {
-//          String message = ValidateWSDLPlugin.getInstance().getString(_UI_SAVE_DIRTY_FILE_MESSAGE);
-//          String title = ValidateWSDLPlugin.getInstance().getString(_UI_SAVE_DIRTY_FILE_TITLE);
-//          if (MessageDialog.openQuestion(Display.getDefault().getActiveShell(), title, message))
-//          {
-//            dirtyEditors[i].doSave(null);
-//          }
-//          // There can only be one open editor/file so we can break.
-//          break;
-//        }
-//      }
-//
-//    }
-//  }
-
-  /**
-   * Create a marker on the file of the indicated type for each
-   * ValidationMessage in the array.
-   * 
-   * @param iFile
-   *          The file to add the markers to.
-   * @param valMessages
-   *          The array of messages to add as markers.
-   */
-//  public void createMarkers(IFile iFile, ValidationMessage[] valMessages)
-//  {
-//    if (!fileIsOK(iFile))
-//    {
-//      return;
-//    }
-//    int numValMessages = valMessages.length;
-//    for (int i = 0; i < numValMessages; i++)
-//    {
-//      ValidationMessage validationMessage = valMessages[i];
-//
-//      int line = validationMessage.getLine();
-//      int column = validationMessage.getColumn();
-//      String message = validationMessage.getMessage();
-//      int severity = validationMessage.getSeverity();
-//      IMarker marker = null;
-//      
-//      boolean hasNestedErrors = false;
-//      List nestederrors = validationMessage.getNestedMessages();
-//      if(nestederrors != null && !nestederrors.isEmpty())
-//      {
-//        hasNestedErrors = true;
-//        message += ValidateWSDLPlugin.getInstance().getString(_UI_REF_FILE_ERROR_MESSAGE); 
-//      }
-//      if (severity == ValidationMessage.SEV_ERROR)
-//      {
-//        marker = getOrCreateReporter().addErrorMessage(iFile, message, line, column);
-//      }
-//      else if (severity == ValidationMessage.SEV_WARNING)
-//      {
-//        marker = getOrCreateReporter().addWarningMessage(iFile, message, line, column);
-//      }
-//      
-//      if (hasNestedErrors && marker != null)
-//      {
-//        try
-//        {
-//          marker.setAttribute("groupName", REFERENCED_FILE_ERROR_OPEN + validationMessage.getURI() + REFERENCED_FILE_ERROR_CLOSE);
-//          marker.setAttribute(IMarker.DONE, true);
-//        }
-//        catch(CoreException e)
-//        {
-//        }
-//      }
-//      
-//    }
-//  }
-
-  /**
-   * Show a dialog containing the status of the validation. Will display valid
-   * or invalid depending on whether there are errors or not.
-   * 
-   * @param validationOutcome
-   *          The outcome of the validation.
-   */
-  public void showDialog(ValidationOutcome validationOutcome)
-  {
-    String title, message;
-    if (validationOutcome.isValid)
-    {
-      if (validationOutcome.hasMessages)
-      {
-        showProblemsView();
-        title = ValidateWSDLPlugin.getInstance().getString("_VALIDATION_SUCCEEDED");
-        message = ValidateWSDLPlugin.getInstance().getString("_UI_THE_WSDL_FILE_IS_VALID_WITH_WARNINGS");
-        MessageDialog.openWarning(Display.getDefault().getActiveShell(), title, message);
-      }
-      else
-      {
-        title = ValidateWSDLPlugin.getInstance().getString("_VALIDATION_SUCCEEDED");
-        message = ValidateWSDLPlugin.getInstance().getString("_UI_THE_WSDL_FILE_IS_VALID");
-        MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message);
-      }
-
-    }
-    else
-    {
-      if (validationOutcome.isWSDLValid)
-      {
-        title = ValidateWSDLPlugin.getInstance().getString("_VALIDATION_FAILED");
-        message = ValidateWSDLPlugin.getInstance().getString("_UI_THE_WSDL_FILE_IS_VALID_WSDL11");
-      }
-      else
-      {
-        title = ValidateWSDLPlugin.getInstance().getString("_VALIDATION_FAILED");
-        message = ValidateWSDLPlugin.getInstance().getString("_UI_THE_WSDL_FILE_IS_NOT_VALID");
-      }
-      showProblemsView();
-      MessageDialog.openError(Display.getDefault().getActiveShell(), title, message);
-    }
-
-  }
-  
-  /**
-   * Show the problems view if it is not already visible.
-   */
-//  protected void showProblemsView()
-//  {
-//    IWorkbenchWindow dw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-//    IWorkbenchPage page = dw.getActivePage();
-//    IWorkbenchPart activePart = page.getActivePart();
-//    try
-//    {
-//      if (page != null)
-//      {
-//        page.showView("org.eclipse.ui.views.ProblemView");
-//      }
-//    }
-//    catch (PartInitException e)
-//    {
-//    }
-//    page.activate(activePart);
-//  }
-
-  /**
-   * If a reporter doesn't exist creates it or uses the reporter already
-   * created.
-   * 
-   * @return a reporter
-   */
-//  protected IReporter getOrCreateReporter()
-//  {
-//    if (reporter == null)
-//    {
-//      reporter = new WorkbenchReporter(file.getProject(), new NullProgressMonitor());
-//    }
-//    return reporter;
-//  }
-
-  /**
-   * Clear all the markers on the given resource generated by this validator.
-   * 
-   * @param resource -
-   *          the resrouce to clear all the markers from
-   */
-//  public void clearMarkers(IResource resource)
-//  {
-//    getOrCreateReporter().removeAllMessages(resource);
-//  }
-
-  protected class ValidationOutcome
-  {
-    public boolean isValid = true;
-
-    public boolean isWSDLValid = true;
-
-    public boolean hasMessages = false;
-
-    public ValidationOutcome()
-    {
-    }
-  }
-
-  public void setInputStream(InputStream inputStream)
-  {  this.inputStream = inputStream;
-  }
-  
-  /**
-   * Set extra attributes in the IMessage to provide information on what should be "squiggled"
-   * @param valMess the ValidationMessage corresponding to this error
-   * @param message the IMessage to set the attributes for
-   */
-  protected void addInfoToMessage(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage valMess, IMessage message)
-  {   if (valMess.getKey() != null)
-      {
-          XMLMessageInfoHelper helper = new XMLMessageInfoHelper();
-          String[] squiggleInfo = helper.createMessageInfo(valMess.getKey(), valMess.getMessageArguments());
-      
-          message.setAttribute(COLUMN_NUMBER_ATTRIBUTE, new Integer(valMess.getColumnNumber()));
-          message.setAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE, squiggleInfo[0]);
-          message.setAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE, squiggleInfo[1]);
-      }
-  }
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLActionDelegate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLActionDelegate.java
deleted file mode 100644
index 40199de..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLActionDelegate.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-
-/**
- * An action delegate for the WSDL validator.
- */
-public class ValidateWSDLActionDelegate implements IActionDelegate
-{
-  protected ISelection selection;
-  protected void validate(IFile file)
-  {
-    ValidateWSDLAction validateAction = new ValidateWSDLAction(file, true);
-    validateAction.setValidator(new Validator());
-    validateAction.run();	
-  }
- 
-  /**
-   * @see org.eclipse.ui.IActionDelegate#run(IAction)
-   */
-  public void run(IAction action)
-  {
-  	IFile file = null;
-    if (!selection.isEmpty() && selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-      Object element = structuredSelection.getFirstElement();
-
-      if (element instanceof IFile)
-      {
-        file = (IFile) element;
-      }
-      else
-      {
-        return;
-      }
-    }
-          
-    if (file != null)
-    {          
-      validate(file);
-    }
-  }
-
-  /**
-   * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
-   */
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-  	this.selection = selection;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLPlugin.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLPlugin.java
deleted file mode 100644
index 6b66003..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/ValidateWSDLPlugin.java
+++ /dev/null

@@ -1,511 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.wsdl.validation.internal.Constants;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalogEntityHolder;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class required for eclipse.
- */
-public class ValidateWSDLPlugin extends AbstractUIPlugin
-{
-  protected final String PROPERTIES_FILE = "validatewsdlui";
-  protected static ValidateWSDLPlugin instance;
-  protected ResourceBundle resourcebundle = null;
-  protected ResourceBundle wsdlValidatorResourceBundle = null;
-
-  /**
-   * Constructor.
-   */
-  public ValidateWSDLPlugin()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-   */
-  public void start(BundleContext context) throws Exception
-  {
-    super.start(context);
-    instance = this;
-    wsdlValidatorResourceBundle = ResourceBundle.getBundle(Constants.WSDL_VALIDATOR_PROPERTIES_FILE);
-    resourcebundle = ResourceBundle.getBundle(PROPERTIES_FILE);
-
-    // Configure the XML catalog.
-    new ExtXMLCatalogPluginRegistryReader().readRegistry();
-    new WSDLValidatorPluginRegistryReader(
-      "extvalidator",
-      "extvalidator",
-      WSDLValidatorPluginRegistryReader.EXT_VALIDATOR)
-      .readRegistry();
-
-    // register any WSDL 1.1 validators defined
-    new WSDL11ValidatorPluginRegistryReader("wsdl11validator", "validator").readRegistry();
-  }
-  /* (non-Javadoc)
-   * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-   */
-  public void stop(BundleContext context) throws Exception
-  {
-    super.stop(context);
-    XMLCatalog.reset();
-  }
-  
-  /**
-   * Return the instance of this plugin object.
-   * 
-   * @return the instance of this plugin object
-   */
-  public static ValidateWSDLPlugin getInstance()
-  {
-    return instance;
-  }
-
-  /**
-   * Get the install URL of this plugin.
-   * 
-   * @return the install url of this plugin
-   */
-  public String getInstallURL()
-  {
-    try
-    {
-      return Platform.resolve(getBundle().getEntry("/")).getFile();
-    }
-    catch (IOException e)
-    {
-      return null;
-    }
-  }
-
-  /*************************************************************
-   * ResourceBundle helper methods
-   * 
-   *************************************************************/
-  /**
-   * Returns the resource bundle for this plugin.
-   * 
-   * @return the resource bundle for this plugin
-   */
-  public ResourceBundle getResourceBundle()
-  {
-    return resourcebundle;
-  }
-
-  /**
-   * Returns the resource bundle for the WSDL validator.
-   * 
-   * @return the resource bundle for the WSDL validator
-   */
-  public ResourceBundle getWSDLValidatorResourceBundle()
-  {
-    return wsdlValidatorResourceBundle;
-  }
-
-  /**
-   * Returns the string for the given id.
-   * 
-   * @param stringID - the id for the string
-   * @return the string for the given id
-   */
-  public String getString(String stringID)
-  {
-    return getResourceBundle().getString(stringID);
-  }
-}
-
-/**
- * This class reads the plugin manifests and registers each WSDLExtensionValidator
- */
-class WSDLValidatorPluginRegistryReader
-{
-  protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.validation";
-  protected static final String ATT_CLASS = "class";
-  protected static final String ATT_NAMESPACE = "namespace";
-  protected static final String ATT_RESOURCEBUNDLE = "resourcebundle";
-  protected static final int WSDL_VALIDATOR = 0;
-  protected static final int EXT_VALIDATOR = 1;
-  protected String extensionPointId;
-  protected String tagName;
-  protected int validatorType;
-
-  /**
-   * 
-   */
-  public WSDLValidatorPluginRegistryReader(String extensionPointId, String tagName, int validatorType)
-  {
-    this.extensionPointId = extensionPointId;
-    this.tagName = tagName;
-    this.validatorType = validatorType;
-  }
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
-    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, extensionPointId);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  /**
-   * readElement() - parse and deal with an extension like:
-   *
-   * <extension point="org.eclipse.validate.wsdl.WSDLExtensionValidator"
-   *            id="soapValidator"
-   *            name="SOAP Validator">>
-   *   <validator>
-   *        <run class=" org.eclipse.validate.wsdl.soap.SOAPValidator"/>
-   *   </validator>
-   *   <attribute name="namespace" value="http://schemas.xmlsoap.org/wsdl/soap/"/>
-   * </extension>
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(tagName))
-    {
-      String validatorClass = element.getAttribute(ATT_CLASS);
-      String namespace = element.getAttribute(ATT_NAMESPACE);
-      String resourceBundle = element.getAttribute(ATT_RESOURCEBUNDLE);
-
-      if (validatorClass != null)
-      {
-        try
-        {
-          //          ClassLoader pluginLoader =
-          //            element.getDeclaringExtension().getDeclaringPluginDescriptor().getPlugin().getClass().getClassLoader();
-          //				modified to resolve certain situations where the plugin has not been initialized
-
-          ClassLoader pluginLoader =
-            element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-          
-//          if (validatorType == WSDL_VALIDATOR)
-//           {
-//            WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(validatorClass, resourceBundle, pluginLoader);
-//            WSDLValidator.getInstance().registerWSDL11Validator(namespace, delegate);
-//          }
-          if (validatorType == EXT_VALIDATOR)
-           {
-            WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(validatorClass, resourceBundle, pluginLoader);
-            WSDLValidator.getInstance().registerWSDLExtensionValidator(namespace, delegate);
-          }
-//          registerWSDLValidatorPluginExtensionWithClassName(
-//            pluginLoader,
-//            WSDLValidatorExtensionClass,
-//            WSDLValidatorExtensionNamespace);
-        }
-        catch (Exception e)
-        {
-        }
-      }
-    }
-  }
-
-  /**
-   * Register the extension validator with the given class name and namespaces.
-   * 
-   * @param classLoader - the class loader to create the validator
-   * @param className - the name of the extension validator
-   * @param namespace - the namespace of the extension validator
-   * @throws Exception
-   */
-//  protected void registerWSDLValidatorPluginExtensionWithClassName(
-//    ClassLoader classLoader,
-//    String className,
-//    String namespace)
-//    throws Exception
-//  {
-//    try
-//    {
-//      Class validatorExtensionClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-//
-//      
-//      //IValidatorExtensionPlugin validatorHandler = (IValidatorExtensionPlugin)validatorExtensionClass.newInstance();
-//      //add(namespace, validatorHandler.getValidator());
-//    }
-//    catch (Exception e)
-//    {
-//      //System.out.println(e.getMessage());
-//      //TODO: write the error message to the log file - use custom log writer class
-//      //ValidateWSDLPlugin.getInstance().getMsgLogger().write("WSDL Validator could not register the extension validator." + e.getMessage());	
-//    }
-//  }
-
-  /**
-   * Register the loaded validator.
-   * 
-   * @param namespace - the namespace of the validator
-   * @param validatorExtension - the extension validator
-   */
-//  protected void add(String namespace, IWSDLValidator validatorExtension)
-//  {
-//    if (validatorType == WSDL_VALIDATOR)
-//    {
-//      WSDLConfigurator.registerWSDLValidator(namespace, validatorExtension);
-//    }
-//    else if (validatorType == WSI_VALIDATOR)
-//    {
-//      WSDLConfigurator.registerWSIValidator(namespace, validatorExtension);
-//    }
-//  }
-}
-
-/**
- * Read WSDl 1.1 extension validators.
- * 
- *  <extension
- *     point="com.ibm.etools.validation.validator"
- *     id="wsdlValidator"
- *     name="%_UI_WSDL_VALIDATOR">
- *    <wsdl11validator
- *       namespace="http://schemas.xmlsoap.org/wsdl/soap/"
- *       class="org.eclipse.wsdl.validate.soap.wsdl11.SOAPValidator"
- *       resourcebundle="validatewsdlsoap"/>
- *   </extension>
- *  
- */
-class WSDL11ValidatorPluginRegistryReader
-{
-  protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.validation";
-  protected static final String ATT_CLASS = "class";
-  protected static final String ATT_NAMESPACE = "namespace";
-  protected static final String ATT_RESOURCEBUNDLE = "resourcebundle";
-  protected String extensionPointId;
-  protected String tagName;
-
-  /**
-   * Constructor.
-   * 
-   * @param extensionPointId - the id of the extension point
-   * @param tagName - the tag name of the extension point
-   */
-  public WSDL11ValidatorPluginRegistryReader(String extensionPointId, String tagName)
-  {
-    this.extensionPointId = extensionPointId;
-    this.tagName = tagName;
-  }
-
-  /**
-   * Read from plugin registry and handle the configuration elements that match
-   * the spedified elements.
-   */
-  public void readRegistry()
-  {
-    IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
-    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, extensionPointId);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  /**
-   * Parse and deal with the extension points.
-   * 
-   * @param element The extension point element.
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(tagName))
-    {
-      String validatorClass = element.getAttribute(ATT_CLASS);
-      String namespace = element.getAttribute(ATT_NAMESPACE);
-      String resourceBundle = element.getAttribute(ATT_RESOURCEBUNDLE);
-
-      if (validatorClass != null && namespace != null)
-      {
-        try
-        {
-          ClassLoader pluginLoader =
-            element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-          WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(validatorClass, resourceBundle, pluginLoader);
-          WSDLValidator.getInstance().registerWSDL11Validator(namespace, delegate);
-        }
-        catch (Exception e)
-        {
-        }
-      }
-    }
-  }
-}
-
-/**
- * This class reads the plugin manifests and registers each WSDLExtensionValidator
- */
-class ExtXMLCatalogPluginRegistryReader
-{
-  protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.validation";
-  protected static final String EXTENSION_POINT_ID = "xmlcatalog";
-  
-  /**
-   * The xmlcatalog element allow adding an extension XML Catalog such as
-   * <xmlcatalog class="org.eclipse.wsdl.validate.ExtXMLCatalog">
-   */
-  protected static final String EXT_CATALOG_TAG_NAME = "xmlcatalog";
-  protected static final String ATT_CLASS = "class";
-  
-  /**
-   * The entity element allows adding specific XML catalog entities such as
-   * <entity
-   *   publicid="http://schemas.xmlsoap.org/wsdl/" 
-   *   systemid="xsd/wsdl.xsd" />
-   */
-  protected static final String ENTITY_TAG_NAME = "entity";
-  protected static final String ATT_PUBLIC_ID = "publicId";
-  protected static final String ATT_SYSTEM_ID = "location";
-  
-  /**
-   * The schemadir element allows adding a director of schemas to the XML catalog such as
-   * <schemadir location="c:\myschemadir" />
-   * Note: It is more expensive to use this method then the entity method
-   * of adding schemas to the catalog as this method requires that all of
-   * the schemas be read.
-   */
-  protected static final String SCHEMA_DIR_TAG_NAME = "schemadir";
-  protected static final String ATT_LOCATION = "location";
-  protected String pluginId, extensionPointId;
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-    IExtensionPoint point = extensionRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  /**
-   * readElement() - parse and deal with an extension like:
-   *
-   * <extension point="com.ibm.etools.validate.wsdl.WSDLExtensionValidator"
-   *            id="soapValidator"
-   *            name="SOAP Validator">>
-   *   <validator>
-   *        <run class=" com.ibm.etools.validate.wsdl.soap.SOAPValidator"/>
-   *   </validator>
-   *   <attribute name="namespace" value="http://schemas.xmlsoap.org/wsdl/soap/"/>
-   * </extension>
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    String elementname = element.getName();
-    // Extension XML Catalogs.
-    if (elementname.equals(EXT_CATALOG_TAG_NAME))
-    {
-      String xmlCatalogClass = element.getAttribute(ATT_CLASS);
-
-      if (xmlCatalogClass != null)
-      {
-        try
-        {
-          // modified to resolve certain situations where the plugin has not been initialized
-          ClassLoader pluginLoader =
-            element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-          //					ClassLoader pluginLoader =
-          //						element.getDeclaringExtension().getDeclaringPluginDescriptor().getPlugin().getClass().getClassLoader();
-          XMLCatalog.setExtensionXMLCatalog(xmlCatalogClass, pluginLoader);
-        }
-        catch (Exception e)
-        {
-          System.out.println(e);
-        }
-      }
-    }
-    // XML Catalog entites.
-    else if(elementname.equals(ENTITY_TAG_NAME))
-    {
-      String publicid = element.getAttribute(ATT_PUBLIC_ID);
-      String systemid = element.getAttribute(ATT_SYSTEM_ID);
-      if(publicid == null || systemid == null)
-      {
-        return;
-      }
-      Bundle bundle = Platform.getBundle(element.getDeclaringExtension().getNamespace());
-      systemid = getAbsoluteLocation(systemid, bundle);
-      
-      XMLCatalog.addEntity(new XMLCatalogEntityHolder(publicid, systemid));
-    }
-    // Schema directories for the XML Catalog.
-    else if(elementname.equals(SCHEMA_DIR_TAG_NAME))
-    {
-      String location = element.getAttribute(ATT_LOCATION);
-      if(location != null)
-      {
-        Bundle bundle = Platform.getBundle(element.getDeclaringExtension().getNamespace());
-        location = getAbsoluteLocation(location, bundle);
-        XMLCatalog.addSchemaDir(location);
-      }
-    }
-  }
-
-  private String getAbsoluteLocation(String location, Bundle bundle)
-  {
-    URL url = null;
-    if(bundle != null)
-    {
-      url = bundle.getEntry(location);
-    }
-    
-    if(url != null)
-    {
-      try
-      {
-        url = Platform.resolve(url);
-        return url.toExternalForm();
-      }
-      catch(IOException e)
-      {
-        //Unable to register the schema.
-      }
-    }
-    return location;
-  }
-}
-
-
-

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/Validator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/Validator.java
deleted file mode 100644
index b1a750b..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/Validator.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IRuleGroup;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.core.internal.validation.core.Helper;
-
-
-/**
- * A validator to plug the WSDL validator into the validation framework.
- */
-public class Validator implements IValidator
-{
-
-  /**
-   * Validate the given IFile.
-   * 
-   * @param file
-   *          The file to validate.
-   */
-//  public void validate(IFile file)
-//  {
-//    ValidateWSDLAction validateAction = new ValidateWSDLAction(file, false);
-//    validateAction.setValidator(this);
-//    validateAction.run();
-//  }
-  
-  protected void validate(IFile file, InputStream inputStream, IReporter reporter)
-  {
-    ValidateWSDLAction validateAction = new ValidateWSDLAction(file, false);
-    validateAction.setValidator(this);
-    validateAction.setReporter(reporter);
-    validateAction.setInputStream(inputStream);
-    validateAction.run();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.validation.core.IValidator#validate(org.eclipse.wst.validation.core.IHelper, org.eclipse.wst.validation.core.IReporter, org.eclipse.wst.validation.core.IFileDelta[])
-   */
-  public void validate(IValidationContext helper, IReporter reporter) throws ValidationException
-  {
-	String[] changedFiles = helper.getURIs();
-    if (changedFiles != null && changedFiles.length > 0)
-    {
-      InputStream streamToValidate = (InputStream) helper.loadModel("inputStream");
-      if (streamToValidate != null)
-      {   
-        String fileName = changedFiles[0];
-        Object[] parms = { fileName };
-        IFile file = (IFile) helper.loadModel(Helper.GET_FILE, parms);
-        
-        validate(file, streamToValidate, reporter);
-        
-      } else
-      { for (int i = 0; i < changedFiles.length; i++)
-        {
-          String fileName = changedFiles[i];
-          if (fileName != null)
-          {
-            Object[] parms = {fileName};
-            
-            IFile file = (IFile) helper.loadModel(Helper.GET_FILE, parms);
-            if (file != null)
-            {
-              validateIfNeeded(file, helper, reporter);
-            }
-          }
-        }
-      }
-    } else
-    {
-      Object[] parms = {this.getClass().getName()};
-      Collection files = (Collection) helper.loadModel(Helper.GET_PROJECT_FILES, parms);
-      Iterator iter = files.iterator();
-      while (iter.hasNext())
-      {
-        IFile file = (IFile) iter.next();
-        validateIfNeeded(file, helper, reporter);
-      }
-    }
-  }
-
-  /**
-   * @param file
-   * @param reporter
-   * @param ruleGroup
-   */
-  protected void validate(IFile file, IReporter reporter, int ruleGroup)
-  {
-    ValidateWSDLAction validateAction = new ValidateWSDLAction(file, false);
-    validateAction.setValidator(this);
-    validateAction.run();
-  }
-
-  /**
-   * Validate the given file if validation is required.
-   * 
-   * @param file
-   * @param model
-   * @param helper
-   * @param reporter
-   */
-  protected void validateIfNeeded(IFile file, Object model, IValidationContext helper, IReporter reporter)
-  {
-    if (model == null)
-    {
-      validateIfNeeded(file, helper, reporter);
-    }
-  }
-
-  /**
-   * Unpacks the fileModelPair and returns an IFile object.
-   */
-  protected IFile getFile(Object object)
-  {
-    IFile result = null;
-    if (object instanceof List)
-    {
-      List fileModelPair = (List) object;
-      if (fileModelPair.size() > 0)
-      {
-        Object file = fileModelPair.get(0);
-        if (file instanceof IFile)
-        {
-          result = (IFile) file;
-        }
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Validate the given file if validation is required.
-   * 
-   * @param file
-   *          The file to validate.
-   * @param helper
-   *          An aid for the validation.
-   * @param reporter
-   *          The reporter to report the validation messages.
-   */
-  protected void validateIfNeeded(IFile file, IValidationContext helper, IReporter reporter)
-  {
-    ValidatorManager mgr = ValidatorManager.getManager();
-    // Pass in a "null" so that loadModel doesn't attempt to cast the result into a RefObject.
-    Integer ruleGroupInt = (Integer) helper.loadModel(IRuleGroup.PASS_LEVEL, null); 
-    int ruleGroup = (ruleGroupInt == null) ? IRuleGroup.PASS_FULL : ruleGroupInt.intValue();
-
-    validate(file, reporter, ruleGroup);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see com.ibm.etools.validation.IValidator#cleanup(com.ibm.etools.validation.IReporter)
-   */
-  public void cleanup(IReporter reporter)
-  {
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/WSDLValidator.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/WSDLValidator.java
deleted file mode 100644
index 184f530..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/eclipse/WSDLValidator.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.eclipse;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-
-/**
- * An Eclipse WSDL validator. This validator is the default validator
- * used in the validation framework. There is only a single instance of
- * this validator. When created, this validator registers all extension
- * URI resolvers.
- */
-public class WSDLValidator extends org.eclipse.wst.wsdl.validation.internal.WSDLValidator
-{
-	private static WSDLValidator instance = null;
-
-	/**
-	 * The constructor registers all of the URI resolvers defined via the
-	 * WSDL URI resolver extension point with the WSDL validator. 
-	 * 
-	 */
-	private WSDLValidator()
-	{
-    super();
-	  URIResolverRegistryReader uriRR = new URIResolverRegistryReader();
-	  List resolvers = uriRR.readRegistry();
-	  Iterator resolverIter = resolvers.iterator();
-	  while(resolverIter.hasNext())
-	  {
-	  	IExtensibleURIResolver resolver = (IExtensibleURIResolver)resolverIter.next();
-	  	addURIResolver(resolver);
-	  }
-	}
-	
-	/**
-	 * Get the one and only instance of this Eclipse WSDL validator.
-	 * 
-	 * @return The one and only instance of this Eclipse WSDL validator.
-	 */
-	public static WSDLValidator getInstance()
-	{
-		if(instance == null)
-		{
-			instance = new WSDLValidator();
-		}
-		return instance;
-	}
-	
-//	/**
-//	 * Validate the specified WSDL file.
-//	 * 
-//	 * @param fileURI The URI of the WSDL file.
-//	 * @return A validation report with the validation results.
-//	 */
-//	public IValidationReport validate(String fileURI)
-//	{
-//		return wsdlValidator.validate(fileURI);
-//	}
-//  /**
-//	 * Validate the given WSDL InputStream
-//	 * 
-//	 * @param fileURI The URI of the WSDL file.
-//	 * @param inputStream the InputStream to validate
-//	 * @return A validation report with the validation results.
-//	 */
-//	public IValidationReport validate(String fileURI, InputStream inputStream)
-//  {
-//    return wsdlValidator.validate(fileURI, inputStream);
-//  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java
deleted file mode 100644
index d7e9397..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java
+++ /dev/null

@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.validation.internal.ui.text;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.WSDLValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.resolver.IExtensibleURIResolver;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverDelegate;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidatorDelegate;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalog;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalogEntityHolder;
-
-import com.ibm.wsdl.util.StringUtils;
-
-/**
- * A commande line tool to run WSDL Validation on a single or multiple files.
- * 
- * Options
- * -schemaDir directory       : a directory of schemas to load into the catalog
- * -schema namespace location : a schema to load into the registry
- * -wsdl11v classname namespace resourcebundle : register a WSDL 1.1 extension validator
- *                              to load for the given namespace with the given resourcebundle
- * -wsiv validatorClass namespace propertiesfile : register a WS-I validator
- * -uriresolver URIResolverClass : register an extension URI resolver
- */
-public class WSDLValidate
-{
-  private final String FILE_PREFIX = "file:///";
-  private static final String VALIDATOR_PROPERTIES =
-    org.eclipse.wst.wsdl.validation.internal.Constants.WSDL_VALIDATOR_PROPERTIES_FILE;
-  private static final String UI_PROPERTIES = "validatewsdlui";
-  private static final String _ERROR_WRONG_ARGUMENTS = "_ERROR_WRONG_ARGUMENTS";
-  private static final String _UI_INFORMATION_DELIMITER = "_UI_INFORMATION_DELIMITER";
-  private static final String _UI_ACTION_VALIDATING_FILE = "_UI_ACTION_VALIDATING_FILE";
-  private static final String _UI_VALID = "_UI_VALID";
-  private static final String _UI_INVALID = "_UI_INVALID";
-  private static final String _UI_ERROR_MARKER = "_UI_ERROR_MARKER";
-  private static final String _UI_WARNING_MARKER = "_UI_WARNING_MARKER";
-  private static final String _ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR = "_ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR";
-  
-  private static final String PARAM_WSDL11VAL = "-wsdl11v";
-  private static final String PARAM_EXTVAL = "-extv";
-  private static final String PARAM_SCHEMADIR = "-schemaDir";
-  private static final String PARAM_SCHEMA = "-schema";
-  private static final String PARAM_URIRESOLVER = "-uriresolver";
-  
-  private static final String STRING_EMPTY = "";
-  private static final String STRING_SPACE = " ";
-  private static final String STRING_DASH = "-";
-  
-  
-  protected ResourceBundle resourceBundle;
-  protected List errors = null;
-  protected List warnings = null;
-  protected WSDLValidator wsdlValidator;
-
-  /**
-   * Constuctor.
-   */
-  public WSDLValidate()
-  {
-  	wsdlValidator = new WSDLValidator();
-  }
-  
-  public void addURIResolver(IExtensibleURIResolver uriResolver)
-  {
-  	wsdlValidator.addURIResolver(uriResolver);
-  }
-
-  /**
-   * Run WSDL validation on a given file.
-   * 
-   * @param directory - the current dir for resolving relative file names
-   * @param filename - the name of the file to validate
-   * @param validatorRB - the WSDL validator resource bundle
-   * @throws Exception
-   */
-  protected IValidationReport validateFile(String directory, String filename, ResourceBundle validatorRB)
-    throws Exception
-  {
-    //	resolve the location of the file
-    String filelocation = null;
-    try
-    {
-      URL test = StringUtils.getURL(new URL(FILE_PREFIX + directory + "/"), filename);
-      filelocation = test.toExternalForm();
-    }
-    catch (MalformedURLException e)
-    {
-      throw new Exception("Unable to resolve WSDL file location");
-    }
-    // run validation on the file and record the errors and warnings
-    IValidationReport valReport = wsdlValidator.validate(filelocation);
-    return valReport;
-  }
-
-  /**
-   * Returns a String with formatted output for a list of messages.
-   * 
-   * @param messages The messages to get.
-   * @param errormarker The marker to use to label error messages.
-   * @param warningmarker The marker to use to label warning messages.
-   * @return A string with a formatted list of the messages.
-   */
-  protected String getMessages(IValidationMessage[] messages, String errormarker, String warningmarker)
-  {
-    StringBuffer outputBuffer = new StringBuffer();
-    if (messages != null)
-    {
-      // create a list of messages that looks like
-      // ERROR 1:1 Error message content
-      int numMessages = messages.length;
-      String marker = null;
-      for (int i = 0; i < numMessages; i++)
-      {
-        IValidationMessage message = messages[i];
-        int severity = message.getSeverity();
-        if (severity == IValidationMessage.SEV_ERROR)
-        {
-          marker = errormarker;
-        }
-        else if (severity == IValidationMessage.SEV_WARNING)
-        {
-          marker = warningmarker;
-        }
-        else
-        {
-          marker = STRING_EMPTY;
-        }
-        outputBuffer
-          .append(marker)
-          .append(STRING_SPACE)
-          .append(message.getLine())
-          .append(":")
-          .append(message.getColumn())
-          .append(STRING_SPACE)
-          .append(message.getMessage())
-          .append("\n");
-      }
-    }
-    return outputBuffer.toString();
-  }
-
-  /**
-   * The main entry point into the command line tool. 
-   * Checks the command line arguments, registers the default validators and runs validation on the
-   * list of files.
-   * 
-   * @param args - the arguments to the validator
-   */
-  public static void main(String[] args)
-  {
-    List wsdlFiles = new Vector();
-    MessageGenerator messGen = null;
-    ResourceBundle validatorRB = null;
-    try
-    {
-      ResourceBundle uiRB = ResourceBundle.getBundle(UI_PROPERTIES);
-      messGen = new MessageGenerator(uiRB);
-      validatorRB = ResourceBundle.getBundle(VALIDATOR_PROPERTIES);
-    }
-    catch (MissingResourceException e)
-    {
-      System.err.println("Validation failed: Unable to load the properties file.");
-      return;
-    }
-    // no arguments specified. Print usage.
-    if (args.length < 1)
-    {
-      System.out.println(messGen.getString(_ERROR_WRONG_ARGUMENTS));
-      return;
-    }
-
-    int argslength = args.length;
-
-    WSDLValidate wsdlValidator = new WSDLValidate();
-    // go through the parameters
-    for (int i = 0; i < argslength; i++)
-    {
-      String param = args[i];
-
-      // registering a validator
-      if (param.equalsIgnoreCase(WSDLValidate.PARAM_WSDL11VAL) || param.equalsIgnoreCase(WSDLValidate.PARAM_EXTVAL))
-      {
-
-        String validatorClass = args[++i];
-        if (!validatorClass.startsWith(WSDLValidate.STRING_DASH))
-        {
-          String namespace = args[++i];
-
-          if (!namespace.startsWith(WSDLValidate.STRING_DASH))
-          {
-            String propertiesFile = args[++i];
-            if (propertiesFile.startsWith(WSDLValidate.STRING_DASH))
-            {
-              propertiesFile = null;
-              i--;
-            }
-            if(param.equalsIgnoreCase(WSDLValidate.PARAM_WSDL11VAL))
-            {  
-              WSDL11ValidatorDelegate delegate = new WSDL11ValidatorDelegate(validatorClass, propertiesFile);
-              wsdlValidator.wsdlValidator.registerWSDL11Validator(namespace, delegate);
-            }
-            else if(param.equalsIgnoreCase(WSDLValidate.PARAM_EXTVAL))
-            {
-              WSDLValidatorDelegate delegate = new WSDLValidatorDelegate(validatorClass, propertiesFile);
-              wsdlValidator.wsdlValidator.registerWSDLExtensionValidator(namespace, delegate);
-            }
-          }
-          else
-          {
-            namespace = null;
-            i--;
-          }
-        }
-        else
-        {
-          validatorClass = null;
-          i--;
-        }  
-      }
-      // registering a directory with schemas
-      else if (param.equalsIgnoreCase(WSDLValidate.PARAM_SCHEMADIR))
-      {
-        String xsdDir = args[++i];
-        XMLCatalog.addSchemaDir(xsdDir);
-      }
-      // registering a schema
-      else if (param.equalsIgnoreCase(WSDLValidate.PARAM_SCHEMA))
-      {
-        String publicid = args[++i];
-        String systemid = args[++i];
-        XMLCatalog.addEntity(new XMLCatalogEntityHolder(publicid, systemid));
-      }
-      else if(param.equalsIgnoreCase(PARAM_URIRESOLVER))
-      {
-        String resolverClass = args[++i];
-        wsdlValidator.addURIResolver(new URIResolverDelegate(resolverClass, null).getURIResolver());
-      }
-      // a file to validate
-      else
-      {
-        if(!param.startsWith(WSDLValidate.STRING_DASH))
-        {  
-          wsdlFiles.add(param);
-        }
-      }
-
-    }
-    // validate the file
-    StringBuffer outputBuffer = null;
-    String infoDelim = messGen.getString(_UI_INFORMATION_DELIMITER);
-    String valid = messGen.getString(_UI_VALID);
-    String invalid = messGen.getString(_UI_INVALID);
-    String errormarker = messGen.getString(_UI_ERROR_MARKER);
-    String warningmarker = messGen.getString(_UI_WARNING_MARKER);
-
-    Iterator filesIter = wsdlFiles.iterator();
-    while (filesIter.hasNext())
-    {
-      outputBuffer = new StringBuffer();
-      String wsdlFile = (String)filesIter.next();
-      try
-      {
-        IValidationReport valReport = wsdlValidator.validateFile(System.getProperty("user.dir"), wsdlFile, validatorRB);
-
-        outputBuffer.append(infoDelim).append("\n");
-        outputBuffer.append(messGen.getString(_UI_ACTION_VALIDATING_FILE, wsdlFile)).append(" - ");
-        if (!valReport.hasErrors())
-        {
-          outputBuffer.append(valid);
-        }
-        else
-        {
-          outputBuffer.append(invalid);
-        }
-        outputBuffer.append("\n").append(infoDelim).append("\n");
-        outputBuffer.append(wsdlValidator.getMessages(valReport.getValidationMessages(), errormarker, warningmarker));
-        System.out.println(outputBuffer.toString());
-      }
-      catch (Exception e)
-      {
-        System.out.println(e.getMessage());
-      }
-    }
-  }
-
-  /**
-   * Load a validator into the wsdl validation framework registry.
-   * 
-   * @param namespace - the namespace the validator checks
-   * @param validatorClass - the name of the class the implements IWSDLValidator
-   * @param propertiesFile - the name of the properties file for the validator
-   * @param type           - the type of validator - WSDL or WS-I
-   * @param messGen        - a MessageGenerator for producing error messages
-   */
-//  protected static void loadExtensionValidator(
-//    String namespace,
-//    String validatorClass,
-//    String propertiesFile,
-//    Integer type,
-//    MessageGenerator messGen)
-//  {
-//    try
-//    {
-//      ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-//      IWSDLValidator validator = (IWSDLValidator)classLoader.loadClass(validatorClass).newInstance();
-//      // if no properties file is specified we can still load the validator
-//      if (propertiesFile != null && !propertiesFile.equals(""))
-//      {
-//        ResourceBundle rb = ResourceBundle.getBundle(propertiesFile);
-//        validator.setResourceBundle(rb);
-//      }
-//      else
-//      {
-//        propertiesFile = null;
-//      }
-//
-//      ValidatorRegistry.getInstance().registerValidator(namespace, validator, type);
-//    }
-//    catch (Exception e)
-//    {
-//      System.out.println(messGen.getString(_ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR, namespace, e));
-//    }
-//
-//  }
-  //	/**
-  //	 * loadWSDL11ExtensionValidator
-  //	 * Load an extension validator into the WSDL 1.1 validator
-  //   * @param namespace
-  //   * @param validatorClass
-  //   * @param propertiesFile
-  //   * @param type
-  //   * @param classLoader
-  //   */
-  //  protected static void loadWSDL11ExtensionValidator(
-  //			String namespace,
-  //			String validatorClass,
-  //			String resourceBundle,
-  //			ClassLoader classLoader)
-  //		{
-  //			try
-  // {
-  // 	Class valclass = classLoader.loadClass(validatorClass);
-  // 	IWSDL11Validator validator = (IWSDL11Validator)valclass.newInstance();
-  // 	validator.setResourceBundle(ResourceBundle.getBundle(resourceBundle));
-  // 	WSDLConfigurator.registerWSDL11Validator(namespace,validator);
-  // }
-  // catch(Exception e)
-  // {
-  //	 System.out.println("Unable to load the WSDL 1.1 validator for namespace "
-  // + namespace + e);
-  // }
-  //
-  //		}
-}

diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/validatewsdlui.properties b/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/validatewsdlui.properties
deleted file mode 100644
index 9e9e80b..0000000
--- a/bundles/org.eclipse.wst.wsdl.validation/src/wsdlvalidateui/validatewsdlui.properties
+++ /dev/null

@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-!-- Eclipse UI Message Dialog
-_VALIDATION_SUCCEEDED                      = Validation Succeeded
-_VALIDATION_FAILED                         = Validation Failed
-_UI_THE_WSDL_FILE_IS_VALID                 = The WSDL file is valid.
-_UI_THE_WSDL_FILE_IS_NOT_VALID             = The WSDL file is not valid. See the Problems view for a list of the validation errors.
-_UI_THE_WSDL_FILE_IS_VALID_WSDL11          = The WSDL file is valid according to the WSDL specification however an extension validator has determined that the file is not valid. See the Problems view for a list of the validation errors.
-_UI_THE_WSDL_FILE_IS_VALID_WITH_WARNINGS   = The WSDL file is valid however warnings have been issued. See the Problems view for a list of the validation warnings.
-
-!-- Ant UI
-_UI_INFORMATION_DELIMITER                  = ---------------------------------------
-_UI_ERROR_MARKER                           = ERROR  
-_UI_WARNING_MARKER                         = WARNING
-_UI_VALID                                  = VALID
-_UI_INVALID                                = INVALID
-_UI_ACTION_VALIDATING_FILE                 = Validating {0}
-
-_ERROR_NO_FILE_SPECIFIED                   = Unable to run WSDL Validation. You must specify at least one file.
-
-_EXC_UNABLE_TO_VALIDATE_FILE               = Unable to validate the WSDL file {0}. {1}
-_EXC_WSDL_FAIL_ON_ERROR                    = The WSDL file is not valid. (Fail On Error is enabled.)
-
-!-- Text UI
-_ERROR_WRONG_ARGUMENTS                     = Usage: WSDLValidate filename"
-_ERROR_UNABLE_TO_LOAD_EXT_VALIDATOR        = Unable to load the validator for namespace {0}. {1}

diff --git a/bundles/org.eclipse.wst.wsdl/.classpath b/bundles/org.eclipse.wst.wsdl/.classpath
deleted file mode 100644
index 1c993be..0000000
--- a/bundles/org.eclipse.wst.wsdl/.classpath
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-http"/>
-	<classpathentry kind="src" path="src-mime"/>
-	<classpathentry kind="src" path="src-soap"/>
-	<classpathentry kind="src" path="src-wsdl"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.wst.wsdl/.cvsignore b/bundles/org.eclipse.wst.wsdl/.cvsignore
deleted file mode 100644
index cca1c09..0000000
--- a/bundles/org.eclipse.wst.wsdl/.cvsignore
+++ /dev/null

@@ -1,7 +0,0 @@
-bin
-wsdl.jar
-build.xml
-temp.folder
-org.eclipse.wst.wsdl_1.0.0.jar
-org.eclipse.wst.wsdl.patch
-@dot

diff --git a/bundles/org.eclipse.wst.wsdl/.project b/bundles/org.eclipse.wst.wsdl/.project
deleted file mode 100644
index ebc53b6..0000000
--- a/bundles/org.eclipse.wst.wsdl/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsdl</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
deleted file mode 100644
index ca194e0..0000000
--- a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.wsdl; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: model,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.wsdl.binding.http,
- org.eclipse.wst.wsdl.binding.http.internal.generator,
- org.eclipse.wst.wsdl.binding.http.internal.impl,
- org.eclipse.wst.wsdl.binding.http.internal.util,
- org.eclipse.wst.wsdl.binding.mime,
- org.eclipse.wst.wsdl.binding.mime.internal.impl,
- org.eclipse.wst.wsdl.binding.mime.internal.util,
- org.eclipse.wst.wsdl.binding.soap,
- org.eclipse.wst.wsdl.binding.soap.internal.generator,
- org.eclipse.wst.wsdl.binding.soap.internal.impl,
- org.eclipse.wst.wsdl.binding.soap.internal.util,
- org.eclipse.wst.wsdl.internal.extensibility,
- org.eclipse.wst.wsdl.internal.generator,
- org.eclipse.wst.wsdl.internal.generator.extension,
- org.eclipse.wst.wsdl.internal.impl,
- org.eclipse.wst.wsdl.internal.impl.wsdl4j,
- org.eclipse.wst.wsdl.internal.util,
- org.eclipse.wst.wsdl.util
-Require-Bundle: org.eclipse.core.runtime.compatibility,
- org.eclipse.emf.ecore,
- org.eclipse.xsd,
- org.eclipse.core.resources,
- org.wsdl4j
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.wst.wsdl.WSDLPluginImplementation

diff --git a/bundles/org.eclipse.wst.wsdl/about.html b/bundles/org.eclipse.wst.wsdl/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.wsdl/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl/build.properties b/bundles/org.eclipse.wst.wsdl/build.properties
deleted file mode 100644
index 19b356f..0000000
--- a/bundles/org.eclipse.wst.wsdl/build.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               xsd/,\
-               META-INF/,\
-               about.html
-jars.compile.order = .
-source.. = src-http/,\
-                  src-mime/,\
-                  src-soap/,\
-                  src-wsdl/
-output.. = bin/
-src.includes = src/,\
-               xsd/,\
-               component.xml

diff --git a/bundles/org.eclipse.wst.wsdl/component.xml b/bundles/org.eclipse.wst.wsdl/component.xml
deleted file mode 100644
index dd9c56d..0000000
--- a/bundles/org.eclipse.wst.wsdl/component.xml
+++ /dev/null

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
-	name="org.eclipse.wst.wsdl">
-	<component-depends unrestricted="true"></component-depends>
-	<plugin id="org.eclipse.wst.wsdl" fragment="false" />
-	<plugin id="org.eclipse.wst.wsdl.ui" fragment="false" />
-	<plugin id="org.eclipse.wst.wsdl.validation" fragment="false" />
-	<plugin id="org.wsdl4j" fragment="false" />
-	<package name="org.eclipse.wst.wsdl" api="false">
-		<type name="BindingFault" />
-		<type name="BindingOutput" />
-		<type name="Types" />
-		<type name="Operation" />
-		<type name="Fault" />
-		<type name="ExtensibilityElement" />
-		<type name="Message" />
-		<type name="ExtensibleElement" />
-		<type name="BindingInput" />
-		<type name="PortType" />
-		<type name="Service" />
-		<type name="Input" />
-		<type name="WSDLElement" />
-		<type name="Port" />
-		<type name="Namespace" />
-		<type name="Part" />
-		<type name="Definition" />
-		<type name="Import" />
-		<type name="XSDSchemaExtensibilityElement" />
-		<type name="WSDLPlugin" />
-		<type name="WSDLFactory" />
-		<type name="MessageReference" />
-		<type name="UnknownExtensibilityElement" />
-		<type name="Output" />
-		<type name="Binding" />
-		<type name="BindingOperation" />
-	</package>
-	<package name="org.eclipse.wst.wsdl.util" api="false">
-		<type name="WSDLConstants" />
-		<type name="ExtensibilityElementFactoryRegistry" />
-		<type name="WSDLResourceFactoryImpl" />
-		<type name="ExtensibilityElementFactory" />
-		<type name="WSDLResourceImpl" subclass="false"/>
-	</package>
-	<package name="org.eclipse.wst.wsdl.binding.soap" api="false">
-		<type name="SOAPBody" />
-		<type name="SOAPHeaderFault" />
-		<type name="SOAPAddress" />
-		<type name="SOAPFactory" />
-		<type name="SOAPHeader" />
-		<type name="SOAPBinding" />
-		<type name="SOAPHeaderBase" />
-		<type name="SOAPFault" />
-		<type name="SOAPOperation" />
-	</package>
-<!-- provisional APIs -->
-<!--
-	<package name="org.eclipse.wst.wsdl.binding.mime">
-		<type name="MIMEContent" />
-		<type name="MIMEPackage" />
-		<type name="MIMEMultipartRelated" />
-		<type name="MIMEPart" />
-		<type name="MIMEMimeXml" />
-		<type name="MIMEFactory" />
-	</package>
--->
-<!--
-	<package name="org.eclipse.wst.wsdl.binding.http">
-		<type name="HTTPFactory" />
-		<type name="HTTPOperation" />
-		<type name="HTTPUrlEncoded" />
-		<type name="HTTPPackage" />
-		<type name="HTTPAddress" />
-		<type name="HTTPUrlReplacement" />
-		<type name="HTTPBinding" />
-	</package>
--->
-</component>

diff --git a/bundles/org.eclipse.wst.wsdl/grabjars.xml b/bundles/org.eclipse.wst.wsdl/grabjars.xml
deleted file mode 100644
index 106edbf..0000000
--- a/bundles/org.eclipse.wst.wsdl/grabjars.xml
+++ /dev/null

@@ -1,34 +0,0 @@
-<project default="copyJars" basedir=".">
-
-	<property name="pluginName" value="org.eclipse.wst.wsdl"/>
-	<property name="version" value=""/>
-
-	<target name="copyJars" if="downloadPath">
-		<antcall target="copyJars2"/>
-	</target>
-	
-	<target name="copyJars2" if="pluginsPath">
-		<antcall target="copyJars3"/>
-	</target>
-
-	<target name="copyJars3" if="pluginName">
-		<copy todir="${pluginsPath}/${pluginName}${version}/lib" overwrite="true">
-			<fileset dir="${downloadPath}/${pluginName}${version}">
-				<filename name="*.jar"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<target name="cleanupJars" if="pluginsPath">
-		<antcall target="cleanupJars2"/>
-	</target>
-
-	<target name="cleanupJars2" if="pluginName">
-		<delete>
-			<fileset dir="${pluginsPath}/${pluginName}${version}/lib">
-				<filename name="*.jar"/>
-			</fileset>
-		</delete>
-	</target>
-
-</project>

diff --git a/bundles/org.eclipse.wst.wsdl/lib/.cvsignore b/bundles/org.eclipse.wst.wsdl/lib/.cvsignore
deleted file mode 100644
index d392f0e..0000000
--- a/bundles/org.eclipse.wst.wsdl/lib/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-*.jar

diff --git a/bundles/org.eclipse.wst.wsdl/plugin.properties b/bundles/org.eclipse.wst.wsdl/plugin.properties
deleted file mode 100644
index 4edaf9d..0000000
--- a/bundles/org.eclipse.wst.wsdl/plugin.properties
+++ /dev/null

@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = WSDL Model
-providerName = Eclipse.org
-
-xpExtensibilityElementFactories = WSDL Extensibility Element Factories
-xpPortAndBindingContentGenerators = Port and Binding Content Generators
-xpWSDLContentType = WSDL Content Type
-
-_ERROR_INVALID_WSDL = The input source is not a valid WSDL document.
-

diff --git a/bundles/org.eclipse.wst.wsdl/plugin.xml b/bundles/org.eclipse.wst.wsdl/plugin.xml
deleted file mode 100644
index b8f0266..0000000
--- a/bundles/org.eclipse.wst.wsdl/plugin.xml
+++ /dev/null

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension-point
-		id="extensibilityElementFactories"
-		name="%xpExtensibilityElementFactories" />
-	<extension-point
-		id="contentGenerators"
-		name="%xpPortAndBindingContentGenerators" />
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.ibm.com/wsdl/2003/WSDL"
-			class="org.eclipse.wst.wsdl.WSDLPackage">
-		</package>
-	</extension>
-	<extension point="org.eclipse.emf.ecore.extension_parser">
-		<parser
-			type="wsdl"
-			class="org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl">
-		</parser>
-	</extension>
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.eclipse.org/wsdl/2003/HTTP"
-			class="org.eclipse.wst.wsdl.binding.http.HTTPPackage">
-		</package>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.extensibilityElementFactories">
-		<extensibilityElementFactory
-			namespace="http://schemas.xmlsoap.org/wsdl/http/"
-			class="org.eclipse.wst.wsdl.binding.http.internal.util.HTTPExtensibilityElementFactory" />
-	</extension>
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.eclipse.org/wsdl/2003/MIME"
-			class="org.eclipse.wst.wsdl.binding.mime.MIMEPackage">
-		</package>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.extensibilityElementFactories">
-		<extensibilityElementFactory
-			namespace="http://schemas.xmlsoap.org/wsdl/mime/"
-			class="org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEExtensibilityElementFactory" />
-	</extension>
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.eclipse.org/wsdl/2003/SOAP"
-			class="org.eclipse.wst.wsdl.binding.soap.SOAPPackage">
-		</package>
-	</extension>
-
-	<extension
-		point="org.eclipse.wst.wsdl.extensibilityElementFactories">
-		<extensibilityElementFactory
-			namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-			class="org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPExtensibilityElementFactory" />
-	</extension>
-
-	<extension point="org.eclipse.wst.wsdl.contentGenerators">
-		<contentGenerator
-			name="SOAP"
-			namespace="http://schemas.xmlsoap.org/wsdl/soap/"
-			class="org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator">
-		</contentGenerator>
-	</extension>
-
-	<extension point="org.eclipse.wst.wsdl.contentGenerators">
-		<contentGenerator
-			name="HTTP"
-			namespace="http://schemas.xmlsoap.org/wsdl/http/"
-			class="org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator">
-		</contentGenerator>
-	</extension>
-
-
-
-	<!-- define a wsdl content type -->
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<content-type
-			priority="high"
-			name="%xpWSDLContentType"
-			id="wsdlsource"
-			base-type="org.eclipse.core.runtime.xml"
-			default-charset="UTF-8"
-			file-extensions="wsdl" />
-	</extension>
-</plugin>

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel b/bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel
deleted file mode 100644
index fbc4158..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel
+++ /dev/null

@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.ibm.etools.wsdl.binding.http/src"
-    editDirectory="/com.ibm.etools.wsdl.binding.http.edit/src" editorDirectory="/com.ibm.etools.wsdl.binding.http.editor/src"
-    modelPluginID="com.ibm.etools.wsdl.binding.http" modelName="HTTP" editPluginClass=""
-    editorPluginClass="" usedGenPackages="../../../org.eclipse.xsd/src/model/XSD.genmodel#//xsd">
-  <foreignModel>..\rose\http.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="WSDL" basePackage="com.ibm.etools" ecorePackage="wsdl.ecore#/">
-    <genDataTypes ecoreDataType="wsdl.ecore#//QName"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//OperationType"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMElement"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//WSDLException"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMDocument"/>
-    <genClasses ecoreClass="wsdl.ecore#//WSDLElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/documentationElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/element"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/getEnclosingDefinition"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/setEnclosingDefinition">
-        <genParameters ecoreParameter="wsdl.ecore#//WSDLElement/setEnclosingDefinition/definition"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//PortType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//PortType/eOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Operation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/style"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eFaults"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eParameterOrdering"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Message">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Message/eParts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Part">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/elementName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/typeName"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/typeDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/elementDeclaration"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/eMessage"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Binding">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/resourceURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/ePortType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/eBindingOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOperation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOperation/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eOperation"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingFaults"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Service">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Service/ePorts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Port">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Port/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Port/eBinding"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibilityElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/required"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/elementType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Definition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/targetNamespace"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/location"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/encoding"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eMessages"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/ePortTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eBindings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eServices"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eNamespaces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/getDocument"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/setDocument">
-        <genParameters ecoreParameter="wsdl.ecore#//Definition/setDocument/document"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Import">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/namespaceURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/locationURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/getSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/setSchema">
-        <genParameters ecoreParameter="wsdl.ecore#//Import/setSchema/schema"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibleElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//ExtensibleElement/eExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/getExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/addExtensibilityElement">
-        <genParameters ecoreParameter="wsdl.ecore#//ExtensibleElement/addExtensibilityElement/extElement"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Input"/>
-    <genClasses ecoreClass="wsdl.ecore#//Output"/>
-    <genClasses ecoreClass="wsdl.ecore#//Fault"/>
-    <genClasses ecoreClass="wsdl.ecore#//BindingInput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingInput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingInput/eInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingInput/setInput/input"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOutput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOutput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOutput/eOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingOutput/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingFault">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingFault/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingFault/eFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/getFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/setFault">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingFault/setFault/fault"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Namespace">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/URI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/prefix"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPortType">
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/addOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/addOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/addFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/addFault/fault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/getFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getParameterOrdering"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setParameterOrdering">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setParameterOrdering/parameterOrder"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setInput/input"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IInput">
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IInput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOutput">
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IOutput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IFault">
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IFault/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IMessage">
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/addPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/addPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getPart/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getParts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getOrderedParts">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getOrderedParts/partOrder"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPart">
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/setExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttributeNames"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/getExtensionAttribute/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IService">
-      <genOperations ecoreOperation="wsdl.ecore#//IService/addPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/addPort/port"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPorts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/getPort/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPort">
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/getBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/setBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IPort/setBinding/binding"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBinding">
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/addBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/addBindingOperation/bindingOperation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperations"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/setPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/setPortType/portType"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/addBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/addBindingFault/bindingFault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/getBindingFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingInput/bindingInput"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingOutput/bindingOutput"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingInput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOutput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingFault"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensibilityElement"/>
-    <genClasses ecoreClass="wsdl.ecore#//IDefinition">
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addBinding/binding"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addImport">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addImport/importDef"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addMessage/message"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/prefix"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addPortType/portType"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addService/service"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createImport"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPart"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPort"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createService"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBindings"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports.1">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getImports.1/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessages"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getNamespace/prefix"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespaces"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPrefix">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPrefix/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getServices"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getExtensionRegistry"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setExtensionRegistry">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setExtensionRegistry/extensionRegistry"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getDocumentBaseURI"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setDocumentBaseURI">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setDocumentBaseURI/documentBase"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removePortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removePortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setTypes">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setTypes/types"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IImport"/>
-    <genClasses ecoreClass="wsdl.ecore#//IList"/>
-    <genClasses ecoreClass="wsdl.ecore#//IMap"/>
-    <genClasses ecoreClass="wsdl.ecore#//IURL"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensionRegistry"/>
-    <genClasses ecoreClass="wsdl.ecore#//Types">
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas.1">
-        <genParameters ecoreParameter="wsdl.ecore#//Types/getSchemas.1/namespaceURI"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IIterator"/>
-    <genClasses ecoreClass="wsdl.ecore#//ITypes"/>
-    <genClasses ecoreClass="wsdl.ecore#//UnknownExtensibilityElement">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/parent"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/children"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//XSDSchemaExtensibilityElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//XSDSchemaExtensibilityElement/schema"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//MessageReference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//MessageReference/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//MessageReference/eMessage"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="HTTP" basePackage="com.ibm.etools.wsdl.binding" ecorePackage="http.ecore#/">
-    <genClasses ecoreClass="http.ecore#//HTTPBinding">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http.ecore#//HTTPBinding/verb"/>
-    </genClasses>
-    <genClasses ecoreClass="http.ecore#//HTTPOperation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http.ecore#//HTTPOperation/locationURI"/>
-    </genClasses>
-    <genClasses ecoreClass="http.ecore#//HTTPUrlReplacement"/>
-    <genClasses ecoreClass="http.ecore#//HTTPUrlEncoded"/>
-    <genClasses ecoreClass="http.ecore#//HTTPAddress">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http.ecore#//HTTPAddress/locationURI"/>
-    </genClasses>
-    <genClasses ecoreClass="http.ecore#//IHTTPAddress"/>
-    <genClasses ecoreClass="http.ecore#//IHTTPBinding"/>
-    <genClasses ecoreClass="http.ecore#//IHTTPOperation"/>
-    <genClasses ecoreClass="http.ecore#//IHTTPUrlEncoded"/>
-    <genClasses ecoreClass="http.ecore#//IHTTPUrlReplacement"/>
-  </genPackages>
-</genmodel:GenModel>

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat b/bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat
deleted file mode 100644
index a63207a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat
+++ /dev/null

@@ -1,378 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Class_Category "http"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"3ABFD9AD01F8"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "HTTPBinding"
-	    quid       	"3ABFE57C0136"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE5FF1D0019"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "verb"
-		    quid       	"3ABFE60D00DB"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "HTTPOperation"
-	    quid       	"3ABFE6AE0050"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE5FF4B037C"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "locationURI"
-		    quid       	"3ABFE70D0147"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "HTTPUrlReplacement"
-	    quid       	"3ABFEA1A017C"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE728B802C3"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    language   	"Java")
-	(object Class "HTTPUrlEncoded"
-	    quid       	"3ABFEA6D0294"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE728D50094"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    language   	"Java")
-	(object Class "HTTPAddress"
-	    quid       	"3AC3BF2500F5"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE5FEA901B7"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "locationURI"
-		    quid       	"3AC3BFA7012E"
-		    type       	"String"))
-	    language   	"Java"))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Port"
-	    quid       	"3AC11E5201FB"
-	    title      	"Port"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::http::HTTPAddress" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(336, 432)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(135, 351)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	402
-			justify    	0
-			label      	"HTTPAddress")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC3BF2500F5"
-		    width      	420
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)))
-	(object ClassDiagram "Extensibility"
-	    quid       	"3AE5FE3B037B"
-	    title      	"Extensibility"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(272, 128)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(70, 53)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	404
-			justify    	0
-			label      	"ExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5DBB602A9"
-		    width      	422
-		    height     	174
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::http::HTTPAddress" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(272, 480)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(128, 428)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	288
-			justify    	0
-			label      	"HTTPAddress")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC3BF2500F5"
-		    width      	306
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::http::HTTPBinding" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(480, 640)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(344, 588)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	272
-			justify    	0
-			label      	"HTTPBinding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFE57C0136"
-		    width      	290
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @5
-		    location   	(272, 305)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@2
-		    vertices   	(list Points
-			(272, 305)
-			(272, 215)))
-		(object InheritView "" @6
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE5FEA901B7"
-		    client     	@3
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(272, 416)
-		    terminal_attachment 	(272, 305)
-		    drawSupplier 	@5)
-		(object InheritView "" @7
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE5FF1D0019"
-		    client     	@4
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(475, 576)
-		    terminal_attachment 	(475, 305)
-		    drawSupplier 	@5)
-		(object ClassView "Class" "Logical View::http::HTTPOperation" @8
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(672, 816)
-		    label      	(object ItemLabel
-			Parent_View 	@8
-			location   	(518, 764)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	308
-			justify    	0
-			label      	"HTTPOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFE6AE0050"
-		    width      	326
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @9
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE5FF4B037C"
-		    client     	@8
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(656, 752)
-		    terminal_attachment 	(656, 305)
-		    drawSupplier 	@5)
-		(object ClassView "Class" "Logical View::http::HTTPUrlReplacement" @10
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(816, 992)
-		    label      	(object ItemLabel
-			Parent_View 	@10
-			location   	(605, 941)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	422
-			justify    	0
-			label      	"HTTPUrlReplacement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFEA1A017C"
-		    width      	440
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @11
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE728B802C3"
-		    client     	@10
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(869, 929)
-		    terminal_attachment 	(869, 305)
-		    drawSupplier 	@5)
-		(object ClassView "Class" "Logical View::http::HTTPUrlEncoded" @12
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1072, 1168)
-		    label      	(object ItemLabel
-			Parent_View 	@12
-			location   	(900, 1117)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	344
-			justify    	0
-			label      	"HTTPUrlEncoded")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFEA6D0294"
-		    width      	362
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @13
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE728D50094"
-		    client     	@12
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(1103, 1105)
-		    terminal_attachment 	(1103, 305)
-		    drawSupplier 	@5)))
-	(object ClassDiagram "Binding"
-	    quid       	"3AE72A7000A9"
-	    title      	"Binding"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::http::HTTPBinding" @14
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(336, 272)
-		    label      	(object ItemLabel
-			Parent_View 	@14
-			location   	(200, 220)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	272
-			justify    	0
-			label      	"HTTPBinding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFE57C0136"
-		    width      	290
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::http::HTTPOperation" @15
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(720, 272)
-		    label      	(object ItemLabel
-			Parent_View 	@15
-			location   	(519, 191)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	402
-			justify    	0
-			label      	"HTTPOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFE6AE0050"
-		    width      	420
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::http::HTTPUrlReplacement" @16
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(848, 592)
-		    label      	(object ItemLabel
-			Parent_View 	@16
-			location   	(637, 541)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	422
-			justify    	0
-			label      	"HTTPUrlReplacement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFEA1A017C"
-		    width      	440
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::http::HTTPUrlEncoded" @17
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(384, 592)
-		    label      	(object ItemLabel
-			Parent_View 	@17
-			location   	(212, 541)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	344
-			justify    	0
-			label      	"HTTPUrlEncoded")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3ABFEA6D0294"
-		    width      	362
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)))))

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore b/bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore
deleted file mode 100644
index 831039d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="http"
-    nsURI="http://www.ibm.com/wsdl/2003/HTTP" nsPrefix="http">
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPBinding" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPBinding">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verb" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPOperation" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPOperation">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPUrlReplacement" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPUrlReplacement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPUrlEncoded" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPUrlEncoded"/>
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPAddress" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IHTTPAddress">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IHTTPAddress" instanceClassName="javax.wsdl.extensions.http.HTTPAddress"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IHTTPBinding" instanceClassName="javax.wsdl.extensions.http.HTTPBinding"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IHTTPOperation" instanceClassName="javax.wsdl.extensions.http.HTTPOperation"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IHTTPUrlEncoded" instanceClassName="javax.wsdl.extensions.http.HTTPUrlEncoded"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IHTTPUrlReplacement" instanceClassName="javax.wsdl.extensions.http.HTTPUrlReplacement"
-      abstract="true" interface="true"/>
-</ecore:EPackage>

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl b/bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl
deleted file mode 100644
index 4de2bea..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl
+++ /dev/null

@@ -1,32383 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3ABFD9A70151"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3ABFD9A7018C"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3ABFD9A70150"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3ABFD9A70152"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "http"
-		quid       	"3ABFD9AD01F8"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "HTTPBinding"
-			quid       	"3ABFE57C0136"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE5FF1D0019"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"409843F103C0"
-				supplier   	"Logical View::http::IHTTPBinding"
-				quidu      	"409843A702EB"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "verb"
-				quid       	"3ABFE60D00DB"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "HTTPOperation"
-			quid       	"3ABFE6AE0050"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE5FF4B037C"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"4098444602CC"
-				supplier   	"Logical View::http::IHTTPOperation"
-				quidu      	"409843FF02BB"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "locationURI"
-				quid       	"3ABFE70D0147"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "HTTPUrlReplacement"
-			quid       	"3ABFEA1A017C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE728B802C3"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"409844D202C5"
-				supplier   	"Logical View::http::IHTTPUrlReplacement"
-				quidu      	"4098449600D8"))
-			language   	"Java")
-		    (object Class "HTTPUrlEncoded"
-			quid       	"3ABFEA6D0294"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE728D50094"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"409844910009"
-				supplier   	"Logical View::http::IHTTPUrlEncoded"
-				quidu      	"409844570063"))
-			language   	"Java")
-		    (object Class "HTTPAddress"
-			quid       	"3AC3BF2500F5"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE5FEA901B7"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"409840D800C4"
-				supplier   	"Logical View::http::IHTTPAddress"
-				quidu      	"4098408901A1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "locationURI"
-				quid       	"3AC3BFA7012E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "IHTTPAddress"
-			quid       	"4098408901A1"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.http.HTTPAddress"
-				quid       	"409840A4013A"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IHTTPBinding"
-			quid       	"409843A702EB"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.http.HTTPBinding"
-				quid       	"409843CA0177"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IHTTPOperation"
-			quid       	"409843FF02BB"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.http.HTTPOperation"
-				quid       	"409844130204"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IHTTPUrlEncoded"
-			quid       	"409844570063"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.http.HTTPUrlEncoded"
-				quid       	"4098446D021C"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IHTTPUrlReplacement"
-			quid       	"4098449600D8"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.http.HTTPUrlReplacement"
-				quid       	"409844AC01AB"
-				stereotype 	"javaclass"))
-			language   	"Java"))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Port"
-			quid       	"3AC11E5201FB"
-			title      	"Port"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::http::HTTPAddress" @1
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(672, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(471, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"HTTPAddress")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC3BF2500F5"
-				compartment 	(object Compartment
-				    Parent_View 	@1
-				    location   	(471, 763)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	409)
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::IHTTPAddress" @2
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(672, 288)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(138, 229)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1068
-				    justify    	0
-				    label      	"IHTTPAddress")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(138, 179)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1068
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4098408901A1"
-				compartment 	(object Compartment
-				    Parent_View 	@2
-				    location   	(138, 289)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	1065)
-				width      	1086
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @3
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"409840D800C4"
-				client     	@1
-				supplier   	@2
-				line_style 	0)))
-		    (object ClassDiagram "Extensibility"
-			quid       	"3AE5FE3B037B"
-			title      	"Extensibility"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @4
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@4
-				    location   	(70, 53)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	422
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::HTTPAddress" @5
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 480)
-				label      	(object ItemLabel
-				    Parent_View 	@5
-				    location   	(128, 428)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	288
-				    justify    	0
-				    label      	"HTTPAddress")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC3BF2500F5"
-				width      	306
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::HTTPBinding" @6
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(480, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@6
-				    location   	(344, 588)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"HTTPBinding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFE57C0136"
-				width      	290
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @7
-				location   	(272, 305)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@4
-				vertices   	(list Points
-				    (272, 305)
-				    (272, 215)))
-			    (object InheritView "" @8
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE5FEA901B7"
-				client     	@5
-				supplier   	@4
-				line_style 	3
-				origin_attachment 	(272, 416)
-				terminal_attachment 	(272, 305)
-				drawSupplier 	@7)
-			    (object InheritView "" @9
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE5FF1D0019"
-				client     	@6
-				supplier   	@4
-				line_style 	3
-				origin_attachment 	(475, 576)
-				terminal_attachment 	(475, 305)
-				drawSupplier 	@7)
-			    (object ClassView "Class" "Logical View::http::HTTPOperation" @10
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(672, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@10
-				    location   	(518, 764)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	308
-				    justify    	0
-				    label      	"HTTPOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFE6AE0050"
-				width      	326
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @11
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE5FF4B037C"
-				client     	@10
-				supplier   	@4
-				line_style 	3
-				origin_attachment 	(656, 752)
-				terminal_attachment 	(656, 305)
-				drawSupplier 	@7)
-			    (object ClassView "Class" "Logical View::http::HTTPUrlReplacement" @12
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@12
-				    location   	(605, 941)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	422
-				    justify    	0
-				    label      	"HTTPUrlReplacement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFEA1A017C"
-				width      	440
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @13
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE728B802C3"
-				client     	@12
-				supplier   	@4
-				line_style 	3
-				origin_attachment 	(869, 929)
-				terminal_attachment 	(869, 305)
-				drawSupplier 	@7)
-			    (object ClassView "Class" "Logical View::http::HTTPUrlEncoded" @14
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@14
-				    location   	(900, 1117)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"HTTPUrlEncoded")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFEA6D0294"
-				width      	362
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @15
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE728D50094"
-				client     	@14
-				supplier   	@4
-				line_style 	3
-				origin_attachment 	(1103, 1105)
-				terminal_attachment 	(1103, 305)
-				drawSupplier 	@7)))
-		    (object ClassDiagram "Binding"
-			quid       	"3AE72A7000A9"
-			title      	"Binding"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::http::HTTPBinding" @16
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 592)
-				label      	(object ItemLabel
-				    Parent_View 	@16
-				    location   	(440, 540)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"HTTPBinding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFE57C0136"
-				compartment 	(object Compartment
-				    Parent_View 	@16
-				    location   	(440, 600)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	275)
-				width      	290
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::HTTPOperation" @17
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1696, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@17
-				    location   	(1495, 527)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"HTTPOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFE6AE0050"
-				compartment 	(object Compartment
-				    Parent_View 	@17
-				    location   	(1495, 587)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	409)
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::HTTPUrlReplacement" @18
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1616, 1808)
-				label      	(object ItemLabel
-				    Parent_View 	@18
-				    location   	(1405, 1757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	422
-				    justify    	0
-				    label      	"HTTPUrlReplacement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFEA1A017C"
-				width      	440
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::HTTPUrlEncoded" @19
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1520)
-				label      	(object ItemLabel
-				    Parent_View 	@19
-				    location   	(436, 1469)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"HTTPUrlEncoded")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3ABFEA6D0294"
-				width      	362
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::http::IHTTPBinding" @20
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@20
-				    location   	(50, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1052
-				    justify    	0
-				    label      	"IHTTPBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@20
-				    location   	(50, 51)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1052
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"409843A702EB"
-				compartment 	(object Compartment
-				    Parent_View 	@20
-				    location   	(50, 161)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	1050)
-				width      	1070
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @21
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"409843F103C0"
-				client     	@16
-				supplier   	@20
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::http::IHTTPOperation" @22
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1696, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(1150, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1092
-				    justify    	0
-				    label      	"IHTTPOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(1150, 51)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1092
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"409843FF02BB"
-				compartment 	(object Compartment
-				    Parent_View 	@22
-				    location   	(1150, 161)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	1090)
-				width      	1110
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @23
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4098444602CC"
-				client     	@17
-				supplier   	@22
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::http::IHTTPUrlEncoded" @24
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(44, 1045)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1128
-				    justify    	0
-				    label      	"IHTTPUrlEncoded")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(44, 995)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1128
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"409844570063"
-				compartment 	(object Compartment
-				    Parent_View 	@24
-				    location   	(44, 1105)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	1125)
-				width      	1146
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @25
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"409844910009"
-				client     	@19
-				supplier   	@24
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::http::IHTTPUrlReplacement" @26
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(981, 1317)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1206
-				    justify    	0
-				    label      	"IHTTPUrlReplacement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(981, 1267)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1206
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4098449600D8"
-				compartment 	(object Compartment
-				    Parent_View 	@26
-				    location   	(981, 1377)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	1203)
-				width      	1224
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @27
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"409844D202C5"
-				client     	@18
-				supplier   	@26
-				line_style 	0)))))
-	    (object Class_Category "wsdl"
-		quid       	"3ADFB8E5021E"
-		documentation 	
-|The WSDL model contains classes for the Web Services Description Language (WSDL).
-|
-|WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
-|
-|WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
-|
-|The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
-|- 2.1 Definition, shows the WSDL definition element and the WSDL document structure
-|- 2.1.1 Naming and Linking, shows the namespace and import mechanism
-|- 2.1.3 Extensibility, shows the WSDL extensibility mechanism
-|- 2.2 Types, shows the use of XML Schema types in WSDL
-|- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
-|
-|The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "WSDLElement"
-			quid       	"3AD5C6A302DD"
-			documentation 	"This class represents a WSDL language element."
-			operations 	(list Operations
-			    (object Operation "getEnclosingDefinition"
-				quid       	"3CD1529600C8"
-				result     	"Definition"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setEnclosingDefinition"
-				quid       	"3CD152B80347"
-				parameters 	(list Parameters
-				    (object Parameter "definition"
-					type       	"Definition"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "documentationElement"
-				quid       	"3CCE443602A3"
-				type       	"DOMElement")
-			    (object ClassAttribute "element"
-				quid       	"3F97DBD30207"
-				type       	"DOMElement"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "PortType"
-			quid       	"3AD5C7F001A5"
-			documentation 	"This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5C9B70150"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FD8019F"
-				supplier   	"Logical View::wsdl::IPortType"
-				quidu      	"3B84A5BE0331"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB488E0023"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1E301E5"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CDEB0316"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4FD01BA"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Operation"
-			quid       	"3AD5C80D03CE"
-			documentation 	"This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE9DE98003C"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FE20171"
-				supplier   	"Logical View::wsdl::IOperation"
-				quidu      	"3B84A77600D1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "style"
-				quid       	"3AEB472601AC"
-				type       	"OperationType")
-			    (object ClassAttribute "name"
-				quid       	"3BDD9643004C"
-				type       	"String")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF235003E"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE2201AD"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D520011B"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Message"
-			quid       	"3AD5C9590078"
-			documentation 	"This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5D05501C4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3B84A8D102BA"
-				supplier   	"Logical View::wsdl::IMessage"
-				quidu      	"3B84A8AF004F"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB487C01FE"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1D20226"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE4B02B0"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D54200F1"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Part"
-			quid       	"3AD5CE1C032E"
-			documentation 	"This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84A96D02F1"
-				supplier   	"Logical View::wsdl::IPart"
-				quidu      	"3B84A93F01BE")
-			    (object Inheritance_Relationship
-				quid       	"3B897E230237"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3BCE70B703C8"
-				type       	"String")
-			    (object ClassAttribute "elementName"
-				quid       	"3B84B08703DB"
-				type       	"QName")
-			    (object ClassAttribute "typeName"
-				quid       	"3BCE70C303C5"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Binding"
-			quid       	"3AD5D2860261"
-			documentation 	"This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA0F02F0"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B8595410129"
-				supplier   	"Logical View::wsdl::IBinding"
-				quidu      	"3B84ABC60219"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB4899014B"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1F401A3"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE6D0151"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4DF035C"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOperation"
-			quid       	"3AD5D3CB0145"
-			documentation 	"This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD6009202F7"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84ADE401DC"
-				supplier   	"Logical View::wsdl::IBindingOperation"
-				quidu      	"3B84ADC00072"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B89C4CB0199"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Service"
-			quid       	"3AD5D8F002F8"
-			documentation 	"This class represents a WSDL service element. A service groups a set of related ports together."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA20025E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954E01B4"
-				supplier   	"Logical View::wsdl::IService"
-				quidu      	"3B84AB490287"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB48A40151"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF20D0203"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18D4810220"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4C501E2"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Port"
-			quid       	"3AD5D9170286"
-			documentation 	"This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD600CB00AA"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954502C9"
-				supplier   	"Logical View::wsdl::IPort"
-				quidu      	"3B84AB800326"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3AD5D9A00391"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibilityElement"
-			quid       	"3AD5DBB602A9"
-			documentation 	"This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84B14903D0"
-				supplier   	"Logical View::wsdl::IExtensibilityElement"
-				quidu      	"3B84B12402AB")
-			    (object Inheritance_Relationship
-				quid       	"3BDDF53502C3"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3AF9543C0073"
-				type       	"boolean")
-			    (object ClassAttribute "elementType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B85B21A0271"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Definition"
-			quid       	"3AD5E43F008E"
-			documentation 	"This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FDB803D4"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84B1F80382"
-				supplier   	"Logical View::wsdl::IDefinition"
-				quidu      	"3B84B1D90142"))
-			operations 	(list Operations
-			    (object Operation "getDocument"
-				quid       	"3CD14FC2012B"
-				result     	"DOMDocument"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocument"
-				quid       	"3CD150DE01E7"
-				parameters 	(list Parameters
-				    (object Parameter "document"
-					type       	"DOMDocument"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3AD5E474004E"
-				type       	"String")
-			    (object ClassAttribute "location"
-				quid       	"40352B7C0396"
-				type       	"String")
-			    (object ClassAttribute "qName"
-				quid       	"3AEB485702F5"
-				type       	"QName")
-			    (object ClassAttribute "encoding"
-				quid       	"3CADD00D000D"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Import"
-			quid       	"3AD5E4F903DE"
-			documentation 	"This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5EE58037A"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F200D0340"
-				supplier   	"Logical View::wsdl::IImport"
-				quidu      	"3B84B2020119"))
-			operations 	(list Operations
-			    (object Operation "getSchema"
-				quid       	"3C8672C10379"
-				result     	"XSDSchema"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setSchema"
-				quid       	"3C8672C10397"
-				parameters 	(list Parameters
-				    (object Parameter "schema"
-					type       	"XSDSchema"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD5E50A0036"
-				type       	"String")
-			    (object ClassAttribute "locationURI"
-				quid       	"3AD5E5140211"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibleElement"
-			quid       	"3AD5FCFA033A"
-			documentation 	" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FE3C03D4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			operations 	(list Operations
-			    (object Operation "getExtensibilityElements"
-				quid       	"3B85C12C03CD"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addExtensibilityElement"
-				quid       	"3B85C1470295"
-				parameters 	(list Parameters
-				    (object Parameter "extElement"
-					type       	"IExtensibilityElement"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "Input"
-			quid       	"3AE0789F0059"
-			documentation 	"This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C504025F"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67722802E7"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FEE031D"
-				supplier   	"Logical View::wsdl::IInput"
-				quidu      	"3B84A7EE0015"))
-			language   	"Java")
-		    (object Class "Output"
-			quid       	"3AE078B60232"
-			documentation 	"This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C50C035B"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723500DD"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FF801CD"
-				supplier   	"Logical View::wsdl::IOutput"
-				quidu      	"3B84A829027D"))
-			language   	"Java")
-		    (object Class "Fault"
-			quid       	"3AE078BE0108"
-			documentation 	"This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE1C82002F2"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723D0319"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F2002002D"
-				supplier   	"Logical View::wsdl::IFault"
-				quidu      	"3B84A861031D"))
-			language   	"Java")
-		    (object Class "BindingInput"
-			quid       	"3AE08A8202D4"
-			documentation 	"This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE1B0113"
-				supplier   	"Logical View::wsdl::IBindingInput"
-				quidu      	"3B84ADEB0100")
-			    (object Inheritance_Relationship
-				quid       	"3B85B59B0072"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getInput"
-				quid       	"3C8653A40203"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8653B503A2"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C1EA020E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOutput"
-			quid       	"3AE08A8F028C"
-			documentation 	"This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE4302AB"
-				supplier   	"Logical View::wsdl::IBindingOutput"
-				quidu      	"3B84AE210111")
-			    (object Inheritance_Relationship
-				quid       	"3B85B5A4027E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getOutput"
-				quid       	"3C8653D900F1"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8653F10326"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C20200BE"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingFault"
-			quid       	"3AE08A9E03A6"
-			documentation 	"This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE0938602C9"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84AE710333"
-				supplier   	"Logical View::wsdl::IBindingFault"
-				quidu      	"3B84AE4F00BD"))
-			operations 	(list Operations
-			    (object Operation "getFault"
-				quid       	"3C865413037F"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFault"
-				quid       	"3C8654210109"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85BF9E014A"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "QName"
-			quid       	"3AE8ED220140"
-			documentation 	"This class represents the javax.wsdl.QName class. A QName is a fully qualified name."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.xml.namespace.QName"
-				quid       	"3B849DA9003D"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "Namespace"
-			quid       	"3AEA3CD30030"
-			documentation 	"This class represents a namespace and the corresponding namespace prefix used in a WSDL document."
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "URI"
-				quid       	"3AEA3D2901B1"
-				type       	"String")
-			    (object ClassAttribute "prefix"
-				quid       	"3AEA3D320236"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "OperationType"
-			quid       	"3AEB4782024F"
-			documentation 	
-|ONE_WAY=1
-|REQUEST_RESPONSE=2
-|SOLICIT_RESPONSE=3
-|NOTIFICATION=4
-			
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.OperationType"
-				quid       	"3B85C35303E3"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IPortType"
-			quid       	"3B84A5BE0331"
-			documentation 	"This class represents the javax.wsdl.PortType non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addOperation"
-				quid       	"3B896AC101CA"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3B896BAF01A4"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperations"
-				quid       	"3B896BF7031A"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.PortType"
-				quid       	"3B84A632000D"
-				stereotype 	"javaclass")))
-		    (object Class "IOperation"
-			quid       	"3B84A77600D1"
-			documentation 	"This class represents the javax.wsdl.Operation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addFault"
-				quid       	"3B896C420065"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFault"
-				quid       	"3B896C59028F"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFaults"
-				quid       	"3B896C7102B1"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParameterOrdering"
-				quid       	"3B896C8101B0"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setParameterOrdering"
-				quid       	"3B896C99031D"
-				parameters 	(list Parameters
-				    (object Parameter "parameterOrder"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInput"
-				quid       	"3C8654E5018D"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8662C40107"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOutput"
-				quid       	"3C8662E40094"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8662F001D2"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Operation"
-				quid       	"3B84A799012B"
-				stereotype 	"javaclass")))
-		    (object Class "IInput"
-			quid       	"3B84A7EE0015"
-			documentation 	"This class represents the javax.wsdl.Input non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86633100EF"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8663470277"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Input"
-				quid       	"3B84A8000039"
-				stereotype 	"javaclass")))
-		    (object Class "IOutput"
-			quid       	"3B84A829027D"
-			documentation 	"This class represents the javax.wsdl.Output non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86643A035D"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C86644501C8"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Output"
-				quid       	"3B84A83901D5"
-				stereotype 	"javaclass")))
-		    (object Class "IFault"
-			quid       	"3B84A861031D"
-			documentation 	"This class represents the javax.wsdl.Fault non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86646A00BD"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8664750131"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Fault"
-				quid       	"3B84A8710208"
-				stereotype 	"javaclass")))
-		    (object Class "IMessage"
-			quid       	"3B84A8AF004F"
-			documentation 	"This class represents the javax.wsdl.Message non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPart"
-				quid       	"3B8972240273"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"IPart"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"3B89723D0233"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParts"
-				quid       	"3B897254025E"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOrderedParts"
-				quid       	"3B897261020D"
-				parameters 	(list Parameters
-				    (object Parameter "partOrder"
-					type       	"IList"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Message"
-				quid       	"3B84A8BC0260"
-				stereotype 	"javaclass")))
-		    (object Class "IPart"
-			quid       	"3B84A93F01BE"
-			documentation 	"This class represents the javax.wsdl.Part non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "setExtensionAttribute"
-				quid       	"3C4688450052"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName")
-				    (object Parameter "value"
-					type       	"QName"))
-				exceptions 	"WSDLException"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttributeNames"
-				quid       	"3C468A0101C3"
-				result     	"IIterator"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttribute"
-				quid       	"3C468A2D02D5"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"QName"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Part"
-				quid       	"3B84A9500231"
-				stereotype 	"javaclass")))
-		    (object Class "IService"
-			quid       	"3B84AB490287"
-			documentation 	"This class represents the javax.wsdl.Service non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPort"
-				quid       	"3B895D5601D1"
-				parameters 	(list Parameters
-				    (object Parameter "port"
-					type       	"IPort"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPorts"
-				quid       	"3B895DA20036"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPort"
-				quid       	"3B895DB001BC"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Service"
-				quid       	"3B84AB5B003E"
-				stereotype 	"javaclass")))
-		    (object Class "IPort"
-			quid       	"3B84AB800326"
-			documentation 	"This class represents the javax.wsdl.Port non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getBinding"
-				quid       	"3C8651F302B5"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBinding"
-				quid       	"3C86526302F2"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Port"
-				quid       	"3B84AB8C0016"
-				stereotype 	"javaclass")))
-		    (object Class "IBinding"
-			quid       	"3B84ABC60219"
-			documentation 	"This class represents the javax.wsdl.Binding non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingOperation"
-				quid       	"3B895F160153"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOperation"
-					type       	"IBindingOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperation"
-				quid       	"3B895F500066"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperations"
-				quid       	"3B895FA401C5"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3C8652A90284"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setPortType"
-				quid       	"3C8652BE01A8"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Binding"
-				quid       	"3B84ABCF0302"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOperation"
-			quid       	"3B84ADC00072"
-			documentation 	"This class represents the javax.wsdl.BindingOperation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingFault"
-				quid       	"3B8960BC0041"
-				parameters 	(list Parameters
-				    (object Parameter "bindingFault"
-					type       	"IBindingFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFault"
-				quid       	"3B8960D9009D"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFaults"
-				quid       	"3B8960FC0061"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3C86532D0017"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOperation"
-				quid       	"3C86533F037B"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingInput"
-				quid       	"3C86550900DA"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingInput"
-				quid       	"3C86551D007F"
-				parameters 	(list Parameters
-				    (object Parameter "bindingInput"
-					type       	"IBindingInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOutput"
-				quid       	"3C8655340349"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingOutput"
-				quid       	"3C86554702A6"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOutput"
-					type       	"IBindingOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOperation"
-				quid       	"3B84ADCB021C"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingInput"
-			quid       	"3B84ADEB0100"
-			documentation 	"This class represents the javax.wsdl.BindingInput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingInput"
-				quid       	"3B84ADFE000D"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOutput"
-			quid       	"3B84AE210111"
-			documentation 	"This class represents the javax.wsdl.BindingOutput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOutput"
-				quid       	"3B84AE2D0050"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingFault"
-			quid       	"3B84AE4F00BD"
-			documentation 	"This class represents the javax.wsdl.BindingFault non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingFault"
-				quid       	"3B84AE5F002A"
-				stereotype 	"javaclass")))
-		    (object Class "DOMElement"
-			quid       	"3B84AF3203DB"
-			documentation 	"This class represents the org.w3c.dom.Element non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B84AF560292"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensibilityElement"
-			quid       	"3B84B12402AB"
-			documentation 	"This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensibilityElement"
-				quid       	"3B84B13503D1"
-				stereotype 	"javaclass")))
-		    (object Class "IDefinition"
-			quid       	"3B84B1D90142"
-			documentation 	"This class represents the javax.wsdl.Definition non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBinding"
-				quid       	"3B8988F1039D"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addImport"
-				quid       	"3B8989490259"
-				parameters 	(list Parameters
-				    (object Parameter "importDef"
-					type       	"IImport"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addMessage"
-				quid       	"3B89896E005E"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addNamespace"
-				quid       	"3B898984004B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String")
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addPortType"
-				quid       	"3B8989C50045"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addService"
-				quid       	"3B8989E401EE"
-				parameters 	(list Parameters
-				    (object Parameter "service"
-					type       	"IService"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingFault"
-				quid       	"3B898A17038C"
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingInput"
-				quid       	"3B898A320286"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOutput"
-				quid       	"3B898A46013B"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOperation"
-				quid       	"3B898A5C00B0"
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBinding"
-				quid       	"3B8989FE037C"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createFault"
-				quid       	"3B898A7502E7"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createImport"
-				quid       	"3B898A83014C"
-				result     	"IImport"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createInput"
-				quid       	"3B898A9D033E"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createMessage"
-				quid       	"3B898AAF0254"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOperation"
-				quid       	"3B898AC203C4"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOutput"
-				quid       	"3B898AE800ED"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPart"
-				quid       	"3B898AF8026D"
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPort"
-				quid       	"3B898B0801DA"
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPortType"
-				quid       	"3B898B15039B"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createService"
-				quid       	"3B898B32013A"
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBinding"
-				quid       	"3B898B420075"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindings"
-				quid       	"3B898B920341"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BCD0060"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BE70144"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessage"
-				quid       	"3B898C170107"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessages"
-				quid       	"3B898C3E001D"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespace"
-				quid       	"3B898C62014B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespaces"
-				quid       	"3B898C740115"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3B898CBE0071"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortTypes"
-				quid       	"3B898CDA01C6"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPrefix"
-				quid       	"3B898CFD0017"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getService"
-				quid       	"3B898D2300A8"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getServices"
-				quid       	"3B898D3B03CE"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionRegistry"
-				quid       	"3B89D5B8012B"
-				result     	"IExtensionRegistry"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setExtensionRegistry"
-				quid       	"3B89D5D703BB"
-				parameters 	(list Parameters
-				    (object Parameter "extensionRegistry"
-					type       	"IExtensionRegistry"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDocumentBaseURI"
-				quid       	"3B89D5FE0208"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocumentBaseURI"
-				quid       	"3B89D6180328"
-				parameters 	(list Parameters
-				    (object Parameter "documentBase"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createTypes"
-				quid       	"3CADD0560080"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeService"
-				quid       	"3CADD07E004C"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeBinding"
-				quid       	"3CADD0BA0355"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removePortType"
-				quid       	"3CADD0D8029A"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeMessage"
-				quid       	"3CADD0FA0307"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getTypes"
-				quid       	"3C86706F031B"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setTypes"
-				quid       	"3C86709500EE"
-				parameters 	(list Parameters
-				    (object Parameter "types"
-					type       	"ITypes"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Definition"
-				quid       	"3B84B1E702A1"
-				stereotype 	"javaclass")))
-		    (object Class "IImport"
-			quid       	"3B84B2020119"
-			documentation 	"This class represents the javax.wsdl.Import non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Import"
-				quid       	"3B84B20C02EA"
-				stereotype 	"javaclass")))
-		    (object Class "IList"
-			quid       	"3B85C0A203C5"
-			documentation 	"This class represents the non-MOF java.util.List interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"3B85C0AF0297"
-				stereotype 	"javaclass")))
-		    (object Class "IMap"
-			quid       	"3B896B0300D4"
-			documentation 	"This class represents the non-MOF java.util.Map interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Map"
-				quid       	"3B896B1102B5"
-				stereotype 	"javaclass")))
-		    (object Class "IURL"
-			quid       	"3B89D5630274"
-			documentation 	"This class represents the non-MOF java.net.URL interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.net.URL"
-				quid       	"3B89D56E03E2"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensionRegistry"
-			quid       	"3B89D59302A5"
-			documentation 	"This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensionRegistry"
-				quid       	"3B89D59F02E8"
-				stereotype 	"javaclass")))
-		    (object Class "Types"
-			quid       	"3B8BE9A603A8"
-			documentation 	"This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B8BEB010311"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3CADCD3B0380"
-				supplier   	"Logical View::wsdl::ITypes"
-				quidu      	"3CADCBB20050"))
-			operations 	(list Operations
-			    (object Operation "getSchemas"
-				quid       	"3CADCF3803E6"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSchemas"
-				quid       	"3CADCF7E0301"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)))
-		    (object Class "IIterator"
-			quid       	"3C4687DA0167"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Iterator"
-				quid       	"3C46880800B9"
-				stereotype 	"javaclass")))
-		    (object Class "WSDLException"
-			quid       	"3C4689650313"
-			documentation 	"This class represents the javax.wsdl.Exception class."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.WSDLException"
-				quid       	"3C4689740315"
-				stereotype 	"javaclass")))
-		    (object Class "ITypes"
-			quid       	"3CADCBB20050"
-			documentation 	"This class represents the javax.wsdl.Types non-MOF interface"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Types"
-				quid       	"3CADCBF10173"
-				stereotype 	"javaclass")))
-		    (object Class "UnknownExtensibilityElement"
-			quid       	"3CB24AC002AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CB24AEC01CB"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "XSDSchemaExtensibilityElement"
-			quid       	"3CC360D7039C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CC3627F00B7"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "DOMDocument"
-			quid       	"3CD1502C023B"
-			documentation 	"This class represents the org.w3c.dom.Document non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3CD150600182"
-				stereotype 	"javaclass")))
-		    (object Class "MessageReference"
-			quid       	"3F6771DB02DC"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3F762A6A0308"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3F6780A001AB"
-				type       	"String"
-				exportControl 	"Protected"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Association "$UNNAMED$0"
-			quid       	"3AD5C824018C"
-			roles      	(list role_list
-			    (object Role "portType"
-				quid       	"3AD5C82701C3"
-				label      	"portType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				Containment 	"By Value"
-				is_aggregate 	TRUE)
-			    (object Role "eOperations"
-				quid       	"3AD5C82701CD"
-				label      	"eOperations"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$1"
-			quid       	"3AD5CEBE00E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$2"
-				quid       	"3AD5CEBF0057"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eParts"
-				quid       	"3AD5CEBF0061"
-				label      	"eParts"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$3"
-			quid       	"3AD5D352010F"
-			roles      	(list role_list
-			    (object Role "ePortType"
-				quid       	"3AD5D3540176"
-				label      	"ePortType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$4"
-				quid       	"3AD5D3540180"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261")))
-		    (object Association "$UNNAMED$5"
-			quid       	"3AD5D3E10179"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$6"
-				quid       	"3AD5D3E20225"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindingOperations"
-				quid       	"3AD5D3E20239"
-				label      	"eBindingOperations"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$7"
-			quid       	"3AD5D425038A"
-			roles      	(list role_list
-			    (object Role "eOperation"
-				quid       	"3AD5D42602F5"
-				label      	"eOperation"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$8"
-				quid       	"3AD5D42602FF"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145")))
-		    (object Association "$UNNAMED$9"
-			quid       	"3AD5D9400393"
-			roles      	(list role_list
-			    (object Role "ePorts"
-				quid       	"3AD5D941031C"
-				label      	"ePorts"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$10"
-				quid       	"3AD5D941031D"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$11"
-			quid       	"3AD5D9B8011F"
-			roles      	(list role_list
-			    (object Role "eBinding"
-				quid       	"3AD5D9B9024D"
-				label      	"eBinding"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$12"
-				quid       	"3AD5D9B90261"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286")))
-		    (object Association "$UNNAMED$13"
-			quid       	"3AD5E60301E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$14"
-				quid       	"3AD5E60400B7"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eMessages"
-				quid       	"3AD5E60400C1"
-				label      	"eMessages"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$15"
-			quid       	"3AD5E6710104"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$16"
-				quid       	"3AD5E672034A"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "ePortTypes"
-				quid       	"3AD5E6720354"
-				label      	"ePortTypes"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$17"
-			quid       	"3AD5E6770095"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$18"
-				quid       	"3AD5E6780371"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindings"
-				quid       	"3AD5E678037B"
-				label      	"eBindings"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$19"
-			quid       	"3AD5E67B0311"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$20"
-				quid       	"3AD5E67D007F"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eServices"
-				quid       	"3AD5E67D0089"
-				label      	"eServices"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$21"
-			quid       	"3AD5FD130079"
-			roles      	(list role_list
-			    (object Role "eExtensibilityElements"
-				quid       	"3AD5FD14019D"
-				label      	"eExtensibilityElements"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$22"
-				quid       	"3AD5FD14019E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$23"
-			quid       	"3ADF2E6401F5"
-			roles      	(list role_list
-			    (object Role "eBindingInput"
-				quid       	"3ADF2E650251"
-				label      	"eBindingInput"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$24"
-				quid       	"3ADF2E650252"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$25"
-			quid       	"3ADF2EB30163"
-			roles      	(list role_list
-			    (object Role "eBindingOutput"
-				quid       	"3ADF2EB4013C"
-				label      	"eBindingOutput"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$26"
-				quid       	"3ADF2EB4013D"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$27"
-			quid       	"3ADF2F94024D"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3ADF2F950190"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$28"
-				quid       	"3ADF2F95019A"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$29"
-			quid       	"3ADF2FB802F9"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3ADF2FB9020A"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$30"
-				quid       	"3ADF2FB9020B"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$31"
-			quid       	"3ADF331601A4"
-			roles      	(list role_list
-			    (object Role "eFaults"
-				quid       	"3ADF33180387"
-				label      	"eFaults"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$32"
-				quid       	"3ADF33180388"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$33"
-			quid       	"3ADF340003E5"
-			roles      	(list role_list
-			    (object Role "eBindingFaults"
-				quid       	"3ADF340103AA"
-				label      	"eBindingFaults"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$34"
-				quid       	"3ADF340103AB"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$35"
-			quid       	"3AE091F402F3"
-			roles      	(list role_list
-			    (object Role "eFault"
-				quid       	"3AE091F801FE"
-				label      	"eFault"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$36"
-				quid       	"3AE091F801FF"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6")))
-		    (object Association "$UNNAMED$37"
-			quid       	"3AEA3D55002D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$38"
-				quid       	"3AEA3D560328"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eNamespaces"
-				quid       	"3AEA3D560332"
-				label      	"eNamespaces"
-				supplier   	"Logical View::wsdl::Namespace"
-				quidu      	"3AEA3CD30030"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$39"
-			quid       	"3AEA3E3A002D"
-			roles      	(list role_list
-			    (object Role "eDefinition"
-				quid       	"3AEA3E3C01E8"
-				label      	"eDefinition"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$40"
-				quid       	"3AEA3E3C01F2"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$41"
-			quid       	"3AEA412F0035"
-			roles      	(list role_list
-			    (object Role "eParameterOrdering"
-				quid       	"3AEA41310255"
-				label      	"eParameterOrdering"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$42"
-				quid       	"3AEA4131025F"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE")))
-		    (object Association "$UNNAMED$43"
-			quid       	"3B84AD2400BD"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3B84AD250083"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$44"
-				quid       	"3B84AD250084"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4")))
-		    (object Association "$UNNAMED$45"
-			quid       	"3B84AD7900F2"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3B84AD7A014D"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$46"
-				quid       	"3B84AD7A014E"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C")))
-		    (object Association "$UNNAMED$47"
-			quid       	"3B8B1BE900C4"
-			roles      	(list role_list
-			    (object Role "typeDefinition"
-				quid       	"3B8B1BE90327"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$48"
-				quid       	"3B8B1BE90331"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$49"
-			quid       	"3B8B1C1203B2"
-			roles      	(list role_list
-			    (object Role "elementDeclaration"
-				quid       	"3B8B1C14001C"
-				label      	"elementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$50"
-				quid       	"3B8B1C140026"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$51"
-			quid       	"3B8B1DCC02E5"
-			roles      	(list role_list
-			    (object Role "eSchema"
-				quid       	"3B8B1DCE0270"
-				label      	"eSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$52"
-				quid       	"3B8B1DCE027A"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$53"
-			quid       	"3B8BEA27029F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$54"
-				quid       	"3B8BEA290356"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eTypes"
-				quid       	"3B8BEA29036A"
-				label      	"eTypes"
-				supplier   	"Logical View::wsdl::Types"
-				quidu      	"3B8BE9A603A8"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$55"
-			quid       	"3C46829303E5"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3C468296010E"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$56"
-				quid       	"3C4682960118"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$57"
-			quid       	"3C864DFF02EC"
-			roles      	(list role_list
-			    (object Role "eImports"
-				quid       	"3C864DFF02ED"
-				label      	"eImports"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$58"
-				quid       	"3C864DFF02EE"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$59"
-			quid       	"3CC3614500F2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$60"
-				quid       	"3CC36146023D"
-				supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-				quidu      	"3CC360D7039C"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "schema"
-				quid       	"3CC36146023E"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$61"
-			quid       	"3F74E78401B1"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3F74E786000F"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$62"
-				quid       	"3F74E7860023"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")))
-		    (object Association "$UNNAMED$63"
-			quid       	"3F7896A2026E"
-			roles      	(list role_list
-			    (object Role "parent"
-				quid       	"3F7896A7012B"
-				label      	"parent"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "children"
-				quid       	"3F7896A7012C"
-				label      	"children"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "2.7 Services"
-			quid       	"39AD3EF60127"
-			title      	"2.7 Services"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @28
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(1173, 660)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(1173, 610)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				width      	520
-				height     	404
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPort" @29
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(686, 481)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IPort")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(686, 431)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB800326"
-				width      	278
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IService" @30
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(126, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"IService")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(126, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB490287"
-				width      	246
-				height     	264
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @31
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@31
-				    location   	(44, 389)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @32
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954E01B4"
-				client     	@31
-				supplier   	@30
-				line_style 	3
-				origin_attachment 	(240, 377)
-				terminal_attachment 	(240, 292))
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @33
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@33
-				    location   	(1244, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @34
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@33
-				supplier   	@28
-				line_style 	3
-				origin_attachment 	(1430, 1113)
-				terminal_attachment 	(1430, 1002))
-			    (object ClassView "Class" "Logical View::wsdl::Port" @35
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 912)
-				label      	(object ItemLabel
-				    Parent_View 	@35
-				    location   	(675, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	282
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				width      	300
-				height     	168
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @36
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954502C9"
-				client     	@35
-				supplier   	@29
-				line_style 	3
-				origin_attachment 	(809, 828)
-				terminal_attachment 	(809, 637))
-			    (object AssociationViewNew "$UNNAMED$9" @37
-				location   	(343, 916)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9400393"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePorts" @38
-					Parent_View 	@37
-					location   	(-121, 644)
-					label      	(object SegLabel @39
-					    Parent_View 	@38
-					    location   	(413, 945)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+ePorts"
-					    pctDist    	0.218978
-					    height     	29
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031C"
-					client     	@37
-					supplier   	@35
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(666, 916)
-					label      	(object SegLabel @40
-					    Parent_View 	@38
-					    location   	(539, 880)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	160
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.608000
-					    height     	37
-					    orientation 	0)
-					label      	(object SegLabel @41
-					    Parent_View 	@38
-					    location   	(448, 990)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.328467
-					    height     	74
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$10" @42
-					Parent_View 	@37
-					location   	(-121, 644)
-					label      	(object SegLabel @43
-					    Parent_View 	@42
-					    location   	(216, 744)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031D"
-					client     	@37
-					supplier   	@31
-					vertices   	(list Points
-					    (343, 916)
-					    (257, 916)
-					    (257, 679))
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(257, 679)
-					label      	(object SegLabel @44
-					    Parent_View 	@42
-					    location   	(301, 796)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.637097
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$11" @45
-				location   	(886, 1270)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9B8011F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBinding" @46
-					Parent_View 	@45
-					location   	(38, 422)
-					label      	(object SegLabel @47
-					    Parent_View 	@46
-					    location   	(1112, 1235)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eBinding"
-					    pctDist    	0.648571
-					    height     	36
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B9024D"
-					client     	@45
-					supplier   	@33
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(1235, 1270)
-					label      	(object SegLabel @48
-					    Parent_View 	@46
-					    location   	(1170, 1313)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.814286
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$12" @49
-					Parent_View 	@45
-					location   	(38, 422)
-					label      	(object SegLabel @50
-					    Parent_View 	@49
-					    location   	(852, 1106)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	""
-					    pctDist    	0.687943
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B90261"
-					client     	@45
-					supplier   	@35
-					vertices   	(list Points
-					    (886, 1270)
-					    (812, 1270)
-					    (812, 996))
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(812, 996))))))
-		    (object ClassDiagram "2.5 Bindings"
-			quid       	"39AD51270252"
-			title      	"2.5 Bindings"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @51
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@51
-				    location   	(73, 114)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@51
-				    location   	(73, 64)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				width      	480
-				height     	376
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOperation" @52
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 352)
-				label      	(object ItemLabel
-				    Parent_View 	@52
-				    location   	(780, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"IBindingOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@52
-				    location   	(780, 80)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADC00072"
-				width      	410
-				height     	568
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingInput" @53
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@53
-				    location   	(62, 1334)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IBindingInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@53
-				    location   	(62, 1284)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADEB0100"
-				width      	278
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOutput" @54
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@54
-				    location   	(61, 1638)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"IBindingOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@54
-				    location   	(61, 1588)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE210111"
-				width      	312
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingFault" @55
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@55
-				    location   	(72, 1958)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"IBindingFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@55
-				    location   	(72, 1908)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE4F00BD"
-				width      	290
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @56
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@56
-				    location   	(1568, 486)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	673
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	691
-				height     	301
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @57
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@57
-				    location   	(1756, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @58
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@58
-				    location   	(1756, 1587)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @59
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@59
-				    location   	(97, 539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @60
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@59
-				supplier   	@51
-				line_style 	3
-				origin_attachment 	(279, 527)
-				terminal_attachment 	(279, 428))
-			    (object AssociationViewNew "$UNNAMED$3" @61
-				location   	(1039, 742)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D352010F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePortType" @62
-					Parent_View 	@61
-					location   	(575, 598)
-					label      	(object SegLabel @63
-					    Parent_View 	@62
-					    location   	(1449, 781)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+ePortType"
-					    pctDist    	0.789292
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540176"
-					client     	@61
-					supplier   	@56
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(1559, 742)
-					label      	(object SegLabel @64
-					    Parent_View 	@62
-					    location   	(1492, 716)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.872193
-					    height     	27
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$4" @65
-					Parent_View 	@61
-					location   	(575, 598)
-					label      	(object SegLabel @66
-					    Parent_View 	@65
-					    location   	(776, 697)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	""
-					    pctDist    	0.509449
-					    height     	46
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540180"
-					client     	@61
-					supplier   	@59
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(520, 742))))
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @67
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@67
-				    location   	(1672, 851)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				width      	450
-				height     	370
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @68
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@68
-				    location   	(476, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$43" @69
-				location   	(1264, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD2400BD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @70
-					Parent_View 	@69
-					location   	(96, 287)
-					label      	(object SegLabel @71
-					    Parent_View 	@70
-					    location   	(1637, 1316)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.775148
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250083"
-					client     	@69
-					supplier   	@57
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(1747, 1359)
-					label      	(object SegLabel @72
-					    Parent_View 	@70
-					    location   	(1694, 1398)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.889546
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$44" @73
-					Parent_View 	@69
-					location   	(96, 287)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250084"
-					client     	@69
-					supplier   	@68
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(781, 1359))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @74
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@74
-				    location   	(812, 1539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$45" @75
-				location   	(1432, 1654)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD7900F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @76
-					Parent_View 	@75
-					location   	(-120, 374)
-					label      	(object SegLabel @77
-					    Parent_View 	@76
-					    location   	(1645, 1612)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.674772
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014D"
-					client     	@75
-					supplier   	@58
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1747, 1654)
-					label      	(object SegLabel @78
-					    Parent_View 	@76
-					    location   	(1681, 1697)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.790274
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$46" @79
-					Parent_View 	@75
-					location   	(-120, 374)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014E"
-					client     	@75
-					supplier   	@74
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1117, 1654))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @80
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@80
-				    location   	(819, 931)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @81
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84ADE401DC"
-				client     	@80
-				supplier   	@52
-				line_style 	3
-				origin_attachment 	(966, 919)
-				terminal_attachment 	(966, 636))
-			    (object AssociationViewNew "$UNNAMED$5" @82
-				location   	(457, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D3E10179"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$6" @83
-					Parent_View 	@82
-					location   	(-1319, 494)
-					label      	(object SegLabel @84
-					    Parent_View 	@83
-					    location   	(235, 920)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20225"
-					client     	@82
-					supplier   	@59
-					vertices   	(list Points
-					    (457, 1022)
-					    (276, 1022)
-					    (276, 849))
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(276, 849)
-					label      	(object SegLabel @85
-					    Parent_View 	@83
-					    location   	(330, 884)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "eBindingOperations" @86
-					Parent_View 	@82
-					location   	(-1319, 494)
-					label      	(object SegLabel @87
-					    Parent_View 	@86
-					    location   	(531, 977)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+eBindingOperations"
-					    pctDist    	0.211699
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20239"
-					client     	@82
-					supplier   	@80
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(810, 1022)
-					label      	(object SegLabel @88
-					    Parent_View 	@86
-					    location   	(769, 980)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.884956
-					    height     	43
-					    orientation 	0)
-					label      	(object SegLabel @89
-					    Parent_View 	@86
-					    location   	(714, 1067)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.727564
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$7" @90
-				location   	(1418, 1040)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D425038A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperation" @91
-					Parent_View 	@90
-					location   	(-358, 464)
-					label      	(object SegLabel @92
-					    Parent_View 	@91
-					    location   	(1520, 1079)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	228
-					    justify    	0
-					    label      	"+eOperation"
-					    pctDist    	0.420601
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602F5"
-					client     	@90
-					supplier   	@67
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1663, 1040)
-					label      	(object SegLabel @93
-					    Parent_View 	@91
-					    location   	(1589, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.696721
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$8" @94
-					Parent_View 	@90
-					location   	(-358, 464)
-					label      	(object SegLabel @95
-					    Parent_View 	@94
-					    location   	(1273, 1070)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.595420
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602FF"
-					client     	@90
-					supplier   	@80
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1174, 1040))))
-			    (object AssociationViewNew "$UNNAMED$23" @96
-				location   	(787, 1190)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2E6401F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingInput" @97
-					Parent_View 	@96
-					location   	(-381, 454)
-					label      	(object SegLabel @98
-					    Parent_View 	@97
-					    location   	(669, 1152)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+eBindingInput"
-					    pctDist    	0.511905
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650251"
-					client     	@96
-					supplier   	@68
-					vertices   	(list Points
-					    (787, 1190)
-					    (636, 1190)
-					    (636, 1271))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(636, 1271)
-					label      	(object SegLabel @99
-					    Parent_View 	@97
-					    location   	(685, 1222)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.440476
-					    height     	32
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$24" @100
-					Parent_View 	@96
-					location   	(-381, 454)
-					label      	(object SegLabel @101
-					    Parent_View 	@100
-					    location   	(885, 1144)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650252"
-					client     	@96
-					supplier   	@80
-					vertices   	(list Points
-					    (787, 1190)
-					    (926, 1190)
-					    (926, 1097))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(926, 1097)
-					label      	(object SegLabel @102
-					    Parent_View 	@100
-					    location   	(871, 1136)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.837758
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$25" @103
-				location   	(1024, 1312)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2EB30163"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingOutput" @104
-					Parent_View 	@103
-					location   	(-150, 578)
-					label      	(object SegLabel @105
-					    Parent_View 	@104
-					    location   	(1012, 1429)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	306
-					    justify    	0
-					    label      	"+eBindingOutput"
-					    pctDist    	0.545082
-					    height     	13
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013C"
-					client     	@103
-					supplier   	@74
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1527)
-					label      	(object SegLabel @106
-					    Parent_View 	@104
-					    location   	(967, 1479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.774590
-					    height     	58
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$26" @107
-					Parent_View 	@103
-					location   	(-150, 578)
-					label      	(object SegLabel @108
-					    Parent_View 	@107
-					    location   	(983, 1140)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013D"
-					client     	@103
-					supplier   	@80
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1097)
-					label      	(object SegLabel @109
-					    Parent_View 	@107
-					    location   	(1031, 1186)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.590164
-					    height     	7
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @110
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1920, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@110
-				    location   	(1772, 1907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @111
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@111
-				    location   	(1212, 1859)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @112
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE710333"
-				client     	@111
-				supplier   	@55
-				line_style 	3
-				origin_attachment 	(1203, 2007)
-				terminal_attachment 	(353, 2007))
-			    (object AssociationViewNew "$UNNAMED$33" @113
-				location   	(1356, 1352)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF340003E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingFaults" @114
-					Parent_View 	@113
-					location   	(188, 616)
-					label      	(object SegLabel @115
-					    Parent_View 	@114
-					    location   	(1382, 1750)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	300
-					    justify    	0
-					    label      	"+eBindingFaults"
-					    pctDist    	0.803150
-					    height     	26
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AA"
-					client     	@113
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1356, 1847)
-					label      	(object SegLabel @116
-					    Parent_View 	@114
-					    location   	(1409, 1797)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899194
-					    height     	53
-					    orientation 	0)
-					label      	(object SegLabel @117
-					    Parent_View 	@114
-					    location   	(1256, 1806)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.919291
-					    height     	101
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$34" @118
-					Parent_View 	@113
-					location   	(188, 616)
-					label      	(object SegLabel @119
-					    Parent_View 	@118
-					    location   	(1076, 1197)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AB"
-					client     	@113
-					supplier   	@80
-					vertices   	(list Points
-					    (1356, 1352)
-					    (1356, 1217)
-					    (1117, 1217)
-					    (1117, 1097))
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1117, 1097)
-					label      	(object SegLabel @120
-					    Parent_View 	@118
-					    location   	(1152, 1164)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.687008
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$35" @121
-				location   	(1640, 1970)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE091F402F3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFault" @122
-					Parent_View 	@121
-					location   	(-344, 818)
-					label      	(object SegLabel @123
-					    Parent_View 	@122
-					    location   	(1674, 1915)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eFault"
-					    pctDist    	0.276423
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FE"
-					client     	@121
-					supplier   	@110
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1763, 1970)
-					label      	(object SegLabel @124
-					    Parent_View 	@122
-					    location   	(1718, 2012)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.642276
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$36" @125
-					Parent_View 	@121
-					location   	(-344, 818)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FF"
-					client     	@121
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1517, 1970))))
-			    (object InheritView "" @126
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE4302AB"
-				client     	@74
-				supplier   	@54
-				line_style 	3
-				origin_attachment 	(803, 1656)
-				terminal_attachment 	(364, 1656))
-			    (object InheritView "" @127
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE1B0113"
-				client     	@68
-				supplier   	@53
-				line_style 	3
-				origin_attachment 	(467, 1385)
-				terminal_attachment 	(331, 1385))))
-		    (object ClassDiagram "2.4 PortTypes"
-			quid       	"3AD5D1C40366"
-			title      	"2.4 PortTypes"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IPortType" @128
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@128
-				    location   	(146, 172)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"IPortType")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@128
-				    location   	(146, 122)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A5BE0331"
-				width      	718
-				height     	196
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::IOperation" @129
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@129
-				    location   	(1116, 176)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"IOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@129
-				    location   	(1116, 126)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A77600D1"
-				width      	891
-				height     	188
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IInput" @130
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@130
-				    location   	(55, 1437)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@130
-				    location   	(55, 1387)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A7EE0015"
-				width      	644
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IOutput" @131
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@131
-				    location   	(56, 1757)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"IOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@131
-				    location   	(56, 1707)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A829027D"
-				width      	674
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IFault" @132
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@132
-				    location   	(55, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@132
-				    location   	(55, 2026)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A861031D"
-				width      	644
-				height     	196
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @133
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@133
-				    location   	(158, 672)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	695
-				height     	281
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @134
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2576, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@134
-				    location   	(2325, 692)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	520
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @135
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@135
-				    location   	(1647, 2060)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @136
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@136
-				    location   	(870, 1422)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	390
-				height     	125
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @137
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@137
-				    location   	(1232, 1742)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	274
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @138
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@138
-				    location   	(1214, 620)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				width      	695
-				height     	352
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$0" @139
-				location   	(1024, 797)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5C824018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperations" @140
-					Parent_View 	@139
-					location   	(592, 269)
-					label      	(object SegLabel @141
-					    Parent_View 	@140
-					    location   	(1088, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+eOperations"
-					    pctDist    	0.359649
-					    height     	50
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701CD"
-					client     	@139
-					supplier   	@138
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(1205, 797)
-					label      	(object SegLabel @142
-					    Parent_View 	@140
-					    location   	(1176, 861)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.840391
-					    height     	64
-					    orientation 	1)
-					label      	(object SegLabel @143
-					    Parent_View 	@140
-					    location   	(1074, 923)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.276243
-					    height     	126
-					    orientation 	1))
-				    (object RoleView "portType" @144
-					Parent_View 	@139
-					location   	(592, 269)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701C3"
-					client     	@139
-					supplier   	@133
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(843, 797)
-					label      	(object SegLabel @145
-					    Parent_View 	@144
-					    location   	(888, 757)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.753488
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$41" @146
-				location   	(2107, 773)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA412F0035"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParameterOrdering" @147
-					Parent_View 	@146
-					location   	(1819, 101)
-					label      	(object SegLabel @148
-					    Parent_View 	@147
-					    location   	(2145, 647)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+eParameterOrdering"
-					    pctDist    	0.183333
-					    height     	127
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA41310255"
-					client     	@146
-					supplier   	@134
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(2316, 773)
-					label      	(object SegLabel @149
-					    Parent_View 	@147
-					    location   	(2272, 822)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.796610
-					    height     	49
-					    orientation 	1)
-					label      	(object SegLabel @150
-					    Parent_View 	@147
-					    location   	(2171, 888)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.306220
-					    height     	115
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$42" @151
-					Parent_View 	@146
-					location   	(1819, 101)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA4131025F"
-					client     	@146
-					supplier   	@138
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(1899, 773))))
-			    (object AssociationViewNew "$UNNAMED$31" @152
-				location   	(1702, 1504)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF331601A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFaults" @153
-					Parent_View 	@152
-					location   	(1414, 832)
-					label      	(object SegLabel @154
-					    Parent_View 	@153
-					    location   	(1815, 1982)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eFaults"
-					    pctDist    	0.878992
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180387"
-					client     	@152
-					supplier   	@135
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 2048)
-					label      	(object SegLabel @155
-					    Parent_View 	@153
-					    location   	(1644, 2020)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.949580
-					    height     	59
-					    orientation 	1)
-					label      	(object SegLabel @156
-					    Parent_View 	@153
-					    location   	(1593, 1963)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.845378
-					    height     	110
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$32" @157
-					Parent_View 	@152
-					location   	(1414, 832)
-					label      	(object SegLabel @158
-					    Parent_View 	@157
-					    location   	(1661, 1069)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180388"
-					client     	@152
-					supplier   	@138
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 960)
-					label      	(object SegLabel @159
-					    Parent_View 	@157
-					    location   	(1821, 1039)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.857362
-					    height     	119
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$27" @160
-				location   	(1178, 1234)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2F94024D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @161
-					Parent_View 	@160
-					location   	(890, 562)
-					label      	(object SegLabel @162
-					    Parent_View 	@161
-					    location   	(878, 1343)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.819820
-					    height     	103
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F950190"
-					client     	@160
-					supplier   	@136
-					vertices   	(list Points
-					    (1178, 1234)
-					    (980, 1234)
-					    (980, 1410))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(980, 1410)
-					label      	(object SegLabel @163
-					    Parent_View 	@161
-					    location   	(1046, 1364)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.877660
-					    height     	66
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$28" @164
-					Parent_View 	@160
-					location   	(890, 562)
-					label      	(object SegLabel @165
-					    Parent_View 	@164
-					    location   	(1236, 1036)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F95019A"
-					client     	@160
-					supplier   	@138
-					vertices   	(list Points
-					    (1178, 1234)
-					    (1277, 1234)
-					    (1277, 960))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(1277, 960)
-					label      	(object SegLabel @166
-					    Parent_View 	@164
-					    location   	(1197, 1058)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736413
-					    height     	81
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$29" @167
-				location   	(1468, 1345)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2FB802F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @168
-					Parent_View 	@167
-					location   	(1180, 673)
-					label      	(object SegLabel @169
-					    Parent_View 	@168
-					    location   	(1362, 1669)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.840909
-					    height     	107
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020A"
-					client     	@167
-					supplier   	@137
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 1730)
-					label      	(object SegLabel @170
-					    Parent_View 	@168
-					    location   	(1546, 1676)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863636
-					    height     	78
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$30" @171
-					Parent_View 	@167
-					location   	(1180, 673)
-					label      	(object SegLabel @172
-					    Parent_View 	@171
-					    location   	(1427, 1037)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020B"
-					client     	@167
-					supplier   	@138
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 960)
-					label      	(object SegLabel @173
-					    Parent_View 	@171
-					    location   	(1523, 1080)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.690341
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @174
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FD8019F"
-				client     	@133
-				supplier   	@128
-				line_style 	0)
-			    (object InheritView "" @175
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FE20171"
-				client     	@138
-				supplier   	@129
-				line_style 	0)
-			    (object InheritView "" @176
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FEE031D"
-				client     	@136
-				supplier   	@130
-				line_style 	0)
-			    (object InheritView "" @177
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FF801CD"
-				client     	@137
-				supplier   	@131
-				line_style 	0)
-			    (object InheritView "" @178
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F2002002D"
-				client     	@135
-				supplier   	@132
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @179
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2224, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@179
-				    location   	(1937, 1312)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	575
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	593
-				height     	312
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::MessageReference" @180
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 2544)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@180
-				    location   	(1193, 2466)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	654
-				    justify    	0
-				    label      	"MessageReference")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3F6771DB02DC"
-				width      	672
-				height     	180
-				annotation 	8)
-			    (object InheritTreeView "" @181
-				location   	(1524, 2275)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@180
-				vertices   	(list Points
-				    (1524, 2275)
-				    (1524, 2454)))
-			    (object InheritView "" @182
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723D0319"
-				client     	@135
-				supplier   	@180
-				line_style 	3
-				origin_attachment 	(1776, 2176)
-				terminal_attachment 	(1776, 2275)
-				drawSupplier 	@181)
-			    (object InheritView "" @183
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723500DD"
-				client     	@137
-				supplier   	@180
-				line_style 	3
-				origin_attachment 	(1371, 1854)
-				terminal_attachment 	(1371, 2275)
-				drawSupplier 	@181)
-			    (object InheritView "" @184
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67722802E7"
-				client     	@136
-				supplier   	@180
-				line_style 	3
-				origin_attachment 	(980, 1534)
-				terminal_attachment 	(980, 2275)
-				drawSupplier 	@181)
-			    (object AssociationViewNew "$UNNAMED$61" @185
-				location   	(2206, 2259)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F74E78401B1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @186
-					Parent_View 	@185
-					location   	(734, -285)
-					label      	(object SegLabel @187
-					    Parent_View 	@186
-					    location   	(2068, 1670)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.912230
-					    height     	139
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E786000F"
-					client     	@185
-					supplier   	@179
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(2206, 1612)
-					label      	(object SegLabel @188
-					    Parent_View 	@186
-					    location   	(2260, 1678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$62" @189
-					Parent_View 	@185
-					location   	(734, -285)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E7860023"
-					client     	@185
-					supplier   	@180
-					vertices   	(list Points
-					    (2206, 2259)
-					    (2206, 2556)
-					    (1856, 2556))
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(1856, 2556))))))
-		    (object ClassDiagram "2.1 Definitions"
-			quid       	"3AD5E48A0262"
-			title      	"2.1 Definitions"
-			zoom       	83
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IDefinition" @190
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 192)
-				label      	(object ItemLabel
-				    Parent_View 	@190
-				    location   	(88, 161)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"IDefinition")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@190
-				    location   	(88, 111)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B1D90142"
-				width      	706
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @191
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@191
-				    location   	(1686, 896)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	294
-				height     	120
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Import" @192
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@192
-				    location   	(1910, 545)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				width      	486
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @193
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2112, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@193
-				    location   	(1900, 1056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @194
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1808, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@194
-				    location   	(1596, 1360)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @195
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2336, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@195
-				    location   	(2124, 1600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @196
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@196
-				    location   	(1073, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	510
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	528
-				height     	426
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @197
-				location   	(1358, 860)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$54" @198
-					Parent_View 	@197
-					location   	(62, -36)
-					label      	(object SegLabel @199
-					    Parent_View 	@198
-					    location   	(1317, 535)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@197
-					supplier   	@196
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1358, 453)
-					label      	(object SegLabel @200
-					    Parent_View 	@198
-					    location   	(1403, 511)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.856649
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eTypes" @201
-					Parent_View 	@197
-					location   	(62, -36)
-					label      	(object SegLabel @202
-					    Parent_View 	@201
-					    location   	(1586, 909)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.779097
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@197
-					supplier   	@191
-					vertices   	(list Points
-					    (1358, 860)
-					    (1358, 948)
-					    (1677, 948))
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1677, 948)
-					label      	(object SegLabel @203
-					    Parent_View 	@201
-					    location   	(1632, 987)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.892655
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$57" @204
-				location   	(1612, 595)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @205
-					Parent_View 	@204
-					location   	(12, 227)
-					label      	(object SegLabel @206
-					    Parent_View 	@205
-					    location   	(1423, 512)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@204
-					supplier   	@196
-					vertices   	(list Points
-					    (1612, 595)
-					    (1464, 595)
-					    (1464, 453))
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1464, 453)
-					label      	(object SegLabel @207
-					    Parent_View 	@205
-					    location   	(1524, 495)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.858667
-					    height     	60
-					    orientation 	1))
-				    (object RoleView "eImports" @208
-					Parent_View 	@204
-					location   	(12, 227)
-					label      	(object SegLabel @209
-					    Parent_View 	@208
-					    location   	(1692, 557)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.280335
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@204
-					supplier   	@192
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1901, 595)
-					label      	(object SegLabel @210
-					    Parent_View 	@208
-					    location   	(1854, 652)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.841004
-					    height     	57
-					    orientation 	1)
-					label      	(object SegLabel @211
-					    Parent_View 	@208
-					    location   	(1676, 646)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.225941
-					    height     	51
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$13" @212
-				location   	(1279, 1137)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E60301E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$14" @213
-					Parent_View 	@212
-					location   	(271, 273)
-					label      	(object SegLabel @214
-					    Parent_View 	@213
-					    location   	(1238, 591)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400B7"
-					client     	@212
-					supplier   	@196
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1279, 453)
-					label      	(object SegLabel @215
-					    Parent_View 	@213
-					    location   	(1320, 586)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.804974
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eMessages" @216
-					Parent_View 	@212
-					location   	(271, 273)
-					label      	(object SegLabel @217
-					    Parent_View 	@216
-					    location   	(1647, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+eMessages"
-					    pctDist    	0.643137
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400C1"
-					client     	@212
-					supplier   	@193
-					vertices   	(list Points
-					    (1279, 1137)
-					    (1279, 1208)
-					    (1891, 1208))
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1891, 1208)
-					label      	(object SegLabel @218
-					    Parent_View 	@216
-					    location   	(1821, 1171)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899346
-					    height     	38
-					    orientation 	0)
-					label      	(object SegLabel @219
-					    Parent_View 	@216
-					    location   	(1797, 1244)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.864407
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$15" @220
-				location   	(1212, 1159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6710104"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$16" @221
-					Parent_View 	@220
-					location   	(-324, 215)
-					label      	(object SegLabel @222
-					    Parent_View 	@221
-					    location   	(1171, 594)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E672034A"
-					client     	@220
-					supplier   	@196
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1212, 453)
-					label      	(object SegLabel @223
-					    Parent_View 	@221
-					    location   	(1251, 624)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.757962
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "ePortTypes" @224
-					Parent_View 	@220
-					location   	(-324, 215)
-					label      	(object SegLabel @225
-					    Parent_View 	@224
-					    location   	(1391, 1451)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+ePortTypes"
-					    pctDist    	0.723698
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6720354"
-					client     	@220
-					supplier   	@194
-					vertices   	(list Points
-					    (1212, 1159)
-					    (1212, 1490)
-					    (1587, 1490))
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1587, 1490)
-					label      	(object SegLabel @226
-					    Parent_View 	@224
-					    location   	(1533, 1451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.925611
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @227
-					    Parent_View 	@224
-					    location   	(1512, 1540)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.895855
-					    height     	50
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$17" @228
-				location   	(1114, 1585)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6770095"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$18" @229
-					Parent_View 	@228
-					location   	(-406, 241)
-					label      	(object SegLabel @230
-					    Parent_View 	@229
-					    location   	(1073, 680)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6780371"
-					client     	@228
-					supplier   	@196
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(1114, 453)
-					label      	(object SegLabel @231
-					    Parent_View 	@229
-					    location   	(1155, 752)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736704
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eBindings" @232
-					Parent_View 	@228
-					location   	(-406, 241)
-					label      	(object SegLabel @233
-					    Parent_View 	@232
-					    location   	(1851, 1674)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eBindings"
-					    pctDist    	0.766347
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E678037B"
-					client     	@228
-					supplier   	@195
-					vertices   	(list Points
-					    (1114, 1585)
-					    (1114, 1716)
-					    (2115, 1716))
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(2115, 1716)
-					label      	(object SegLabel @234
-					    Parent_View 	@232
-					    location   	(2053, 1677)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.945074
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @235
-					    Parent_View 	@232
-					    location   	(2014, 1754)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.911072
-					    height     	38
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Service" @236
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@236
-				    location   	(1628, 1920)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$19" @237
-				location   	(1066, 1533)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E67B0311"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$20" @238
-					Parent_View 	@237
-					location   	(-521, -111)
-					label      	(object SegLabel @239
-					    Parent_View 	@238
-					    location   	(1025, 669)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D007F"
-					client     	@237
-					supplier   	@196
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1066, 453)
-					label      	(object SegLabel @240
-					    Parent_View 	@238
-					    location   	(1109, 756)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.719697
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "eServices" @241
-					Parent_View 	@237
-					location   	(-521, -111)
-					label      	(object SegLabel @242
-					    Parent_View 	@241
-					    location   	(1393, 2028)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eServices"
-					    pctDist    	0.791824
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D0089"
-					client     	@237
-					supplier   	@236
-					vertices   	(list Points
-					    (1066, 1533)
-					    (1066, 2059)
-					    (1619, 2059))
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1619, 2059)
-					label      	(object SegLabel @243
-					    Parent_View 	@241
-					    location   	(1554, 2031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.940197
-					    height     	29
-					    orientation 	0)
-					label      	(object SegLabel @244
-					    Parent_View 	@241
-					    location   	(1532, 2113)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.920515
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @245
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B1F80382"
-				client     	@196
-				supplier   	@190
-				line_style 	3
-				origin_attachment 	(1064, 263)
-				terminal_attachment 	(785, 263))))
-		    (object ClassDiagram "2.1.3 Extensibility"
-			quid       	"3AD60C510192"
-			title      	"2.1.3 Extensibility"
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @246
-				ShowCompartmentStereotypes 	TRUE
-				location   	(576, 1584)
-				label      	(object ItemLabel
-				    Parent_View 	@246
-				    location   	(494, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Port" @247
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1568, 1888)
-				label      	(object ItemLabel
-				    Parent_View 	@247
-				    location   	(1487, 1836)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @248
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1424, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@248
-				    location   	(1342, 1675)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @249
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1216, 2336)
-				label      	(object ItemLabel
-				    Parent_View 	@249
-				    location   	(1088, 2283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @250
-				ShowCompartmentStereotypes 	TRUE
-				location   	(736, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@250
-				    location   	(563, 1707)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	130
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IExtensibilityElement" @251
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@251
-				    location   	(1495, 136)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"IExtensibilityElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@251
-				    location   	(1495, 86)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B12402AB"
-				width      	804
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @252
-				ShowCompartmentStereotypes 	TRUE
-				location   	(928, 1952)
-				label      	(object ItemLabel
-				    Parent_View 	@252
-				    location   	(800, 1899)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @253
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1008, 2144)
-				label      	(object ItemLabel
-				    Parent_View 	@253
-				    location   	(863, 2091)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	290
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	308
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @254
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@254
-				    location   	(74, 1235)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	146
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @255
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(416, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@255
-				    location   	(335, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @256
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(480, 688)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@256
-				    location   	(209, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	542
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				width      	560
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @257
-				location   	(480, 1039)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@256
-				vertices   	(list Points
-				    (480, 1039)
-				    (480, 808)))
-			    (object InheritView "" @258
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD600CB00AA"
-				client     	@247
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(1566, 1824)
-				terminal_attachment 	(1566, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @259
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B5A4027E"
-				client     	@253
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(1097, 2079)
-				terminal_attachment 	(1097, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @260
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE0938602C9"
-				client     	@249
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(1219, 2271)
-				terminal_attachment 	(1219, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @261
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B59B0072"
-				client     	@252
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(988, 1887)
-				terminal_attachment 	(988, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @262
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6009202F7"
-				client     	@250
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(797, 1695)
-				terminal_attachment 	(797, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @263
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA0F02F0"
-				client     	@246
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(601, 1519)
-				terminal_attachment 	(601, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @264
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FDB803D4"
-				client     	@254
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(211, 1223)
-				terminal_attachment 	(211, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @265
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@255
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(414, 1344)
-				terminal_attachment 	(414, 1039)
-				drawSupplier 	@257)
-			    (object InheritView "" @266
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA20025E"
-				client     	@248
-				supplier   	@256
-				line_style 	3
-				origin_attachment 	(1429, 1663)
-				terminal_attachment 	(1429, 1039)
-				drawSupplier 	@257)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @267
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@267
-				    location   	(1632, 583)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	545
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	563
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @268
-				location   	(1191, 672)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @269
-					Parent_View 	@268
-					location   	(23, 560)
-					label      	(object SegLabel @270
-					    Parent_View 	@269
-					    location   	(847, 631)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@268
-					supplier   	@256
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(760, 672)
-					label      	(object SegLabel @271
-					    Parent_View 	@269
-					    location   	(830, 628)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.839695
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eExtensibilityElements" @272
-					Parent_View 	@268
-					location   	(23, 560)
-					label      	(object SegLabel @273
-					    Parent_View 	@272
-					    location   	(1355, 522)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	0.379070
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@268
-					supplier   	@267
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(1623, 672)
-					label      	(object SegLabel @274
-					    Parent_View 	@272
-					    location   	(1496, 627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.709402
-					    height     	46
-					    orientation 	0)
-					label      	(object SegLabel @275
-					    Parent_View 	@272
-					    location   	(1463, 764)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.632479
-					    height     	92
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::WSDLElement" @276
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1008, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@276
-				    location   	(630, 84)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	756
-				    justify    	0
-				    label      	"WSDLElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C6A302DD"
-				width      	774
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @277
-				location   	(1008, 402)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@276
-				vertices   	(list Points
-				    (1008, 402)
-				    (1008, 312)))
-			    (object InheritView "" @278
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FE3C03D4"
-				client     	@256
-				supplier   	@276
-				line_style 	3
-				origin_attachment 	(492, 568)
-				terminal_attachment 	(492, 402)
-				drawSupplier 	@277)
-			    (object InheritView "" @279
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B14903D0"
-				client     	@267
-				supplier   	@251
-				line_style 	3
-				origin_attachment 	(2015, 571)
-				terminal_attachment 	(2015, 246))
-			    (object InheritView "" @280
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BDDF53502C3"
-				client     	@267
-				supplier   	@276
-				line_style 	3
-				origin_attachment 	(1762, 571)
-				terminal_attachment 	(1762, 402)
-				drawSupplier 	@277)
-			    (object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @281
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2016, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@281
-				    location   	(1731, 1307)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	570
-				    justify    	0
-				    label      	"UnknownExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CB24AC002AE"
-				width      	588
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @282
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CB24AEC01CB"
-				client     	@281
-				supplier   	@267
-				line_style 	3
-				origin_attachment 	(1796, 1295)
-				terminal_attachment 	(1796, 805))
-			    (object AssociationViewNew "$UNNAMED$63" @283
-				location   	(2311, 1686)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F7896A2026E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "parent" @284
-					Parent_View 	@283
-					location   	(279, 294)
-					label      	(object SegLabel @285
-					    Parent_View 	@284
-					    location   	(2422, 1333)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+parent"
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012B"
-					client     	@283
-					supplier   	@281
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2432, 1686)
-					    (2432, 1374)
-					    (2310, 1374))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2310, 1374)
-					label      	(object SegLabel @286
-					    Parent_View 	@284
-					    location   	(2366, 1428)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "children" @287
-					Parent_View 	@283
-					location   	(279, 294)
-					label      	(object SegLabel @288
-					    Parent_View 	@287
-					    location   	(1899, 1537)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+children"
-					    pctDist    	0.798561
-					    height     	118
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012C"
-					client     	@283
-					supplier   	@281
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2016, 1686)
-					    (2016, 1425))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2016, 1425)
-					label      	(object SegLabel @289
-					    Parent_View 	@287
-					    location   	(2070, 1481)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "2.1.1 Naming and Linking"
-			quid       	"3AE8ED7201BD"
-			title      	"2.1.1 Naming and Linking"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IImport" @290
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@290
-				    location   	(1422, 177)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"IImport")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@290
-				    location   	(1422, 127)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B2020119"
-				width      	598
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Namespace" @291
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@291
-				    location   	(202, 1041)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	461
-				    justify    	0
-				    label      	"Namespace")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AEA3CD30030"
-				width      	479
-				height     	215
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @292
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@292
-				    location   	(1294, 1142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	694
-				height     	173
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @293
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@293
-				    location   	(164, 236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	490
-				height     	320
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$37" @294
-				location   	(309, 786)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3D55002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eNamespaces" @295
-					Parent_View 	@294
-					location   	(-91, 258)
-					label      	(object SegLabel @296
-					    Parent_View 	@295
-					    location   	(461, 956)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+eNamespaces"
-					    pctDist    	0.698842
-					    height     	152
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560332"
-					client     	@294
-					supplier   	@291
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 1029)
-					label      	(object SegLabel @297
-					    Parent_View 	@295
-					    location   	(248, 973)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.768707
-					    height     	62
-					    orientation 	1)
-					label      	(object SegLabel @298
-					    Parent_View 	@295
-					    location   	(228, 913)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.525097
-					    height     	82
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$38" @299
-					Parent_View 	@294
-					location   	(-91, 258)
-					label      	(object SegLabel @300
-					    Parent_View 	@299
-					    location   	(268, 592)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560328"
-					client     	@294
-					supplier   	@293
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 544)
-					label      	(object SegLabel @301
-					    Parent_View 	@299
-					    location   	(239, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.844961
-					    height     	71
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::wsdl::Import" @302
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 720)
-				label      	(object ItemLabel
-				    Parent_View 	@302
-				    location   	(1255, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	434
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				width      	452
-				height     	304
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$51" @303
-				location   	(1486, 1001)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1DCC02E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eSchema" @304
-					Parent_View 	@303
-					location   	(510, -103)
-					label      	(object SegLabel @305
-					    Parent_View 	@304
-					    location   	(1737, 1018)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eSchema"
-					    pctDist    	0.592593
-					    height     	105
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE0270"
-					client     	@303
-					supplier   	@292
-					vertices   	(list Points
-					    (1486, 1001)
-					    (1632, 1001)
-					    (1632, 1130))
-					line_style 	3
-					origin_attachment 	(1486, 1001)
-					terminal_attachment 	(1632, 1130)
-					label      	(object SegLabel @306
-					    Parent_View 	@304
-					    location   	(1563, 1018)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.592593
-					    height     	70
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$52" @307
-					Parent_View 	@303
-					location   	(510, -103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE027A"
-					client     	@303
-					supplier   	@302
-					line_style 	3
-					origin_attachment 	(1486, 1000)
-					terminal_attachment 	(1486, 872))))
-			    (object AssociationViewNew "$UNNAMED$39" @308
-				location   	(1087, 403)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3E3A002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$40" @309
-					Parent_View 	@308
-					location   	(687, -125)
-					label      	(object SegLabel @310
-					    Parent_View 	@309
-					    location   	(1406, 480)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01F2"
-					client     	@308
-					supplier   	@302
-					vertices   	(list Points
-					    (1087, 403)
-					    (1364, 403)
-					    (1364, 568))
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(1364, 568))
-				    (object RoleView "eDefinition" @311
-					Parent_View 	@308
-					location   	(687, -125)
-					label      	(object SegLabel @312
-					    Parent_View 	@311
-					    location   	(805, 363)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eDefinition"
-					    pctDist    	0.637532
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01E8"
-					client     	@308
-					supplier   	@293
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(645, 403)
-					label      	(object SegLabel @313
-					    Parent_View 	@311
-					    location   	(727, 456)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.814910
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$57" @314
-				location   	(737, 826)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @315
-					Parent_View 	@314
-					location   	(-671, 106)
-					label      	(object SegLabel @316
-					    Parent_View 	@315
-					    location   	(552, 647)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@314
-					supplier   	@293
-					vertices   	(list Points
-					    (737, 826)
-					    (510, 826)
-					    (510, 544))
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(510, 544)
-					label      	(object SegLabel @317
-					    Parent_View 	@315
-					    location   	(457, 595)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "eImports" @318
-					Parent_View 	@314
-					location   	(-671, 106)
-					label      	(object SegLabel @319
-					    Parent_View 	@318
-					    location   	(1144, 773)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.799189
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@314
-					supplier   	@302
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(1246, 826)
-					label      	(object SegLabel @320
-					    Parent_View 	@318
-					    location   	(1180, 879)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.872211
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @321
-					    Parent_View 	@318
-					    location   	(1162, 933)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.837728
-					    height     	107
-					    orientation 	1))))
-			    (object InheritView "" @322
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F200D0340"
-				client     	@302
-				supplier   	@290
-				line_style 	3
-				origin_attachment 	(1555, 568)
-				terminal_attachment 	(1555, 333))))
-		    (object ClassDiagram "2.2 Types"
-			quid       	"3B85AE59037E"
-			title      	"2.2 Types"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	81
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @323
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@323
-				    location   	(895, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ECD302A9"
-				width      	500
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @324
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@324
-				    location   	(906, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	478
-				height     	162
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @325
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@325
-				    location   	(1022, 1828)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	517
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	535
-				height     	305
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @326
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@326
-				    location   	(128, 1067)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	448
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	466
-				height     	258
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$47" @327
-				location   	(735, 1172)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1BE900C4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "typeDefinition" @328
-					Parent_View 	@327
-					location   	(143, 676)
-					label      	(object SegLabel @329
-					    Parent_View 	@328
-					    location   	(775, 1133)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.269006
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90327"
-					client     	@327
-					supplier   	@323
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(886, 1172)
-					label      	(object SegLabel @330
-					    Parent_View 	@328
-					    location   	(839, 1207)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.688705
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$48" @331
-					Parent_View 	@327
-					location   	(143, 676)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90331"
-					client     	@327
-					supplier   	@326
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(585, 1172))))
-			    (object AssociationViewNew "$UNNAMED$49" @332
-				location   	(527, 1592)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1C1203B2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "elementDeclaration" @333
-					Parent_View 	@332
-					location   	(-65, 1096)
-					label      	(object SegLabel @334
-					    Parent_View 	@333
-					    location   	(666, 1554)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+elementDeclaration"
-					    pctDist    	0.375394
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C14001C"
-					client     	@332
-					supplier   	@324
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(897, 1592)
-					label      	(object SegLabel @335
-					    Parent_View 	@333
-					    location   	(807, 1645)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.755877
-					    height     	53
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$50" @336
-					Parent_View 	@332
-					location   	(-65, 1096)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C140026"
-					client     	@332
-					supplier   	@326
-					vertices   	(list Points
-					    (527, 1592)
-					    (437, 1592)
-					    (437, 1313))
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(437, 1313))))
-			    (object AssociationViewNew "$UNNAMED$55" @337
-				location   	(322, 1911)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C46829303E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @338
-					Parent_View 	@337
-					location   	(-14, 1191)
-					label      	(object SegLabel @339
-					    Parent_View 	@338
-					    location   	(838, 1872)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.748560
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C468296010E"
-					client     	@337
-					supplier   	@325
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(1013, 1911)
-					label      	(object SegLabel @340
-					    Parent_View 	@338
-					    location   	(943, 1965)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$56" @341
-					Parent_View 	@337
-					location   	(-14, 1191)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C4682960118"
-					client     	@337
-					supplier   	@326
-					vertices   	(list Points
-					    (322, 1911)
-					    (229, 1911)
-					    (229, 1313))
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(229, 1313))))
-			    (object ClassView "Class" "Logical View::wsdl::Types" @342
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@342
-				    location   	(615, 512)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	371
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	389
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @343
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@343
-				    location   	(74, 107)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @344
-				location   	(234, 604)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eTypes" @345
-					Parent_View 	@344
-					location   	(-150, 396)
-					label      	(object SegLabel @346
-					    Parent_View 	@345
-					    location   	(480, 640)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	207
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.661017
-					    height     	36
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@344
-					supplier   	@342
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(606, 604)
-					label      	(object SegLabel @347
-					    Parent_View 	@345
-					    location   	(526, 569)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783883
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$54" @348
-					Parent_View 	@344
-					location   	(-150, 396)
-					label      	(object SegLabel @349
-					    Parent_View 	@348
-					    location   	(133, 313)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@344
-					supplier   	@343
-					vertices   	(list Points
-					    (234, 604)
-					    (174, 604)
-					    (174, 225))
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(174, 225)
-					label      	(object SegLabel @350
-					    Parent_View 	@348
-					    location   	(228, 271)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.897729
-					    height     	54
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::ITypes" @351
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@351
-				    location   	(525, 203)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"ITypes")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@351
-				    location   	(525, 153)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CADCBB20050"
-				width      	248
-				height     	166
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::XSDSchemaExtensibilityElement" @352
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@352
-				    location   	(1359, 753)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	739
-				    justify    	0
-				    label      	"XSDSchemaExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CC360D7039C"
-				width      	757
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @353
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@353
-				    location   	(1529, 1103)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	655
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	673
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$59" @354
-				location   	(1826, 975)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3614500F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$60" @355
-					Parent_View 	@354
-					location   	(306, 447)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023D"
-					client     	@354
-					supplier   	@352
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 859)
-					label      	(object SegLabel @356
-					    Parent_View 	@355
-					    location   	(1774, 900)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.656489
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "schema" @357
-					Parent_View 	@354
-					location   	(306, 447)
-					label      	(object SegLabel @358
-					    Parent_View 	@357
-					    location   	(2006, 1033)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	0.507576
-					    height     	180
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023E"
-					client     	@354
-					supplier   	@353
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 1091)
-					label      	(object SegLabel @359
-					    Parent_View 	@357
-					    location   	(1788, 1050)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.651515
-					    height     	39
-					    orientation 	1))))
-			    (object InheritView "" @360
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CADCD3B0380"
-				client     	@342
-				supplier   	@351
-				line_style 	3
-				origin_attachment 	(705, 500)
-				terminal_attachment 	(705, 307))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @361
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 224)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@361
-				    location   	(815, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				width      	500
-				height     	212
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @362
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@342
-				supplier   	@361
-				line_style 	3
-				origin_attachment 	(854, 500)
-				terminal_attachment 	(854, 330))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @363
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1824, 464)
-				label      	(object ItemLabel
-				    Parent_View 	@363
-				    location   	(1490, 368)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	669
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	687
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @364
-				location   	(1206, 493)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @365
-					Parent_View 	@364
-					location   	(-586, 237)
-					label      	(object SegLabel @366
-					    Parent_View 	@365
-					    location   	(1136, 386)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@364
-					supplier   	@361
-					vertices   	(list Points
-					    (1206, 493)
-					    (1094, 493)
-					    (1094, 330))
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1094, 330)
-					label      	(object SegLabel @367
-					    Parent_View 	@365
-					    location   	(1042, 377)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.828326
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "eExtensibilityElements" @368
-					Parent_View 	@364
-					location   	(-586, 237)
-					label      	(object SegLabel @369
-					    Parent_View 	@368
-					    location   	(1196, 454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	-0.039711
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@364
-					supplier   	@363
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1481, 493)
-					label      	(object SegLabel @370
-					    Parent_View 	@368
-					    location   	(1415, 546)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.764957
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @371
-					    Parent_View 	@368
-					    location   	(1396, 392)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.694915
-					    height     	102
-					    orientation 	0))))
-			    (object InheritView "" @372
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3627F00B7"
-				client     	@352
-				supplier   	@363
-				line_style 	3
-				origin_attachment 	(1812, 741)
-				terminal_attachment 	(1812, 572))))
-		    (object ClassDiagram "2.3 Messages"
-			quid       	"3BCE853D02C8"
-			title      	"2.3 Messages"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IMessage" @373
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@373
-				    location   	(267, 122)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"IMessage")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@373
-				    location   	(267, 72)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A8AF004F"
-				width      	380
-				height     	328
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPart" @374
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@374
-				    location   	(1029, 124)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"IPart")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@374
-				    location   	(1029, 74)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A93F01BE"
-				width      	617
-				height     	324
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @375
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@375
-				    location   	(1075, 690)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	492
-				height     	276
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @376
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A96D02F1"
-				client     	@375
-				supplier   	@374
-				line_style 	3
-				origin_attachment 	(1304, 678)
-				terminal_attachment 	(1304, 386))
-			    (object ClassView "Class" "Logical View::wsdl::Message" @377
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@377
-				    location   	(241, 507)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @378
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A8D102BA"
-				client     	@377
-				supplier   	@373
-				line_style 	3
-				origin_attachment 	(445, 495)
-				terminal_attachment 	(445, 388))
-			    (object AssociationViewNew "$UNNAMED$1" @379
-				location   	(688, 952)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5CEBE00E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParts" @380
-					Parent_View 	@379
-					location   	(176, 328)
-					label      	(object SegLabel @381
-					    Parent_View 	@380
-					    location   	(952, 897)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eParts"
-					    pctDist    	0.697452
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0061"
-					client     	@379
-					supplier   	@375
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(1066, 952)
-					label      	(object SegLabel @382
-					    Parent_View 	@380
-					    location   	(987, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.789809
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @383
-					    Parent_View 	@380
-					    location   	(967, 1061)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.742038
-					    height     	109
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$2" @384
-					Parent_View 	@379
-					location   	(176, 328)
-					label      	(object SegLabel @385
-					    Parent_View 	@384
-					    location   	(404, 893)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0057"
-					client     	@379
-					supplier   	@377
-					vertices   	(list Points
-					    (688, 952)
-					    (445, 952)
-					    (445, 817))
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(445, 817)
-					label      	(object SegLabel @386
-					    Parent_View 	@384
-					    location   	(393, 912)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.747604
-					    height     	53
-					    orientation 	0))))))))
-	    (object Class_Category "xsd"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"XSD")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"xsd")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/xsd/2002/XSD"))
-		quid       	"39ABDC6F01AA"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "XSDAnnotation"
-			quid       	"3B66EDC80233"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69E1770116"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4E20366"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "applicationInformation"
-				quid       	"3BBF7EBF02C8"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "userInformation"
-				quid       	"3BBF7EEA0157"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributes"
-				quid       	"3BBF7F0501E2"
-				stereotype 	"0..*"
-				type       	"DOMAttr"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeDeclaration"
-			quid       	"3B66ED2E0192"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69B7DC0193"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B688E6103BE"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F5202B4"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeGroupContent"
-			quid       	"3B6940200089"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D8E200EA"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDAttributeGroupDefinition"
-			quid       	"3B66ED840290"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69403A0221"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2EB02A8"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC800D2"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F7B0386"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUse"
-			quid       	"3B68354601A8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D737038F"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B72D7BB0349"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3B69CCF3027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B69CDDB03B7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CDE002D8"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "use"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7B0220382"
-				type       	"XSDAttributeUseCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C2719D90341"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDBoundedFacet"
-			quid       	"3B6C751D0344"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C763C0224"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C752A00CC"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinalityFacet"
-			quid       	"3B6C755D03D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C764F0131"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C756C0153"
-				type       	"XSDCardinality"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexTypeContent"
-			quid       	"3B683BA00196"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848B80286"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDComplexTypeDefinition"
-			quid       	"3B682B82031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69BAA20310"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2")
-			    (object Inheritance_Relationship
-				quid       	"3BA0D01901F1"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "derivationMethod"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C6E4020E"
-				type       	"XSDDerivationMethod"
-				initv      	"restriction"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B69C71D026A"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C73800C5"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "contentTypeCategory"
-				quid       	"3B69CA4202B8"
-				type       	"XSDContentTypeCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibitedSubstitutions"
-				quid       	"3B69CB8A03E6"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F618014D"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0FB97006E"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3C31AF5E03A6"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDComponent"
-			quid       	"3B6846E90029"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA903D2"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDConcreteComponent"
-			quid       	"3B6AD7B40065"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "element"
-				quid       	"3B6ADDB501A5"
-				type       	"DOMElement"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDConstrainingFacet"
-			quid       	"3B6C6B340093"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C800394"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDDiagnostic"
-			quid       	"3BFE5F910046"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3D4C0F4C01A1"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "severity"
-				quid       	"3BFE691C005D"
-				type       	"XSDDiagnosticSeverity"
-				exportControl 	"Public")
-			    (object ClassAttribute "message"
-				quid       	"3BFE5FDD0280"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "locationURI"
-				quid       	"3C063743016B"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "line"
-				quid       	"3BFE607E0213"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "column"
-				quid       	"3BFE611E0296"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "node"
-				quid       	"3C016B6B0200"
-				type       	"DOMNode"
-				exportControl 	"Public")
-			    (object ClassAttribute "annotationURI"
-				quid       	"3C06374F0186"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDElementDeclaration"
-			quid       	"3B66ED580214"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69EDEE01BF"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B685F17002E"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174")
-			    (object Inheritance_Relationship
-				quid       	"3B688E660339"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "nillable"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BFB4029F"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "disallowedSubstitutions"
-				quid       	"3B69C4680368"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "substitutionGroupExclusions"
-				quid       	"3B69C4A003B9"
-				stereotype 	"0..*"
-				type       	"XSDSubstitutionGroupExclusions"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C4E0000E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D14C00B2"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D16801C1"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289F6203CF"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C34DCB00018"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDEnumerationFacet"
-			quid       	"3B6C6ACE0141"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C9D03C7"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C640054"
-				stereotype 	"0..*"
-				type       	"Value"
-				exportControl 	"Public")))
-		    (object Class "XSDFacet"
-			quid       	"3B6C359403D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D25680259"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3B6C73740253"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "facetName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289FB401EC"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "effectiveValue"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28AAE303B6"
-				type       	"Value"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFeature"
-			quid       	"3B69B537026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C290A2C0307"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B69BF81020F"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BF8800C5"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "form"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F902B033E"
-				type       	"XSDForm"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C271A1B016F"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "global"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0070372"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "featureReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0440185"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFixedFacet"
-			quid       	"3B6C699E00C1"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8801B4"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C6A600201"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFractionDigitsFacet"
-			quid       	"3B6C79BE02EE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B990016"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79D2008A"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDFundamentalFacet"
-			quid       	"3B6C69E801D6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C7B0396"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDIdentityConstraintDefinition"
-			quid       	"3B682B2603A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684AA30242"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "identityConstraintCategory"
-				quid       	"3B69D1C70143"
-				type       	"XSDIdentityConstraintCategory"
-				exportControl 	"Public")))
-		    (object Class "XSDImport"
-			quid       	"3B688C93017F"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8D9003E"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespace"
-				quid       	"3B6ADB15036C"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDInclude"
-			quid       	"3B688C7D0250"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8DC0381"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDLengthFacet"
-			quid       	"3B6C776200E7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C778002DF"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C776C004B"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMaxExclusiveFacet"
-			quid       	"3B6C789600C2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8E0309"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxFacet"
-			quid       	"3C0A1CEB010E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D3103AD"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1EE201F7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A174027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1930354"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMaxInclusiveFacet"
-			quid       	"3B6C787D00DA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8303B8"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxLengthFacet"
-			quid       	"3B6C77C70146"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B7D00FC"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C77DA00F3"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMinExclusiveFacet"
-			quid       	"3B6C792D000A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B590281"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinFacet"
-			quid       	"3C0A1CDE037C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D240098"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1ED10398"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1A2008E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1BE03E2"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMinInclusiveFacet"
-			quid       	"3B6C788702C9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B520353"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinLengthFacet"
-			quid       	"3B6C778C0065"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C77C400C0"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7799015E"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroup"
-			quid       	"3B6834E00291"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A640279"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "compositor"
-				quid       	"3B69CF1D01CF"
-				type       	"XSDCompositor"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroupDefinition"
-			quid       	"3B66ED9A0205"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2E20381"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2550385"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC40090"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "modelGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1F602E8"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDNamedComponent"
-			quid       	"3B6846D303A4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA20197"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B6847000142"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B684704031E"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A57F0127"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "uRI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A58700E2"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasURI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A5AA02AF"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "qName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C290963025E"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDNotationDeclaration"
-			quid       	"3B66EDAA021C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B68494302F1"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4")
-			    (object Inheritance_Relationship
-				quid       	"3B688E4F023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "systemIdentifier"
-				quid       	"3B69D32E00F0"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "publicIdentifier"
-				quid       	"3B69D3340397"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDNumericFacet"
-			quid       	"3B6C75950206"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C76420074"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C75A30012"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDOrderedFacet"
-			quid       	"3B6C74DD0248"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7659012C"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C74F602DA"
-				type       	"XSDOrdered"
-				exportControl 	"Public")))
-		    (object Class "XSDParticle"
-			quid       	"3B682BBD01F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848FC01E7"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "minOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF8E03B2"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "maxOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF9903AE"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")))
-		    (object Class "XSDParticleContent"
-			quid       	"3B6BD22300C6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B780BD90059"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDPatternFacet"
-			quid       	"3B6C6ADB026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6CA5038D"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C790311"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDRedefinableComponent"
-			quid       	"3B7FCA8B020B"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4BA023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3C290A26036D"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A6800216"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefineContent"
-			quid       	"3B6AE2060172"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2B301D5"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefine"
-			quid       	"3B688C9B02AD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB640240"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDRepeatableFacet"
-			quid       	"3B6C6AA6031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8F002E"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			abstract   	TRUE)
-		    (object Class "XSDSchema"
-			quid       	"374B182500BB"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCC4A0182"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "document"
-				quid       	"3C2784E503DD"
-				type       	"DOMDocument"
-				exportControl 	"Public")
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6868EC0226"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B9F9BFF0180"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributeFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F904B0102"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F907800AC"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "finalDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0C4A70038"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "blockDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F59D02D8"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "version"
-				quid       	"3D22D6D80356"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDSchemaCompositor"
-			quid       	"3C21DB4102AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB560092"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaContent"
-			quid       	"3B688CB800BA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8E60372"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaDirective"
-			quid       	"3B6AD8A202A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE32102AF"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6AD9B30330"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDScope"
-			quid       	"3B69B54000F2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCD640231"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDSimpleTypeDefinition"
-			quid       	"3B682BA7005D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A1302A2"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")
-			    (object Inheritance_Relationship
-				quid       	"3B685F55032B"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C315800A9"
-				type       	"XSDVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B6D544F0146"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F65E035A"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "validFacets"
-				quid       	"3C28AB0F00B6"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDTerm"
-			quid       	"3B683C5E0174"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848AA01D3"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2440069"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"))
-			abstract   	TRUE)
-		    (object Class "XSDTotalDigitsFacet"
-			quid       	"3B6C79A0020E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B610337"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79AB0232"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDTypeDefinition"
-			quid       	"3B66ECD302A9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2F5013A"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAB1004D"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			abstract   	TRUE)
-		    (object Class "XSDWhiteSpaceFacet"
-			quid       	"3B6C784601B7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C78620045"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C78500201"
-				type       	"XSDWhiteSpace"
-				exportControl 	"Public")))
-		    (object Class "XSDWildcard"
-			quid       	"3B6838370031"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A3A0041"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceConstraintCategory"
-				quid       	"3B69D0E9019E"
-				type       	"XSDNamespaceConstraintCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "namespaceConstraint"
-				quid       	"3B97CF860223"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "processContents"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69D12E01E4"
-				type       	"XSDProcessContents"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalNamespaceConstraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7BDB701F9"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathDefinition"
-			quid       	"3B6D83BB0355"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D84F70092"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				quid       	"3B6D901503DE"
-				type       	"XSDXPathVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B7BBBE101B1"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "DOMAttr"
-			quid       	"3BBF8C8901B6"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Attr"
-				quid       	"3BBF8CB000D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMDocument"
-			quid       	"3C27850E0381"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3C27851B03C6"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMElement"
-			quid       	"3B8189790200"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B8189DB0374"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMNode"
-			quid       	"3BFE64A50117"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Node"
-				quid       	"3BFE65BF002D"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Value"
-			quid       	"3C040B5B031F"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.lang.Object"
-				quid       	"3C040B8D03D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUseCategory"
-			quid       	"3BA7B0E801A8"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "optional"
-				quid       	"3BA7B11502B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibited"
-				quid       	"3BA7B12202D3"
-				exportControl 	"Public")
-			    (object ClassAttribute "required"
-				quid       	"3BA7B12902F0"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinality"
-			quid       	"3BC7715D009B"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "finite"
-				quid       	"3BC771DC02ED"
-				exportControl 	"Public")
-			    (object ClassAttribute "countablyInfinite"
-				quid       	"3BC771EC0141"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexFinal"
-			quid       	"3B97C2CA01CB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C2E700DA"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2EA016A"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6D20112"
-				exportControl 	"Public")))
-		    (object Class "XSDCompositor"
-			quid       	"3B869B620037"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "all"
-				quid       	"3B869BD00003"
-				exportControl 	"Public")
-			    (object ClassAttribute "choice"
-				quid       	"3B869CB8011E"
-				exportControl 	"Public")
-			    (object ClassAttribute "sequence"
-				quid       	"3B869CE50057"
-				exportControl 	"Public")))
-		    (object Class "XSDConstraint"
-			quid       	"3B869E2601AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "default"
-				quid       	"3B869E8E0258"
-				exportControl 	"Public")
-			    (object ClassAttribute "fixed"
-				quid       	"3B869E990271"
-				exportControl 	"Public")))
-		    (object Class "XSDContentTypeCategory"
-			quid       	"3B86A79F03A2"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "empty"
-				quid       	"3B86A7CD02F0"
-				exportControl 	"Public")
-			    (object ClassAttribute "simple"
-				quid       	"3B86A7D100CE"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				quid       	"3B86A7D301B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementOnly"
-				quid       	"3B86A7D702E9"
-				exportControl 	"Public")))
-		    (object Class "XSDDerivationMethod"
-			quid       	"3B86A0B000CE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B86A0C80329"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B86A0CC0162"
-				exportControl 	"Public")))
-		    (object Class "XSDDiagnosticSeverity"
-			quid       	"3BFE68A7032F"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fatal"
-				quid       	"3BFE68C303D0"
-				exportControl 	"Public")
-			    (object ClassAttribute "error"
-				quid       	"3BFE68E700E3"
-				exportControl 	"Public")
-			    (object ClassAttribute "warning"
-				quid       	"3BFE68EA01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "information"
-				quid       	"3BFE7FC2019A"
-				exportControl 	"Public")))
-		    (object Class "XSDDisallowedSubstitutions"
-			quid       	"3B97C5A403DF"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "substitution"
-				quid       	"3B97C6790045"
-				exportControl 	"Public")
-			    (object ClassAttribute "extension"
-				quid       	"3B97C67F01AC"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C683020B"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2450069"
-				exportControl 	"Public")))
-		    (object Class "XSDForm"
-			quid       	"3B9F913B01EB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qualified"
-				quid       	"3B9F916F0023"
-				exportControl 	"Public")
-			    (object ClassAttribute "unqualified"
-				quid       	"3B9F918C007F"
-				exportControl 	"Public")))
-		    (object Class "XSDIdentityConstraintCategory"
-			quid       	"3B86A1E00272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "key"
-				quid       	"3B86A2120085"
-				exportControl 	"Public")
-			    (object ClassAttribute "keyref"
-				quid       	"3B86A213014F"
-				exportControl 	"Public")
-			    (object ClassAttribute "unique"
-				quid       	"3B86A2160365"
-				exportControl 	"Public")))
-		    (object Class "XSDNamespaceConstraintCategory"
-			quid       	"3B97C5EA0023"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "any"
-				quid       	"3B97D0600034"
-				exportControl 	"Public")
-			    (object ClassAttribute "not"
-				quid       	"3B97D062005F"
-				exportControl 	"Public")
-			    (object ClassAttribute "set"
-				quid       	"3B97D0650117"
-				exportControl 	"Public")))
-		    (object Class "XSDOrdered"
-			quid       	"3BC7715202E4"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "false"
-				quid       	"3BC771A90271"
-				exportControl 	"Public")
-			    (object ClassAttribute "partial"
-				quid       	"3BC771BB01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "total"
-				quid       	"3BC771C401B2"
-				exportControl 	"Public")))
-		    (object Class "XSDProcessContents"
-			quid       	"3B8FF8C70284"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "strict"
-				quid       	"3B8FF8F80045"
-				exportControl 	"Public")
-			    (object ClassAttribute "lax"
-				quid       	"3B8FF8F6038B"
-				exportControl 	"Public")
-			    (object ClassAttribute "skip"
-				quid       	"3B8FF8E802BA"
-				exportControl 	"Public")))
-		    (object Class "XSDProhibitedSubstitutions"
-			quid       	"3B97C5BE0272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C68B00B8"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C6940291"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2500295"
-				exportControl 	"Public")))
-		    (object Class "XSDSimpleFinal"
-			quid       	"3B97C25D0295"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "list"
-				quid       	"3B97C2810230"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2830138"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B97C288024E"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6E00374"
-				exportControl 	"Public")))
-		    (object Class "XSDSubstitutionGroupExclusions"
-			quid       	"3B97C59100AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C6640231"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C66D0216"
-				exportControl 	"Public")))
-		    (object Class "XSDVariety"
-			quid       	"3B8FF7730249"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "atomic"
-				quid       	"3B8FF7A702DF"
-				exportControl 	"Public")
-			    (object ClassAttribute "list"
-				quid       	"3B8FF7AD0139"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B8FF7AF039F"
-				exportControl 	"Public")))
-		    (object Class "XSDWhiteSpace"
-			quid       	"3BEED0F60342"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "preserve"
-				quid       	"3BEED10F0117"
-				exportControl 	"Public")
-			    (object ClassAttribute "replace"
-				quid       	"3BEED127034D"
-				exportControl 	"Public")
-			    (object ClassAttribute "collapse"
-				quid       	"3BEED1290396"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathVariety"
-			quid       	"3B8FFB89033A"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "selector"
-				quid       	"3B8FFBAC0192"
-				exportControl 	"Public")
-			    (object ClassAttribute "field"
-				quid       	"3B8FFBB30278"
-				exportControl 	"Public")))
-		    (object Association "$UNNAMED$64"
-			quid       	"3C626EA70102"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$65"
-				quid       	"3C626EA90191"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EA90192"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$66"
-			quid       	"3B69DADC02F5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$67"
-				quid       	"3B69DADD0238"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DADD0242"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$68"
-			quid       	"3B6890D6006F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$69"
-				quid       	"3B6890D6030E"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6890D60318"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$70"
-			quid       	"3B68356B02CB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$71"
-				quid       	"3B68356D00A6"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68356D00A7"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$72"
-			quid       	"3B6B426B0194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$73"
-				quid       	"3B6B426D0309"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B426D0313"
-				label      	"resolvedAttributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$74"
-			quid       	"3B69DB060291"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$75"
-				quid       	"3B69DB070171"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB070172"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$76"
-			quid       	"3B69404E0067"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$77"
-				quid       	"3B694050029B"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B69405002A5"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$78"
-			quid       	"3B68359F0086"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$79"
-				quid       	"3B6835A00069"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6835A0006A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$80"
-			quid       	"3C275D320220"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$81"
-				quid       	"3C275D3C010C"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3C275D3C010D"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$82"
-			quid       	"3B6887BF0150"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$83"
-				quid       	"3B6887C000A7"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6887C000A8"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$84"
-			quid       	"3B6B425E01F9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$85"
-				quid       	"3B6B42620046"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B42620050"
-				label      	"resolvedAttributeGroupDefinition"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$86"
-			quid       	"3B683585010D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$87"
-				quid       	"3B68358600FA"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68358600FB"
-				label      	"attributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$88"
-			quid       	"3B6F1DE9018A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$89"
-				quid       	"3B6F1DEA036C"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6F1DEA0380"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$90"
-			quid       	"3B90068801C2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$91"
-				quid       	"3B90068A0111"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentAnnotation"
-				quid       	"3B90068A011B"
-				label      	"contentAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$92"
-			quid       	"3B6833350340"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$93"
-				quid       	"3B683336028D"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683336028E"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$94"
-			quid       	"3B6FDDD70113"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$95"
-				quid       	"3B6FDDDA026B"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6FDDDA0275"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$96"
-			quid       	"3B6837DF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$97"
-				quid       	"3B6837E100FD"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6837E100FE"
-				label      	"contentType"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$98"
-			quid       	"3B683959006E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$99"
-				quid       	"3B6839590349"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683959034A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$100"
-			quid       	"3B698E360386"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$101"
-				quid       	"3B698E380072"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeContents"
-				quid       	"3B698E38007C"
-				label      	"attributeContents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$102"
-			quid       	"3B6851BA0126"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$103"
-				quid       	"3B6851BB0150"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6851BB0151"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$104"
-			quid       	"3B751B0803C7"
-			roles      	(list role_list
-			    (object Role "container"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B0C01CE"
-				label      	"container"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$105"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B0C01CF"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$106"
-			quid       	"3B751B480261"
-			roles      	(list role_list
-			    (object Role "rootContainer"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B4C0285"
-				label      	"rootContainer"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$107"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B4C0286"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$108"
-			quid       	"3B751C310356"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$109"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751C330331"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")
-			    (object Role "schema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751C33033B"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$110"
-			quid       	"3B69DB0A0066"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$111"
-				quid       	"3B69DB0B023F"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0B0249"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$112"
-			quid       	"3B68911401AF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$113"
-				quid       	"3B6891150016"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6891150017"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$114"
-			quid       	"3B68338C0058"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$115"
-				quid       	"3B68338C03BF"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68338C03C0"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$116"
-			quid       	"3B6833EF0160"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$117"
-				quid       	"3B6833F00298"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				quid       	"3B6833F00299"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$118"
-			quid       	"3B6B41E60251"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$119"
-				quid       	"3B6B41EA02F7"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedElementDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B41EA030B"
-				label      	"resolvedElementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$120"
-			quid       	"3B69C0590198"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$121"
-				quid       	"3B69C05D01E3"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214")
-			    (object Role "substitutionGroupAffiliation"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69C05D01ED"
-				label      	"substitutionGroupAffiliation"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$122"
-			quid       	"3C42DBDD0297"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$123"
-				quid       	"3C42DBE0011E"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "substitutionGroup"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C42DBE00128"
-				label      	"substitutionGroup"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$124"
-			quid       	"3B6D23B901CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$125"
-				quid       	"3B6D23BA01C4"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6D23BA01CE"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$126"
-			quid       	"3B6D597102EA"
-			roles      	(list role_list
-			    (object Role "simpleTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D59750105"
-				label      	"simpleTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$127"
-				attributes 	(list Attribute_Set)
-				quid       	"3B6D59750119"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2")))
-		    (object Association "$UNNAMED$128"
-			quid       	"3B69B653017A"
-			roles      	(list role_list
-			    (object Role "scope"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B69B654006D"
-				label      	"scope"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$129"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69B654006E"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$130"
-			quid       	"3C29010602D7"
-			roles      	(list role_list
-			    (object Role "resolvedFeature"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C29010B000E"
-				label      	"resolvedFeature"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$131"
-				attributes 	(list Attribute_Set)
-				quid       	"3C29010B0018"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$132"
-			quid       	"3B69DB0D0183"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$133"
-				quid       	"3B69DB0D033C"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0D0346"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$134"
-			quid       	"3B69D29E014D"
-			roles      	(list role_list
-			    (object Role "referencedKey"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69D2A80165"
-				label      	"referencedKey"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$135"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69D2A8016F"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2")))
-		    (object Association "$UNNAMED$136"
-			quid       	"3B6D8D3D003E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$137"
-				quid       	"3B6D8D3E022A"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "selector"
-				quid       	"3B6D8D3E0234"
-				label      	"selector"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$138"
-			quid       	"3B6D8D330025"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$139"
-				quid       	"3B6D8D330365"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "fields"
-				quid       	"3B6D8D330379"
-				label      	"fields"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$140"
-			quid       	"3B6ADCD802FC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$141"
-				quid       	"3B6ADCD9018B"
-				supplier   	"Logical View::xsd::XSDImport"
-				quidu      	"3B688C93017F"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCD9018C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$142"
-			quid       	"3B6ADCC5007E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$143"
-				quid       	"3B6ADCC6006B"
-				supplier   	"Logical View::xsd::XSDInclude"
-				quidu      	"3B688C7D0250"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCC6006C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$144"
-			quid       	"3B69DB1702C8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$145"
-				quid       	"3B69DB1803E2"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB190004"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$146"
-			quid       	"3B6BCEB102F8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$147"
-				quid       	"3B6BCEB6001B"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6BCEB60025"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$148"
-			quid       	"3B683606026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$149"
-				quid       	"3B6836070221"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "particles"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6836070222"
-				label      	"particles"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$150"
-			quid       	"3B69DB15008A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$151"
-				quid       	"3B69DB160096"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1600A0"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$152"
-			quid       	"3B6837AC025A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$153"
-				quid       	"3B6837AD0338"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroup"
-				quid       	"3B6837AD0339"
-				label      	"modelGroup"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$154"
-			quid       	"3B6B42450398"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$155"
-				quid       	"3B6B4249038A"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedModelGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B4249039E"
-				label      	"resolvedModelGroupDefinition"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$156"
-			quid       	"3B69DB0F0212"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$157"
-				quid       	"3B69DB1000C9"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1000D3"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$158"
-			quid       	"3B6B47150119"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$159"
-				quid       	"3B6B471A03AB"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6B471A03B5"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$160"
-			quid       	"3B683C890122"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$161"
-				quid       	"3B683C8A0110"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "term"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683C8A0111"
-				label      	"term"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$162"
-			quid       	"3B6ADE42009A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$163"
-				quid       	"3B6ADE4302FE"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6ADE430308"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$164"
-			quid       	"3B6AE8240051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$165"
-				quid       	"3B6AE82602AD"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6AE82602B7"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$166"
-			quid       	"3B688E6B003D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$167"
-				quid       	"3B688E6C0107"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B688E6C0111"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$168"
-			quid       	"3B66EE8D01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$169"
-				quid       	"3B66EE8E0198"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "elementDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE8E0199"
-				label      	"elementDeclarations"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$170"
-			quid       	"3B66FDFA00C3"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$171"
-				quid       	"3B66FDFB027D"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66FDFB027E"
-				label      	"attributeDeclarations"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$172"
-			quid       	"3B66EE920216"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$173"
-				quid       	"3B66EE93018B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE93018C"
-				label      	"attributeGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$174"
-			quid       	"3B66EE760049"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$175"
-				quid       	"3B66EE760374"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE76037E"
-				label      	"typeDefinitions"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$176"
-			quid       	"3B66EEFF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$177"
-				quid       	"3B66EF00025A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EF000264"
-				label      	"modelGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$178"
-			quid       	"3BFC2A1701ED"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$179"
-				quid       	"3BFC2A1A0273"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFC2A1A027D"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$180"
-			quid       	"3B66EEA7023E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$181"
-				quid       	"3B66EEA8038A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "notationDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EEA8038B"
-				label      	"notationDeclarations"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$182"
-			quid       	"3B69E4560290"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$183"
-				quid       	"3B69E4570165"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69E457016F"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$184"
-			quid       	"3B6D5CA50112"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$185"
-				quid       	"3B6D5CA703B4"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6D5CA703C8"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$186"
-			quid       	"3B6C35AD0374"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$187"
-				quid       	"3B6C35AF0006"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facetContents"
-				quid       	"3B6C35AF0010"
-				label      	"facetContents"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$188"
-			quid       	"3BC8AE0203A8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$189"
-				quid       	"3BC8AE060051"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BC8AE060065"
-				label      	"facets"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$190"
-			quid       	"3B6C34B70208"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$191"
-				quid       	"3B6C34BE0258"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "memberTypeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6C34BE0259"
-				label      	"memberTypeDefinitions"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$192"
-			quid       	"3B6C363201DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$193"
-				quid       	"3B6C36350059"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fundamentalFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B6C36350063"
-				label      	"fundamentalFacets"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$194"
-			quid       	"3B6D35AB0273"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$195"
-				quid       	"3B6D35B20291"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D35B202A5"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$196"
-			quid       	"3B6D5572016C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$197"
-				quid       	"3B6D5575022F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "primitiveTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D55750243"
-				label      	"primitiveTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$198"
-			quid       	"3B69E2910158"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$199"
-				quid       	"3B69E292019F"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69E29201A9"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$200"
-			quid       	"3B9006CF0088"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$201"
-				quid       	"3B9006D1015D"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "derivationAnnotation"
-				quid       	"3B9006D10167"
-				label      	"derivationAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$202"
-			quid       	"3B69DB330264"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$203"
-				quid       	"3B69DB340284"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69DB34028E"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$204"
-			quid       	"3B69DB11026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$205"
-				quid       	"3B69DB1201F9"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB120203"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$206"
-			quid       	"3C626EB30005"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$207"
-				quid       	"3C626EB40327"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EB40332"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$208"
-			quid       	"3BEBDC870247"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$209"
-				quid       	"3BEBDC8C02F9"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3BEBDC8C0303"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$210"
-			quid       	"3BFE622703CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$211"
-				attributes 	(list Attribute_Set)
-				quid       	"3BFE622B0061"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "components"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE622B006C"
-				label      	"components"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$212"
-			quid       	"3BFE62690165"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$213"
-				quid       	"3BFE626A0026"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				is_aggregate 	TRUE)
-			    (object Role "diagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3BFE626A0027"
-				label      	"diagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$214"
-			quid       	"3BFE6431035F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$215"
-				quid       	"3BFE643201C6"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "allDiagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE643201C7"
-				label      	"allDiagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$216"
-			quid       	"3C21DCC700EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$217"
-				quid       	"3C21DCCE0042"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DCCE0043"
-				label      	"resolvedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$218"
-			quid       	"3C21DD0C03DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$219"
-				quid       	"3C21DD100304"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DD100305"
-				label      	"incorporatedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$220"
-			quid       	"3C239134004F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$221"
-				quid       	"3C23913600CA"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3C23913600D4"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$222"
-			quid       	"3C25D3A60131"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$223"
-				quid       	"3C25D3A90370"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "referencingDirectives"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C25D3A90371"
-				label      	"referencingDirectives"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$224"
-			quid       	"3C25ECF0005E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$225"
-				quid       	"3C25ECF4001E"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "rootVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ECF40028"
-				label      	"rootVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$226"
-			quid       	"3C25ED0B011B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$227"
-				quid       	"3C25ED0F0121"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "originalVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ED0F012B"
-				label      	"originalVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$228"
-			quid       	"3C25EEAB001F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$229"
-				quid       	"3C25EEAF010B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedVersions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25EEAF0115"
-				label      	"incorporatedVersions"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$230"
-			quid       	"3C276DA000DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$231"
-				quid       	"3C276DA000DF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "itemTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C276DA000E0"
-				label      	"itemTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$232"
-			quid       	"3C2784730194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$233"
-				quid       	"3C27847501F1"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "schemaForSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C27847501FB"
-				label      	"schemaForSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$234"
-			quid       	"3C2880F503D9"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2880F9003C"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$235"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2880F90046"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A")))
-		    (object Association "$UNNAMED$236"
-			quid       	"3C2882C50137"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$237"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2882C70112"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "primaryComponent"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2882C70113"
-				label      	"primaryComponent"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$238"
-			quid       	"3C28A0F201A4"
-			roles      	(list role_list
-			    (object Role "type"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A0F302E5"
-				label      	"type"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$239"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A0F302F0"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$240"
-			quid       	"3C28A6DB01E5"
-			roles      	(list role_list
-			    (object Role "rootType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A6DD03DD"
-				label      	"rootType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$241"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A6DD03DE"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$242"
-			quid       	"3C28A7120108"
-			roles      	(list role_list
-			    (object Role "baseType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7140151"
-				label      	"baseType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$243"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A714015B"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$244"
-			quid       	"3C28A74B0178"
-			roles      	(list role_list
-			    (object Role "simpleType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A74D017B"
-				label      	"simpleType"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$245"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A74D0185"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$246"
-			quid       	"3C28A7ED03C0"
-			roles      	(list role_list
-			    (object Role "complexType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7F40117"
-				label      	"complexType"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$247"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A7F40121"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$248"
-			quid       	"3C28A994030A"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A99700DD"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$249"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A99700E7"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D")))
-		    (object Association "$UNNAMED$250"
-			quid       	"3C28B085025B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$251"
-				quid       	"3C28B0860270"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B086027A"
-				label      	"minFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$252"
-			quid       	"3C28B08D0252"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$253"
-				quid       	"3C28B08E0091"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B08E009B"
-				label      	"maxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$254"
-			quid       	"3C28B0AB0396"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$255"
-				quid       	"3C28B0AC03C9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0AC03D4"
-				label      	"maxInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxInclusiveFacet"
-				quidu      	"3B6C787D00DA"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$256"
-			quid       	"3C28B0AF0338"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$257"
-				quid       	"3C28B0B001F9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B00203"
-				label      	"minInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinInclusiveFacet"
-				quidu      	"3B6C788702C9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$258"
-			quid       	"3C28B0B30207"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$259"
-				quid       	"3C28B0B40190"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B4019A"
-				label      	"minExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinExclusiveFacet"
-				quidu      	"3B6C792D000A"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$260"
-			quid       	"3C28B0B6028D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$261"
-				quid       	"3C28B0B70217"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B70221"
-				label      	"maxExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxExclusiveFacet"
-				quidu      	"3B6C789600C2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$262"
-			quid       	"3C28B0BC0051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$263"
-				quid       	"3C28B0BC0246"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "lengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0BC0250"
-				label      	"lengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$264"
-			quid       	"3C28B0BF018C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$265"
-				quid       	"3C28B0C0006B"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "whiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C00075"
-				label      	"whiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$266"
-			quid       	"3C28B0C2021D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$267"
-				quid       	"3C28B0C300AB"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "enumerationFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C300AC"
-				label      	"enumerationFacets"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$268"
-			quid       	"3C28B0C50159"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$269"
-				quid       	"3C28B0C600B0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "patternFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C600BA"
-				label      	"patternFacets"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$270"
-			quid       	"3C28B0C802A7"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$271"
-				quid       	"3C28B0C901EA"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "cardinalityFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C901F5"
-				label      	"cardinalityFacet"
-				supplier   	"Logical View::xsd::XSDCardinalityFacet"
-				quidu      	"3B6C755D03D2"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$272"
-			quid       	"3C28B0CB039C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$273"
-				quid       	"3C28B0CC03D0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "numericFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0CC03D1"
-				label      	"numericFacet"
-				supplier   	"Logical View::xsd::XSDNumericFacet"
-				quidu      	"3B6C75950206"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$274"
-			quid       	"3C28B0CF0199"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$275"
-				quid       	"3C28B0D20085"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D2008F"
-				label      	"maxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$276"
-			quid       	"3C28B0D500C5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$277"
-				quid       	"3C28B0D6001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D60027"
-				label      	"minLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$278"
-			quid       	"3C28B0D800DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$279"
-				quid       	"3C28B0D803CD"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "totalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D803D7"
-				label      	"totalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$280"
-			quid       	"3C28B0DB0377"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$281"
-				quid       	"3C28B0DC035A"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DC0364"
-				label      	"fractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$282"
-			quid       	"3C28B0DF0048"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$283"
-				quid       	"3C28B0DF03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "orderedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DF03C3"
-				label      	"orderedFacet"
-				supplier   	"Logical View::xsd::XSDOrderedFacet"
-				quidu      	"3B6C74DD0248"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$284"
-			quid       	"3C28B0E300D9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$285"
-				quid       	"3C28B0E4038E"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "boundedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0E40398"
-				label      	"boundedFacet"
-				supplier   	"Logical View::xsd::XSDBoundedFacet"
-				quidu      	"3B6C751D0344"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$286"
-			quid       	"3C28B44401EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$287"
-				quid       	"3C28B4450360"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B445036A"
-				label      	"effectiveMaxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$288"
-			quid       	"3C28B54F0145"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$289"
-				quid       	"3C28B550038C"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveWhiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5500396"
-				label      	"effectiveWhiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$290"
-			quid       	"3C28B5C4011C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$291"
-				quid       	"3C28B5C5020D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5C50217"
-				label      	"effectiveMaxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$292"
-			quid       	"3C28B62A00AA"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$293"
-				quid       	"3C28B62B0138"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveFractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B62B0142"
-				label      	"effectiveFractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$294"
-			quid       	"3C28B6B003A6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$295"
-				quid       	"3C28B6B10311"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectivePatternFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B6B10312"
-				label      	"effectivePatternFacet"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$296"
-			quid       	"3C28B7CA026B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$297"
-				quid       	"3C28B7CB0186"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveEnumerationFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B7CB0190"
-				label      	"effectiveEnumerationFacet"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$298"
-			quid       	"3C28B8400062"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$299"
-				quid       	"3C28B841001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveTotalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8410027"
-				label      	"effectiveTotalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$300"
-			quid       	"3C28B898016D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$301"
-				quid       	"3C28B8990056"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8990060"
-				label      	"effectiveMinLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$302"
-			quid       	"3C28B8DC0052"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$303"
-				quid       	"3C28B8DC03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8DC03C3"
-				label      	"effectiveLengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$304"
-			quid       	"3C28B97001DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$305"
-				quid       	"3C28B97100CF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B97100D9"
-				label      	"effectiveMinFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$306"
-			quid       	"3D4BB4AE01CC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$307"
-				quid       	"3D4BB4AF010F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4AF011A"
-				label      	"syntheticFacets"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$308"
-			quid       	"3D4BB4D3028E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$309"
-				quid       	"3D4BB4D402F3"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticParticle"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4D402FD"
-				label      	"syntheticParticle"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$310"
-			quid       	"3D4BB4D901F6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$311"
-				quid       	"3D4BB4DA0284"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4DA028E"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$312"
-			quid       	"3D4C68FF01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$313"
-				quid       	"3D4C69020317"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				quid       	"3D4C69020318"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "1. Component Hierarchy (Part 1: Structures)"
-			quid       	"3B6847680138"
-			title      	"1. Component Hierarchy (Part 1: Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @387
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@387
-				    location   	(766, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @388
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1168, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@388
-				    location   	(940, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @389
-				location   	(928, 225)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@387
-				vertices   	(list Points
-				    (928, 225)
-				    (928, 135)))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @390
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@390
-				    location   	(1460, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @391
-				location   	(1203, 706)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@388
-				vertices   	(list Points
-				    (1203, 706)
-				    (1203, 615)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @392
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@392
-				    location   	(372, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @393
-				location   	(444, 709)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@392
-				vertices   	(list Points
-				    (444, 709)
-				    (444, 615)))
-			    (object InheritTreeView "" @394
-				location   	(1572, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@390
-				vertices   	(list Points
-				    (1572, 465)
-				    (1572, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @395
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@395
-				    location   	(290, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @396
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 1056)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@396
-				    location   	(262, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @397
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1104, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@397
-				    location   	(936, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @398
-				location   	(453, 1203)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@396
-				vertices   	(list Points
-				    (453, 1203)
-				    (453, 1111)))
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @399
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@399
-				    location   	(62, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @400
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@400
-				    location   	(1746, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @401
-				location   	(1872, 950)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@400
-				vertices   	(list Points
-				    (1872, 950)
-				    (1872, 855)))
-			    (object InheritTreeView "" @402
-				location   	(181, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@399
-				vertices   	(list Points
-				    (181, 465)
-				    (181, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @403
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@403
-				    location   	(1670, 1233)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	550
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @404
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@404
-				    location   	(1734, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @405
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@405
-				    location   	(1569, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	656
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @406
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1184, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@406
-				    location   	(903, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	563
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	581
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @407
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@407
-				    location   	(1462, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	294
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @408
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@408
-				    location   	(778, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @409
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@409
-				    location   	(1806, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @410
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@410
-				    location   	(106, 1253)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @411
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@411
-				    location   	(60, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @412
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@412
-				    location   	(802, 1237)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	558
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @413
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@413
-				    location   	(30, 1441)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	694
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @414
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@414
-				    location   	(426, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	300
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	318
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @415
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@415
-				    location   	(1808, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @416
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@397
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(1094, 265)
-				terminal_attachment 	(1094, 225)
-				drawSupplier 	@389)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @417
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@417
-				    location   	(690, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @418
-				location   	(962, 947)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@417
-				vertices   	(list Points
-				    (962, 947)
-				    (962, 855)))
-			    (object InheritView "" @419
-				stereotype 	(object SegLabel @420
-				    Parent_View 	@419
-				    location   	(218, 1154)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.163534
-				    height     	69
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@410
-				supplier   	@392
-				line_style 	3
-				origin_attachment 	(149, 1241)
-				terminal_attachment 	(149, 709)
-				drawSupplier 	@393)
-			    (object InheritView "" @421
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@410
-				supplier   	@396
-				line_style 	3
-				origin_attachment 	(256, 1241)
-				terminal_attachment 	(256, 1203)
-				drawSupplier 	@398)
-			    (object InheritView "" @422
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@411
-				supplier   	@399
-				line_style 	3
-				origin_attachment 	(284, 505)
-				terminal_attachment 	(284, 465)
-				drawSupplier 	@402)
-			    (object InheritView "" @423
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@409
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(2002, 505)
-				terminal_attachment 	(2002, 465)
-				drawSupplier 	@394)
-			    (object InheritView "" @424
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@390
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(1569, 265)
-				terminal_attachment 	(1569, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @425
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@407
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(1490, 505)
-				terminal_attachment 	(1490, 465)
-				drawSupplier 	@394)
-			    (object InheritView "" @426
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@395
-				supplier   	@392
-				line_style 	3
-				origin_attachment 	(510, 745)
-				terminal_attachment 	(510, 709)
-				drawSupplier 	@393)
-			    (object InheritView "" @427
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@412
-				supplier   	@417
-				line_style 	3
-				origin_attachment 	(1321, 1225)
-				terminal_attachment 	(1321, 947)
-				drawSupplier 	@418)
-			    (object InheritView "" @428
-				stereotype 	(object SegLabel @429
-				    Parent_View 	@428
-				    location   	(2137, 886)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.215812
-				    height     	64
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@404
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(2200, 1001)
-				terminal_attachment 	(2200, 465)
-				drawSupplier 	@394)
-			    (object InheritView "" @430
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@404
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(2093, 1001)
-				terminal_attachment 	(2093, 950)
-				drawSupplier 	@401)
-			    (object InheritView "" @431
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@396
-				supplier   	@417
-				line_style 	3
-				origin_attachment 	(450, 1001)
-				terminal_attachment 	(450, 947)
-				drawSupplier 	@418)
-			    (object InheritView "" @432
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@399
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(147, 265)
-				terminal_attachment 	(147, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @433
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D84F70092"
-				client     	@415
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(2012, 265)
-				terminal_attachment 	(2012, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @434
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848B80286"
-				client     	@392
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(834, 505)
-				terminal_attachment 	(834, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @435
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@388
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(1350, 505)
-				terminal_attachment 	(1350, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @436
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@414
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(572, 265)
-				terminal_attachment 	(572, 225)
-				drawSupplier 	@389)
-			    (object InheritView "" @437
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@403
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(1693, 1221)
-				terminal_attachment 	(1693, 950)
-				drawSupplier 	@401)
-			    (object InheritView "" @438
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@405
-				supplier   	@388
-				line_style 	3
-				origin_attachment 	(1590, 1432)
-				terminal_attachment 	(1590, 706)
-				drawSupplier 	@391)
-			    (object InheritView "" @439
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@406
-				supplier   	@388
-				line_style 	3
-				origin_attachment 	(1431, 1432)
-				terminal_attachment 	(1431, 706)
-				drawSupplier 	@391)
-			    (object InheritView "" @440
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@417
-				supplier   	@388
-				line_style 	3
-				origin_attachment 	(959, 745)
-				terminal_attachment 	(959, 706)
-				drawSupplier 	@391)
-			    (object InheritView "" @441
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@400
-				supplier   	@388
-				line_style 	3
-				origin_attachment 	(1872, 745)
-				terminal_attachment 	(1872, 706)
-				drawSupplier 	@391)
-			    (object InheritView "" @442
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@408
-				supplier   	@417
-				line_style 	3
-				origin_attachment 	(962, 1001)
-				terminal_attachment 	(962, 947)
-				drawSupplier 	@418)
-			    (object InheritView "" @443
-				stereotype 	(object SegLabel @444
-				    Parent_View 	@443
-				    location   	(95, 1388)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.042531
-				    height     	67
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B69BAA20310"
-				client     	@413
-				supplier   	@399
-				line_style 	3
-				origin_attachment 	(28, 1429)
-				terminal_attachment 	(28, 465)
-				drawSupplier 	@402)
-			    (object InheritView "" @445
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@413
-				supplier   	@396
-				line_style 	3
-				origin_attachment 	(656, 1429)
-				terminal_attachment 	(656, 1203)
-				drawSupplier 	@398)))
-		    (object ClassDiagram "2. Component Relations (Part 1 : Structures)"
-			quid       	"374B18190028"
-			title      	"2. Component Relations (Part 1 : Structures)"
-			zoom       	96
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @446
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(784, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@446
-				    location   	(670, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @447
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@447
-				    location   	(66, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$128" @448
-				location   	(494, 1627)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B653017A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "scope" @449
-					Parent_View 	@448
-					location   	(286, -485)
-					label      	(object SegLabel @450
-					    Parent_View 	@449
-					    location   	(555, 1589)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+scope"
-					    pctDist    	0.371257
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006D"
-					client     	@448
-					supplier   	@446
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(661, 1627)
-					label      	(object SegLabel @451
-					    Parent_View 	@449
-					    location   	(576, 1664)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.491018
-					    height     	37
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$129" @452
-					Parent_View 	@448
-					location   	(286, -485)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006E"
-					client     	@448
-					supplier   	@447
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(327, 1627))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @453
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@453
-				    location   	(2084, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @454
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2176, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@454
-				    location   	(2051, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$160" @455
-				location   	(2229, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683C890122"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$161" @456
-					Parent_View 	@455
-					location   	(549, -248)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0110"
-					client     	@455
-					supplier   	@454
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1045))
-				    (object RoleView "term" @457
-					Parent_View 	@455
-					location   	(549, -248)
-					label      	(object SegLabel @458
-					    Parent_View 	@457
-					    location   	(2157, 1121)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+term"
-					    pctDist    	0.134328
-					    height     	72
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0111"
-					client     	@455
-					supplier   	@453
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1179)
-					label      	(object SegLabel @459
-					    Parent_View 	@457
-					    location   	(2274, 1119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.119403
-					    height     	45
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @460
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@460
-				    location   	(1076, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @461
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@461
-				    location   	(1977, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$148" @462
-				location   	(2219, 880)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683606026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$149" @463
-					Parent_View 	@462
-					location   	(-357, -240)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070221"
-					client     	@462
-					supplier   	@461
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 821))
-				    (object RoleView "particles" @464
-					Parent_View 	@462
-					location   	(-357, -240)
-					label      	(object SegLabel @465
-					    Parent_View 	@464
-					    location   	(2105, 888)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+particles"
-					    pctDist    	0.156627
-					    height     	115
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070222"
-					client     	@462
-					supplier   	@454
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 939)
-					label      	(object SegLabel @466
-					    Parent_View 	@464
-					    location   	(2281, 888)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.156627
-					    height     	62
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @467
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@467
-				    location   	(1639, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @468
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@468
-				    location   	(905, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @469
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@469
-				    location   	(187, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$194" @470
-				location   	(590, 1140)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$195" @471
-					Parent_View 	@470
-					location   	(302, 148)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@470
-					supplier   	@469
-					vertices   	(list Points
-					    (590, 1140)
-					    (540, 1140)
-					    (540, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(540, 1045))
-				    (object RoleView "baseTypeDefinition" @472
-					Parent_View 	@470
-					location   	(302, 148)
-					label      	(object SegLabel @473
-					    Parent_View 	@472
-					    location   	(643, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.053571
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@470
-					supplier   	@469
-					vertices   	(list Points
-					    (590, 1140)
-					    (641, 1140)
-					    (641, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(641, 1045)
-					label      	(object SegLabel @474
-					    Parent_View 	@472
-					    location   	(584, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.122449
-					    height     	44
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @475
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@475
-				    location   	(745, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$96" @476
-				location   	(1119, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837DF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$97" @477
-					Parent_View 	@476
-					location   	(-1569, -8)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FD"
-					client     	@476
-					supplier   	@475
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1045))
-				    (object RoleView "contentType" @478
-					Parent_View 	@476
-					location   	(-1569, -8)
-					label      	(object SegLabel @479
-					    Parent_View 	@478
-					    location   	(1259, 1126)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+contentType"
-					    pctDist    	0.208955
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FE"
-					client     	@476
-					supplier   	@460
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1179)
-					label      	(object SegLabel @480
-					    Parent_View 	@478
-					    location   	(1063, 1126)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.208955
-					    height     	57
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$102" @481
-				location   	(1455, 982)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6851BA0126"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$103" @482
-					Parent_View 	@481
-					location   	(159, -570)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0150"
-					client     	@481
-					supplier   	@475
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1280, 982))
-				    (object RoleView "attributeWildcard" @483
-					Parent_View 	@481
-					location   	(159, -570)
-					label      	(object SegLabel @484
-					    Parent_View 	@483
-					    location   	(1445, 929)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	-0.062857
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0151"
-					client     	@481
-					supplier   	@467
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1630, 982)
-					label      	(object SegLabel @485
-					    Parent_View 	@483
-					    location   	(1550, 1022)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.542857
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$98" @486
-				location   	(921, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683959006E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$99" @487
-					Parent_View 	@486
-					location   	(-871, -376)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6839590349"
-					client     	@486
-					supplier   	@475
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1045))
-				    (object RoleView "attributeUses" @488
-					Parent_View 	@486
-					location   	(-871, -376)
-					label      	(object SegLabel @489
-					    Parent_View 	@488
-					    location   	(778, 1251)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.269939
-					    height     	144
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683959034A"
-					client     	@486
-					supplier   	@468
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1371)
-					label      	(object SegLabel @490
-					    Parent_View 	@488
-					    location   	(979, 1254)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.288344
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @491
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@491
-				    location   	(1122, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	380
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	398
-				height     	107
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @492
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@492
-				    location   	(1623, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @493
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@493
-				    location   	(1803, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$152" @494
-				location   	(2216, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$153" @495
-					Parent_View 	@494
-					location   	(-552, -816)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@494
-					supplier   	@493
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 501))
-				    (object RoleView "modelGroup" @496
-					Parent_View 	@494
-					location   	(-552, -816)
-					label      	(object SegLabel @497
-					    Parent_View 	@496
-					    location   	(2080, 628)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.182609
-					    height     	137
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@494
-					supplier   	@461
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 715)
-					label      	(object SegLabel @498
-					    Parent_View 	@496
-					    location   	(2256, 633)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.233645
-					    height     	40
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @499
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@499
-				    location   	(1619, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$82" @500
-				location   	(1676, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6887BF0150"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$83" @501
-					Parent_View 	@500
-					location   	(412, -344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A7"
-					client     	@500
-					supplier   	@499
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1371))
-				    (object RoleView "attributeWildcard" @502
-					Parent_View 	@500
-					location   	(412, -344)
-					label      	(object SegLabel @503
-					    Parent_View 	@502
-					    location   	(1857, 1106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	0.625767
-					    height     	181
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A8"
-					client     	@500
-					supplier   	@467
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1045)
-					label      	(object SegLabel @504
-					    Parent_View 	@502
-					    location   	(1618, 1108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.619632
-					    height     	59
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$78" @505
-				location   	(1429, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68359F0086"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$79" @506
-					Parent_View 	@505
-					location   	(-363, -146)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A00069"
-					client     	@505
-					supplier   	@499
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1610, 1438))
-				    (object RoleView "attributeUses" @507
-					Parent_View 	@505
-					location   	(-363, -146)
-					label      	(object SegLabel @508
-					    Parent_View 	@507
-					    location   	(1405, 1506)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.132597
-					    height     	68
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A0006A"
-					client     	@505
-					supplier   	@468
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1248, 1438)
-					label      	(object SegLabel @509
-					    Parent_View 	@507
-					    location   	(1327, 1391)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.563536
-					    height     	48
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @510
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@510
-				    location   	(183, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$86" @511
-				location   	(777, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683585010D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$87" @512
-					Parent_View 	@511
-					location   	(-519, -367)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FA"
-					client     	@511
-					supplier   	@468
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(896, 1425))
-				    (object RoleView "attributeDeclaration" @513
-					Parent_View 	@511
-					location   	(-519, -367)
-					label      	(object SegLabel @514
-					    Parent_View 	@513
-					    location   	(784, 1508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+attributeDeclaration"
-					    pctDist    	-0.059259
-					    height     	83
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FB"
-					client     	@511
-					supplier   	@510
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(658, 1425)
-					label      	(object SegLabel @515
-					    Parent_View 	@513
-					    location   	(721, 1385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.472441
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$70" @516
-				location   	(237, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68356B02CB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$71" @517
-					Parent_View 	@516
-					location   	(-1043, 72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A6"
-					client     	@516
-					supplier   	@510
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1371))
-				    (object RoleView "typeDefinition" @518
-					Parent_View 	@516
-					location   	(-1043, 72)
-					label      	(object SegLabel @519
-					    Parent_View 	@518
-					    location   	(388, 1247)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	-0.239264
-					    height     	151
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A7"
-					client     	@516
-					supplier   	@469
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1045)
-					label      	(object SegLabel @520
-					    Parent_View 	@518
-					    location   	(195, 1247)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.239264
-					    height     	43
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @521
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@521
-				    location   	(198, 743)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$92" @522
-				location   	(728, 775)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833350340"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$93" @523
-					Parent_View 	@522
-					location   	(-856, -57)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028D"
-					client     	@522
-					supplier   	@475
-					vertices   	(list Points
-					    (728, 775)
-					    (788, 775)
-					    (788, 939))
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(788, 939))
-				    (object RoleView "baseTypeDefinition" @524
-					Parent_View 	@522
-					location   	(-856, -57)
-					label      	(object SegLabel @525
-					    Parent_View 	@524
-					    location   	(558, 883)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.140940
-					    height     	108
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028E"
-					client     	@522
-					supplier   	@521
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(579, 775)
-					label      	(object SegLabel @526
-					    Parent_View 	@524
-					    location   	(750, 812)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.152439
-					    height     	37
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @527
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@527
-				    location   	(1017, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$134" @528
-				location   	(1629, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69D29E014D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencedKey" @529
-					Parent_View 	@528
-					location   	(-83, 94)
-					label      	(object SegLabel @530
-					    Parent_View 	@529
-					    location   	(1761, 608)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+referencedKey"
-					    pctDist    	-1.797297
-					    height     	34
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A80165"
-					client     	@528
-					supplier   	@527
-					vertices   	(list Points
-					    (1629, 574)
-					    (1555, 574)
-					    (1555, 501))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1555, 501)
-					label      	(object SegLabel @531
-					    Parent_View 	@529
-					    location   	(1622, 539)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.047619
-					    height     	36
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$135" @532
-					Parent_View 	@528
-					location   	(-83, 94)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A8016F"
-					client     	@528
-					supplier   	@527
-					vertices   	(list Points
-					    (1629, 574)
-					    (1689, 574)
-					    (1689, 444)
-					    (1616, 444))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1616, 444))))
-			    (object AssociationViewNew "$UNNAMED$138" @533
-				location   	(1197, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$139" @534
-					Parent_View 	@533
-					location   	(-115, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@533
-					supplier   	@527
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 501))
-				    (object RoleView "fields" @535
-					Parent_View 	@533
-					location   	(-115, 32)
-					label      	(object SegLabel @536
-					    Parent_View 	@535
-					    location   	(1119, 655)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.439252
-					    height     	78
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@533
-					supplier   	@491
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 715)
-					label      	(object SegLabel @537
-					    Parent_View 	@535
-					    location   	(1253, 654)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.429907
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$136" @538
-				location   	(1415, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$137" @539
-					Parent_View 	@538
-					location   	(103, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@538
-					supplier   	@527
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 501))
-				    (object RoleView "selector" @540
-					Parent_View 	@538
-					location   	(103, 32)
-					label      	(object SegLabel @541
-					    Parent_View 	@540
-					    location   	(1513, 651)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.411215
-					    height     	98
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@538
-					supplier   	@491
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 715)
-					label      	(object SegLabel @542
-					    Parent_View 	@540
-					    location   	(1381, 650)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.392523
-					    height     	34
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @543
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1312, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@543
-				    location   	(1022, 68)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	581
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	599
-				height     	209
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$180" @544
-				location   	(2395, 606)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEA7023E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$181" @545
-					Parent_View 	@544
-					location   	(-853, 174)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038A"
-					client     	@544
-					supplier   	@543
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 65)
-					    (1611, 65))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(1611, 65))
-				    (object RoleView "notationDeclarations" @546
-					Parent_View 	@544
-					location   	(-853, 174)
-					label      	(object SegLabel @547
-					    Parent_View 	@546
-					    location   	(2089, 104)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+notationDeclarations"
-					    pctDist    	-0.489776
-					    height     	307
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038B"
-					client     	@544
-					supplier   	@492
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 1633)
-					    (2098, 1633))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(2098, 1633)
-					label      	(object SegLabel @548
-					    Parent_View 	@546
-					    location   	(2344, 105)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.487829
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$176" @549
-				location   	(1772, 249)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEFF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$177" @550
-					Parent_View 	@549
-					location   	(-948, -327)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF00025A"
-					client     	@549
-					supplier   	@543
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1611, 249))
-				    (object RoleView "modelGroupDefinitions" @551
-					Parent_View 	@549
-					location   	(-948, -327)
-					label      	(object SegLabel @552
-					    Parent_View 	@551
-					    location   	(2076, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+modelGroupDefinitions"
-					    pctDist    	0.713592
-					    height     	244
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF000264"
-					client     	@549
-					supplier   	@493
-					vertices   	(list Points
-					    (1772, 249)
-					    (1832, 249)
-					    (1832, 395))
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1832, 395)
-					label      	(object SegLabel @553
-					    Parent_View 	@551
-					    location   	(1781, 340)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.737864
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$172" @554
-				location   	(2346, 518)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE920216"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$173" @555
-					Parent_View 	@554
-					location   	(154, 86)
-					label      	(object SegLabel @556
-					    Parent_View 	@555
-					    location   	(1872, 1857)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	-3.630072
-					    height     	475
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018B"
-					client     	@554
-					supplier   	@543
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 149)
-					    (1611, 149))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(1611, 149))
-				    (object RoleView "attributeGroupDefinitions" @557
-					Parent_View 	@554
-					location   	(154, 86)
-					label      	(object SegLabel @558
-					    Parent_View 	@557
-					    location   	(2008, 195)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+attributeGroupDefinitions"
-					    pctDist    	-0.349946
-					    height     	339
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018C"
-					client     	@554
-					supplier   	@499
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 1441)
-					    (2166, 1441))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(2166, 1441)
-					label      	(object SegLabel @559
-					    Parent_View 	@557
-					    location   	(2299, 197)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.348862
-					    height     	48
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$174" @560
-				location   	(203, 159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE760049"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$175" @561
-					Parent_View 	@560
-					location   	(-485, -273)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE760374"
-					client     	@560
-					supplier   	@543
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(1013, 159))
-				    (object RoleView "typeDefinitions" @562
-					Parent_View 	@560
-					location   	(-485, -273)
-					label      	(object SegLabel @563
-					    Parent_View 	@562
-					    location   	(349, 196)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+typeDefinitions"
-					    pctDist    	-1.475728
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE76037E"
-					client     	@560
-					supplier   	@521
-					vertices   	(list Points
-					    (203, 159)
-					    (104, 159)
-					    (104, 784)
-					    (189, 784))
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(189, 784)
-					label      	(object SegLabel @564
-					    Parent_View 	@562
-					    location   	(155, 200)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.059701
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$178" @565
-				location   	(1087, 329)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFC2A1701ED"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$179" @566
-					Parent_View 	@565
-					location   	(-577, -23)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A0273"
-					client     	@565
-					supplier   	@543
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 264))
-				    (object RoleView "identityConstraintDefinitions" @567
-					Parent_View 	@565
-					location   	(-577, -23)
-					label      	(object SegLabel @568
-					    Parent_View 	@567
-					    location   	(1375, 338)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.130952
-					    height     	288
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A027D"
-					client     	@565
-					supplier   	@527
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 395)
-					label      	(object SegLabel @569
-					    Parent_View 	@567
-					    location   	(1018, 336)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.107143
-					    height     	70
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$170" @570
-				location   	(48, 320)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66FDFA00C3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$171" @571
-					Parent_View 	@570
-					location   	(-1072, -288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027D"
-					client     	@570
-					supplier   	@543
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 68)
-					    (1013, 68))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(1013, 68))
-				    (object RoleView "attributeDeclarations" @572
-					Parent_View 	@570
-					location   	(-1072, -288)
-					label      	(object SegLabel @573
-					    Parent_View 	@572
-					    location   	(338, 106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+attributeDeclarations"
-					    pctDist    	-0.198536
-					    height     	289
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027E"
-					client     	@570
-					supplier   	@510
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 1415)
-					    (174, 1415))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(174, 1415)
-					label      	(object SegLabel @574
-					    Parent_View 	@572
-					    location   	(91, 108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.196706
-					    height     	42
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @575
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@575
-				    location   	(175, 412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	483
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	501
-				height     	97
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$120" @576
-				location   	(499, 589)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69C0590198"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$121" @577
-					Parent_View 	@576
-					location   	(-13, 109)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01E3"
-					client     	@576
-					supplier   	@575
-					vertices   	(list Points
-					    (499, 589)
-					    (452, 589)
-					    (452, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(452, 496))
-				    (object RoleView "substitutionGroupAffiliation" @578
-					Parent_View 	@576
-					location   	(-13, 109)
-					label      	(object SegLabel @579
-					    Parent_View 	@578
-					    location   	(811, 585)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+substitutionGroupAffiliation"
-					    pctDist    	6.520833
-					    height     	5
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01ED"
-					client     	@576
-					supplier   	@575
-					vertices   	(list Points
-					    (499, 589)
-					    (547, 589)
-					    (547, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(547, 496)
-					label      	(object SegLabel @580
-					    Parent_View 	@578
-					    location   	(499, 559)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.000000
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$114" @581
-				location   	(241, 613)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68338C0058"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$115" @582
-					Parent_View 	@581
-					location   	(-1343, -219)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03BF"
-					client     	@581
-					supplier   	@575
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 496))
-				    (object RoleView "typeDefinition" @583
-					Parent_View 	@581
-					location   	(-1343, -219)
-					label      	(object SegLabel @584
-					    Parent_View 	@583
-					    location   	(408, 694)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.686441
-					    height     	167
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03C0"
-					client     	@581
-					supplier   	@521
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 731)
-					label      	(object SegLabel @585
-					    Parent_View 	@583
-					    location   	(202, 685)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.610169
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$116" @586
-				location   	(837, 460)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$117" @587
-					Parent_View 	@586
-					location   	(-1819, -68)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@586
-					supplier   	@575
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(666, 460))
-				    (object RoleView "identityConstraintDefinitions" @588
-					Parent_View 	@586
-					location   	(-1819, -68)
-					label      	(object SegLabel @589
-					    Parent_View 	@588
-					    location   	(880, 528)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.251462
-					    height     	68
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@586
-					supplier   	@527
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(1008, 460)
-					label      	(object SegLabel @590
-					    Parent_View 	@588
-					    location   	(859, 407)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.130435
-					    height     	54
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$168" @591
-				location   	(541, 246)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE8D01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$169" @592
-					Parent_View 	@591
-					location   	(-1123, -186)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0198"
-					client     	@591
-					supplier   	@543
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(1013, 246))
-				    (object RoleView "elementDeclarations" @593
-					Parent_View 	@591
-					location   	(-1123, -186)
-					label      	(object SegLabel @594
-					    Parent_View 	@593
-					    location   	(443, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+elementDeclarations"
-					    pctDist    	0.209302
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0199"
-					client     	@591
-					supplier   	@575
-					vertices   	(list Points
-					    (541, 246)
-					    (224, 246)
-					    (224, 400))
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(224, 400)
-					label      	(object SegLabel @595
-					    Parent_View 	@593
-					    location   	(186, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.864693
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$122" @596
-				location   	(353, 621)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C42DBDD0297"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$123" @597
-					Parent_View 	@596
-					location   	(-63, 173)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE0011E"
-					client     	@596
-					supplier   	@575
-					vertices   	(list Points
-					    (353, 621)
-					    (306, 621)
-					    (306, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(306, 496))
-				    (object RoleView "substitutionGroup" @598
-					Parent_View 	@596
-					location   	(-63, 173)
-					label      	(object SegLabel @599
-					    Parent_View 	@598
-					    location   	(579, 636)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+substitutionGroup"
-					    pctDist    	4.808511
-					    height     	15
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE00128"
-					client     	@596
-					supplier   	@575
-					vertices   	(list Points
-					    (353, 621)
-					    (400, 621)
-					    (400, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(400, 496)
-					label      	(object SegLabel @600
-					    Parent_View 	@598
-					    location   	(350, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.069767
-					    height     	39
-					    orientation 	0))))))
-		    (object ClassDiagram "3. Component Attributes  (Part 1 : Structures)"
-			quid       	"3B69E78602C5"
-			title      	"3. Component Attributes  (Part 1 : Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @601
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@601
-				    location   	(46, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	516
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@601
-				    location   	(46, 107)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	482
-				    compartmentItems 	(list Compartment
-					"+ name : String"
-					"+ targetNamespace : String"))
-				width      	534
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @602
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@602
-				    location   	(41, 1567)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	512
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @603
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 1680)
-				label      	(object ItemLabel
-				    Parent_View 	@603
-				    location   	(1781, 1524)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1174
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@603
-				    location   	(1781, 1584)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	1139
-				    compartmentItems 	(list Compartment
-					"+ derivationMethod : XSDDerivationMethod = restriction"
-					"<<0..*>> + final : XSDComplexFinal"
-					"+ abstract : boolean"
-					"+ contentTypeCategory : XSDContentTypeCategory"
-					"<<0..*>> + prohibitedSubstitutions : XSDProhibitedSubstitutions"))
-				width      	1192
-				height     	336
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @604
-				location   	(463, 362)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@601
-				vertices   	(list Points
-				    (463, 362)
-				    (463, 221)))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @605
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@605
-				    location   	(1094, 1519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	628
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@605
-				    location   	(1094, 1579)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	592
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	646
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @606
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@606
-				    location   	(647, 38)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	530
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@606
-				    location   	(647, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	502
-				    compartmentItems 	(list Compartment
-					"+ required : boolean"
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	548
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @607
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@607
-				    location   	(45, 1830)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1286
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@607
-				    location   	(45, 1890)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	1260
-				    compartmentItems 	(list Compartment
-					"+ namespaceConstraintCategory : XSDNamespaceConstraintCategory"
-					"<<0..*>> + namespaceConstraint : String"
-					"+ processContents : XSDProcessContents"))
-				width      	1304
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @608
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 1440)
-				label      	(object ItemLabel
-				    Parent_View 	@608
-				    location   	(47, 1384)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	578
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	596
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @609
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@609
-				    location   	(36, 431)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@609
-				    location   	(36, 491)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	506
-				    compartmentItems 	(list Compartment
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	554
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @610
-				location   	(294, 697)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@609
-				vertices   	(list Points
-				    (294, 697)
-				    (294, 605)))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @611
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2256, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@611
-				    location   	(1995, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	540
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @612
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@612
-				    location   	(2418, 460)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @613
-				location   	(2684, 962)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@612
-				vertices   	(list Points
-				    (2684, 962)
-				    (2684, 576)))
-			    (object ClassView "Class" "Logical View::xsd::XSDCompositor" @614
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@614
-				    location   	(45, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDCompositor")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@614
-				    location   	(45, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869B620037"
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstraint" @615
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@615
-				    location   	(638, 469)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDConstraint")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@615
-				    location   	(638, 419)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869E2601AE"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDerivationMethod" @616
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@616
-				    location   	(1980, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"XSDDerivationMethod")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@616
-				    location   	(1980, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A0B000CE"
-				width      	442
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintCategory" @617
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@617
-				    location   	(1281, 88)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"XSDIdentityConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@617
-				    location   	(1281, 38)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A1E00272"
-				width      	625
-				height     	300
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDContentTypeCategory" @618
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2704, 2224)
-				label      	(object ItemLabel
-				    Parent_View 	@618
-				    location   	(2456, 2115)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"XSDContentTypeCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@618
-				    location   	(2456, 2065)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A79F03A2"
-				width      	514
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @619
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@619
-				    location   	(708, 1516)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@619
-				    location   	(708, 1466)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	362
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProcessContents" @620
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@620
-				    location   	(766, 2156)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDProcessContents")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@620
-				    location   	(766, 2106)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF8C70284"
-				width      	438
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathVariety" @621
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2768, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@621
-				    location   	(2587, 97)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"XSDXPathVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@621
-				    location   	(2587, 47)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FFB89033A"
-				width      	381
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @622
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 1872)
-				label      	(object ItemLabel
-				    Parent_View 	@622
-				    location   	(1389, 1788)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@622
-				    location   	(1389, 1738)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@622
-				    location   	(1389, 1848)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	199
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @623
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 2000)
-				label      	(object ItemLabel
-				    Parent_View 	@623
-				    location   	(1786, 1941)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@623
-				    location   	(1786, 1891)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				compartment 	(object Compartment
-				    Parent_View 	@623
-				    location   	(1786, 2001)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	382
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSubstitutionGroupExclusions" @624
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@624
-				    location   	(485, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"XSDSubstitutionGroupExclusions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@624
-				    location   	(485, 1075)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C59100AE"
-				width      	648
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @625
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@625
-				    location   	(1171, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@625
-				    location   	(1171, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@625
-				    location   	(1171, 1176)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	236
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"))
-				width      	556
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @626
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1664, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@626
-				    location   	(1398, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@626
-				    location   	(1398, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@626
-				    location   	(1398, 2273)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	550
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamespaceConstraintCategory" @627
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(45, 2154)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"XSDNamespaceConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(45, 2104)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5EA0023"
-				width      	696
-				height     	296
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @628
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1264, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@628
-				    location   	(571, 749)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1386
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@628
-				    location   	(571, 809)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	1357
-				    compartmentItems 	(list Compartment
-					"+ nillable : boolean"
-					"<<0..*>> + disallowedSubstitutions : XSDDisallowedSubstitutions"
-					"<<0..*>> + substitutionGroupExclusions : XSDSubstitutionGroupExclusions"
-					"+ abstract : boolean"))
-				width      	1404
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @629
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@628
-				supplier   	@609
-				line_style 	3
-				origin_attachment 	(681, 737)
-				terminal_attachment 	(681, 697)
-				drawSupplier 	@610)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @630
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@630
-				    location   	(35, 812)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @631
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@631
-				    location   	(2420, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @632
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@631
-				supplier   	@612
-				line_style 	3
-				origin_attachment 	(2862, 1088)
-				terminal_attachment 	(2862, 962)
-				drawSupplier 	@613)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @633
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1312)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@633
-				    location   	(2168, 1261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @634
-				location   	(2375, 1465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@633
-				vertices   	(list Points
-				    (2375, 1465)
-				    (2375, 1375)))
-			    (object InheritView "" @635
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@633
-				supplier   	@612
-				line_style 	3
-				origin_attachment 	(2368, 1249)
-				terminal_attachment 	(2368, 962)
-				drawSupplier 	@613)
-			    (object InheritView "" @636
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@603
-				supplier   	@633
-				line_style 	3
-				origin_attachment 	(2818, 1512)
-				terminal_attachment 	(2818, 1465)
-				drawSupplier 	@634)
-			    (object InheritView "" @637
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@605
-				supplier   	@633
-				line_style 	3
-				origin_attachment 	(1406, 1507)
-				terminal_attachment 	(1406, 1465)
-				drawSupplier 	@634)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @638
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(1818, 1101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @639
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@638
-				supplier   	@612
-				line_style 	3
-				origin_attachment 	(2115, 1089)
-				terminal_attachment 	(2115, 962)
-				drawSupplier 	@613)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @640
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(1034, 468)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1132
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	1150
-				height     	144
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @641
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@640
-				supplier   	@601
-				line_style 	3
-				origin_attachment 	(1568, 456)
-				terminal_attachment 	(1568, 362)
-				drawSupplier 	@604)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @642
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@642
-				    location   	(2078, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	484
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	502
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @643
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@643
-				    location   	(43, 268)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @644
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@642
-				supplier   	@601
-				line_style 	3
-				origin_attachment 	(2290, 691)
-				terminal_attachment 	(2290, 362)
-				drawSupplier 	@604)
-			    (object InheritView "" @645
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@630
-				supplier   	@609
-				line_style 	3
-				origin_attachment 	(141, 800)
-				terminal_attachment 	(141, 697)
-				drawSupplier 	@610)
-			    (object InheritView "" @646
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@609
-				supplier   	@601
-				line_style 	3
-				origin_attachment 	(372, 419)
-				terminal_attachment 	(372, 362)
-				drawSupplier 	@604)
-			    (object InheritView "" @647
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@612
-				supplier   	@601
-				line_style 	3
-				origin_attachment 	(2687, 448)
-				terminal_attachment 	(2687, 362)
-				drawSupplier 	@604)))
-		    (object ClassDiagram "4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			quid       	"3B6C3265005F"
-			title      	"4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFixedFacet" @648
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@648
-				    location   	(32, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	320
-				    justify    	0
-				    label      	"XSDFixedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C699E00C1"
-				width      	338
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @649
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@649
-				    location   	(504, 845)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @650
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@650
-				    location   	(266, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	478
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @651
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@651
-				    location   	(777, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	480
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @652
-				location   	(718, 1049)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@649
-				vertices   	(list Points
-				    (718, 1049)
-				    (718, 959)))
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @653
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@653
-				    location   	(1799, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	420
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @654
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@654
-				    location   	(1383, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	388
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @655
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2032, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@655
-				    location   	(1807, 1048)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	468
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @656
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@656
-				    location   	(1319, 1049)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	388
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @657
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@657
-				    location   	(491, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	348
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @658
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@658
-				    location   	(405, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	424
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @659
-				location   	(144, 1262)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@648
-				vertices   	(list Points
-				    (144, 1262)
-				    (144, 964)))
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @660
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1216, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@660
-				    location   	(1007, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @661
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@661
-				    location   	(880, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	498
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @662
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@662
-				    location   	(1090, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	462
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @663
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@663
-				    location   	(1193, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @664
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@664
-				    location   	(282, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	428
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	446
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @665
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@665
-				    location   	(124, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	474
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @666
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@666
-				    location   	(52, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	426
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @667
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@667
-				    location   	(1318, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	486
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @668
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C9D03C7"
-				client     	@650
-				supplier   	@649
-				line_style 	3
-				origin_attachment 	(394, 1100)
-				terminal_attachment 	(394, 1049)
-				drawSupplier 	@652)
-			    (object InheritView "" @669
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C78620045"
-				client     	@661
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(1119, 1308)
-				terminal_attachment 	(1119, 1262)
-				drawSupplier 	@659)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @670
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 160)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@670
-				    location   	(174, 117)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @671
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6CA5038D"
-				client     	@651
-				supplier   	@649
-				line_style 	3
-				origin_attachment 	(1044, 1100)
-				terminal_attachment 	(1044, 1049)
-				drawSupplier 	@652)
-			    (object InheritView "" @672
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C778002DF"
-				client     	@657
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(663, 1308)
-				terminal_attachment 	(663, 1262)
-				drawSupplier 	@659)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrdered" @673
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@673
-				    location   	(1835, 1324)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDOrdered")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@673
-				    location   	(1835, 1274)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715202E4"
-				width      	444
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinality" @674
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@674
-				    location   	(1835, 1669)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDCardinality")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@674
-				    location   	(1835, 1619)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715D009B"
-				width      	444
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpace" @675
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 2032)
-				label      	(object ItemLabel
-				    Parent_View 	@675
-				    location   	(1861, 1951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDWhiteSpace")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@675
-				    location   	(1861, 1901)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BEED0F60342"
-				width      	424
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::Value" @676
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@676
-				    location   	(571, 2062)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"Value")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@676
-				    location   	(571, 2012)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C040B5B031F"
-				width      	636
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @677
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B610337"
-				client     	@666
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(75, 2044)
-				terminal_attachment 	(75, 1262)
-				drawSupplier 	@659)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @678
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@678
-				    location   	(113, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	286
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@678
-				    location   	(113, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	254
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	304
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @679
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@679
-				    location   	(1440, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	288
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@679
-				    location   	(1440, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	258
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	306
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @680
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D240098"
-				client     	@678
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(235, 1308)
-				terminal_attachment 	(235, 1262)
-				drawSupplier 	@659)
-			    (object InheritView "" @681
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D3103AD"
-				client     	@679
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(1581, 1308)
-				terminal_attachment 	(1581, 1262)
-				drawSupplier 	@659)
-			    (object InheritView "" @682
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B520353"
-				client     	@664
-				supplier   	@678
-				line_style 	3
-				origin_attachment 	(285, 1664)
-				terminal_attachment 	(285, 1444))
-			    (object InheritView "" @683
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8303B8"
-				client     	@662
-				supplier   	@679
-				line_style 	3
-				origin_attachment 	(1500, 1664)
-				terminal_attachment 	(1500, 1444))
-			    (object InheritView "" @684
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8E0309"
-				client     	@663
-				supplier   	@679
-				line_style 	3
-				origin_attachment 	(1622, 1840)
-				terminal_attachment 	(1622, 1444))
-			    (object InheritView "" @685
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C77C400C0"
-				client     	@658
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(447, 1485)
-				terminal_attachment 	(447, 1262)
-				drawSupplier 	@659)
-			    (object InheritView "" @686
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B7D00FC"
-				client     	@660
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(1397, 1485)
-				terminal_attachment 	(1397, 1262)
-				drawSupplier 	@659)
-			    (object InheritView "" @687
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B990016"
-				client     	@667
-				supplier   	@648
-				line_style 	3
-				origin_attachment 	(1775, 2044)
-				terminal_attachment 	(1775, 1262)
-				drawSupplier 	@659)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @688
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 368)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@688
-				    location   	(174, 318)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	406
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @689
-				location   	(366, 522)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@688
-				vertices   	(list Points
-				    (366, 522)
-				    (366, 430)))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @690
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@690
-				    location   	(34, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	462
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @691
-				location   	(272, 781)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@690
-				vertices   	(list Points
-				    (272, 781)
-				    (272, 687)))
-			    (object InheritView "" @692
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@649
-				supplier   	@690
-				line_style 	3
-				origin_attachment 	(594, 833)
-				terminal_attachment 	(594, 781)
-				drawSupplier 	@691)
-			    (object ClassView "Class" "Logical View::xsd::XSDFundamentalFacet" @693
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@693
-				    location   	(526, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDFundamentalFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C69E801D6"
-				width      	470
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @694
-				location   	(768, 789)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@693
-				vertices   	(list Points
-				    (768, 789)
-				    (768, 687)))
-			    (object InheritView "" @695
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7659012C"
-				client     	@653
-				supplier   	@693
-				line_style 	3
-				origin_attachment 	(2050, 860)
-				terminal_attachment 	(2050, 789)
-				drawSupplier 	@694)
-			    (object InheritView "" @696
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C763C0224"
-				client     	@654
-				supplier   	@693
-				line_style 	3
-				origin_attachment 	(1525, 860)
-				terminal_attachment 	(1525, 789)
-				drawSupplier 	@694)
-			    (object InheritView "" @697
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C764F0131"
-				client     	@655
-				supplier   	@693
-				line_style 	3
-				origin_attachment 	(2237, 1036)
-				terminal_attachment 	(2237, 789)
-				drawSupplier 	@694)
-			    (object InheritView "" @698
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C76420074"
-				client     	@656
-				supplier   	@693
-				line_style 	3
-				origin_attachment 	(1328, 1037)
-				terminal_attachment 	(1328, 789)
-				drawSupplier 	@694)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @699
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1456, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@699
-				    location   	(1137, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@699
-				    location   	(1137, 107)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	598
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	656
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$126" @700
-				location   	(775, 178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D597102EA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$127" @701
-					Parent_View 	@700
-					location   	(-1209, -46)
-					label      	(object SegLabel @702
-					    Parent_View 	@701
-					    location   	(509, 235)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750119"
-					client     	@700
-					supplier   	@688
-					vertices   	(list Points
-					    (775, 178)
-					    (550, 178)
-					    (550, 306))
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(550, 306))
-				    (object RoleView "simpleTypeDefinition" @703
-					Parent_View 	@700
-					location   	(-1209, -46)
-					label      	(object SegLabel @704
-					    Parent_View 	@703
-					    location   	(875, 136)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+simpleTypeDefinition"
-					    pctDist    	0.283133
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750105"
-					client     	@700
-					supplier   	@699
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(1128, 178)
-					label      	(object SegLabel @705
-					    Parent_View 	@703
-					    location   	(1061, 215)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.812500
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$188" @706
-				location   	(369, 72)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BC8AE0203A8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facets" @707
-					Parent_View 	@706
-					location   	(-1615, -152)
-					label      	(object SegLabel @708
-					    Parent_View 	@707
-					    location   	(187, 496)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+facets"
-					    pctDist    	0.913863
-					    height     	87
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060065"
-					client     	@706
-					supplier   	@690
-					vertices   	(list Points
-					    (369, 72)
-					    (100, 72)
-					    (100, 561))
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(100, 561)
-					label      	(object SegLabel @709
-					    Parent_View 	@707
-					    location   	(60, 498)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.917900
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$189" @710
-					Parent_View 	@706
-					location   	(-1615, -152)
-					label      	(object SegLabel @711
-					    Parent_View 	@710
-					    location   	(976, 31)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060051"
-					client     	@706
-					supplier   	@699
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(1128, 72))))
-			    (object AssociationViewNew "$UNNAMED$230" @712
-				location   	(1538, 508)
-				label      	(object SegLabel @713
-				    Parent_View 	@712
-				    location   	(1538, 449)
-				    font       	(object Font
-					italics    	TRUE)
-				    hidden     	TRUE
-				    anchor     	1
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	60
-				    justify    	0
-				    label      	""
-				    pctDist    	0.500000
-				    height     	60
-				    orientation 	0)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C276DA000DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$231" @714
-					Parent_View 	@712
-					location   	(-446, 284)
-					label      	(object SegLabel @715
-					    Parent_View 	@714
-					    location   	(1446, 340)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000DF"
-					client     	@712
-					supplier   	@699
-					vertices   	(list Points
-					    (1538, 508)
-					    (1487, 508)
-					    (1487, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1487, 285))
-				    (object RoleView "itemTypeDefinition" @716
-					Parent_View 	@712
-					location   	(-446, 284)
-					label      	(object SegLabel @717
-					    Parent_View 	@716
-					    location   	(1423, 577)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+itemTypeDefinition"
-					    pctDist    	-2.211539
-					    height     	69
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000E0"
-					client     	@712
-					supplier   	@699
-					vertices   	(list Points
-					    (1538, 508)
-					    (1590, 508)
-					    (1590, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1590, 285)
-					label      	(object SegLabel @718
-					    Parent_View 	@716
-					    location   	(1539, 468)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.003984
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$190" @719
-				location   	(1729, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C34B70208"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$191" @720
-					Parent_View 	@719
-					location   	(-255, 350)
-					label      	(object SegLabel @721
-					    Parent_View 	@720
-					    location   	(1637, 353)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0258"
-					client     	@719
-					supplier   	@699
-					vertices   	(list Points
-					    (1729, 574)
-					    (1678, 574)
-					    (1678, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1678, 285))
-				    (object RoleView "memberTypeDefinitions" @722
-					Parent_View 	@719
-					location   	(-255, 350)
-					label      	(object SegLabel @723
-					    Parent_View 	@722
-					    location   	(1559, 654)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+memberTypeDefinitions"
-					    pctDist    	-3.269231
-					    height     	80
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0259"
-					client     	@719
-					supplier   	@699
-					vertices   	(list Points
-					    (1729, 574)
-					    (1781, 574)
-					    (1781, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1781, 285)
-					label      	(object SegLabel @724
-					    Parent_View 	@722
-					    location   	(1730, 520)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.312121
-					    height     	52
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$192" @725
-				location   	(748, 269)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C363201DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fundamentalFacets" @726
-					Parent_View 	@725
-					location   	(-1236, 45)
-					label      	(object SegLabel @727
-					    Parent_View 	@726
-					    location   	(873, 312)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+fundamentalFacets"
-					    pctDist    	-1.409091
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350063"
-					client     	@725
-					supplier   	@693
-					vertices   	(list Points
-					    (748, 269)
-					    (659, 269)
-					    (659, 561))
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(659, 561)
-					label      	(object SegLabel @728
-					    Parent_View 	@726
-					    location   	(728, 385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.538028
-					    height     	69
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$193" @729
-					Parent_View 	@725
-					location   	(-1236, 45)
-					label      	(object SegLabel @730
-					    Parent_View 	@729
-					    location   	(1052, 228)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350059"
-					client     	@725
-					supplier   	@699
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(1128, 269))))
-			    (object AssociationViewNew "$UNNAMED$194" @731
-				location   	(1175, 396)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$195" @732
-					Parent_View 	@731
-					location   	(-809, 172)
-					label      	(object SegLabel @733
-					    Parent_View 	@732
-					    location   	(1094, 316)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@731
-					supplier   	@699
-					vertices   	(list Points
-					    (1175, 396)
-					    (1135, 396)
-					    (1135, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1135, 285))
-				    (object RoleView "baseTypeDefinition" @734
-					Parent_View 	@731
-					location   	(-809, 172)
-					label      	(object SegLabel @735
-					    Parent_View 	@734
-					    location   	(1074, 443)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	-2.533333
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@731
-					supplier   	@699
-					vertices   	(list Points
-					    (1175, 396)
-					    (1215, 396)
-					    (1215, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1215, 285)
-					label      	(object SegLabel @736
-					    Parent_View 	@734
-					    location   	(1172, 359)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.096154
-					    height     	38
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$196" @737
-				location   	(1360, 446)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5572016C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$197" @738
-					Parent_View 	@737
-					location   	(-624, 222)
-					label      	(object SegLabel @739
-					    Parent_View 	@738
-					    location   	(1268, 327)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5575022F"
-					client     	@737
-					supplier   	@699
-					vertices   	(list Points
-					    (1360, 446)
-					    (1309, 446)
-					    (1309, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1309, 285))
-				    (object RoleView "primitiveTypeDefinition" @740
-					Parent_View 	@737
-					location   	(-624, 222)
-					label      	(object SegLabel @741
-					    Parent_View 	@740
-					    location   	(1204, 508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+primitiveTypeDefinition"
-					    pctDist    	-3.000000
-					    height     	62
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D55750243"
-					client     	@737
-					supplier   	@699
-					vertices   	(list Points
-					    (1360, 446)
-					    (1412, 446)
-					    (1412, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1412, 285)
-					label      	(object SegLabel @742
-					    Parent_View 	@740
-					    location   	(1373, 409)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.062147
-					    height     	38
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @743
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 512)
-				label      	(object ItemLabel
-				    Parent_View 	@743
-				    location   	(1917, 428)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@743
-				    location   	(1917, 378)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@743
-				    location   	(1917, 488)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	3
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @744
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@744
-				    location   	(1918, 92)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@744
-				    location   	(1918, 42)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	342
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @745
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C7B0396"
-				client     	@693
-				supplier   	@688
-				line_style 	3
-				origin_attachment 	(591, 561)
-				terminal_attachment 	(591, 522)
-				drawSupplier 	@689)
-			    (object InheritView "" @746
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@690
-				supplier   	@688
-				line_style 	3
-				origin_attachment 	(272, 561)
-				terminal_attachment 	(272, 522)
-				drawSupplier 	@689)
-			    (object InheritView "" @747
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@688
-				supplier   	@670
-				line_style 	3
-				origin_attachment 	(366, 306)
-				terminal_attachment 	(366, 215))
-			    (object InheritView "" @748
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8801B4"
-				client     	@648
-				supplier   	@690
-				line_style 	3
-				origin_attachment 	(147, 828)
-				terminal_attachment 	(147, 781)
-				drawSupplier 	@691)
-			    (object InheritView "" @749
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B590281"
-				client     	@665
-				supplier   	@678
-				line_style 	3
-				origin_attachment 	(150, 1840)
-				terminal_attachment 	(150, 1444))))
-		    (object ClassDiagram "5. Component Annotations"
-			quid       	"3B69D68D00D2"
-			title      	"5. Component Annotations"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @750
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@750
-				    location   	(88, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @751
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@751
-				    location   	(82, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @752
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 1504)
-				label      	(object ItemLabel
-				    Parent_View 	@752
-				    location   	(1626, 1461)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @753
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 304)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@753
-				    location   	(1663, 261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @754
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@754
-				    location   	(74, 1317)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	588
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	606
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @755
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@755
-				    location   	(86, 661)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @756
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@756
-				    location   	(74, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @757
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 544)
-				label      	(object ItemLabel
-				    Parent_View 	@757
-				    location   	(86, 501)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @758
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@758
-				    location   	(1068, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @759
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1216)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@759
-				    location   	(1750, 1173)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @760
-				location   	(1994, 1412)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@759
-				vertices   	(list Points
-				    (1994, 1412)
-				    (1994, 1271)))
-			    (object InheritView "" @761
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@752
-				supplier   	@759
-				line_style 	3
-				origin_attachment 	(2084, 1449)
-				terminal_attachment 	(2084, 1412)
-				drawSupplier 	@760)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @762
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@762
-				    location   	(80, 821)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @763
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@763
-				    location   	(1892, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	234
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @764
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@764
-				    location   	(84, 341)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @765
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@765
-				    location   	(86, 181)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @766
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@766
-				    location   	(1467, 1674)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	651
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	669
-				height     	100
-				annotation 	8)
-			    (object InheritView "" @767
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@766
-				supplier   	@759
-				line_style 	3
-				origin_attachment 	(1572, 1662)
-				terminal_attachment 	(1572, 1412)
-				drawSupplier 	@760)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @768
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@768
-				    location   	(78, 981)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @769
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@769
-				    location   	(1688, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @770
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@770
-				    location   	(71, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @771
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@771
-				    location   	(872, 685)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	720
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	738
-				height     	543
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$132" @772
-				location   	(865, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0D0183"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$133" @773
-					Parent_View 	@772
-					location   	(-255, 559)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D033C"
-					client     	@772
-					supplier   	@754
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(671, 1359))
-				    (object RoleView "annotation" @774
-					Parent_View 	@772
-					location   	(-255, 559)
-					label      	(object SegLabel @775
-					    Parent_View 	@774
-					    location   	(798, 1321)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-1.116667
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D0346"
-					client     	@772
-					supplier   	@771
-					vertices   	(list Points
-					    (865, 1359)
-					    (925, 1359)
-					    (925, 1215))
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(925, 1215)
-					label      	(object SegLabel @776
-					    Parent_View 	@774
-					    location   	(987, 1276)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.706422
-					    height     	62
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$156" @777
-				location   	(713, 709)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0F0212"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$157" @778
-					Parent_View 	@777
-					location   	(-407, -90)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000C9"
-					client     	@777
-					supplier   	@755
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(563, 709))
-				    (object RoleView "annotation" @779
-					Parent_View 	@777
-					location   	(-407, -90)
-					label      	(object SegLabel @780
-					    Parent_View 	@779
-					    location   	(727, 667)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.095238
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000D3"
-					client     	@777
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(863, 709)
-					label      	(object SegLabel @781
-					    Parent_View 	@779
-					    location   	(796, 753)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.553571
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$150" @782
-				location   	(719, 1193)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB15008A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$151" @783
-					Parent_View 	@782
-					location   	(-401, 393)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB160096"
-					client     	@782
-					supplier   	@756
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(575, 1193))
-				    (object RoleView "annotation" @784
-					Parent_View 	@782
-					location   	(-401, 393)
-					label      	(object SegLabel @785
-					    Parent_View 	@784
-					    location   	(720, 1147)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.006993
-					    height     	47
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1600A0"
-					client     	@782
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(863, 1193)
-					label      	(object SegLabel @786
-					    Parent_View 	@784
-					    location   	(806, 1240)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.604167
-					    height     	47
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$110" @787
-				location   	(785, 550)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0A0066"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$111" @788
-					Parent_View 	@787
-					location   	(-335, -250)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B023F"
-					client     	@787
-					supplier   	@757
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(563, 550))
-				    (object RoleView "annotation" @789
-					Parent_View 	@787
-					location   	(-335, -250)
-					label      	(object SegLabel @790
-					    Parent_View 	@789
-					    location   	(779, 516)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.070707
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B0249"
-					client     	@787
-					supplier   	@771
-					vertices   	(list Points
-					    (785, 550)
-					    (884, 550)
-					    (884, 673))
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(884, 673)
-					label      	(object SegLabel @791
-					    Parent_View 	@789
-					    location   	(935, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.729730
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$182" @792
-				location   	(1184, 404)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E4560290"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$183" @793
-					Parent_View 	@792
-					location   	(-32, -412)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E4570165"
-					client     	@792
-					supplier   	@758
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 135))
-				    (object RoleView "annotations" @794
-					Parent_View 	@792
-					location   	(-32, -412)
-					label      	(object SegLabel @795
-					    Parent_View 	@794
-					    location   	(1324, 226)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-0.665428
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E457016F"
-					client     	@792
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 673)
-					label      	(object SegLabel @796
-					    Parent_View 	@794
-					    location   	(1251, 615)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.784387
-					    height     	67
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$198" @797
-				location   	(1752, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E2910158"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$199" @798
-					Parent_View 	@797
-					location   	(536, 218)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E292019F"
-					client     	@797
-					supplier   	@759
-					vertices   	(list Points
-					    (1752, 1034)
-					    (1812, 1034)
-					    (1812, 1161))
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1812, 1161))
-				    (object RoleView "annotation" @799
-					Parent_View 	@797
-					location   	(536, 218)
-					label      	(object SegLabel @800
-					    Parent_View 	@799
-					    location   	(1743, 997)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.059603
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E29201A9"
-					client     	@797
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1601, 1034)
-					label      	(object SegLabel @801
-					    Parent_View 	@799
-					    location   	(1684, 1066)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.450331
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$200" @802
-				location   	(1896, 881)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B9006CF0088"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$201" @803
-					Parent_View 	@802
-					location   	(621, 40)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D1015D"
-					client     	@802
-					supplier   	@759
-					vertices   	(list Points
-					    (1896, 881)
-					    (1956, 881)
-					    (1956, 1161))
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1956, 1161))
-				    (object RoleView "derivationAnnotation" @804
-					Parent_View 	@802
-					location   	(621, 40)
-					label      	(object SegLabel @805
-					    Parent_View 	@804
-					    location   	(1821, 842)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	390
-					    justify    	0
-					    label      	"+derivationAnnotation"
-					    pctDist    	0.254237
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D10167"
-					client     	@802
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1601, 881)
-					label      	(object SegLabel @806
-					    Parent_View 	@804
-					    location   	(1689, 914)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.705085
-					    height     	33
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$202" @807
-				location   	(2040, 715)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB330264"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$203" @808
-					Parent_View 	@807
-					location   	(920, -85)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB340284"
-					client     	@807
-					supplier   	@759
-					vertices   	(list Points
-					    (2040, 715)
-					    (2100, 715)
-					    (2100, 1161))
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(2100, 1161))
-				    (object RoleView "annotations" @809
-					Parent_View 	@807
-					location   	(920, -85)
-					label      	(object SegLabel @810
-					    Parent_View 	@809
-					    location   	(1758, 681)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.643192
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB34028E"
-					client     	@807
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(1601, 715)
-					label      	(object SegLabel @811
-					    Parent_View 	@809
-					    location   	(1685, 746)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.809313
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$220" @812
-				location   	(668, 865)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C239134004F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$221" @813
-					Parent_View 	@812
-					location   	(-612, 33)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600CA"
-					client     	@812
-					supplier   	@762
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(473, 865))
-				    (object RoleView "annotation" @814
-					Parent_View 	@812
-					location   	(-612, 33)
-					label      	(object SegLabel @815
-					    Parent_View 	@814
-					    location   	(714, 825)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.234146
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600D4"
-					client     	@812
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(863, 865)
-					label      	(object SegLabel @816
-					    Parent_View 	@814
-					    location   	(801, 903)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.682051
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$124" @817
-				location   	(1472, 167)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D23B901CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$125" @818
-					Parent_View 	@817
-					location   	(256, -649)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01C4"
-					client     	@817
-					supplier   	@763
-					vertices   	(list Points
-					    (1472, 167)
-					    (1472, 72)
-					    (1883, 72))
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1883, 72))
-				    (object RoleView "annotation" @819
-					Parent_View 	@817
-					location   	(256, -649)
-					label      	(object SegLabel @820
-					    Parent_View 	@819
-					    location   	(1604, 129)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.076305
-					    height     	132
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01CE"
-					client     	@817
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1472, 673)
-					label      	(object SegLabel @821
-					    Parent_View 	@819
-					    location   	(1419, 618)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.893574
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$74" @822
-				location   	(927, 350)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB060291"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$75" @823
-					Parent_View 	@822
-					location   	(-193, -450)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070171"
-					client     	@822
-					supplier   	@764
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(629, 350))
-				    (object RoleView "annotation" @824
-					Parent_View 	@822
-					location   	(-193, -450)
-					label      	(object SegLabel @825
-					    Parent_View 	@824
-					    location   	(878, 310)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.816667
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070172"
-					client     	@822
-					supplier   	@771
-					vertices   	(list Points
-					    (927, 350)
-					    (987, 350)
-					    (987, 673))
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(987, 673)
-					label      	(object SegLabel @826
-					    Parent_View 	@824
-					    location   	(1037, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.843342
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$66" @827
-				location   	(1027, 222)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DADC02F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$67" @828
-					Parent_View 	@827
-					location   	(-93, -578)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0238"
-					client     	@827
-					supplier   	@765
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(563, 222))
-				    (object RoleView "annotation" @829
-					Parent_View 	@827
-					location   	(-93, -578)
-					label      	(object SegLabel @830
-					    Parent_View 	@829
-					    location   	(1003, 188)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.406250
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0242"
-					client     	@827
-					supplier   	@771
-					vertices   	(list Points
-					    (1027, 222)
-					    (1087, 222)
-					    (1087, 673))
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(1087, 673)
-					label      	(object SegLabel @831
-					    Parent_View 	@829
-					    location   	(1137, 613)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	100
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.882583
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$90" @832
-				location   	(1494, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B90068801C2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$91" @833
-					Parent_View 	@832
-					location   	(214, 590)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A0111"
-					client     	@832
-					supplier   	@766
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1662))
-				    (object RoleView "contentAnnotation" @834
-					Parent_View 	@832
-					location   	(214, 590)
-					label      	(object SegLabel @835
-					    Parent_View 	@834
-					    location   	(1696, 1356)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+contentAnnotation"
-					    pctDist    	0.367713
-					    height     	202
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A011B"
-					client     	@832
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1215)
-					label      	(object SegLabel @836
-					    Parent_View 	@834
-					    location   	(1443, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.713004
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$144" @837
-				location   	(637, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB1702C8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$145" @838
-					Parent_View 	@837
-					location   	(-483, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1803E2"
-					client     	@837
-					supplier   	@768
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(411, 1022))
-				    (object RoleView "annotation" @839
-					Parent_View 	@837
-					location   	(-483, 222)
-					label      	(object SegLabel @840
-					    Parent_View 	@839
-					    location   	(710, 979)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.328889
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB190004"
-					client     	@837
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(863, 1022)
-					label      	(object SegLabel @841
-					    Parent_View 	@839
-					    location   	(802, 1062)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.730088
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$64" @842
-				location   	(1581, 607)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EA70102"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$65" @843
-					Parent_View 	@842
-					location   	(301, -225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90191"
-					client     	@842
-					supplier   	@769
-					vertices   	(list Points
-					    (1581, 607)
-					    (1581, 547)
-					    (1679, 547))
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1679, 547))
-				    (object RoleView "annotations" @844
-					Parent_View 	@842
-					location   	(301, -225)
-					label      	(object SegLabel @845
-					    Parent_View 	@844
-					    location   	(1669, 462)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-2.196970
-					    height     	88
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90192"
-					client     	@842
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1581, 673)
-					label      	(object SegLabel @846
-					    Parent_View 	@844
-					    location   	(1539, 620)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.196970
-					    height     	42
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$204" @847
-				location   	(849, 1496)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB11026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$205" @848
-					Parent_View 	@847
-					location   	(-271, 696)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1201F9"
-					client     	@847
-					supplier   	@770
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(354, 1496))
-				    (object RoleView "annotation" @849
-					Parent_View 	@847
-					location   	(-271, 696)
-					label      	(object SegLabel @850
-					    Parent_View 	@849
-					    location   	(942, 1464)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.188259
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB120203"
-					client     	@847
-					supplier   	@771
-					vertices   	(list Points
-					    (849, 1496)
-					    (1062, 1496)
-					    (1062, 1215))
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(1062, 1215)
-					label      	(object SegLabel @851
-					    Parent_View 	@849
-					    location   	(1115, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.872690
-					    height     	53
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$206" @852
-				location   	(952, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EB30005"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$207" @853
-					Parent_View 	@852
-					location   	(-328, 733)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40327"
-					client     	@852
-					supplier   	@770
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(354, 1565))
-				    (object RoleView "annotations" @854
-					Parent_View 	@852
-					location   	(-328, 733)
-					label      	(object SegLabel @855
-					    Parent_View 	@854
-					    location   	(1075, 1538)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.204959
-					    height     	28
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40332"
-					client     	@852
-					supplier   	@771
-					vertices   	(list Points
-					    (952, 1565)
-					    (1200, 1565)
-					    (1200, 1215))
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(1200, 1215)
-					label      	(object SegLabel @856
-					    Parent_View 	@854
-					    location   	(1254, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @857
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@753
-				supplier   	@763
-				line_style 	3
-				origin_attachment 	(1984, 249)
-				terminal_attachment 	(1984, 135))
-			    (object InheritView "" @858
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@769
-				supplier   	@753
-				line_style 	3
-				origin_attachment 	(1997, 505)
-				terminal_attachment 	(1997, 359))))
-		    (object ClassDiagram "6. Concrete Components"
-			quid       	"3B6AD74D03C4"
-			title      	"6. Concrete Components"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @859
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@859
-				    location   	(126, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @860
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@860
-				    location   	(568, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @861
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@861
-				    location   	(991, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @862
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@862
-				    location   	(1156, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @863
-				location   	(1360, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@862
-				vertices   	(list Points
-				    (1360, 561)
-				    (1360, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDInclude" @864
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@864
-				    location   	(1512, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"XSDInclude")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C7D0250"
-				width      	258
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @865
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@865
-				    location   	(1294, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @866
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@866
-				    location   	(1805, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @867
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@867
-				    location   	(375, 1153)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	851
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	869
-				height     	119
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$142" @868
-				location   	(1368, 1206)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCC5007E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$143" @869
-					Parent_View 	@868
-					location   	(1160, 406)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006B"
-					client     	@868
-					supplier   	@864
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1503, 1206))
-				    (object RoleView "annotation" @870
-					Parent_View 	@868
-					location   	(1160, 406)
-					label      	(object SegLabel @871
-					    Parent_View 	@870
-					    location   	(1347, 1154)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.154412
-					    height     	53
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006C"
-					client     	@868
-					supplier   	@867
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1234, 1206)
-					label      	(object SegLabel @872
-					    Parent_View 	@870
-					    location   	(1300, 1253)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	107
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.514706
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$140" @873
-				location   	(1168, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCD802FC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$141" @874
-					Parent_View 	@873
-					location   	(960, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018B"
-					client     	@873
-					supplier   	@865
-					vertices   	(list Points
-					    (1168, 1022)
-					    (1168, 962)
-					    (1285, 962))
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1285, 962))
-				    (object RoleView "annotation" @875
-					Parent_View 	@873
-					location   	(960, 222)
-					label      	(object SegLabel @876
-					    Parent_View 	@875
-					    location   	(1290, 1075)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.445378
-					    height     	122
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018C"
-					client     	@873
-					supplier   	@867
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1168, 1141)
-					label      	(object SegLabel @877
-					    Parent_View 	@875
-					    location   	(1127, 1074)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.436975
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$162" @878
-				location   	(1563, 1353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADE42009A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$163" @879
-					Parent_View 	@878
-					location   	(1355, 553)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE4302FE"
-					client     	@878
-					supplier   	@866
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1940, 1353)
-					    (1940, 1255))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1940, 1255))
-				    (object RoleView "annotations" @880
-					Parent_View 	@878
-					location   	(1355, 553)
-					label      	(object SegLabel @881
-					    Parent_View 	@880
-					    location   	(1317, 1322)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.516807
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE430308"
-					client     	@878
-					supplier   	@867
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1181, 1353)
-					    (1181, 1259))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1181, 1259)
-					label      	(object SegLabel @882
-					    Parent_View 	@880
-					    location   	(1130, 1326)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.861345
-					    height     	52
-					    orientation 	0))))
-			    (object InheritTreeView "" @883
-				location   	(288, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@859
-				vertices   	(list Points
-				    (288, 561)
-				    (288, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @884
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@884
-				    location   	(460, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @885
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@885
-				    location   	(1658, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	396
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	414
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @886
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 960)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@886
-				    location   	(450, 917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @887
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@887
-				    location   	(110, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @888
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@887
-				supplier   	@859
-				line_style 	3
-				origin_attachment 	(221, 617)
-				terminal_attachment 	(221, 561)
-				drawSupplier 	@883)
-			    (object InheritView "" @889
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@884
-				supplier   	@859
-				line_style 	3
-				origin_attachment 	(589, 617)
-				terminal_attachment 	(589, 561)
-				drawSupplier 	@883)
-			    (object InheritView "" @890
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@861
-				supplier   	@862
-				line_style 	3
-				origin_attachment 	(1016, 617)
-				terminal_attachment 	(1016, 561)
-				drawSupplier 	@863)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @891
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@891
-				    location   	(1590, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	486
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @892
-				location   	(1824, 1089)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@891
-				vertices   	(list Points
-				    (1824, 1089)
-				    (1824, 999)))
-			    (object InheritView "" @893
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8DC0381"
-				client     	@864
-				supplier   	@891
-				line_style 	3
-				origin_attachment 	(1666, 1145)
-				terminal_attachment 	(1666, 1089)
-				drawSupplier 	@892)
-			    (object InheritView "" @894
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@866
-				supplier   	@891
-				line_style 	3
-				origin_attachment 	(1934, 1145)
-				terminal_attachment 	(1934, 1089)
-				drawSupplier 	@892)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @895
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@895
-				    location   	(1630, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	438
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @896
-				location   	(1762, 819)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@895
-				vertices   	(list Points
-				    (1762, 819)
-				    (1762, 727)))
-			    (object InheritView "" @897
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@865
-				supplier   	@895
-				line_style 	3
-				origin_attachment 	(1416, 889)
-				terminal_attachment 	(1416, 819)
-				drawSupplier 	@896)
-			    (object InheritView "" @898
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@895
-				supplier   	@862
-				line_style 	3
-				origin_attachment 	(1756, 617)
-				terminal_attachment 	(1756, 561)
-				drawSupplier 	@863)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @899
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1120, 144)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@899
-				    location   	(875, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @900
-				location   	(1120, 289)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@899
-				vertices   	(list Points
-				    (1120, 289)
-				    (1120, 199)))
-			    (object AssociationViewNew "$UNNAMED$104" @901
-				location   	(1485, 215)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B0803C7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "container" @902
-					Parent_View 	@901
-					location   	(989, 103)
-					label      	(object SegLabel @903
-					    Parent_View 	@902
-					    location   	(1604, 210)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+container"
-					    pctDist    	0.033113
-					    height     	119
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CE"
-					client     	@901
-					supplier   	@899
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 176)
-					    (1374, 176))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1374, 176)
-					label      	(object SegLabel @904
-					    Parent_View 	@902
-					    location   	(1435, 226)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	69
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.602649
-					    height     	50
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$105" @905
-					Parent_View 	@901
-					location   	(989, 103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CF"
-					client     	@901
-					supplier   	@899
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 254)
-					    (1345, 254)
-					    (1345, 199))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1345, 199))))
-			    (object AssociationViewNew "$UNNAMED$106" @906
-				location   	(773, 216)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B480261"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootContainer" @907
-					Parent_View 	@906
-					location   	(53, 104)
-					label      	(object SegLabel @908
-					    Parent_View 	@907
-					    location   	(614, 217)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+rootContainer"
-					    pctDist    	-0.025000
-					    height     	160
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0285"
-					client     	@906
-					supplier   	@899
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 176)
-					    (866, 176))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(866, 176)
-					label      	(object SegLabel @909
-					    Parent_View 	@907
-					    location   	(800, 228)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.300000
-					    height     	27
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$107" @910
-					Parent_View 	@906
-					location   	(53, 104)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0286"
-					client     	@906
-					supplier   	@899
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 257)
-					    (895, 257)
-					    (895, 199))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(895, 199))))
-			    (object InheritView "" @911
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@862
-				supplier   	@899
-				line_style 	3
-				origin_attachment 	(1367, 361)
-				terminal_attachment 	(1367, 289)
-				drawSupplier 	@900)
-			    (object InheritView "" @912
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D8E200EA"
-				client     	@860
-				supplier   	@899
-				line_style 	3
-				origin_attachment 	(752, 361)
-				terminal_attachment 	(752, 289)
-				drawSupplier 	@900)
-			    (object InheritView "" @913
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@859
-				supplier   	@899
-				line_style 	3
-				origin_attachment 	(299, 361)
-				terminal_attachment 	(299, 289)
-				drawSupplier 	@900)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @914
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@914
-				    location   	(61, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @915
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@914
-				supplier   	@887
-				line_style 	3
-				origin_attachment 	(216, 1145)
-				terminal_attachment 	(216, 727))
-			    (object AssociationViewNew "$UNNAMED$218" @916
-				location   	(1382, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$219" @917
-					Parent_View 	@916
-					location   	(1190, 225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@916
-					supplier   	@891
-					vertices   	(list Points
-					    (1382, 1425)
-					    (2147, 1425)
-					    (2147, 943)
-					    (2067, 943))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(2067, 943))
-				    (object RoleView "incorporatedSchema" @918
-					Parent_View 	@916
-					location   	(1190, 225)
-					label      	(object SegLabel @919
-					    Parent_View 	@918
-					    location   	(445, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.706546
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@916
-					supplier   	@914
-					vertices   	(list Points
-					    (1382, 1425)
-					    (225, 1425)
-					    (225, 1255))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(225, 1255)
-					label      	(object SegLabel @920
-					    Parent_View 	@918
-					    location   	(183, 1392)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.896915
-					    height     	43
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$216" @921
-				location   	(1505, 1503)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$217" @922
-					Parent_View 	@921
-					location   	(1313, 303)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@921
-					supplier   	@895
-					vertices   	(list Points
-					    (1505, 1503)
-					    (2188, 1503)
-					    (2188, 675)
-					    (2059, 675))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(2059, 675))
-				    (object RoleView "resolvedSchema" @923
-					Parent_View 	@921
-					location   	(1313, 303)
-					label      	(object SegLabel @924
-					    Parent_View 	@923
-					    location   	(303, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.733333
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@921
-					supplier   	@914
-					vertices   	(list Points
-					    (1505, 1503)
-					    (113, 1503)
-					    (113, 1255))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(113, 1255)
-					label      	(object SegLabel @925
-					    Parent_View 	@923
-					    location   	(73, 1472)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.867683
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$108" @926
-				location   	(66, 244)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751C310356"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$109" @927
-					Parent_View 	@926
-					location   	(-94, -444)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C330331"
-					client     	@926
-					supplier   	@899
-					vertices   	(list Points
-					    (66, 244)
-					    (66, 144)
-					    (866, 144))
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(866, 144))
-				    (object RoleView "schema" @928
-					Parent_View 	@926
-					location   	(-94, -444)
-					label      	(object SegLabel @929
-					    Parent_View 	@928
-					    location   	(165, 93)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	-0.168113
-					    height     	99
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C33033B"
-					client     	@926
-					supplier   	@914
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(66, 1145)
-					label      	(object SegLabel @930
-					    Parent_View 	@928
-					    location   	(136, 184)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	113
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.066593
-					    height     	70
-					    orientation 	0))))
-			    (object InheritView "" @931
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B780BD90059"
-				client     	@885
-				supplier   	@899
-				line_style 	3
-				origin_attachment 	(1759, 361)
-				terminal_attachment 	(1759, 289)
-				drawSupplier 	@900)
-			    (object InheritView "" @932
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@867
-				supplier   	@859
-				line_style 	3
-				origin_attachment 	(400, 1141)
-				terminal_attachment 	(400, 561)
-				drawSupplier 	@883)
-			    (object InheritTreeView "" @933
-				location   	(1012, 837)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@861
-				vertices   	(list Points
-				    (1012, 837)
-				    (1012, 727)))
-			    (object InheritView "" @934
-				stereotype 	(object SegLabel @935
-				    Parent_View 	@934
-				    location   	(1071, 871)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.888158
-				    height     	34
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B7FD4E20366"
-				client     	@867
-				supplier   	@861
-				line_style 	3
-				origin_attachment 	(1037, 1141)
-				terminal_attachment 	(1037, 837)
-				drawSupplier 	@933)
-			    (object InheritView "" @936
-				stereotype 	(object SegLabel @937
-				    Parent_View 	@936
-				    location   	(890, 865)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	263
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.581633
-				    height     	36
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B7FD4BA023C"
-				client     	@886
-				supplier   	@861
-				line_style 	3
-				origin_attachment 	(925, 905)
-				terminal_attachment 	(925, 837)
-				drawSupplier 	@933)
-			    (object InheritView "" @938
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@891
-				supplier   	@895
-				line_style 	3
-				origin_attachment 	(1828, 889)
-				terminal_attachment 	(1828, 819)
-				drawSupplier 	@896)))
-		    (object ClassDiagram "7. Concrete Attributes"
-			quid       	"3B9F8F7602C7"
-			title      	"7. Concrete Attributes"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @939
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@939
-				    location   	(1938, 1359)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@939
-				    location   	(1938, 1419)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	382
-				    compartmentItems 	(list Compartment
-					"+ form : XSDForm"
-					"+ lexicalValue : String"))
-				width      	430
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDForm" @940
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2560, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@940
-				    location   	(2398, 1365)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDForm")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@940
-				    location   	(2398, 1315)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B9F913B01EB"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @941
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 96)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@941
-				    location   	(40, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	657
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				compartment 	(object Compartment
-				    Parent_View 	@941
-				    location   	(40, 97)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	446
-				    compartmentItems 	(list Compartment
-					"+ element : DOMElement"))
-				width      	675
-				height     	143
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @942
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@942
-				    location   	(687, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	322
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	340
-				height     	126
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @943
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@943
-				    location   	(1678, 892)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	470
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @944
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 1408)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@944
-				    location   	(1328, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @945
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(864, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@945
-				    location   	(745, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	256
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @946
-				location   	(850, 537)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@942
-				vertices   	(list Points
-				    (850, 537)
-				    (850, 447)))
-			    (object ClassView "Class" "Logical View::xsd::DOMElement" @947
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1248, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@947
-				    location   	(873, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"DOMElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@947
-				    location   	(873, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3B8189790200"
-				width      	769
-				height     	200
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @948
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 640)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@948
-				    location   	(41, 584)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	512
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @949
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@949
-				    location   	(38, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	422
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @950
-				location   	(368, 263)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@941
-				vertices   	(list Points
-				    (368, 263)
-				    (368, 167)))
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @951
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@951
-				    location   	(723, 1347)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@951
-				    location   	(723, 1297)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@951
-				    location   	(723, 1407)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	225
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	556
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @952
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@952
-				    location   	(614, 1708)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@952
-				    location   	(614, 1658)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@952
-				    location   	(614, 1768)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	198
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	550
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @953
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@953
-				    location   	(532, 2040)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	760
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@953
-				    location   	(532, 2100)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	723
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDSimpleFinal"))
-				width      	778
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @954
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@954
-				    location   	(45, 1875)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@954
-				    location   	(45, 1825)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				width      	344
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @955
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2544, 2016)
-				label      	(object ItemLabel
-				    Parent_View 	@955
-				    location   	(2362, 1932)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@955
-				    location   	(2362, 1882)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				width      	382
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @956
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@956
-				    location   	(41, 1279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	622
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@956
-				    location   	(41, 1339)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	588
-				    compartmentItems 	(list Compartment
-					"+ use : XSDAttributeUseCategory"
-					"+ lexicalValue : String"))
-				width      	640
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUseCategory" @957
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@957
-				    location   	(41, 1548)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDAttributeUseCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@957
-				    location   	(41, 1498)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BA7B0E801A8"
-				width      	512
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @958
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2608, 928)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@958
-				    location   	(2498, 881)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	220
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	238
-				height     	119
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @959
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2240, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@959
-				    location   	(1757, 1631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	966
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@959
-				    location   	(1757, 1691)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	934
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDProhibitedSubstitutions"
-					"<<0..*>> + block : XSDDisallowedSubstitutions"))
-				width      	984
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @960
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@960
-				    location   	(1828, 1096)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	888
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@960
-				    location   	(1828, 1156)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	852
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalNamespaceConstraint : String"))
-				width      	906
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @961
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@961
-				    location   	(622, 777)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	996
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	1014
-				height     	486
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @962
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@962
-				    location   	(37, 904)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	424
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @963
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1344, 656)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@963
-				    location   	(1138, 600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@963
-				    location   	(1138, 660)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	378
-				    compartmentItems 	(list Compartment
-					"+ lexicalValue : String"))
-				width      	430
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @964
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(1410, 1942)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	860
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@964
-				    location   	(1410, 2002)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	822
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDComplexFinal"
-					"<<0..*>> + block : XSDProhibitedSubstitutions"
-					"+ mixed : boolean"))
-				width      	878
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @965
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1488, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@965
-				    location   	(1304, 1644)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @966
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@965
-				supplier   	@944
-				line_style 	3
-				origin_attachment 	(1506, 1632)
-				terminal_attachment 	(1506, 1472))
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @967
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2208, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@967
-				    location   	(1758, 598)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	900
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	918
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @968
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@958
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(2696, 869)
-				terminal_attachment 	(2696, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @969
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@959
-				supplier   	@939
-				line_style 	3
-				origin_attachment 	(2094, 1619)
-				terminal_attachment 	(2094, 1533))
-			    (object InheritTreeView "" @970
-				location   	(1487, 1856)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@965
-				vertices   	(list Points
-				    (1487, 1856)
-				    (1487, 1760)))
-			    (object ClassView "Class" "Logical View::xsd::DOMAttr" @971
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@971
-				    location   	(2080, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"DOMAttr")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@971
-				    location   	(2080, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BBF8C8901B6"
-				width      	658
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @972
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@964
-				supplier   	@965
-				line_style 	3
-				origin_attachment 	(1734, 1930)
-				terminal_attachment 	(1734, 1856)
-				drawSupplier 	@970)
-			    (object InheritView "" @973
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@963
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(1328, 588)
-				terminal_attachment 	(1328, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @974
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@967
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(2190, 586)
-				terminal_attachment 	(2190, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @975
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@948
-				supplier   	@949
-				line_style 	3
-				origin_attachment 	(222, 572)
-				terminal_attachment 	(222, 447))
-			    (object InheritView "" @976
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@949
-				supplier   	@941
-				line_style 	3
-				origin_attachment 	(260, 321)
-				terminal_attachment 	(260, 263)
-				drawSupplier 	@950)
-			    (object InheritView "" @977
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@962
-				supplier   	@948
-				line_style 	3
-				origin_attachment 	(223, 892)
-				terminal_attachment 	(223, 708))
-			    (object InheritView "" @978
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@960
-				supplier   	@958
-				line_style 	3
-				origin_attachment 	(2600, 1084)
-				terminal_attachment 	(2600, 987))
-			    (object ClassView "Class" "Logical View::xsd::DOMDocument" @979
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@979
-				    location   	(1957, 94)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"DOMDocument")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@979
-				    location   	(1957, 44)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C27850E0381"
-				width      	776
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @980
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@942
-				supplier   	@941
-				line_style 	3
-				origin_attachment 	(856, 321)
-				terminal_attachment 	(856, 263)
-				drawSupplier 	@950)
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @981
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@981
-				    location   	(1234, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@981
-				    location   	(1234, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @982
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@945
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(850, 561)
-				terminal_attachment 	(850, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @983
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@956
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(575, 1267)
-				terminal_attachment 	(575, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @984
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@943
-				supplier   	@942
-				line_style 	3
-				origin_attachment 	(1694, 880)
-				terminal_attachment 	(1694, 537)
-				drawSupplier 	@946)
-			    (object InheritView "" @985
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@961
-				supplier   	@945
-				line_style 	3
-				origin_attachment 	(856, 765)
-				terminal_attachment 	(856, 687))
-			    (object InheritTreeView "" @986
-				location   	(1703, 1290)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@943
-				vertices   	(list Points
-				    (1703, 1290)
-				    (1703, 1008)))
-			    (object InheritView "" @987
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@944
-				supplier   	@943
-				line_style 	3
-				origin_attachment 	(1503, 1344)
-				terminal_attachment 	(1503, 1290)
-				drawSupplier 	@986)
-			    (object InheritView "" @988
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@939
-				supplier   	@943
-				line_style 	3
-				origin_attachment 	(2093, 1347)
-				terminal_attachment 	(2093, 1290)
-				drawSupplier 	@986)
-			    (object InheritView "" @989
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@953
-				supplier   	@965
-				line_style 	3
-				origin_attachment 	(1253, 2028)
-				terminal_attachment 	(1253, 1856)
-				drawSupplier 	@970)))
-		    (object ClassDiagram "8. Concrete Containment"
-			quid       	"3B6A8097027A"
-			title      	"8. Concrete Containment"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @990
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2672, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@990
-				    location   	(2439, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @991
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2640, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@991
-				    location   	(2431, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @992
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@992
-				    location   	(2013, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @993
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@993
-				    location   	(1854, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	438
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @994
-				location   	(1943, 868)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@993
-				vertices   	(list Points
-				    (1943, 868)
-				    (1943, 631)))
-			    (object AssociationViewNew "$UNNAMED$164" @995
-				location   	(2125, 680)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE8240051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$165" @996
-					Parent_View 	@995
-					location   	(157, 344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602AD"
-					client     	@995
-					supplier   	@992
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 729))
-				    (object RoleView "contents" @997
-					Parent_View 	@995
-					location   	(157, 344)
-					label      	(object SegLabel @998
-					    Parent_View 	@997
-					    location   	(2255, 671)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.175439
-					    height     	130
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602B7"
-					client     	@995
-					supplier   	@993
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 631)
-					label      	(object SegLabel @999
-					    Parent_View 	@997
-					    location   	(2067, 671)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.175439
-					    height     	59
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @1000
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1000
-				    location   	(148, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1001
-				location   	(272, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1000
-				vertices   	(list Points
-				    (272, 465)
-				    (272, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1002
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1002
-				    location   	(2372, 1121)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	569
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	587
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @1003
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1003
-				    location   	(89, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$152" @1004
-				location   	(1170, 1356)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "modelGroup" @1005
-					Parent_View 	@1004
-					location   	(866, -20)
-					label      	(object SegLabel @1006
-					    Parent_View 	@1005
-					    location   	(269, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.534044
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@1004
-					supplier   	@1003
-					vertices   	(list Points
-					    (1170, 1356)
-					    (206, 1356)
-					    (206, 631))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(206, 631)
-					label      	(object SegLabel @1007
-					    Parent_View 	@1005
-					    location   	(226, 1322)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.559146
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$153" @1008
-					Parent_View 	@1004
-					location   	(866, -20)
-					label      	(object SegLabel @1009
-					    Parent_View 	@1008
-					    location   	(2521, 1398)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@1004
-					supplier   	@1002
-					vertices   	(list Points
-					    (1170, 1356)
-					    (2731, 1356)
-					    (2731, 1227))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(2731, 1227))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1010
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(160, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1010
-				    location   	(35, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$146" @1011
-				location   	(122, 1136)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6BCEB102F8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$147" @1012
-					Parent_View 	@1011
-					location   	(-630, -256)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB6001B"
-					client     	@1011
-					supplier   	@1003
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 631))
-				    (object RoleView "contents" @1013
-					Parent_View 	@1011
-					location   	(-630, -256)
-					label      	(object SegLabel @1014
-					    Parent_View 	@1013
-					    location   	(223, 1515)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.750495
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB60025"
-					client     	@1011
-					supplier   	@1010
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 1641)
-					label      	(object SegLabel @1015
-					    Parent_View 	@1013
-					    location   	(180, 1581)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.881188
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @1016
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1016
-				    location   	(41, 42)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	495
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	513
-				height     	100
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$158" @1017
-				location   	(47, 885)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B47150119"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$159" @1018
-					Parent_View 	@1017
-					location   	(-289, 821)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03AB"
-					client     	@1017
-					supplier   	@1010
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 1641))
-				    (object RoleView "content" @1019
-					Parent_View 	@1017
-					location   	(-289, 821)
-					label      	(object SegLabel @1020
-					    Parent_View 	@1019
-					    location   	(142, 189)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.921854
-					    height     	95
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03B5"
-					client     	@1017
-					supplier   	@1016
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 130)
-					label      	(object SegLabel @1021
-					    Parent_View 	@1019
-					    location   	(28, 192)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.917881
-					    height     	19
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @1022
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1022
-				    location   	(1252, 849)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	345
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	363
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1023
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1023
-				    location   	(1175, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$88" @1024
-				location   	(1319, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6F1DE9018A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$89" @1025
-					Parent_View 	@1024
-					location   	(-57, -102)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA036C"
-					client     	@1024
-					supplier   	@1022
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 955))
-				    (object RoleView "content" @1026
-					Parent_View 	@1024
-					location   	(-57, -102)
-					label      	(object SegLabel @1027
-					    Parent_View 	@1026
-					    location   	(1439, 1039)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.073171
-					    height     	120
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA0380"
-					client     	@1024
-					supplier   	@1023
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 1113)
-					label      	(object SegLabel @1028
-					    Parent_View 	@1026
-					    location   	(1279, 1031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.040816
-					    height     	41
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @1029
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1029
-				    location   	(1855, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1030
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1030
-				    location   	(1035, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$184" @1031
-				location   	(1351, 1840)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5CA50112"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$185" @1032
-					Parent_View 	@1031
-					location   	(-297, 224)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703B4"
-					client     	@1031
-					supplier   	@1030
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1294, 1840)
-					    (1294, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1294, 1751))
-				    (object RoleView "contents" @1033
-					Parent_View 	@1031
-					location   	(-297, 224)
-					label      	(object SegLabel @1034
-					    Parent_View 	@1033
-					    location   	(1517, 1806)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.632653
-					    height     	108
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703C8"
-					client     	@1031
-					supplier   	@1030
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1409, 1840)
-					    (1409, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1409, 1751)
-					label      	(object SegLabel @1035
-					    Parent_View 	@1033
-					    location   	(1361, 1801)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.072848
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$68" @1036
-				location   	(1190, 1432)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6890D6006F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1037
-					Parent_View 	@1036
-					location   	(774, -1832)
-					label      	(object SegLabel @1038
-					    Parent_View 	@1037
-					    location   	(1462, 1525)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.444976
-					    height     	272
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D60318"
-					client     	@1036
-					supplier   	@1030
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1641)
-					label      	(object SegLabel @1039
-					    Parent_View 	@1037
-					    location   	(1143, 1527)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.454545
-					    height     	47
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$69" @1040
-					Parent_View 	@1036
-					location   	(774, -1832)
-					label      	(object SegLabel @1041
-					    Parent_View 	@1040
-					    location   	(1149, 1266)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D6030E"
-					client     	@1036
-					supplier   	@1023
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1223))))
-			    (object AssociationViewNew "$UNNAMED$186" @1042
-				location   	(1690, 1684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C35AD0374"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facetContents" @1043
-					Parent_View 	@1042
-					location   	(-326, -12)
-					label      	(object SegLabel @1044
-					    Parent_View 	@1043
-					    location   	(1695, 1731)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+facetContents"
-					    pctDist    	0.032051
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0010"
-					client     	@1042
-					supplier   	@1029
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1846, 1684)
-					label      	(object SegLabel @1045
-					    Parent_View 	@1043
-					    location   	(1756, 1644)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	94
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420732
-					    height     	41
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$187" @1046
-					Parent_View 	@1042
-					location   	(-326, -12)
-					label      	(object SegLabel @1047
-					    Parent_View 	@1046
-					    location   	(1566, 1643)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0006"
-					client     	@1042
-					supplier   	@1030
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1534, 1684))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1048
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2624, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1048
-				    location   	(2388, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @1049
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1049
-				    location   	(1108, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1050
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@1050
-				    location   	(557, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$166" @1051
-				location   	(963, 319)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B688E6B003D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1052
-					Parent_View 	@1051
-					location   	(595, -17)
-					label      	(object SegLabel @1053
-					    Parent_View 	@1052
-					    location   	(974, 361)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.081081
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0111"
-					client     	@1051
-					supplier   	@1049
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(1099, 319)
-					label      	(object SegLabel @1054
-					    Parent_View 	@1052
-					    location   	(1016, 290)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.396396
-					    height     	30
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$167" @1055
-					Parent_View 	@1051
-					location   	(595, -17)
-					label      	(object SegLabel @1056
-					    Parent_View 	@1055
-					    location   	(855, 361)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0107"
-					client     	@1051
-					supplier   	@1050
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(828, 319))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1057
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1057
-				    location   	(1974, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1058
-				location   	(2322, 1593)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1057
-				vertices   	(list Points
-				    (2322, 1593)
-				    (2322, 1047)))
-			    (object InheritView "" @1059
-				stereotype 	(object SegLabel @1060
-				    Parent_View 	@1059
-				    location   	(2146, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.460000
-				    height     	5
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2F5013A"
-				client     	@1057
-				supplier   	@993
-				line_style 	3
-				origin_attachment 	(2150, 937)
-				terminal_attachment 	(2150, 868)
-				drawSupplier 	@994)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1061
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1061
-				    location   	(510, 532)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	644
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	662
-				height     	112
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$112" @1062
-				location   	(1498, 1431)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68911401AF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1063
-					Parent_View 	@1062
-					location   	(1038, -1810)
-					label      	(object SegLabel @1064
-					    Parent_View 	@1063
-					    location   	(2027, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.454389
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150017"
-					client     	@1062
-					supplier   	@1057
-					vertices   	(list Points
-					    (1498, 1431)
-					    (2281, 1431)
-					    (2281, 1047))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(2281, 1047)
-					label      	(object SegLabel @1065
-					    Parent_View 	@1063
-					    location   	(2204, 1397)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.605419
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$113" @1066
-					Parent_View 	@1062
-					location   	(1038, -1810)
-					label      	(object SegLabel @1067
-					    Parent_View 	@1066
-					    location   	(1090, 866)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150016"
-					client     	@1062
-					supplier   	@1061
-					vertices   	(list Points
-					    (1498, 1431)
-					    (1131, 1431)
-					    (1131, 632))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(1131, 632))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @1068
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1068
-				    location   	(655, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	386
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	404
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @1069
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1069
-				    location   	(505, 853)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$116" @1070
-				location   	(534, 736)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "identityConstraintDefinitions" @1071
-					Parent_View 	@1070
-					location   	(86, -2144)
-					label      	(object SegLabel @1072
-					    Parent_View 	@1071
-					    location   	(820, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	550
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.111111
-					    height     	286
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@1070
-					supplier   	@1069
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 841)
-					label      	(object SegLabel @1073
-					    Parent_View 	@1071
-					    location   	(595, 807)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.675926
-					    height     	61
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$117" @1074
-					Parent_View 	@1070
-					location   	(86, -2144)
-					label      	(object SegLabel @1075
-					    Parent_View 	@1074
-					    location   	(576, 653)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@1070
-					supplier   	@1061
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 632))))
-			    (object AssociationViewNew "$UNNAMED$136" @1076
-				location   	(900, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "selector" @1077
-					Parent_View 	@1076
-					location   	(84, 120)
-					label      	(object SegLabel @1078
-					    Parent_View 	@1077
-					    location   	(1013, 1042)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.123288
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@1076
-					supplier   	@1068
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 1113)
-					label      	(object SegLabel @1079
-					    Parent_View 	@1077
-					    location   	(859, 1040)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.095890
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$137" @1080
-					Parent_View 	@1076
-					location   	(84, 120)
-					label      	(object SegLabel @1081
-					    Parent_View 	@1080
-					    location   	(859, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@1076
-					supplier   	@1069
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 951))))
-			    (object AssociationViewNew "$UNNAMED$138" @1082
-				location   	(700, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fields" @1083
-					Parent_View 	@1082
-					location   	(-116, 120)
-					label      	(object SegLabel @1084
-					    Parent_View 	@1083
-					    location   	(616, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.054795
-					    height     	85
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@1082
-					supplier   	@1068
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 1113)
-					label      	(object SegLabel @1085
-					    Parent_View 	@1083
-					    location   	(771, 1042)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.123077
-					    height     	71
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$139" @1086
-					Parent_View 	@1082
-					location   	(-116, 120)
-					label      	(object SegLabel @1087
-					    Parent_View 	@1086
-					    location   	(659, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@1082
-					supplier   	@1069
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 951))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @1088
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1088
-				    location   	(500, 1397)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1089
-				location   	(550, 1590)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1088
-				vertices   	(list Points
-				    (550, 1590)
-				    (550, 1495)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @1090
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1090
-				    location   	(1240, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1091
-				location   	(1406, 765)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1090
-				vertices   	(list Points
-				    (1406, 765)
-				    (1406, 631)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1092
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1092
-				    location   	(2393, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$94" @1093
-				location   	(1614, 1868)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6FDDD70113"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$95" @1094
-					Parent_View 	@1093
-					location   	(526, 476)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA026B"
-					client     	@1093
-					supplier   	@1092
-					vertices   	(list Points
-					    (1614, 1868)
-					    (2500, 1868)
-					    (2500, 1751))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(2500, 1751))
-				    (object RoleView "content" @1095
-					Parent_View 	@1093
-					location   	(526, 476)
-					label      	(object SegLabel @1096
-					    Parent_View 	@1095
-					    location   	(896, 1787)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.709870
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA0275"
-					client     	@1093
-					supplier   	@1088
-					vertices   	(list Points
-					    (1614, 1868)
-					    (984, 1868)
-					    (984, 1495))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(984, 1495)
-					label      	(object SegLabel @1097
-					    Parent_View 	@1095
-					    location   	(1042, 1824)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.571286
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$100" @1098
-				location   	(2927, 387)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B698E360386"
-				roleview_list 	(list RoleViews
-				    (object RoleView "attributeContents" @1099
-					Parent_View 	@1098
-					location   	(2463, -3757)
-					label      	(object SegLabel @1100
-					    Parent_View 	@1099
-					    location   	(1915, 357)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeContents"
-					    pctDist    	0.773060
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E38007C"
-					client     	@1098
-					supplier   	@1090
-					vertices   	(list Points
-					    (2927, 387)
-					    (1750, 387)
-					    (1750, 521))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(1750, 521)
-					label      	(object SegLabel @1101
-					    Parent_View 	@1099
-					    location   	(1804, 425)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.857247
-					    height     	38
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$101" @1102
-					Parent_View 	@1098
-					location   	(2463, -3757)
-					label      	(object SegLabel @1103
-					    Parent_View 	@1102
-					    location   	(2946, 1448)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E380072"
-					client     	@1098
-					supplier   	@1092
-					vertices   	(list Points
-					    (2927, 387)
-					    (2987, 387)
-					    (2987, 1671)
-					    (2928, 1671))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(2928, 1671))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1104
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1104
-				    location   	(1699, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$76" @1105
-				location   	(1750, 872)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69404E0067"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1106
-					Parent_View 	@1105
-					location   	(1462, -2392)
-					label      	(object SegLabel @1107
-					    Parent_View 	@1106
-					    location   	(1640, 691)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.751037
-					    height     	110
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69405002A5"
-					client     	@1105
-					supplier   	@1090
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 631)
-					label      	(object SegLabel @1108
-					    Parent_View 	@1106
-					    location   	(1814, 695)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.734440
-					    height     	64
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$77" @1109
-					Parent_View 	@1105
-					location   	(1462, -2392)
-					label      	(object SegLabel @1110
-					    Parent_View 	@1109
-					    location   	(1709, 1065)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B694050029B"
-					client     	@1105
-					supplier   	@1104
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 1113))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1111
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1111
-				    location   	(279, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$208" @1112
-				location   	(1252, 1896)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BEBDC870247"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$209" @1113
-					Parent_View 	@1112
-					location   	(708, 1288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C02F9"
-					client     	@1112
-					supplier   	@1092
-					vertices   	(list Points
-					    (1252, 1896)
-					    (2603, 1896)
-					    (2603, 1751))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(2603, 1751))
-				    (object RoleView "attributeWildcardContent" @1114
-					Parent_View 	@1112
-					location   	(708, 1288)
-					label      	(object SegLabel @1115
-					    Parent_View 	@1114
-					    location   	(682, 1858)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.381142
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C0303"
-					client     	@1112
-					supplier   	@1111
-					vertices   	(list Points
-					    (1252, 1896)
-					    (428, 1896)
-					    (428, 1223))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(428, 1223)
-					label      	(object SegLabel @1116
-					    Parent_View 	@1114
-					    location   	(382, 1860)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.575033
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$80" @1117
-				location   	(1199, 1321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C275D320220"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$81" @1118
-					Parent_View 	@1117
-					location   	(655, 713)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010C"
-					client     	@1117
-					supplier   	@1104
-					vertices   	(list Points
-					    (1199, 1321)
-					    (1897, 1321)
-					    (1897, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(1897, 1223))
-				    (object RoleView "attributeWildcardContent" @1119
-					Parent_View 	@1117
-					location   	(655, 713)
-					label      	(object SegLabel @1120
-					    Parent_View 	@1119
-					    location   	(857, 1279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.429569
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010D"
-					client     	@1117
-					supplier   	@1111
-					vertices   	(list Points
-					    (1199, 1321)
-					    (500, 1321)
-					    (500, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(500, 1223)
-					label      	(object SegLabel @1121
-					    Parent_View 	@1119
-					    location   	(576, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.782305
-					    height     	43
-					    orientation 	1))))
-			    (object InheritView "" @1122
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1092
-				supplier   	@1057
-				line_style 	3
-				origin_attachment 	(2606, 1641)
-				terminal_attachment 	(2606, 1593)
-				drawSupplier 	@1058)
-			    (object InheritView "" @1123
-				stereotype 	(object SegLabel @1124
-				    Parent_View 	@1123
-				    location   	(759, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.446429
-				    height     	6
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@1061
-				supplier   	@1000
-				line_style 	3
-				origin_attachment 	(753, 520)
-				terminal_attachment 	(753, 465)
-				drawSupplier 	@1001)
-			    (object InheritView "" @1125
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1030
-				supplier   	@1057
-				line_style 	3
-				origin_attachment 	(1409, 1641)
-				terminal_attachment 	(1409, 1593)
-				drawSupplier 	@1058)
-			    (object InheritView "" @1126
-				stereotype 	(object SegLabel @1127
-				    Parent_View 	@1126
-				    location   	(759, 1591)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	219
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.980392
-				    height     	385
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@1030
-				supplier   	@1088
-				line_style 	3
-				origin_attachment 	(1144, 1641)
-				terminal_attachment 	(1144, 1590)
-				drawSupplier 	@1089)
-			    (object InheritView "" @1128
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@1003
-				supplier   	@1000
-				line_style 	3
-				origin_attachment 	(166, 521)
-				terminal_attachment 	(166, 465)
-				drawSupplier 	@1001)
-			    (object InheritTreeView "" @1129
-				location   	(431, 222)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1016
-				vertices   	(list Points
-				    (431, 222)
-				    (431, 130)))
-			    (object InheritView "" @1130
-				stereotype 	(object SegLabel @1131
-				    Parent_View 	@1130
-				    location   	(361, 224)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	237
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.976744
-				    height     	86
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6BD2440069"
-				client     	@1000
-				supplier   	@1016
-				line_style 	3
-				origin_attachment 	(275, 265)
-				terminal_attachment 	(275, 222)
-				drawSupplier 	@1129)
-			    (object InheritTreeView "" @1132
-				location   	(1309, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1049
-				vertices   	(list Points
-				    (1309, 465)
-				    (1309, 375)))
-			    (object InheritView "" @1133
-				stereotype 	(object SegLabel @1134
-				    Parent_View 	@1133
-				    location   	(941, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.464286
-				    height     	10
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E660339"
-				client     	@1061
-				supplier   	@1049
-				line_style 	3
-				origin_attachment 	(931, 520)
-				terminal_attachment 	(931, 465)
-				drawSupplier 	@1132)
-			    (object InheritView "" @1135
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@1010
-				supplier   	@1088
-				line_style 	3
-				origin_attachment 	(250, 1641)
-				terminal_attachment 	(250, 1590)
-				drawSupplier 	@1089)
-			    (object InheritView "" @1136
-				stereotype 	(object SegLabel @1137
-				    Parent_View 	@1136
-				    location   	(1205, 493)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.958333
-				    height     	8
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E6103BE"
-				client     	@1023
-				supplier   	@1049
-				line_style 	3
-				origin_attachment 	(1197, 1113)
-				terminal_attachment 	(1197, 465)
-				drawSupplier 	@1132)
-			    (object InheritView "" @1138
-				stereotype 	(object SegLabel @1139
-				    Parent_View 	@1138
-				    location   	(1951, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.848980
-				    height     	73
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6AE2EB02A8"
-				client     	@1104
-				supplier   	@993
-				line_style 	3
-				origin_attachment 	(1878, 1113)
-				terminal_attachment 	(1878, 868)
-				drawSupplier 	@994)
-			    (object InheritView "" @1140
-				stereotype 	(object SegLabel @1141
-				    Parent_View 	@1140
-				    location   	(1642, 807)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.879310
-				    height     	61
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B69403A0221"
-				client     	@1104
-				supplier   	@1090
-				line_style 	3
-				origin_attachment 	(1703, 1113)
-				terminal_attachment 	(1703, 765)
-				drawSupplier 	@1091)
-			    (object InheritView "" @1142
-				stereotype 	(object SegLabel @1143
-				    Parent_View 	@1142
-				    location   	(1354, 801)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.500000
-				    height     	70
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B72D737038F"
-				client     	@1022
-				supplier   	@1090
-				line_style 	3
-				origin_attachment 	(1284, 837)
-				terminal_attachment 	(1284, 765)
-				drawSupplier 	@1091)
-			    (object InheritView "" @1144
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@992
-				supplier   	@1048
-				line_style 	3
-				origin_attachment 	(2284, 762)
-				terminal_attachment 	(2379, 762))
-			    (object InheritView "" @1145
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@991
-				supplier   	@1049
-				line_style 	3
-				origin_attachment 	(2637, 521)
-				terminal_attachment 	(2637, 465)
-				drawSupplier 	@1132)
-			    (object InheritView "" @1146
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1048
-				supplier   	@991
-				line_style 	3
-				origin_attachment 	(2637, 729)
-				terminal_attachment 	(2637, 631))
-			    (object InheritView "" @1147
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@993
-				supplier   	@1049
-				line_style 	3
-				origin_attachment 	(1950, 521)
-				terminal_attachment 	(1950, 465)
-				drawSupplier 	@1132)
-			    (object InheritView "" @1148
-				stereotype 	(object SegLabel @1149
-				    Parent_View 	@1148
-				    location   	(2821, 897)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	181
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.087719
-				    height     	76
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B688E4F023C"
-				client     	@990
-				supplier   	@1049
-				line_style 	3
-				origin_attachment 	(2896, 937)
-				terminal_attachment 	(2896, 465)
-				drawSupplier 	@1132)
-			    (object InheritView "" @1150
-				stereotype 	(object SegLabel @1151
-				    Parent_View 	@1150
-				    location   	(2313, 904)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	207
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.850622
-				    height     	68
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2E20381"
-				client     	@1002
-				supplier   	@993
-				line_style 	3
-				origin_attachment 	(2381, 1109)
-				terminal_attachment 	(2381, 868)
-				drawSupplier 	@994)
-			    (object InheritView "" @1152
-				stereotype 	(object SegLabel @1153
-				    Parent_View 	@1152
-				    location   	(2878, 269)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.946667
-				    height     	66
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6BD2550385"
-				client     	@1002
-				supplier   	@1016
-				line_style 	3
-				origin_attachment 	(2943, 1109)
-				terminal_attachment 	(2943, 222)
-				drawSupplier 	@1129)
-			    (object InheritView "" @1154
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@1111
-				supplier   	@1000
-				line_style 	3
-				origin_attachment 	(462, 1113)
-				terminal_attachment 	(462, 465)
-				drawSupplier 	@1001)))
-		    (object ClassDiagram "9. Concrete Schema Composition"
-			quid       	"3C25EB7A038C"
-			title      	"9. Concrete Schema Composition"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1155
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1155
-				    location   	(73, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	480
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$118" @1156
-				location   	(228, 1695)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B41E60251"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$119" @1157
-					Parent_View 	@1156
-					location   	(-476, -385)
-					label      	(object SegLabel @1158
-					    Parent_View 	@1157
-					    location   	(217, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA02F7"
-					client     	@1156
-					supplier   	@1155
-					vertices   	(list Points
-					    (228, 1695)
-					    (175, 1695)
-					    (175, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(175, 1591))
-				    (object RoleView "resolvedElementDeclaration" @1159
-					Parent_View 	@1156
-					location   	(-476, -385)
-					label      	(object SegLabel @1160
-					    Parent_View 	@1159
-					    location   	(329, 1740)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedElementDeclaration"
-					    pctDist    	1.924528
-					    height     	45
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA030B"
-					client     	@1156
-					supplier   	@1155
-					vertices   	(list Points
-					    (228, 1695)
-					    (281, 1695)
-					    (281, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(281, 1591)
-					label      	(object SegLabel @1161
-					    Parent_View 	@1159
-					    location   	(229, 1646)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.005714
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1162
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1162
-				    location   	(790, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	500
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	518
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$154" @1163
-				location   	(952, 1698)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B42450398"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$155" @1164
-					Parent_View 	@1163
-					location   	(-1288, -318)
-					label      	(object SegLabel @1165
-					    Parent_View 	@1164
-					    location   	(860, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249038A"
-					client     	@1163
-					supplier   	@1162
-					vertices   	(list Points
-					    (952, 1698)
-					    (901, 1698)
-					    (901, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(901, 1591))
-				    (object RoleView "resolvedModelGroupDefinition" @1166
-					Parent_View 	@1163
-					location   	(-1288, -318)
-					label      	(object SegLabel @1167
-					    Parent_View 	@1166
-					    location   	(1020, 1739)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	564
-					    justify    	0
-					    label      	"+resolvedModelGroupDefinition"
-					    pctDist    	1.326923
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249039E"
-					client     	@1163
-					supplier   	@1162
-					vertices   	(list Points
-					    (952, 1698)
-					    (1004, 1698)
-					    (1004, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(1004, 1591)
-					label      	(object SegLabel @1168
-					    Parent_View 	@1166
-					    location   	(952, 1649)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.000000
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1169
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1169
-				    location   	(420, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1170
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1170
-				    location   	(412, 737)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	457
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	475
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1171
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 416)
-				label      	(object ItemLabel
-				    Parent_View 	@1171
-				    location   	(446, 285)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	406
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$218" @1172
-				location   	(1303, 679)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "incorporatedSchema" @1173
-					Parent_View 	@1172
-					location   	(-41, -857)
-					label      	(object SegLabel @1174
-					    Parent_View 	@1173
-					    location   	(1059, 381)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.700384
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@1172
-					supplier   	@1171
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 419)
-					    (843, 419))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(843, 419)
-					label      	(object SegLabel @1175
-					    Parent_View 	@1173
-					    location   	(922, 454)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.890746
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$219" @1176
-					Parent_View 	@1172
-					location   	(-41, -857)
-					label      	(object SegLabel @1177
-					    Parent_View 	@1176
-					    location   	(1045, 956)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@1172
-					supplier   	@1169
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 997)
-					    (901, 997))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(901, 997))))
-			    (object AssociationViewNew "$UNNAMED$216" @1178
-				location   	(1216, 649)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedSchema" @1179
-					Parent_View 	@1178
-					location   	(336, -1399)
-					label      	(object SegLabel @1180
-					    Parent_View 	@1179
-					    location   	(1038, 500)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.601923
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@1178
-					supplier   	@1171
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 534)
-					    (843, 534))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(843, 534)
-					label      	(object SegLabel @1181
-					    Parent_View 	@1179
-					    location   	(926, 577)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.831643
-					    height     	43
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$217" @1182
-					Parent_View 	@1178
-					location   	(336, -1399)
-					label      	(object SegLabel @1183
-					    Parent_View 	@1182
-					    location   	(974, 756)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@1178
-					supplier   	@1170
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 797)
-					    (877, 797))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(877, 797))))
-			    (object AssociationViewNew "$UNNAMED$222" @1184
-				location   	(662, 642)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25D3A60131"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencingDirectives" @1185
-					Parent_View 	@1184
-					location   	(-234, 114)
-					label      	(object SegLabel @1186
-					    Parent_View 	@1185
-					    location   	(878, 675)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+referencingDirectives"
-					    pctDist    	0.408759
-					    height     	216
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90371"
-					client     	@1184
-					supplier   	@1170
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 725)
-					label      	(object SegLabel @1187
-					    Parent_View 	@1185
-					    location   	(615, 678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.430657
-					    height     	48
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$223" @1188
-					Parent_View 	@1184
-					location   	(-234, 114)
-					label      	(object SegLabel @1189
-					    Parent_View 	@1188
-					    location   	(621, 576)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90370"
-					client     	@1184
-					supplier   	@1171
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 559))))
-			    (object AssociationViewNew "$UNNAMED$224" @1190
-				location   	(75, 188)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ECF0005E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$225" @1191
-					Parent_View 	@1190
-					location   	(-853, -308)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF4001E"
-					client     	@1190
-					supplier   	@1171
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 128)
-					    (510, 128)
-					    (510, 273))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(510, 273))
-				    (object RoleView "rootVersion" @1192
-					Parent_View 	@1190
-					location   	(-853, -308)
-					label      	(object SegLabel @1193
-					    Parent_View 	@1192
-					    location   	(176, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+rootVersion"
-					    pctDist    	-0.593750
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF40028"
-					client     	@1190
-					supplier   	@1171
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 380)
-					    (437, 380))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(437, 380)
-					label      	(object SegLabel @1194
-					    Parent_View 	@1192
-					    location   	(368, 328)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.874755
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$226" @1195
-				location   	(1262, 134)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ED0B011B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$227" @1196
-					Parent_View 	@1195
-					location   	(334, -362)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F0121"
-					client     	@1195
-					supplier   	@1171
-					vertices   	(list Points
-					    (1262, 134)
-					    (766, 134)
-					    (766, 273))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(766, 273))
-				    (object RoleView "originalVersion" @1197
-					Parent_View 	@1195
-					location   	(334, -362)
-					label      	(object SegLabel @1198
-					    Parent_View 	@1197
-					    location   	(1164, 97)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+originalVersion"
-					    pctDist    	-1.650000
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F012B"
-					client     	@1195
-					supplier   	@1171
-					vertices   	(list Points
-					    (1262, 134)
-					    (1322, 134)
-					    (1322, 334)
-					    (843, 334))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(843, 334)
-					label      	(object SegLabel @1199
-					    Parent_View 	@1197
-					    location   	(919, 279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898108
-					    height     	56
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$228" @1200
-				location   	(126, 656)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25EEAB001F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$229" @1201
-					Parent_View 	@1200
-					location   	(-834, 160)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF010B"
-					client     	@1200
-					supplier   	@1171
-					vertices   	(list Points
-					    (126, 656)
-					    (513, 656)
-					    (513, 559))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(513, 559))
-				    (object RoleView "incorporatedVersions" @1202
-					Parent_View 	@1200
-					location   	(-834, 160)
-					label      	(object SegLabel @1203
-					    Parent_View 	@1202
-					    location   	(217, 431)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+incorporatedVersions"
-					    pctDist    	0.643902
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF0115"
-					client     	@1200
-					supplier   	@1171
-					vertices   	(list Points
-					    (126, 656)
-					    (66, 656)
-					    (66, 472)
-					    (437, 472))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(437, 472)
-					label      	(object SegLabel @1204
-					    Parent_View 	@1202
-					    location   	(356, 526)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.868468
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$232" @1205
-				location   	(642, 126)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2784730194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$233" @1206
-					Parent_View 	@1205
-					location   	(82, -418)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501F1"
-					client     	@1205
-					supplier   	@1171
-					vertices   	(list Points
-					    (642, 126)
-					    (588, 126)
-					    (588, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(588, 273))
-				    (object RoleView "schemaForSchema" @1207
-					Parent_View 	@1205
-					location   	(82, -418)
-					label      	(object SegLabel @1208
-					    Parent_View 	@1207
-					    location   	(639, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+schemaForSchema"
-					    pctDist    	-0.055556
-					    height     	53
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501FB"
-					client     	@1205
-					supplier   	@1171
-					vertices   	(list Points
-					    (642, 126)
-					    (697, 126)
-					    (697, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(697, 273)
-					label      	(object SegLabel @1209
-					    Parent_View 	@1207
-					    location   	(643, 213)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.701863
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @1210
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1169
-				supplier   	@1170
-				line_style 	3
-				origin_attachment 	(638, 937)
-				terminal_attachment 	(638, 843))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1211
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1211
-				    location   	(67, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$72" @1212
-				location   	(234, 1340)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B426B0194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$73" @1213
-					Parent_View 	@1212
-					location   	(-310, -4)
-					label      	(object SegLabel @1214
-					    Parent_View 	@1213
-					    location   	(140, 1271)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0309"
-					client     	@1212
-					supplier   	@1211
-					vertices   	(list Points
-					    (234, 1340)
-					    (181, 1340)
-					    (181, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(181, 1239))
-				    (object RoleView "resolvedAttributeDeclaration" @1215
-					Parent_View 	@1212
-					location   	(-310, -4)
-					label      	(object SegLabel @1216
-					    Parent_View 	@1215
-					    location   	(333, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedAttributeDeclaration"
-					    pctDist    	1.867925
-					    height     	49
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0313"
-					client     	@1212
-					supplier   	@1211
-					vertices   	(list Points
-					    (234, 1340)
-					    (287, 1340)
-					    (287, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(287, 1239)
-					label      	(object SegLabel @1217
-					    Parent_View 	@1215
-					    location   	(241, 1295)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.042945
-					    height     	46
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1218
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1760, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@1218
-				    location   	(1517, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	486
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	504
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1219
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1219
-				    location   	(1599, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	226
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C359403D2"
-				width      	244
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$306" @1220
-				location   	(1668, 280)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4AE01CC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$307" @1221
-					Parent_View 	@1220
-					location   	(8, -152)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF010F"
-					client     	@1220
-					supplier   	@1218
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 199))
-				    (object RoleView "syntheticFacets" @1222
-					Parent_View 	@1220
-					location   	(8, -152)
-					label      	(object SegLabel @1223
-					    Parent_View 	@1222
-					    location   	(1852, 300)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+syntheticFacets"
-					    pctDist    	0.246154
-					    height     	184
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF011A"
-					client     	@1220
-					supplier   	@1219
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 361)
-					label      	(object SegLabel @1224
-					    Parent_View 	@1222
-					    location   	(1625, 301)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.276923
-					    height     	44
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1225
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1225
-				    location   	(1426, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1226
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@1226
-				    location   	(1515, 597)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$308" @1227
-				location   	(1508, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D3028E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$309" @1228
-					Parent_View 	@1227
-					location   	(-12, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402F3"
-					client     	@1227
-					supplier   	@1226
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 695))
-				    (object RoleView "syntheticParticle" @1229
-					Parent_View 	@1227
-					location   	(-12, -280)
-					label      	(object SegLabel @1230
-					    Parent_View 	@1229
-					    location   	(1695, 767)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+syntheticParticle"
-					    pctDist    	-0.259259
-					    height     	187
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402FD"
-					client     	@1227
-					supplier   	@1225
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 889)
-					label      	(object SegLabel @1231
-					    Parent_View 	@1229
-					    location   	(1454, 829)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.395062
-					    height     	55
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1232
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1232
-				    location   	(756, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$84" @1233
-				location   	(919, 1349)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B425E01F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$85" @1234
-					Parent_View 	@1233
-					location   	(-233, -59)
-					label      	(object SegLabel @1235
-					    Parent_View 	@1234
-					    location   	(825, 1273)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620046"
-					client     	@1233
-					supplier   	@1232
-					vertices   	(list Points
-					    (919, 1349)
-					    (866, 1349)
-					    (866, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(866, 1239))
-				    (object RoleView "resolvedAttributeGroupDefinition" @1236
-					Parent_View 	@1233
-					location   	(-233, -59)
-					label      	(object SegLabel @1237
-					    Parent_View 	@1236
-					    location   	(993, 1393)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	600
-					    justify    	0
-					    label      	"+resolvedAttributeGroupDefinition"
-					    pctDist    	1.377358
-					    height     	44
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620050"
-					client     	@1233
-					supplier   	@1232
-					vertices   	(list Points
-					    (919, 1349)
-					    (973, 1349)
-					    (973, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(973, 1239)
-					label      	(object SegLabel @1238
-					    Parent_View 	@1236
-					    location   	(919, 1296)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.014925
-					    height     	54
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1239
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1952, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1239
-				    location   	(1816, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	290
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$310" @1240
-				location   	(2025, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D901F6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$311" @1241
-					Parent_View 	@1240
-					location   	(153, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA0284"
-					client     	@1240
-					supplier   	@1226
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 695))
-				    (object RoleView "syntheticWildcard" @1242
-					Parent_View 	@1240
-					location   	(153, -280)
-					label      	(object SegLabel @1243
-					    Parent_View 	@1242
-					    location   	(1826, 838)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.488095
-					    height     	200
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA028E"
-					client     	@1240
-					supplier   	@1239
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 889)
-					label      	(object SegLabel @1244
-					    Parent_View 	@1242
-					    location   	(2098, 840)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.506173
-					    height     	73
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$312" @1245
-				location   	(1754, 1178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C68FF01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$313" @1246
-					Parent_View 	@1245
-					location   	(-198, 234)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020317"
-					client     	@1245
-					supplier   	@1232
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(1301, 1178))
-				    (object RoleView "syntheticWildcard" @1247
-					Parent_View 	@1245
-					location   	(-198, 234)
-					label      	(object SegLabel @1248
-					    Parent_View 	@1247
-					    location   	(1828, 1261)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.163355
-					    height     	83
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020318"
-					client     	@1245
-					supplier   	@1239
-					vertices   	(list Points
-					    (1754, 1178)
-					    (2028, 1178)
-					    (2028, 999))
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(2028, 999)
-					label      	(object SegLabel @1249
-					    Parent_View 	@1247
-					    location   	(2082, 1098)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783664
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "10. Diagnostics"
-			quid       	"3BFE5F0803E2"
-			title      	"10. Diagnostics"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @1250
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(400, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@1250
-				    location   	(66, 990)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1250
-				    location   	(66, 940)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnosticSeverity" @1251
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@1251
-				    location   	(818, 547)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDDiagnosticSeverity")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1251
-				    location   	(818, 497)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BFE68A7032F"
-				width      	462
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1252
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1252
-				    location   	(59, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1253
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(896, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1253
-				    location   	(540, 62)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	713
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	731
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1254
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@1254
-				    location   	(64, 402)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	658
-				height     	436
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$214" @1255
-				location   	(144, 283)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE6431035F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$215" @1256
-					Parent_View 	@1255
-					location   	(-1088, -661)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C6"
-					client     	@1255
-					supplier   	@1252
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 176))
-				    (object RoleView "allDiagnostics" @1257
-					Parent_View 	@1255
-					location   	(-1088, -661)
-					label      	(object SegLabel @1258
-					    Parent_View 	@1257
-					    location   	(309, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+allDiagnostics"
-					    pctDist    	0.448598
-					    height     	165
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C7"
-					client     	@1255
-					supplier   	@1254
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 390)
-					label      	(object SegLabel @1259
-					    Parent_View 	@1257
-					    location   	(96, 327)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420561
-					    height     	49
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$210" @1260
-				location   	(1028, 440)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE622703CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$211" @1261
-					Parent_View 	@1260
-					location   	(-396, -72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B0061"
-					client     	@1260
-					supplier   	@1254
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(713, 440))
-				    (object RoleView "components" @1262
-					Parent_View 	@1260
-					location   	(-396, -72)
-					label      	(object SegLabel @1263
-					    Parent_View 	@1262
-					    location   	(938, 230)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+components"
-					    pctDist    	0.829181
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B006C"
-					client     	@1260
-					supplier   	@1253
-					vertices   	(list Points
-					    (1028, 440)
-					    (1088, 440)
-					    (1088, 174))
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(1088, 174)
-					label      	(object SegLabel @1264
-					    Parent_View 	@1262
-					    location   	(1143, 232)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.823848
-					    height     	55
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$212" @1265
-				location   	(688, 282)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE62690165"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$213" @1266
-					Parent_View 	@1265
-					location   	(160, -278)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0026"
-					client     	@1265
-					supplier   	@1253
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 174))
-				    (object RoleView "diagnostics" @1267
-					Parent_View 	@1265
-					location   	(160, -278)
-					label      	(object SegLabel @1268
-					    Parent_View 	@1267
-					    location   	(822, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+diagnostics"
-					    pctDist    	0.452632
-					    height     	134
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0027"
-					client     	@1265
-					supplier   	@1254
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 390)
-					label      	(object SegLabel @1269
-					    Parent_View 	@1267
-					    location   	(645, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.494737
-					    height     	44
-					    orientation 	1))))
-			    (object InheritView "" @1270
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C0F4C01A1"
-				client     	@1254
-				supplier   	@1253
-				line_style 	3
-				origin_attachment 	(575, 390)
-				terminal_attachment 	(575, 174))))
-		    (object ClassDiagram "11. Supplemental"
-			quid       	"3C287E49019B"
-			title      	"11. Supplemental"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1271
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(464, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@1271
-				    location   	(47, 760)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	834
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	852
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1272
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2112, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@1272
-				    location   	(1731, 824)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	762
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	780
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1273
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1273
-				    location   	(48, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	498
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1274
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2384, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1274
-				    location   	(2236, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	314
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$236" @1275
-				location   	(1382, 84)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2882C50137"
-				roleview_list 	(list RoleViews
-				    (object RoleView "primaryComponent" @1276
-					Parent_View 	@1275
-					location   	(-250, -508)
-					label      	(object SegLabel @1277
-					    Parent_View 	@1276
-					    location   	(756, 116)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+primaryComponent"
-					    pctDist    	0.740828
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70113"
-					client     	@1275
-					supplier   	@1273
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(537, 84)
-					label      	(object SegLabel @1278
-					    Parent_View 	@1276
-					    location   	(624, 55)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.897260
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$237" @1279
-					Parent_View 	@1275
-					location   	(-250, -508)
-					label      	(object SegLabel @1280
-					    Parent_View 	@1279
-					    location   	(2058, 126)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70112"
-					client     	@1275
-					supplier   	@1274
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(2227, 84))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1281
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@1281
-				    location   	(1778, 607)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	764
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@1281
-				    location   	(1778, 667)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	722
-				    compartmentItems 	(list Compartment
-					"+ elementDeclarationReference : boolean"
-					"+ circular : boolean"))
-				width      	782
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1282
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1072)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1282
-				    location   	(2100, 991)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@1282
-				    location   	(2100, 1051)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	423
-				    compartmentItems 	(list Compartment
-					"+ facetName : String"
-					"+ effectiveValue : Value"))
-				width      	458
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1283
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@1283
-				    location   	(47, 568)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	802
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				compartment 	(object Compartment
-				    Parent_View 	@1283
-				    location   	(47, 628)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	769
-				    compartmentItems 	(list Compartment
-					"+ modelGroupDefinitionReference : boolean"))
-				width      	820
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @1284
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 288)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1284
-				    location   	(1005, 157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	454
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@1284
-				    location   	(1005, 217)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	4
-				    max_width  	356
-				    compartmentItems 	(list Compartment
-					"+ aliasName : String"
-					"+ uRI : String"
-					"+ aliasURI : String"
-					"+ qName : String"))
-				width      	472
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @1285
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 352)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1285
-				    location   	(48, 296)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1286
-				location   	(320, 510)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1285
-				vertices   	(list Points
-				    (320, 510)
-				    (320, 420)))
-			    (object InheritView "" @1287
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@1283
-				supplier   	@1285
-				line_style 	3
-				origin_attachment 	(81, 556)
-				terminal_attachment 	(81, 510)
-				drawSupplier 	@1286)
-			    (object InheritView "" @1288
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@1271
-				supplier   	@1285
-				line_style 	3
-				origin_attachment 	(877, 748)
-				terminal_attachment 	(877, 510)
-				drawSupplier 	@1286)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @1289
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1808)
-				label      	(object ItemLabel
-				    Parent_View 	@1289
-				    location   	(2101, 1761)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	456
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @1290
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1776)
-				label      	(object ItemLabel
-				    Parent_View 	@1290
-				    location   	(35, 1729)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	493
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @1291
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@1291
-				    location   	(35, 1889)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	493
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @1292
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@1292
-				    location   	(2073, 1917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @1293
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@1293
-				    location   	(2134, 1372)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @1294
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@1294
-				    location   	(2163, 1212)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	396
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @1295
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 1392)
-				label      	(object ItemLabel
-				    Parent_View 	@1295
-				    location   	(43, 1340)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	380
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @1296
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1232)
-				label      	(object ItemLabel
-				    Parent_View 	@1296
-				    location   	(49, 1178)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	382
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	400
-				height     	132
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @1297
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1616)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1297
-				    location   	(2135, 1535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@1297
-				    location   	(2135, 1595)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	363
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @1298
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2288)
-				label      	(object ItemLabel
-				    Parent_View 	@1298
-				    location   	(2102, 2236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	436
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	454
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @1299
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 2624)
-				label      	(object ItemLabel
-				    Parent_View 	@1299
-				    location   	(2074, 2572)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	478
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @1300
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 2128)
-				label      	(object ItemLabel
-				    Parent_View 	@1300
-				    location   	(2196, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	362
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @1301
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@1301
-				    location   	(36, 2044)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	458
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @1302
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@1302
-				    location   	(38, 2220)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	340
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	358
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @1303
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1584)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1303
-				    location   	(38, 1503)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@1303
-				    location   	(38, 1563)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	363
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	422
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @1304
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2464)
-				label      	(object ItemLabel
-				    Parent_View 	@1304
-				    location   	(2111, 2412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @1305
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2448)
-				label      	(object ItemLabel
-				    Parent_View 	@1305
-				    location   	(39, 2396)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	420
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @1306
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2608)
-				label      	(object ItemLabel
-				    Parent_View 	@1306
-				    location   	(38, 2556)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1307
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@1307
-				    location   	(667, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1308
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 1072)
-				label      	(object ItemLabel
-				    Parent_View 	@1308
-				    location   	(50, 1020)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1309
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@1309
-				    location   	(944, 1304)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	576
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@1309
-				    location   	(944, 1364)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	538
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + validFacets : String"))
-				width      	594
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$248" @1310
-				location   	(1446, 1218)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A994030A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1311
-					Parent_View 	@1310
-					location   	(582, -78)
-					label      	(object SegLabel @1312
-					    Parent_View 	@1311
-					    location   	(1580, 1173)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	3.268293
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700DD"
-					client     	@1310
-					supplier   	@1309
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1487, 1218)
-					    (1487, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1487, 1292)
-					label      	(object SegLabel @1313
-					    Parent_View 	@1311
-					    location   	(1439, 1257)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.184211
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$249" @1314
-					Parent_View 	@1310
-					location   	(582, -78)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700E7"
-					client     	@1310
-					supplier   	@1309
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1405, 1218)
-					    (1405, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1405, 1292))))
-			    (object AssociationViewNew "$UNNAMED$252" @1315
-				location   	(1733, 1575)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B08D0252"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$253" @1316
-					Parent_View 	@1315
-					location   	(917, 7)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E0091"
-					client     	@1315
-					supplier   	@1309
-					vertices   	(list Points
-					    (1733, 1575)
-					    (1487, 1575)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "maxFacet" @1317
-					Parent_View 	@1315
-					location   	(917, 7)
-					label      	(object SegLabel @1318
-					    Parent_View 	@1317
-					    location   	(1751, 1541)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+maxFacet"
-					    pctDist    	0.046243
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E009B"
-					client     	@1315
-					supplier   	@1297
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(2126, 1575)
-					label      	(object SegLabel @1319
-					    Parent_View 	@1317
-					    location   	(2042, 1536)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.789157
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$254" @1320
-				location   	(1587, 1793)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AB0396"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$255" @1321
-					Parent_View 	@1320
-					location   	(707, -31)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03C9"
-					client     	@1320
-					supplier   	@1309
-					vertices   	(list Points
-					    (1587, 1793)
-					    (1447, 1793)
-					    (1447, 1428))
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(1447, 1428))
-				    (object RoleView "maxInclusiveFacet" @1322
-					Parent_View 	@1320
-					location   	(707, -31)
-					label      	(object SegLabel @1323
-					    Parent_View 	@1322
-					    location   	(1737, 1751)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+maxInclusiveFacet"
-					    pctDist    	0.298441
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03D4"
-					client     	@1320
-					supplier   	@1289
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(2092, 1793)
-					label      	(object SegLabel @1324
-					    Parent_View 	@1322
-					    location   	(2020, 1754)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.859155
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$256" @1325
-				location   	(937, 1787)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AF0338"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$257" @1326
-					Parent_View 	@1325
-					location   	(617, -5)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B001F9"
-					client     	@1325
-					supplier   	@1309
-					vertices   	(list Points
-					    (937, 1787)
-					    (997, 1787)
-					    (997, 1428))
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(997, 1428))
-				    (object RoleView "minInclusiveFacet" @1327
-					Parent_View 	@1325
-					location   	(617, -5)
-					label      	(object SegLabel @1328
-					    Parent_View 	@1327
-					    location   	(792, 1745)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+minInclusiveFacet"
-					    pctDist    	0.346062
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B00203"
-					client     	@1325
-					supplier   	@1290
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(518, 1787)
-					label      	(object SegLabel @1329
-					    Parent_View 	@1327
-					    location   	(575, 1743)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863962
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$258" @1330
-				location   	(981, 1937)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B30207"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$259" @1331
-					Parent_View 	@1330
-					location   	(677, -79)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B40190"
-					client     	@1330
-					supplier   	@1309
-					vertices   	(list Points
-					    (981, 1937)
-					    (1041, 1937)
-					    (1041, 1428))
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(1041, 1428))
-				    (object RoleView "minExclusiveFacet" @1332
-					Parent_View 	@1330
-					location   	(677, -79)
-					label      	(object SegLabel @1333
-					    Parent_View 	@1332
-					    location   	(823, 1900)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+minExclusiveFacet"
-					    pctDist    	0.341253
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B4019A"
-					client     	@1330
-					supplier   	@1291
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(518, 1937)
-					label      	(object SegLabel @1334
-					    Parent_View 	@1332
-					    location   	(589, 1897)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.846652
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$260" @1335
-				location   	(1469, 1953)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B6028D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$261" @1336
-					Parent_View 	@1335
-					location   	(621, -95)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70217"
-					client     	@1335
-					supplier   	@1309
-					vertices   	(list Points
-					    (1469, 1953)
-					    (1400, 1953)
-					    (1400, 1428))
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(1400, 1428))
-				    (object RoleView "maxExclusiveFacet" @1337
-					Parent_View 	@1335
-					location   	(621, -95)
-					label      	(object SegLabel @1338
-					    Parent_View 	@1337
-					    location   	(1646, 1913)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+maxExclusiveFacet"
-					    pctDist    	0.298097
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70221"
-					client     	@1335
-					supplier   	@1292
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(2064, 1953)
-					label      	(object SegLabel @1339
-					    Parent_View 	@1337
-					    location   	(1961, 1913)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.827236
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$262" @1340
-				location   	(1122, 2180)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BC0051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$263" @1341
-					Parent_View 	@1340
-					location   	(-318, 628)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0246"
-					client     	@1340
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "lengthFacet" @1342
-					Parent_View 	@1340
-					location   	(-318, 628)
-					label      	(object SegLabel @1343
-					    Parent_View 	@1342
-					    location   	(804, 2204)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+lengthFacet"
-					    pctDist    	0.475472
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0250"
-					client     	@1340
-					supplier   	@1302
-					vertices   	(list Points
-					    (1122, 2180)
-					    (1122, 2240)
-					    (387, 2240))
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(387, 2240)
-					label      	(object SegLabel @1344
-					    Parent_View 	@1342
-					    location   	(471, 2204)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.895597
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$266" @1345
-				location   	(1084, 1989)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C2021D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$267" @1346
-					Parent_View 	@1345
-					location   	(-1380, 437)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AB"
-					client     	@1345
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "enumerationFacets" @1347
-					Parent_View 	@1345
-					location   	(-1380, 437)
-					label      	(object SegLabel @1348
-					    Parent_View 	@1347
-					    location   	(837, 2016)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+enumerationFacets"
-					    pctDist    	0.465857
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AC"
-					client     	@1345
-					supplier   	@1301
-					vertices   	(list Points
-					    (1084, 1989)
-					    (1084, 2049)
-					    (485, 2049))
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(485, 2049)
-					label      	(object SegLabel @1349
-					    Parent_View 	@1347
-					    location   	(583, 2021)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.851290
-					    height     	29
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$268" @1350
-				location   	(1451, 2074)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C50159"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$269" @1351
-					Parent_View 	@1350
-					location   	(-1525, 538)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600B0"
-					client     	@1350
-					supplier   	@1309
-					vertices   	(list Points
-					    (1451, 2074)
-					    (1362, 2074)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "patternFacets" @1352
-					Parent_View 	@1350
-					location   	(-1525, 538)
-					label      	(object SegLabel @1353
-					    Parent_View 	@1352
-					    location   	(1720, 2038)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+patternFacets"
-					    pctDist    	0.367223
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600BA"
-					client     	@1350
-					supplier   	@1300
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(2187, 2074)
-					label      	(object SegLabel @1354
-					    Parent_View 	@1352
-					    location   	(1972, 2035)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.708649
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$270" @1355
-				location   	(1827, 1400)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C802A7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$271" @1356
-					Parent_View 	@1355
-					location   	(-1149, -472)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901EA"
-					client     	@1355
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(1529, 1400))
-				    (object RoleView "cardinalityFacet" @1357
-					Parent_View 	@1355
-					location   	(-1149, -472)
-					label      	(object SegLabel @1358
-					    Parent_View 	@1357
-					    location   	(1847, 1358)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+cardinalityFacet"
-					    pctDist    	0.071730
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901F5"
-					client     	@1355
-					supplier   	@1293
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(2125, 1400)
-					label      	(object SegLabel @1359
-					    Parent_View 	@1357
-					    location   	(2083, 1357)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.863426
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$280" @1360
-				location   	(1262, 2413)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DB0377"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$281" @1361
-					Parent_View 	@1360
-					location   	(-786, 301)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC035A"
-					client     	@1360
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "fractionDigitsFacet" @1362
-					Parent_View 	@1360
-					location   	(-786, 301)
-					label      	(object SegLabel @1363
-					    Parent_View 	@1362
-					    location   	(1608, 2556)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+fractionDigitsFacet"
-					    pctDist    	0.537393
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC0364"
-					client     	@1360
-					supplier   	@1299
-					vertices   	(list Points
-					    (1262, 2413)
-					    (1262, 2596)
-					    (2065, 2596))
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(2065, 2596)
-					label      	(object SegLabel @1364
-					    Parent_View 	@1362
-					    location   	(1979, 2556)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913886
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$284" @1365
-				location   	(1841, 1306)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0E300D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$285" @1366
-					Parent_View 	@1365
-					location   	(-1135, -790)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E4038E"
-					client     	@1365
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(1529, 1306))
-				    (object RoleView "boundedFacet" @1367
-					Parent_View 	@1365
-					location   	(-1135, -790)
-					label      	(object SegLabel @1368
-					    Parent_View 	@1367
-					    location   	(1832, 1270)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+boundedFacet"
-					    pctDist    	-0.031746
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E40398"
-					client     	@1365
-					supplier   	@1294
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(2154, 1306)
-					label      	(object SegLabel @1369
-					    Parent_View 	@1367
-					    location   	(2077, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.754717
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$264" @1370
-				location   	(1328, 2186)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BF018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$265" @1371
-					Parent_View 	@1370
-					location   	(-640, 634)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C0006B"
-					client     	@1370
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "whiteSpaceFacet" @1372
-					Parent_View 	@1370
-					location   	(-640, 634)
-					label      	(object SegLabel @1373
-					    Parent_View 	@1372
-					    location   	(1673, 2207)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+whiteSpaceFacet"
-					    pctDist    	0.490909
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C00075"
-					client     	@1370
-					supplier   	@1298
-					vertices   	(list Points
-					    (1328, 2186)
-					    (1328, 2246)
-					    (2093, 2246))
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(2093, 2246)
-					label      	(object SegLabel @1374
-					    Parent_View 	@1372
-					    location   	(2033, 2203)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926763
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$282" @1375
-				location   	(674, 1390)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DF0048"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$283" @1376
-					Parent_View 	@1375
-					location   	(-1854, -706)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03B9"
-					client     	@1375
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(935, 1390))
-				    (object RoleView "orderedFacet" @1377
-					Parent_View 	@1375
-					location   	(-1854, -706)
-					label      	(object SegLabel @1378
-					    Parent_View 	@1377
-					    location   	(658, 1353)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+orderedFacet"
-					    pctDist    	0.061538
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03C3"
-					client     	@1375
-					supplier   	@1295
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(414, 1390)
-					label      	(object SegLabel @1379
-					    Parent_View 	@1377
-					    location   	(510, 1355)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.634615
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$272" @1380
-				location   	(687, 1296)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CB039C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$273" @1381
-					Parent_View 	@1380
-					location   	(-1809, -576)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D0"
-					client     	@1380
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(935, 1296))
-				    (object RoleView "numericFacet" @1382
-					Parent_View 	@1380
-					location   	(-1809, -576)
-					label      	(object SegLabel @1383
-					    Parent_View 	@1382
-					    location   	(668, 1257)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+numericFacet"
-					    pctDist    	0.080972
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D1"
-					client     	@1380
-					supplier   	@1296
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(440, 1296)
-					label      	(object SegLabel @1384
-					    Parent_View 	@1382
-					    location   	(506, 1260)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.736842
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$286" @1385
-				location   	(1689, 1662)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B44401EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$287" @1386
-					Parent_View 	@1385
-					location   	(-183, -354)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B4450360"
-					client     	@1385
-					supplier   	@1309
-					vertices   	(list Points
-					    (1689, 1662)
-					    (1487, 1662)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "effectiveMaxFacet" @1387
-					Parent_View 	@1385
-					location   	(-183, -354)
-					label      	(object SegLabel @1388
-					    Parent_View 	@1387
-					    location   	(1769, 1623)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+effectiveMaxFacet"
-					    pctDist    	0.182051
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B445036A"
-					client     	@1385
-					supplier   	@1297
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(2126, 1662)
-					label      	(object SegLabel @1389
-					    Parent_View 	@1387
-					    location   	(2044, 1627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.815385
-					    height     	36
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$288" @1390
-				location   	(1328, 2258)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B54F0145"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$289" @1391
-					Parent_View 	@1390
-					location   	(-1072, -462)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B550038C"
-					client     	@1390
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "effectiveWhiteSpaceFacet" @1392
-					Parent_View 	@1390
-					location   	(-1072, -462)
-					label      	(object SegLabel @1393
-					    Parent_View 	@1392
-					    location   	(1685, 2288)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+effectiveWhiteSpaceFacet"
-					    pctDist    	0.508541
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5500396"
-					client     	@1390
-					supplier   	@1298
-					vertices   	(list Points
-					    (1328, 2258)
-					    (1328, 2324)
-					    (2093, 2324))
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(2093, 2324)
-					label      	(object SegLabel @1394
-					    Parent_View 	@1392
-					    location   	(2009, 2293)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898817
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$290" @1395
-				location   	(1297, 2366)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B5C4011C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$291" @1396
-					Parent_View 	@1395
-					location   	(-607, -722)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C5020D"
-					client     	@1395
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "effectiveMaxLengthFacet" @1397
-					Parent_View 	@1395
-					location   	(-607, -722)
-					label      	(object SegLabel @1398
-					    Parent_View 	@1397
-					    location   	(1657, 2463)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+effectiveMaxLengthFacet"
-					    pctDist    	0.526906
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C50217"
-					client     	@1395
-					supplier   	@1304
-					vertices   	(list Points
-					    (1297, 2366)
-					    (1297, 2499)
-					    (2102, 2499))
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(2102, 2499)
-					label      	(object SegLabel @1399
-					    Parent_View 	@1397
-					    location   	(2007, 2471)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.899308
-					    height     	29
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$292" @1400
-				location   	(1262, 2449)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B62A00AA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$293" @1401
-					Parent_View 	@1400
-					location   	(-1170, -815)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0138"
-					client     	@1400
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "effectiveFractionDigitsFacet" @1402
-					Parent_View 	@1400
-					location   	(-1170, -815)
-					label      	(object SegLabel @1403
-					    Parent_View 	@1402
-					    location   	(1640, 2634)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+effectiveFractionDigitsFacet"
-					    pctDist    	0.585315
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0142"
-					client     	@1400
-					supplier   	@1299
-					vertices   	(list Points
-					    (1262, 2449)
-					    (1262, 2668)
-					    (2065, 2668))
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(2065, 2668)
-					label      	(object SegLabel @1404
-					    Parent_View 	@1402
-					    location   	(1989, 2629)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926485
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$294" @1405
-				location   	(1422, 2159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B6B003A6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$295" @1406
-					Parent_View 	@1405
-					location   	(-770, -1313)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10311"
-					client     	@1405
-					supplier   	@1309
-					vertices   	(list Points
-					    (1422, 2159)
-					    (1362, 2159)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "effectivePatternFacet" @1407
-					Parent_View 	@1405
-					location   	(-770, -1313)
-					label      	(object SegLabel @1408
-					    Parent_View 	@1407
-					    location   	(1727, 2125)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+effectivePatternFacet"
-					    pctDist    	0.399090
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10312"
-					client     	@1405
-					supplier   	@1300
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(2187, 2159)
-					label      	(object SegLabel @1409
-					    Parent_View 	@1407
-					    location   	(2102, 2119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.889226
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$296" @1410
-				location   	(1084, 2083)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B7CA026B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$297" @1411
-					Parent_View 	@1410
-					location   	(828, -1373)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0186"
-					client     	@1410
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "effectiveEnumerationFacet" @1412
-					Parent_View 	@1410
-					location   	(828, -1373)
-					label      	(object SegLabel @1413
-					    Parent_View 	@1412
-					    location   	(822, 2101)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+effectiveEnumerationFacet"
-					    pctDist    	0.488619
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0190"
-					client     	@1410
-					supplier   	@1301
-					vertices   	(list Points
-					    (1084, 2083)
-					    (1084, 2143)
-					    (485, 2143))
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(485, 2143)
-					label      	(object SegLabel @1414
-					    Parent_View 	@1412
-					    location   	(531, 2100)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.931715
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$302" @1415
-				location   	(1122, 2241)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8DC0052"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$303" @1416
-					Parent_View 	@1415
-					location   	(866, -479)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03B9"
-					client     	@1415
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "effectiveLengthFacet" @1417
-					Parent_View 	@1415
-					location   	(866, -479)
-					label      	(object SegLabel @1418
-					    Parent_View 	@1417
-					    location   	(800, 2279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+effectiveLengthFacet"
-					    pctDist    	0.491731
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03C3"
-					client     	@1415
-					supplier   	@1302
-					vertices   	(list Points
-					    (1122, 2241)
-					    (1122, 2318)
-					    (387, 2318))
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(387, 2318)
-					label      	(object SegLabel @1419
-					    Parent_View 	@1417
-					    location   	(470, 2279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898567
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$250" @1420
-				location   	(773, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B085025B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$251" @1421
-					Parent_View 	@1420
-					location   	(469, 13)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0860270"
-					client     	@1420
-					supplier   	@1309
-					vertices   	(list Points
-					    (773, 1565)
-					    (959, 1565)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "minFacet" @1422
-					Parent_View 	@1420
-					location   	(469, 13)
-					label      	(object SegLabel @1423
-					    Parent_View 	@1422
-					    location   	(753, 1532)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+minFacet"
-					    pctDist    	0.063091
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B086027A"
-					client     	@1420
-					supplier   	@1303
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(451, 1565)
-					label      	(object SegLabel @1424
-					    Parent_View 	@1422
-					    location   	(534, 1523)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.746667
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$304" @1425
-				location   	(816, 1650)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B97001DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$305" @1426
-					Parent_View 	@1425
-					location   	(496, -334)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100CF"
-					client     	@1425
-					supplier   	@1309
-					vertices   	(list Points
-					    (816, 1650)
-					    (959, 1650)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "effectiveMinFacet" @1427
-					Parent_View 	@1425
-					location   	(496, -334)
-					label      	(object SegLabel @1428
-					    Parent_View 	@1427
-					    location   	(764, 1614)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+effectiveMinFacet"
-					    pctDist    	0.141618
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100D9"
-					client     	@1425
-					supplier   	@1303
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(451, 1650)
-					label      	(object SegLabel @1429
-					    Parent_View 	@1427
-					    location   	(523, 1606)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.802740
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$274" @1430
-				location   	(1297, 2321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CF0199"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$275" @1431
-					Parent_View 	@1430
-					location   	(-719, 497)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D20085"
-					client     	@1430
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "maxLengthFacet" @1432
-					Parent_View 	@1430
-					location   	(-719, 497)
-					label      	(object SegLabel @1433
-					    Parent_View 	@1432
-					    location   	(1630, 2380)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+maxLengthFacet"
-					    pctDist    	0.472255
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D2008F"
-					client     	@1430
-					supplier   	@1304
-					vertices   	(list Points
-					    (1297, 2321)
-					    (1297, 2409)
-					    (2102, 2409))
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(2102, 2409)
-					label      	(object SegLabel @1434
-					    Parent_View 	@1432
-					    location   	(1994, 2366)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.879208
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$276" @1435
-				location   	(1159, 2273)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D500C5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$277" @1436
-					Parent_View 	@1435
-					location   	(-281, 449)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D6001D"
-					client     	@1435
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(1159, 1428))
-				    (object RoleView "minLengthFacet" @1437
-					Parent_View 	@1435
-					location   	(-281, 449)
-					label      	(object SegLabel @1438
-					    Parent_View 	@1437
-					    location   	(857, 2372)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+minLengthFacet"
-					    pctDist    	0.519527
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D60027"
-					client     	@1435
-					supplier   	@1305
-					vertices   	(list Points
-					    (1159, 2273)
-					    (1159, 2409)
-					    (450, 2409))
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(450, 2409)
-					label      	(object SegLabel @1439
-					    Parent_View 	@1437
-					    location   	(523, 2369)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913610
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$300" @1440
-				location   	(1197, 2334)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B898016D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$301" @1441
-					Parent_View 	@1440
-					location   	(941, -610)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990056"
-					client     	@1440
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(1197, 1428))
-				    (object RoleView "effectiveMinLengthFacet" @1442
-					Parent_View 	@1440
-					location   	(941, -610)
-					label      	(object SegLabel @1443
-					    Parent_View 	@1442
-					    location   	(856, 2454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveMinLengthFacet"
-					    pctDist    	0.552604
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990060"
-					client     	@1440
-					supplier   	@1305
-					vertices   	(list Points
-					    (1197, 2334)
-					    (1197, 2493)
-					    (450, 2493))
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(450, 2493)
-					label      	(object SegLabel @1444
-					    Parent_View 	@1442
-					    location   	(527, 2451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.916047
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$298" @1445
-				location   	(1231, 2438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8400062"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$299" @1446
-					Parent_View 	@1445
-					location   	(863, -746)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B841001D"
-					client     	@1445
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "effectiveTotalDigitsFacet" @1447
-					Parent_View 	@1445
-					location   	(863, -746)
-					label      	(object SegLabel @1448
-					    Parent_View 	@1447
-					    location   	(859, 2632)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveTotalDigitsFacet"
-					    pctDist    	0.597030
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8410027"
-					client     	@1445
-					supplier   	@1306
-					vertices   	(list Points
-					    (1231, 2438)
-					    (1231, 2668)
-					    (451, 2668))
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(451, 2668)
-					label      	(object SegLabel @1449
-					    Parent_View 	@1447
-					    location   	(534, 2631)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.918812
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$278" @1450
-				location   	(1231, 2397)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D800DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$279" @1451
-					Parent_View 	@1450
-					location   	(-209, 253)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803CD"
-					client     	@1450
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "totalDigitsFacet" @1452
-					Parent_View 	@1450
-					location   	(-209, 253)
-					label      	(object SegLabel @1453
-					    Parent_View 	@1452
-					    location   	(853, 2550)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+totalDigitsFacet"
-					    pctDist    	0.585567
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803D7"
-					client     	@1450
-					supplier   	@1306
-					vertices   	(list Points
-					    (1231, 2397)
-					    (1231, 2587)
-					    (451, 2587))
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(451, 2587)
-					label      	(object SegLabel @1454
-					    Parent_View 	@1452
-					    location   	(535, 2560)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.914647
-					    height     	28
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1455
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 768)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1455
-				    location   	(1019, 574)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	444
-				height     	413
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1456
-				location   	(1209, 1065)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1455
-				vertices   	(list Points
-				    (1209, 1065)
-				    (1209, 974)))
-			    (object AssociationViewNew "$UNNAMED$234" @1457
-				location   	(1090, 1031)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2880F503D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1458
-					Parent_View 	@1457
-					location   	(322, -25)
-					label      	(object SegLabel @1459
-					    Parent_View 	@1458
-					    location   	(897, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	-0.098765
-					    height     	194
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F9003C"
-					client     	@1457
-					supplier   	@1455
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 974)
-					label      	(object SegLabel @1460
-					    Parent_View 	@1458
-					    location   	(1121, 1034)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.061728
-					    height     	31
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$235" @1461
-					Parent_View 	@1457
-					location   	(322, -25)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F90046"
-					client     	@1457
-					supplier   	@1307
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 1088))))
-			    (object AssociationViewNew "$UNNAMED$240" @1462
-				location   	(1538, 873)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A6DB01E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootType" @1463
-					Parent_View 	@1462
-					location   	(178, 105)
-					label      	(object SegLabel @1464
-					    Parent_View 	@1463
-					    location   	(1558, 792)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+rootType"
-					    pctDist    	-1.760870
-					    height     	20
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DD"
-					client     	@1462
-					supplier   	@1455
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 919)
-					    (1454, 919))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 919)
-					label      	(object SegLabel @1465
-					    Parent_View 	@1463
-					    location   	(1509, 875)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.016667
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$241" @1466
-					Parent_View 	@1462
-					location   	(178, 105)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DE"
-					client     	@1462
-					supplier   	@1455
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 828)
-					    (1454, 828))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 828))))
-			    (object AssociationViewNew "$UNNAMED$242" @1467
-				location   	(1535, 684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7120108"
-				roleview_list 	(list RoleViews
-				    (object RoleView "baseType" @1468
-					Parent_View 	@1467
-					location   	(175, -84)
-					label      	(object SegLabel @1469
-					    Parent_View 	@1468
-					    location   	(1559, 597)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+baseType"
-					    pctDist    	-1.977273
-					    height     	24
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7140151"
-					client     	@1467
-					supplier   	@1455
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 728)
-					    (1454, 728))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 728)
-					label      	(object SegLabel @1470
-					    Parent_View 	@1468
-					    location   	(1506, 683)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.027778
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$243" @1471
-					Parent_View 	@1467
-					location   	(175, -84)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A714015B"
-					client     	@1467
-					supplier   	@1455
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 641)
-					    (1454, 641))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 641))))
-			    (object AssociationViewNew "$UNNAMED$246" @1472
-				location   	(613, 940)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7ED03C0"
-				roleview_list 	(list RoleViews
-				    (object RoleView "complexType" @1473
-					Parent_View 	@1472
-					location   	(-747, 172)
-					label      	(object SegLabel @1474
-					    Parent_View 	@1473
-					    location   	(465, 983)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+complexType"
-					    pctDist    	0.373057
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40117"
-					client     	@1472
-					supplier   	@1308
-					vertices   	(list Points
-					    (613, 940)
-					    (284, 940)
-					    (284, 1008))
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(284, 1008)
-					label      	(object SegLabel @1475
-					    Parent_View 	@1473
-					    location   	(224, 972)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.909320
-					    height     	61
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$247" @1476
-					Parent_View 	@1472
-					location   	(-747, 172)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40121"
-					client     	@1472
-					supplier   	@1455
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(1010, 940))))
-			    (object InheritView "" @1477
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@1455
-				supplier   	@1285
-				line_style 	3
-				origin_attachment 	(1112, 562)
-				terminal_attachment 	(1112, 510)
-				drawSupplier 	@1286)
-			    (object InheritView "" @1478
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1307
-				supplier   	@1455
-				line_style 	3
-				origin_attachment 	(1146, 1088)
-				terminal_attachment 	(1146, 1065)
-				drawSupplier 	@1456)
-			    (object AssociationViewNew "$UNNAMED$244" @1479
-				location   	(1362, 1133)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A74B0178"
-				roleview_list 	(list RoleViews
-				    (object RoleView "simpleType" @1480
-					Parent_View 	@1479
-					location   	(-158, -163)
-					label      	(object SegLabel @1481
-					    Parent_View 	@1480
-					    location   	(1499, 1094)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+simpleType"
-					    pctDist    	-0.246753
-					    height     	137
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D017B"
-					client     	@1479
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 1292)
-					label      	(object SegLabel @1482
-					    Parent_View 	@1480
-					    location   	(1321, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.227273
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$245" @1483
-					Parent_View 	@1479
-					location   	(-158, -163)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D0185"
-					client     	@1479
-					supplier   	@1455
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 974))))
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @1484
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1484
-				    location   	(2002, 303)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@1484
-				    location   	(2002, 363)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	508
-				    compartmentItems 	(list Compartment
-					"+ global : boolean"
-					"+ featureReference : boolean"))
-				width      	558
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1485
-				location   	(2262, 568)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1484
-				vertices   	(list Points
-				    (2262, 568)
-				    (2262, 477)))
-			    (object InheritView "" @1486
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@1281
-				supplier   	@1484
-				line_style 	3
-				origin_attachment 	(2346, 595)
-				terminal_attachment 	(2346, 568)
-				drawSupplier 	@1485)
-			    (object AssociationViewNew "$UNNAMED$238" @1487
-				location   	(1553, 453)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A0F201A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "type" @1488
-					Parent_View 	@1487
-					location   	(801, 293)
-					label      	(object SegLabel @1489
-					    Parent_View 	@1488
-					    location   	(1331, 499)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+type"
-					    pctDist    	0.506266
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302E5"
-					client     	@1487
-					supplier   	@1455
-					vertices   	(list Points
-					    (1553, 453)
-					    (1222, 453)
-					    (1222, 562))
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1222, 562)
-					label      	(object SegLabel @1490
-					    Parent_View 	@1488
-					    location   	(1185, 479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.812030
-					    height     	38
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$239" @1491
-					Parent_View 	@1487
-					location   	(801, 293)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302F0"
-					client     	@1487
-					supplier   	@1484
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1993, 453))))
-			    (object AssociationViewNew "$UNNAMED$130" @1492
-				location   	(1908, 353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C29010602D7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedFeature" @1493
-					Parent_View 	@1492
-					location   	(-268, -159)
-					label      	(object SegLabel @1494
-					    Parent_View 	@1493
-					    location   	(1729, 352)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+resolvedFeature"
-					    pctDist    	-0.029412
-					    height     	180
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B000E"
-					client     	@1492
-					supplier   	@1484
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 387)
-					    (1993, 387))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 387)
-					label      	(object SegLabel @1495
-					    Parent_View 	@1493
-					    location   	(1945, 354)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.596639
-					    height     	34
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$131" @1496
-					Parent_View 	@1492
-					location   	(-268, -159)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B0018"
-					client     	@1492
-					supplier   	@1484
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 319)
-					    (1993, 319))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 319))))
-			    (object InheritView "" @1497
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@1285
-				supplier   	@1284
-				vertices   	(list Points
-				    (494, 284)
-				    (494, 244)
-				    (996, 244))
-				line_style 	3
-				origin_attachment 	(494, 284)
-				terminal_attachment 	(996, 244))
-			    (object InheritView "" @1498
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@1272
-				supplier   	@1484
-				line_style 	3
-				origin_attachment 	(1718, 812)
-				terminal_attachment 	(1718, 568)
-				drawSupplier 	@1485)
-			    (object InheritView "" @1499
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1309
-				supplier   	@1455
-				line_style 	3
-				origin_attachment 	(1265, 1292)
-				terminal_attachment 	(1265, 1065)
-				drawSupplier 	@1456)
-			    (object InheritView "" @1500
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@1484
-				supplier   	@1284
-				vertices   	(list Points
-				    (2147, 291)
-				    (2147, 244)
-				    (1468, 244))
-				line_style 	3
-				origin_attachment 	(2147, 291)
-				terminal_attachment 	(1468, 244)))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3ABFD9A70163"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::http" @1501
-			location   	(336, 224)
-			label      	(object ItemLabel
-			    Parent_View 	@1501
-			    location   	(192, 140)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"http")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3ABFD9AD01F8"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::wsdl" @1502
-			location   	(784, 224)
-			label      	(object ItemLabel
-			    Parent_View 	@1502
-			    location   	(640, 140)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsdl")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3ADFB8E5021E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::xsd" @1503
-			location   	(1232, 224)
-			label      	(object ItemLabel
-			    Parent_View 	@1503
-			    location   	(1088, 140)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"xsd")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39ABDC6F01AA"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3ABFD9A70152"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3ABFD9A7018B"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3ABFD9A70153"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3ABFD9A70155"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.http/src/rose/httpbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.http/src/rose/httpbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"IBM"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.http/src/rose/httpbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.http/src/rose/httpbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	"0")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"None"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"R2Editor"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"3ABFD9A70154"))

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java
deleted file mode 100644
index e5ab588..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Address</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.HTTPAddress#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPAddress()
- * @model 
- * @generated
- */
-public interface HTTPAddress extends ExtensibilityElement, javax.wsdl.extensions.http.HTTPAddress {
-	/**
-	 * Returns the value of the '<em><b>Location URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Location URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Location URI</em>' attribute.
-	 * @see #setLocationURI(String)
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPAddress_LocationURI()
-	 * @model 
-	 * @generated
-	 */
-	String getLocationURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.http.HTTPAddress#getLocationURI <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Location URI</em>' attribute.
-	 * @see #getLocationURI()
-	 * @generated
-	 */
-	void setLocationURI(String value);
-
-} // HTTPAddress

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java
deleted file mode 100644
index 573254c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.HTTPBinding#getVerb <em>Verb</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPBinding()
- * @model 
- * @generated
- */
-public interface HTTPBinding extends ExtensibilityElement, javax.wsdl.extensions.http.HTTPBinding {
-	/**
-	 * Returns the value of the '<em><b>Verb</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Verb</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Verb</em>' attribute.
-	 * @see #setVerb(String)
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPBinding_Verb()
-	 * @model 
-	 * @generated
-	 */
-	String getVerb();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.http.HTTPBinding#getVerb <em>Verb</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Verb</em>' attribute.
-	 * @see #getVerb()
-	 * @generated
-	 */
-	void setVerb(String value);
-
-} // HTTPBinding

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java
deleted file mode 100644
index bd582b1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- 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 -->
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage
- * @generated
- */
-public interface HTTPFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	HTTPFactory eINSTANCE = new org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Binding</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Binding</em>'.
-	 * @generated
-	 */
-	HTTPBinding createHTTPBinding();
-
-	/**
-	 * Returns a new object of class '<em>Operation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Operation</em>'.
-	 * @generated
-	 */
-	HTTPOperation createHTTPOperation();
-
-	/**
-	 * Returns a new object of class '<em>Url Replacement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Url Replacement</em>'.
-	 * @generated
-	 */
-	HTTPUrlReplacement createHTTPUrlReplacement();
-
-	/**
-	 * Returns a new object of class '<em>Url Encoded</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Url Encoded</em>'.
-	 * @generated
-	 */
-	HTTPUrlEncoded createHTTPUrlEncoded();
-
-	/**
-	 * Returns a new object of class '<em>Address</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Address</em>'.
-	 * @generated
-	 */
-	HTTPAddress createHTTPAddress();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	HTTPPackage getHTTPPackage();
-
-} //HTTPFactory

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java
deleted file mode 100644
index 170a9a1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.HTTPOperation#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPOperation()
- * @model 
- * @generated
- */
-public interface HTTPOperation extends ExtensibilityElement, javax.wsdl.extensions.http.HTTPOperation {
-	/**
-	 * Returns the value of the '<em><b>Location URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Location URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Location URI</em>' attribute.
-	 * @see #setLocationURI(String)
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPOperation_LocationURI()
-	 * @model 
-	 * @generated
-	 */
-	String getLocationURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.http.HTTPOperation#getLocationURI <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Location URI</em>' attribute.
-	 * @see #getLocationURI()
-	 * @generated
-	 */
-	void setLocationURI(String value);
-
-} // HTTPOperation

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java
deleted file mode 100644
index 19d659b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java
+++ /dev/null

@@ -1,612 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-/**
- * <!-- 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.eclipse.wst.wsdl.binding.http.HTTPFactory
- * @generated
- */
-public interface HTTPPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "http";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.ibm.com/wsdl/2003/HTTP";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "http";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	HTTPPackage eINSTANCE = org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPBindingImpl <em>Binding</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPBindingImpl
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getHTTPBinding()
-	 * @generated
-	 */
-	int HTTP_BINDING = 0;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Verb</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING__VERB = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Binding</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_BINDING_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPOperationImpl <em>Operation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPOperationImpl
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getHTTPOperation()
-	 * @generated
-	 */
-	int HTTP_OPERATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Location URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION__LOCATION_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Operation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_OPERATION_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPUrlReplacementImpl <em>Url Replacement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPUrlReplacementImpl
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getHTTPUrlReplacement()
-	 * @generated
-	 */
-	int HTTP_URL_REPLACEMENT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_REPLACEMENT__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_REPLACEMENT__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_REPLACEMENT__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_REPLACEMENT__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The number of structural features of the the '<em>Url Replacement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_REPLACEMENT_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPUrlEncodedImpl <em>Url Encoded</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPUrlEncodedImpl
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getHTTPUrlEncoded()
-	 * @generated
-	 */
-	int HTTP_URL_ENCODED = 3;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_ENCODED__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_ENCODED__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_ENCODED__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_ENCODED__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The number of structural features of the the '<em>Url Encoded</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_URL_ENCODED_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPAddressImpl <em>Address</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPAddressImpl
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getHTTPAddress()
-	 * @generated
-	 */
-	int HTTP_ADDRESS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Location URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS__LOCATION_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Address</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_ADDRESS_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.http.HTTPAddress <em>IHTTP Address</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.http.HTTPAddress
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getIHTTPAddress()
-	 * @generated
-	 */
-	int IHTTP_ADDRESS = 5;
-
-	/**
-	 * The number of structural features of the the '<em>IHTTP Address</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHTTP_ADDRESS_FEATURE_COUNT = 0;
-
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.http.HTTPBinding <em>IHTTP Binding</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.http.HTTPBinding
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getIHTTPBinding()
-	 * @generated
-	 */
-	int IHTTP_BINDING = 6;
-
-	/**
-	 * The number of structural features of the the '<em>IHTTP Binding</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHTTP_BINDING_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.http.HTTPOperation <em>IHTTP Operation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.http.HTTPOperation
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getIHTTPOperation()
-	 * @generated
-	 */
-	int IHTTP_OPERATION = 7;
-
-	/**
-	 * The number of structural features of the the '<em>IHTTP Operation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHTTP_OPERATION_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.http.HTTPUrlEncoded <em>IHTTP Url Encoded</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.http.HTTPUrlEncoded
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getIHTTPUrlEncoded()
-	 * @generated
-	 */
-	int IHTTP_URL_ENCODED = 8;
-
-	/**
-	 * The number of structural features of the the '<em>IHTTP Url Encoded</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHTTP_URL_ENCODED_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.http.HTTPUrlReplacement <em>IHTTP Url Replacement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.http.HTTPUrlReplacement
-	 * @see org.eclipse.wst.wsdl.binding.http.impl.HTTPPackageImpl#getIHTTPUrlReplacement()
-	 * @generated
-	 */
-	int IHTTP_URL_REPLACEMENT = 9;
-
-	/**
-	 * The number of structural features of the the '<em>IHTTP Url Replacement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IHTTP_URL_REPLACEMENT_FEATURE_COUNT = 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.http.HTTPBinding <em>Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Binding</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPBinding
-	 * @generated
-	 */
-	EClass getHTTPBinding();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.http.HTTPBinding#getVerb <em>Verb</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Verb</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPBinding#getVerb()
-	 * @see #getHTTPBinding()
-	 * @generated
-	 */
-	EAttribute getHTTPBinding_Verb();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.http.HTTPOperation <em>Operation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Operation</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPOperation
-	 * @generated
-	 */
-	EClass getHTTPOperation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.http.HTTPOperation#getLocationURI <em>Location URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Location URI</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPOperation#getLocationURI()
-	 * @see #getHTTPOperation()
-	 * @generated
-	 */
-	EAttribute getHTTPOperation_LocationURI();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement <em>Url Replacement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Url Replacement</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement
-	 * @generated
-	 */
-	EClass getHTTPUrlReplacement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded <em>Url Encoded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Url Encoded</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded
-	 * @generated
-	 */
-	EClass getHTTPUrlEncoded();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.http.HTTPAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Address</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPAddress
-	 * @generated
-	 */
-	EClass getHTTPAddress();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.http.HTTPAddress#getLocationURI <em>Location URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Location URI</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPAddress#getLocationURI()
-	 * @see #getHTTPAddress()
-	 * @generated
-	 */
-	EAttribute getHTTPAddress_LocationURI();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.http.HTTPAddress <em>IHTTP Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IHTTP Address</em>'.
-	 * @see javax.wsdl.extensions.http.HTTPAddress
-	 * @model instanceClass="javax.wsdl.extensions.http.HTTPAddress" 
-	 * @generated
-	 */
-	EClass getIHTTPAddress();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.http.HTTPBinding <em>IHTTP Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IHTTP Binding</em>'.
-	 * @see javax.wsdl.extensions.http.HTTPBinding
-	 * @model instanceClass="javax.wsdl.extensions.http.HTTPBinding" 
-	 * @generated
-	 */
-	EClass getIHTTPBinding();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.http.HTTPOperation <em>IHTTP Operation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IHTTP Operation</em>'.
-	 * @see javax.wsdl.extensions.http.HTTPOperation
-	 * @model instanceClass="javax.wsdl.extensions.http.HTTPOperation" 
-	 * @generated
-	 */
-	EClass getIHTTPOperation();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.http.HTTPUrlEncoded <em>IHTTP Url Encoded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IHTTP Url Encoded</em>'.
-	 * @see javax.wsdl.extensions.http.HTTPUrlEncoded
-	 * @model instanceClass="javax.wsdl.extensions.http.HTTPUrlEncoded" 
-	 * @generated
-	 */
-	EClass getIHTTPUrlEncoded();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.http.HTTPUrlReplacement <em>IHTTP Url Replacement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IHTTP Url Replacement</em>'.
-	 * @see javax.wsdl.extensions.http.HTTPUrlReplacement
-	 * @model instanceClass="javax.wsdl.extensions.http.HTTPUrlReplacement" 
-	 * @generated
-	 */
-	EClass getIHTTPUrlReplacement();
-
-	/**
-	 * 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
-	 */
-	HTTPFactory getHTTPFactory();
-
-} //HTTPPackage

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java
deleted file mode 100644
index d06c008..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Url Encoded</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPUrlEncoded()
- * @model 
- * @generated
- */
-public interface HTTPUrlEncoded extends ExtensibilityElement, javax.wsdl.extensions.http.HTTPUrlEncoded {
-} // HTTPUrlEncoded

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java
deleted file mode 100644
index 00d1dde..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Url Replacement</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage#getHTTPUrlReplacement()
- * @model 
- * @generated
- */
-public interface HTTPUrlReplacement extends ExtensibilityElement, javax.wsdl.extensions.http.HTTPUrlReplacement {
-} // HTTPUrlReplacement

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/generator/HTTPContentGenerator.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/generator/HTTPContentGenerator.java
deleted file mode 100644
index 5435b8b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/generator/HTTPContentGenerator.java
+++ /dev/null

@@ -1,267 +0,0 @@
-package org.eclipse.wst.wsdl.binding.http.internal.generator;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPFactory;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-import org.w3c.dom.Element;
-
-public class HTTPContentGenerator implements ContentGenerator
-{
-  public static final int VERB_POST = 0;
-  public static final int VERB_GET = 1;
-  public static final int VERB_NOT_SET = -1;
-
-  private int verbOption = VERB_NOT_SET;
-  protected String addressLocation = ContentGenerator.ADDRESS_LOCATION;
-
-  protected final static String[] requiredNamespaces = { "http://schemas.xmlsoap.org/wsdl/mime/", "http://schemas.xmlsoap.org/wsdl/http/" };
-
-  public void setVerb(int verb) {
-	  verbOption = verb;
-  }
-  
-  public void setAddressLocation(String addressLocation) {
-	  this.addressLocation = addressLocation;
-  }
-  
-  public String[] getRequiredNamespaces()
-  {
-    return requiredNamespaces;
-  }
-
-  public String getPreferredNamespacePrefix(String namespace)
-  {
-	  if (namespace.equals("http://schemas.xmlsoap.org/wsdl/mime/")) {
-		  return "mime";
-	  }
-	  else if (namespace.equals("http://schemas.xmlsoap.org/wsdl/http/")) {
-		  return "http";
-	  }
-
-	  return "";
-  }
-
-  public void generatePortContent(Port port)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(port.getEExtensibilityElements());
-	  removeExtensebilityElements(port.getEExtensibilityElements(), removeList);
-
-	  HTTPAddress httpAddress= HTTPFactory.eINSTANCE.createHTTPAddress();
-	  httpAddress.setLocationURI(addressLocation);
-	  port.addExtensibilityElement(httpAddress);
-  }
-
-  public void generateBindingContent(Binding binding, PortType portType)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(binding.getEExtensibilityElements());
-	  removeExtensebilityElements(binding.getEExtensibilityElements(), removeList);
-	
-	  HTTPBinding httpBinding = HTTPFactory.eINSTANCE.createHTTPBinding();
-	  httpBinding.setVerb(getVerbOption(binding) == VERB_POST ? "POST" : "GET");
-
-	  binding.addExtensibilityElement(httpBinding);
-  }
-
-  public void generateBindingOperationContent(BindingOperation bindingOperation, Operation operation)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingOperation.getEExtensibilityElements());
-	  removeExtensebilityElements(bindingOperation.getEExtensibilityElements(), removeList);
-	
-	  HTTPOperation httpOperation = HTTPFactory.eINSTANCE.createHTTPOperation();
-	  httpOperation.setLocationURI("/" + operation.getName());
-	  bindingOperation.addExtensibilityElement(httpOperation);
-  }
-
-  public void generateBindingInputContent(BindingInput bindingInput, Input input)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingInput.getEExtensibilityElements());
-	  
-	  // hack: we're being sneaky here. Set the 'verb' options now.
-	  int option = getVerbOption(bindingInput);
-	  removeExtensebilityElements(bindingInput.getEExtensibilityElements(), removeList);
-	  
-	  if (option == VERB_POST)
-	  {
-		  // TODO: Is there an equivalent HTTP Model Object for this?....
-		  Element element = createElement(bindingInput.getElement(), "mime", "content");
-		  element.setAttribute("type", "application/x-www-form-urlencoded");
-	  }
-	  else
-	  {
-		  HTTPUrlEncoded urlEncoded= HTTPFactory.eINSTANCE.createHTTPUrlEncoded();
-		  bindingInput.addExtensibilityElement(urlEncoded);
-	  }
-  }
-
-  public void generateBindingOutputContent(BindingOutput bindingOutput, Output output)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingOutput.getEExtensibilityElements());
-
-	  // hack: we're being sneaky here. Set the 'verb' options now.
-	  getVerbOption(bindingOutput);
-	  removeExtensebilityElements(bindingOutput.getEExtensibilityElements(), removeList);
-
-	  // TODO: Is there an equivalent HTTP Model Object for this?....
-	  Element bindingOutputElement = bindingOutput.getElement();
-	  Element element = createElement(bindingOutputElement, "mime", "content");
-	  element.setAttribute("type", "text/xml");
-  }
-
-  public void generateBindingFaultContent(BindingFault bindingFault, Fault fault)
-  {
-    //TODO!!
-  }
-
-  protected Element createElement(Element parentElement, String prefix, String elementName)
-  {
-    String name = prefix != null ? (prefix + ":" + elementName) : elementName;
-    Element result = parentElement.getOwnerDocument().createElement(name);
-	parentElement.insertBefore(result, parentElement.getFirstChild());
-//    parentElement.appendChild(result);
-    return result;
-  }
-  
-  /////////////////////  
-  private int getVerbOption(Object genericBindingObject) {
-	  if (verbOption == VERB_NOT_SET && genericBindingObject != null) {
-		  // init() was never called, try to determine the 'verb' based on what we have/know
-		  Binding binding = getBindingObject(genericBindingObject);
-		  
-		  // Try to determine the verb from the Binding Object
-		  if (binding != null) {
-			  List list = binding.getEExtensibilityElements();
-			  Iterator valuesIt = getExtensibilityElementAttributeValue(list, "verb").iterator();
-
-			  while (valuesIt.hasNext()) {
-				  String verb = (String) valuesIt.next();
-				  
-				  if (verb.equals("POST")) {
-					  verbOption = VERB_POST;
-				  }
-				  else if (verb.equals("GET")) {
-					  verbOption = VERB_GET;
-				  }
-				  
-				  if (verbOption != VERB_NOT_SET) {
-					  break;
-				  }
-			  }
-		  }
-	  }
-	  
-	  if (verbOption == VERB_NOT_SET) {
-		  verbOption = VERB_GET;
-	  }
-	  
-	  return verbOption;
-  }
-  
-  private List getExtensibilityElementAttributeValue(List eeList, String attributeKey) {
-	  List values = new ArrayList();
-	  Iterator eeElementsIt = eeList.iterator();
-	  
-	  while (eeElementsIt.hasNext()) {
-		  ExtensibilityElement eeElement = (ExtensibilityElement) eeElementsIt.next();
-		  String attributeValue = eeElement.getElement().getAttribute(attributeKey);
-		  if (attributeValue != null && !attributeValue.equals("")) {
-			  values.add(attributeValue);
-		  }		  
-	  }
-	  
-	  return values;
-  }
-  
-  private Binding getBindingObject(Object genericBindingObject) {
-	  Object parent = genericBindingObject;
-	  
-	  int index = 0;
-	  while (parent != null && index < 5) {
-		  parent = getGenericBindingObjectParent(parent);
-		  if (parent instanceof Binding) {
-			  break;
-		  }
-		  index++;
-	  }
-
-	  return (parent instanceof Binding)? (Binding) parent : null;
-  }
-  
-  private List getMessageReferenceBindingObjects(Object genericBindingObject) {
-	  List list = new ArrayList();
-	  Binding binding = getBindingObject(genericBindingObject);
-	  
-	  if (binding != null) {
-		  Iterator operationsIt = binding.getEBindingOperations().iterator();
-	  
-		  while (operationsIt.hasNext()) {
-			  BindingOperation op = (BindingOperation) operationsIt.next();
-			  list.add(op.getEBindingInput());
-			  list.add(op.getEBindingOutput());
-			  list.addAll(op.getEBindingFaults());
-		  }	  
-	  }
-	  
-	  return list;
-  }
-  
-  private Object getGenericBindingObjectParent(Object genericBindingObject) {
-	  Object parent = null;
-	  
-	  if (genericBindingObject != null) {
-		  if (genericBindingObject instanceof BindingOperation) {
-			  parent = ((BindingOperation) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingInput) {
-			  parent = ((BindingInput) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingOutput) {
-			  parent = ((BindingOutput) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingFault) {
-			  parent = ((BindingFault) genericBindingObject).getContainer();
-		  }	  
-	  }
-	  
-	  return parent;	  
-  }
-  
-  private void removeExtensebilityElements(List originalList, List removeList) {
-	  Iterator removeIt = removeList.iterator();
-	  while (removeIt.hasNext()) {
-		  originalList.remove(removeIt.next());
-	  }
-  }
-  
-  public String getProtocol() {
-	  return "HTTP";
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java
deleted file mode 100644
index 741d450..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java
+++ /dev/null

@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Address</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPAddressImpl#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HTTPAddressImpl extends ExtensibilityElementImpl implements HTTPAddress {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * The default value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocationURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCATION_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocationURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String locationURI = LOCATION_URI_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPAddressImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return HTTPPackage.eINSTANCE.getHTTPAddress();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocationURI() {
-		return locationURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocationURI(String newLocationURI) {
-		String oldLocationURI = locationURI;
-		locationURI = newLocationURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HTTPPackage.HTTP_ADDRESS__LOCATION_URI, oldLocationURI, locationURI));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_ADDRESS__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT:
-				return getElement();
-			case HTTPPackage.HTTP_ADDRESS__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT_TYPE:
-				return getElementType();
-			case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-				return getLocationURI();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_ADDRESS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-				setLocationURI((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_ADDRESS__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-				setLocationURI(LOCATION_URI_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_ADDRESS__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case HTTPPackage.HTTP_ADDRESS__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case HTTPPackage.HTTP_ADDRESS__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-				return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (locationURI: ");
-		result.append(locationURI);
-		result.append(')');
-		return result.toString();
-	}
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  	setLocationURI
-      (HTTPConstants.getAttribute(changedElement, HTTPConstants.LOCATION_URI_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == HTTPPackage.eINSTANCE.getHTTPAddress_LocationURI())
-        niceSetAttribute(theElement,HTTPConstants.LOCATION_URI_ATTRIBUTE,getLocationURI());
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(HTTPConstants.HTTP_NAMESPACE_URI, HTTPConstants.ADDRESS_ELEMENT_TAG);
-    return elementType;
-  }
-} //HTTPAddressImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java
deleted file mode 100644
index beb4bbb..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java
+++ /dev/null

@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPBindingImpl#getVerb <em>Verb</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HTTPBindingImpl extends ExtensibilityElementImpl implements HTTPBinding {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * The default value of the '{@link #getVerb() <em>Verb</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVerb()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERB_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVerb() <em>Verb</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVerb()
-	 * @generated
-	 * @ordered
-	 */
-	protected String verb = VERB_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPBindingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return HTTPPackage.eINSTANCE.getHTTPBinding();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVerb() {
-		return verb;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVerb(String newVerb) {
-		String oldVerb = verb;
-		verb = newVerb;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HTTPPackage.HTTP_BINDING__VERB, oldVerb, verb));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_BINDING__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case HTTPPackage.HTTP_BINDING__ELEMENT:
-				return getElement();
-			case HTTPPackage.HTTP_BINDING__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case HTTPPackage.HTTP_BINDING__ELEMENT_TYPE:
-				return getElementType();
-			case HTTPPackage.HTTP_BINDING__VERB:
-				return getVerb();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_BINDING__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_BINDING__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_BINDING__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case HTTPPackage.HTTP_BINDING__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case HTTPPackage.HTTP_BINDING__VERB:
-				setVerb((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_BINDING__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_BINDING__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_BINDING__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_BINDING__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_BINDING__VERB:
-				setVerb(VERB_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_BINDING__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case HTTPPackage.HTTP_BINDING__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case HTTPPackage.HTTP_BINDING__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case HTTPPackage.HTTP_BINDING__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case HTTPPackage.HTTP_BINDING__VERB:
-				return VERB_EDEFAULT == null ? verb != null : !VERB_EDEFAULT.equals(verb);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (verb: ");
-		result.append(verb);
-		result.append(')');
-		return result.toString();
-	}
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  	setVerb
-      (HTTPConstants.getAttribute(changedElement, HTTPConstants.VERB_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == HTTPPackage.eINSTANCE.getHTTPBinding_Verb())
-        niceSetAttribute(theElement,HTTPConstants.VERB_ATTRIBUTE,getVerb());
-    }
-  }
-
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(HTTPConstants.HTTP_NAMESPACE_URI, HTTPConstants.BINDING_ELEMENT_TAG);
-    return elementType;
-  }
-  
-} //HTTPBindingImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java
deleted file mode 100644
index 9c1e97e..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPFactory;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class HTTPFactoryImpl extends EFactoryImpl implements HTTPFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case HTTPPackage.HTTP_BINDING: return createHTTPBinding();
-			case HTTPPackage.HTTP_OPERATION: return createHTTPOperation();
-			case HTTPPackage.HTTP_URL_REPLACEMENT: return createHTTPUrlReplacement();
-			case HTTPPackage.HTTP_URL_ENCODED: return createHTTPUrlEncoded();
-			case HTTPPackage.HTTP_ADDRESS: return createHTTPAddress();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPBinding createHTTPBinding() {
-		HTTPBindingImpl httpBinding = new HTTPBindingImpl();
-		return httpBinding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPOperation createHTTPOperation() {
-		HTTPOperationImpl httpOperation = new HTTPOperationImpl();
-		return httpOperation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPUrlReplacement createHTTPUrlReplacement() {
-		HTTPUrlReplacementImpl httpUrlReplacement = new HTTPUrlReplacementImpl();
-		return httpUrlReplacement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPUrlEncoded createHTTPUrlEncoded() {
-		HTTPUrlEncodedImpl httpUrlEncoded = new HTTPUrlEncodedImpl();
-		return httpUrlEncoded;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPAddress createHTTPAddress() {
-		HTTPAddressImpl httpAddress = new HTTPAddressImpl();
-		return httpAddress;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPPackage getHTTPPackage() {
-		return (HTTPPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static HTTPPackage getPackage() {
-		return HTTPPackage.eINSTANCE;
-	}
-} //HTTPFactoryImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java
deleted file mode 100644
index d266baa..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java
+++ /dev/null

@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.http.impl.HTTPOperationImpl#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HTTPOperationImpl extends ExtensibilityElementImpl implements HTTPOperation {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * The default value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocationURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCATION_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocationURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String locationURI = LOCATION_URI_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPOperationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return HTTPPackage.eINSTANCE.getHTTPOperation();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocationURI() {
-		return locationURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocationURI(String newLocationURI) {
-		String oldLocationURI = locationURI;
-		locationURI = newLocationURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HTTPPackage.HTTP_OPERATION__LOCATION_URI, oldLocationURI, locationURI));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_OPERATION__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case HTTPPackage.HTTP_OPERATION__ELEMENT:
-				return getElement();
-			case HTTPPackage.HTTP_OPERATION__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT_TYPE:
-				return getElementType();
-			case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-				return getLocationURI();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_OPERATION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_OPERATION__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-				setLocationURI((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_OPERATION__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_OPERATION__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-				setLocationURI(LOCATION_URI_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_OPERATION__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case HTTPPackage.HTTP_OPERATION__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case HTTPPackage.HTTP_OPERATION__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case HTTPPackage.HTTP_OPERATION__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-				return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (locationURI: ");
-		result.append(locationURI);
-		result.append(')');
-		return result.toString();
-	}
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  	setLocationURI
-      (HTTPConstants.getAttribute(changedElement, HTTPConstants.LOCATION_URI_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == HTTPPackage.eINSTANCE.getHTTPOperation_LocationURI())
-        niceSetAttribute(theElement,HTTPConstants.LOCATION_URI_ATTRIBUTE,getLocationURI());
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(HTTPConstants.HTTP_NAMESPACE_URI, HTTPConstants.OPERATION_ELEMENT_TAG);
-    return elementType;
-  }
-  
-} //HTTPOperationImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java
deleted file mode 100644
index 4c1adab..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java
+++ /dev/null

@@ -1,412 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPFactory;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class HTTPPackageImpl extends EPackageImpl implements HTTPPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpBindingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpOperationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpUrlReplacementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpUrlEncodedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpAddressEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ihttpAddressEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ihttpBindingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ihttpOperationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ihttpUrlEncodedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ihttpUrlReplacementEClass = 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.eclipse.wst.wsdl.binding.http.HTTPPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private HTTPPackageImpl() {
-		super(eNS_URI, HTTPFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- 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 HTTPPackage init() {
-		if (isInited) return (HTTPPackage)EPackage.Registry.INSTANCE.get(HTTPPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		HTTPPackageImpl theHTTPPackage = (HTTPPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HTTPPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XSDPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)(EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) : WSDLPackageImpl.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theHTTPPackage.createPackageContents();
-		theWSDLPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theHTTPPackage.initializePackageContents();
-		theWSDLPackage.initializePackageContents();
-
-		return theHTTPPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPBinding() {
-		return httpBindingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHTTPBinding_Verb() {
-		return (EAttribute)httpBindingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPOperation() {
-		return httpOperationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHTTPOperation_LocationURI() {
-		return (EAttribute)httpOperationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPUrlReplacement() {
-		return httpUrlReplacementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPUrlEncoded() {
-		return httpUrlEncodedEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHTTPAddress() {
-		return httpAddressEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHTTPAddress_LocationURI() {
-		return (EAttribute)httpAddressEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIHTTPAddress() {
-		return ihttpAddressEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIHTTPBinding() {
-		return ihttpBindingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIHTTPOperation() {
-		return ihttpOperationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIHTTPUrlEncoded() {
-		return ihttpUrlEncodedEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIHTTPUrlReplacement() {
-		return ihttpUrlReplacementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPFactory getHTTPFactory() {
-		return (HTTPFactory)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
-		httpBindingEClass = createEClass(HTTP_BINDING);
-		createEAttribute(httpBindingEClass, HTTP_BINDING__VERB);
-
-		httpOperationEClass = createEClass(HTTP_OPERATION);
-		createEAttribute(httpOperationEClass, HTTP_OPERATION__LOCATION_URI);
-
-		httpUrlReplacementEClass = createEClass(HTTP_URL_REPLACEMENT);
-
-		httpUrlEncodedEClass = createEClass(HTTP_URL_ENCODED);
-
-		httpAddressEClass = createEClass(HTTP_ADDRESS);
-		createEAttribute(httpAddressEClass, HTTP_ADDRESS__LOCATION_URI);
-
-		ihttpAddressEClass = createEClass(IHTTP_ADDRESS);
-
-		ihttpBindingEClass = createEClass(IHTTP_BINDING);
-
-		ihttpOperationEClass = createEClass(IHTTP_OPERATION);
-
-		ihttpUrlEncodedEClass = createEClass(IHTTP_URL_ENCODED);
-
-		ihttpUrlReplacementEClass = createEClass(IHTTP_URL_REPLACEMENT);
-	}
-
-	/**
-	 * <!-- 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
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-
-		// Add supertypes to classes
-		httpBindingEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		httpBindingEClass.getESuperTypes().add(this.getIHTTPBinding());
-		httpOperationEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		httpOperationEClass.getESuperTypes().add(this.getIHTTPOperation());
-		httpUrlReplacementEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		httpUrlReplacementEClass.getESuperTypes().add(this.getIHTTPUrlReplacement());
-		httpUrlEncodedEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		httpUrlEncodedEClass.getESuperTypes().add(this.getIHTTPUrlEncoded());
-		httpAddressEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		httpAddressEClass.getESuperTypes().add(this.getIHTTPAddress());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(httpBindingEClass, HTTPBinding.class, "HTTPBinding", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getHTTPBinding_Verb(), ecorePackage.getEString(), "verb", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(httpOperationEClass, HTTPOperation.class, "HTTPOperation", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getHTTPOperation_LocationURI(), ecorePackage.getEString(), "locationURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(httpUrlReplacementEClass, HTTPUrlReplacement.class, "HTTPUrlReplacement", !IS_ABSTRACT, !IS_INTERFACE);
-
-		initEClass(httpUrlEncodedEClass, HTTPUrlEncoded.class, "HTTPUrlEncoded", !IS_ABSTRACT, !IS_INTERFACE);
-
-		initEClass(httpAddressEClass, HTTPAddress.class, "HTTPAddress", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getHTTPAddress_LocationURI(), ecorePackage.getEString(), "locationURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ihttpAddressEClass, javax.wsdl.extensions.http.HTTPAddress.class, "IHTTPAddress", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(ihttpBindingEClass, javax.wsdl.extensions.http.HTTPBinding.class, "IHTTPBinding", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(ihttpOperationEClass, javax.wsdl.extensions.http.HTTPOperation.class, "IHTTPOperation", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(ihttpUrlEncodedEClass, javax.wsdl.extensions.http.HTTPUrlEncoded.class, "IHTTPUrlEncoded", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(ihttpUrlReplacementEClass, javax.wsdl.extensions.http.HTTPUrlReplacement.class, "IHTTPUrlReplacement", IS_ABSTRACT, IS_INTERFACE);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //HTTPPackageImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java
deleted file mode 100644
index f681e94..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Url Encoded</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class HTTPUrlEncodedImpl extends ExtensibilityElementImpl implements HTTPUrlEncoded {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPUrlEncodedImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return HTTPPackage.eINSTANCE.getHTTPUrlEncoded();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_ENCODED__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT:
-				return getElement();
-			case HTTPPackage.HTTP_URL_ENCODED__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT_TYPE:
-				return getElementType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_ENCODED__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_ENCODED__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_ENCODED__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case HTTPPackage.HTTP_URL_ENCODED__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case HTTPPackage.HTTP_URL_ENCODED__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	  public QName getElementType()
-	  {
-	    if (elementType == null)
-	      elementType = new QName(HTTPConstants.HTTP_NAMESPACE_URI, HTTPConstants.URL_ENCODED_ELEMENT_TAG);
-	    return elementType;
-	  }
-	  
-} //HTTPUrlEncodedImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java
deleted file mode 100644
index d58b4e8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
-import org.eclipse.wst.wsdl.binding.http.internal.util.HTTPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Url Replacement</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class HTTPUrlReplacementImpl extends ExtensibilityElementImpl implements HTTPUrlReplacement {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPUrlReplacementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return HTTPPackage.eINSTANCE.getHTTPUrlReplacement();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_REPLACEMENT__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT:
-				return getElement();
-			case HTTPPackage.HTTP_URL_REPLACEMENT__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT_TYPE:
-				return getElementType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_REPLACEMENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_REPLACEMENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case HTTPPackage.HTTP_URL_REPLACEMENT__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case HTTPPackage.HTTP_URL_REPLACEMENT__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case HTTPPackage.HTTP_URL_REPLACEMENT__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	  public QName getElementType()
-	  {
-	    if (elementType == null)
-	      elementType = new QName(HTTPConstants.HTTP_NAMESPACE_URI, HTTPConstants.URL_REPLACEMENT_ELEMENT_TAG);
-	    return elementType;
-	  }
-	  
-} //HTTPUrlReplacementImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java
deleted file mode 100644
index bf7481a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java
+++ /dev/null

@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage
- * @generated
- */
-public class HTTPAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static HTTPPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = HTTPPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPSwitch modelSwitch =
-		new HTTPSwitch() {
-			public Object caseHTTPBinding(HTTPBinding object) {
-				return createHTTPBindingAdapter();
-			}
-			public Object caseHTTPOperation(HTTPOperation object) {
-				return createHTTPOperationAdapter();
-			}
-			public Object caseHTTPUrlReplacement(HTTPUrlReplacement object) {
-				return createHTTPUrlReplacementAdapter();
-			}
-			public Object caseHTTPUrlEncoded(HTTPUrlEncoded object) {
-				return createHTTPUrlEncodedAdapter();
-			}
-			public Object caseHTTPAddress(HTTPAddress object) {
-				return createHTTPAddressAdapter();
-			}
-			public Object caseIHTTPAddress(javax.wsdl.extensions.http.HTTPAddress object) {
-				return createIHTTPAddressAdapter();
-			}
-			public Object caseIHTTPBinding(javax.wsdl.extensions.http.HTTPBinding object) {
-				return createIHTTPBindingAdapter();
-			}
-			public Object caseIHTTPOperation(javax.wsdl.extensions.http.HTTPOperation object) {
-				return createIHTTPOperationAdapter();
-			}
-			public Object caseIHTTPUrlEncoded(javax.wsdl.extensions.http.HTTPUrlEncoded object) {
-				return createIHTTPUrlEncodedAdapter();
-			}
-			public Object caseIHTTPUrlReplacement(javax.wsdl.extensions.http.HTTPUrlReplacement object) {
-				return createIHTTPUrlReplacementAdapter();
-			}
-			public Object caseWSDLElement(WSDLElement object) {
-				return createWSDLElementAdapter();
-			}
-			public Object caseIExtensibilityElement(ExtensibilityElement object) {
-				return createIExtensibilityElementAdapter();
-			}
-			public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object) {
-				return createExtensibilityElementAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.http.HTTPBinding <em>Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPBinding
-	 * @generated
-	 */
-	public Adapter createHTTPBindingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.http.HTTPOperation <em>Operation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPOperation
-	 * @generated
-	 */
-	public Adapter createHTTPOperationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement <em>Url Replacement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement
-	 * @generated
-	 */
-	public Adapter createHTTPUrlReplacementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded <em>Url Encoded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded
-	 * @generated
-	 */
-	public Adapter createHTTPUrlEncodedAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.http.HTTPAddress <em>Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.http.HTTPAddress
-	 * @generated
-	 */
-	public Adapter createHTTPAddressAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.http.HTTPAddress <em>IHTTP Address</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.http.HTTPAddress
-	 * @generated
-	 */
-	public Adapter createIHTTPAddressAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.http.HTTPBinding <em>IHTTP Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.http.HTTPBinding
-	 * @generated
-	 */
-	public Adapter createIHTTPBindingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.http.HTTPOperation <em>IHTTP Operation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.http.HTTPOperation
-	 * @generated
-	 */
-	public Adapter createIHTTPOperationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.http.HTTPUrlEncoded <em>IHTTP Url Encoded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.http.HTTPUrlEncoded
-	 * @generated
-	 */
-	public Adapter createIHTTPUrlEncodedAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.http.HTTPUrlReplacement <em>IHTTP Url Replacement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.http.HTTPUrlReplacement
-	 * @generated
-	 */
-	public Adapter createIHTTPUrlReplacementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.WSDLElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.WSDLElement
-	 * @generated
-	 */
-	public Adapter createWSDLElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.ExtensibilityElement
-	 * @generated
-	 */
-	public Adapter createIExtensibilityElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.ExtensibilityElement <em>Extensibility Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.ExtensibilityElement
-	 * @generated
-	 */
-	public Adapter createExtensibilityElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //HTTPAdapterFactory

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java
deleted file mode 100644
index 1b46a1a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.util;
-
-import org.w3c.dom.Element;
-
-public final class HTTPConstants 
-{
-  public static final String ADDRESS_ELEMENT_TAG = "address";
-  public static final String BINDING_ELEMENT_TAG = "binding";
-  public static final String OPERATION_ELEMENT_TAG = "operation";
-  public static final String URL_ENCODED_ELEMENT_TAG = "urlEncoded";
-  public static final String URL_REPLACEMENT_ELEMENT_TAG = "urlReplacement";
-  
-  public static final String HTTP_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/http/";
-
-  public static final String LOCATION_URI_ATTRIBUTE ="location";
-  public static final String VERB_ATTRIBUTE ="verb";
-  
-  public static String getAttribute(Element element, String attributeName)
-  {
-    return element.hasAttribute(attributeName) ? element.getAttribute(attributeName) : null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java
deleted file mode 100644
index ef962d1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.util;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.binding.http.HTTPFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-
-public class HTTPExtensibilityElementFactory implements ExtensibilityElementFactory
-{
-  public ExtensibilityElement createExtensibilityElement(String namespace, String localName)
-  {
-    if (HTTPConstants.HTTP_NAMESPACE_URI.equals(namespace))
-    {
-      if (HTTPConstants.ADDRESS_ELEMENT_TAG.equals(localName))
-      {
-        return HTTPFactory.eINSTANCE.createHTTPAddress();
-      }
-      else if (HTTPConstants.BINDING_ELEMENT_TAG.equals(localName))
-      {
-        return HTTPFactory.eINSTANCE.createHTTPBinding();
-      }
-      else if (HTTPConstants.OPERATION_ELEMENT_TAG.equals(localName))
-      {
-        return HTTPFactory.eINSTANCE.createHTTPOperation();
-      }
-      else if (HTTPConstants.URL_ENCODED_ELEMENT_TAG.equals(localName))
-      {
-      	return HTTPFactory.eINSTANCE.createHTTPUrlEncoded();
-      }
-      else if (HTTPConstants.URL_REPLACEMENT_ELEMENT_TAG.equals(localName))
-      {
-      	return HTTPFactory.eINSTANCE.createHTTPUrlReplacement();
-      }
-      else
-      {
-        //System.out.println("Unhandled localName: " + localName);
-        return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-      }
-    }
-    else
-    {
-      //System.out.println("Unhandled namespace: " + namespace);
-      return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java
deleted file mode 100644
index 2dd03f2..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java
+++ /dev/null

@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.http.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.http.HTTPPackage
- * @generated
- */
-public class HTTPSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static HTTPPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPSwitch() {
-		if (modelPackage == null) {
-			modelPackage = HTTPPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case HTTPPackage.HTTP_BINDING: {
-					HTTPBinding httpBinding = (HTTPBinding)theEObject;
-					Object result = caseHTTPBinding(httpBinding);
-					if (result == null) result = caseExtensibilityElement(httpBinding);
-					if (result == null) result = caseIHTTPBinding(httpBinding);
-					if (result == null) result = caseWSDLElement(httpBinding);
-					if (result == null) result = caseIExtensibilityElement(httpBinding);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case HTTPPackage.HTTP_OPERATION: {
-					HTTPOperation httpOperation = (HTTPOperation)theEObject;
-					Object result = caseHTTPOperation(httpOperation);
-					if (result == null) result = caseExtensibilityElement(httpOperation);
-					if (result == null) result = caseIHTTPOperation(httpOperation);
-					if (result == null) result = caseWSDLElement(httpOperation);
-					if (result == null) result = caseIExtensibilityElement(httpOperation);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case HTTPPackage.HTTP_URL_REPLACEMENT: {
-					HTTPUrlReplacement httpUrlReplacement = (HTTPUrlReplacement)theEObject;
-					Object result = caseHTTPUrlReplacement(httpUrlReplacement);
-					if (result == null) result = caseExtensibilityElement(httpUrlReplacement);
-					if (result == null) result = caseIHTTPUrlReplacement(httpUrlReplacement);
-					if (result == null) result = caseWSDLElement(httpUrlReplacement);
-					if (result == null) result = caseIExtensibilityElement(httpUrlReplacement);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case HTTPPackage.HTTP_URL_ENCODED: {
-					HTTPUrlEncoded httpUrlEncoded = (HTTPUrlEncoded)theEObject;
-					Object result = caseHTTPUrlEncoded(httpUrlEncoded);
-					if (result == null) result = caseExtensibilityElement(httpUrlEncoded);
-					if (result == null) result = caseIHTTPUrlEncoded(httpUrlEncoded);
-					if (result == null) result = caseWSDLElement(httpUrlEncoded);
-					if (result == null) result = caseIExtensibilityElement(httpUrlEncoded);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case HTTPPackage.HTTP_ADDRESS: {
-					HTTPAddress httpAddress = (HTTPAddress)theEObject;
-					Object result = caseHTTPAddress(httpAddress);
-					if (result == null) result = caseExtensibilityElement(httpAddress);
-					if (result == null) result = caseIHTTPAddress(httpAddress);
-					if (result == null) result = caseWSDLElement(httpAddress);
-					if (result == null) result = caseIExtensibilityElement(httpAddress);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Binding</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Binding</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPBinding(HTTPBinding object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Operation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Operation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPOperation(HTTPOperation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Url Replacement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Url Replacement</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPUrlReplacement(HTTPUrlReplacement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Url Encoded</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Url Encoded</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPUrlEncoded(HTTPUrlEncoded object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Address</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Address</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPAddress(HTTPAddress object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IHTTP Address</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IHTTP Address</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIHTTPAddress(javax.wsdl.extensions.http.HTTPAddress object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IHTTP Binding</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IHTTP Binding</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIHTTPBinding(javax.wsdl.extensions.http.HTTPBinding object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IHTTP Operation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IHTTP Operation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIHTTPOperation(javax.wsdl.extensions.http.HTTPOperation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IHTTP Url Encoded</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IHTTP Url Encoded</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIHTTPUrlEncoded(javax.wsdl.extensions.http.HTTPUrlEncoded object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IHTTP Url Replacement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IHTTP Url Replacement</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIHTTPUrlReplacement(javax.wsdl.extensions.http.HTTPUrlReplacement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWSDLElement(WSDLElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIExtensibilityElement(ExtensibilityElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //HTTPSwitch

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/model/MIME.genmodel b/bundles/org.eclipse.wst.wsdl/src-mime/model/MIME.genmodel
deleted file mode 100644
index d70dc5b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/model/MIME.genmodel
+++ /dev/null

@@ -1,428 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.ibm.etools.wsdl.binding.mime/src"
-    editDirectory="/com.ibm.etools.wsdl.binding.mime.edit/src" editorDirectory="/com.ibm.etools.wsdl.binding.mime.editor/src"
-    modelPluginID="com.ibm.etools.wsdl.binding.mime" modelName="MIME" editPluginClass=""
-    editorPluginClass="" usedGenPackages="../../../org.eclipse.xsd/src/model/XSD.genmodel#//xsd">
-  <foreignModel>..\rose\mime.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="MIME" basePackage="com.ibm.etools.wsdl.binding" ecorePackage="mime.ecore#/">
-    <genDataTypes ecoreDataType="mime.ecore#//List"/>
-    <genClasses ecoreClass="mime.ecore#//MIMEContent">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mime.ecore#//MIMEContent/type"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference mime.ecore#//MIMEContent/ePart"/>
-      <genOperations ecoreOperation="mime.ecore#//MIMEContent/setPart">
-        <genParameters ecoreParameter="mime.ecore#//MIMEContent/setPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="mime.ecore#//MIMEContent/getPart"/>
-    </genClasses>
-    <genClasses ecoreClass="mime.ecore#//MIMEPart">
-      <genOperations ecoreOperation="mime.ecore#//MIMEPart/addExtensibilityElement">
-        <genParameters ecoreParameter="mime.ecore#//MIMEPart/addExtensibilityElement/extensibilityElement"/>
-      </genOperations>
-      <genOperations ecoreOperation="mime.ecore#//MIMEPart/getExtensibilityElements"/>
-    </genClasses>
-    <genClasses ecoreClass="mime.ecore#//MIMEMultipartRelated">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mime.ecore#//MIMEMultipartRelated/eMIMEPart"/>
-      <genOperations ecoreOperation="mime.ecore#//MIMEMultipartRelated/addMIMEPart">
-        <genParameters ecoreParameter="mime.ecore#//MIMEMultipartRelated/addMIMEPart/mimePart"/>
-      </genOperations>
-      <genOperations ecoreOperation="mime.ecore#//MIMEMultipartRelated/getMIMEParts"/>
-    </genClasses>
-    <genClasses ecoreClass="mime.ecore#//MIMEMimeXml">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference mime.ecore#//MIMEMimeXml/ePart"/>
-      <genOperations ecoreOperation="mime.ecore#//MIMEMimeXml/setPart">
-        <genParameters ecoreParameter="mime.ecore#//MIMEMimeXml/setPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="mime.ecore#//MIMEMimeXml/getPart"/>
-    </genClasses>
-    <genClasses ecoreClass="mime.ecore#//IMIMEPart"/>
-    <genClasses ecoreClass="mime.ecore#//IMIMEMultipartRelated"/>
-    <genClasses ecoreClass="mime.ecore#//IMIMEContent"/>
-    <genClasses ecoreClass="mime.ecore#//IMIMEMimeXml"/>
-  </genPackages>
-  <genPackages prefix="WSDL" basePackage="com.ibm.etools" ecorePackage="wsdl.ecore#/">
-    <genDataTypes ecoreDataType="wsdl.ecore#//QName"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//OperationType"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMElement"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//WSDLException"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMDocument"/>
-    <genClasses ecoreClass="wsdl.ecore#//WSDLElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/documentationElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/element"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/getEnclosingDefinition"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/setEnclosingDefinition">
-        <genParameters ecoreParameter="wsdl.ecore#//WSDLElement/setEnclosingDefinition/definition"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//PortType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//PortType/eOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Operation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/style"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eFaults"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eParameterOrdering"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Message">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Message/eParts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Part">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/elementName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/typeName"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/typeDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/elementDeclaration"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/eMessage"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Binding">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/resourceURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/ePortType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/eBindingOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOperation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOperation/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eOperation"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingFaults"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Service">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Service/ePorts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Port">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Port/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Port/eBinding"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibilityElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/required"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/elementType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Definition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/targetNamespace"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/location"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/encoding"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eMessages"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/ePortTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eBindings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eServices"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eNamespaces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/getDocument"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/setDocument">
-        <genParameters ecoreParameter="wsdl.ecore#//Definition/setDocument/document"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Import">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/namespaceURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/locationURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/getSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/setSchema">
-        <genParameters ecoreParameter="wsdl.ecore#//Import/setSchema/schema"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibleElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//ExtensibleElement/eExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/getExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/addExtensibilityElement">
-        <genParameters ecoreParameter="wsdl.ecore#//ExtensibleElement/addExtensibilityElement/extElement"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Input"/>
-    <genClasses ecoreClass="wsdl.ecore#//Output"/>
-    <genClasses ecoreClass="wsdl.ecore#//Fault"/>
-    <genClasses ecoreClass="wsdl.ecore#//BindingInput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingInput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingInput/eInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingInput/setInput/input"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOutput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOutput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOutput/eOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingOutput/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingFault">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingFault/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingFault/eFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/getFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/setFault">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingFault/setFault/fault"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Namespace">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/URI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/prefix"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPortType">
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/addOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/addOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/addFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/addFault/fault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/getFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getParameterOrdering"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setParameterOrdering">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setParameterOrdering/parameterOrder"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setInput/input"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IInput">
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IInput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOutput">
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IOutput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IFault">
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IFault/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IMessage">
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/addPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/addPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getPart/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getParts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getOrderedParts">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getOrderedParts/partOrder"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPart">
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/setExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttributeNames"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/getExtensionAttribute/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IService">
-      <genOperations ecoreOperation="wsdl.ecore#//IService/addPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/addPort/port"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPorts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/getPort/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPort">
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/getBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/setBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IPort/setBinding/binding"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBinding">
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/addBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/addBindingOperation/bindingOperation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperations"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/setPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/setPortType/portType"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/addBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/addBindingFault/bindingFault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/getBindingFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingInput/bindingInput"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingOutput/bindingOutput"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingInput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOutput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingFault"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensibilityElement"/>
-    <genClasses ecoreClass="wsdl.ecore#//IDefinition">
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addBinding/binding"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addImport">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addImport/importDef"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addMessage/message"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/prefix"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addPortType/portType"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addService/service"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createImport"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPart"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPort"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createService"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBindings"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports.1">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getImports.1/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessages"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getNamespace/prefix"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespaces"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPrefix">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPrefix/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getServices"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getExtensionRegistry"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setExtensionRegistry">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setExtensionRegistry/extensionRegistry"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getDocumentBaseURI"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setDocumentBaseURI">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setDocumentBaseURI/documentBase"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removePortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removePortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setTypes">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setTypes/types"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IImport"/>
-    <genClasses ecoreClass="wsdl.ecore#//IList"/>
-    <genClasses ecoreClass="wsdl.ecore#//IMap"/>
-    <genClasses ecoreClass="wsdl.ecore#//IURL"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensionRegistry"/>
-    <genClasses ecoreClass="wsdl.ecore#//Types">
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas.1">
-        <genParameters ecoreParameter="wsdl.ecore#//Types/getSchemas.1/namespaceURI"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IIterator"/>
-    <genClasses ecoreClass="wsdl.ecore#//ITypes"/>
-    <genClasses ecoreClass="wsdl.ecore#//UnknownExtensibilityElement">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/parent"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/children"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//XSDSchemaExtensibilityElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//XSDSchemaExtensibilityElement/schema"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//MessageReference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//MessageReference/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//MessageReference/eMessage"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/model/com.ibm.etools.wsdl.bindings.MIME.cat b/bundles/org.eclipse.wst.wsdl/src-mime/model/com.ibm.etools.wsdl.bindings.MIME.cat
deleted file mode 100644
index c47f921..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/model/com.ibm.etools.wsdl.bindings.MIME.cat
+++ /dev/null

@@ -1,630 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Class_Category "mime"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"3AC9127C0266"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "MIMEContent"
-	    quid       	"3AC9135B03A7"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AEF11CA038E"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "type"
-		    quid       	"3AC91971036B"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "MIMEPart"
-	    quid       	"3AC913EE00EB"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AEF11400259"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3AE8B1AB015D"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "MIMEMultipartRelated"
-	    quid       	"3AC913FA025B"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AEF11D50330"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    language   	"Java")
-	(object Class "MIMEMimeXml"
-	    quid       	"3AC9145A01FF"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AEF11DD038B"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    language   	"Java")
-	(object Association "$UNNAMED$0"
-	    quid       	"3AE73B3C0356"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$1"
-		    quid       	"3AE73B3D0090"
-		    supplier   	"Logical View::mime::MIMEContent"
-		    quidu      	"3AC9135B03A7")
-		(object Role "part"
-		    quid       	"3AE73B3D009A"
-		    label      	"part"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$2"
-	    quid       	"3AE73BB900D5"
-	    roles      	(list role_list
-		(object Role "part"
-		    quid       	"3AE73BB903CE"
-		    label      	"part"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3AE73BB903E2"
-		    supplier   	"Logical View::mime::MIMEMimeXml"
-		    quidu      	"3AC9145A01FF")))
-	(object Association "$UNNAMED$4"
-	    quid       	"3AEF12FE0387"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$5"
-		    quid       	"3AEF130000D7"
-		    supplier   	"Logical View::mime::MIMEMultipartRelated"
-		    quidu      	"3AC913FA025B"
-		    is_aggregate 	TRUE)
-		(object Role "elements"
-		    quid       	"3AEF130000E1"
-		    label      	"elements"
-		    supplier   	"Logical View::mime::MIMEPart"
-		    quidu      	"3AC913EE00EB"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Bindings"
-	    quid       	"3AC9128B01F9"
-	    title      	"Bindings"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	56
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::mime::MIMEContent" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1856, 336)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(1714, 255)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	284
-			justify    	0
-			label      	"MIMEContent")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC9135B03A7"
-		    width      	302
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Part" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1504, 784)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(1354, 555)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	300
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    width      	318
-		    height     	482
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$0" @3
-		    location   	(1722, 505)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE73B3C0356"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$1" @4
-			    Parent_View 	@3
-			    location   	(-326, -727)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE73B3D0090"
-			    client     	@3
-			    supplier   	@1
-			    line_style 	0)
-			(object RoleView "part" @5
-			    Parent_View 	@3
-			    location   	(-326, -727)
-			    label      	(object SegLabel @6
-				Parent_View 	@5
-				location   	(1740, 508)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	96
-				justify    	0
-				label      	"+part"
-				pctDist    	-0.097934
-				height     	16
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE73B3D009A"
-			    client     	@3
-			    supplier   	@2
-			    line_style 	0
-			    label      	(object SegLabel @7
-				Parent_View 	@5
-				location   	(1734, 569)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.449103
-				height     	49
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::mime::MIMEMimeXml" @8
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1216, 320)
-		    label      	(object ItemLabel
-			Parent_View 	@8
-			location   	(1061, 268)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	310
-			justify    	0
-			label      	"MIMEMimeXml")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC9145A01FF"
-		    width      	328
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$2" @9
-		    location   	(1304, 463)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE73BB900D5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "part" @10
-			    Parent_View 	@9
-			    location   	(-184, -1185)
-			    label      	(object SegLabel @11
-				Parent_View 	@10
-				location   	(1311, 479)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	96
-				justify    	0
-				label      	"+part"
-				pctDist    	0.177941
-				height     	4
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE73BB903CE"
-			    client     	@9
-			    supplier   	@2
-			    line_style 	0
-			    label      	(object SegLabel @12
-				Parent_View 	@10
-				location   	(1272, 554)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.652270
-				height     	76
-				orientation 	1))
-			(object RoleView "$UNNAMED$3" @13
-			    Parent_View 	@9
-			    location   	(-184, -1185)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE73BB903E2"
-			    client     	@9
-			    supplier   	@8
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::mime::MIMEMultipartRelated" @14
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(528, 320)
-		    label      	(object ItemLabel
-			Parent_View 	@14
-			location   	(312, 269)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	432
-			justify    	0
-			label      	"MIMEMultipartRelated")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC913FA025B"
-		    width      	450
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::mime::MIMEPart" @15
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(528, 848)
-		    label      	(object ItemLabel
-			Parent_View 	@15
-			location   	(380, 767)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"MIMEPart")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC913EE00EB"
-		    compartment 	(object Compartment
-			Parent_View 	@15
-			location   	(380, 827)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	2
-			max_width  	303)
-		    width      	314
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$4" @16
-		    location   	(528, 568)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEF12FE0387"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$5" @17
-			    Parent_View 	@16
-			    location   	(0, -136)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEF130000D7"
-			    client     	@16
-			    supplier   	@14
-			    line_style 	0)
-			(object RoleView "elements" @18
-			    Parent_View 	@16
-			    location   	(0, -136)
-			    label      	(object SegLabel @19
-				Parent_View 	@18
-				location   	(535, 627)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	"+elements"
-				pctDist    	0.320000
-				height     	7
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEF130000E1"
-			    client     	@16
-			    supplier   	@15
-			    line_style 	0
-			    label      	(object SegLabel @20
-				Parent_View 	@18
-				location   	(471, 716)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.794118
-				height     	58
-				orientation 	1)
-			    label      	(object SegLabel @21
-				Parent_View 	@18
-				location   	(636, 734)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	159
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.900000
-				height     	108
-				orientation 	0))))))
-	(object ClassDiagram "Extensibility"
-	    quid       	"3AE73AA3032E"
-	    title      	"Extensibility"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @22
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(400, 176)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@22
-			location   	(138, 42)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	524
-			justify    	0
-			label      	"ExtensibleElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5FCFA033A"
-		    width      	542
-		    height     	292
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @23
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1344, 192)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@23
-			location   	(1115, 8)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	458
-			justify    	0
-			label      	"ExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5DBB602A9"
-		    width      	476
-		    height     	392
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "" @24
-		    location   	(888, 183)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FD130079"
-		    roleview_list 	(list RoleViews
-			(object RoleView "" @25
-			    Parent_View 	@24
-			    location   	(536, 23)
-			    label      	(object SegLabel @26
-				Parent_View 	@25
-				location   	(714, 222)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019E"
-			    client     	@24
-			    supplier   	@22
-			    line_style 	0
-			    label      	(object SegLabel @27
-				Parent_View 	@25
-				location   	(694, 233)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "eExtensibilityElements" @28
-			    Parent_View 	@24
-			    location   	(536, 23)
-			    label      	(object SegLabel @29
-				Parent_View 	@28
-				location   	(996, 225)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	457
-				justify    	0
-				label      	"+eExtensibilityElements"
-				pctDist    	0.501538
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019D"
-			    client     	@24
-			    supplier   	@23
-			    line_style 	0
-			    label      	(object SegLabel @30
-				Parent_View 	@28
-				location   	(1069, 132)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.829630
-				height     	54
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::mime::MIMEMimeXml" @31
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1504, 784)
-		    label      	(object ItemLabel
-			Parent_View 	@31
-			location   	(1349, 733)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	310
-			justify    	0
-			label      	"MIMEMimeXml")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC9145A01FF"
-		    width      	328
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::mime::MIMEMultipartRelated" @32
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1248, 608)
-		    label      	(object ItemLabel
-			Parent_View 	@32
-			location   	(1032, 557)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	432
-			justify    	0
-			label      	"MIMEMultipartRelated")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC913FA025B"
-		    width      	450
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::mime::MIMEPart" @33
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(400, 752)
-		    label      	(object ItemLabel
-			Parent_View 	@33
-			location   	(295, 700)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	210
-			justify    	0
-			label      	"MIMEPart")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC913EE00EB"
-		    width      	228
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @34
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEF11400259"
-		    client     	@33
-		    supplier   	@22
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::mime::MIMEContent" @35
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1728, 976)
-		    label      	(object ItemLabel
-			Parent_View 	@35
-			location   	(1587, 924)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	282
-			justify    	0
-			label      	"MIMEContent")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AC9135B03A7"
-		    width      	300
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @36
-		    location   	(1344, 549)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@23
-		    vertices   	(list Points
-			(1344, 549)
-			(1344, 388)))
-		(object InheritView "" @37
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEF11DD038B"
-		    client     	@31
-		    supplier   	@23
-		    line_style 	3
-		    origin_attachment 	(1541, 721)
-		    terminal_attachment 	(1541, 549)
-		    drawSupplier 	@36)
-		(object InheritView "" @38
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEF11D50330"
-		    client     	@32
-		    supplier   	@23
-		    line_style 	3
-		    origin_attachment 	(1347, 545)
-		    terminal_attachment 	(1347, 549)
-		    drawSupplier 	@36)
-		(object InheritView "" @39
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEF11CA038E"
-		    client     	@35
-		    supplier   	@23
-		    line_style 	3
-		    origin_attachment 	(1722, 912)
-		    terminal_attachment 	(1722, 549)
-		    drawSupplier 	@36)))))

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.ecore b/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.ecore
deleted file mode 100644
index 697bfa5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.ecore
+++ /dev/null

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mime"
-    nsURI="http://www.ibm.com/wsdl/2003/MIME" nsPrefix="mime">
-  <eClassifiers xsi:type="ecore:EClass" name="MIMEContent" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IMIMEContent">
-    <eOperations name="setPart">
-      <eParameters name="part" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getPart" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePart" eType="ecore:EClass wsdl.ecore#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MIMEPart" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IMIMEPart">
-    <eOperations name="addExtensibilityElement">
-      <eParameters name="extensibilityElement" eType="ecore:EClass wsdl.ecore#//IExtensibilityElement"/>
-    </eOperations>
-    <eOperations name="getExtensibilityElements" eType="#//List"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MIMEMultipartRelated" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IMIMEMultipartRelated">
-    <eOperations name="addMIMEPart">
-      <eParameters name="mimePart" eType="#//IMIMEPart"/>
-    </eOperations>
-    <eOperations name="getMIMEParts" eType="#//List"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eMIMEPart" upperBound="-1"
-        eType="#//MIMEPart" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MIMEMimeXml" eSuperTypes="wsdl.ecore#//ExtensibilityElement #//IMIMEMimeXml">
-    <eOperations name="setPart">
-      <eParameters name="part" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getPart" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePart" eType="ecore:EClass wsdl.ecore#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IMIMEPart" instanceClassName="javax.wsdl.extensions.mime.MIMEPart"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IMIMEMultipartRelated" instanceClassName="javax.wsdl.extensions.mime.MIMEMultipartRelated"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IMIMEContent" instanceClassName="javax.wsdl.extensions.mime.MIMEContent"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IMIMEMimeXml" instanceClassName="javax.wsdl.extensions.mime.MIMEMimeXml"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="List" instanceClassName="java.util.List"/>
-</ecore:EPackage>

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.mdl b/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.mdl
deleted file mode 100644
index 5c76a50..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/model/mime.mdl
+++ /dev/null

@@ -1,32998 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3AC91051031E"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3AC91052001B"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3AC91051031D"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3AC91051031F"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "mime"
-		quid       	"3AC9127C0266"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "MIMEContent"
-			quid       	"3AC9135B03A7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AEF11CA038E"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"40A106A30168"
-				supplier   	"Logical View::mime::IMIMEContent"
-				quidu      	"40A105E001CC"))
-			operations 	(list Operations
-			    (object Operation "setPart"
-				quid       	"40A1066F0023"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"String"))
-				result     	"void"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"40A1067D02CC"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "type"
-				quid       	"3AC91971036B"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "MIMEPart"
-			quid       	"3AC913EE00EB"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"40A0FDEF0322"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"40A102CD0175"
-				supplier   	"Logical View::mime::IMIMEPart"
-				quidu      	"40A1025D01A6"))
-			operations 	(list Operations
-			    (object Operation "addExtensibilityElement"
-				quid       	"40A1046401A2"
-				parameters 	(list Parameters
-				    (object Parameter "extensibilityElement"
-					type       	"IExtensibilityElement"))
-				result     	"void"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensibilityElements"
-				quid       	"40A10484027B"
-				result     	"List"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java")
-		    (object Class "MIMEMultipartRelated"
-			quid       	"3AC913FA025B"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AEF11D50330"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"40A103AD031C"
-				supplier   	"Logical View::mime::IMIMEMultipartRelated"
-				quidu      	"40A1033B00DD"))
-			operations 	(list Operations
-			    (object Operation "addMIMEPart"
-				quid       	"40A103F60172"
-				parameters 	(list Parameters
-				    (object Parameter "mimePart"
-					type       	"IMIMEPart"))
-				result     	"void"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMIMEParts"
-				quid       	"40A10403038D"
-				result     	"List"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java")
-		    (object Class "MIMEMimeXml"
-			quid       	"3AC9145A01FF"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AEF11DD038B"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"40A10747034E"
-				supplier   	"Logical View::mime::IMIMEMimeXml"
-				quidu      	"40A106EF008B"))
-			operations 	(list Operations
-			    (object Operation "setPart"
-				quid       	"40A106D401EB"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"String"))
-				result     	"void"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"40A106E10095"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java")
-		    (object Class "IMIMEPart"
-			quid       	"40A1025D01A6"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.mime.MIMEPart"
-				quid       	"40A1029D03D9"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IMIMEMultipartRelated"
-			quid       	"40A1033B00DD"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.mime.MIMEMultipartRelated"
-				quid       	"40A10378018F"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IMIMEContent"
-			quid       	"40A105E001CC"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.mime.MIMEContent"
-				quid       	"40A105F50226"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IMIMEMimeXml"
-			quid       	"40A106EF008B"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.mime.MIMEMimeXml"
-				quid       	"40A1071E03B4"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "List"
-			quid       	"40A10BFA0109"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"40A10C0902A6"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Association "$UNNAMED$0"
-			quid       	"3AE73B3C0356"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$1"
-				quid       	"3AE73B3D0090"
-				supplier   	"Logical View::mime::MIMEContent"
-				quidu      	"3AC9135B03A7")
-			    (object Role "ePart"
-				quid       	"3AE73B3D009A"
-				label      	"ePart"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$2"
-			quid       	"3AE73BB900D5"
-			roles      	(list role_list
-			    (object Role "ePart"
-				quid       	"3AE73BB903CE"
-				label      	"ePart"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$3"
-				quid       	"3AE73BB903E2"
-				supplier   	"Logical View::mime::MIMEMimeXml"
-				quidu      	"3AC9145A01FF")))
-		    (object Association "$UNNAMED$4"
-			quid       	"3AEF12FE0387"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$5"
-				quid       	"3AEF130000D7"
-				supplier   	"Logical View::mime::MIMEMultipartRelated"
-				quidu      	"3AC913FA025B"
-				is_aggregate 	TRUE)
-			    (object Role "eMIMEPart"
-				quid       	"3AEF130000E1"
-				label      	"eMIMEPart"
-				supplier   	"Logical View::mime::MIMEPart"
-				quidu      	"3AC913EE00EB"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Bindings"
-			quid       	"3AC9128B01F9"
-			title      	"Bindings"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::mime::MIMEContent" @1
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 848)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1490, 717)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	284
-				    justify    	0
-				    label      	"MIMEContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC9135B03A7"
-				compartment 	(object Compartment
-				    Parent_View 	@1
-				    location   	(1490, 777)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	272)
-				width      	302
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @2
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(1551, 1150)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				height     	124
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$0" @3
-				location   	(1632, 1064)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE73B3C0356"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$1" @4
-					Parent_View 	@3
-					location   	(-416, -168)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE73B3D0090"
-					client     	@3
-					supplier   	@1
-					line_style 	0)
-				    (object RoleView "ePart" @5
-					Parent_View 	@3
-					location   	(-416, -168)
-					label      	(object SegLabel @6
-					    Parent_View 	@5
-					    location   	(1515, 1102)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+ePart"
-					    pctDist    	0.539326
-					    height     	118
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE73B3D009A"
-					client     	@3
-					supplier   	@2
-					line_style 	0
-					label      	(object SegLabel @7
-					    Parent_View 	@5
-					    location   	(1681, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.449103
-					    height     	49
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::mime::MIMEMimeXml" @8
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1504)
-				label      	(object ItemLabel
-				    Parent_View 	@8
-				    location   	(1478, 1398)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	308
-				    justify    	0
-				    label      	"MIMEMimeXml")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC9145A01FF"
-				compartment 	(object Compartment
-				    Parent_View 	@8
-				    location   	(1478, 1458)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	206)
-				width      	326
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$2" @9
-				location   	(1632, 1323)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE73BB900D5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePart" @10
-					Parent_View 	@9
-					location   	(144, -325)
-					label      	(object SegLabel @11
-					    Parent_View 	@10
-					    location   	(1506, 1293)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+ePart"
-					    pctDist    	0.489583
-					    height     	127
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE73BB903CE"
-					client     	@9
-					supplier   	@2
-					line_style 	0
-					label      	(object SegLabel @12
-					    Parent_View 	@10
-					    location   	(1708, 1284)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.652270
-					    height     	76
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$3" @13
-					Parent_View 	@9
-					location   	(144, -325)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE73BB903E2"
-					client     	@9
-					supplier   	@8
-					line_style 	0)))
-			    (object ClassView "Class" "Logical View::mime::MIMEMultipartRelated" @14
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(560, 592)
-				label      	(object ItemLabel
-				    Parent_View 	@14
-				    location   	(341, 486)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"MIMEMultipartRelated")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC913FA025B"
-				compartment 	(object Compartment
-				    Parent_View 	@14
-				    location   	(341, 546)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	334)
-				width      	456
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEPart" @15
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(560, 1040)
-				label      	(object ItemLabel
-				    Parent_View 	@15
-				    location   	(296, 934)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"MIMEPart")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC913EE00EB"
-				compartment 	(object Compartment
-				    Parent_View 	@15
-				    location   	(296, 994)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	525)
-				width      	546
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$4" @16
-				location   	(560, 815)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF12FE0387"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$5" @17
-					Parent_View 	@16
-					location   	(32, 111)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEF130000D7"
-					client     	@16
-					supplier   	@14
-					line_style 	0)
-				    (object RoleView "eMIMEPart" @18
-					Parent_View 	@16
-					location   	(32, 111)
-					label      	(object SegLabel @19
-					    Parent_View 	@18
-					    location   	(744, 890)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	228
-					    justify    	0
-					    label      	"+eMIMEPart"
-					    pctDist    	0.709402
-					    height     	184
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEF130000E1"
-					client     	@16
-					supplier   	@15
-					line_style 	0
-					label      	(object SegLabel @20
-					    Parent_View 	@18
-					    location   	(503, 898)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.794118
-					    height     	58
-					    orientation 	1)
-					label      	(object SegLabel @21
-					    Parent_View 	@18
-					    location   	(364, 890)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	159
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.709402
-					    height     	197
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::mime::IMIMEPart" @22
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(205, 1422)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1030
-				    justify    	0
-				    label      	"IMIMEPart")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(205, 1372)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1030
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40A1025D01A6"
-				compartment 	(object Compartment
-				    Parent_View 	@22
-				    location   	(205, 1482)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	1028)
-				width      	1048
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @23
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40A102CD0175"
-				client     	@15
-				supplier   	@22
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::mime::IMIMEMultipartRelated" @24
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(768, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(143, 142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1250
-				    justify    	0
-				    label      	"IMIMEMultipartRelated")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(143, 92)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1250
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40A1033B00DD"
-				compartment 	(object Compartment
-				    Parent_View 	@24
-				    location   	(143, 202)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	1247)
-				width      	1268
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @25
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40A103AD031C"
-				client     	@14
-				supplier   	@24
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::mime::IMIMEContent" @26
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 432)
-				label      	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(1084, 398)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1096
-				    justify    	0
-				    label      	"IMIMEContent")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(1084, 348)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1096
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40A105E001CC"
-				compartment 	(object Compartment
-				    Parent_View 	@26
-				    location   	(1084, 458)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	1094)
-				width      	1114
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @27
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40A106A30168"
-				client     	@1
-				supplier   	@26
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::mime::IMIMEMimeXml" @28
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1616, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(1055, 1870)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1122
-				    justify    	0
-				    label      	"IMIMEMimeXml")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(1055, 1820)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1122
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40A106EF008B"
-				compartment 	(object Compartment
-				    Parent_View 	@28
-				    location   	(1055, 1930)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	1119)
-				width      	1140
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @29
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40A10747034E"
-				client     	@8
-				supplier   	@28
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::mime::List" @30
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(176, 1701)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"List")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(176, 1651)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40A10BFA0109"
-				compartment 	(object Compartment
-				    Parent_View 	@30
-				    location   	(176, 1761)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	541)
-				width      	562
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)))
-		    (object ClassDiagram "Extensibility"
-			quid       	"3AE73AA3032E"
-			title      	"Extensibility"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @31
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@31
-				    location   	(747, 87)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	458
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				compartment 	(object Compartment
-				    Parent_View 	@31
-				    location   	(747, 195)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	456)
-				width      	476
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEMimeXml" @32
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 752)
-				label      	(object ItemLabel
-				    Parent_View 	@32
-				    location   	(1174, 646)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	308
-				    justify    	0
-				    label      	"MIMEMimeXml")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC9145A01FF"
-				compartment 	(object Compartment
-				    Parent_View 	@32
-				    location   	(1174, 706)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	206)
-				width      	326
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEMultipartRelated" @33
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@33
-				    location   	(533, 1030)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"MIMEMultipartRelated")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC913FA025B"
-				compartment 	(object Compartment
-				    Parent_View 	@33
-				    location   	(533, 1090)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	334)
-				width      	456
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEPart" @34
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@34
-				    location   	(40, 662)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"MIMEPart")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC913EE00EB"
-				compartment 	(object Compartment
-				    Parent_View 	@34
-				    location   	(40, 722)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	525)
-				width      	546
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEContent" @35
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 752)
-				label      	(object ItemLabel
-				    Parent_View 	@35
-				    location   	(1650, 646)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	284
-				    justify    	0
-				    label      	"MIMEContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AC9135B03A7"
-				compartment 	(object Compartment
-				    Parent_View 	@35
-				    location   	(1650, 706)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	206)
-				width      	302
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @36
-				location   	(976, 526)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@31
-				vertices   	(list Points
-				    (976, 526)
-				    (976, 309)))
-			    (object InheritView "" @37
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF11DD038B"
-				client     	@32
-				supplier   	@31
-				line_style 	3
-				origin_attachment 	(1356, 634)
-				terminal_attachment 	(1356, 526)
-				drawSupplier 	@36)
-			    (object InheritView "" @38
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF11D50330"
-				client     	@33
-				supplier   	@31
-				line_style 	3
-				origin_attachment 	(844, 1018)
-				terminal_attachment 	(844, 526)
-				drawSupplier 	@36)
-			    (object InheritView "" @39
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF11CA038E"
-				client     	@35
-				supplier   	@31
-				line_style 	3
-				origin_attachment 	(1778, 634)
-				terminal_attachment 	(1778, 526)
-				drawSupplier 	@36)
-			    (object InheritView "" @40
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40A0FDEF0322"
-				client     	@34
-				supplier   	@31
-				line_style 	3
-				origin_attachment 	(256, 650)
-				terminal_attachment 	(256, 526)
-				drawSupplier 	@36)))))
-	    (object Class_Category "wsdl"
-		quid       	"3ADFB8E5021E"
-		documentation 	
-|The WSDL model contains classes for the Web Services Description Language (WSDL).
-|
-|WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
-|
-|WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
-|
-|The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
-|- 2.1 Definition, shows the WSDL definition element and the WSDL document structure
-|- 2.1.1 Naming and Linking, shows the namespace and import mechanism
-|- 2.1.3 Extensibility, shows the WSDL extensibility mechanism
-|- 2.2 Types, shows the use of XML Schema types in WSDL
-|- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
-|
-|The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "WSDLElement"
-			quid       	"3AD5C6A302DD"
-			documentation 	"This class represents a WSDL language element."
-			operations 	(list Operations
-			    (object Operation "getEnclosingDefinition"
-				quid       	"3CD1529600C8"
-				result     	"Definition"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setEnclosingDefinition"
-				quid       	"3CD152B80347"
-				parameters 	(list Parameters
-				    (object Parameter "definition"
-					type       	"Definition"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "documentationElement"
-				quid       	"3CCE443602A3"
-				type       	"DOMElement")
-			    (object ClassAttribute "element"
-				quid       	"3F97DBD30207"
-				type       	"DOMElement"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "PortType"
-			quid       	"3AD5C7F001A5"
-			documentation 	"This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5C9B70150"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FD8019F"
-				supplier   	"Logical View::wsdl::IPortType"
-				quidu      	"3B84A5BE0331"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB488E0023"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1E301E5"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CDEB0316"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4FD01BA"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Operation"
-			quid       	"3AD5C80D03CE"
-			documentation 	"This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE9DE98003C"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FE20171"
-				supplier   	"Logical View::wsdl::IOperation"
-				quidu      	"3B84A77600D1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "style"
-				quid       	"3AEB472601AC"
-				type       	"OperationType")
-			    (object ClassAttribute "name"
-				quid       	"3BDD9643004C"
-				type       	"String")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF235003E"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE2201AD"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D520011B"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Message"
-			quid       	"3AD5C9590078"
-			documentation 	"This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5D05501C4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3B84A8D102BA"
-				supplier   	"Logical View::wsdl::IMessage"
-				quidu      	"3B84A8AF004F"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB487C01FE"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1D20226"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE4B02B0"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D54200F1"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Part"
-			quid       	"3AD5CE1C032E"
-			documentation 	"This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84A96D02F1"
-				supplier   	"Logical View::wsdl::IPart"
-				quidu      	"3B84A93F01BE")
-			    (object Inheritance_Relationship
-				quid       	"3B897E230237"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3BCE70B703C8"
-				type       	"String")
-			    (object ClassAttribute "elementName"
-				quid       	"3B84B08703DB"
-				type       	"QName")
-			    (object ClassAttribute "typeName"
-				quid       	"3BCE70C303C5"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Binding"
-			quid       	"3AD5D2860261"
-			documentation 	"This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA0F02F0"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B8595410129"
-				supplier   	"Logical View::wsdl::IBinding"
-				quidu      	"3B84ABC60219"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB4899014B"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1F401A3"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE6D0151"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4DF035C"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOperation"
-			quid       	"3AD5D3CB0145"
-			documentation 	"This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD6009202F7"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84ADE401DC"
-				supplier   	"Logical View::wsdl::IBindingOperation"
-				quidu      	"3B84ADC00072"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B89C4CB0199"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Service"
-			quid       	"3AD5D8F002F8"
-			documentation 	"This class represents a WSDL service element. A service groups a set of related ports together."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA20025E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954E01B4"
-				supplier   	"Logical View::wsdl::IService"
-				quidu      	"3B84AB490287"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB48A40151"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF20D0203"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18D4810220"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4C501E2"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Port"
-			quid       	"3AD5D9170286"
-			documentation 	"This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD600CB00AA"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954502C9"
-				supplier   	"Logical View::wsdl::IPort"
-				quidu      	"3B84AB800326"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3AD5D9A00391"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibilityElement"
-			quid       	"3AD5DBB602A9"
-			documentation 	"This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84B14903D0"
-				supplier   	"Logical View::wsdl::IExtensibilityElement"
-				quidu      	"3B84B12402AB")
-			    (object Inheritance_Relationship
-				quid       	"3BDDF53502C3"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3AF9543C0073"
-				type       	"boolean")
-			    (object ClassAttribute "elementType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B85B21A0271"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Definition"
-			quid       	"3AD5E43F008E"
-			documentation 	"This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FDB803D4"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84B1F80382"
-				supplier   	"Logical View::wsdl::IDefinition"
-				quidu      	"3B84B1D90142"))
-			operations 	(list Operations
-			    (object Operation "getDocument"
-				quid       	"3CD14FC2012B"
-				result     	"DOMDocument"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocument"
-				quid       	"3CD150DE01E7"
-				parameters 	(list Parameters
-				    (object Parameter "document"
-					type       	"DOMDocument"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3AD5E474004E"
-				type       	"String")
-			    (object ClassAttribute "location"
-				quid       	"40352B7C0396"
-				type       	"String")
-			    (object ClassAttribute "qName"
-				quid       	"3AEB485702F5"
-				type       	"QName")
-			    (object ClassAttribute "encoding"
-				quid       	"3CADD00D000D"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Import"
-			quid       	"3AD5E4F903DE"
-			documentation 	"This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5EE58037A"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F200D0340"
-				supplier   	"Logical View::wsdl::IImport"
-				quidu      	"3B84B2020119"))
-			operations 	(list Operations
-			    (object Operation "getSchema"
-				quid       	"3C8672C10379"
-				result     	"XSDSchema"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setSchema"
-				quid       	"3C8672C10397"
-				parameters 	(list Parameters
-				    (object Parameter "schema"
-					type       	"XSDSchema"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD5E50A0036"
-				type       	"String")
-			    (object ClassAttribute "locationURI"
-				quid       	"3AD5E5140211"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibleElement"
-			quid       	"3AD5FCFA033A"
-			documentation 	" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FE3C03D4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			operations 	(list Operations
-			    (object Operation "getExtensibilityElements"
-				quid       	"3B85C12C03CD"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addExtensibilityElement"
-				quid       	"3B85C1470295"
-				parameters 	(list Parameters
-				    (object Parameter "extElement"
-					type       	"IExtensibilityElement"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "Input"
-			quid       	"3AE0789F0059"
-			documentation 	"This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C504025F"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67722802E7"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FEE031D"
-				supplier   	"Logical View::wsdl::IInput"
-				quidu      	"3B84A7EE0015"))
-			language   	"Java")
-		    (object Class "Output"
-			quid       	"3AE078B60232"
-			documentation 	"This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C50C035B"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723500DD"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FF801CD"
-				supplier   	"Logical View::wsdl::IOutput"
-				quidu      	"3B84A829027D"))
-			language   	"Java")
-		    (object Class "Fault"
-			quid       	"3AE078BE0108"
-			documentation 	"This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE1C82002F2"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723D0319"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F2002002D"
-				supplier   	"Logical View::wsdl::IFault"
-				quidu      	"3B84A861031D"))
-			language   	"Java")
-		    (object Class "BindingInput"
-			quid       	"3AE08A8202D4"
-			documentation 	"This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE1B0113"
-				supplier   	"Logical View::wsdl::IBindingInput"
-				quidu      	"3B84ADEB0100")
-			    (object Inheritance_Relationship
-				quid       	"3B85B59B0072"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getInput"
-				quid       	"3C8653A40203"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8653B503A2"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C1EA020E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOutput"
-			quid       	"3AE08A8F028C"
-			documentation 	"This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE4302AB"
-				supplier   	"Logical View::wsdl::IBindingOutput"
-				quidu      	"3B84AE210111")
-			    (object Inheritance_Relationship
-				quid       	"3B85B5A4027E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getOutput"
-				quid       	"3C8653D900F1"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8653F10326"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C20200BE"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingFault"
-			quid       	"3AE08A9E03A6"
-			documentation 	"This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE0938602C9"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84AE710333"
-				supplier   	"Logical View::wsdl::IBindingFault"
-				quidu      	"3B84AE4F00BD"))
-			operations 	(list Operations
-			    (object Operation "getFault"
-				quid       	"3C865413037F"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFault"
-				quid       	"3C8654210109"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85BF9E014A"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "QName"
-			quid       	"3AE8ED220140"
-			documentation 	"This class represents the javax.wsdl.QName class. A QName is a fully qualified name."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.xml.namespace.QName"
-				quid       	"3B849DA9003D"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "Namespace"
-			quid       	"3AEA3CD30030"
-			documentation 	"This class represents a namespace and the corresponding namespace prefix used in a WSDL document."
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "URI"
-				quid       	"3AEA3D2901B1"
-				type       	"String")
-			    (object ClassAttribute "prefix"
-				quid       	"3AEA3D320236"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "OperationType"
-			quid       	"3AEB4782024F"
-			documentation 	
-|ONE_WAY=1
-|REQUEST_RESPONSE=2
-|SOLICIT_RESPONSE=3
-|NOTIFICATION=4
-			
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.OperationType"
-				quid       	"3B85C35303E3"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IPortType"
-			quid       	"3B84A5BE0331"
-			documentation 	"This class represents the javax.wsdl.PortType non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addOperation"
-				quid       	"3B896AC101CA"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3B896BAF01A4"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperations"
-				quid       	"3B896BF7031A"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.PortType"
-				quid       	"3B84A632000D"
-				stereotype 	"javaclass")))
-		    (object Class "IOperation"
-			quid       	"3B84A77600D1"
-			documentation 	"This class represents the javax.wsdl.Operation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addFault"
-				quid       	"3B896C420065"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFault"
-				quid       	"3B896C59028F"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFaults"
-				quid       	"3B896C7102B1"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParameterOrdering"
-				quid       	"3B896C8101B0"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setParameterOrdering"
-				quid       	"3B896C99031D"
-				parameters 	(list Parameters
-				    (object Parameter "parameterOrder"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInput"
-				quid       	"3C8654E5018D"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8662C40107"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOutput"
-				quid       	"3C8662E40094"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8662F001D2"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Operation"
-				quid       	"3B84A799012B"
-				stereotype 	"javaclass")))
-		    (object Class "IInput"
-			quid       	"3B84A7EE0015"
-			documentation 	"This class represents the javax.wsdl.Input non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86633100EF"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8663470277"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Input"
-				quid       	"3B84A8000039"
-				stereotype 	"javaclass")))
-		    (object Class "IOutput"
-			quid       	"3B84A829027D"
-			documentation 	"This class represents the javax.wsdl.Output non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86643A035D"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C86644501C8"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Output"
-				quid       	"3B84A83901D5"
-				stereotype 	"javaclass")))
-		    (object Class "IFault"
-			quid       	"3B84A861031D"
-			documentation 	"This class represents the javax.wsdl.Fault non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86646A00BD"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8664750131"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Fault"
-				quid       	"3B84A8710208"
-				stereotype 	"javaclass")))
-		    (object Class "IMessage"
-			quid       	"3B84A8AF004F"
-			documentation 	"This class represents the javax.wsdl.Message non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPart"
-				quid       	"3B8972240273"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"IPart"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"3B89723D0233"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParts"
-				quid       	"3B897254025E"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOrderedParts"
-				quid       	"3B897261020D"
-				parameters 	(list Parameters
-				    (object Parameter "partOrder"
-					type       	"IList"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Message"
-				quid       	"3B84A8BC0260"
-				stereotype 	"javaclass")))
-		    (object Class "IPart"
-			quid       	"3B84A93F01BE"
-			documentation 	"This class represents the javax.wsdl.Part non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "setExtensionAttribute"
-				quid       	"3C4688450052"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName")
-				    (object Parameter "value"
-					type       	"QName"))
-				exceptions 	"WSDLException"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttributeNames"
-				quid       	"3C468A0101C3"
-				result     	"IIterator"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttribute"
-				quid       	"3C468A2D02D5"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"QName"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Part"
-				quid       	"3B84A9500231"
-				stereotype 	"javaclass")))
-		    (object Class "IService"
-			quid       	"3B84AB490287"
-			documentation 	"This class represents the javax.wsdl.Service non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPort"
-				quid       	"3B895D5601D1"
-				parameters 	(list Parameters
-				    (object Parameter "port"
-					type       	"IPort"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPorts"
-				quid       	"3B895DA20036"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPort"
-				quid       	"3B895DB001BC"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Service"
-				quid       	"3B84AB5B003E"
-				stereotype 	"javaclass")))
-		    (object Class "IPort"
-			quid       	"3B84AB800326"
-			documentation 	"This class represents the javax.wsdl.Port non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getBinding"
-				quid       	"3C8651F302B5"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBinding"
-				quid       	"3C86526302F2"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Port"
-				quid       	"3B84AB8C0016"
-				stereotype 	"javaclass")))
-		    (object Class "IBinding"
-			quid       	"3B84ABC60219"
-			documentation 	"This class represents the javax.wsdl.Binding non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingOperation"
-				quid       	"3B895F160153"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOperation"
-					type       	"IBindingOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperation"
-				quid       	"3B895F500066"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperations"
-				quid       	"3B895FA401C5"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3C8652A90284"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setPortType"
-				quid       	"3C8652BE01A8"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Binding"
-				quid       	"3B84ABCF0302"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOperation"
-			quid       	"3B84ADC00072"
-			documentation 	"This class represents the javax.wsdl.BindingOperation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingFault"
-				quid       	"3B8960BC0041"
-				parameters 	(list Parameters
-				    (object Parameter "bindingFault"
-					type       	"IBindingFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFault"
-				quid       	"3B8960D9009D"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFaults"
-				quid       	"3B8960FC0061"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3C86532D0017"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOperation"
-				quid       	"3C86533F037B"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingInput"
-				quid       	"3C86550900DA"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingInput"
-				quid       	"3C86551D007F"
-				parameters 	(list Parameters
-				    (object Parameter "bindingInput"
-					type       	"IBindingInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOutput"
-				quid       	"3C8655340349"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingOutput"
-				quid       	"3C86554702A6"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOutput"
-					type       	"IBindingOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOperation"
-				quid       	"3B84ADCB021C"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingInput"
-			quid       	"3B84ADEB0100"
-			documentation 	"This class represents the javax.wsdl.BindingInput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingInput"
-				quid       	"3B84ADFE000D"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOutput"
-			quid       	"3B84AE210111"
-			documentation 	"This class represents the javax.wsdl.BindingOutput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOutput"
-				quid       	"3B84AE2D0050"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingFault"
-			quid       	"3B84AE4F00BD"
-			documentation 	"This class represents the javax.wsdl.BindingFault non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingFault"
-				quid       	"3B84AE5F002A"
-				stereotype 	"javaclass")))
-		    (object Class "DOMElement"
-			quid       	"3B84AF3203DB"
-			documentation 	"This class represents the org.w3c.dom.Element non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B84AF560292"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensibilityElement"
-			quid       	"3B84B12402AB"
-			documentation 	"This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensibilityElement"
-				quid       	"3B84B13503D1"
-				stereotype 	"javaclass")))
-		    (object Class "IDefinition"
-			quid       	"3B84B1D90142"
-			documentation 	"This class represents the javax.wsdl.Definition non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBinding"
-				quid       	"3B8988F1039D"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addImport"
-				quid       	"3B8989490259"
-				parameters 	(list Parameters
-				    (object Parameter "importDef"
-					type       	"IImport"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addMessage"
-				quid       	"3B89896E005E"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addNamespace"
-				quid       	"3B898984004B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String")
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addPortType"
-				quid       	"3B8989C50045"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addService"
-				quid       	"3B8989E401EE"
-				parameters 	(list Parameters
-				    (object Parameter "service"
-					type       	"IService"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingFault"
-				quid       	"3B898A17038C"
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingInput"
-				quid       	"3B898A320286"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOutput"
-				quid       	"3B898A46013B"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOperation"
-				quid       	"3B898A5C00B0"
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBinding"
-				quid       	"3B8989FE037C"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createFault"
-				quid       	"3B898A7502E7"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createImport"
-				quid       	"3B898A83014C"
-				result     	"IImport"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createInput"
-				quid       	"3B898A9D033E"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createMessage"
-				quid       	"3B898AAF0254"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOperation"
-				quid       	"3B898AC203C4"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOutput"
-				quid       	"3B898AE800ED"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPart"
-				quid       	"3B898AF8026D"
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPort"
-				quid       	"3B898B0801DA"
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPortType"
-				quid       	"3B898B15039B"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createService"
-				quid       	"3B898B32013A"
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBinding"
-				quid       	"3B898B420075"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindings"
-				quid       	"3B898B920341"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BCD0060"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BE70144"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessage"
-				quid       	"3B898C170107"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessages"
-				quid       	"3B898C3E001D"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespace"
-				quid       	"3B898C62014B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespaces"
-				quid       	"3B898C740115"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3B898CBE0071"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortTypes"
-				quid       	"3B898CDA01C6"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPrefix"
-				quid       	"3B898CFD0017"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getService"
-				quid       	"3B898D2300A8"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getServices"
-				quid       	"3B898D3B03CE"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionRegistry"
-				quid       	"3B89D5B8012B"
-				result     	"IExtensionRegistry"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setExtensionRegistry"
-				quid       	"3B89D5D703BB"
-				parameters 	(list Parameters
-				    (object Parameter "extensionRegistry"
-					type       	"IExtensionRegistry"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDocumentBaseURI"
-				quid       	"3B89D5FE0208"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocumentBaseURI"
-				quid       	"3B89D6180328"
-				parameters 	(list Parameters
-				    (object Parameter "documentBase"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createTypes"
-				quid       	"3CADD0560080"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeService"
-				quid       	"3CADD07E004C"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeBinding"
-				quid       	"3CADD0BA0355"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removePortType"
-				quid       	"3CADD0D8029A"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeMessage"
-				quid       	"3CADD0FA0307"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getTypes"
-				quid       	"3C86706F031B"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setTypes"
-				quid       	"3C86709500EE"
-				parameters 	(list Parameters
-				    (object Parameter "types"
-					type       	"ITypes"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Definition"
-				quid       	"3B84B1E702A1"
-				stereotype 	"javaclass")))
-		    (object Class "IImport"
-			quid       	"3B84B2020119"
-			documentation 	"This class represents the javax.wsdl.Import non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Import"
-				quid       	"3B84B20C02EA"
-				stereotype 	"javaclass")))
-		    (object Class "IList"
-			quid       	"3B85C0A203C5"
-			documentation 	"This class represents the non-MOF java.util.List interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"3B85C0AF0297"
-				stereotype 	"javaclass")))
-		    (object Class "IMap"
-			quid       	"3B896B0300D4"
-			documentation 	"This class represents the non-MOF java.util.Map interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Map"
-				quid       	"3B896B1102B5"
-				stereotype 	"javaclass")))
-		    (object Class "IURL"
-			quid       	"3B89D5630274"
-			documentation 	"This class represents the non-MOF java.net.URL interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.net.URL"
-				quid       	"3B89D56E03E2"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensionRegistry"
-			quid       	"3B89D59302A5"
-			documentation 	"This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensionRegistry"
-				quid       	"3B89D59F02E8"
-				stereotype 	"javaclass")))
-		    (object Class "Types"
-			quid       	"3B8BE9A603A8"
-			documentation 	"This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B8BEB010311"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3CADCD3B0380"
-				supplier   	"Logical View::wsdl::ITypes"
-				quidu      	"3CADCBB20050"))
-			operations 	(list Operations
-			    (object Operation "getSchemas"
-				quid       	"3CADCF3803E6"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSchemas"
-				quid       	"3CADCF7E0301"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)))
-		    (object Class "IIterator"
-			quid       	"3C4687DA0167"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Iterator"
-				quid       	"3C46880800B9"
-				stereotype 	"javaclass")))
-		    (object Class "WSDLException"
-			quid       	"3C4689650313"
-			documentation 	"This class represents the javax.wsdl.Exception class."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.WSDLException"
-				quid       	"3C4689740315"
-				stereotype 	"javaclass")))
-		    (object Class "ITypes"
-			quid       	"3CADCBB20050"
-			documentation 	"This class represents the javax.wsdl.Types non-MOF interface"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Types"
-				quid       	"3CADCBF10173"
-				stereotype 	"javaclass")))
-		    (object Class "UnknownExtensibilityElement"
-			quid       	"3CB24AC002AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CB24AEC01CB"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "XSDSchemaExtensibilityElement"
-			quid       	"3CC360D7039C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CC3627F00B7"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "DOMDocument"
-			quid       	"3CD1502C023B"
-			documentation 	"This class represents the org.w3c.dom.Document non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3CD150600182"
-				stereotype 	"javaclass")))
-		    (object Class "MessageReference"
-			quid       	"3F6771DB02DC"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3F762A6A0308"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3F6780A001AB"
-				type       	"String"
-				exportControl 	"Protected"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Association "$UNNAMED$6"
-			quid       	"3AD5C824018C"
-			roles      	(list role_list
-			    (object Role "portType"
-				quid       	"3AD5C82701C3"
-				label      	"portType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				Containment 	"By Value"
-				is_aggregate 	TRUE)
-			    (object Role "eOperations"
-				quid       	"3AD5C82701CD"
-				label      	"eOperations"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$7"
-			quid       	"3AD5CEBE00E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$8"
-				quid       	"3AD5CEBF0057"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eParts"
-				quid       	"3AD5CEBF0061"
-				label      	"eParts"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$9"
-			quid       	"3AD5D352010F"
-			roles      	(list role_list
-			    (object Role "ePortType"
-				quid       	"3AD5D3540176"
-				label      	"ePortType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$10"
-				quid       	"3AD5D3540180"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261")))
-		    (object Association "$UNNAMED$11"
-			quid       	"3AD5D3E10179"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$12"
-				quid       	"3AD5D3E20225"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindingOperations"
-				quid       	"3AD5D3E20239"
-				label      	"eBindingOperations"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$13"
-			quid       	"3AD5D425038A"
-			roles      	(list role_list
-			    (object Role "eOperation"
-				quid       	"3AD5D42602F5"
-				label      	"eOperation"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$14"
-				quid       	"3AD5D42602FF"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145")))
-		    (object Association "$UNNAMED$15"
-			quid       	"3AD5D9400393"
-			roles      	(list role_list
-			    (object Role "ePorts"
-				quid       	"3AD5D941031C"
-				label      	"ePorts"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$16"
-				quid       	"3AD5D941031D"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$17"
-			quid       	"3AD5D9B8011F"
-			roles      	(list role_list
-			    (object Role "eBinding"
-				quid       	"3AD5D9B9024D"
-				label      	"eBinding"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$18"
-				quid       	"3AD5D9B90261"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286")))
-		    (object Association "$UNNAMED$19"
-			quid       	"3AD5E60301E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$20"
-				quid       	"3AD5E60400B7"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eMessages"
-				quid       	"3AD5E60400C1"
-				label      	"eMessages"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$21"
-			quid       	"3AD5E6710104"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$22"
-				quid       	"3AD5E672034A"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "ePortTypes"
-				quid       	"3AD5E6720354"
-				label      	"ePortTypes"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$23"
-			quid       	"3AD5E6770095"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$24"
-				quid       	"3AD5E6780371"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindings"
-				quid       	"3AD5E678037B"
-				label      	"eBindings"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$25"
-			quid       	"3AD5E67B0311"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$26"
-				quid       	"3AD5E67D007F"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eServices"
-				quid       	"3AD5E67D0089"
-				label      	"eServices"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$27"
-			quid       	"3AD5FD130079"
-			roles      	(list role_list
-			    (object Role "eExtensibilityElements"
-				quid       	"3AD5FD14019D"
-				label      	"eExtensibilityElements"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$28"
-				quid       	"3AD5FD14019E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$29"
-			quid       	"3ADF2E6401F5"
-			roles      	(list role_list
-			    (object Role "eBindingInput"
-				quid       	"3ADF2E650251"
-				label      	"eBindingInput"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$30"
-				quid       	"3ADF2E650252"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$31"
-			quid       	"3ADF2EB30163"
-			roles      	(list role_list
-			    (object Role "eBindingOutput"
-				quid       	"3ADF2EB4013C"
-				label      	"eBindingOutput"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$32"
-				quid       	"3ADF2EB4013D"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$33"
-			quid       	"3ADF2F94024D"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3ADF2F950190"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$34"
-				quid       	"3ADF2F95019A"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$35"
-			quid       	"3ADF2FB802F9"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3ADF2FB9020A"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$36"
-				quid       	"3ADF2FB9020B"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$37"
-			quid       	"3ADF331601A4"
-			roles      	(list role_list
-			    (object Role "eFaults"
-				quid       	"3ADF33180387"
-				label      	"eFaults"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$38"
-				quid       	"3ADF33180388"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$39"
-			quid       	"3ADF340003E5"
-			roles      	(list role_list
-			    (object Role "eBindingFaults"
-				quid       	"3ADF340103AA"
-				label      	"eBindingFaults"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$40"
-				quid       	"3ADF340103AB"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$41"
-			quid       	"3AE091F402F3"
-			roles      	(list role_list
-			    (object Role "eFault"
-				quid       	"3AE091F801FE"
-				label      	"eFault"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$42"
-				quid       	"3AE091F801FF"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6")))
-		    (object Association "$UNNAMED$43"
-			quid       	"3AEA3D55002D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$44"
-				quid       	"3AEA3D560328"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eNamespaces"
-				quid       	"3AEA3D560332"
-				label      	"eNamespaces"
-				supplier   	"Logical View::wsdl::Namespace"
-				quidu      	"3AEA3CD30030"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$45"
-			quid       	"3AEA3E3A002D"
-			roles      	(list role_list
-			    (object Role "eDefinition"
-				quid       	"3AEA3E3C01E8"
-				label      	"eDefinition"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$46"
-				quid       	"3AEA3E3C01F2"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$47"
-			quid       	"3AEA412F0035"
-			roles      	(list role_list
-			    (object Role "eParameterOrdering"
-				quid       	"3AEA41310255"
-				label      	"eParameterOrdering"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$48"
-				quid       	"3AEA4131025F"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE")))
-		    (object Association "$UNNAMED$49"
-			quid       	"3B84AD2400BD"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3B84AD250083"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$50"
-				quid       	"3B84AD250084"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4")))
-		    (object Association "$UNNAMED$51"
-			quid       	"3B84AD7900F2"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3B84AD7A014D"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$52"
-				quid       	"3B84AD7A014E"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C")))
-		    (object Association "$UNNAMED$53"
-			quid       	"3B8B1BE900C4"
-			roles      	(list role_list
-			    (object Role "typeDefinition"
-				quid       	"3B8B1BE90327"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$54"
-				quid       	"3B8B1BE90331"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$55"
-			quid       	"3B8B1C1203B2"
-			roles      	(list role_list
-			    (object Role "elementDeclaration"
-				quid       	"3B8B1C14001C"
-				label      	"elementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$56"
-				quid       	"3B8B1C140026"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$57"
-			quid       	"3B8B1DCC02E5"
-			roles      	(list role_list
-			    (object Role "eSchema"
-				quid       	"3B8B1DCE0270"
-				label      	"eSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$58"
-				quid       	"3B8B1DCE027A"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$59"
-			quid       	"3B8BEA27029F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$60"
-				quid       	"3B8BEA290356"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eTypes"
-				quid       	"3B8BEA29036A"
-				label      	"eTypes"
-				supplier   	"Logical View::wsdl::Types"
-				quidu      	"3B8BE9A603A8"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$61"
-			quid       	"3C46829303E5"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3C468296010E"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$62"
-				quid       	"3C4682960118"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$63"
-			quid       	"3C864DFF02EC"
-			roles      	(list role_list
-			    (object Role "eImports"
-				quid       	"3C864DFF02ED"
-				label      	"eImports"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$64"
-				quid       	"3C864DFF02EE"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$65"
-			quid       	"3CC3614500F2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$66"
-				quid       	"3CC36146023D"
-				supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-				quidu      	"3CC360D7039C"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "schema"
-				quid       	"3CC36146023E"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$67"
-			quid       	"3F74E78401B1"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3F74E786000F"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$68"
-				quid       	"3F74E7860023"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")))
-		    (object Association "$UNNAMED$69"
-			quid       	"3F7896A2026E"
-			roles      	(list role_list
-			    (object Role "parent"
-				quid       	"3F7896A7012B"
-				label      	"parent"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "children"
-				quid       	"3F7896A7012C"
-				label      	"children"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "2.7 Services"
-			quid       	"39AD3EF60127"
-			title      	"2.7 Services"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @41
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@41
-				    location   	(1173, 660)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@41
-				    location   	(1173, 610)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				compartment 	(object Compartment
-				    Parent_View 	@41
-				    location   	(1173, 715)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	471)
-				width      	520
-				height     	404
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPort" @42
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@42
-				    location   	(686, 481)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IPort")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@42
-				    location   	(686, 431)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB800326"
-				compartment 	(object Compartment
-				    Parent_View 	@42
-				    location   	(686, 536)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	275)
-				width      	278
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IService" @43
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@43
-				    location   	(126, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"IService")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@43
-				    location   	(126, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB490287"
-				compartment 	(object Compartment
-				    Parent_View 	@43
-				    location   	(126, 145)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	237)
-				width      	246
-				height     	264
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @44
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@44
-				    location   	(44, 389)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				compartment 	(object Compartment
-				    Parent_View 	@44
-				    location   	(44, 444)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @45
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954E01B4"
-				client     	@44
-				supplier   	@43
-				line_style 	3
-				origin_attachment 	(240, 377)
-				terminal_attachment 	(240, 292))
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @46
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@46
-				    location   	(1244, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@46
-				    location   	(1244, 1180)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @47
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@46
-				supplier   	@41
-				line_style 	3
-				origin_attachment 	(1430, 1113)
-				terminal_attachment 	(1430, 1002))
-			    (object ClassView "Class" "Logical View::wsdl::Port" @48
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 912)
-				label      	(object ItemLabel
-				    Parent_View 	@48
-				    location   	(675, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	282
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				compartment 	(object Compartment
-				    Parent_View 	@48
-				    location   	(675, 895)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	303)
-				width      	300
-				height     	168
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @49
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954502C9"
-				client     	@48
-				supplier   	@42
-				line_style 	3
-				origin_attachment 	(809, 828)
-				terminal_attachment 	(809, 637))
-			    (object AssociationViewNew "$UNNAMED$15" @50
-				location   	(343, 916)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9400393"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePorts" @51
-					Parent_View 	@50
-					location   	(-121, 644)
-					label      	(object SegLabel @52
-					    Parent_View 	@51
-					    location   	(413, 945)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+ePorts"
-					    pctDist    	0.218978
-					    height     	29
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031C"
-					client     	@50
-					supplier   	@48
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(666, 916)
-					label      	(object SegLabel @53
-					    Parent_View 	@51
-					    location   	(539, 880)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	160
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.608000
-					    height     	37
-					    orientation 	0)
-					label      	(object SegLabel @54
-					    Parent_View 	@51
-					    location   	(448, 990)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.328467
-					    height     	74
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$16" @55
-					Parent_View 	@50
-					location   	(-121, 644)
-					label      	(object SegLabel @56
-					    Parent_View 	@55
-					    location   	(216, 744)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031D"
-					client     	@50
-					supplier   	@44
-					vertices   	(list Points
-					    (343, 916)
-					    (257, 916)
-					    (257, 679))
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(257, 679)
-					label      	(object SegLabel @57
-					    Parent_View 	@55
-					    location   	(301, 796)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.637097
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$17" @58
-				location   	(886, 1270)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9B8011F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBinding" @59
-					Parent_View 	@58
-					location   	(38, 422)
-					label      	(object SegLabel @60
-					    Parent_View 	@59
-					    location   	(1112, 1235)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eBinding"
-					    pctDist    	0.648571
-					    height     	36
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B9024D"
-					client     	@58
-					supplier   	@46
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(1235, 1270)
-					label      	(object SegLabel @61
-					    Parent_View 	@59
-					    location   	(1170, 1313)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.814286
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$18" @62
-					Parent_View 	@58
-					location   	(38, 422)
-					label      	(object SegLabel @63
-					    Parent_View 	@62
-					    location   	(852, 1106)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	""
-					    pctDist    	0.687943
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B90261"
-					client     	@58
-					supplier   	@48
-					vertices   	(list Points
-					    (886, 1270)
-					    (812, 1270)
-					    (812, 996))
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(812, 996))))))
-		    (object ClassDiagram "2.5 Bindings"
-			quid       	"39AD51270252"
-			title      	"2.5 Bindings"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @64
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@64
-				    location   	(73, 114)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@64
-				    location   	(73, 64)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				compartment 	(object Compartment
-				    Parent_View 	@64
-				    location   	(73, 172)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	471)
-				width      	480
-				height     	376
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOperation" @65
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 352)
-				label      	(object ItemLabel
-				    Parent_View 	@65
-				    location   	(780, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"IBindingOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@65
-				    location   	(780, 80)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADC00072"
-				compartment 	(object Compartment
-				    Parent_View 	@65
-				    location   	(780, 188)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	9
-				    max_width  	396)
-				width      	410
-				height     	568
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingInput" @66
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@66
-				    location   	(62, 1334)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IBindingInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@66
-				    location   	(62, 1284)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADEB0100"
-				width      	278
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOutput" @67
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@67
-				    location   	(61, 1638)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"IBindingOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@67
-				    location   	(61, 1588)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE210111"
-				width      	312
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingFault" @68
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@68
-				    location   	(72, 1958)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"IBindingFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@68
-				    location   	(72, 1908)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE4F00BD"
-				width      	290
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @69
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@69
-				    location   	(1568, 486)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	673
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@69
-				    location   	(1568, 544)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	691
-				height     	301
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @70
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@70
-				    location   	(1756, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @71
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@71
-				    location   	(1756, 1587)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @72
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@72
-				    location   	(97, 539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@72
-				    location   	(97, 597)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @73
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@72
-				supplier   	@64
-				line_style 	3
-				origin_attachment 	(279, 527)
-				terminal_attachment 	(279, 428))
-			    (object AssociationViewNew "$UNNAMED$9" @74
-				location   	(1039, 742)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D352010F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePortType" @75
-					Parent_View 	@74
-					location   	(575, 598)
-					label      	(object SegLabel @76
-					    Parent_View 	@75
-					    location   	(1449, 781)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+ePortType"
-					    pctDist    	0.789292
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540176"
-					client     	@74
-					supplier   	@69
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(1559, 742)
-					label      	(object SegLabel @77
-					    Parent_View 	@75
-					    location   	(1492, 716)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.872193
-					    height     	27
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$10" @78
-					Parent_View 	@74
-					location   	(575, 598)
-					label      	(object SegLabel @79
-					    Parent_View 	@78
-					    location   	(776, 697)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	""
-					    pctDist    	0.509449
-					    height     	46
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540180"
-					client     	@74
-					supplier   	@72
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(520, 742))))
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @80
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@80
-				    location   	(1672, 851)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				compartment 	(object Compartment
-				    Parent_View 	@80
-				    location   	(1672, 909)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	6
-				    max_width  	446)
-				width      	450
-				height     	370
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @81
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@81
-				    location   	(476, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				compartment 	(object Compartment
-				    Parent_View 	@81
-				    location   	(476, 1341)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$49" @82
-				location   	(1264, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD2400BD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @83
-					Parent_View 	@82
-					location   	(96, 287)
-					label      	(object SegLabel @84
-					    Parent_View 	@83
-					    location   	(1637, 1316)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.775148
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250083"
-					client     	@82
-					supplier   	@70
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(1747, 1359)
-					label      	(object SegLabel @85
-					    Parent_View 	@83
-					    location   	(1694, 1398)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.889546
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$50" @86
-					Parent_View 	@82
-					location   	(96, 287)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250084"
-					client     	@82
-					supplier   	@81
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(781, 1359))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @87
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@87
-				    location   	(812, 1539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				compartment 	(object Compartment
-				    Parent_View 	@87
-				    location   	(812, 1597)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$51" @88
-				location   	(1432, 1654)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD7900F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @89
-					Parent_View 	@88
-					location   	(-120, 374)
-					label      	(object SegLabel @90
-					    Parent_View 	@89
-					    location   	(1645, 1612)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.674772
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014D"
-					client     	@88
-					supplier   	@71
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1747, 1654)
-					label      	(object SegLabel @91
-					    Parent_View 	@89
-					    location   	(1681, 1697)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.790274
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$52" @92
-					Parent_View 	@88
-					location   	(-120, 374)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014E"
-					client     	@88
-					supplier   	@87
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1117, 1654))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @93
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@93
-				    location   	(819, 931)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				compartment 	(object Compartment
-				    Parent_View 	@93
-				    location   	(819, 989)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	303)
-				width      	364
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @94
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84ADE401DC"
-				client     	@93
-				supplier   	@65
-				line_style 	3
-				origin_attachment 	(966, 919)
-				terminal_attachment 	(966, 636))
-			    (object AssociationViewNew "$UNNAMED$11" @95
-				location   	(457, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D3E10179"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$12" @96
-					Parent_View 	@95
-					location   	(-1319, 494)
-					label      	(object SegLabel @97
-					    Parent_View 	@96
-					    location   	(235, 920)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20225"
-					client     	@95
-					supplier   	@72
-					vertices   	(list Points
-					    (457, 1022)
-					    (276, 1022)
-					    (276, 849))
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(276, 849)
-					label      	(object SegLabel @98
-					    Parent_View 	@96
-					    location   	(330, 884)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "eBindingOperations" @99
-					Parent_View 	@95
-					location   	(-1319, 494)
-					label      	(object SegLabel @100
-					    Parent_View 	@99
-					    location   	(531, 977)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+eBindingOperations"
-					    pctDist    	0.211699
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20239"
-					client     	@95
-					supplier   	@93
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(810, 1022)
-					label      	(object SegLabel @101
-					    Parent_View 	@99
-					    location   	(769, 980)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.884956
-					    height     	43
-					    orientation 	0)
-					label      	(object SegLabel @102
-					    Parent_View 	@99
-					    location   	(714, 1067)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.727564
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$13" @103
-				location   	(1418, 1040)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D425038A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperation" @104
-					Parent_View 	@103
-					location   	(-358, 464)
-					label      	(object SegLabel @105
-					    Parent_View 	@104
-					    location   	(1520, 1079)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	228
-					    justify    	0
-					    label      	"+eOperation"
-					    pctDist    	0.420601
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602F5"
-					client     	@103
-					supplier   	@80
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1663, 1040)
-					label      	(object SegLabel @106
-					    Parent_View 	@104
-					    location   	(1589, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.696721
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$14" @107
-					Parent_View 	@103
-					location   	(-358, 464)
-					label      	(object SegLabel @108
-					    Parent_View 	@107
-					    location   	(1273, 1070)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.595420
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602FF"
-					client     	@103
-					supplier   	@93
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1174, 1040))))
-			    (object AssociationViewNew "$UNNAMED$29" @109
-				location   	(787, 1190)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2E6401F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingInput" @110
-					Parent_View 	@109
-					location   	(-381, 454)
-					label      	(object SegLabel @111
-					    Parent_View 	@110
-					    location   	(669, 1152)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+eBindingInput"
-					    pctDist    	0.511905
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650251"
-					client     	@109
-					supplier   	@81
-					vertices   	(list Points
-					    (787, 1190)
-					    (636, 1190)
-					    (636, 1271))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(636, 1271)
-					label      	(object SegLabel @112
-					    Parent_View 	@110
-					    location   	(685, 1222)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.440476
-					    height     	32
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$30" @113
-					Parent_View 	@109
-					location   	(-381, 454)
-					label      	(object SegLabel @114
-					    Parent_View 	@113
-					    location   	(885, 1144)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650252"
-					client     	@109
-					supplier   	@93
-					vertices   	(list Points
-					    (787, 1190)
-					    (926, 1190)
-					    (926, 1097))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(926, 1097)
-					label      	(object SegLabel @115
-					    Parent_View 	@113
-					    location   	(871, 1136)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.837758
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$31" @116
-				location   	(1024, 1312)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2EB30163"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingOutput" @117
-					Parent_View 	@116
-					location   	(-150, 578)
-					label      	(object SegLabel @118
-					    Parent_View 	@117
-					    location   	(1012, 1429)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	306
-					    justify    	0
-					    label      	"+eBindingOutput"
-					    pctDist    	0.545082
-					    height     	13
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013C"
-					client     	@116
-					supplier   	@87
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1527)
-					label      	(object SegLabel @119
-					    Parent_View 	@117
-					    location   	(967, 1479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.774590
-					    height     	58
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$32" @120
-					Parent_View 	@116
-					location   	(-150, 578)
-					label      	(object SegLabel @121
-					    Parent_View 	@120
-					    location   	(983, 1140)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013D"
-					client     	@116
-					supplier   	@93
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1097)
-					label      	(object SegLabel @122
-					    Parent_View 	@120
-					    location   	(1031, 1186)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.590164
-					    height     	7
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @123
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1920, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@123
-				    location   	(1772, 1907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @124
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@124
-				    location   	(1212, 1859)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				compartment 	(object Compartment
-				    Parent_View 	@124
-				    location   	(1212, 1917)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @125
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE710333"
-				client     	@124
-				supplier   	@68
-				line_style 	3
-				origin_attachment 	(1203, 2007)
-				terminal_attachment 	(353, 2007))
-			    (object AssociationViewNew "$UNNAMED$39" @126
-				location   	(1356, 1352)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF340003E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingFaults" @127
-					Parent_View 	@126
-					location   	(188, 616)
-					label      	(object SegLabel @128
-					    Parent_View 	@127
-					    location   	(1382, 1750)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	300
-					    justify    	0
-					    label      	"+eBindingFaults"
-					    pctDist    	0.803150
-					    height     	26
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AA"
-					client     	@126
-					supplier   	@124
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1356, 1847)
-					label      	(object SegLabel @129
-					    Parent_View 	@127
-					    location   	(1409, 1797)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899194
-					    height     	53
-					    orientation 	0)
-					label      	(object SegLabel @130
-					    Parent_View 	@127
-					    location   	(1256, 1806)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.919291
-					    height     	101
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$40" @131
-					Parent_View 	@126
-					location   	(188, 616)
-					label      	(object SegLabel @132
-					    Parent_View 	@131
-					    location   	(1076, 1197)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AB"
-					client     	@126
-					supplier   	@93
-					vertices   	(list Points
-					    (1356, 1352)
-					    (1356, 1217)
-					    (1117, 1217)
-					    (1117, 1097))
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1117, 1097)
-					label      	(object SegLabel @133
-					    Parent_View 	@131
-					    location   	(1152, 1164)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.687008
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$41" @134
-				location   	(1640, 1970)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE091F402F3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFault" @135
-					Parent_View 	@134
-					location   	(-344, 818)
-					label      	(object SegLabel @136
-					    Parent_View 	@135
-					    location   	(1674, 1915)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eFault"
-					    pctDist    	0.276423
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FE"
-					client     	@134
-					supplier   	@123
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1763, 1970)
-					label      	(object SegLabel @137
-					    Parent_View 	@135
-					    location   	(1718, 2012)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.642276
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$42" @138
-					Parent_View 	@134
-					location   	(-344, 818)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FF"
-					client     	@134
-					supplier   	@124
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1517, 1970))))
-			    (object InheritView "" @139
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE4302AB"
-				client     	@87
-				supplier   	@67
-				line_style 	3
-				origin_attachment 	(803, 1656)
-				terminal_attachment 	(364, 1656))
-			    (object InheritView "" @140
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE1B0113"
-				client     	@81
-				supplier   	@66
-				line_style 	3
-				origin_attachment 	(467, 1385)
-				terminal_attachment 	(331, 1385))))
-		    (object ClassDiagram "2.4 PortTypes"
-			quid       	"3AD5D1C40366"
-			title      	"2.4 PortTypes"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IPortType" @141
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@141
-				    location   	(146, 172)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"IPortType")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@141
-				    location   	(146, 122)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A5BE0331"
-				compartment 	(object Compartment
-				    Parent_View 	@141
-				    location   	(146, 233)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	696)
-				width      	718
-				height     	196
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::IOperation" @142
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@142
-				    location   	(1116, 176)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"IOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@142
-				    location   	(1116, 126)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A77600D1"
-				compartment 	(object Compartment
-				    Parent_View 	@142
-				    location   	(1116, 237)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	709)
-				width      	891
-				height     	188
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IInput" @143
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@143
-				    location   	(55, 1437)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@143
-				    location   	(55, 1387)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A7EE0015"
-				compartment 	(object Compartment
-				    Parent_View 	@143
-				    location   	(55, 1498)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	621)
-				width      	644
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IOutput" @144
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@144
-				    location   	(56, 1757)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"IOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@144
-				    location   	(56, 1707)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A829027D"
-				compartment 	(object Compartment
-				    Parent_View 	@144
-				    location   	(56, 1818)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	656)
-				width      	674
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IFault" @145
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@145
-				    location   	(55, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@145
-				    location   	(55, 2026)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A861031D"
-				compartment 	(object Compartment
-				    Parent_View 	@145
-				    location   	(55, 2137)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	625)
-				width      	644
-				height     	196
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @146
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@146
-				    location   	(158, 672)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@146
-				    location   	(158, 733)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	695
-				height     	281
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @147
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2576, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@147
-				    location   	(2325, 692)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				compartment 	(object Compartment
-				    Parent_View 	@147
-				    location   	(2325, 753)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	484)
-				width      	520
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @148
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@148
-				    location   	(1647, 2060)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @149
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@149
-				    location   	(870, 1422)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	390
-				height     	125
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @150
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@150
-				    location   	(1232, 1742)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	274
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @151
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@151
-				    location   	(1214, 620)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				compartment 	(object Compartment
-				    Parent_View 	@151
-				    location   	(1214, 681)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	446)
-				width      	695
-				height     	352
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$6" @152
-				location   	(1024, 797)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5C824018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperations" @153
-					Parent_View 	@152
-					location   	(592, 269)
-					label      	(object SegLabel @154
-					    Parent_View 	@153
-					    location   	(1088, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+eOperations"
-					    pctDist    	0.359649
-					    height     	50
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701CD"
-					client     	@152
-					supplier   	@151
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(1205, 797)
-					label      	(object SegLabel @155
-					    Parent_View 	@153
-					    location   	(1176, 861)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.840391
-					    height     	64
-					    orientation 	1)
-					label      	(object SegLabel @156
-					    Parent_View 	@153
-					    location   	(1074, 923)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.276243
-					    height     	126
-					    orientation 	1))
-				    (object RoleView "portType" @157
-					Parent_View 	@152
-					location   	(592, 269)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701C3"
-					client     	@152
-					supplier   	@146
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(843, 797)
-					label      	(object SegLabel @158
-					    Parent_View 	@157
-					    location   	(888, 757)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.753488
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$47" @159
-				location   	(2107, 773)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA412F0035"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParameterOrdering" @160
-					Parent_View 	@159
-					location   	(1819, 101)
-					label      	(object SegLabel @161
-					    Parent_View 	@160
-					    location   	(2145, 647)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+eParameterOrdering"
-					    pctDist    	0.183333
-					    height     	127
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA41310255"
-					client     	@159
-					supplier   	@147
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(2316, 773)
-					label      	(object SegLabel @162
-					    Parent_View 	@160
-					    location   	(2272, 822)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.796610
-					    height     	49
-					    orientation 	1)
-					label      	(object SegLabel @163
-					    Parent_View 	@160
-					    location   	(2171, 888)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.306220
-					    height     	115
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$48" @164
-					Parent_View 	@159
-					location   	(1819, 101)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA4131025F"
-					client     	@159
-					supplier   	@151
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(1899, 773))))
-			    (object AssociationViewNew "$UNNAMED$37" @165
-				location   	(1702, 1504)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF331601A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFaults" @166
-					Parent_View 	@165
-					location   	(1414, 832)
-					label      	(object SegLabel @167
-					    Parent_View 	@166
-					    location   	(1815, 1982)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eFaults"
-					    pctDist    	0.878992
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180387"
-					client     	@165
-					supplier   	@148
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 2048)
-					label      	(object SegLabel @168
-					    Parent_View 	@166
-					    location   	(1644, 2020)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.949580
-					    height     	59
-					    orientation 	1)
-					label      	(object SegLabel @169
-					    Parent_View 	@166
-					    location   	(1593, 1963)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.845378
-					    height     	110
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$38" @170
-					Parent_View 	@165
-					location   	(1414, 832)
-					label      	(object SegLabel @171
-					    Parent_View 	@170
-					    location   	(1661, 1069)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180388"
-					client     	@165
-					supplier   	@151
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 960)
-					label      	(object SegLabel @172
-					    Parent_View 	@170
-					    location   	(1821, 1039)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.857362
-					    height     	119
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$33" @173
-				location   	(1178, 1234)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2F94024D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @174
-					Parent_View 	@173
-					location   	(890, 562)
-					label      	(object SegLabel @175
-					    Parent_View 	@174
-					    location   	(878, 1343)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.819820
-					    height     	103
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F950190"
-					client     	@173
-					supplier   	@149
-					vertices   	(list Points
-					    (1178, 1234)
-					    (980, 1234)
-					    (980, 1410))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(980, 1410)
-					label      	(object SegLabel @176
-					    Parent_View 	@174
-					    location   	(1046, 1364)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.877660
-					    height     	66
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$34" @177
-					Parent_View 	@173
-					location   	(890, 562)
-					label      	(object SegLabel @178
-					    Parent_View 	@177
-					    location   	(1236, 1036)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F95019A"
-					client     	@173
-					supplier   	@151
-					vertices   	(list Points
-					    (1178, 1234)
-					    (1277, 1234)
-					    (1277, 960))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(1277, 960)
-					label      	(object SegLabel @179
-					    Parent_View 	@177
-					    location   	(1197, 1058)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736413
-					    height     	81
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$35" @180
-				location   	(1468, 1345)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2FB802F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @181
-					Parent_View 	@180
-					location   	(1180, 673)
-					label      	(object SegLabel @182
-					    Parent_View 	@181
-					    location   	(1362, 1669)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.840909
-					    height     	107
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020A"
-					client     	@180
-					supplier   	@150
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 1730)
-					label      	(object SegLabel @183
-					    Parent_View 	@181
-					    location   	(1546, 1676)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863636
-					    height     	78
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$36" @184
-					Parent_View 	@180
-					location   	(1180, 673)
-					label      	(object SegLabel @185
-					    Parent_View 	@184
-					    location   	(1427, 1037)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020B"
-					client     	@180
-					supplier   	@151
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 960)
-					label      	(object SegLabel @186
-					    Parent_View 	@184
-					    location   	(1523, 1080)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.690341
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @187
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FD8019F"
-				client     	@146
-				supplier   	@141
-				line_style 	0)
-			    (object InheritView "" @188
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FE20171"
-				client     	@151
-				supplier   	@142
-				line_style 	0)
-			    (object InheritView "" @189
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FEE031D"
-				client     	@149
-				supplier   	@143
-				line_style 	0)
-			    (object InheritView "" @190
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FF801CD"
-				client     	@150
-				supplier   	@144
-				line_style 	0)
-			    (object InheritView "" @191
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F2002002D"
-				client     	@148
-				supplier   	@145
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @192
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2224, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@192
-				    location   	(1937, 1312)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	575
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@192
-				    location   	(1937, 1373)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	593
-				height     	312
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::MessageReference" @193
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 2544)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@193
-				    location   	(1193, 2466)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	654
-				    justify    	0
-				    label      	"MessageReference")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3F6771DB02DC"
-				compartment 	(object Compartment
-				    Parent_View 	@193
-				    location   	(1193, 2527)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	303)
-				width      	672
-				height     	180
-				annotation 	8)
-			    (object InheritTreeView "" @194
-				location   	(1524, 2275)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@193
-				vertices   	(list Points
-				    (1524, 2275)
-				    (1524, 2454)))
-			    (object InheritView "" @195
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723D0319"
-				client     	@148
-				supplier   	@193
-				line_style 	3
-				origin_attachment 	(1776, 2176)
-				terminal_attachment 	(1776, 2275)
-				drawSupplier 	@194)
-			    (object InheritView "" @196
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723500DD"
-				client     	@150
-				supplier   	@193
-				line_style 	3
-				origin_attachment 	(1371, 1854)
-				terminal_attachment 	(1371, 2275)
-				drawSupplier 	@194)
-			    (object InheritView "" @197
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67722802E7"
-				client     	@149
-				supplier   	@193
-				line_style 	3
-				origin_attachment 	(980, 1534)
-				terminal_attachment 	(980, 2275)
-				drawSupplier 	@194)
-			    (object AssociationViewNew "$UNNAMED$67" @198
-				location   	(2206, 2259)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F74E78401B1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @199
-					Parent_View 	@198
-					location   	(734, -285)
-					label      	(object SegLabel @200
-					    Parent_View 	@199
-					    location   	(2068, 1670)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.912230
-					    height     	139
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E786000F"
-					client     	@198
-					supplier   	@192
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(2206, 1612)
-					label      	(object SegLabel @201
-					    Parent_View 	@199
-					    location   	(2260, 1678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$68" @202
-					Parent_View 	@198
-					location   	(734, -285)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E7860023"
-					client     	@198
-					supplier   	@193
-					vertices   	(list Points
-					    (2206, 2259)
-					    (2206, 2556)
-					    (1856, 2556))
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(1856, 2556))))))
-		    (object ClassDiagram "2.1 Definitions"
-			quid       	"3AD5E48A0262"
-			title      	"2.1 Definitions"
-			zoom       	83
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IDefinition" @203
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 192)
-				label      	(object ItemLabel
-				    Parent_View 	@203
-				    location   	(88, 161)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"IDefinition")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@203
-				    location   	(88, 111)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B1D90142"
-				compartment 	(object Compartment
-				    Parent_View 	@203
-				    location   	(88, 220)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	700)
-				width      	706
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @204
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@204
-				    location   	(1686, 896)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	294
-				height     	120
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Import" @205
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@205
-				    location   	(1910, 545)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				compartment 	(object Compartment
-				    Parent_View 	@205
-				    location   	(1910, 604)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	478)
-				width      	486
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @206
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2112, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@206
-				    location   	(1900, 1056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@206
-				    location   	(1900, 1115)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @207
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1808, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@207
-				    location   	(1596, 1360)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@207
-				    location   	(1596, 1419)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @208
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2336, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@208
-				    location   	(2124, 1600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@208
-				    location   	(2124, 1659)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @209
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@209
-				    location   	(1073, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	510
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				compartment 	(object Compartment
-				    Parent_View 	@209
-				    location   	(1073, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	7
-				    max_width  	521)
-				width      	528
-				height     	426
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$59" @210
-				location   	(1358, 860)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$60" @211
-					Parent_View 	@210
-					location   	(62, -36)
-					label      	(object SegLabel @212
-					    Parent_View 	@211
-					    location   	(1317, 535)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@210
-					supplier   	@209
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1358, 453)
-					label      	(object SegLabel @213
-					    Parent_View 	@211
-					    location   	(1403, 511)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.856649
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eTypes" @214
-					Parent_View 	@210
-					location   	(62, -36)
-					label      	(object SegLabel @215
-					    Parent_View 	@214
-					    location   	(1586, 909)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.779097
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@210
-					supplier   	@204
-					vertices   	(list Points
-					    (1358, 860)
-					    (1358, 948)
-					    (1677, 948))
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1677, 948)
-					label      	(object SegLabel @216
-					    Parent_View 	@214
-					    location   	(1632, 987)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.892655
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$63" @217
-				location   	(1612, 595)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$64" @218
-					Parent_View 	@217
-					location   	(12, 227)
-					label      	(object SegLabel @219
-					    Parent_View 	@218
-					    location   	(1423, 512)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@217
-					supplier   	@209
-					vertices   	(list Points
-					    (1612, 595)
-					    (1464, 595)
-					    (1464, 453))
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1464, 453)
-					label      	(object SegLabel @220
-					    Parent_View 	@218
-					    location   	(1524, 495)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.858667
-					    height     	60
-					    orientation 	1))
-				    (object RoleView "eImports" @221
-					Parent_View 	@217
-					location   	(12, 227)
-					label      	(object SegLabel @222
-					    Parent_View 	@221
-					    location   	(1692, 557)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.280335
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@217
-					supplier   	@205
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1901, 595)
-					label      	(object SegLabel @223
-					    Parent_View 	@221
-					    location   	(1854, 652)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.841004
-					    height     	57
-					    orientation 	1)
-					label      	(object SegLabel @224
-					    Parent_View 	@221
-					    location   	(1676, 646)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.225941
-					    height     	51
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$19" @225
-				location   	(1279, 1137)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E60301E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$20" @226
-					Parent_View 	@225
-					location   	(271, 273)
-					label      	(object SegLabel @227
-					    Parent_View 	@226
-					    location   	(1238, 591)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400B7"
-					client     	@225
-					supplier   	@209
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1279, 453)
-					label      	(object SegLabel @228
-					    Parent_View 	@226
-					    location   	(1320, 586)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.804974
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eMessages" @229
-					Parent_View 	@225
-					location   	(271, 273)
-					label      	(object SegLabel @230
-					    Parent_View 	@229
-					    location   	(1647, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+eMessages"
-					    pctDist    	0.643137
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400C1"
-					client     	@225
-					supplier   	@206
-					vertices   	(list Points
-					    (1279, 1137)
-					    (1279, 1208)
-					    (1891, 1208))
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1891, 1208)
-					label      	(object SegLabel @231
-					    Parent_View 	@229
-					    location   	(1821, 1171)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899346
-					    height     	38
-					    orientation 	0)
-					label      	(object SegLabel @232
-					    Parent_View 	@229
-					    location   	(1797, 1244)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.864407
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$21" @233
-				location   	(1212, 1159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6710104"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @234
-					Parent_View 	@233
-					location   	(-324, 215)
-					label      	(object SegLabel @235
-					    Parent_View 	@234
-					    location   	(1171, 594)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E672034A"
-					client     	@233
-					supplier   	@209
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1212, 453)
-					label      	(object SegLabel @236
-					    Parent_View 	@234
-					    location   	(1251, 624)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.757962
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "ePortTypes" @237
-					Parent_View 	@233
-					location   	(-324, 215)
-					label      	(object SegLabel @238
-					    Parent_View 	@237
-					    location   	(1391, 1451)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+ePortTypes"
-					    pctDist    	0.723698
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6720354"
-					client     	@233
-					supplier   	@207
-					vertices   	(list Points
-					    (1212, 1159)
-					    (1212, 1490)
-					    (1587, 1490))
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1587, 1490)
-					label      	(object SegLabel @239
-					    Parent_View 	@237
-					    location   	(1533, 1451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.925611
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @240
-					    Parent_View 	@237
-					    location   	(1512, 1540)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.895855
-					    height     	50
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$23" @241
-				location   	(1114, 1585)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6770095"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$24" @242
-					Parent_View 	@241
-					location   	(-406, 241)
-					label      	(object SegLabel @243
-					    Parent_View 	@242
-					    location   	(1073, 680)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6780371"
-					client     	@241
-					supplier   	@209
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(1114, 453)
-					label      	(object SegLabel @244
-					    Parent_View 	@242
-					    location   	(1155, 752)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736704
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eBindings" @245
-					Parent_View 	@241
-					location   	(-406, 241)
-					label      	(object SegLabel @246
-					    Parent_View 	@245
-					    location   	(1851, 1674)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eBindings"
-					    pctDist    	0.766347
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E678037B"
-					client     	@241
-					supplier   	@208
-					vertices   	(list Points
-					    (1114, 1585)
-					    (1114, 1716)
-					    (2115, 1716))
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(2115, 1716)
-					label      	(object SegLabel @247
-					    Parent_View 	@245
-					    location   	(2053, 1677)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.945074
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @248
-					    Parent_View 	@245
-					    location   	(2014, 1754)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.911072
-					    height     	38
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Service" @249
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@249
-				    location   	(1628, 1920)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				compartment 	(object Compartment
-				    Parent_View 	@249
-				    location   	(1628, 1979)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	425)
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$25" @250
-				location   	(1066, 1533)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E67B0311"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$26" @251
-					Parent_View 	@250
-					location   	(-521, -111)
-					label      	(object SegLabel @252
-					    Parent_View 	@251
-					    location   	(1025, 669)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D007F"
-					client     	@250
-					supplier   	@209
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1066, 453)
-					label      	(object SegLabel @253
-					    Parent_View 	@251
-					    location   	(1109, 756)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.719697
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "eServices" @254
-					Parent_View 	@250
-					location   	(-521, -111)
-					label      	(object SegLabel @255
-					    Parent_View 	@254
-					    location   	(1393, 2028)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eServices"
-					    pctDist    	0.791824
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D0089"
-					client     	@250
-					supplier   	@249
-					vertices   	(list Points
-					    (1066, 1533)
-					    (1066, 2059)
-					    (1619, 2059))
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1619, 2059)
-					label      	(object SegLabel @256
-					    Parent_View 	@254
-					    location   	(1554, 2031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.940197
-					    height     	29
-					    orientation 	0)
-					label      	(object SegLabel @257
-					    Parent_View 	@254
-					    location   	(1532, 2113)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.920515
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @258
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B1F80382"
-				client     	@209
-				supplier   	@203
-				line_style 	3
-				origin_attachment 	(1064, 263)
-				terminal_attachment 	(785, 263))))
-		    (object ClassDiagram "2.1.3 Extensibility"
-			quid       	"3AD60C510192"
-			title      	"2.1.3 Extensibility"
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @259
-				ShowCompartmentStereotypes 	TRUE
-				location   	(576, 1584)
-				label      	(object ItemLabel
-				    Parent_View 	@259
-				    location   	(494, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Port" @260
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1568, 1888)
-				label      	(object ItemLabel
-				    Parent_View 	@260
-				    location   	(1487, 1836)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @261
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1424, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@261
-				    location   	(1342, 1675)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @262
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1216, 2336)
-				label      	(object ItemLabel
-				    Parent_View 	@262
-				    location   	(1088, 2283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @263
-				ShowCompartmentStereotypes 	TRUE
-				location   	(736, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@263
-				    location   	(563, 1707)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	130
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IExtensibilityElement" @264
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@264
-				    location   	(1495, 136)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"IExtensibilityElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@264
-				    location   	(1495, 86)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B12402AB"
-				width      	804
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @265
-				ShowCompartmentStereotypes 	TRUE
-				location   	(928, 1952)
-				label      	(object ItemLabel
-				    Parent_View 	@265
-				    location   	(800, 1899)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @266
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1008, 2144)
-				label      	(object ItemLabel
-				    Parent_View 	@266
-				    location   	(863, 2091)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	290
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	308
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @267
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@267
-				    location   	(74, 1235)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	146
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @268
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(416, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@268
-				    location   	(335, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @269
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(480, 688)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@269
-				    location   	(209, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	542
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				compartment 	(object Compartment
-				    Parent_View 	@269
-				    location   	(209, 641)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	531)
-				width      	560
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @270
-				location   	(480, 1039)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@269
-				vertices   	(list Points
-				    (480, 1039)
-				    (480, 808)))
-			    (object InheritView "" @271
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD600CB00AA"
-				client     	@260
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(1566, 1824)
-				terminal_attachment 	(1566, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @272
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B5A4027E"
-				client     	@266
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(1097, 2079)
-				terminal_attachment 	(1097, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @273
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE0938602C9"
-				client     	@262
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(1219, 2271)
-				terminal_attachment 	(1219, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @274
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B59B0072"
-				client     	@265
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(988, 1887)
-				terminal_attachment 	(988, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @275
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6009202F7"
-				client     	@263
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(797, 1695)
-				terminal_attachment 	(797, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @276
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA0F02F0"
-				client     	@259
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(601, 1519)
-				terminal_attachment 	(601, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @277
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FDB803D4"
-				client     	@267
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(211, 1223)
-				terminal_attachment 	(211, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @278
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@268
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(414, 1344)
-				terminal_attachment 	(414, 1039)
-				drawSupplier 	@270)
-			    (object InheritView "" @279
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA20025E"
-				client     	@261
-				supplier   	@269
-				line_style 	3
-				origin_attachment 	(1429, 1663)
-				terminal_attachment 	(1429, 1039)
-				drawSupplier 	@270)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @280
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@280
-				    location   	(1632, 583)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	545
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				compartment 	(object Compartment
-				    Parent_View 	@280
-				    location   	(1632, 644)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	465)
-				width      	563
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$27" @281
-				location   	(1191, 672)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$28" @282
-					Parent_View 	@281
-					location   	(23, 560)
-					label      	(object SegLabel @283
-					    Parent_View 	@282
-					    location   	(847, 631)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@281
-					supplier   	@269
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(760, 672)
-					label      	(object SegLabel @284
-					    Parent_View 	@282
-					    location   	(830, 628)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.839695
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eExtensibilityElements" @285
-					Parent_View 	@281
-					location   	(23, 560)
-					label      	(object SegLabel @286
-					    Parent_View 	@285
-					    location   	(1355, 522)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	0.379070
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@281
-					supplier   	@280
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(1623, 672)
-					label      	(object SegLabel @287
-					    Parent_View 	@285
-					    location   	(1496, 627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.709402
-					    height     	46
-					    orientation 	0)
-					label      	(object SegLabel @288
-					    Parent_View 	@285
-					    location   	(1463, 764)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.632479
-					    height     	92
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::WSDLElement" @289
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1008, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@289
-				    location   	(630, 84)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	756
-				    justify    	0
-				    label      	"WSDLElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C6A302DD"
-				compartment 	(object Compartment
-				    Parent_View 	@289
-				    location   	(630, 145)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	753)
-				width      	774
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @290
-				location   	(1008, 402)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@289
-				vertices   	(list Points
-				    (1008, 402)
-				    (1008, 312)))
-			    (object InheritView "" @291
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FE3C03D4"
-				client     	@269
-				supplier   	@289
-				line_style 	3
-				origin_attachment 	(492, 568)
-				terminal_attachment 	(492, 402)
-				drawSupplier 	@290)
-			    (object InheritView "" @292
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B14903D0"
-				client     	@280
-				supplier   	@264
-				line_style 	3
-				origin_attachment 	(2015, 571)
-				terminal_attachment 	(2015, 246))
-			    (object InheritView "" @293
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BDDF53502C3"
-				client     	@280
-				supplier   	@289
-				line_style 	3
-				origin_attachment 	(1762, 571)
-				terminal_attachment 	(1762, 402)
-				drawSupplier 	@290)
-			    (object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @294
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2016, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@294
-				    location   	(1731, 1307)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	570
-				    justify    	0
-				    label      	"UnknownExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CB24AC002AE"
-				width      	588
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @295
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CB24AEC01CB"
-				client     	@294
-				supplier   	@280
-				line_style 	3
-				origin_attachment 	(1796, 1295)
-				terminal_attachment 	(1796, 805))
-			    (object AssociationViewNew "$UNNAMED$69" @296
-				location   	(2311, 1686)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F7896A2026E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "parent" @297
-					Parent_View 	@296
-					location   	(279, 294)
-					label      	(object SegLabel @298
-					    Parent_View 	@297
-					    location   	(2422, 1333)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+parent"
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012B"
-					client     	@296
-					supplier   	@294
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2432, 1686)
-					    (2432, 1374)
-					    (2310, 1374))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2310, 1374)
-					label      	(object SegLabel @299
-					    Parent_View 	@297
-					    location   	(2366, 1428)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "children" @300
-					Parent_View 	@296
-					location   	(279, 294)
-					label      	(object SegLabel @301
-					    Parent_View 	@300
-					    location   	(1899, 1537)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+children"
-					    pctDist    	0.798561
-					    height     	118
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012C"
-					client     	@296
-					supplier   	@294
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2016, 1686)
-					    (2016, 1425))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2016, 1425)
-					label      	(object SegLabel @302
-					    Parent_View 	@300
-					    location   	(2070, 1481)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "2.1.1 Naming and Linking"
-			quid       	"3AE8ED7201BD"
-			title      	"2.1.1 Naming and Linking"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IImport" @303
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@303
-				    location   	(1422, 177)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"IImport")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@303
-				    location   	(1422, 127)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B2020119"
-				width      	598
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Namespace" @304
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@304
-				    location   	(202, 1041)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	461
-				    justify    	0
-				    label      	"Namespace")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AEA3CD30030"
-				width      	479
-				height     	215
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @305
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@305
-				    location   	(1294, 1142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	694
-				height     	173
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @306
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@306
-				    location   	(164, 236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	490
-				height     	320
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$43" @307
-				location   	(309, 786)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3D55002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eNamespaces" @308
-					Parent_View 	@307
-					location   	(-91, 258)
-					label      	(object SegLabel @309
-					    Parent_View 	@308
-					    location   	(461, 956)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+eNamespaces"
-					    pctDist    	0.698842
-					    height     	152
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560332"
-					client     	@307
-					supplier   	@304
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 1029)
-					label      	(object SegLabel @310
-					    Parent_View 	@308
-					    location   	(248, 973)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.768707
-					    height     	62
-					    orientation 	1)
-					label      	(object SegLabel @311
-					    Parent_View 	@308
-					    location   	(228, 913)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.525097
-					    height     	82
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$44" @312
-					Parent_View 	@307
-					location   	(-91, 258)
-					label      	(object SegLabel @313
-					    Parent_View 	@312
-					    location   	(268, 592)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560328"
-					client     	@307
-					supplier   	@306
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 544)
-					label      	(object SegLabel @314
-					    Parent_View 	@312
-					    location   	(239, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.844961
-					    height     	71
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::wsdl::Import" @315
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 720)
-				label      	(object ItemLabel
-				    Parent_View 	@315
-				    location   	(1255, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	434
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				width      	452
-				height     	304
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$57" @316
-				location   	(1486, 1001)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1DCC02E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eSchema" @317
-					Parent_View 	@316
-					location   	(510, -103)
-					label      	(object SegLabel @318
-					    Parent_View 	@317
-					    location   	(1737, 1018)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eSchema"
-					    pctDist    	0.592593
-					    height     	105
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE0270"
-					client     	@316
-					supplier   	@305
-					vertices   	(list Points
-					    (1486, 1001)
-					    (1632, 1001)
-					    (1632, 1130))
-					line_style 	3
-					origin_attachment 	(1486, 1001)
-					terminal_attachment 	(1632, 1130)
-					label      	(object SegLabel @319
-					    Parent_View 	@317
-					    location   	(1563, 1018)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.592593
-					    height     	70
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$58" @320
-					Parent_View 	@316
-					location   	(510, -103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE027A"
-					client     	@316
-					supplier   	@315
-					line_style 	3
-					origin_attachment 	(1486, 1000)
-					terminal_attachment 	(1486, 872))))
-			    (object AssociationViewNew "$UNNAMED$45" @321
-				location   	(1087, 403)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3E3A002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$46" @322
-					Parent_View 	@321
-					location   	(687, -125)
-					label      	(object SegLabel @323
-					    Parent_View 	@322
-					    location   	(1406, 480)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01F2"
-					client     	@321
-					supplier   	@315
-					vertices   	(list Points
-					    (1087, 403)
-					    (1364, 403)
-					    (1364, 568))
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(1364, 568))
-				    (object RoleView "eDefinition" @324
-					Parent_View 	@321
-					location   	(687, -125)
-					label      	(object SegLabel @325
-					    Parent_View 	@324
-					    location   	(805, 363)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eDefinition"
-					    pctDist    	0.637532
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01E8"
-					client     	@321
-					supplier   	@306
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(645, 403)
-					label      	(object SegLabel @326
-					    Parent_View 	@324
-					    location   	(727, 456)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.814910
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$63" @327
-				location   	(737, 826)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$64" @328
-					Parent_View 	@327
-					location   	(-671, 106)
-					label      	(object SegLabel @329
-					    Parent_View 	@328
-					    location   	(552, 647)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@327
-					supplier   	@306
-					vertices   	(list Points
-					    (737, 826)
-					    (510, 826)
-					    (510, 544))
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(510, 544)
-					label      	(object SegLabel @330
-					    Parent_View 	@328
-					    location   	(457, 595)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "eImports" @331
-					Parent_View 	@327
-					location   	(-671, 106)
-					label      	(object SegLabel @332
-					    Parent_View 	@331
-					    location   	(1144, 773)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.799189
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@327
-					supplier   	@315
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(1246, 826)
-					label      	(object SegLabel @333
-					    Parent_View 	@331
-					    location   	(1180, 879)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.872211
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @334
-					    Parent_View 	@331
-					    location   	(1162, 933)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.837728
-					    height     	107
-					    orientation 	1))))
-			    (object InheritView "" @335
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F200D0340"
-				client     	@315
-				supplier   	@303
-				line_style 	3
-				origin_attachment 	(1555, 568)
-				terminal_attachment 	(1555, 333))))
-		    (object ClassDiagram "2.2 Types"
-			quid       	"3B85AE59037E"
-			title      	"2.2 Types"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	81
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @336
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@336
-				    location   	(895, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ECD302A9"
-				width      	500
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @337
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@337
-				    location   	(906, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	478
-				height     	162
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @338
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@338
-				    location   	(1022, 1828)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	517
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@338
-				    location   	(1022, 1883)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	535
-				height     	305
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @339
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@339
-				    location   	(128, 1067)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	448
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				compartment 	(object Compartment
-				    Parent_View 	@339
-				    location   	(128, 1122)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	484)
-				width      	466
-				height     	258
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @340
-				location   	(735, 1172)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1BE900C4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "typeDefinition" @341
-					Parent_View 	@340
-					location   	(143, 676)
-					label      	(object SegLabel @342
-					    Parent_View 	@341
-					    location   	(775, 1133)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.269006
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90327"
-					client     	@340
-					supplier   	@336
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(886, 1172)
-					label      	(object SegLabel @343
-					    Parent_View 	@341
-					    location   	(839, 1207)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.688705
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$54" @344
-					Parent_View 	@340
-					location   	(143, 676)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90331"
-					client     	@340
-					supplier   	@339
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(585, 1172))))
-			    (object AssociationViewNew "$UNNAMED$55" @345
-				location   	(527, 1592)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1C1203B2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "elementDeclaration" @346
-					Parent_View 	@345
-					location   	(-65, 1096)
-					label      	(object SegLabel @347
-					    Parent_View 	@346
-					    location   	(666, 1554)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+elementDeclaration"
-					    pctDist    	0.375394
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C14001C"
-					client     	@345
-					supplier   	@337
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(897, 1592)
-					label      	(object SegLabel @348
-					    Parent_View 	@346
-					    location   	(807, 1645)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.755877
-					    height     	53
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$56" @349
-					Parent_View 	@345
-					location   	(-65, 1096)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C140026"
-					client     	@345
-					supplier   	@339
-					vertices   	(list Points
-					    (527, 1592)
-					    (437, 1592)
-					    (437, 1313))
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(437, 1313))))
-			    (object AssociationViewNew "$UNNAMED$61" @350
-				location   	(322, 1911)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C46829303E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @351
-					Parent_View 	@350
-					location   	(-14, 1191)
-					label      	(object SegLabel @352
-					    Parent_View 	@351
-					    location   	(838, 1872)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.748560
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C468296010E"
-					client     	@350
-					supplier   	@338
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(1013, 1911)
-					label      	(object SegLabel @353
-					    Parent_View 	@351
-					    location   	(943, 1965)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$62" @354
-					Parent_View 	@350
-					location   	(-14, 1191)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C4682960118"
-					client     	@350
-					supplier   	@339
-					vertices   	(list Points
-					    (322, 1911)
-					    (229, 1911)
-					    (229, 1313))
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(229, 1313))))
-			    (object ClassView "Class" "Logical View::wsdl::Types" @355
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@355
-				    location   	(615, 512)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	371
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				compartment 	(object Compartment
-				    Parent_View 	@355
-				    location   	(615, 567)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	312)
-				width      	389
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @356
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@356
-				    location   	(74, 107)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$59" @357
-				location   	(234, 604)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eTypes" @358
-					Parent_View 	@357
-					location   	(-150, 396)
-					label      	(object SegLabel @359
-					    Parent_View 	@358
-					    location   	(480, 640)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	207
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.661017
-					    height     	36
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@357
-					supplier   	@355
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(606, 604)
-					label      	(object SegLabel @360
-					    Parent_View 	@358
-					    location   	(526, 569)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783883
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$60" @361
-					Parent_View 	@357
-					location   	(-150, 396)
-					label      	(object SegLabel @362
-					    Parent_View 	@361
-					    location   	(133, 313)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@357
-					supplier   	@356
-					vertices   	(list Points
-					    (234, 604)
-					    (174, 604)
-					    (174, 225))
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(174, 225)
-					label      	(object SegLabel @363
-					    Parent_View 	@361
-					    location   	(228, 271)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.897729
-					    height     	54
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::ITypes" @364
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@364
-				    location   	(525, 203)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"ITypes")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@364
-				    location   	(525, 153)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CADCBB20050"
-				width      	248
-				height     	166
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::XSDSchemaExtensibilityElement" @365
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@365
-				    location   	(1359, 753)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	739
-				    justify    	0
-				    label      	"XSDSchemaExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CC360D7039C"
-				width      	757
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @366
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@366
-				    location   	(1529, 1103)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	655
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	673
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$65" @367
-				location   	(1826, 975)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3614500F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$66" @368
-					Parent_View 	@367
-					location   	(306, 447)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023D"
-					client     	@367
-					supplier   	@365
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 859)
-					label      	(object SegLabel @369
-					    Parent_View 	@368
-					    location   	(1774, 900)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.656489
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "schema" @370
-					Parent_View 	@367
-					location   	(306, 447)
-					label      	(object SegLabel @371
-					    Parent_View 	@370
-					    location   	(2006, 1033)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	0.507576
-					    height     	180
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023E"
-					client     	@367
-					supplier   	@366
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 1091)
-					label      	(object SegLabel @372
-					    Parent_View 	@370
-					    location   	(1788, 1050)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.651515
-					    height     	39
-					    orientation 	1))))
-			    (object InheritView "" @373
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CADCD3B0380"
-				client     	@355
-				supplier   	@364
-				line_style 	3
-				origin_attachment 	(705, 500)
-				terminal_attachment 	(705, 307))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @374
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 224)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@374
-				    location   	(815, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				compartment 	(object Compartment
-				    Parent_View 	@374
-				    location   	(815, 185)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	531)
-				width      	500
-				height     	212
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @375
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@355
-				supplier   	@374
-				line_style 	3
-				origin_attachment 	(854, 500)
-				terminal_attachment 	(854, 330))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @376
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1824, 464)
-				label      	(object ItemLabel
-				    Parent_View 	@376
-				    location   	(1490, 368)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	669
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				compartment 	(object Compartment
-				    Parent_View 	@376
-				    location   	(1490, 423)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	465)
-				width      	687
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$27" @377
-				location   	(1206, 493)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$28" @378
-					Parent_View 	@377
-					location   	(-586, 237)
-					label      	(object SegLabel @379
-					    Parent_View 	@378
-					    location   	(1136, 386)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@377
-					supplier   	@374
-					vertices   	(list Points
-					    (1206, 493)
-					    (1094, 493)
-					    (1094, 330))
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1094, 330)
-					label      	(object SegLabel @380
-					    Parent_View 	@378
-					    location   	(1042, 377)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.828326
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "eExtensibilityElements" @381
-					Parent_View 	@377
-					location   	(-586, 237)
-					label      	(object SegLabel @382
-					    Parent_View 	@381
-					    location   	(1196, 454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	-0.039711
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@377
-					supplier   	@376
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1481, 493)
-					label      	(object SegLabel @383
-					    Parent_View 	@381
-					    location   	(1415, 546)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.764957
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @384
-					    Parent_View 	@381
-					    location   	(1396, 392)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.694915
-					    height     	102
-					    orientation 	0))))
-			    (object InheritView "" @385
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3627F00B7"
-				client     	@365
-				supplier   	@376
-				line_style 	3
-				origin_attachment 	(1812, 741)
-				terminal_attachment 	(1812, 572))))
-		    (object ClassDiagram "2.3 Messages"
-			quid       	"3BCE853D02C8"
-			title      	"2.3 Messages"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IMessage" @386
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@386
-				    location   	(267, 122)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"IMessage")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@386
-				    location   	(267, 72)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A8AF004F"
-				compartment 	(object Compartment
-				    Parent_View 	@386
-				    location   	(267, 180)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	381)
-				width      	380
-				height     	328
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPart" @387
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@387
-				    location   	(1029, 124)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"IPart")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@387
-				    location   	(1029, 74)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A93F01BE"
-				compartment 	(object Compartment
-				    Parent_View 	@387
-				    location   	(1029, 182)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	603)
-				width      	617
-				height     	324
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @388
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@388
-				    location   	(1075, 690)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				compartment 	(object Compartment
-				    Parent_View 	@388
-				    location   	(1075, 748)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	484)
-				width      	492
-				height     	276
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @389
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A96D02F1"
-				client     	@388
-				supplier   	@387
-				line_style 	3
-				origin_attachment 	(1304, 678)
-				terminal_attachment 	(1304, 386))
-			    (object ClassView "Class" "Logical View::wsdl::Message" @390
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@390
-				    location   	(241, 507)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@390
-				    location   	(241, 565)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	425)
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @391
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A8D102BA"
-				client     	@390
-				supplier   	@386
-				line_style 	3
-				origin_attachment 	(445, 495)
-				terminal_attachment 	(445, 388))
-			    (object AssociationViewNew "$UNNAMED$7" @392
-				location   	(688, 952)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5CEBE00E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParts" @393
-					Parent_View 	@392
-					location   	(176, 328)
-					label      	(object SegLabel @394
-					    Parent_View 	@393
-					    location   	(952, 897)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eParts"
-					    pctDist    	0.697452
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0061"
-					client     	@392
-					supplier   	@388
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(1066, 952)
-					label      	(object SegLabel @395
-					    Parent_View 	@393
-					    location   	(987, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.789809
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @396
-					    Parent_View 	@393
-					    location   	(967, 1061)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.742038
-					    height     	109
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$8" @397
-					Parent_View 	@392
-					location   	(176, 328)
-					label      	(object SegLabel @398
-					    Parent_View 	@397
-					    location   	(404, 893)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0057"
-					client     	@392
-					supplier   	@390
-					vertices   	(list Points
-					    (688, 952)
-					    (445, 952)
-					    (445, 817))
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(445, 817)
-					label      	(object SegLabel @399
-					    Parent_View 	@397
-					    location   	(393, 912)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.747604
-					    height     	53
-					    orientation 	0))))))))
-	    (object Class_Category "xsd"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"XSD")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"xsd")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/xsd/2002/XSD"))
-		quid       	"39ABDC6F01AA"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "XSDAnnotation"
-			quid       	"3B66EDC80233"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69E1770116"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4E20366"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "applicationInformation"
-				quid       	"3BBF7EBF02C8"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "userInformation"
-				quid       	"3BBF7EEA0157"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributes"
-				quid       	"3BBF7F0501E2"
-				stereotype 	"0..*"
-				type       	"DOMAttr"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeDeclaration"
-			quid       	"3B66ED2E0192"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69B7DC0193"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B688E6103BE"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F5202B4"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeGroupContent"
-			quid       	"3B6940200089"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D8E200EA"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDAttributeGroupDefinition"
-			quid       	"3B66ED840290"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69403A0221"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2EB02A8"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC800D2"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F7B0386"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUse"
-			quid       	"3B68354601A8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D737038F"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B72D7BB0349"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3B69CCF3027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B69CDDB03B7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CDE002D8"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "use"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7B0220382"
-				type       	"XSDAttributeUseCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C2719D90341"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDBoundedFacet"
-			quid       	"3B6C751D0344"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C763C0224"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C752A00CC"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinalityFacet"
-			quid       	"3B6C755D03D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C764F0131"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C756C0153"
-				type       	"XSDCardinality"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexTypeContent"
-			quid       	"3B683BA00196"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848B80286"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDComplexTypeDefinition"
-			quid       	"3B682B82031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69BAA20310"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2")
-			    (object Inheritance_Relationship
-				quid       	"3BA0D01901F1"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "derivationMethod"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C6E4020E"
-				type       	"XSDDerivationMethod"
-				initv      	"restriction"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B69C71D026A"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C73800C5"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "contentTypeCategory"
-				quid       	"3B69CA4202B8"
-				type       	"XSDContentTypeCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibitedSubstitutions"
-				quid       	"3B69CB8A03E6"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F618014D"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0FB97006E"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3C31AF5E03A6"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDComponent"
-			quid       	"3B6846E90029"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA903D2"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDConcreteComponent"
-			quid       	"3B6AD7B40065"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "element"
-				quid       	"3B6ADDB501A5"
-				type       	"DOMElement"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDConstrainingFacet"
-			quid       	"3B6C6B340093"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C800394"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDDiagnostic"
-			quid       	"3BFE5F910046"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3D4C0F4C01A1"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "severity"
-				quid       	"3BFE691C005D"
-				type       	"XSDDiagnosticSeverity"
-				exportControl 	"Public")
-			    (object ClassAttribute "message"
-				quid       	"3BFE5FDD0280"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "locationURI"
-				quid       	"3C063743016B"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "line"
-				quid       	"3BFE607E0213"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "column"
-				quid       	"3BFE611E0296"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "node"
-				quid       	"3C016B6B0200"
-				type       	"DOMNode"
-				exportControl 	"Public")
-			    (object ClassAttribute "annotationURI"
-				quid       	"3C06374F0186"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDElementDeclaration"
-			quid       	"3B66ED580214"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69EDEE01BF"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B685F17002E"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174")
-			    (object Inheritance_Relationship
-				quid       	"3B688E660339"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "nillable"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BFB4029F"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "disallowedSubstitutions"
-				quid       	"3B69C4680368"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "substitutionGroupExclusions"
-				quid       	"3B69C4A003B9"
-				stereotype 	"0..*"
-				type       	"XSDSubstitutionGroupExclusions"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C4E0000E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D14C00B2"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D16801C1"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289F6203CF"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C34DCB00018"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDEnumerationFacet"
-			quid       	"3B6C6ACE0141"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C9D03C7"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C640054"
-				stereotype 	"0..*"
-				type       	"Value"
-				exportControl 	"Public")))
-		    (object Class "XSDFacet"
-			quid       	"3B6C359403D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D25680259"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3B6C73740253"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "facetName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289FB401EC"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "effectiveValue"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28AAE303B6"
-				type       	"Value"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFeature"
-			quid       	"3B69B537026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C290A2C0307"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B69BF81020F"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BF8800C5"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "form"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F902B033E"
-				type       	"XSDForm"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C271A1B016F"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "global"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0070372"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "featureReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0440185"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFixedFacet"
-			quid       	"3B6C699E00C1"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8801B4"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C6A600201"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFractionDigitsFacet"
-			quid       	"3B6C79BE02EE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B990016"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79D2008A"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDFundamentalFacet"
-			quid       	"3B6C69E801D6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C7B0396"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDIdentityConstraintDefinition"
-			quid       	"3B682B2603A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684AA30242"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "identityConstraintCategory"
-				quid       	"3B69D1C70143"
-				type       	"XSDIdentityConstraintCategory"
-				exportControl 	"Public")))
-		    (object Class "XSDImport"
-			quid       	"3B688C93017F"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8D9003E"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespace"
-				quid       	"3B6ADB15036C"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDInclude"
-			quid       	"3B688C7D0250"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8DC0381"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDLengthFacet"
-			quid       	"3B6C776200E7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C778002DF"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C776C004B"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMaxExclusiveFacet"
-			quid       	"3B6C789600C2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8E0309"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxFacet"
-			quid       	"3C0A1CEB010E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D3103AD"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1EE201F7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A174027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1930354"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMaxInclusiveFacet"
-			quid       	"3B6C787D00DA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8303B8"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxLengthFacet"
-			quid       	"3B6C77C70146"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B7D00FC"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C77DA00F3"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMinExclusiveFacet"
-			quid       	"3B6C792D000A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B590281"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinFacet"
-			quid       	"3C0A1CDE037C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D240098"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1ED10398"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1A2008E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1BE03E2"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMinInclusiveFacet"
-			quid       	"3B6C788702C9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B520353"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinLengthFacet"
-			quid       	"3B6C778C0065"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C77C400C0"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7799015E"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroup"
-			quid       	"3B6834E00291"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A640279"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "compositor"
-				quid       	"3B69CF1D01CF"
-				type       	"XSDCompositor"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroupDefinition"
-			quid       	"3B66ED9A0205"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2E20381"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2550385"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC40090"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "modelGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1F602E8"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDNamedComponent"
-			quid       	"3B6846D303A4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA20197"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B6847000142"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B684704031E"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A57F0127"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "uRI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A58700E2"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasURI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A5AA02AF"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "qName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C290963025E"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDNotationDeclaration"
-			quid       	"3B66EDAA021C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B68494302F1"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4")
-			    (object Inheritance_Relationship
-				quid       	"3B688E4F023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "systemIdentifier"
-				quid       	"3B69D32E00F0"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "publicIdentifier"
-				quid       	"3B69D3340397"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDNumericFacet"
-			quid       	"3B6C75950206"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C76420074"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C75A30012"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDOrderedFacet"
-			quid       	"3B6C74DD0248"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7659012C"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C74F602DA"
-				type       	"XSDOrdered"
-				exportControl 	"Public")))
-		    (object Class "XSDParticle"
-			quid       	"3B682BBD01F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848FC01E7"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "minOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF8E03B2"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "maxOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF9903AE"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")))
-		    (object Class "XSDParticleContent"
-			quid       	"3B6BD22300C6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B780BD90059"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDPatternFacet"
-			quid       	"3B6C6ADB026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6CA5038D"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C790311"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDRedefinableComponent"
-			quid       	"3B7FCA8B020B"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4BA023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3C290A26036D"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A6800216"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefineContent"
-			quid       	"3B6AE2060172"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2B301D5"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefine"
-			quid       	"3B688C9B02AD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB640240"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDRepeatableFacet"
-			quid       	"3B6C6AA6031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8F002E"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			abstract   	TRUE)
-		    (object Class "XSDSchema"
-			quid       	"374B182500BB"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCC4A0182"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "document"
-				quid       	"3C2784E503DD"
-				type       	"DOMDocument"
-				exportControl 	"Public")
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6868EC0226"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B9F9BFF0180"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributeFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F904B0102"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F907800AC"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "finalDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0C4A70038"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "blockDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F59D02D8"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "version"
-				quid       	"3D22D6D80356"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDSchemaCompositor"
-			quid       	"3C21DB4102AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB560092"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaContent"
-			quid       	"3B688CB800BA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8E60372"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaDirective"
-			quid       	"3B6AD8A202A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE32102AF"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6AD9B30330"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDScope"
-			quid       	"3B69B54000F2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCD640231"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDSimpleTypeDefinition"
-			quid       	"3B682BA7005D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A1302A2"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")
-			    (object Inheritance_Relationship
-				quid       	"3B685F55032B"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C315800A9"
-				type       	"XSDVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B6D544F0146"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F65E035A"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "validFacets"
-				quid       	"3C28AB0F00B6"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDTerm"
-			quid       	"3B683C5E0174"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848AA01D3"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2440069"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"))
-			abstract   	TRUE)
-		    (object Class "XSDTotalDigitsFacet"
-			quid       	"3B6C79A0020E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B610337"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79AB0232"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDTypeDefinition"
-			quid       	"3B66ECD302A9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2F5013A"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAB1004D"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			abstract   	TRUE)
-		    (object Class "XSDWhiteSpaceFacet"
-			quid       	"3B6C784601B7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C78620045"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C78500201"
-				type       	"XSDWhiteSpace"
-				exportControl 	"Public")))
-		    (object Class "XSDWildcard"
-			quid       	"3B6838370031"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A3A0041"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceConstraintCategory"
-				quid       	"3B69D0E9019E"
-				type       	"XSDNamespaceConstraintCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "namespaceConstraint"
-				quid       	"3B97CF860223"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "processContents"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69D12E01E4"
-				type       	"XSDProcessContents"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalNamespaceConstraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7BDB701F9"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathDefinition"
-			quid       	"3B6D83BB0355"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D84F70092"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				quid       	"3B6D901503DE"
-				type       	"XSDXPathVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B7BBBE101B1"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "DOMAttr"
-			quid       	"3BBF8C8901B6"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Attr"
-				quid       	"3BBF8CB000D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMDocument"
-			quid       	"3C27850E0381"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3C27851B03C6"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMElement"
-			quid       	"3B8189790200"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B8189DB0374"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMNode"
-			quid       	"3BFE64A50117"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Node"
-				quid       	"3BFE65BF002D"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Value"
-			quid       	"3C040B5B031F"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.lang.Object"
-				quid       	"3C040B8D03D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUseCategory"
-			quid       	"3BA7B0E801A8"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "optional"
-				quid       	"3BA7B11502B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibited"
-				quid       	"3BA7B12202D3"
-				exportControl 	"Public")
-			    (object ClassAttribute "required"
-				quid       	"3BA7B12902F0"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinality"
-			quid       	"3BC7715D009B"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "finite"
-				quid       	"3BC771DC02ED"
-				exportControl 	"Public")
-			    (object ClassAttribute "countablyInfinite"
-				quid       	"3BC771EC0141"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexFinal"
-			quid       	"3B97C2CA01CB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C2E700DA"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2EA016A"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6D20112"
-				exportControl 	"Public")))
-		    (object Class "XSDCompositor"
-			quid       	"3B869B620037"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "all"
-				quid       	"3B869BD00003"
-				exportControl 	"Public")
-			    (object ClassAttribute "choice"
-				quid       	"3B869CB8011E"
-				exportControl 	"Public")
-			    (object ClassAttribute "sequence"
-				quid       	"3B869CE50057"
-				exportControl 	"Public")))
-		    (object Class "XSDConstraint"
-			quid       	"3B869E2601AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "default"
-				quid       	"3B869E8E0258"
-				exportControl 	"Public")
-			    (object ClassAttribute "fixed"
-				quid       	"3B869E990271"
-				exportControl 	"Public")))
-		    (object Class "XSDContentTypeCategory"
-			quid       	"3B86A79F03A2"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "empty"
-				quid       	"3B86A7CD02F0"
-				exportControl 	"Public")
-			    (object ClassAttribute "simple"
-				quid       	"3B86A7D100CE"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				quid       	"3B86A7D301B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementOnly"
-				quid       	"3B86A7D702E9"
-				exportControl 	"Public")))
-		    (object Class "XSDDerivationMethod"
-			quid       	"3B86A0B000CE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B86A0C80329"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B86A0CC0162"
-				exportControl 	"Public")))
-		    (object Class "XSDDiagnosticSeverity"
-			quid       	"3BFE68A7032F"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fatal"
-				quid       	"3BFE68C303D0"
-				exportControl 	"Public")
-			    (object ClassAttribute "error"
-				quid       	"3BFE68E700E3"
-				exportControl 	"Public")
-			    (object ClassAttribute "warning"
-				quid       	"3BFE68EA01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "information"
-				quid       	"3BFE7FC2019A"
-				exportControl 	"Public")))
-		    (object Class "XSDDisallowedSubstitutions"
-			quid       	"3B97C5A403DF"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "substitution"
-				quid       	"3B97C6790045"
-				exportControl 	"Public")
-			    (object ClassAttribute "extension"
-				quid       	"3B97C67F01AC"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C683020B"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2450069"
-				exportControl 	"Public")))
-		    (object Class "XSDForm"
-			quid       	"3B9F913B01EB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qualified"
-				quid       	"3B9F916F0023"
-				exportControl 	"Public")
-			    (object ClassAttribute "unqualified"
-				quid       	"3B9F918C007F"
-				exportControl 	"Public")))
-		    (object Class "XSDIdentityConstraintCategory"
-			quid       	"3B86A1E00272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "key"
-				quid       	"3B86A2120085"
-				exportControl 	"Public")
-			    (object ClassAttribute "keyref"
-				quid       	"3B86A213014F"
-				exportControl 	"Public")
-			    (object ClassAttribute "unique"
-				quid       	"3B86A2160365"
-				exportControl 	"Public")))
-		    (object Class "XSDNamespaceConstraintCategory"
-			quid       	"3B97C5EA0023"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "any"
-				quid       	"3B97D0600034"
-				exportControl 	"Public")
-			    (object ClassAttribute "not"
-				quid       	"3B97D062005F"
-				exportControl 	"Public")
-			    (object ClassAttribute "set"
-				quid       	"3B97D0650117"
-				exportControl 	"Public")))
-		    (object Class "XSDOrdered"
-			quid       	"3BC7715202E4"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "false"
-				quid       	"3BC771A90271"
-				exportControl 	"Public")
-			    (object ClassAttribute "partial"
-				quid       	"3BC771BB01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "total"
-				quid       	"3BC771C401B2"
-				exportControl 	"Public")))
-		    (object Class "XSDProcessContents"
-			quid       	"3B8FF8C70284"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "strict"
-				quid       	"3B8FF8F80045"
-				exportControl 	"Public")
-			    (object ClassAttribute "lax"
-				quid       	"3B8FF8F6038B"
-				exportControl 	"Public")
-			    (object ClassAttribute "skip"
-				quid       	"3B8FF8E802BA"
-				exportControl 	"Public")))
-		    (object Class "XSDProhibitedSubstitutions"
-			quid       	"3B97C5BE0272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C68B00B8"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C6940291"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2500295"
-				exportControl 	"Public")))
-		    (object Class "XSDSimpleFinal"
-			quid       	"3B97C25D0295"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "list"
-				quid       	"3B97C2810230"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2830138"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B97C288024E"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6E00374"
-				exportControl 	"Public")))
-		    (object Class "XSDSubstitutionGroupExclusions"
-			quid       	"3B97C59100AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C6640231"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C66D0216"
-				exportControl 	"Public")))
-		    (object Class "XSDVariety"
-			quid       	"3B8FF7730249"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "atomic"
-				quid       	"3B8FF7A702DF"
-				exportControl 	"Public")
-			    (object ClassAttribute "list"
-				quid       	"3B8FF7AD0139"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B8FF7AF039F"
-				exportControl 	"Public")))
-		    (object Class "XSDWhiteSpace"
-			quid       	"3BEED0F60342"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "preserve"
-				quid       	"3BEED10F0117"
-				exportControl 	"Public")
-			    (object ClassAttribute "replace"
-				quid       	"3BEED127034D"
-				exportControl 	"Public")
-			    (object ClassAttribute "collapse"
-				quid       	"3BEED1290396"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathVariety"
-			quid       	"3B8FFB89033A"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "selector"
-				quid       	"3B8FFBAC0192"
-				exportControl 	"Public")
-			    (object ClassAttribute "field"
-				quid       	"3B8FFBB30278"
-				exportControl 	"Public")))
-		    (object Association "$UNNAMED$70"
-			quid       	"3C626EA70102"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$71"
-				quid       	"3C626EA90191"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EA90192"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$72"
-			quid       	"3B69DADC02F5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$73"
-				quid       	"3B69DADD0238"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DADD0242"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$74"
-			quid       	"3B6890D6006F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$75"
-				quid       	"3B6890D6030E"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6890D60318"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$76"
-			quid       	"3B68356B02CB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$77"
-				quid       	"3B68356D00A6"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68356D00A7"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$78"
-			quid       	"3B6B426B0194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$79"
-				quid       	"3B6B426D0309"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B426D0313"
-				label      	"resolvedAttributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$80"
-			quid       	"3B69DB060291"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$81"
-				quid       	"3B69DB070171"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB070172"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$82"
-			quid       	"3B69404E0067"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$83"
-				quid       	"3B694050029B"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B69405002A5"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$84"
-			quid       	"3B68359F0086"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$85"
-				quid       	"3B6835A00069"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6835A0006A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$86"
-			quid       	"3C275D320220"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$87"
-				quid       	"3C275D3C010C"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3C275D3C010D"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$88"
-			quid       	"3B6887BF0150"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$89"
-				quid       	"3B6887C000A7"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6887C000A8"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$90"
-			quid       	"3B6B425E01F9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$91"
-				quid       	"3B6B42620046"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B42620050"
-				label      	"resolvedAttributeGroupDefinition"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$92"
-			quid       	"3B683585010D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$93"
-				quid       	"3B68358600FA"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68358600FB"
-				label      	"attributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$94"
-			quid       	"3B6F1DE9018A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$95"
-				quid       	"3B6F1DEA036C"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6F1DEA0380"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$96"
-			quid       	"3B90068801C2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$97"
-				quid       	"3B90068A0111"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentAnnotation"
-				quid       	"3B90068A011B"
-				label      	"contentAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$98"
-			quid       	"3B6833350340"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$99"
-				quid       	"3B683336028D"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683336028E"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$100"
-			quid       	"3B6FDDD70113"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$101"
-				quid       	"3B6FDDDA026B"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6FDDDA0275"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$102"
-			quid       	"3B6837DF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$103"
-				quid       	"3B6837E100FD"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6837E100FE"
-				label      	"contentType"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$104"
-			quid       	"3B683959006E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$105"
-				quid       	"3B6839590349"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683959034A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$106"
-			quid       	"3B698E360386"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$107"
-				quid       	"3B698E380072"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeContents"
-				quid       	"3B698E38007C"
-				label      	"attributeContents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$108"
-			quid       	"3B6851BA0126"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$109"
-				quid       	"3B6851BB0150"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6851BB0151"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$110"
-			quid       	"3B751B0803C7"
-			roles      	(list role_list
-			    (object Role "container"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B0C01CE"
-				label      	"container"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$111"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B0C01CF"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$112"
-			quid       	"3B751B480261"
-			roles      	(list role_list
-			    (object Role "rootContainer"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B4C0285"
-				label      	"rootContainer"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$113"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B4C0286"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$114"
-			quid       	"3B751C310356"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$115"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751C330331"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")
-			    (object Role "schema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751C33033B"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$116"
-			quid       	"3B69DB0A0066"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$117"
-				quid       	"3B69DB0B023F"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0B0249"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$118"
-			quid       	"3B68911401AF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$119"
-				quid       	"3B6891150016"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6891150017"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$120"
-			quid       	"3B68338C0058"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$121"
-				quid       	"3B68338C03BF"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68338C03C0"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$122"
-			quid       	"3B6833EF0160"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$123"
-				quid       	"3B6833F00298"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				quid       	"3B6833F00299"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$124"
-			quid       	"3B6B41E60251"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$125"
-				quid       	"3B6B41EA02F7"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedElementDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B41EA030B"
-				label      	"resolvedElementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$126"
-			quid       	"3B69C0590198"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$127"
-				quid       	"3B69C05D01E3"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214")
-			    (object Role "substitutionGroupAffiliation"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69C05D01ED"
-				label      	"substitutionGroupAffiliation"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$128"
-			quid       	"3C42DBDD0297"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$129"
-				quid       	"3C42DBE0011E"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "substitutionGroup"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C42DBE00128"
-				label      	"substitutionGroup"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$130"
-			quid       	"3B6D23B901CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$131"
-				quid       	"3B6D23BA01C4"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6D23BA01CE"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$132"
-			quid       	"3B6D597102EA"
-			roles      	(list role_list
-			    (object Role "simpleTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D59750105"
-				label      	"simpleTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$133"
-				attributes 	(list Attribute_Set)
-				quid       	"3B6D59750119"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2")))
-		    (object Association "$UNNAMED$134"
-			quid       	"3B69B653017A"
-			roles      	(list role_list
-			    (object Role "scope"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B69B654006D"
-				label      	"scope"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$135"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69B654006E"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$136"
-			quid       	"3C29010602D7"
-			roles      	(list role_list
-			    (object Role "resolvedFeature"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C29010B000E"
-				label      	"resolvedFeature"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$137"
-				attributes 	(list Attribute_Set)
-				quid       	"3C29010B0018"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$138"
-			quid       	"3B69DB0D0183"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$139"
-				quid       	"3B69DB0D033C"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0D0346"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$140"
-			quid       	"3B69D29E014D"
-			roles      	(list role_list
-			    (object Role "referencedKey"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69D2A80165"
-				label      	"referencedKey"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$141"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69D2A8016F"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2")))
-		    (object Association "$UNNAMED$142"
-			quid       	"3B6D8D3D003E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$143"
-				quid       	"3B6D8D3E022A"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "selector"
-				quid       	"3B6D8D3E0234"
-				label      	"selector"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$144"
-			quid       	"3B6D8D330025"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$145"
-				quid       	"3B6D8D330365"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "fields"
-				quid       	"3B6D8D330379"
-				label      	"fields"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$146"
-			quid       	"3B6ADCD802FC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$147"
-				quid       	"3B6ADCD9018B"
-				supplier   	"Logical View::xsd::XSDImport"
-				quidu      	"3B688C93017F"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCD9018C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$148"
-			quid       	"3B6ADCC5007E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$149"
-				quid       	"3B6ADCC6006B"
-				supplier   	"Logical View::xsd::XSDInclude"
-				quidu      	"3B688C7D0250"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCC6006C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$150"
-			quid       	"3B69DB1702C8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$151"
-				quid       	"3B69DB1803E2"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB190004"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$152"
-			quid       	"3B6BCEB102F8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$153"
-				quid       	"3B6BCEB6001B"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6BCEB60025"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$154"
-			quid       	"3B683606026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$155"
-				quid       	"3B6836070221"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "particles"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6836070222"
-				label      	"particles"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$156"
-			quid       	"3B69DB15008A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$157"
-				quid       	"3B69DB160096"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1600A0"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$158"
-			quid       	"3B6837AC025A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$159"
-				quid       	"3B6837AD0338"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroup"
-				quid       	"3B6837AD0339"
-				label      	"modelGroup"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$160"
-			quid       	"3B6B42450398"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$161"
-				quid       	"3B6B4249038A"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedModelGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B4249039E"
-				label      	"resolvedModelGroupDefinition"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$162"
-			quid       	"3B69DB0F0212"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$163"
-				quid       	"3B69DB1000C9"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1000D3"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$164"
-			quid       	"3B6B47150119"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$165"
-				quid       	"3B6B471A03AB"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6B471A03B5"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$166"
-			quid       	"3B683C890122"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$167"
-				quid       	"3B683C8A0110"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "term"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683C8A0111"
-				label      	"term"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$168"
-			quid       	"3B6ADE42009A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$169"
-				quid       	"3B6ADE4302FE"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6ADE430308"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$170"
-			quid       	"3B6AE8240051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$171"
-				quid       	"3B6AE82602AD"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6AE82602B7"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$172"
-			quid       	"3B688E6B003D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$173"
-				quid       	"3B688E6C0107"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B688E6C0111"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$174"
-			quid       	"3B66EE8D01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$175"
-				quid       	"3B66EE8E0198"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "elementDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE8E0199"
-				label      	"elementDeclarations"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$176"
-			quid       	"3B66FDFA00C3"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$177"
-				quid       	"3B66FDFB027D"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66FDFB027E"
-				label      	"attributeDeclarations"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$178"
-			quid       	"3B66EE920216"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$179"
-				quid       	"3B66EE93018B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE93018C"
-				label      	"attributeGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$180"
-			quid       	"3B66EE760049"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$181"
-				quid       	"3B66EE760374"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE76037E"
-				label      	"typeDefinitions"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$182"
-			quid       	"3B66EEFF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$183"
-				quid       	"3B66EF00025A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EF000264"
-				label      	"modelGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$184"
-			quid       	"3BFC2A1701ED"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$185"
-				quid       	"3BFC2A1A0273"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFC2A1A027D"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$186"
-			quid       	"3B66EEA7023E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$187"
-				quid       	"3B66EEA8038A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "notationDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EEA8038B"
-				label      	"notationDeclarations"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$188"
-			quid       	"3B69E4560290"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$189"
-				quid       	"3B69E4570165"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69E457016F"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$190"
-			quid       	"3B6D5CA50112"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$191"
-				quid       	"3B6D5CA703B4"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6D5CA703C8"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$192"
-			quid       	"3B6C35AD0374"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$193"
-				quid       	"3B6C35AF0006"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facetContents"
-				quid       	"3B6C35AF0010"
-				label      	"facetContents"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$194"
-			quid       	"3BC8AE0203A8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$195"
-				quid       	"3BC8AE060051"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BC8AE060065"
-				label      	"facets"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$196"
-			quid       	"3B6C34B70208"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$197"
-				quid       	"3B6C34BE0258"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "memberTypeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6C34BE0259"
-				label      	"memberTypeDefinitions"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$198"
-			quid       	"3B6C363201DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$199"
-				quid       	"3B6C36350059"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fundamentalFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B6C36350063"
-				label      	"fundamentalFacets"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$200"
-			quid       	"3B6D35AB0273"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$201"
-				quid       	"3B6D35B20291"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D35B202A5"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$202"
-			quid       	"3B6D5572016C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$203"
-				quid       	"3B6D5575022F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "primitiveTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D55750243"
-				label      	"primitiveTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$204"
-			quid       	"3B69E2910158"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$205"
-				quid       	"3B69E292019F"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69E29201A9"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$206"
-			quid       	"3B9006CF0088"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$207"
-				quid       	"3B9006D1015D"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "derivationAnnotation"
-				quid       	"3B9006D10167"
-				label      	"derivationAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$208"
-			quid       	"3B69DB330264"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$209"
-				quid       	"3B69DB340284"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69DB34028E"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$210"
-			quid       	"3B69DB11026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$211"
-				quid       	"3B69DB1201F9"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB120203"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$212"
-			quid       	"3C626EB30005"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$213"
-				quid       	"3C626EB40327"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EB40332"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$214"
-			quid       	"3BEBDC870247"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$215"
-				quid       	"3BEBDC8C02F9"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3BEBDC8C0303"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$216"
-			quid       	"3BFE622703CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$217"
-				attributes 	(list Attribute_Set)
-				quid       	"3BFE622B0061"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "components"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE622B006C"
-				label      	"components"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$218"
-			quid       	"3BFE62690165"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$219"
-				quid       	"3BFE626A0026"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				is_aggregate 	TRUE)
-			    (object Role "diagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3BFE626A0027"
-				label      	"diagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$220"
-			quid       	"3BFE6431035F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$221"
-				quid       	"3BFE643201C6"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "allDiagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE643201C7"
-				label      	"allDiagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$222"
-			quid       	"3C21DCC700EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$223"
-				quid       	"3C21DCCE0042"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DCCE0043"
-				label      	"resolvedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$224"
-			quid       	"3C21DD0C03DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$225"
-				quid       	"3C21DD100304"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DD100305"
-				label      	"incorporatedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$226"
-			quid       	"3C239134004F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$227"
-				quid       	"3C23913600CA"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3C23913600D4"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$228"
-			quid       	"3C25D3A60131"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$229"
-				quid       	"3C25D3A90370"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "referencingDirectives"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C25D3A90371"
-				label      	"referencingDirectives"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$230"
-			quid       	"3C25ECF0005E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$231"
-				quid       	"3C25ECF4001E"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "rootVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ECF40028"
-				label      	"rootVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$232"
-			quid       	"3C25ED0B011B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$233"
-				quid       	"3C25ED0F0121"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "originalVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ED0F012B"
-				label      	"originalVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$234"
-			quid       	"3C25EEAB001F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$235"
-				quid       	"3C25EEAF010B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedVersions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25EEAF0115"
-				label      	"incorporatedVersions"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$236"
-			quid       	"3C276DA000DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$237"
-				quid       	"3C276DA000DF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "itemTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C276DA000E0"
-				label      	"itemTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$238"
-			quid       	"3C2784730194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$239"
-				quid       	"3C27847501F1"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "schemaForSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C27847501FB"
-				label      	"schemaForSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$240"
-			quid       	"3C2880F503D9"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2880F9003C"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$241"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2880F90046"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A")))
-		    (object Association "$UNNAMED$242"
-			quid       	"3C2882C50137"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$243"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2882C70112"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "primaryComponent"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2882C70113"
-				label      	"primaryComponent"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$244"
-			quid       	"3C28A0F201A4"
-			roles      	(list role_list
-			    (object Role "type"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A0F302E5"
-				label      	"type"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$245"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A0F302F0"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$246"
-			quid       	"3C28A6DB01E5"
-			roles      	(list role_list
-			    (object Role "rootType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A6DD03DD"
-				label      	"rootType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$247"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A6DD03DE"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$248"
-			quid       	"3C28A7120108"
-			roles      	(list role_list
-			    (object Role "baseType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7140151"
-				label      	"baseType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$249"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A714015B"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$250"
-			quid       	"3C28A74B0178"
-			roles      	(list role_list
-			    (object Role "simpleType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A74D017B"
-				label      	"simpleType"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$251"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A74D0185"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$252"
-			quid       	"3C28A7ED03C0"
-			roles      	(list role_list
-			    (object Role "complexType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7F40117"
-				label      	"complexType"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$253"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A7F40121"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$254"
-			quid       	"3C28A994030A"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A99700DD"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$255"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A99700E7"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D")))
-		    (object Association "$UNNAMED$256"
-			quid       	"3C28B085025B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$257"
-				quid       	"3C28B0860270"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B086027A"
-				label      	"minFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$258"
-			quid       	"3C28B08D0252"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$259"
-				quid       	"3C28B08E0091"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B08E009B"
-				label      	"maxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$260"
-			quid       	"3C28B0AB0396"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$261"
-				quid       	"3C28B0AC03C9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0AC03D4"
-				label      	"maxInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxInclusiveFacet"
-				quidu      	"3B6C787D00DA"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$262"
-			quid       	"3C28B0AF0338"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$263"
-				quid       	"3C28B0B001F9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B00203"
-				label      	"minInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinInclusiveFacet"
-				quidu      	"3B6C788702C9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$264"
-			quid       	"3C28B0B30207"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$265"
-				quid       	"3C28B0B40190"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B4019A"
-				label      	"minExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinExclusiveFacet"
-				quidu      	"3B6C792D000A"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$266"
-			quid       	"3C28B0B6028D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$267"
-				quid       	"3C28B0B70217"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B70221"
-				label      	"maxExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxExclusiveFacet"
-				quidu      	"3B6C789600C2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$268"
-			quid       	"3C28B0BC0051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$269"
-				quid       	"3C28B0BC0246"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "lengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0BC0250"
-				label      	"lengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$270"
-			quid       	"3C28B0BF018C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$271"
-				quid       	"3C28B0C0006B"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "whiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C00075"
-				label      	"whiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$272"
-			quid       	"3C28B0C2021D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$273"
-				quid       	"3C28B0C300AB"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "enumerationFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C300AC"
-				label      	"enumerationFacets"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$274"
-			quid       	"3C28B0C50159"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$275"
-				quid       	"3C28B0C600B0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "patternFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C600BA"
-				label      	"patternFacets"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$276"
-			quid       	"3C28B0C802A7"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$277"
-				quid       	"3C28B0C901EA"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "cardinalityFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C901F5"
-				label      	"cardinalityFacet"
-				supplier   	"Logical View::xsd::XSDCardinalityFacet"
-				quidu      	"3B6C755D03D2"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$278"
-			quid       	"3C28B0CB039C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$279"
-				quid       	"3C28B0CC03D0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "numericFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0CC03D1"
-				label      	"numericFacet"
-				supplier   	"Logical View::xsd::XSDNumericFacet"
-				quidu      	"3B6C75950206"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$280"
-			quid       	"3C28B0CF0199"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$281"
-				quid       	"3C28B0D20085"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D2008F"
-				label      	"maxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$282"
-			quid       	"3C28B0D500C5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$283"
-				quid       	"3C28B0D6001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D60027"
-				label      	"minLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$284"
-			quid       	"3C28B0D800DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$285"
-				quid       	"3C28B0D803CD"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "totalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D803D7"
-				label      	"totalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$286"
-			quid       	"3C28B0DB0377"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$287"
-				quid       	"3C28B0DC035A"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DC0364"
-				label      	"fractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$288"
-			quid       	"3C28B0DF0048"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$289"
-				quid       	"3C28B0DF03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "orderedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DF03C3"
-				label      	"orderedFacet"
-				supplier   	"Logical View::xsd::XSDOrderedFacet"
-				quidu      	"3B6C74DD0248"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$290"
-			quid       	"3C28B0E300D9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$291"
-				quid       	"3C28B0E4038E"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "boundedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0E40398"
-				label      	"boundedFacet"
-				supplier   	"Logical View::xsd::XSDBoundedFacet"
-				quidu      	"3B6C751D0344"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$292"
-			quid       	"3C28B44401EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$293"
-				quid       	"3C28B4450360"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B445036A"
-				label      	"effectiveMaxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$294"
-			quid       	"3C28B54F0145"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$295"
-				quid       	"3C28B550038C"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveWhiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5500396"
-				label      	"effectiveWhiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$296"
-			quid       	"3C28B5C4011C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$297"
-				quid       	"3C28B5C5020D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5C50217"
-				label      	"effectiveMaxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$298"
-			quid       	"3C28B62A00AA"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$299"
-				quid       	"3C28B62B0138"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveFractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B62B0142"
-				label      	"effectiveFractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$300"
-			quid       	"3C28B6B003A6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$301"
-				quid       	"3C28B6B10311"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectivePatternFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B6B10312"
-				label      	"effectivePatternFacet"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$302"
-			quid       	"3C28B7CA026B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$303"
-				quid       	"3C28B7CB0186"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveEnumerationFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B7CB0190"
-				label      	"effectiveEnumerationFacet"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$304"
-			quid       	"3C28B8400062"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$305"
-				quid       	"3C28B841001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveTotalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8410027"
-				label      	"effectiveTotalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$306"
-			quid       	"3C28B898016D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$307"
-				quid       	"3C28B8990056"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8990060"
-				label      	"effectiveMinLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$308"
-			quid       	"3C28B8DC0052"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$309"
-				quid       	"3C28B8DC03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8DC03C3"
-				label      	"effectiveLengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$310"
-			quid       	"3C28B97001DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$311"
-				quid       	"3C28B97100CF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B97100D9"
-				label      	"effectiveMinFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$312"
-			quid       	"3D4BB4AE01CC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$313"
-				quid       	"3D4BB4AF010F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4AF011A"
-				label      	"syntheticFacets"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$314"
-			quid       	"3D4BB4D3028E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$315"
-				quid       	"3D4BB4D402F3"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticParticle"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4D402FD"
-				label      	"syntheticParticle"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$316"
-			quid       	"3D4BB4D901F6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$317"
-				quid       	"3D4BB4DA0284"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4DA028E"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$318"
-			quid       	"3D4C68FF01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$319"
-				quid       	"3D4C69020317"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				quid       	"3D4C69020318"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "1. Component Hierarchy (Part 1: Structures)"
-			quid       	"3B6847680138"
-			title      	"1. Component Hierarchy (Part 1: Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @400
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@400
-				    location   	(766, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @401
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1168, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@401
-				    location   	(940, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @402
-				location   	(928, 225)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@400
-				vertices   	(list Points
-				    (928, 225)
-				    (928, 135)))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @403
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@403
-				    location   	(1460, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @404
-				location   	(1203, 706)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@401
-				vertices   	(list Points
-				    (1203, 706)
-				    (1203, 615)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @405
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@405
-				    location   	(372, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @406
-				location   	(444, 709)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@405
-				vertices   	(list Points
-				    (444, 709)
-				    (444, 615)))
-			    (object InheritTreeView "" @407
-				location   	(1572, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@403
-				vertices   	(list Points
-				    (1572, 465)
-				    (1572, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @408
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@408
-				    location   	(290, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @409
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 1056)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@409
-				    location   	(262, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @410
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1104, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@410
-				    location   	(936, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @411
-				location   	(453, 1203)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@409
-				vertices   	(list Points
-				    (453, 1203)
-				    (453, 1111)))
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @412
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@412
-				    location   	(62, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @413
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@413
-				    location   	(1746, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @414
-				location   	(1872, 950)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@413
-				vertices   	(list Points
-				    (1872, 950)
-				    (1872, 855)))
-			    (object InheritTreeView "" @415
-				location   	(181, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@412
-				vertices   	(list Points
-				    (181, 465)
-				    (181, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @416
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@416
-				    location   	(1670, 1233)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	550
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @417
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@417
-				    location   	(1734, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @418
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@418
-				    location   	(1569, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	656
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @419
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1184, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@419
-				    location   	(903, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	563
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	581
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @420
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@420
-				    location   	(1462, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	294
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @421
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@421
-				    location   	(778, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @422
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@422
-				    location   	(1806, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @423
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@423
-				    location   	(106, 1253)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @424
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@424
-				    location   	(60, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @425
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@425
-				    location   	(802, 1237)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	558
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @426
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@426
-				    location   	(30, 1441)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	694
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @427
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@427
-				    location   	(426, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	300
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	318
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @428
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@428
-				    location   	(1808, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @429
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@410
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(1094, 265)
-				terminal_attachment 	(1094, 225)
-				drawSupplier 	@402)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @430
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@430
-				    location   	(690, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @431
-				location   	(962, 947)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@430
-				vertices   	(list Points
-				    (962, 947)
-				    (962, 855)))
-			    (object InheritView "" @432
-				stereotype 	(object SegLabel @433
-				    Parent_View 	@432
-				    location   	(218, 1154)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.163534
-				    height     	69
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@423
-				supplier   	@405
-				line_style 	3
-				origin_attachment 	(149, 1241)
-				terminal_attachment 	(149, 709)
-				drawSupplier 	@406)
-			    (object InheritView "" @434
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@423
-				supplier   	@409
-				line_style 	3
-				origin_attachment 	(256, 1241)
-				terminal_attachment 	(256, 1203)
-				drawSupplier 	@411)
-			    (object InheritView "" @435
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@424
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(284, 505)
-				terminal_attachment 	(284, 465)
-				drawSupplier 	@415)
-			    (object InheritView "" @436
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@422
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(2002, 505)
-				terminal_attachment 	(2002, 465)
-				drawSupplier 	@407)
-			    (object InheritView "" @437
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@403
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(1569, 265)
-				terminal_attachment 	(1569, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @438
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@420
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(1490, 505)
-				terminal_attachment 	(1490, 465)
-				drawSupplier 	@407)
-			    (object InheritView "" @439
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@408
-				supplier   	@405
-				line_style 	3
-				origin_attachment 	(510, 745)
-				terminal_attachment 	(510, 709)
-				drawSupplier 	@406)
-			    (object InheritView "" @440
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@425
-				supplier   	@430
-				line_style 	3
-				origin_attachment 	(1321, 1225)
-				terminal_attachment 	(1321, 947)
-				drawSupplier 	@431)
-			    (object InheritView "" @441
-				stereotype 	(object SegLabel @442
-				    Parent_View 	@441
-				    location   	(2137, 886)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.215812
-				    height     	64
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@417
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(2200, 1001)
-				terminal_attachment 	(2200, 465)
-				drawSupplier 	@407)
-			    (object InheritView "" @443
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@417
-				supplier   	@413
-				line_style 	3
-				origin_attachment 	(2093, 1001)
-				terminal_attachment 	(2093, 950)
-				drawSupplier 	@414)
-			    (object InheritView "" @444
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@409
-				supplier   	@430
-				line_style 	3
-				origin_attachment 	(450, 1001)
-				terminal_attachment 	(450, 947)
-				drawSupplier 	@431)
-			    (object InheritView "" @445
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@412
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(147, 265)
-				terminal_attachment 	(147, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @446
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D84F70092"
-				client     	@428
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(2012, 265)
-				terminal_attachment 	(2012, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @447
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848B80286"
-				client     	@405
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(834, 505)
-				terminal_attachment 	(834, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @448
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@401
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(1350, 505)
-				terminal_attachment 	(1350, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @449
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@427
-				supplier   	@400
-				line_style 	3
-				origin_attachment 	(572, 265)
-				terminal_attachment 	(572, 225)
-				drawSupplier 	@402)
-			    (object InheritView "" @450
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@416
-				supplier   	@413
-				line_style 	3
-				origin_attachment 	(1693, 1221)
-				terminal_attachment 	(1693, 950)
-				drawSupplier 	@414)
-			    (object InheritView "" @451
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@418
-				supplier   	@401
-				line_style 	3
-				origin_attachment 	(1590, 1432)
-				terminal_attachment 	(1590, 706)
-				drawSupplier 	@404)
-			    (object InheritView "" @452
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@419
-				supplier   	@401
-				line_style 	3
-				origin_attachment 	(1431, 1432)
-				terminal_attachment 	(1431, 706)
-				drawSupplier 	@404)
-			    (object InheritView "" @453
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@430
-				supplier   	@401
-				line_style 	3
-				origin_attachment 	(959, 745)
-				terminal_attachment 	(959, 706)
-				drawSupplier 	@404)
-			    (object InheritView "" @454
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@413
-				supplier   	@401
-				line_style 	3
-				origin_attachment 	(1872, 745)
-				terminal_attachment 	(1872, 706)
-				drawSupplier 	@404)
-			    (object InheritView "" @455
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@421
-				supplier   	@430
-				line_style 	3
-				origin_attachment 	(962, 1001)
-				terminal_attachment 	(962, 947)
-				drawSupplier 	@431)
-			    (object InheritView "" @456
-				stereotype 	(object SegLabel @457
-				    Parent_View 	@456
-				    location   	(95, 1388)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.042531
-				    height     	67
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B69BAA20310"
-				client     	@426
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(28, 1429)
-				terminal_attachment 	(28, 465)
-				drawSupplier 	@415)
-			    (object InheritView "" @458
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@426
-				supplier   	@409
-				line_style 	3
-				origin_attachment 	(656, 1429)
-				terminal_attachment 	(656, 1203)
-				drawSupplier 	@411)))
-		    (object ClassDiagram "2. Component Relations (Part 1 : Structures)"
-			quid       	"374B18190028"
-			title      	"2. Component Relations (Part 1 : Structures)"
-			zoom       	96
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @459
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(784, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@459
-				    location   	(670, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @460
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@460
-				    location   	(66, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$134" @461
-				location   	(494, 1627)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B653017A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "scope" @462
-					Parent_View 	@461
-					location   	(286, -485)
-					label      	(object SegLabel @463
-					    Parent_View 	@462
-					    location   	(555, 1589)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+scope"
-					    pctDist    	0.371257
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006D"
-					client     	@461
-					supplier   	@459
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(661, 1627)
-					label      	(object SegLabel @464
-					    Parent_View 	@462
-					    location   	(576, 1664)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.491018
-					    height     	37
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$135" @465
-					Parent_View 	@461
-					location   	(286, -485)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006E"
-					client     	@461
-					supplier   	@460
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(327, 1627))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @466
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@466
-				    location   	(2084, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @467
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2176, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@467
-				    location   	(2051, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$166" @468
-				location   	(2229, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683C890122"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$167" @469
-					Parent_View 	@468
-					location   	(549, -248)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0110"
-					client     	@468
-					supplier   	@467
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1045))
-				    (object RoleView "term" @470
-					Parent_View 	@468
-					location   	(549, -248)
-					label      	(object SegLabel @471
-					    Parent_View 	@470
-					    location   	(2157, 1121)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+term"
-					    pctDist    	0.134328
-					    height     	72
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0111"
-					client     	@468
-					supplier   	@466
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1179)
-					label      	(object SegLabel @472
-					    Parent_View 	@470
-					    location   	(2274, 1119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.119403
-					    height     	45
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @473
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@473
-				    location   	(1076, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @474
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@474
-				    location   	(1977, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$154" @475
-				location   	(2219, 880)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683606026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$155" @476
-					Parent_View 	@475
-					location   	(-357, -240)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070221"
-					client     	@475
-					supplier   	@474
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 821))
-				    (object RoleView "particles" @477
-					Parent_View 	@475
-					location   	(-357, -240)
-					label      	(object SegLabel @478
-					    Parent_View 	@477
-					    location   	(2105, 888)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+particles"
-					    pctDist    	0.156627
-					    height     	115
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070222"
-					client     	@475
-					supplier   	@467
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 939)
-					label      	(object SegLabel @479
-					    Parent_View 	@477
-					    location   	(2281, 888)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.156627
-					    height     	62
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @480
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@480
-				    location   	(1639, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @481
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@481
-				    location   	(905, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @482
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@482
-				    location   	(187, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$200" @483
-				location   	(590, 1140)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$201" @484
-					Parent_View 	@483
-					location   	(302, 148)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@483
-					supplier   	@482
-					vertices   	(list Points
-					    (590, 1140)
-					    (540, 1140)
-					    (540, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(540, 1045))
-				    (object RoleView "baseTypeDefinition" @485
-					Parent_View 	@483
-					location   	(302, 148)
-					label      	(object SegLabel @486
-					    Parent_View 	@485
-					    location   	(643, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.053571
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@483
-					supplier   	@482
-					vertices   	(list Points
-					    (590, 1140)
-					    (641, 1140)
-					    (641, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(641, 1045)
-					label      	(object SegLabel @487
-					    Parent_View 	@485
-					    location   	(584, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.122449
-					    height     	44
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @488
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@488
-				    location   	(745, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$102" @489
-				location   	(1119, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837DF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$103" @490
-					Parent_View 	@489
-					location   	(-1569, -8)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FD"
-					client     	@489
-					supplier   	@488
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1045))
-				    (object RoleView "contentType" @491
-					Parent_View 	@489
-					location   	(-1569, -8)
-					label      	(object SegLabel @492
-					    Parent_View 	@491
-					    location   	(1259, 1126)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+contentType"
-					    pctDist    	0.208955
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FE"
-					client     	@489
-					supplier   	@473
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1179)
-					label      	(object SegLabel @493
-					    Parent_View 	@491
-					    location   	(1063, 1126)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.208955
-					    height     	57
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$108" @494
-				location   	(1455, 982)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6851BA0126"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$109" @495
-					Parent_View 	@494
-					location   	(159, -570)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0150"
-					client     	@494
-					supplier   	@488
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1280, 982))
-				    (object RoleView "attributeWildcard" @496
-					Parent_View 	@494
-					location   	(159, -570)
-					label      	(object SegLabel @497
-					    Parent_View 	@496
-					    location   	(1445, 929)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	-0.062857
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0151"
-					client     	@494
-					supplier   	@480
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1630, 982)
-					label      	(object SegLabel @498
-					    Parent_View 	@496
-					    location   	(1550, 1022)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.542857
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$104" @499
-				location   	(921, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683959006E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$105" @500
-					Parent_View 	@499
-					location   	(-871, -376)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6839590349"
-					client     	@499
-					supplier   	@488
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1045))
-				    (object RoleView "attributeUses" @501
-					Parent_View 	@499
-					location   	(-871, -376)
-					label      	(object SegLabel @502
-					    Parent_View 	@501
-					    location   	(778, 1251)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.269939
-					    height     	144
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683959034A"
-					client     	@499
-					supplier   	@481
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1371)
-					label      	(object SegLabel @503
-					    Parent_View 	@501
-					    location   	(979, 1254)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.288344
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @504
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@504
-				    location   	(1122, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	380
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	398
-				height     	107
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @505
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@505
-				    location   	(1623, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @506
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@506
-				    location   	(1803, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$158" @507
-				location   	(2216, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$159" @508
-					Parent_View 	@507
-					location   	(-552, -816)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@507
-					supplier   	@506
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 501))
-				    (object RoleView "modelGroup" @509
-					Parent_View 	@507
-					location   	(-552, -816)
-					label      	(object SegLabel @510
-					    Parent_View 	@509
-					    location   	(2080, 628)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.182609
-					    height     	137
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@507
-					supplier   	@474
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 715)
-					label      	(object SegLabel @511
-					    Parent_View 	@509
-					    location   	(2256, 633)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.233645
-					    height     	40
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @512
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@512
-				    location   	(1619, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$88" @513
-				location   	(1676, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6887BF0150"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$89" @514
-					Parent_View 	@513
-					location   	(412, -344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A7"
-					client     	@513
-					supplier   	@512
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1371))
-				    (object RoleView "attributeWildcard" @515
-					Parent_View 	@513
-					location   	(412, -344)
-					label      	(object SegLabel @516
-					    Parent_View 	@515
-					    location   	(1857, 1106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	0.625767
-					    height     	181
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A8"
-					client     	@513
-					supplier   	@480
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1045)
-					label      	(object SegLabel @517
-					    Parent_View 	@515
-					    location   	(1618, 1108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.619632
-					    height     	59
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$84" @518
-				location   	(1429, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68359F0086"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$85" @519
-					Parent_View 	@518
-					location   	(-363, -146)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A00069"
-					client     	@518
-					supplier   	@512
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1610, 1438))
-				    (object RoleView "attributeUses" @520
-					Parent_View 	@518
-					location   	(-363, -146)
-					label      	(object SegLabel @521
-					    Parent_View 	@520
-					    location   	(1405, 1506)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.132597
-					    height     	68
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A0006A"
-					client     	@518
-					supplier   	@481
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1248, 1438)
-					label      	(object SegLabel @522
-					    Parent_View 	@520
-					    location   	(1327, 1391)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.563536
-					    height     	48
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @523
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@523
-				    location   	(183, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$92" @524
-				location   	(777, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683585010D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$93" @525
-					Parent_View 	@524
-					location   	(-519, -367)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FA"
-					client     	@524
-					supplier   	@481
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(896, 1425))
-				    (object RoleView "attributeDeclaration" @526
-					Parent_View 	@524
-					location   	(-519, -367)
-					label      	(object SegLabel @527
-					    Parent_View 	@526
-					    location   	(784, 1508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+attributeDeclaration"
-					    pctDist    	-0.059259
-					    height     	83
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FB"
-					client     	@524
-					supplier   	@523
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(658, 1425)
-					label      	(object SegLabel @528
-					    Parent_View 	@526
-					    location   	(721, 1385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.472441
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$76" @529
-				location   	(237, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68356B02CB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$77" @530
-					Parent_View 	@529
-					location   	(-1043, 72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A6"
-					client     	@529
-					supplier   	@523
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1371))
-				    (object RoleView "typeDefinition" @531
-					Parent_View 	@529
-					location   	(-1043, 72)
-					label      	(object SegLabel @532
-					    Parent_View 	@531
-					    location   	(388, 1247)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	-0.239264
-					    height     	151
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A7"
-					client     	@529
-					supplier   	@482
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1045)
-					label      	(object SegLabel @533
-					    Parent_View 	@531
-					    location   	(195, 1247)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.239264
-					    height     	43
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @534
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@534
-				    location   	(198, 743)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$98" @535
-				location   	(728, 775)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833350340"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$99" @536
-					Parent_View 	@535
-					location   	(-856, -57)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028D"
-					client     	@535
-					supplier   	@488
-					vertices   	(list Points
-					    (728, 775)
-					    (788, 775)
-					    (788, 939))
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(788, 939))
-				    (object RoleView "baseTypeDefinition" @537
-					Parent_View 	@535
-					location   	(-856, -57)
-					label      	(object SegLabel @538
-					    Parent_View 	@537
-					    location   	(558, 883)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.140940
-					    height     	108
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028E"
-					client     	@535
-					supplier   	@534
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(579, 775)
-					label      	(object SegLabel @539
-					    Parent_View 	@537
-					    location   	(750, 812)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.152439
-					    height     	37
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @540
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@540
-				    location   	(1017, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$140" @541
-				location   	(1629, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69D29E014D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencedKey" @542
-					Parent_View 	@541
-					location   	(-83, 94)
-					label      	(object SegLabel @543
-					    Parent_View 	@542
-					    location   	(1761, 608)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+referencedKey"
-					    pctDist    	-1.797297
-					    height     	34
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A80165"
-					client     	@541
-					supplier   	@540
-					vertices   	(list Points
-					    (1629, 574)
-					    (1555, 574)
-					    (1555, 501))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1555, 501)
-					label      	(object SegLabel @544
-					    Parent_View 	@542
-					    location   	(1622, 539)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.047619
-					    height     	36
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$141" @545
-					Parent_View 	@541
-					location   	(-83, 94)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A8016F"
-					client     	@541
-					supplier   	@540
-					vertices   	(list Points
-					    (1629, 574)
-					    (1689, 574)
-					    (1689, 444)
-					    (1616, 444))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1616, 444))))
-			    (object AssociationViewNew "$UNNAMED$144" @546
-				location   	(1197, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$145" @547
-					Parent_View 	@546
-					location   	(-115, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@546
-					supplier   	@540
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 501))
-				    (object RoleView "fields" @548
-					Parent_View 	@546
-					location   	(-115, 32)
-					label      	(object SegLabel @549
-					    Parent_View 	@548
-					    location   	(1119, 655)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.439252
-					    height     	78
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@546
-					supplier   	@504
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 715)
-					label      	(object SegLabel @550
-					    Parent_View 	@548
-					    location   	(1253, 654)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.429907
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$142" @551
-				location   	(1415, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$143" @552
-					Parent_View 	@551
-					location   	(103, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@551
-					supplier   	@540
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 501))
-				    (object RoleView "selector" @553
-					Parent_View 	@551
-					location   	(103, 32)
-					label      	(object SegLabel @554
-					    Parent_View 	@553
-					    location   	(1513, 651)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.411215
-					    height     	98
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@551
-					supplier   	@504
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 715)
-					label      	(object SegLabel @555
-					    Parent_View 	@553
-					    location   	(1381, 650)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.392523
-					    height     	34
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @556
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1312, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@556
-				    location   	(1022, 68)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	581
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	599
-				height     	209
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$186" @557
-				location   	(2395, 606)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEA7023E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$187" @558
-					Parent_View 	@557
-					location   	(-853, 174)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038A"
-					client     	@557
-					supplier   	@556
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 65)
-					    (1611, 65))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(1611, 65))
-				    (object RoleView "notationDeclarations" @559
-					Parent_View 	@557
-					location   	(-853, 174)
-					label      	(object SegLabel @560
-					    Parent_View 	@559
-					    location   	(2089, 104)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+notationDeclarations"
-					    pctDist    	-0.489776
-					    height     	307
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038B"
-					client     	@557
-					supplier   	@505
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 1633)
-					    (2098, 1633))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(2098, 1633)
-					label      	(object SegLabel @561
-					    Parent_View 	@559
-					    location   	(2344, 105)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.487829
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$182" @562
-				location   	(1772, 249)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEFF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$183" @563
-					Parent_View 	@562
-					location   	(-948, -327)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF00025A"
-					client     	@562
-					supplier   	@556
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1611, 249))
-				    (object RoleView "modelGroupDefinitions" @564
-					Parent_View 	@562
-					location   	(-948, -327)
-					label      	(object SegLabel @565
-					    Parent_View 	@564
-					    location   	(2076, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+modelGroupDefinitions"
-					    pctDist    	0.713592
-					    height     	244
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF000264"
-					client     	@562
-					supplier   	@506
-					vertices   	(list Points
-					    (1772, 249)
-					    (1832, 249)
-					    (1832, 395))
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1832, 395)
-					label      	(object SegLabel @566
-					    Parent_View 	@564
-					    location   	(1781, 340)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.737864
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$178" @567
-				location   	(2346, 518)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE920216"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$179" @568
-					Parent_View 	@567
-					location   	(154, 86)
-					label      	(object SegLabel @569
-					    Parent_View 	@568
-					    location   	(1872, 1857)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	-3.630072
-					    height     	475
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018B"
-					client     	@567
-					supplier   	@556
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 149)
-					    (1611, 149))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(1611, 149))
-				    (object RoleView "attributeGroupDefinitions" @570
-					Parent_View 	@567
-					location   	(154, 86)
-					label      	(object SegLabel @571
-					    Parent_View 	@570
-					    location   	(2008, 195)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+attributeGroupDefinitions"
-					    pctDist    	-0.349946
-					    height     	339
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018C"
-					client     	@567
-					supplier   	@512
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 1441)
-					    (2166, 1441))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(2166, 1441)
-					label      	(object SegLabel @572
-					    Parent_View 	@570
-					    location   	(2299, 197)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.348862
-					    height     	48
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$180" @573
-				location   	(203, 159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE760049"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$181" @574
-					Parent_View 	@573
-					location   	(-485, -273)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE760374"
-					client     	@573
-					supplier   	@556
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(1013, 159))
-				    (object RoleView "typeDefinitions" @575
-					Parent_View 	@573
-					location   	(-485, -273)
-					label      	(object SegLabel @576
-					    Parent_View 	@575
-					    location   	(349, 196)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+typeDefinitions"
-					    pctDist    	-1.475728
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE76037E"
-					client     	@573
-					supplier   	@534
-					vertices   	(list Points
-					    (203, 159)
-					    (104, 159)
-					    (104, 784)
-					    (189, 784))
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(189, 784)
-					label      	(object SegLabel @577
-					    Parent_View 	@575
-					    location   	(155, 200)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.059701
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$184" @578
-				location   	(1087, 329)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFC2A1701ED"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$185" @579
-					Parent_View 	@578
-					location   	(-577, -23)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A0273"
-					client     	@578
-					supplier   	@556
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 264))
-				    (object RoleView "identityConstraintDefinitions" @580
-					Parent_View 	@578
-					location   	(-577, -23)
-					label      	(object SegLabel @581
-					    Parent_View 	@580
-					    location   	(1375, 338)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.130952
-					    height     	288
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A027D"
-					client     	@578
-					supplier   	@540
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 395)
-					label      	(object SegLabel @582
-					    Parent_View 	@580
-					    location   	(1018, 336)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.107143
-					    height     	70
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$176" @583
-				location   	(48, 320)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66FDFA00C3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$177" @584
-					Parent_View 	@583
-					location   	(-1072, -288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027D"
-					client     	@583
-					supplier   	@556
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 68)
-					    (1013, 68))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(1013, 68))
-				    (object RoleView "attributeDeclarations" @585
-					Parent_View 	@583
-					location   	(-1072, -288)
-					label      	(object SegLabel @586
-					    Parent_View 	@585
-					    location   	(338, 106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+attributeDeclarations"
-					    pctDist    	-0.198536
-					    height     	289
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027E"
-					client     	@583
-					supplier   	@523
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 1415)
-					    (174, 1415))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(174, 1415)
-					label      	(object SegLabel @587
-					    Parent_View 	@585
-					    location   	(91, 108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.196706
-					    height     	42
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @588
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@588
-				    location   	(175, 412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	483
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	501
-				height     	97
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$126" @589
-				location   	(499, 589)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69C0590198"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$127" @590
-					Parent_View 	@589
-					location   	(-13, 109)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01E3"
-					client     	@589
-					supplier   	@588
-					vertices   	(list Points
-					    (499, 589)
-					    (452, 589)
-					    (452, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(452, 496))
-				    (object RoleView "substitutionGroupAffiliation" @591
-					Parent_View 	@589
-					location   	(-13, 109)
-					label      	(object SegLabel @592
-					    Parent_View 	@591
-					    location   	(811, 585)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+substitutionGroupAffiliation"
-					    pctDist    	6.520833
-					    height     	5
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01ED"
-					client     	@589
-					supplier   	@588
-					vertices   	(list Points
-					    (499, 589)
-					    (547, 589)
-					    (547, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(547, 496)
-					label      	(object SegLabel @593
-					    Parent_View 	@591
-					    location   	(499, 559)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.000000
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$120" @594
-				location   	(241, 613)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68338C0058"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$121" @595
-					Parent_View 	@594
-					location   	(-1343, -219)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03BF"
-					client     	@594
-					supplier   	@588
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 496))
-				    (object RoleView "typeDefinition" @596
-					Parent_View 	@594
-					location   	(-1343, -219)
-					label      	(object SegLabel @597
-					    Parent_View 	@596
-					    location   	(408, 694)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.686441
-					    height     	167
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03C0"
-					client     	@594
-					supplier   	@534
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 731)
-					label      	(object SegLabel @598
-					    Parent_View 	@596
-					    location   	(202, 685)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.610169
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$122" @599
-				location   	(837, 460)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$123" @600
-					Parent_View 	@599
-					location   	(-1819, -68)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@599
-					supplier   	@588
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(666, 460))
-				    (object RoleView "identityConstraintDefinitions" @601
-					Parent_View 	@599
-					location   	(-1819, -68)
-					label      	(object SegLabel @602
-					    Parent_View 	@601
-					    location   	(880, 528)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.251462
-					    height     	68
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@599
-					supplier   	@540
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(1008, 460)
-					label      	(object SegLabel @603
-					    Parent_View 	@601
-					    location   	(859, 407)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.130435
-					    height     	54
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$174" @604
-				location   	(541, 246)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE8D01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$175" @605
-					Parent_View 	@604
-					location   	(-1123, -186)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0198"
-					client     	@604
-					supplier   	@556
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(1013, 246))
-				    (object RoleView "elementDeclarations" @606
-					Parent_View 	@604
-					location   	(-1123, -186)
-					label      	(object SegLabel @607
-					    Parent_View 	@606
-					    location   	(443, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+elementDeclarations"
-					    pctDist    	0.209302
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0199"
-					client     	@604
-					supplier   	@588
-					vertices   	(list Points
-					    (541, 246)
-					    (224, 246)
-					    (224, 400))
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(224, 400)
-					label      	(object SegLabel @608
-					    Parent_View 	@606
-					    location   	(186, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.864693
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$128" @609
-				location   	(353, 621)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C42DBDD0297"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$129" @610
-					Parent_View 	@609
-					location   	(-63, 173)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE0011E"
-					client     	@609
-					supplier   	@588
-					vertices   	(list Points
-					    (353, 621)
-					    (306, 621)
-					    (306, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(306, 496))
-				    (object RoleView "substitutionGroup" @611
-					Parent_View 	@609
-					location   	(-63, 173)
-					label      	(object SegLabel @612
-					    Parent_View 	@611
-					    location   	(579, 636)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+substitutionGroup"
-					    pctDist    	4.808511
-					    height     	15
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE00128"
-					client     	@609
-					supplier   	@588
-					vertices   	(list Points
-					    (353, 621)
-					    (400, 621)
-					    (400, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(400, 496)
-					label      	(object SegLabel @613
-					    Parent_View 	@611
-					    location   	(350, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.069767
-					    height     	39
-					    orientation 	0))))))
-		    (object ClassDiagram "3. Component Attributes  (Part 1 : Structures)"
-			quid       	"3B69E78602C5"
-			title      	"3. Component Attributes  (Part 1 : Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @614
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@614
-				    location   	(46, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	516
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@614
-				    location   	(46, 107)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	524
-				    compartmentItems 	(list Compartment
-					"+ name : String"
-					"+ targetNamespace : String"))
-				width      	534
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @615
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@615
-				    location   	(41, 1567)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	512
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @616
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 1680)
-				label      	(object ItemLabel
-				    Parent_View 	@616
-				    location   	(1781, 1524)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1174
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@616
-				    location   	(1781, 1584)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	1177
-				    compartmentItems 	(list Compartment
-					"+ derivationMethod : XSDDerivationMethod = restriction"
-					"<<0..*>> + final : XSDComplexFinal"
-					"+ abstract : boolean"
-					"+ contentTypeCategory : XSDContentTypeCategory"
-					"<<0..*>> + prohibitedSubstitutions : XSDProhibitedSubstitutions"))
-				width      	1192
-				height     	336
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @617
-				location   	(463, 362)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@614
-				vertices   	(list Points
-				    (463, 362)
-				    (463, 221)))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @618
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@618
-				    location   	(1094, 1519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	628
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@618
-				    location   	(1094, 1579)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	628
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	646
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @619
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@619
-				    location   	(647, 38)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	530
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@619
-				    location   	(647, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	538
-				    compartmentItems 	(list Compartment
-					"+ required : boolean"
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	548
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @620
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@620
-				    location   	(45, 1830)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1286
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@620
-				    location   	(45, 1890)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	1294
-				    compartmentItems 	(list Compartment
-					"+ namespaceConstraintCategory : XSDNamespaceConstraintCategory"
-					"<<0..*>> + namespaceConstraint : String"
-					"+ processContents : XSDProcessContents"))
-				width      	1304
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @621
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 1440)
-				label      	(object ItemLabel
-				    Parent_View 	@621
-				    location   	(47, 1384)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	578
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	596
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @622
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@622
-				    location   	(36, 431)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@622
-				    location   	(36, 491)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	548
-				    compartmentItems 	(list Compartment
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	554
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @623
-				location   	(294, 697)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@622
-				vertices   	(list Points
-				    (294, 697)
-				    (294, 605)))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @624
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2256, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@624
-				    location   	(1995, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	540
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @625
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@625
-				    location   	(2418, 460)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @626
-				location   	(2684, 962)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@625
-				vertices   	(list Points
-				    (2684, 962)
-				    (2684, 576)))
-			    (object ClassView "Class" "Logical View::xsd::XSDCompositor" @627
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(45, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDCompositor")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(45, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869B620037"
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstraint" @628
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@628
-				    location   	(638, 469)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDConstraint")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@628
-				    location   	(638, 419)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869E2601AE"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDerivationMethod" @629
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@629
-				    location   	(1980, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"XSDDerivationMethod")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@629
-				    location   	(1980, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A0B000CE"
-				width      	442
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintCategory" @630
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@630
-				    location   	(1281, 88)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"XSDIdentityConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@630
-				    location   	(1281, 38)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A1E00272"
-				width      	625
-				height     	300
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDContentTypeCategory" @631
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2704, 2224)
-				label      	(object ItemLabel
-				    Parent_View 	@631
-				    location   	(2456, 2115)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"XSDContentTypeCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@631
-				    location   	(2456, 2065)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A79F03A2"
-				width      	514
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @632
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@632
-				    location   	(708, 1516)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@632
-				    location   	(708, 1466)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	362
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProcessContents" @633
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@633
-				    location   	(766, 2156)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDProcessContents")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@633
-				    location   	(766, 2106)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF8C70284"
-				width      	438
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathVariety" @634
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2768, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@634
-				    location   	(2587, 97)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"XSDXPathVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@634
-				    location   	(2587, 47)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FFB89033A"
-				width      	381
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @635
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 1872)
-				label      	(object ItemLabel
-				    Parent_View 	@635
-				    location   	(1389, 1788)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@635
-				    location   	(1389, 1738)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@635
-				    location   	(1389, 1848)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	241
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @636
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 2000)
-				label      	(object ItemLabel
-				    Parent_View 	@636
-				    location   	(1786, 1941)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@636
-				    location   	(1786, 1891)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				compartment 	(object Compartment
-				    Parent_View 	@636
-				    location   	(1786, 2001)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	382
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSubstitutionGroupExclusions" @637
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@637
-				    location   	(485, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"XSDSubstitutionGroupExclusions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@637
-				    location   	(485, 1075)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C59100AE"
-				width      	648
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @638
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(1171, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(1171, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@638
-				    location   	(1171, 1176)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	264
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"))
-				width      	556
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @639
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1664, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@639
-				    location   	(1398, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@639
-				    location   	(1398, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@639
-				    location   	(1398, 2273)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	550
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamespaceConstraintCategory" @640
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(45, 2154)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"XSDNamespaceConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(45, 2104)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5EA0023"
-				width      	696
-				height     	296
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @641
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1264, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@641
-				    location   	(571, 749)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1386
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@641
-				    location   	(571, 809)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	1396
-				    compartmentItems 	(list Compartment
-					"+ nillable : boolean"
-					"<<0..*>> + disallowedSubstitutions : XSDDisallowedSubstitutions"
-					"<<0..*>> + substitutionGroupExclusions : XSDSubstitutionGroupExclusions"
-					"+ abstract : boolean"))
-				width      	1404
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @642
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@641
-				supplier   	@622
-				line_style 	3
-				origin_attachment 	(681, 737)
-				terminal_attachment 	(681, 697)
-				drawSupplier 	@623)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @643
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@643
-				    location   	(35, 812)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @644
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@644
-				    location   	(2420, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @645
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@644
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(2862, 1088)
-				terminal_attachment 	(2862, 962)
-				drawSupplier 	@626)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @646
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1312)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@646
-				    location   	(2168, 1261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @647
-				location   	(2375, 1465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@646
-				vertices   	(list Points
-				    (2375, 1465)
-				    (2375, 1375)))
-			    (object InheritView "" @648
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@646
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(2368, 1249)
-				terminal_attachment 	(2368, 962)
-				drawSupplier 	@626)
-			    (object InheritView "" @649
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@616
-				supplier   	@646
-				line_style 	3
-				origin_attachment 	(2818, 1512)
-				terminal_attachment 	(2818, 1465)
-				drawSupplier 	@647)
-			    (object InheritView "" @650
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@618
-				supplier   	@646
-				line_style 	3
-				origin_attachment 	(1406, 1507)
-				terminal_attachment 	(1406, 1465)
-				drawSupplier 	@647)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @651
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@651
-				    location   	(1818, 1101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @652
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@651
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(2115, 1089)
-				terminal_attachment 	(2115, 962)
-				drawSupplier 	@626)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @653
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@653
-				    location   	(1034, 468)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1132
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	1150
-				height     	144
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @654
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@653
-				supplier   	@614
-				line_style 	3
-				origin_attachment 	(1568, 456)
-				terminal_attachment 	(1568, 362)
-				drawSupplier 	@617)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @655
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@655
-				    location   	(2078, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	484
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	502
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @656
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@656
-				    location   	(43, 268)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @657
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@655
-				supplier   	@614
-				line_style 	3
-				origin_attachment 	(2290, 691)
-				terminal_attachment 	(2290, 362)
-				drawSupplier 	@617)
-			    (object InheritView "" @658
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@643
-				supplier   	@622
-				line_style 	3
-				origin_attachment 	(141, 800)
-				terminal_attachment 	(141, 697)
-				drawSupplier 	@623)
-			    (object InheritView "" @659
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@622
-				supplier   	@614
-				line_style 	3
-				origin_attachment 	(372, 419)
-				terminal_attachment 	(372, 362)
-				drawSupplier 	@617)
-			    (object InheritView "" @660
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@625
-				supplier   	@614
-				line_style 	3
-				origin_attachment 	(2687, 448)
-				terminal_attachment 	(2687, 362)
-				drawSupplier 	@617)))
-		    (object ClassDiagram "4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			quid       	"3B6C3265005F"
-			title      	"4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFixedFacet" @661
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@661
-				    location   	(32, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	320
-				    justify    	0
-				    label      	"XSDFixedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C699E00C1"
-				width      	338
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @662
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@662
-				    location   	(504, 845)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @663
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@663
-				    location   	(266, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	478
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @664
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@664
-				    location   	(777, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	480
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @665
-				location   	(718, 1049)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@662
-				vertices   	(list Points
-				    (718, 1049)
-				    (718, 959)))
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @666
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@666
-				    location   	(1799, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	420
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @667
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@667
-				    location   	(1383, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	388
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @668
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2032, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@668
-				    location   	(1807, 1048)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	468
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @669
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@669
-				    location   	(1319, 1049)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	388
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @670
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@670
-				    location   	(491, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	348
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @671
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@671
-				    location   	(405, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	424
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @672
-				location   	(144, 1262)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@661
-				vertices   	(list Points
-				    (144, 1262)
-				    (144, 964)))
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @673
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1216, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@673
-				    location   	(1007, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @674
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@674
-				    location   	(880, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	498
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @675
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@675
-				    location   	(1090, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	462
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @676
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@676
-				    location   	(1193, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @677
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@677
-				    location   	(282, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	428
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	446
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @678
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@678
-				    location   	(124, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	474
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @679
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@679
-				    location   	(52, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	426
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @680
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@680
-				    location   	(1318, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	486
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @681
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C9D03C7"
-				client     	@663
-				supplier   	@662
-				line_style 	3
-				origin_attachment 	(394, 1100)
-				terminal_attachment 	(394, 1049)
-				drawSupplier 	@665)
-			    (object InheritView "" @682
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C78620045"
-				client     	@674
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(1119, 1308)
-				terminal_attachment 	(1119, 1262)
-				drawSupplier 	@672)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @683
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 160)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@683
-				    location   	(174, 117)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @684
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6CA5038D"
-				client     	@664
-				supplier   	@662
-				line_style 	3
-				origin_attachment 	(1044, 1100)
-				terminal_attachment 	(1044, 1049)
-				drawSupplier 	@665)
-			    (object InheritView "" @685
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C778002DF"
-				client     	@670
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(663, 1308)
-				terminal_attachment 	(663, 1262)
-				drawSupplier 	@672)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrdered" @686
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@686
-				    location   	(1835, 1324)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDOrdered")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@686
-				    location   	(1835, 1274)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715202E4"
-				width      	444
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinality" @687
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@687
-				    location   	(1835, 1669)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDCardinality")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@687
-				    location   	(1835, 1619)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715D009B"
-				width      	444
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpace" @688
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 2032)
-				label      	(object ItemLabel
-				    Parent_View 	@688
-				    location   	(1861, 1951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDWhiteSpace")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@688
-				    location   	(1861, 1901)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BEED0F60342"
-				width      	424
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::Value" @689
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@689
-				    location   	(571, 2062)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"Value")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@689
-				    location   	(571, 2012)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C040B5B031F"
-				width      	636
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @690
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B610337"
-				client     	@679
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(75, 2044)
-				terminal_attachment 	(75, 1262)
-				drawSupplier 	@672)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @691
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@691
-				    location   	(113, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	286
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@691
-				    location   	(113, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	290
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	304
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @692
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@692
-				    location   	(1440, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	288
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@692
-				    location   	(1440, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	294
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	306
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @693
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D240098"
-				client     	@691
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(235, 1308)
-				terminal_attachment 	(235, 1262)
-				drawSupplier 	@672)
-			    (object InheritView "" @694
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D3103AD"
-				client     	@692
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(1581, 1308)
-				terminal_attachment 	(1581, 1262)
-				drawSupplier 	@672)
-			    (object InheritView "" @695
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B520353"
-				client     	@677
-				supplier   	@691
-				line_style 	3
-				origin_attachment 	(285, 1664)
-				terminal_attachment 	(285, 1444))
-			    (object InheritView "" @696
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8303B8"
-				client     	@675
-				supplier   	@692
-				line_style 	3
-				origin_attachment 	(1500, 1664)
-				terminal_attachment 	(1500, 1444))
-			    (object InheritView "" @697
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8E0309"
-				client     	@676
-				supplier   	@692
-				line_style 	3
-				origin_attachment 	(1622, 1840)
-				terminal_attachment 	(1622, 1444))
-			    (object InheritView "" @698
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C77C400C0"
-				client     	@671
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(447, 1485)
-				terminal_attachment 	(447, 1262)
-				drawSupplier 	@672)
-			    (object InheritView "" @699
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B7D00FC"
-				client     	@673
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(1397, 1485)
-				terminal_attachment 	(1397, 1262)
-				drawSupplier 	@672)
-			    (object InheritView "" @700
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B990016"
-				client     	@680
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(1775, 2044)
-				terminal_attachment 	(1775, 1262)
-				drawSupplier 	@672)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @701
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 368)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@701
-				    location   	(174, 318)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	406
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @702
-				location   	(366, 522)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@701
-				vertices   	(list Points
-				    (366, 522)
-				    (366, 430)))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @703
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@703
-				    location   	(34, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	462
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @704
-				location   	(272, 781)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@703
-				vertices   	(list Points
-				    (272, 781)
-				    (272, 687)))
-			    (object InheritView "" @705
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@662
-				supplier   	@703
-				line_style 	3
-				origin_attachment 	(594, 833)
-				terminal_attachment 	(594, 781)
-				drawSupplier 	@704)
-			    (object ClassView "Class" "Logical View::xsd::XSDFundamentalFacet" @706
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@706
-				    location   	(526, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDFundamentalFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C69E801D6"
-				width      	470
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @707
-				location   	(768, 789)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@706
-				vertices   	(list Points
-				    (768, 789)
-				    (768, 687)))
-			    (object InheritView "" @708
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7659012C"
-				client     	@666
-				supplier   	@706
-				line_style 	3
-				origin_attachment 	(2050, 860)
-				terminal_attachment 	(2050, 789)
-				drawSupplier 	@707)
-			    (object InheritView "" @709
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C763C0224"
-				client     	@667
-				supplier   	@706
-				line_style 	3
-				origin_attachment 	(1525, 860)
-				terminal_attachment 	(1525, 789)
-				drawSupplier 	@707)
-			    (object InheritView "" @710
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C764F0131"
-				client     	@668
-				supplier   	@706
-				line_style 	3
-				origin_attachment 	(2237, 1036)
-				terminal_attachment 	(2237, 789)
-				drawSupplier 	@707)
-			    (object InheritView "" @711
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C76420074"
-				client     	@669
-				supplier   	@706
-				line_style 	3
-				origin_attachment 	(1328, 1037)
-				terminal_attachment 	(1328, 789)
-				drawSupplier 	@707)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @712
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1456, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@712
-				    location   	(1137, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@712
-				    location   	(1137, 107)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	628
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	656
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$132" @713
-				location   	(775, 178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D597102EA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$133" @714
-					Parent_View 	@713
-					location   	(-1209, -46)
-					label      	(object SegLabel @715
-					    Parent_View 	@714
-					    location   	(509, 235)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750119"
-					client     	@713
-					supplier   	@701
-					vertices   	(list Points
-					    (775, 178)
-					    (550, 178)
-					    (550, 306))
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(550, 306))
-				    (object RoleView "simpleTypeDefinition" @716
-					Parent_View 	@713
-					location   	(-1209, -46)
-					label      	(object SegLabel @717
-					    Parent_View 	@716
-					    location   	(875, 136)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+simpleTypeDefinition"
-					    pctDist    	0.283133
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750105"
-					client     	@713
-					supplier   	@712
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(1128, 178)
-					label      	(object SegLabel @718
-					    Parent_View 	@716
-					    location   	(1061, 215)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.812500
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$194" @719
-				location   	(369, 72)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BC8AE0203A8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facets" @720
-					Parent_View 	@719
-					location   	(-1615, -152)
-					label      	(object SegLabel @721
-					    Parent_View 	@720
-					    location   	(187, 496)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+facets"
-					    pctDist    	0.913863
-					    height     	87
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060065"
-					client     	@719
-					supplier   	@703
-					vertices   	(list Points
-					    (369, 72)
-					    (100, 72)
-					    (100, 561))
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(100, 561)
-					label      	(object SegLabel @722
-					    Parent_View 	@720
-					    location   	(60, 498)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.917900
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$195" @723
-					Parent_View 	@719
-					location   	(-1615, -152)
-					label      	(object SegLabel @724
-					    Parent_View 	@723
-					    location   	(976, 31)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060051"
-					client     	@719
-					supplier   	@712
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(1128, 72))))
-			    (object AssociationViewNew "$UNNAMED$236" @725
-				location   	(1538, 508)
-				label      	(object SegLabel @726
-				    Parent_View 	@725
-				    location   	(1538, 449)
-				    font       	(object Font
-					italics    	TRUE)
-				    hidden     	TRUE
-				    anchor     	1
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	60
-				    justify    	0
-				    label      	""
-				    pctDist    	0.500000
-				    height     	60
-				    orientation 	0)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C276DA000DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$237" @727
-					Parent_View 	@725
-					location   	(-446, 284)
-					label      	(object SegLabel @728
-					    Parent_View 	@727
-					    location   	(1446, 340)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000DF"
-					client     	@725
-					supplier   	@712
-					vertices   	(list Points
-					    (1538, 508)
-					    (1487, 508)
-					    (1487, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1487, 285))
-				    (object RoleView "itemTypeDefinition" @729
-					Parent_View 	@725
-					location   	(-446, 284)
-					label      	(object SegLabel @730
-					    Parent_View 	@729
-					    location   	(1423, 577)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+itemTypeDefinition"
-					    pctDist    	-2.211539
-					    height     	69
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000E0"
-					client     	@725
-					supplier   	@712
-					vertices   	(list Points
-					    (1538, 508)
-					    (1590, 508)
-					    (1590, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1590, 285)
-					label      	(object SegLabel @731
-					    Parent_View 	@729
-					    location   	(1539, 468)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.003984
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$196" @732
-				location   	(1729, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C34B70208"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$197" @733
-					Parent_View 	@732
-					location   	(-255, 350)
-					label      	(object SegLabel @734
-					    Parent_View 	@733
-					    location   	(1637, 353)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0258"
-					client     	@732
-					supplier   	@712
-					vertices   	(list Points
-					    (1729, 574)
-					    (1678, 574)
-					    (1678, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1678, 285))
-				    (object RoleView "memberTypeDefinitions" @735
-					Parent_View 	@732
-					location   	(-255, 350)
-					label      	(object SegLabel @736
-					    Parent_View 	@735
-					    location   	(1559, 654)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+memberTypeDefinitions"
-					    pctDist    	-3.269231
-					    height     	80
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0259"
-					client     	@732
-					supplier   	@712
-					vertices   	(list Points
-					    (1729, 574)
-					    (1781, 574)
-					    (1781, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1781, 285)
-					label      	(object SegLabel @737
-					    Parent_View 	@735
-					    location   	(1730, 520)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.312121
-					    height     	52
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$198" @738
-				location   	(748, 269)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C363201DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fundamentalFacets" @739
-					Parent_View 	@738
-					location   	(-1236, 45)
-					label      	(object SegLabel @740
-					    Parent_View 	@739
-					    location   	(873, 312)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+fundamentalFacets"
-					    pctDist    	-1.409091
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350063"
-					client     	@738
-					supplier   	@706
-					vertices   	(list Points
-					    (748, 269)
-					    (659, 269)
-					    (659, 561))
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(659, 561)
-					label      	(object SegLabel @741
-					    Parent_View 	@739
-					    location   	(728, 385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.538028
-					    height     	69
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$199" @742
-					Parent_View 	@738
-					location   	(-1236, 45)
-					label      	(object SegLabel @743
-					    Parent_View 	@742
-					    location   	(1052, 228)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350059"
-					client     	@738
-					supplier   	@712
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(1128, 269))))
-			    (object AssociationViewNew "$UNNAMED$200" @744
-				location   	(1175, 396)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$201" @745
-					Parent_View 	@744
-					location   	(-809, 172)
-					label      	(object SegLabel @746
-					    Parent_View 	@745
-					    location   	(1094, 316)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@744
-					supplier   	@712
-					vertices   	(list Points
-					    (1175, 396)
-					    (1135, 396)
-					    (1135, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1135, 285))
-				    (object RoleView "baseTypeDefinition" @747
-					Parent_View 	@744
-					location   	(-809, 172)
-					label      	(object SegLabel @748
-					    Parent_View 	@747
-					    location   	(1074, 443)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	-2.533333
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@744
-					supplier   	@712
-					vertices   	(list Points
-					    (1175, 396)
-					    (1215, 396)
-					    (1215, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1215, 285)
-					label      	(object SegLabel @749
-					    Parent_View 	@747
-					    location   	(1172, 359)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.096154
-					    height     	38
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$202" @750
-				location   	(1360, 446)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5572016C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$203" @751
-					Parent_View 	@750
-					location   	(-624, 222)
-					label      	(object SegLabel @752
-					    Parent_View 	@751
-					    location   	(1268, 327)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5575022F"
-					client     	@750
-					supplier   	@712
-					vertices   	(list Points
-					    (1360, 446)
-					    (1309, 446)
-					    (1309, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1309, 285))
-				    (object RoleView "primitiveTypeDefinition" @753
-					Parent_View 	@750
-					location   	(-624, 222)
-					label      	(object SegLabel @754
-					    Parent_View 	@753
-					    location   	(1204, 508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+primitiveTypeDefinition"
-					    pctDist    	-3.000000
-					    height     	62
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D55750243"
-					client     	@750
-					supplier   	@712
-					vertices   	(list Points
-					    (1360, 446)
-					    (1412, 446)
-					    (1412, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1412, 285)
-					label      	(object SegLabel @755
-					    Parent_View 	@753
-					    location   	(1373, 409)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.062147
-					    height     	38
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @756
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 512)
-				label      	(object ItemLabel
-				    Parent_View 	@756
-				    location   	(1917, 428)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@756
-				    location   	(1917, 378)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@756
-				    location   	(1917, 488)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	3
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @757
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@757
-				    location   	(1918, 92)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@757
-				    location   	(1918, 42)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	342
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @758
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C7B0396"
-				client     	@706
-				supplier   	@701
-				line_style 	3
-				origin_attachment 	(591, 561)
-				terminal_attachment 	(591, 522)
-				drawSupplier 	@702)
-			    (object InheritView "" @759
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@703
-				supplier   	@701
-				line_style 	3
-				origin_attachment 	(272, 561)
-				terminal_attachment 	(272, 522)
-				drawSupplier 	@702)
-			    (object InheritView "" @760
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@701
-				supplier   	@683
-				line_style 	3
-				origin_attachment 	(366, 306)
-				terminal_attachment 	(366, 215))
-			    (object InheritView "" @761
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8801B4"
-				client     	@661
-				supplier   	@703
-				line_style 	3
-				origin_attachment 	(147, 828)
-				terminal_attachment 	(147, 781)
-				drawSupplier 	@704)
-			    (object InheritView "" @762
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B590281"
-				client     	@678
-				supplier   	@691
-				line_style 	3
-				origin_attachment 	(150, 1840)
-				terminal_attachment 	(150, 1444))))
-		    (object ClassDiagram "5. Component Annotations"
-			quid       	"3B69D68D00D2"
-			title      	"5. Component Annotations"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @763
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@763
-				    location   	(88, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @764
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@764
-				    location   	(82, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @765
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 1504)
-				label      	(object ItemLabel
-				    Parent_View 	@765
-				    location   	(1626, 1461)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @766
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 304)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@766
-				    location   	(1663, 261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @767
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@767
-				    location   	(74, 1317)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	588
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	606
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @768
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@768
-				    location   	(86, 661)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @769
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@769
-				    location   	(74, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @770
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 544)
-				label      	(object ItemLabel
-				    Parent_View 	@770
-				    location   	(86, 501)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @771
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@771
-				    location   	(1068, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @772
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1216)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@772
-				    location   	(1750, 1173)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @773
-				location   	(1994, 1412)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@772
-				vertices   	(list Points
-				    (1994, 1412)
-				    (1994, 1271)))
-			    (object InheritView "" @774
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@765
-				supplier   	@772
-				line_style 	3
-				origin_attachment 	(2084, 1449)
-				terminal_attachment 	(2084, 1412)
-				drawSupplier 	@773)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @775
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@775
-				    location   	(80, 821)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @776
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@776
-				    location   	(1892, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	234
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @777
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@777
-				    location   	(84, 341)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @778
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@778
-				    location   	(86, 181)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @779
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@779
-				    location   	(1467, 1674)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	651
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	669
-				height     	100
-				annotation 	8)
-			    (object InheritView "" @780
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@779
-				supplier   	@772
-				line_style 	3
-				origin_attachment 	(1572, 1662)
-				terminal_attachment 	(1572, 1412)
-				drawSupplier 	@773)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @781
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@781
-				    location   	(78, 981)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @782
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@782
-				    location   	(1688, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @783
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@783
-				    location   	(71, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @784
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@784
-				    location   	(872, 685)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	720
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	738
-				height     	543
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$138" @785
-				location   	(865, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0D0183"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$139" @786
-					Parent_View 	@785
-					location   	(-255, 559)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D033C"
-					client     	@785
-					supplier   	@767
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(671, 1359))
-				    (object RoleView "annotation" @787
-					Parent_View 	@785
-					location   	(-255, 559)
-					label      	(object SegLabel @788
-					    Parent_View 	@787
-					    location   	(798, 1321)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-1.116667
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D0346"
-					client     	@785
-					supplier   	@784
-					vertices   	(list Points
-					    (865, 1359)
-					    (925, 1359)
-					    (925, 1215))
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(925, 1215)
-					label      	(object SegLabel @789
-					    Parent_View 	@787
-					    location   	(987, 1276)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.706422
-					    height     	62
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$162" @790
-				location   	(713, 709)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0F0212"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$163" @791
-					Parent_View 	@790
-					location   	(-407, -90)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000C9"
-					client     	@790
-					supplier   	@768
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(563, 709))
-				    (object RoleView "annotation" @792
-					Parent_View 	@790
-					location   	(-407, -90)
-					label      	(object SegLabel @793
-					    Parent_View 	@792
-					    location   	(727, 667)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.095238
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000D3"
-					client     	@790
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(863, 709)
-					label      	(object SegLabel @794
-					    Parent_View 	@792
-					    location   	(796, 753)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.553571
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$156" @795
-				location   	(719, 1193)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB15008A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$157" @796
-					Parent_View 	@795
-					location   	(-401, 393)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB160096"
-					client     	@795
-					supplier   	@769
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(575, 1193))
-				    (object RoleView "annotation" @797
-					Parent_View 	@795
-					location   	(-401, 393)
-					label      	(object SegLabel @798
-					    Parent_View 	@797
-					    location   	(720, 1147)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.006993
-					    height     	47
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1600A0"
-					client     	@795
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(863, 1193)
-					label      	(object SegLabel @799
-					    Parent_View 	@797
-					    location   	(806, 1240)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.604167
-					    height     	47
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$116" @800
-				location   	(785, 550)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0A0066"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$117" @801
-					Parent_View 	@800
-					location   	(-335, -250)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B023F"
-					client     	@800
-					supplier   	@770
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(563, 550))
-				    (object RoleView "annotation" @802
-					Parent_View 	@800
-					location   	(-335, -250)
-					label      	(object SegLabel @803
-					    Parent_View 	@802
-					    location   	(779, 516)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.070707
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B0249"
-					client     	@800
-					supplier   	@784
-					vertices   	(list Points
-					    (785, 550)
-					    (884, 550)
-					    (884, 673))
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(884, 673)
-					label      	(object SegLabel @804
-					    Parent_View 	@802
-					    location   	(935, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.729730
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$188" @805
-				location   	(1184, 404)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E4560290"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$189" @806
-					Parent_View 	@805
-					location   	(-32, -412)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E4570165"
-					client     	@805
-					supplier   	@771
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 135))
-				    (object RoleView "annotations" @807
-					Parent_View 	@805
-					location   	(-32, -412)
-					label      	(object SegLabel @808
-					    Parent_View 	@807
-					    location   	(1324, 226)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-0.665428
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E457016F"
-					client     	@805
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 673)
-					label      	(object SegLabel @809
-					    Parent_View 	@807
-					    location   	(1251, 615)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.784387
-					    height     	67
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$204" @810
-				location   	(1752, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E2910158"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$205" @811
-					Parent_View 	@810
-					location   	(536, 218)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E292019F"
-					client     	@810
-					supplier   	@772
-					vertices   	(list Points
-					    (1752, 1034)
-					    (1812, 1034)
-					    (1812, 1161))
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1812, 1161))
-				    (object RoleView "annotation" @812
-					Parent_View 	@810
-					location   	(536, 218)
-					label      	(object SegLabel @813
-					    Parent_View 	@812
-					    location   	(1743, 997)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.059603
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E29201A9"
-					client     	@810
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1601, 1034)
-					label      	(object SegLabel @814
-					    Parent_View 	@812
-					    location   	(1684, 1066)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.450331
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$206" @815
-				location   	(1896, 881)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B9006CF0088"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$207" @816
-					Parent_View 	@815
-					location   	(621, 40)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D1015D"
-					client     	@815
-					supplier   	@772
-					vertices   	(list Points
-					    (1896, 881)
-					    (1956, 881)
-					    (1956, 1161))
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1956, 1161))
-				    (object RoleView "derivationAnnotation" @817
-					Parent_View 	@815
-					location   	(621, 40)
-					label      	(object SegLabel @818
-					    Parent_View 	@817
-					    location   	(1821, 842)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	390
-					    justify    	0
-					    label      	"+derivationAnnotation"
-					    pctDist    	0.254237
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D10167"
-					client     	@815
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1601, 881)
-					label      	(object SegLabel @819
-					    Parent_View 	@817
-					    location   	(1689, 914)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.705085
-					    height     	33
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$208" @820
-				location   	(2040, 715)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB330264"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$209" @821
-					Parent_View 	@820
-					location   	(920, -85)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB340284"
-					client     	@820
-					supplier   	@772
-					vertices   	(list Points
-					    (2040, 715)
-					    (2100, 715)
-					    (2100, 1161))
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(2100, 1161))
-				    (object RoleView "annotations" @822
-					Parent_View 	@820
-					location   	(920, -85)
-					label      	(object SegLabel @823
-					    Parent_View 	@822
-					    location   	(1758, 681)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.643192
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB34028E"
-					client     	@820
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(1601, 715)
-					label      	(object SegLabel @824
-					    Parent_View 	@822
-					    location   	(1685, 746)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.809313
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$226" @825
-				location   	(668, 865)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C239134004F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$227" @826
-					Parent_View 	@825
-					location   	(-612, 33)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600CA"
-					client     	@825
-					supplier   	@775
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(473, 865))
-				    (object RoleView "annotation" @827
-					Parent_View 	@825
-					location   	(-612, 33)
-					label      	(object SegLabel @828
-					    Parent_View 	@827
-					    location   	(714, 825)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.234146
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600D4"
-					client     	@825
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(863, 865)
-					label      	(object SegLabel @829
-					    Parent_View 	@827
-					    location   	(801, 903)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.682051
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$130" @830
-				location   	(1472, 167)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D23B901CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$131" @831
-					Parent_View 	@830
-					location   	(256, -649)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01C4"
-					client     	@830
-					supplier   	@776
-					vertices   	(list Points
-					    (1472, 167)
-					    (1472, 72)
-					    (1883, 72))
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1883, 72))
-				    (object RoleView "annotation" @832
-					Parent_View 	@830
-					location   	(256, -649)
-					label      	(object SegLabel @833
-					    Parent_View 	@832
-					    location   	(1604, 129)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.076305
-					    height     	132
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01CE"
-					client     	@830
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1472, 673)
-					label      	(object SegLabel @834
-					    Parent_View 	@832
-					    location   	(1419, 618)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.893574
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$80" @835
-				location   	(927, 350)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB060291"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$81" @836
-					Parent_View 	@835
-					location   	(-193, -450)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070171"
-					client     	@835
-					supplier   	@777
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(629, 350))
-				    (object RoleView "annotation" @837
-					Parent_View 	@835
-					location   	(-193, -450)
-					label      	(object SegLabel @838
-					    Parent_View 	@837
-					    location   	(878, 310)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.816667
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070172"
-					client     	@835
-					supplier   	@784
-					vertices   	(list Points
-					    (927, 350)
-					    (987, 350)
-					    (987, 673))
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(987, 673)
-					label      	(object SegLabel @839
-					    Parent_View 	@837
-					    location   	(1037, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.843342
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$72" @840
-				location   	(1027, 222)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DADC02F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$73" @841
-					Parent_View 	@840
-					location   	(-93, -578)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0238"
-					client     	@840
-					supplier   	@778
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(563, 222))
-				    (object RoleView "annotation" @842
-					Parent_View 	@840
-					location   	(-93, -578)
-					label      	(object SegLabel @843
-					    Parent_View 	@842
-					    location   	(1003, 188)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.406250
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0242"
-					client     	@840
-					supplier   	@784
-					vertices   	(list Points
-					    (1027, 222)
-					    (1087, 222)
-					    (1087, 673))
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(1087, 673)
-					label      	(object SegLabel @844
-					    Parent_View 	@842
-					    location   	(1137, 613)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	100
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.882583
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$96" @845
-				location   	(1494, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B90068801C2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$97" @846
-					Parent_View 	@845
-					location   	(214, 590)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A0111"
-					client     	@845
-					supplier   	@779
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1662))
-				    (object RoleView "contentAnnotation" @847
-					Parent_View 	@845
-					location   	(214, 590)
-					label      	(object SegLabel @848
-					    Parent_View 	@847
-					    location   	(1696, 1356)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+contentAnnotation"
-					    pctDist    	0.367713
-					    height     	202
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A011B"
-					client     	@845
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1215)
-					label      	(object SegLabel @849
-					    Parent_View 	@847
-					    location   	(1443, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.713004
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$150" @850
-				location   	(637, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB1702C8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$151" @851
-					Parent_View 	@850
-					location   	(-483, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1803E2"
-					client     	@850
-					supplier   	@781
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(411, 1022))
-				    (object RoleView "annotation" @852
-					Parent_View 	@850
-					location   	(-483, 222)
-					label      	(object SegLabel @853
-					    Parent_View 	@852
-					    location   	(710, 979)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.328889
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB190004"
-					client     	@850
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(863, 1022)
-					label      	(object SegLabel @854
-					    Parent_View 	@852
-					    location   	(802, 1062)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.730088
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$70" @855
-				location   	(1581, 607)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EA70102"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$71" @856
-					Parent_View 	@855
-					location   	(301, -225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90191"
-					client     	@855
-					supplier   	@782
-					vertices   	(list Points
-					    (1581, 607)
-					    (1581, 547)
-					    (1679, 547))
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1679, 547))
-				    (object RoleView "annotations" @857
-					Parent_View 	@855
-					location   	(301, -225)
-					label      	(object SegLabel @858
-					    Parent_View 	@857
-					    location   	(1669, 462)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-2.196970
-					    height     	88
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90192"
-					client     	@855
-					supplier   	@784
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1581, 673)
-					label      	(object SegLabel @859
-					    Parent_View 	@857
-					    location   	(1539, 620)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.196970
-					    height     	42
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$210" @860
-				location   	(849, 1496)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB11026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$211" @861
-					Parent_View 	@860
-					location   	(-271, 696)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1201F9"
-					client     	@860
-					supplier   	@783
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(354, 1496))
-				    (object RoleView "annotation" @862
-					Parent_View 	@860
-					location   	(-271, 696)
-					label      	(object SegLabel @863
-					    Parent_View 	@862
-					    location   	(942, 1464)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.188259
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB120203"
-					client     	@860
-					supplier   	@784
-					vertices   	(list Points
-					    (849, 1496)
-					    (1062, 1496)
-					    (1062, 1215))
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(1062, 1215)
-					label      	(object SegLabel @864
-					    Parent_View 	@862
-					    location   	(1115, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.872690
-					    height     	53
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$212" @865
-				location   	(952, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EB30005"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$213" @866
-					Parent_View 	@865
-					location   	(-328, 733)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40327"
-					client     	@865
-					supplier   	@783
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(354, 1565))
-				    (object RoleView "annotations" @867
-					Parent_View 	@865
-					location   	(-328, 733)
-					label      	(object SegLabel @868
-					    Parent_View 	@867
-					    location   	(1075, 1538)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.204959
-					    height     	28
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40332"
-					client     	@865
-					supplier   	@784
-					vertices   	(list Points
-					    (952, 1565)
-					    (1200, 1565)
-					    (1200, 1215))
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(1200, 1215)
-					label      	(object SegLabel @869
-					    Parent_View 	@867
-					    location   	(1254, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @870
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@766
-				supplier   	@776
-				line_style 	3
-				origin_attachment 	(1984, 249)
-				terminal_attachment 	(1984, 135))
-			    (object InheritView "" @871
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@782
-				supplier   	@766
-				line_style 	3
-				origin_attachment 	(1997, 505)
-				terminal_attachment 	(1997, 359))))
-		    (object ClassDiagram "6. Concrete Components"
-			quid       	"3B6AD74D03C4"
-			title      	"6. Concrete Components"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @872
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@872
-				    location   	(126, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @873
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@873
-				    location   	(568, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @874
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@874
-				    location   	(991, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @875
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@875
-				    location   	(1156, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @876
-				location   	(1360, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@875
-				vertices   	(list Points
-				    (1360, 561)
-				    (1360, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDInclude" @877
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@877
-				    location   	(1512, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"XSDInclude")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C7D0250"
-				width      	258
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @878
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@878
-				    location   	(1294, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @879
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@879
-				    location   	(1805, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @880
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@880
-				    location   	(375, 1153)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	851
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	869
-				height     	119
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$148" @881
-				location   	(1368, 1206)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCC5007E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$149" @882
-					Parent_View 	@881
-					location   	(1160, 406)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006B"
-					client     	@881
-					supplier   	@877
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1503, 1206))
-				    (object RoleView "annotation" @883
-					Parent_View 	@881
-					location   	(1160, 406)
-					label      	(object SegLabel @884
-					    Parent_View 	@883
-					    location   	(1347, 1154)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.154412
-					    height     	53
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006C"
-					client     	@881
-					supplier   	@880
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1234, 1206)
-					label      	(object SegLabel @885
-					    Parent_View 	@883
-					    location   	(1300, 1253)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	107
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.514706
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$146" @886
-				location   	(1168, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCD802FC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$147" @887
-					Parent_View 	@886
-					location   	(960, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018B"
-					client     	@886
-					supplier   	@878
-					vertices   	(list Points
-					    (1168, 1022)
-					    (1168, 962)
-					    (1285, 962))
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1285, 962))
-				    (object RoleView "annotation" @888
-					Parent_View 	@886
-					location   	(960, 222)
-					label      	(object SegLabel @889
-					    Parent_View 	@888
-					    location   	(1290, 1075)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.445378
-					    height     	122
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018C"
-					client     	@886
-					supplier   	@880
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1168, 1141)
-					label      	(object SegLabel @890
-					    Parent_View 	@888
-					    location   	(1127, 1074)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.436975
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$168" @891
-				location   	(1563, 1353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADE42009A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$169" @892
-					Parent_View 	@891
-					location   	(1355, 553)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE4302FE"
-					client     	@891
-					supplier   	@879
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1940, 1353)
-					    (1940, 1255))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1940, 1255))
-				    (object RoleView "annotations" @893
-					Parent_View 	@891
-					location   	(1355, 553)
-					label      	(object SegLabel @894
-					    Parent_View 	@893
-					    location   	(1317, 1322)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.516807
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE430308"
-					client     	@891
-					supplier   	@880
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1181, 1353)
-					    (1181, 1259))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1181, 1259)
-					label      	(object SegLabel @895
-					    Parent_View 	@893
-					    location   	(1130, 1326)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.861345
-					    height     	52
-					    orientation 	0))))
-			    (object InheritTreeView "" @896
-				location   	(288, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@872
-				vertices   	(list Points
-				    (288, 561)
-				    (288, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @897
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@897
-				    location   	(460, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @898
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@898
-				    location   	(1658, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	396
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	414
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @899
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 960)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@899
-				    location   	(450, 917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @900
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@900
-				    location   	(110, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @901
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@900
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(221, 617)
-				terminal_attachment 	(221, 561)
-				drawSupplier 	@896)
-			    (object InheritView "" @902
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@897
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(589, 617)
-				terminal_attachment 	(589, 561)
-				drawSupplier 	@896)
-			    (object InheritView "" @903
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@874
-				supplier   	@875
-				line_style 	3
-				origin_attachment 	(1016, 617)
-				terminal_attachment 	(1016, 561)
-				drawSupplier 	@876)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @904
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@904
-				    location   	(1590, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	486
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @905
-				location   	(1824, 1089)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@904
-				vertices   	(list Points
-				    (1824, 1089)
-				    (1824, 999)))
-			    (object InheritView "" @906
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8DC0381"
-				client     	@877
-				supplier   	@904
-				line_style 	3
-				origin_attachment 	(1666, 1145)
-				terminal_attachment 	(1666, 1089)
-				drawSupplier 	@905)
-			    (object InheritView "" @907
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@879
-				supplier   	@904
-				line_style 	3
-				origin_attachment 	(1934, 1145)
-				terminal_attachment 	(1934, 1089)
-				drawSupplier 	@905)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @908
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@908
-				    location   	(1630, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	438
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @909
-				location   	(1762, 819)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@908
-				vertices   	(list Points
-				    (1762, 819)
-				    (1762, 727)))
-			    (object InheritView "" @910
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@878
-				supplier   	@908
-				line_style 	3
-				origin_attachment 	(1416, 889)
-				terminal_attachment 	(1416, 819)
-				drawSupplier 	@909)
-			    (object InheritView "" @911
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@908
-				supplier   	@875
-				line_style 	3
-				origin_attachment 	(1756, 617)
-				terminal_attachment 	(1756, 561)
-				drawSupplier 	@876)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @912
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1120, 144)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@912
-				    location   	(875, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @913
-				location   	(1120, 289)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@912
-				vertices   	(list Points
-				    (1120, 289)
-				    (1120, 199)))
-			    (object AssociationViewNew "$UNNAMED$110" @914
-				location   	(1485, 215)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B0803C7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "container" @915
-					Parent_View 	@914
-					location   	(989, 103)
-					label      	(object SegLabel @916
-					    Parent_View 	@915
-					    location   	(1604, 210)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+container"
-					    pctDist    	0.033113
-					    height     	119
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CE"
-					client     	@914
-					supplier   	@912
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 176)
-					    (1374, 176))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1374, 176)
-					label      	(object SegLabel @917
-					    Parent_View 	@915
-					    location   	(1435, 226)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	69
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.602649
-					    height     	50
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$111" @918
-					Parent_View 	@914
-					location   	(989, 103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CF"
-					client     	@914
-					supplier   	@912
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 254)
-					    (1345, 254)
-					    (1345, 199))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1345, 199))))
-			    (object AssociationViewNew "$UNNAMED$112" @919
-				location   	(773, 216)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B480261"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootContainer" @920
-					Parent_View 	@919
-					location   	(53, 104)
-					label      	(object SegLabel @921
-					    Parent_View 	@920
-					    location   	(614, 217)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+rootContainer"
-					    pctDist    	-0.025000
-					    height     	160
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0285"
-					client     	@919
-					supplier   	@912
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 176)
-					    (866, 176))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(866, 176)
-					label      	(object SegLabel @922
-					    Parent_View 	@920
-					    location   	(800, 228)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.300000
-					    height     	27
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$113" @923
-					Parent_View 	@919
-					location   	(53, 104)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0286"
-					client     	@919
-					supplier   	@912
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 257)
-					    (895, 257)
-					    (895, 199))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(895, 199))))
-			    (object InheritView "" @924
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@875
-				supplier   	@912
-				line_style 	3
-				origin_attachment 	(1367, 361)
-				terminal_attachment 	(1367, 289)
-				drawSupplier 	@913)
-			    (object InheritView "" @925
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D8E200EA"
-				client     	@873
-				supplier   	@912
-				line_style 	3
-				origin_attachment 	(752, 361)
-				terminal_attachment 	(752, 289)
-				drawSupplier 	@913)
-			    (object InheritView "" @926
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@872
-				supplier   	@912
-				line_style 	3
-				origin_attachment 	(299, 361)
-				terminal_attachment 	(299, 289)
-				drawSupplier 	@913)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @927
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@927
-				    location   	(61, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @928
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@927
-				supplier   	@900
-				line_style 	3
-				origin_attachment 	(216, 1145)
-				terminal_attachment 	(216, 727))
-			    (object AssociationViewNew "$UNNAMED$224" @929
-				location   	(1382, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$225" @930
-					Parent_View 	@929
-					location   	(1190, 225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@929
-					supplier   	@904
-					vertices   	(list Points
-					    (1382, 1425)
-					    (2147, 1425)
-					    (2147, 943)
-					    (2067, 943))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(2067, 943))
-				    (object RoleView "incorporatedSchema" @931
-					Parent_View 	@929
-					location   	(1190, 225)
-					label      	(object SegLabel @932
-					    Parent_View 	@931
-					    location   	(445, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.706546
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@929
-					supplier   	@927
-					vertices   	(list Points
-					    (1382, 1425)
-					    (225, 1425)
-					    (225, 1255))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(225, 1255)
-					label      	(object SegLabel @933
-					    Parent_View 	@931
-					    location   	(183, 1392)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.896915
-					    height     	43
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$222" @934
-				location   	(1505, 1503)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$223" @935
-					Parent_View 	@934
-					location   	(1313, 303)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@934
-					supplier   	@908
-					vertices   	(list Points
-					    (1505, 1503)
-					    (2188, 1503)
-					    (2188, 675)
-					    (2059, 675))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(2059, 675))
-				    (object RoleView "resolvedSchema" @936
-					Parent_View 	@934
-					location   	(1313, 303)
-					label      	(object SegLabel @937
-					    Parent_View 	@936
-					    location   	(303, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.733333
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@934
-					supplier   	@927
-					vertices   	(list Points
-					    (1505, 1503)
-					    (113, 1503)
-					    (113, 1255))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(113, 1255)
-					label      	(object SegLabel @938
-					    Parent_View 	@936
-					    location   	(73, 1472)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.867683
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$114" @939
-				location   	(66, 244)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751C310356"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$115" @940
-					Parent_View 	@939
-					location   	(-94, -444)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C330331"
-					client     	@939
-					supplier   	@912
-					vertices   	(list Points
-					    (66, 244)
-					    (66, 144)
-					    (866, 144))
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(866, 144))
-				    (object RoleView "schema" @941
-					Parent_View 	@939
-					location   	(-94, -444)
-					label      	(object SegLabel @942
-					    Parent_View 	@941
-					    location   	(165, 93)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	-0.168113
-					    height     	99
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C33033B"
-					client     	@939
-					supplier   	@927
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(66, 1145)
-					label      	(object SegLabel @943
-					    Parent_View 	@941
-					    location   	(136, 184)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	113
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.066593
-					    height     	70
-					    orientation 	0))))
-			    (object InheritView "" @944
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B780BD90059"
-				client     	@898
-				supplier   	@912
-				line_style 	3
-				origin_attachment 	(1759, 361)
-				terminal_attachment 	(1759, 289)
-				drawSupplier 	@913)
-			    (object InheritView "" @945
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@880
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(400, 1141)
-				terminal_attachment 	(400, 561)
-				drawSupplier 	@896)
-			    (object InheritTreeView "" @946
-				location   	(1012, 837)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@874
-				vertices   	(list Points
-				    (1012, 837)
-				    (1012, 727)))
-			    (object InheritView "" @947
-				stereotype 	(object SegLabel @948
-				    Parent_View 	@947
-				    location   	(1071, 871)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.888158
-				    height     	34
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B7FD4E20366"
-				client     	@880
-				supplier   	@874
-				line_style 	3
-				origin_attachment 	(1037, 1141)
-				terminal_attachment 	(1037, 837)
-				drawSupplier 	@946)
-			    (object InheritView "" @949
-				stereotype 	(object SegLabel @950
-				    Parent_View 	@949
-				    location   	(890, 865)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	263
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.581633
-				    height     	36
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B7FD4BA023C"
-				client     	@899
-				supplier   	@874
-				line_style 	3
-				origin_attachment 	(925, 905)
-				terminal_attachment 	(925, 837)
-				drawSupplier 	@946)
-			    (object InheritView "" @951
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@904
-				supplier   	@908
-				line_style 	3
-				origin_attachment 	(1828, 889)
-				terminal_attachment 	(1828, 819)
-				drawSupplier 	@909)))
-		    (object ClassDiagram "7. Concrete Attributes"
-			quid       	"3B9F8F7602C7"
-			title      	"7. Concrete Attributes"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @952
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@952
-				    location   	(1938, 1359)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@952
-				    location   	(1938, 1419)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	412
-				    compartmentItems 	(list Compartment
-					"+ form : XSDForm"
-					"+ lexicalValue : String"))
-				width      	430
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDForm" @953
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2560, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@953
-				    location   	(2398, 1365)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDForm")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@953
-				    location   	(2398, 1315)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B9F913B01EB"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @954
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 96)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@954
-				    location   	(40, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	657
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				compartment 	(object Compartment
-				    Parent_View 	@954
-				    location   	(40, 97)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	482
-				    compartmentItems 	(list Compartment
-					"+ element : DOMElement"))
-				width      	675
-				height     	143
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @955
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@955
-				    location   	(687, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	322
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	340
-				height     	126
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @956
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@956
-				    location   	(1678, 892)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	470
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @957
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 1408)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@957
-				    location   	(1328, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @958
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(864, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@958
-				    location   	(745, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	256
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @959
-				location   	(850, 537)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@955
-				vertices   	(list Points
-				    (850, 537)
-				    (850, 447)))
-			    (object ClassView "Class" "Logical View::xsd::DOMElement" @960
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1248, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@960
-				    location   	(873, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"DOMElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@960
-				    location   	(873, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3B8189790200"
-				width      	769
-				height     	200
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @961
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 640)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@961
-				    location   	(41, 584)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	512
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @962
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@962
-				    location   	(38, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	422
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @963
-				location   	(368, 263)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@954
-				vertices   	(list Points
-				    (368, 263)
-				    (368, 167)))
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @964
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(723, 1347)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(723, 1297)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@964
-				    location   	(723, 1407)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	264
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	556
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @965
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@965
-				    location   	(614, 1708)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@965
-				    location   	(614, 1658)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@965
-				    location   	(614, 1768)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	234
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	550
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @966
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@966
-				    location   	(532, 2040)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	760
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@966
-				    location   	(532, 2100)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	764
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDSimpleFinal"))
-				width      	778
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @967
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@967
-				    location   	(45, 1875)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@967
-				    location   	(45, 1825)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				width      	344
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @968
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2544, 2016)
-				label      	(object ItemLabel
-				    Parent_View 	@968
-				    location   	(2362, 1932)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@968
-				    location   	(2362, 1882)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				width      	382
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @969
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@969
-				    location   	(41, 1279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	622
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@969
-				    location   	(41, 1339)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	630
-				    compartmentItems 	(list Compartment
-					"+ use : XSDAttributeUseCategory"
-					"+ lexicalValue : String"))
-				width      	640
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUseCategory" @970
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@970
-				    location   	(41, 1548)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDAttributeUseCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@970
-				    location   	(41, 1498)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BA7B0E801A8"
-				width      	512
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @971
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2608, 928)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@971
-				    location   	(2498, 881)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	220
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	238
-				height     	119
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @972
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2240, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@972
-				    location   	(1757, 1631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	966
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@972
-				    location   	(1757, 1691)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	973
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDProhibitedSubstitutions"
-					"<<0..*>> + block : XSDDisallowedSubstitutions"))
-				width      	984
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @973
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@973
-				    location   	(1828, 1096)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	888
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@973
-				    location   	(1828, 1156)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	888
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalNamespaceConstraint : String"))
-				width      	906
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @974
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@974
-				    location   	(622, 777)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	996
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	1014
-				height     	486
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @975
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@975
-				    location   	(37, 904)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	424
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @976
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1344, 656)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@976
-				    location   	(1138, 600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@976
-				    location   	(1138, 660)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	414
-				    compartmentItems 	(list Compartment
-					"+ lexicalValue : String"))
-				width      	430
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @977
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@977
-				    location   	(1410, 1942)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	860
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@977
-				    location   	(1410, 2002)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	870
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDComplexFinal"
-					"<<0..*>> + block : XSDProhibitedSubstitutions"
-					"+ mixed : boolean"))
-				width      	878
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @978
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1488, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@978
-				    location   	(1304, 1644)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @979
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@978
-				supplier   	@957
-				line_style 	3
-				origin_attachment 	(1506, 1632)
-				terminal_attachment 	(1506, 1472))
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @980
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2208, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@980
-				    location   	(1758, 598)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	900
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	918
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @981
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@971
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(2696, 869)
-				terminal_attachment 	(2696, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @982
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@972
-				supplier   	@952
-				line_style 	3
-				origin_attachment 	(2094, 1619)
-				terminal_attachment 	(2094, 1533))
-			    (object InheritTreeView "" @983
-				location   	(1487, 1856)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@978
-				vertices   	(list Points
-				    (1487, 1856)
-				    (1487, 1760)))
-			    (object ClassView "Class" "Logical View::xsd::DOMAttr" @984
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@984
-				    location   	(2080, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"DOMAttr")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@984
-				    location   	(2080, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BBF8C8901B6"
-				width      	658
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @985
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@977
-				supplier   	@978
-				line_style 	3
-				origin_attachment 	(1734, 1930)
-				terminal_attachment 	(1734, 1856)
-				drawSupplier 	@983)
-			    (object InheritView "" @986
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@976
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(1328, 588)
-				terminal_attachment 	(1328, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @987
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@980
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(2190, 586)
-				terminal_attachment 	(2190, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @988
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@961
-				supplier   	@962
-				line_style 	3
-				origin_attachment 	(222, 572)
-				terminal_attachment 	(222, 447))
-			    (object InheritView "" @989
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@962
-				supplier   	@954
-				line_style 	3
-				origin_attachment 	(260, 321)
-				terminal_attachment 	(260, 263)
-				drawSupplier 	@963)
-			    (object InheritView "" @990
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@975
-				supplier   	@961
-				line_style 	3
-				origin_attachment 	(223, 892)
-				terminal_attachment 	(223, 708))
-			    (object InheritView "" @991
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@973
-				supplier   	@971
-				line_style 	3
-				origin_attachment 	(2600, 1084)
-				terminal_attachment 	(2600, 987))
-			    (object ClassView "Class" "Logical View::xsd::DOMDocument" @992
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@992
-				    location   	(1957, 94)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"DOMDocument")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@992
-				    location   	(1957, 44)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C27850E0381"
-				width      	776
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @993
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@955
-				supplier   	@954
-				line_style 	3
-				origin_attachment 	(856, 321)
-				terminal_attachment 	(856, 263)
-				drawSupplier 	@963)
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @994
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@994
-				    location   	(1234, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@994
-				    location   	(1234, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @995
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@958
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(850, 561)
-				terminal_attachment 	(850, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @996
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@969
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(575, 1267)
-				terminal_attachment 	(575, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @997
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@956
-				supplier   	@955
-				line_style 	3
-				origin_attachment 	(1694, 880)
-				terminal_attachment 	(1694, 537)
-				drawSupplier 	@959)
-			    (object InheritView "" @998
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@974
-				supplier   	@958
-				line_style 	3
-				origin_attachment 	(856, 765)
-				terminal_attachment 	(856, 687))
-			    (object InheritTreeView "" @999
-				location   	(1703, 1290)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@956
-				vertices   	(list Points
-				    (1703, 1290)
-				    (1703, 1008)))
-			    (object InheritView "" @1000
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@957
-				supplier   	@956
-				line_style 	3
-				origin_attachment 	(1503, 1344)
-				terminal_attachment 	(1503, 1290)
-				drawSupplier 	@999)
-			    (object InheritView "" @1001
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@952
-				supplier   	@956
-				line_style 	3
-				origin_attachment 	(2093, 1347)
-				terminal_attachment 	(2093, 1290)
-				drawSupplier 	@999)
-			    (object InheritView "" @1002
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@966
-				supplier   	@978
-				line_style 	3
-				origin_attachment 	(1253, 2028)
-				terminal_attachment 	(1253, 1856)
-				drawSupplier 	@983)))
-		    (object ClassDiagram "8. Concrete Containment"
-			quid       	"3B6A8097027A"
-			title      	"8. Concrete Containment"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @1003
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2672, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@1003
-				    location   	(2439, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1004
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2640, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1004
-				    location   	(2431, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @1005
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@1005
-				    location   	(2013, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @1006
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1006
-				    location   	(1854, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	438
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1007
-				location   	(1943, 868)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1006
-				vertices   	(list Points
-				    (1943, 868)
-				    (1943, 631)))
-			    (object AssociationViewNew "$UNNAMED$170" @1008
-				location   	(2125, 680)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE8240051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$171" @1009
-					Parent_View 	@1008
-					location   	(157, 344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602AD"
-					client     	@1008
-					supplier   	@1005
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 729))
-				    (object RoleView "contents" @1010
-					Parent_View 	@1008
-					location   	(157, 344)
-					label      	(object SegLabel @1011
-					    Parent_View 	@1010
-					    location   	(2255, 671)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.175439
-					    height     	130
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602B7"
-					client     	@1008
-					supplier   	@1006
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 631)
-					label      	(object SegLabel @1012
-					    Parent_View 	@1010
-					    location   	(2067, 671)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.175439
-					    height     	59
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @1013
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1013
-				    location   	(148, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1014
-				location   	(272, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1013
-				vertices   	(list Points
-				    (272, 465)
-				    (272, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1015
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1015
-				    location   	(2372, 1121)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	569
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	587
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @1016
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1016
-				    location   	(89, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$158" @1017
-				location   	(1170, 1356)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "modelGroup" @1018
-					Parent_View 	@1017
-					location   	(866, -20)
-					label      	(object SegLabel @1019
-					    Parent_View 	@1018
-					    location   	(269, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.534044
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@1017
-					supplier   	@1016
-					vertices   	(list Points
-					    (1170, 1356)
-					    (206, 1356)
-					    (206, 631))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(206, 631)
-					label      	(object SegLabel @1020
-					    Parent_View 	@1018
-					    location   	(226, 1322)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.559146
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$159" @1021
-					Parent_View 	@1017
-					location   	(866, -20)
-					label      	(object SegLabel @1022
-					    Parent_View 	@1021
-					    location   	(2521, 1398)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@1017
-					supplier   	@1015
-					vertices   	(list Points
-					    (1170, 1356)
-					    (2731, 1356)
-					    (2731, 1227))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(2731, 1227))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1023
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(160, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1023
-				    location   	(35, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$152" @1024
-				location   	(122, 1136)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6BCEB102F8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$153" @1025
-					Parent_View 	@1024
-					location   	(-630, -256)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB6001B"
-					client     	@1024
-					supplier   	@1016
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 631))
-				    (object RoleView "contents" @1026
-					Parent_View 	@1024
-					location   	(-630, -256)
-					label      	(object SegLabel @1027
-					    Parent_View 	@1026
-					    location   	(223, 1515)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.750495
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB60025"
-					client     	@1024
-					supplier   	@1023
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 1641)
-					label      	(object SegLabel @1028
-					    Parent_View 	@1026
-					    location   	(180, 1581)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.881188
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @1029
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1029
-				    location   	(41, 42)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	495
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	513
-				height     	100
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$164" @1030
-				location   	(47, 885)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B47150119"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$165" @1031
-					Parent_View 	@1030
-					location   	(-289, 821)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03AB"
-					client     	@1030
-					supplier   	@1023
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 1641))
-				    (object RoleView "content" @1032
-					Parent_View 	@1030
-					location   	(-289, 821)
-					label      	(object SegLabel @1033
-					    Parent_View 	@1032
-					    location   	(142, 189)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.921854
-					    height     	95
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03B5"
-					client     	@1030
-					supplier   	@1029
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 130)
-					label      	(object SegLabel @1034
-					    Parent_View 	@1032
-					    location   	(28, 192)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.917881
-					    height     	19
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @1035
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1035
-				    location   	(1252, 849)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	345
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	363
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1036
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1036
-				    location   	(1175, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$94" @1037
-				location   	(1319, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6F1DE9018A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$95" @1038
-					Parent_View 	@1037
-					location   	(-57, -102)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA036C"
-					client     	@1037
-					supplier   	@1035
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 955))
-				    (object RoleView "content" @1039
-					Parent_View 	@1037
-					location   	(-57, -102)
-					label      	(object SegLabel @1040
-					    Parent_View 	@1039
-					    location   	(1439, 1039)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.073171
-					    height     	120
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA0380"
-					client     	@1037
-					supplier   	@1036
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 1113)
-					label      	(object SegLabel @1041
-					    Parent_View 	@1039
-					    location   	(1279, 1031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.040816
-					    height     	41
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @1042
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1042
-				    location   	(1855, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1043
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1043
-				    location   	(1035, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$190" @1044
-				location   	(1351, 1840)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5CA50112"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$191" @1045
-					Parent_View 	@1044
-					location   	(-297, 224)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703B4"
-					client     	@1044
-					supplier   	@1043
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1294, 1840)
-					    (1294, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1294, 1751))
-				    (object RoleView "contents" @1046
-					Parent_View 	@1044
-					location   	(-297, 224)
-					label      	(object SegLabel @1047
-					    Parent_View 	@1046
-					    location   	(1517, 1806)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.632653
-					    height     	108
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703C8"
-					client     	@1044
-					supplier   	@1043
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1409, 1840)
-					    (1409, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1409, 1751)
-					label      	(object SegLabel @1048
-					    Parent_View 	@1046
-					    location   	(1361, 1801)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.072848
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$74" @1049
-				location   	(1190, 1432)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6890D6006F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1050
-					Parent_View 	@1049
-					location   	(774, -1832)
-					label      	(object SegLabel @1051
-					    Parent_View 	@1050
-					    location   	(1462, 1525)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.444976
-					    height     	272
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D60318"
-					client     	@1049
-					supplier   	@1043
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1641)
-					label      	(object SegLabel @1052
-					    Parent_View 	@1050
-					    location   	(1143, 1527)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.454545
-					    height     	47
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$75" @1053
-					Parent_View 	@1049
-					location   	(774, -1832)
-					label      	(object SegLabel @1054
-					    Parent_View 	@1053
-					    location   	(1149, 1266)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D6030E"
-					client     	@1049
-					supplier   	@1036
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1223))))
-			    (object AssociationViewNew "$UNNAMED$192" @1055
-				location   	(1690, 1684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C35AD0374"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facetContents" @1056
-					Parent_View 	@1055
-					location   	(-326, -12)
-					label      	(object SegLabel @1057
-					    Parent_View 	@1056
-					    location   	(1695, 1731)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+facetContents"
-					    pctDist    	0.032051
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0010"
-					client     	@1055
-					supplier   	@1042
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1846, 1684)
-					label      	(object SegLabel @1058
-					    Parent_View 	@1056
-					    location   	(1756, 1644)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	94
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420732
-					    height     	41
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$193" @1059
-					Parent_View 	@1055
-					location   	(-326, -12)
-					label      	(object SegLabel @1060
-					    Parent_View 	@1059
-					    location   	(1566, 1643)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0006"
-					client     	@1055
-					supplier   	@1043
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1534, 1684))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1061
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2624, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1061
-				    location   	(2388, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @1062
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1062
-				    location   	(1108, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1063
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@1063
-				    location   	(557, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$172" @1064
-				location   	(963, 319)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B688E6B003D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1065
-					Parent_View 	@1064
-					location   	(595, -17)
-					label      	(object SegLabel @1066
-					    Parent_View 	@1065
-					    location   	(974, 361)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.081081
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0111"
-					client     	@1064
-					supplier   	@1062
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(1099, 319)
-					label      	(object SegLabel @1067
-					    Parent_View 	@1065
-					    location   	(1016, 290)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.396396
-					    height     	30
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$173" @1068
-					Parent_View 	@1064
-					location   	(595, -17)
-					label      	(object SegLabel @1069
-					    Parent_View 	@1068
-					    location   	(855, 361)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0107"
-					client     	@1064
-					supplier   	@1063
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(828, 319))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1070
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1070
-				    location   	(1974, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1071
-				location   	(2322, 1593)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1070
-				vertices   	(list Points
-				    (2322, 1593)
-				    (2322, 1047)))
-			    (object InheritView "" @1072
-				stereotype 	(object SegLabel @1073
-				    Parent_View 	@1072
-				    location   	(2146, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.460000
-				    height     	5
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2F5013A"
-				client     	@1070
-				supplier   	@1006
-				line_style 	3
-				origin_attachment 	(2150, 937)
-				terminal_attachment 	(2150, 868)
-				drawSupplier 	@1007)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1074
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1074
-				    location   	(510, 532)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	644
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	662
-				height     	112
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$118" @1075
-				location   	(1498, 1431)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68911401AF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1076
-					Parent_View 	@1075
-					location   	(1038, -1810)
-					label      	(object SegLabel @1077
-					    Parent_View 	@1076
-					    location   	(2027, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.454389
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150017"
-					client     	@1075
-					supplier   	@1070
-					vertices   	(list Points
-					    (1498, 1431)
-					    (2281, 1431)
-					    (2281, 1047))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(2281, 1047)
-					label      	(object SegLabel @1078
-					    Parent_View 	@1076
-					    location   	(2204, 1397)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.605419
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$119" @1079
-					Parent_View 	@1075
-					location   	(1038, -1810)
-					label      	(object SegLabel @1080
-					    Parent_View 	@1079
-					    location   	(1090, 866)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150016"
-					client     	@1075
-					supplier   	@1074
-					vertices   	(list Points
-					    (1498, 1431)
-					    (1131, 1431)
-					    (1131, 632))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(1131, 632))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @1081
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1081
-				    location   	(655, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	386
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	404
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @1082
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1082
-				    location   	(505, 853)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$122" @1083
-				location   	(534, 736)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "identityConstraintDefinitions" @1084
-					Parent_View 	@1083
-					location   	(86, -2144)
-					label      	(object SegLabel @1085
-					    Parent_View 	@1084
-					    location   	(820, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	550
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.111111
-					    height     	286
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@1083
-					supplier   	@1082
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 841)
-					label      	(object SegLabel @1086
-					    Parent_View 	@1084
-					    location   	(595, 807)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.675926
-					    height     	61
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$123" @1087
-					Parent_View 	@1083
-					location   	(86, -2144)
-					label      	(object SegLabel @1088
-					    Parent_View 	@1087
-					    location   	(576, 653)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@1083
-					supplier   	@1074
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 632))))
-			    (object AssociationViewNew "$UNNAMED$142" @1089
-				location   	(900, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "selector" @1090
-					Parent_View 	@1089
-					location   	(84, 120)
-					label      	(object SegLabel @1091
-					    Parent_View 	@1090
-					    location   	(1013, 1042)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.123288
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@1089
-					supplier   	@1081
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 1113)
-					label      	(object SegLabel @1092
-					    Parent_View 	@1090
-					    location   	(859, 1040)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.095890
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$143" @1093
-					Parent_View 	@1089
-					location   	(84, 120)
-					label      	(object SegLabel @1094
-					    Parent_View 	@1093
-					    location   	(859, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@1089
-					supplier   	@1082
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 951))))
-			    (object AssociationViewNew "$UNNAMED$144" @1095
-				location   	(700, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fields" @1096
-					Parent_View 	@1095
-					location   	(-116, 120)
-					label      	(object SegLabel @1097
-					    Parent_View 	@1096
-					    location   	(616, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.054795
-					    height     	85
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@1095
-					supplier   	@1081
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 1113)
-					label      	(object SegLabel @1098
-					    Parent_View 	@1096
-					    location   	(771, 1042)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.123077
-					    height     	71
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$145" @1099
-					Parent_View 	@1095
-					location   	(-116, 120)
-					label      	(object SegLabel @1100
-					    Parent_View 	@1099
-					    location   	(659, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@1095
-					supplier   	@1082
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 951))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @1101
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1101
-				    location   	(500, 1397)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1102
-				location   	(550, 1590)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1101
-				vertices   	(list Points
-				    (550, 1590)
-				    (550, 1495)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @1103
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1103
-				    location   	(1240, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1104
-				location   	(1406, 765)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1103
-				vertices   	(list Points
-				    (1406, 765)
-				    (1406, 631)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1105
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1105
-				    location   	(2393, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$100" @1106
-				location   	(1614, 1868)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6FDDD70113"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$101" @1107
-					Parent_View 	@1106
-					location   	(526, 476)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA026B"
-					client     	@1106
-					supplier   	@1105
-					vertices   	(list Points
-					    (1614, 1868)
-					    (2500, 1868)
-					    (2500, 1751))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(2500, 1751))
-				    (object RoleView "content" @1108
-					Parent_View 	@1106
-					location   	(526, 476)
-					label      	(object SegLabel @1109
-					    Parent_View 	@1108
-					    location   	(896, 1787)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.709870
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA0275"
-					client     	@1106
-					supplier   	@1101
-					vertices   	(list Points
-					    (1614, 1868)
-					    (984, 1868)
-					    (984, 1495))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(984, 1495)
-					label      	(object SegLabel @1110
-					    Parent_View 	@1108
-					    location   	(1042, 1824)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.571286
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$106" @1111
-				location   	(2927, 387)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B698E360386"
-				roleview_list 	(list RoleViews
-				    (object RoleView "attributeContents" @1112
-					Parent_View 	@1111
-					location   	(2463, -3757)
-					label      	(object SegLabel @1113
-					    Parent_View 	@1112
-					    location   	(1915, 357)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeContents"
-					    pctDist    	0.773060
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E38007C"
-					client     	@1111
-					supplier   	@1103
-					vertices   	(list Points
-					    (2927, 387)
-					    (1750, 387)
-					    (1750, 521))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(1750, 521)
-					label      	(object SegLabel @1114
-					    Parent_View 	@1112
-					    location   	(1804, 425)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.857247
-					    height     	38
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$107" @1115
-					Parent_View 	@1111
-					location   	(2463, -3757)
-					label      	(object SegLabel @1116
-					    Parent_View 	@1115
-					    location   	(2946, 1448)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E380072"
-					client     	@1111
-					supplier   	@1105
-					vertices   	(list Points
-					    (2927, 387)
-					    (2987, 387)
-					    (2987, 1671)
-					    (2928, 1671))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(2928, 1671))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1117
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1117
-				    location   	(1699, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$82" @1118
-				location   	(1750, 872)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69404E0067"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1119
-					Parent_View 	@1118
-					location   	(1462, -2392)
-					label      	(object SegLabel @1120
-					    Parent_View 	@1119
-					    location   	(1640, 691)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.751037
-					    height     	110
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69405002A5"
-					client     	@1118
-					supplier   	@1103
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 631)
-					label      	(object SegLabel @1121
-					    Parent_View 	@1119
-					    location   	(1814, 695)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.734440
-					    height     	64
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$83" @1122
-					Parent_View 	@1118
-					location   	(1462, -2392)
-					label      	(object SegLabel @1123
-					    Parent_View 	@1122
-					    location   	(1709, 1065)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B694050029B"
-					client     	@1118
-					supplier   	@1117
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 1113))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1124
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1124
-				    location   	(279, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$214" @1125
-				location   	(1252, 1896)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BEBDC870247"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$215" @1126
-					Parent_View 	@1125
-					location   	(708, 1288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C02F9"
-					client     	@1125
-					supplier   	@1105
-					vertices   	(list Points
-					    (1252, 1896)
-					    (2603, 1896)
-					    (2603, 1751))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(2603, 1751))
-				    (object RoleView "attributeWildcardContent" @1127
-					Parent_View 	@1125
-					location   	(708, 1288)
-					label      	(object SegLabel @1128
-					    Parent_View 	@1127
-					    location   	(682, 1858)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.381142
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C0303"
-					client     	@1125
-					supplier   	@1124
-					vertices   	(list Points
-					    (1252, 1896)
-					    (428, 1896)
-					    (428, 1223))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(428, 1223)
-					label      	(object SegLabel @1129
-					    Parent_View 	@1127
-					    location   	(382, 1860)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.575033
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$86" @1130
-				location   	(1199, 1321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C275D320220"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$87" @1131
-					Parent_View 	@1130
-					location   	(655, 713)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010C"
-					client     	@1130
-					supplier   	@1117
-					vertices   	(list Points
-					    (1199, 1321)
-					    (1897, 1321)
-					    (1897, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(1897, 1223))
-				    (object RoleView "attributeWildcardContent" @1132
-					Parent_View 	@1130
-					location   	(655, 713)
-					label      	(object SegLabel @1133
-					    Parent_View 	@1132
-					    location   	(857, 1279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.429569
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010D"
-					client     	@1130
-					supplier   	@1124
-					vertices   	(list Points
-					    (1199, 1321)
-					    (500, 1321)
-					    (500, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(500, 1223)
-					label      	(object SegLabel @1134
-					    Parent_View 	@1132
-					    location   	(576, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.782305
-					    height     	43
-					    orientation 	1))))
-			    (object InheritView "" @1135
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1105
-				supplier   	@1070
-				line_style 	3
-				origin_attachment 	(2606, 1641)
-				terminal_attachment 	(2606, 1593)
-				drawSupplier 	@1071)
-			    (object InheritView "" @1136
-				stereotype 	(object SegLabel @1137
-				    Parent_View 	@1136
-				    location   	(759, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.446429
-				    height     	6
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@1074
-				supplier   	@1013
-				line_style 	3
-				origin_attachment 	(753, 520)
-				terminal_attachment 	(753, 465)
-				drawSupplier 	@1014)
-			    (object InheritView "" @1138
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1043
-				supplier   	@1070
-				line_style 	3
-				origin_attachment 	(1409, 1641)
-				terminal_attachment 	(1409, 1593)
-				drawSupplier 	@1071)
-			    (object InheritView "" @1139
-				stereotype 	(object SegLabel @1140
-				    Parent_View 	@1139
-				    location   	(759, 1591)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	219
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.980392
-				    height     	385
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@1043
-				supplier   	@1101
-				line_style 	3
-				origin_attachment 	(1144, 1641)
-				terminal_attachment 	(1144, 1590)
-				drawSupplier 	@1102)
-			    (object InheritView "" @1141
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@1016
-				supplier   	@1013
-				line_style 	3
-				origin_attachment 	(166, 521)
-				terminal_attachment 	(166, 465)
-				drawSupplier 	@1014)
-			    (object InheritTreeView "" @1142
-				location   	(431, 222)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1029
-				vertices   	(list Points
-				    (431, 222)
-				    (431, 130)))
-			    (object InheritView "" @1143
-				stereotype 	(object SegLabel @1144
-				    Parent_View 	@1143
-				    location   	(361, 224)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	237
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.976744
-				    height     	86
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6BD2440069"
-				client     	@1013
-				supplier   	@1029
-				line_style 	3
-				origin_attachment 	(275, 265)
-				terminal_attachment 	(275, 222)
-				drawSupplier 	@1142)
-			    (object InheritTreeView "" @1145
-				location   	(1309, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1062
-				vertices   	(list Points
-				    (1309, 465)
-				    (1309, 375)))
-			    (object InheritView "" @1146
-				stereotype 	(object SegLabel @1147
-				    Parent_View 	@1146
-				    location   	(941, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.464286
-				    height     	10
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E660339"
-				client     	@1074
-				supplier   	@1062
-				line_style 	3
-				origin_attachment 	(931, 520)
-				terminal_attachment 	(931, 465)
-				drawSupplier 	@1145)
-			    (object InheritView "" @1148
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@1023
-				supplier   	@1101
-				line_style 	3
-				origin_attachment 	(250, 1641)
-				terminal_attachment 	(250, 1590)
-				drawSupplier 	@1102)
-			    (object InheritView "" @1149
-				stereotype 	(object SegLabel @1150
-				    Parent_View 	@1149
-				    location   	(1205, 493)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.958333
-				    height     	8
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E6103BE"
-				client     	@1036
-				supplier   	@1062
-				line_style 	3
-				origin_attachment 	(1197, 1113)
-				terminal_attachment 	(1197, 465)
-				drawSupplier 	@1145)
-			    (object InheritView "" @1151
-				stereotype 	(object SegLabel @1152
-				    Parent_View 	@1151
-				    location   	(1951, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.848980
-				    height     	73
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6AE2EB02A8"
-				client     	@1117
-				supplier   	@1006
-				line_style 	3
-				origin_attachment 	(1878, 1113)
-				terminal_attachment 	(1878, 868)
-				drawSupplier 	@1007)
-			    (object InheritView "" @1153
-				stereotype 	(object SegLabel @1154
-				    Parent_View 	@1153
-				    location   	(1642, 807)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.879310
-				    height     	61
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B69403A0221"
-				client     	@1117
-				supplier   	@1103
-				line_style 	3
-				origin_attachment 	(1703, 1113)
-				terminal_attachment 	(1703, 765)
-				drawSupplier 	@1104)
-			    (object InheritView "" @1155
-				stereotype 	(object SegLabel @1156
-				    Parent_View 	@1155
-				    location   	(1354, 801)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.500000
-				    height     	70
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B72D737038F"
-				client     	@1035
-				supplier   	@1103
-				line_style 	3
-				origin_attachment 	(1284, 837)
-				terminal_attachment 	(1284, 765)
-				drawSupplier 	@1104)
-			    (object InheritView "" @1157
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@1005
-				supplier   	@1061
-				line_style 	3
-				origin_attachment 	(2284, 762)
-				terminal_attachment 	(2379, 762))
-			    (object InheritView "" @1158
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@1004
-				supplier   	@1062
-				line_style 	3
-				origin_attachment 	(2637, 521)
-				terminal_attachment 	(2637, 465)
-				drawSupplier 	@1145)
-			    (object InheritView "" @1159
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1061
-				supplier   	@1004
-				line_style 	3
-				origin_attachment 	(2637, 729)
-				terminal_attachment 	(2637, 631))
-			    (object InheritView "" @1160
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@1006
-				supplier   	@1062
-				line_style 	3
-				origin_attachment 	(1950, 521)
-				terminal_attachment 	(1950, 465)
-				drawSupplier 	@1145)
-			    (object InheritView "" @1161
-				stereotype 	(object SegLabel @1162
-				    Parent_View 	@1161
-				    location   	(2821, 897)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	181
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.087719
-				    height     	76
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B688E4F023C"
-				client     	@1003
-				supplier   	@1062
-				line_style 	3
-				origin_attachment 	(2896, 937)
-				terminal_attachment 	(2896, 465)
-				drawSupplier 	@1145)
-			    (object InheritView "" @1163
-				stereotype 	(object SegLabel @1164
-				    Parent_View 	@1163
-				    location   	(2313, 904)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	207
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.850622
-				    height     	68
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2E20381"
-				client     	@1015
-				supplier   	@1006
-				line_style 	3
-				origin_attachment 	(2381, 1109)
-				terminal_attachment 	(2381, 868)
-				drawSupplier 	@1007)
-			    (object InheritView "" @1165
-				stereotype 	(object SegLabel @1166
-				    Parent_View 	@1165
-				    location   	(2878, 269)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.946667
-				    height     	66
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6BD2550385"
-				client     	@1015
-				supplier   	@1029
-				line_style 	3
-				origin_attachment 	(2943, 1109)
-				terminal_attachment 	(2943, 222)
-				drawSupplier 	@1142)
-			    (object InheritView "" @1167
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@1124
-				supplier   	@1013
-				line_style 	3
-				origin_attachment 	(462, 1113)
-				terminal_attachment 	(462, 465)
-				drawSupplier 	@1014)))
-		    (object ClassDiagram "9. Concrete Schema Composition"
-			quid       	"3C25EB7A038C"
-			title      	"9. Concrete Schema Composition"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1168
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1168
-				    location   	(73, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	480
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$124" @1169
-				location   	(228, 1695)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B41E60251"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$125" @1170
-					Parent_View 	@1169
-					location   	(-476, -385)
-					label      	(object SegLabel @1171
-					    Parent_View 	@1170
-					    location   	(217, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA02F7"
-					client     	@1169
-					supplier   	@1168
-					vertices   	(list Points
-					    (228, 1695)
-					    (175, 1695)
-					    (175, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(175, 1591))
-				    (object RoleView "resolvedElementDeclaration" @1172
-					Parent_View 	@1169
-					location   	(-476, -385)
-					label      	(object SegLabel @1173
-					    Parent_View 	@1172
-					    location   	(329, 1740)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedElementDeclaration"
-					    pctDist    	1.924528
-					    height     	45
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA030B"
-					client     	@1169
-					supplier   	@1168
-					vertices   	(list Points
-					    (228, 1695)
-					    (281, 1695)
-					    (281, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(281, 1591)
-					label      	(object SegLabel @1174
-					    Parent_View 	@1172
-					    location   	(229, 1646)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.005714
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1175
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1175
-				    location   	(790, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	500
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	518
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$160" @1176
-				location   	(952, 1698)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B42450398"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$161" @1177
-					Parent_View 	@1176
-					location   	(-1288, -318)
-					label      	(object SegLabel @1178
-					    Parent_View 	@1177
-					    location   	(860, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249038A"
-					client     	@1176
-					supplier   	@1175
-					vertices   	(list Points
-					    (952, 1698)
-					    (901, 1698)
-					    (901, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(901, 1591))
-				    (object RoleView "resolvedModelGroupDefinition" @1179
-					Parent_View 	@1176
-					location   	(-1288, -318)
-					label      	(object SegLabel @1180
-					    Parent_View 	@1179
-					    location   	(1020, 1739)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	564
-					    justify    	0
-					    label      	"+resolvedModelGroupDefinition"
-					    pctDist    	1.326923
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249039E"
-					client     	@1176
-					supplier   	@1175
-					vertices   	(list Points
-					    (952, 1698)
-					    (1004, 1698)
-					    (1004, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(1004, 1591)
-					label      	(object SegLabel @1181
-					    Parent_View 	@1179
-					    location   	(952, 1649)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.000000
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1182
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1182
-				    location   	(420, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1183
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1183
-				    location   	(412, 737)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	457
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	475
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1184
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 416)
-				label      	(object ItemLabel
-				    Parent_View 	@1184
-				    location   	(446, 285)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	406
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$224" @1185
-				location   	(1303, 679)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "incorporatedSchema" @1186
-					Parent_View 	@1185
-					location   	(-41, -857)
-					label      	(object SegLabel @1187
-					    Parent_View 	@1186
-					    location   	(1059, 381)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.700384
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@1185
-					supplier   	@1184
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 419)
-					    (843, 419))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(843, 419)
-					label      	(object SegLabel @1188
-					    Parent_View 	@1186
-					    location   	(922, 454)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.890746
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$225" @1189
-					Parent_View 	@1185
-					location   	(-41, -857)
-					label      	(object SegLabel @1190
-					    Parent_View 	@1189
-					    location   	(1045, 956)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@1185
-					supplier   	@1182
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 997)
-					    (901, 997))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(901, 997))))
-			    (object AssociationViewNew "$UNNAMED$222" @1191
-				location   	(1216, 649)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedSchema" @1192
-					Parent_View 	@1191
-					location   	(336, -1399)
-					label      	(object SegLabel @1193
-					    Parent_View 	@1192
-					    location   	(1038, 500)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.601923
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@1191
-					supplier   	@1184
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 534)
-					    (843, 534))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(843, 534)
-					label      	(object SegLabel @1194
-					    Parent_View 	@1192
-					    location   	(926, 577)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.831643
-					    height     	43
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$223" @1195
-					Parent_View 	@1191
-					location   	(336, -1399)
-					label      	(object SegLabel @1196
-					    Parent_View 	@1195
-					    location   	(974, 756)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@1191
-					supplier   	@1183
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 797)
-					    (877, 797))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(877, 797))))
-			    (object AssociationViewNew "$UNNAMED$228" @1197
-				location   	(662, 642)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25D3A60131"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencingDirectives" @1198
-					Parent_View 	@1197
-					location   	(-234, 114)
-					label      	(object SegLabel @1199
-					    Parent_View 	@1198
-					    location   	(878, 675)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+referencingDirectives"
-					    pctDist    	0.408759
-					    height     	216
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90371"
-					client     	@1197
-					supplier   	@1183
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 725)
-					label      	(object SegLabel @1200
-					    Parent_View 	@1198
-					    location   	(615, 678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.430657
-					    height     	48
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$229" @1201
-					Parent_View 	@1197
-					location   	(-234, 114)
-					label      	(object SegLabel @1202
-					    Parent_View 	@1201
-					    location   	(621, 576)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90370"
-					client     	@1197
-					supplier   	@1184
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 559))))
-			    (object AssociationViewNew "$UNNAMED$230" @1203
-				location   	(75, 188)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ECF0005E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$231" @1204
-					Parent_View 	@1203
-					location   	(-853, -308)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF4001E"
-					client     	@1203
-					supplier   	@1184
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 128)
-					    (510, 128)
-					    (510, 273))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(510, 273))
-				    (object RoleView "rootVersion" @1205
-					Parent_View 	@1203
-					location   	(-853, -308)
-					label      	(object SegLabel @1206
-					    Parent_View 	@1205
-					    location   	(176, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+rootVersion"
-					    pctDist    	-0.593750
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF40028"
-					client     	@1203
-					supplier   	@1184
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 380)
-					    (437, 380))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(437, 380)
-					label      	(object SegLabel @1207
-					    Parent_View 	@1205
-					    location   	(368, 328)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.874755
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$232" @1208
-				location   	(1262, 134)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ED0B011B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$233" @1209
-					Parent_View 	@1208
-					location   	(334, -362)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F0121"
-					client     	@1208
-					supplier   	@1184
-					vertices   	(list Points
-					    (1262, 134)
-					    (766, 134)
-					    (766, 273))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(766, 273))
-				    (object RoleView "originalVersion" @1210
-					Parent_View 	@1208
-					location   	(334, -362)
-					label      	(object SegLabel @1211
-					    Parent_View 	@1210
-					    location   	(1164, 97)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+originalVersion"
-					    pctDist    	-1.650000
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F012B"
-					client     	@1208
-					supplier   	@1184
-					vertices   	(list Points
-					    (1262, 134)
-					    (1322, 134)
-					    (1322, 334)
-					    (843, 334))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(843, 334)
-					label      	(object SegLabel @1212
-					    Parent_View 	@1210
-					    location   	(919, 279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898108
-					    height     	56
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$234" @1213
-				location   	(126, 656)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25EEAB001F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$235" @1214
-					Parent_View 	@1213
-					location   	(-834, 160)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF010B"
-					client     	@1213
-					supplier   	@1184
-					vertices   	(list Points
-					    (126, 656)
-					    (513, 656)
-					    (513, 559))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(513, 559))
-				    (object RoleView "incorporatedVersions" @1215
-					Parent_View 	@1213
-					location   	(-834, 160)
-					label      	(object SegLabel @1216
-					    Parent_View 	@1215
-					    location   	(217, 431)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+incorporatedVersions"
-					    pctDist    	0.643902
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF0115"
-					client     	@1213
-					supplier   	@1184
-					vertices   	(list Points
-					    (126, 656)
-					    (66, 656)
-					    (66, 472)
-					    (437, 472))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(437, 472)
-					label      	(object SegLabel @1217
-					    Parent_View 	@1215
-					    location   	(356, 526)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.868468
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$238" @1218
-				location   	(642, 126)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2784730194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$239" @1219
-					Parent_View 	@1218
-					location   	(82, -418)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501F1"
-					client     	@1218
-					supplier   	@1184
-					vertices   	(list Points
-					    (642, 126)
-					    (588, 126)
-					    (588, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(588, 273))
-				    (object RoleView "schemaForSchema" @1220
-					Parent_View 	@1218
-					location   	(82, -418)
-					label      	(object SegLabel @1221
-					    Parent_View 	@1220
-					    location   	(639, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+schemaForSchema"
-					    pctDist    	-0.055556
-					    height     	53
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501FB"
-					client     	@1218
-					supplier   	@1184
-					vertices   	(list Points
-					    (642, 126)
-					    (697, 126)
-					    (697, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(697, 273)
-					label      	(object SegLabel @1222
-					    Parent_View 	@1220
-					    location   	(643, 213)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.701863
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @1223
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1182
-				supplier   	@1183
-				line_style 	3
-				origin_attachment 	(638, 937)
-				terminal_attachment 	(638, 843))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1224
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1224
-				    location   	(67, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$78" @1225
-				location   	(234, 1340)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B426B0194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$79" @1226
-					Parent_View 	@1225
-					location   	(-310, -4)
-					label      	(object SegLabel @1227
-					    Parent_View 	@1226
-					    location   	(140, 1271)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0309"
-					client     	@1225
-					supplier   	@1224
-					vertices   	(list Points
-					    (234, 1340)
-					    (181, 1340)
-					    (181, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(181, 1239))
-				    (object RoleView "resolvedAttributeDeclaration" @1228
-					Parent_View 	@1225
-					location   	(-310, -4)
-					label      	(object SegLabel @1229
-					    Parent_View 	@1228
-					    location   	(333, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedAttributeDeclaration"
-					    pctDist    	1.867925
-					    height     	49
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0313"
-					client     	@1225
-					supplier   	@1224
-					vertices   	(list Points
-					    (234, 1340)
-					    (287, 1340)
-					    (287, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(287, 1239)
-					label      	(object SegLabel @1230
-					    Parent_View 	@1228
-					    location   	(241, 1295)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.042945
-					    height     	46
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1231
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1760, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@1231
-				    location   	(1517, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	486
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	504
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1232
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1232
-				    location   	(1599, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	226
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C359403D2"
-				width      	244
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$312" @1233
-				location   	(1668, 280)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4AE01CC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$313" @1234
-					Parent_View 	@1233
-					location   	(8, -152)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF010F"
-					client     	@1233
-					supplier   	@1231
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 199))
-				    (object RoleView "syntheticFacets" @1235
-					Parent_View 	@1233
-					location   	(8, -152)
-					label      	(object SegLabel @1236
-					    Parent_View 	@1235
-					    location   	(1852, 300)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+syntheticFacets"
-					    pctDist    	0.246154
-					    height     	184
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF011A"
-					client     	@1233
-					supplier   	@1232
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 361)
-					label      	(object SegLabel @1237
-					    Parent_View 	@1235
-					    location   	(1625, 301)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.276923
-					    height     	44
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1238
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1238
-				    location   	(1426, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1239
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@1239
-				    location   	(1515, 597)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$314" @1240
-				location   	(1508, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D3028E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$315" @1241
-					Parent_View 	@1240
-					location   	(-12, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402F3"
-					client     	@1240
-					supplier   	@1239
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 695))
-				    (object RoleView "syntheticParticle" @1242
-					Parent_View 	@1240
-					location   	(-12, -280)
-					label      	(object SegLabel @1243
-					    Parent_View 	@1242
-					    location   	(1695, 767)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+syntheticParticle"
-					    pctDist    	-0.259259
-					    height     	187
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402FD"
-					client     	@1240
-					supplier   	@1238
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 889)
-					label      	(object SegLabel @1244
-					    Parent_View 	@1242
-					    location   	(1454, 829)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.395062
-					    height     	55
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1245
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1245
-				    location   	(756, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$90" @1246
-				location   	(919, 1349)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B425E01F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$91" @1247
-					Parent_View 	@1246
-					location   	(-233, -59)
-					label      	(object SegLabel @1248
-					    Parent_View 	@1247
-					    location   	(825, 1273)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620046"
-					client     	@1246
-					supplier   	@1245
-					vertices   	(list Points
-					    (919, 1349)
-					    (866, 1349)
-					    (866, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(866, 1239))
-				    (object RoleView "resolvedAttributeGroupDefinition" @1249
-					Parent_View 	@1246
-					location   	(-233, -59)
-					label      	(object SegLabel @1250
-					    Parent_View 	@1249
-					    location   	(993, 1393)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	600
-					    justify    	0
-					    label      	"+resolvedAttributeGroupDefinition"
-					    pctDist    	1.377358
-					    height     	44
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620050"
-					client     	@1246
-					supplier   	@1245
-					vertices   	(list Points
-					    (919, 1349)
-					    (973, 1349)
-					    (973, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(973, 1239)
-					label      	(object SegLabel @1251
-					    Parent_View 	@1249
-					    location   	(919, 1296)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.014925
-					    height     	54
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1252
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1952, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1252
-				    location   	(1816, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	290
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$316" @1253
-				location   	(2025, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D901F6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$317" @1254
-					Parent_View 	@1253
-					location   	(153, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA0284"
-					client     	@1253
-					supplier   	@1239
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 695))
-				    (object RoleView "syntheticWildcard" @1255
-					Parent_View 	@1253
-					location   	(153, -280)
-					label      	(object SegLabel @1256
-					    Parent_View 	@1255
-					    location   	(1826, 838)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.488095
-					    height     	200
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA028E"
-					client     	@1253
-					supplier   	@1252
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 889)
-					label      	(object SegLabel @1257
-					    Parent_View 	@1255
-					    location   	(2098, 840)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.506173
-					    height     	73
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$318" @1258
-				location   	(1754, 1178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C68FF01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$319" @1259
-					Parent_View 	@1258
-					location   	(-198, 234)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020317"
-					client     	@1258
-					supplier   	@1245
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(1301, 1178))
-				    (object RoleView "syntheticWildcard" @1260
-					Parent_View 	@1258
-					location   	(-198, 234)
-					label      	(object SegLabel @1261
-					    Parent_View 	@1260
-					    location   	(1828, 1261)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.163355
-					    height     	83
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020318"
-					client     	@1258
-					supplier   	@1252
-					vertices   	(list Points
-					    (1754, 1178)
-					    (2028, 1178)
-					    (2028, 999))
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(2028, 999)
-					label      	(object SegLabel @1262
-					    Parent_View 	@1260
-					    location   	(2082, 1098)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783664
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "10. Diagnostics"
-			quid       	"3BFE5F0803E2"
-			title      	"10. Diagnostics"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @1263
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(400, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@1263
-				    location   	(66, 990)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1263
-				    location   	(66, 940)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnosticSeverity" @1264
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@1264
-				    location   	(818, 547)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDDiagnosticSeverity")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1264
-				    location   	(818, 497)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BFE68A7032F"
-				width      	462
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1265
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1265
-				    location   	(59, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1266
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(896, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1266
-				    location   	(540, 62)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	713
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	731
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1267
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@1267
-				    location   	(64, 402)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	658
-				height     	436
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$220" @1268
-				location   	(144, 283)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE6431035F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$221" @1269
-					Parent_View 	@1268
-					location   	(-1088, -661)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C6"
-					client     	@1268
-					supplier   	@1265
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 176))
-				    (object RoleView "allDiagnostics" @1270
-					Parent_View 	@1268
-					location   	(-1088, -661)
-					label      	(object SegLabel @1271
-					    Parent_View 	@1270
-					    location   	(309, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+allDiagnostics"
-					    pctDist    	0.448598
-					    height     	165
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C7"
-					client     	@1268
-					supplier   	@1267
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 390)
-					label      	(object SegLabel @1272
-					    Parent_View 	@1270
-					    location   	(96, 327)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420561
-					    height     	49
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$216" @1273
-				location   	(1028, 440)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE622703CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$217" @1274
-					Parent_View 	@1273
-					location   	(-396, -72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B0061"
-					client     	@1273
-					supplier   	@1267
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(713, 440))
-				    (object RoleView "components" @1275
-					Parent_View 	@1273
-					location   	(-396, -72)
-					label      	(object SegLabel @1276
-					    Parent_View 	@1275
-					    location   	(938, 230)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+components"
-					    pctDist    	0.829181
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B006C"
-					client     	@1273
-					supplier   	@1266
-					vertices   	(list Points
-					    (1028, 440)
-					    (1088, 440)
-					    (1088, 174))
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(1088, 174)
-					label      	(object SegLabel @1277
-					    Parent_View 	@1275
-					    location   	(1143, 232)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.823848
-					    height     	55
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$218" @1278
-				location   	(688, 282)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE62690165"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$219" @1279
-					Parent_View 	@1278
-					location   	(160, -278)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0026"
-					client     	@1278
-					supplier   	@1266
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 174))
-				    (object RoleView "diagnostics" @1280
-					Parent_View 	@1278
-					location   	(160, -278)
-					label      	(object SegLabel @1281
-					    Parent_View 	@1280
-					    location   	(822, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+diagnostics"
-					    pctDist    	0.452632
-					    height     	134
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0027"
-					client     	@1278
-					supplier   	@1267
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 390)
-					label      	(object SegLabel @1282
-					    Parent_View 	@1280
-					    location   	(645, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.494737
-					    height     	44
-					    orientation 	1))))
-			    (object InheritView "" @1283
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C0F4C01A1"
-				client     	@1267
-				supplier   	@1266
-				line_style 	3
-				origin_attachment 	(575, 390)
-				terminal_attachment 	(575, 174))))
-		    (object ClassDiagram "11. Supplemental"
-			quid       	"3C287E49019B"
-			title      	"11. Supplemental"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1284
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(464, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@1284
-				    location   	(47, 760)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	834
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	852
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1285
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2112, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@1285
-				    location   	(1731, 824)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	762
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	780
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1286
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1286
-				    location   	(48, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	498
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1287
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2384, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1287
-				    location   	(2236, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	314
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$242" @1288
-				location   	(1382, 84)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2882C50137"
-				roleview_list 	(list RoleViews
-				    (object RoleView "primaryComponent" @1289
-					Parent_View 	@1288
-					location   	(-250, -508)
-					label      	(object SegLabel @1290
-					    Parent_View 	@1289
-					    location   	(756, 116)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+primaryComponent"
-					    pctDist    	0.740828
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70113"
-					client     	@1288
-					supplier   	@1286
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(537, 84)
-					label      	(object SegLabel @1291
-					    Parent_View 	@1289
-					    location   	(624, 55)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.897260
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$243" @1292
-					Parent_View 	@1288
-					location   	(-250, -508)
-					label      	(object SegLabel @1293
-					    Parent_View 	@1292
-					    location   	(2058, 126)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70112"
-					client     	@1288
-					supplier   	@1287
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(2227, 84))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1294
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@1294
-				    location   	(1778, 607)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	764
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@1294
-				    location   	(1778, 667)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	764
-				    compartmentItems 	(list Compartment
-					"+ elementDeclarationReference : boolean"
-					"+ circular : boolean"))
-				width      	782
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1295
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1072)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1295
-				    location   	(2100, 991)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@1295
-				    location   	(2100, 1051)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	459
-				    compartmentItems 	(list Compartment
-					"+ facetName : String"
-					"+ effectiveValue : Value"))
-				width      	458
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1296
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@1296
-				    location   	(47, 568)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	802
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				compartment 	(object Compartment
-				    Parent_View 	@1296
-				    location   	(47, 628)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	805
-				    compartmentItems 	(list Compartment
-					"+ modelGroupDefinitionReference : boolean"))
-				width      	820
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @1297
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 288)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1297
-				    location   	(1005, 157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	454
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@1297
-				    location   	(1005, 217)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	4
-				    max_width  	392
-				    compartmentItems 	(list Compartment
-					"+ aliasName : String"
-					"+ uRI : String"
-					"+ aliasURI : String"
-					"+ qName : String"))
-				width      	472
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @1298
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 352)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1298
-				    location   	(48, 296)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1299
-				location   	(320, 510)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1298
-				vertices   	(list Points
-				    (320, 510)
-				    (320, 420)))
-			    (object InheritView "" @1300
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@1296
-				supplier   	@1298
-				line_style 	3
-				origin_attachment 	(81, 556)
-				terminal_attachment 	(81, 510)
-				drawSupplier 	@1299)
-			    (object InheritView "" @1301
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@1284
-				supplier   	@1298
-				line_style 	3
-				origin_attachment 	(877, 748)
-				terminal_attachment 	(877, 510)
-				drawSupplier 	@1299)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @1302
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1808)
-				label      	(object ItemLabel
-				    Parent_View 	@1302
-				    location   	(2101, 1761)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	456
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @1303
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1776)
-				label      	(object ItemLabel
-				    Parent_View 	@1303
-				    location   	(35, 1729)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	493
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @1304
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@1304
-				    location   	(35, 1889)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	493
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @1305
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@1305
-				    location   	(2073, 1917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @1306
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@1306
-				    location   	(2134, 1372)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @1307
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@1307
-				    location   	(2163, 1212)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	396
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @1308
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 1392)
-				label      	(object ItemLabel
-				    Parent_View 	@1308
-				    location   	(43, 1340)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	380
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @1309
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1232)
-				label      	(object ItemLabel
-				    Parent_View 	@1309
-				    location   	(49, 1178)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	382
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	400
-				height     	132
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @1310
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1616)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1310
-				    location   	(2135, 1535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@1310
-				    location   	(2135, 1595)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	405
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @1311
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2288)
-				label      	(object ItemLabel
-				    Parent_View 	@1311
-				    location   	(2102, 2236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	436
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	454
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @1312
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 2624)
-				label      	(object ItemLabel
-				    Parent_View 	@1312
-				    location   	(2074, 2572)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	478
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @1313
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 2128)
-				label      	(object ItemLabel
-				    Parent_View 	@1313
-				    location   	(2196, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	362
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @1314
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@1314
-				    location   	(36, 2044)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	458
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @1315
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@1315
-				    location   	(38, 2220)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	340
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	358
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @1316
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1584)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1316
-				    location   	(38, 1503)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@1316
-				    location   	(38, 1563)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	405
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	422
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @1317
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2464)
-				label      	(object ItemLabel
-				    Parent_View 	@1317
-				    location   	(2111, 2412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @1318
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2448)
-				label      	(object ItemLabel
-				    Parent_View 	@1318
-				    location   	(39, 2396)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	420
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @1319
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2608)
-				label      	(object ItemLabel
-				    Parent_View 	@1319
-				    location   	(38, 2556)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1320
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@1320
-				    location   	(667, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1321
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 1072)
-				label      	(object ItemLabel
-				    Parent_View 	@1321
-				    location   	(50, 1020)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1322
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@1322
-				    location   	(944, 1304)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	576
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@1322
-				    location   	(944, 1364)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	575
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + validFacets : String"))
-				width      	594
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$254" @1323
-				location   	(1446, 1218)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A994030A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1324
-					Parent_View 	@1323
-					location   	(582, -78)
-					label      	(object SegLabel @1325
-					    Parent_View 	@1324
-					    location   	(1580, 1173)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	3.268293
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700DD"
-					client     	@1323
-					supplier   	@1322
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1487, 1218)
-					    (1487, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1487, 1292)
-					label      	(object SegLabel @1326
-					    Parent_View 	@1324
-					    location   	(1439, 1257)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.184211
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$255" @1327
-					Parent_View 	@1323
-					location   	(582, -78)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700E7"
-					client     	@1323
-					supplier   	@1322
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1405, 1218)
-					    (1405, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1405, 1292))))
-			    (object AssociationViewNew "$UNNAMED$258" @1328
-				location   	(1733, 1575)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B08D0252"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$259" @1329
-					Parent_View 	@1328
-					location   	(917, 7)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E0091"
-					client     	@1328
-					supplier   	@1322
-					vertices   	(list Points
-					    (1733, 1575)
-					    (1487, 1575)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "maxFacet" @1330
-					Parent_View 	@1328
-					location   	(917, 7)
-					label      	(object SegLabel @1331
-					    Parent_View 	@1330
-					    location   	(1751, 1541)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+maxFacet"
-					    pctDist    	0.046243
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E009B"
-					client     	@1328
-					supplier   	@1310
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(2126, 1575)
-					label      	(object SegLabel @1332
-					    Parent_View 	@1330
-					    location   	(2042, 1536)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.789157
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$260" @1333
-				location   	(1587, 1793)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AB0396"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$261" @1334
-					Parent_View 	@1333
-					location   	(707, -31)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03C9"
-					client     	@1333
-					supplier   	@1322
-					vertices   	(list Points
-					    (1587, 1793)
-					    (1447, 1793)
-					    (1447, 1428))
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(1447, 1428))
-				    (object RoleView "maxInclusiveFacet" @1335
-					Parent_View 	@1333
-					location   	(707, -31)
-					label      	(object SegLabel @1336
-					    Parent_View 	@1335
-					    location   	(1737, 1751)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+maxInclusiveFacet"
-					    pctDist    	0.298441
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03D4"
-					client     	@1333
-					supplier   	@1302
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(2092, 1793)
-					label      	(object SegLabel @1337
-					    Parent_View 	@1335
-					    location   	(2020, 1754)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.859155
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$262" @1338
-				location   	(937, 1787)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AF0338"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$263" @1339
-					Parent_View 	@1338
-					location   	(617, -5)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B001F9"
-					client     	@1338
-					supplier   	@1322
-					vertices   	(list Points
-					    (937, 1787)
-					    (997, 1787)
-					    (997, 1428))
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(997, 1428))
-				    (object RoleView "minInclusiveFacet" @1340
-					Parent_View 	@1338
-					location   	(617, -5)
-					label      	(object SegLabel @1341
-					    Parent_View 	@1340
-					    location   	(792, 1745)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+minInclusiveFacet"
-					    pctDist    	0.346062
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B00203"
-					client     	@1338
-					supplier   	@1303
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(518, 1787)
-					label      	(object SegLabel @1342
-					    Parent_View 	@1340
-					    location   	(575, 1743)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863962
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$264" @1343
-				location   	(981, 1937)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B30207"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$265" @1344
-					Parent_View 	@1343
-					location   	(677, -79)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B40190"
-					client     	@1343
-					supplier   	@1322
-					vertices   	(list Points
-					    (981, 1937)
-					    (1041, 1937)
-					    (1041, 1428))
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(1041, 1428))
-				    (object RoleView "minExclusiveFacet" @1345
-					Parent_View 	@1343
-					location   	(677, -79)
-					label      	(object SegLabel @1346
-					    Parent_View 	@1345
-					    location   	(823, 1900)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+minExclusiveFacet"
-					    pctDist    	0.341253
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B4019A"
-					client     	@1343
-					supplier   	@1304
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(518, 1937)
-					label      	(object SegLabel @1347
-					    Parent_View 	@1345
-					    location   	(589, 1897)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.846652
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$266" @1348
-				location   	(1469, 1953)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B6028D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$267" @1349
-					Parent_View 	@1348
-					location   	(621, -95)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70217"
-					client     	@1348
-					supplier   	@1322
-					vertices   	(list Points
-					    (1469, 1953)
-					    (1400, 1953)
-					    (1400, 1428))
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(1400, 1428))
-				    (object RoleView "maxExclusiveFacet" @1350
-					Parent_View 	@1348
-					location   	(621, -95)
-					label      	(object SegLabel @1351
-					    Parent_View 	@1350
-					    location   	(1646, 1913)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+maxExclusiveFacet"
-					    pctDist    	0.298097
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70221"
-					client     	@1348
-					supplier   	@1305
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(2064, 1953)
-					label      	(object SegLabel @1352
-					    Parent_View 	@1350
-					    location   	(1961, 1913)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.827236
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$268" @1353
-				location   	(1122, 2180)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BC0051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$269" @1354
-					Parent_View 	@1353
-					location   	(-318, 628)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0246"
-					client     	@1353
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "lengthFacet" @1355
-					Parent_View 	@1353
-					location   	(-318, 628)
-					label      	(object SegLabel @1356
-					    Parent_View 	@1355
-					    location   	(804, 2204)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+lengthFacet"
-					    pctDist    	0.475472
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0250"
-					client     	@1353
-					supplier   	@1315
-					vertices   	(list Points
-					    (1122, 2180)
-					    (1122, 2240)
-					    (387, 2240))
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(387, 2240)
-					label      	(object SegLabel @1357
-					    Parent_View 	@1355
-					    location   	(471, 2204)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.895597
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$272" @1358
-				location   	(1084, 1989)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C2021D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$273" @1359
-					Parent_View 	@1358
-					location   	(-1380, 437)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AB"
-					client     	@1358
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "enumerationFacets" @1360
-					Parent_View 	@1358
-					location   	(-1380, 437)
-					label      	(object SegLabel @1361
-					    Parent_View 	@1360
-					    location   	(837, 2016)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+enumerationFacets"
-					    pctDist    	0.465857
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AC"
-					client     	@1358
-					supplier   	@1314
-					vertices   	(list Points
-					    (1084, 1989)
-					    (1084, 2049)
-					    (485, 2049))
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(485, 2049)
-					label      	(object SegLabel @1362
-					    Parent_View 	@1360
-					    location   	(583, 2021)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.851290
-					    height     	29
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$274" @1363
-				location   	(1451, 2074)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C50159"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$275" @1364
-					Parent_View 	@1363
-					location   	(-1525, 538)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600B0"
-					client     	@1363
-					supplier   	@1322
-					vertices   	(list Points
-					    (1451, 2074)
-					    (1362, 2074)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "patternFacets" @1365
-					Parent_View 	@1363
-					location   	(-1525, 538)
-					label      	(object SegLabel @1366
-					    Parent_View 	@1365
-					    location   	(1720, 2038)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+patternFacets"
-					    pctDist    	0.367223
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600BA"
-					client     	@1363
-					supplier   	@1313
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(2187, 2074)
-					label      	(object SegLabel @1367
-					    Parent_View 	@1365
-					    location   	(1972, 2035)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.708649
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$276" @1368
-				location   	(1827, 1400)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C802A7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$277" @1369
-					Parent_View 	@1368
-					location   	(-1149, -472)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901EA"
-					client     	@1368
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(1529, 1400))
-				    (object RoleView "cardinalityFacet" @1370
-					Parent_View 	@1368
-					location   	(-1149, -472)
-					label      	(object SegLabel @1371
-					    Parent_View 	@1370
-					    location   	(1847, 1358)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+cardinalityFacet"
-					    pctDist    	0.071730
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901F5"
-					client     	@1368
-					supplier   	@1306
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(2125, 1400)
-					label      	(object SegLabel @1372
-					    Parent_View 	@1370
-					    location   	(2083, 1357)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.863426
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$286" @1373
-				location   	(1262, 2413)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DB0377"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$287" @1374
-					Parent_View 	@1373
-					location   	(-786, 301)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC035A"
-					client     	@1373
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "fractionDigitsFacet" @1375
-					Parent_View 	@1373
-					location   	(-786, 301)
-					label      	(object SegLabel @1376
-					    Parent_View 	@1375
-					    location   	(1608, 2556)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+fractionDigitsFacet"
-					    pctDist    	0.537393
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC0364"
-					client     	@1373
-					supplier   	@1312
-					vertices   	(list Points
-					    (1262, 2413)
-					    (1262, 2596)
-					    (2065, 2596))
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(2065, 2596)
-					label      	(object SegLabel @1377
-					    Parent_View 	@1375
-					    location   	(1979, 2556)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913886
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$290" @1378
-				location   	(1841, 1306)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0E300D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$291" @1379
-					Parent_View 	@1378
-					location   	(-1135, -790)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E4038E"
-					client     	@1378
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(1529, 1306))
-				    (object RoleView "boundedFacet" @1380
-					Parent_View 	@1378
-					location   	(-1135, -790)
-					label      	(object SegLabel @1381
-					    Parent_View 	@1380
-					    location   	(1832, 1270)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+boundedFacet"
-					    pctDist    	-0.031746
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E40398"
-					client     	@1378
-					supplier   	@1307
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(2154, 1306)
-					label      	(object SegLabel @1382
-					    Parent_View 	@1380
-					    location   	(2077, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.754717
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$270" @1383
-				location   	(1328, 2186)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BF018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$271" @1384
-					Parent_View 	@1383
-					location   	(-640, 634)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C0006B"
-					client     	@1383
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "whiteSpaceFacet" @1385
-					Parent_View 	@1383
-					location   	(-640, 634)
-					label      	(object SegLabel @1386
-					    Parent_View 	@1385
-					    location   	(1673, 2207)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+whiteSpaceFacet"
-					    pctDist    	0.490909
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C00075"
-					client     	@1383
-					supplier   	@1311
-					vertices   	(list Points
-					    (1328, 2186)
-					    (1328, 2246)
-					    (2093, 2246))
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(2093, 2246)
-					label      	(object SegLabel @1387
-					    Parent_View 	@1385
-					    location   	(2033, 2203)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926763
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$288" @1388
-				location   	(674, 1390)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DF0048"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$289" @1389
-					Parent_View 	@1388
-					location   	(-1854, -706)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03B9"
-					client     	@1388
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(935, 1390))
-				    (object RoleView "orderedFacet" @1390
-					Parent_View 	@1388
-					location   	(-1854, -706)
-					label      	(object SegLabel @1391
-					    Parent_View 	@1390
-					    location   	(658, 1353)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+orderedFacet"
-					    pctDist    	0.061538
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03C3"
-					client     	@1388
-					supplier   	@1308
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(414, 1390)
-					label      	(object SegLabel @1392
-					    Parent_View 	@1390
-					    location   	(510, 1355)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.634615
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$278" @1393
-				location   	(687, 1296)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CB039C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$279" @1394
-					Parent_View 	@1393
-					location   	(-1809, -576)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D0"
-					client     	@1393
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(935, 1296))
-				    (object RoleView "numericFacet" @1395
-					Parent_View 	@1393
-					location   	(-1809, -576)
-					label      	(object SegLabel @1396
-					    Parent_View 	@1395
-					    location   	(668, 1257)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+numericFacet"
-					    pctDist    	0.080972
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D1"
-					client     	@1393
-					supplier   	@1309
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(440, 1296)
-					label      	(object SegLabel @1397
-					    Parent_View 	@1395
-					    location   	(506, 1260)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.736842
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$292" @1398
-				location   	(1689, 1662)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B44401EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$293" @1399
-					Parent_View 	@1398
-					location   	(-183, -354)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B4450360"
-					client     	@1398
-					supplier   	@1322
-					vertices   	(list Points
-					    (1689, 1662)
-					    (1487, 1662)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "effectiveMaxFacet" @1400
-					Parent_View 	@1398
-					location   	(-183, -354)
-					label      	(object SegLabel @1401
-					    Parent_View 	@1400
-					    location   	(1769, 1623)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+effectiveMaxFacet"
-					    pctDist    	0.182051
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B445036A"
-					client     	@1398
-					supplier   	@1310
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(2126, 1662)
-					label      	(object SegLabel @1402
-					    Parent_View 	@1400
-					    location   	(2044, 1627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.815385
-					    height     	36
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$294" @1403
-				location   	(1328, 2258)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B54F0145"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$295" @1404
-					Parent_View 	@1403
-					location   	(-1072, -462)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B550038C"
-					client     	@1403
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "effectiveWhiteSpaceFacet" @1405
-					Parent_View 	@1403
-					location   	(-1072, -462)
-					label      	(object SegLabel @1406
-					    Parent_View 	@1405
-					    location   	(1685, 2288)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+effectiveWhiteSpaceFacet"
-					    pctDist    	0.508541
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5500396"
-					client     	@1403
-					supplier   	@1311
-					vertices   	(list Points
-					    (1328, 2258)
-					    (1328, 2324)
-					    (2093, 2324))
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(2093, 2324)
-					label      	(object SegLabel @1407
-					    Parent_View 	@1405
-					    location   	(2009, 2293)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898817
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$296" @1408
-				location   	(1297, 2366)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B5C4011C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$297" @1409
-					Parent_View 	@1408
-					location   	(-607, -722)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C5020D"
-					client     	@1408
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "effectiveMaxLengthFacet" @1410
-					Parent_View 	@1408
-					location   	(-607, -722)
-					label      	(object SegLabel @1411
-					    Parent_View 	@1410
-					    location   	(1657, 2463)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+effectiveMaxLengthFacet"
-					    pctDist    	0.526906
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C50217"
-					client     	@1408
-					supplier   	@1317
-					vertices   	(list Points
-					    (1297, 2366)
-					    (1297, 2499)
-					    (2102, 2499))
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(2102, 2499)
-					label      	(object SegLabel @1412
-					    Parent_View 	@1410
-					    location   	(2007, 2471)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.899308
-					    height     	29
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$298" @1413
-				location   	(1262, 2449)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B62A00AA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$299" @1414
-					Parent_View 	@1413
-					location   	(-1170, -815)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0138"
-					client     	@1413
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "effectiveFractionDigitsFacet" @1415
-					Parent_View 	@1413
-					location   	(-1170, -815)
-					label      	(object SegLabel @1416
-					    Parent_View 	@1415
-					    location   	(1640, 2634)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+effectiveFractionDigitsFacet"
-					    pctDist    	0.585315
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0142"
-					client     	@1413
-					supplier   	@1312
-					vertices   	(list Points
-					    (1262, 2449)
-					    (1262, 2668)
-					    (2065, 2668))
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(2065, 2668)
-					label      	(object SegLabel @1417
-					    Parent_View 	@1415
-					    location   	(1989, 2629)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926485
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$300" @1418
-				location   	(1422, 2159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B6B003A6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$301" @1419
-					Parent_View 	@1418
-					location   	(-770, -1313)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10311"
-					client     	@1418
-					supplier   	@1322
-					vertices   	(list Points
-					    (1422, 2159)
-					    (1362, 2159)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "effectivePatternFacet" @1420
-					Parent_View 	@1418
-					location   	(-770, -1313)
-					label      	(object SegLabel @1421
-					    Parent_View 	@1420
-					    location   	(1727, 2125)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+effectivePatternFacet"
-					    pctDist    	0.399090
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10312"
-					client     	@1418
-					supplier   	@1313
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(2187, 2159)
-					label      	(object SegLabel @1422
-					    Parent_View 	@1420
-					    location   	(2102, 2119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.889226
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$302" @1423
-				location   	(1084, 2083)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B7CA026B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$303" @1424
-					Parent_View 	@1423
-					location   	(828, -1373)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0186"
-					client     	@1423
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "effectiveEnumerationFacet" @1425
-					Parent_View 	@1423
-					location   	(828, -1373)
-					label      	(object SegLabel @1426
-					    Parent_View 	@1425
-					    location   	(822, 2101)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+effectiveEnumerationFacet"
-					    pctDist    	0.488619
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0190"
-					client     	@1423
-					supplier   	@1314
-					vertices   	(list Points
-					    (1084, 2083)
-					    (1084, 2143)
-					    (485, 2143))
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(485, 2143)
-					label      	(object SegLabel @1427
-					    Parent_View 	@1425
-					    location   	(531, 2100)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.931715
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$308" @1428
-				location   	(1122, 2241)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8DC0052"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$309" @1429
-					Parent_View 	@1428
-					location   	(866, -479)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03B9"
-					client     	@1428
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "effectiveLengthFacet" @1430
-					Parent_View 	@1428
-					location   	(866, -479)
-					label      	(object SegLabel @1431
-					    Parent_View 	@1430
-					    location   	(800, 2279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+effectiveLengthFacet"
-					    pctDist    	0.491731
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03C3"
-					client     	@1428
-					supplier   	@1315
-					vertices   	(list Points
-					    (1122, 2241)
-					    (1122, 2318)
-					    (387, 2318))
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(387, 2318)
-					label      	(object SegLabel @1432
-					    Parent_View 	@1430
-					    location   	(470, 2279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898567
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$256" @1433
-				location   	(773, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B085025B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$257" @1434
-					Parent_View 	@1433
-					location   	(469, 13)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0860270"
-					client     	@1433
-					supplier   	@1322
-					vertices   	(list Points
-					    (773, 1565)
-					    (959, 1565)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "minFacet" @1435
-					Parent_View 	@1433
-					location   	(469, 13)
-					label      	(object SegLabel @1436
-					    Parent_View 	@1435
-					    location   	(753, 1532)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+minFacet"
-					    pctDist    	0.063091
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B086027A"
-					client     	@1433
-					supplier   	@1316
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(451, 1565)
-					label      	(object SegLabel @1437
-					    Parent_View 	@1435
-					    location   	(534, 1523)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.746667
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$310" @1438
-				location   	(816, 1650)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B97001DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$311" @1439
-					Parent_View 	@1438
-					location   	(496, -334)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100CF"
-					client     	@1438
-					supplier   	@1322
-					vertices   	(list Points
-					    (816, 1650)
-					    (959, 1650)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "effectiveMinFacet" @1440
-					Parent_View 	@1438
-					location   	(496, -334)
-					label      	(object SegLabel @1441
-					    Parent_View 	@1440
-					    location   	(764, 1614)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+effectiveMinFacet"
-					    pctDist    	0.141618
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100D9"
-					client     	@1438
-					supplier   	@1316
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(451, 1650)
-					label      	(object SegLabel @1442
-					    Parent_View 	@1440
-					    location   	(523, 1606)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.802740
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$280" @1443
-				location   	(1297, 2321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CF0199"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$281" @1444
-					Parent_View 	@1443
-					location   	(-719, 497)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D20085"
-					client     	@1443
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "maxLengthFacet" @1445
-					Parent_View 	@1443
-					location   	(-719, 497)
-					label      	(object SegLabel @1446
-					    Parent_View 	@1445
-					    location   	(1630, 2380)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+maxLengthFacet"
-					    pctDist    	0.472255
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D2008F"
-					client     	@1443
-					supplier   	@1317
-					vertices   	(list Points
-					    (1297, 2321)
-					    (1297, 2409)
-					    (2102, 2409))
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(2102, 2409)
-					label      	(object SegLabel @1447
-					    Parent_View 	@1445
-					    location   	(1994, 2366)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.879208
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$282" @1448
-				location   	(1159, 2273)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D500C5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$283" @1449
-					Parent_View 	@1448
-					location   	(-281, 449)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D6001D"
-					client     	@1448
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(1159, 1428))
-				    (object RoleView "minLengthFacet" @1450
-					Parent_View 	@1448
-					location   	(-281, 449)
-					label      	(object SegLabel @1451
-					    Parent_View 	@1450
-					    location   	(857, 2372)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+minLengthFacet"
-					    pctDist    	0.519527
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D60027"
-					client     	@1448
-					supplier   	@1318
-					vertices   	(list Points
-					    (1159, 2273)
-					    (1159, 2409)
-					    (450, 2409))
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(450, 2409)
-					label      	(object SegLabel @1452
-					    Parent_View 	@1450
-					    location   	(523, 2369)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913610
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$306" @1453
-				location   	(1197, 2334)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B898016D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$307" @1454
-					Parent_View 	@1453
-					location   	(941, -610)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990056"
-					client     	@1453
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(1197, 1428))
-				    (object RoleView "effectiveMinLengthFacet" @1455
-					Parent_View 	@1453
-					location   	(941, -610)
-					label      	(object SegLabel @1456
-					    Parent_View 	@1455
-					    location   	(856, 2454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveMinLengthFacet"
-					    pctDist    	0.552604
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990060"
-					client     	@1453
-					supplier   	@1318
-					vertices   	(list Points
-					    (1197, 2334)
-					    (1197, 2493)
-					    (450, 2493))
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(450, 2493)
-					label      	(object SegLabel @1457
-					    Parent_View 	@1455
-					    location   	(527, 2451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.916047
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$304" @1458
-				location   	(1231, 2438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8400062"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$305" @1459
-					Parent_View 	@1458
-					location   	(863, -746)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B841001D"
-					client     	@1458
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "effectiveTotalDigitsFacet" @1460
-					Parent_View 	@1458
-					location   	(863, -746)
-					label      	(object SegLabel @1461
-					    Parent_View 	@1460
-					    location   	(859, 2632)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveTotalDigitsFacet"
-					    pctDist    	0.597030
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8410027"
-					client     	@1458
-					supplier   	@1319
-					vertices   	(list Points
-					    (1231, 2438)
-					    (1231, 2668)
-					    (451, 2668))
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(451, 2668)
-					label      	(object SegLabel @1462
-					    Parent_View 	@1460
-					    location   	(534, 2631)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.918812
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$284" @1463
-				location   	(1231, 2397)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D800DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$285" @1464
-					Parent_View 	@1463
-					location   	(-209, 253)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803CD"
-					client     	@1463
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "totalDigitsFacet" @1465
-					Parent_View 	@1463
-					location   	(-209, 253)
-					label      	(object SegLabel @1466
-					    Parent_View 	@1465
-					    location   	(853, 2550)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+totalDigitsFacet"
-					    pctDist    	0.585567
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803D7"
-					client     	@1463
-					supplier   	@1319
-					vertices   	(list Points
-					    (1231, 2397)
-					    (1231, 2587)
-					    (451, 2587))
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(451, 2587)
-					label      	(object SegLabel @1467
-					    Parent_View 	@1465
-					    location   	(535, 2560)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.914647
-					    height     	28
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1468
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 768)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1468
-				    location   	(1019, 574)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	444
-				height     	413
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1469
-				location   	(1209, 1065)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1468
-				vertices   	(list Points
-				    (1209, 1065)
-				    (1209, 974)))
-			    (object AssociationViewNew "$UNNAMED$240" @1470
-				location   	(1090, 1031)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2880F503D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1471
-					Parent_View 	@1470
-					location   	(322, -25)
-					label      	(object SegLabel @1472
-					    Parent_View 	@1471
-					    location   	(897, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	-0.098765
-					    height     	194
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F9003C"
-					client     	@1470
-					supplier   	@1468
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 974)
-					label      	(object SegLabel @1473
-					    Parent_View 	@1471
-					    location   	(1121, 1034)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.061728
-					    height     	31
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$241" @1474
-					Parent_View 	@1470
-					location   	(322, -25)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F90046"
-					client     	@1470
-					supplier   	@1320
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 1088))))
-			    (object AssociationViewNew "$UNNAMED$246" @1475
-				location   	(1538, 873)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A6DB01E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootType" @1476
-					Parent_View 	@1475
-					location   	(178, 105)
-					label      	(object SegLabel @1477
-					    Parent_View 	@1476
-					    location   	(1558, 792)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+rootType"
-					    pctDist    	-1.760870
-					    height     	20
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DD"
-					client     	@1475
-					supplier   	@1468
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 919)
-					    (1454, 919))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 919)
-					label      	(object SegLabel @1478
-					    Parent_View 	@1476
-					    location   	(1509, 875)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.016667
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$247" @1479
-					Parent_View 	@1475
-					location   	(178, 105)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DE"
-					client     	@1475
-					supplier   	@1468
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 828)
-					    (1454, 828))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 828))))
-			    (object AssociationViewNew "$UNNAMED$248" @1480
-				location   	(1535, 684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7120108"
-				roleview_list 	(list RoleViews
-				    (object RoleView "baseType" @1481
-					Parent_View 	@1480
-					location   	(175, -84)
-					label      	(object SegLabel @1482
-					    Parent_View 	@1481
-					    location   	(1559, 597)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+baseType"
-					    pctDist    	-1.977273
-					    height     	24
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7140151"
-					client     	@1480
-					supplier   	@1468
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 728)
-					    (1454, 728))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 728)
-					label      	(object SegLabel @1483
-					    Parent_View 	@1481
-					    location   	(1506, 683)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.027778
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$249" @1484
-					Parent_View 	@1480
-					location   	(175, -84)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A714015B"
-					client     	@1480
-					supplier   	@1468
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 641)
-					    (1454, 641))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 641))))
-			    (object AssociationViewNew "$UNNAMED$252" @1485
-				location   	(613, 940)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7ED03C0"
-				roleview_list 	(list RoleViews
-				    (object RoleView "complexType" @1486
-					Parent_View 	@1485
-					location   	(-747, 172)
-					label      	(object SegLabel @1487
-					    Parent_View 	@1486
-					    location   	(465, 983)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+complexType"
-					    pctDist    	0.373057
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40117"
-					client     	@1485
-					supplier   	@1321
-					vertices   	(list Points
-					    (613, 940)
-					    (284, 940)
-					    (284, 1008))
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(284, 1008)
-					label      	(object SegLabel @1488
-					    Parent_View 	@1486
-					    location   	(224, 972)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.909320
-					    height     	61
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$253" @1489
-					Parent_View 	@1485
-					location   	(-747, 172)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40121"
-					client     	@1485
-					supplier   	@1468
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(1010, 940))))
-			    (object InheritView "" @1490
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@1468
-				supplier   	@1298
-				line_style 	3
-				origin_attachment 	(1112, 562)
-				terminal_attachment 	(1112, 510)
-				drawSupplier 	@1299)
-			    (object InheritView "" @1491
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1320
-				supplier   	@1468
-				line_style 	3
-				origin_attachment 	(1146, 1088)
-				terminal_attachment 	(1146, 1065)
-				drawSupplier 	@1469)
-			    (object AssociationViewNew "$UNNAMED$250" @1492
-				location   	(1362, 1133)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A74B0178"
-				roleview_list 	(list RoleViews
-				    (object RoleView "simpleType" @1493
-					Parent_View 	@1492
-					location   	(-158, -163)
-					label      	(object SegLabel @1494
-					    Parent_View 	@1493
-					    location   	(1499, 1094)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+simpleType"
-					    pctDist    	-0.246753
-					    height     	137
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D017B"
-					client     	@1492
-					supplier   	@1322
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 1292)
-					label      	(object SegLabel @1495
-					    Parent_View 	@1493
-					    location   	(1321, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.227273
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$251" @1496
-					Parent_View 	@1492
-					location   	(-158, -163)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D0185"
-					client     	@1492
-					supplier   	@1468
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 974))))
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @1497
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1497
-				    location   	(2002, 303)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@1497
-				    location   	(2002, 363)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	550
-				    compartmentItems 	(list Compartment
-					"+ global : boolean"
-					"+ featureReference : boolean"))
-				width      	558
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1498
-				location   	(2262, 568)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1497
-				vertices   	(list Points
-				    (2262, 568)
-				    (2262, 477)))
-			    (object InheritView "" @1499
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@1294
-				supplier   	@1497
-				line_style 	3
-				origin_attachment 	(2346, 595)
-				terminal_attachment 	(2346, 568)
-				drawSupplier 	@1498)
-			    (object AssociationViewNew "$UNNAMED$244" @1500
-				location   	(1553, 453)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A0F201A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "type" @1501
-					Parent_View 	@1500
-					location   	(801, 293)
-					label      	(object SegLabel @1502
-					    Parent_View 	@1501
-					    location   	(1331, 499)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+type"
-					    pctDist    	0.506266
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302E5"
-					client     	@1500
-					supplier   	@1468
-					vertices   	(list Points
-					    (1553, 453)
-					    (1222, 453)
-					    (1222, 562))
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1222, 562)
-					label      	(object SegLabel @1503
-					    Parent_View 	@1501
-					    location   	(1185, 479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.812030
-					    height     	38
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$245" @1504
-					Parent_View 	@1500
-					location   	(801, 293)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302F0"
-					client     	@1500
-					supplier   	@1497
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1993, 453))))
-			    (object AssociationViewNew "$UNNAMED$136" @1505
-				location   	(1908, 353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C29010602D7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedFeature" @1506
-					Parent_View 	@1505
-					location   	(-268, -159)
-					label      	(object SegLabel @1507
-					    Parent_View 	@1506
-					    location   	(1729, 352)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+resolvedFeature"
-					    pctDist    	-0.029412
-					    height     	180
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B000E"
-					client     	@1505
-					supplier   	@1497
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 387)
-					    (1993, 387))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 387)
-					label      	(object SegLabel @1508
-					    Parent_View 	@1506
-					    location   	(1945, 354)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.596639
-					    height     	34
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$137" @1509
-					Parent_View 	@1505
-					location   	(-268, -159)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B0018"
-					client     	@1505
-					supplier   	@1497
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 319)
-					    (1993, 319))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 319))))
-			    (object InheritView "" @1510
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@1298
-				supplier   	@1297
-				vertices   	(list Points
-				    (494, 284)
-				    (494, 244)
-				    (996, 244))
-				line_style 	3
-				origin_attachment 	(494, 284)
-				terminal_attachment 	(996, 244))
-			    (object InheritView "" @1511
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@1285
-				supplier   	@1497
-				line_style 	3
-				origin_attachment 	(1718, 812)
-				terminal_attachment 	(1718, 568)
-				drawSupplier 	@1498)
-			    (object InheritView "" @1512
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1322
-				supplier   	@1468
-				line_style 	3
-				origin_attachment 	(1265, 1292)
-				terminal_attachment 	(1265, 1065)
-				drawSupplier 	@1469)
-			    (object InheritView "" @1513
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@1497
-				supplier   	@1297
-				vertices   	(list Points
-				    (2147, 291)
-				    (2147, 244)
-				    (1468, 244))
-				line_style 	3
-				origin_attachment 	(2147, 291)
-				terminal_attachment 	(1468, 244)))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3AC9105103B2"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::mime" @1514
-			location   	(400, 240)
-			label      	(object ItemLabel
-			    Parent_View 	@1514
-			    location   	(256, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"mime")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3AC9127C0266"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::wsdl" @1515
-			location   	(880, 240)
-			label      	(object ItemLabel
-			    Parent_View 	@1515
-			    location   	(736, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsdl")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3ADFB8E5021E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::xsd" @1516
-			location   	(1376, 240)
-			label      	(object ItemLabel
-			    Parent_View 	@1516
-			    location   	(1232, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"xsd")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39ABDC6F01AA"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3AC91051031F"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3AC91052001A"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3AC910510326"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3AC910510328"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.mime/src/rose/mimebindingMDL.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.mime/src/rose/mimebindingMDL.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"IBM"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.mime/src/rose/mimebindingMDL.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.mime/src/rose/mimebindingMDL.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	"0")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"None"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"R2Editor"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"3AC910510327"))

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java
deleted file mode 100644
index 6866f83..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Part;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Content</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getEPart <em>EPart</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEContent()
- * @model 
- * @generated
- */
-public interface MIMEContent extends ExtensibilityElement, javax.wsdl.extensions.mime.MIMEContent {
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEContent_Type()
-	 * @model 
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>EPart</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EPart</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>EPart</em>' reference.
-	 * @see #setEPart(Part)
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEContent_EPart()
-	 * @model 
-	 * @generated
-	 */
-	Part getEPart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getEPart <em>EPart</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EPart</em>' reference.
-	 * @see #getEPart()
-	 * @generated
-	 */
-	void setEPart(Part value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model 
-	 * @generated
-	 */
-	void setPart(String part);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Part</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @model parameters=""
-	 * @generated
-	 */
-	String getPart();
-
-} // MIMEContent

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java
deleted file mode 100644
index 855e119..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- 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 -->
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage
- * @generated
- */
-public interface MIMEFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MIMEFactory eINSTANCE = new org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Content</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Content</em>'.
-	 * @generated
-	 */
-	MIMEContent createMIMEContent();
-
-	/**
-	 * Returns a new object of class '<em>Part</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Part</em>'.
-	 * @generated
-	 */
-	MIMEPart createMIMEPart();
-
-	/**
-	 * Returns a new object of class '<em>Multipart Related</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Multipart Related</em>'.
-	 * @generated
-	 */
-	MIMEMultipartRelated createMIMEMultipartRelated();
-
-	/**
-	 * Returns a new object of class '<em>Mime Xml</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Mime Xml</em>'.
-	 * @generated
-	 */
-	MIMEMimeXml createMIMEMimeXml();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	MIMEPackage getMIMEPackage();
-
-} //MIMEFactory

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java
deleted file mode 100644
index 64794c5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Part;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mime Xml</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml#getEPart <em>EPart</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEMimeXml()
- * @model 
- * @generated
- */
-public interface MIMEMimeXml extends ExtensibilityElement, javax.wsdl.extensions.mime.MIMEMimeXml {
-	/**
-	 * Returns the value of the '<em><b>EPart</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EPart</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>EPart</em>' reference.
-	 * @see #setEPart(Part)
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEMimeXml_EPart()
-	 * @model 
-	 * @generated
-	 */
-	Part getEPart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml#getEPart <em>EPart</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EPart</em>' reference.
-	 * @see #getEPart()
-	 * @generated
-	 */
-	void setEPart(Part value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model 
-	 * @generated
-	 */
-	void setPart(String part);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Part</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @model parameters=""
-	 * @generated
-	 */
-	String getPart();
-
-} // MIMEMimeXml

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java
deleted file mode 100644
index 35a7b36..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import java.util.List;
-
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Multipart Related</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated#getEMIMEPart <em>EMIME Part</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEMultipartRelated()
- * @model 
- * @generated
- */
-public interface MIMEMultipartRelated extends ExtensibilityElement, javax.wsdl.extensions.mime.MIMEMultipartRelated {
-	/**
-	 * Returns the value of the '<em><b>EMIME Part</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.wst.wsdl.binding.mime.MIMEPart}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EMIME Part</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>EMIME Part</em>' containment reference list.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEMultipartRelated_EMIMEPart()
-	 * @model type="org.eclipse.wst.wsdl.binding.mime.MIMEPart" containment="true"
-	 * @generated
-	 */
-	EList getEMIMEPart();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model 
-	 * @generated
-	 */
-	void addMIMEPart(MIMEPart mimePart);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model dataType="org.eclipse.wst.wsdl.binding.mime.List" parameters=""
-	 * @generated
-	 */
-	List getMIMEParts();
-
-} // MIMEMultipartRelated

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java
deleted file mode 100644
index 2f876e5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java
+++ /dev/null

@@ -1,559 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-/**
- * <!-- 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.eclipse.wst.wsdl.binding.mime.MIMEFactory
- * @generated
- */
-public interface MIMEPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "mime";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.ibm.com/wsdl/2003/MIME";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "mime";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MIMEPackage eINSTANCE = org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEContentImpl <em>Content</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEContentImpl
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getMIMEContent()
-	 * @generated
-	 */
-	int MIME_CONTENT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EPart</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT__EPART = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Content</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_CONTENT_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEPartImpl <em>Part</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPartImpl
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getMIMEPart()
-	 * @generated
-	 */
-	int MIME_PART = 1;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_PART__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_PART__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_PART__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_PART__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The number of structural features of the the '<em>Part</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_PART_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEMultipartRelatedImpl <em>Multipart Related</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEMultipartRelatedImpl
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getMIMEMultipartRelated()
-	 * @generated
-	 */
-	int MIME_MULTIPART_RELATED = 2;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>EMIME Part</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED__EMIME_PART = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Multipart Related</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MULTIPART_RELATED_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEMimeXmlImpl <em>Mime Xml</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEMimeXmlImpl
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getMIMEMimeXml()
-	 * @generated
-	 */
-	int MIME_MIME_XML = 3;
-
-	/**
-	 * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>EPart</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML__EPART = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Mime Xml</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MIME_XML_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.mime.MIMEPart <em>IMIME Part</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.mime.MIMEPart
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getIMIMEPart()
-	 * @generated
-	 */
-	int IMIME_PART = 4;
-
-	/**
-	 * The number of structural features of the the '<em>IMIME Part</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMIME_PART_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.mime.MIMEMultipartRelated <em>IMIME Multipart Related</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.mime.MIMEMultipartRelated
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getIMIMEMultipartRelated()
-	 * @generated
-	 */
-	int IMIME_MULTIPART_RELATED = 5;
-
-	/**
-	 * The number of structural features of the the '<em>IMIME Multipart Related</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMIME_MULTIPART_RELATED_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.mime.MIMEContent <em>IMIME Content</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.mime.MIMEContent
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getIMIMEContent()
-	 * @generated
-	 */
-	int IMIME_CONTENT = 6;
-
-	/**
-	 * The number of structural features of the the '<em>IMIME Content</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMIME_CONTENT_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link javax.wsdl.extensions.mime.MIMEMimeXml <em>IMIME Mime Xml</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see javax.wsdl.extensions.mime.MIMEMimeXml
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getIMIMEMimeXml()
-	 * @generated
-	 */
-	int IMIME_MIME_XML = 7;
-
-	/**
-	 * The number of structural features of the the '<em>IMIME Mime Xml</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMIME_MIME_XML_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '<em>List</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.util.List
-	 * @see org.eclipse.wst.wsdl.binding.mime.impl.MIMEPackageImpl#getList()
-	 * @generated
-	 */
-	int LIST = 8;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent <em>Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Content</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEContent
-	 * @generated
-	 */
-	EClass getMIMEContent();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEContent#getType()
-	 * @see #getMIMEContent()
-	 * @generated
-	 */
-	EAttribute getMIMEContent_Type();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent#getEPart <em>EPart</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>EPart</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEContent#getEPart()
-	 * @see #getMIMEContent()
-	 * @generated
-	 */
-	EReference getMIMEContent_EPart();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEPart <em>Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Part</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPart
-	 * @generated
-	 */
-	EClass getMIMEPart();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated <em>Multipart Related</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Multipart Related</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated
-	 * @generated
-	 */
-	EClass getMIMEMultipartRelated();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated#getEMIMEPart <em>EMIME Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>EMIME Part</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated#getEMIMEPart()
-	 * @see #getMIMEMultipartRelated()
-	 * @generated
-	 */
-	EReference getMIMEMultipartRelated_EMIMEPart();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml <em>Mime Xml</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Mime Xml</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml
-	 * @generated
-	 */
-	EClass getMIMEMimeXml();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml#getEPart <em>EPart</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>EPart</em>'.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml#getEPart()
-	 * @see #getMIMEMimeXml()
-	 * @generated
-	 */
-	EReference getMIMEMimeXml_EPart();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.mime.MIMEPart <em>IMIME Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IMIME Part</em>'.
-	 * @see javax.wsdl.extensions.mime.MIMEPart
-	 * @model instanceClass="javax.wsdl.extensions.mime.MIMEPart" 
-	 * @generated
-	 */
-	EClass getIMIMEPart();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.mime.MIMEMultipartRelated <em>IMIME Multipart Related</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IMIME Multipart Related</em>'.
-	 * @see javax.wsdl.extensions.mime.MIMEMultipartRelated
-	 * @model instanceClass="javax.wsdl.extensions.mime.MIMEMultipartRelated" 
-	 * @generated
-	 */
-	EClass getIMIMEMultipartRelated();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.mime.MIMEContent <em>IMIME Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IMIME Content</em>'.
-	 * @see javax.wsdl.extensions.mime.MIMEContent
-	 * @model instanceClass="javax.wsdl.extensions.mime.MIMEContent" 
-	 * @generated
-	 */
-	EClass getIMIMEContent();
-
-	/**
-	 * Returns the meta object for class '{@link javax.wsdl.extensions.mime.MIMEMimeXml <em>IMIME Mime Xml</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IMIME Mime Xml</em>'.
-	 * @see javax.wsdl.extensions.mime.MIMEMimeXml
-	 * @model instanceClass="javax.wsdl.extensions.mime.MIMEMimeXml" 
-	 * @generated
-	 */
-	EClass getIMIMEMimeXml();
-
-	/**
-	 * Returns the meta object for data type '{@link java.util.List <em>List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>List</em>'.
-	 * @see java.util.List
-	 * @model instanceClass="java.util.List"
-	 * @generated
-	 */
-	EDataType getList();
-
-	/**
-	 * 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
-	 */
-	MIMEFactory getMIMEFactory();
-
-} //MIMEPackage

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java
deleted file mode 100644
index 22cb823..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime;
-
-import java.util.List;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Part</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEPart()
- * @model 
- * @generated
- */
-public interface MIMEPart extends ExtensibilityElement, javax.wsdl.extensions.mime.MIMEPart {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model 
-	 * @generated
-	 */
-	void addExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model dataType="org.eclipse.wst.wsdl.binding.mime.List" parameters=""
-	 * @generated
-	 */
-	List getExtensibilityElements();
-
-} // MIMEPart

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java
deleted file mode 100644
index ac0f084..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java
+++ /dev/null

@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Content</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEContentImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEContentImpl#getEPart <em>EPart</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MIMEContentImpl extends ExtensibilityElementImpl implements MIMEContent {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String type = TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getEPart() <em>EPart</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEPart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Part ePart = null;
-	
-    private String part; // TBD
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MIMEContentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MIMEPackage.eINSTANCE.getMIMEContent();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MIMEPackage.MIME_CONTENT__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Part getEPart() {
-		if (ePart != null && ePart.eIsProxy()) {
-			Part oldEPart = ePart;
-			ePart = (Part)eResolveProxy((InternalEObject)ePart);
-			if (ePart != oldEPart) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MIMEPackage.MIME_CONTENT__EPART, oldEPart, ePart));
-			}
-		}
-		return ePart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Part basicGetEPart() {
-		return ePart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEPart(Part newEPart) {
-		Part oldEPart = ePart;
-		ePart = newEPart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MIMEPackage.MIME_CONTENT__EPART, oldEPart, ePart));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void setPart(String part) {
-      this.part = part;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getPart() {
-      return part;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_CONTENT__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MIMEPackage.MIME_CONTENT__ELEMENT:
-				return getElement();
-			case MIMEPackage.MIME_CONTENT__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MIMEPackage.MIME_CONTENT__ELEMENT_TYPE:
-				return getElementType();
-			case MIMEPackage.MIME_CONTENT__TYPE:
-				return getType();
-			case MIMEPackage.MIME_CONTENT__EPART:
-				if (resolve) return getEPart();
-				return basicGetEPart();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_CONTENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_CONTENT__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_CONTENT__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MIMEPackage.MIME_CONTENT__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case MIMEPackage.MIME_CONTENT__TYPE:
-				setType((String)newValue);
-				return;
-			case MIMEPackage.MIME_CONTENT__EPART:
-				setEPart((Part)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_CONTENT__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_CONTENT__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_CONTENT__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_CONTENT__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_CONTENT__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_CONTENT__EPART:
-				setEPart((Part)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_CONTENT__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MIMEPackage.MIME_CONTENT__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MIMEPackage.MIME_CONTENT__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MIMEPackage.MIME_CONTENT__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case MIMEPackage.MIME_CONTENT__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case MIMEPackage.MIME_CONTENT__EPART:
-				return ePart != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (type: ");
-		result.append(type);
-		result.append(')');
-		return result.toString();
-	}
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  	setPart
-      (MIMEConstants.getAttribute(changedElement, MIMEConstants.PART_ATTRIBUTE));
-  	setType
-      (MIMEConstants.getAttribute(changedElement, MIMEConstants.TYPE_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == MIMEPackage.eINSTANCE. getMIMEContent_EPart())
-        niceSetAttribute(theElement,MIMEConstants.PART_ATTRIBUTE,getPart());
-      if (eAttribute == null || eAttribute == MIMEPackage.eINSTANCE. getMIMEContent_Type())
-        niceSetAttribute(theElement,MIMEConstants.TYPE_ATTRIBUTE,getType());
-    }
-  }
-
-} //MIMEContentImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java
deleted file mode 100644
index d6607aa..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java
+++ /dev/null

@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MIMEFactoryImpl extends EFactoryImpl implements MIMEFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case MIMEPackage.MIME_CONTENT: return createMIMEContent();
-			case MIMEPackage.MIME_PART: return createMIMEPart();
-			case MIMEPackage.MIME_MULTIPART_RELATED: return createMIMEMultipartRelated();
-			case MIMEPackage.MIME_MIME_XML: return createMIMEMimeXml();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case MIMEPackage.LIST:
-				return createListFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case MIMEPackage.LIST:
-				return convertListToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEContent createMIMEContent() {
-		MIMEContentImpl mimeContent = new MIMEContentImpl();
-		return mimeContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEPart createMIMEPart() {
-		MIMEPartImpl mimePart = new MIMEPartImpl();
-		return mimePart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEMultipartRelated createMIMEMultipartRelated() {
-		MIMEMultipartRelatedImpl mimeMultipartRelated = new MIMEMultipartRelatedImpl();
-		return mimeMultipartRelated;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEMimeXml createMIMEMimeXml() {
-		MIMEMimeXmlImpl mimeMimeXml = new MIMEMimeXmlImpl();
-		return mimeMimeXml;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List createListFromString(EDataType eDataType, String initialValue) {
-		return (List)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertListToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEPackage getMIMEPackage() {
-		return (MIMEPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static MIMEPackage getPackage() {
-		return MIMEPackage.eINSTANCE;
-	}
-} //MIMEFactoryImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java
deleted file mode 100644
index 1b5c1f8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java
+++ /dev/null

@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Mime Xml</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEMimeXmlImpl#getEPart <em>EPart</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MIMEMimeXmlImpl extends ExtensibilityElementImpl implements MIMEMimeXml {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-	 * The cached value of the '{@link #getEPart() <em>EPart</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEPart()
-	 * @generated
-	 * @ordered
-	 */
-	protected Part ePart = null;
-	
-    private String part;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MIMEMimeXmlImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MIMEPackage.eINSTANCE.getMIMEMimeXml();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Part getEPart() {
-		if (ePart != null && ePart.eIsProxy()) {
-			Part oldEPart = ePart;
-			ePart = (Part)eResolveProxy((InternalEObject)ePart);
-			if (ePart != oldEPart) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MIMEPackage.MIME_MIME_XML__EPART, oldEPart, ePart));
-			}
-		}
-		return ePart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Part basicGetEPart() {
-		return ePart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEPart(Part newEPart) {
-		Part oldEPart = ePart;
-		ePart = newEPart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MIMEPackage.MIME_MIME_XML__EPART, oldEPart, ePart));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void setPart(String part) {
-      this.part = part;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getPart() {
-      return part;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MIME_XML__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MIMEPackage.MIME_MIME_XML__ELEMENT:
-				return getElement();
-			case MIMEPackage.MIME_MIME_XML__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT_TYPE:
-				return getElementType();
-			case MIMEPackage.MIME_MIME_XML__EPART:
-				if (resolve) return getEPart();
-				return basicGetEPart();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MIME_XML__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_MIME_XML__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case MIMEPackage.MIME_MIME_XML__EPART:
-				setEPart((Part)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MIME_XML__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MIME_XML__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MIME_XML__EPART:
-				setEPart((Part)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MIME_XML__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MIMEPackage.MIME_MIME_XML__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MIMEPackage.MIME_MIME_XML__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MIMEPackage.MIME_MIME_XML__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case MIMEPackage.MIME_MIME_XML__EPART:
-				return ePart != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  	setPart
-      (MIMEConstants.getAttribute(changedElement, MIMEConstants.PART_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == MIMEPackage.eINSTANCE. getMIMEContent_EPart())
-        niceSetAttribute(theElement,MIMEConstants.PART_ATTRIBUTE,getPart());
-    }
-  }
-
-} //MIMEMimeXmlImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java
deleted file mode 100644
index 8657520..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java
+++ /dev/null

@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-import org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEConstants;
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Multipart Related</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.impl.MIMEMultipartRelatedImpl#getEMIMEPart <em>EMIME Part</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MIMEMultipartRelatedImpl extends ExtensibilityElementImpl implements MIMEMultipartRelated {
-	/**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-  /**
-	 * The cached value of the '{@link #getEMIMEPart() <em>EMIME Part</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEMIMEPart()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList eMIMEPart = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MIMEMultipartRelatedImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MIMEPackage.eINSTANCE.getMIMEMultipartRelated();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEMIMEPart() {
-		if (eMIMEPart == null) {
-			eMIMEPart = new EObjectContainmentEList(MIMEPart.class, this, MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART);
-		}
-		return eMIMEPart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void addMIMEPart(javax.wsdl.extensions.mime.MIMEPart mimePart) {
-		getEMIMEPart().add(mimePart);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getMIMEParts() {
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-					return ((InternalEList)getEMIMEPart()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MULTIPART_RELATED__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT:
-				return getElement();
-			case MIMEPackage.MIME_MULTIPART_RELATED__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT_TYPE:
-				return getElementType();
-			case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-				return getEMIMEPart();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MULTIPART_RELATED__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-				getEMIMEPart().clear();
-				getEMIMEPart().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MULTIPART_RELATED__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-				getEMIMEPart().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_MULTIPART_RELATED__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MIMEPackage.MIME_MULTIPART_RELATED__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MIMEPackage.MIME_MULTIPART_RELATED__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-			case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-				return eMIMEPart != null && !eMIMEPart.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-	
-    public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-    {
-      if (MIMEConstants.PART_ELEMENT_TAG.equals(child.getLocalName()))
-      {
-        MIMEPart mimePart = MIMEFactory.eINSTANCE.createMIMEPart();
-	    mimePart.setEnclosingDefinition(getEnclosingDefinition());
-	    mimePart.setElement(child);
-        addMIMEPart(mimePart);
-      }
-    }
-} //MIMEMultipartRelatedImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java
deleted file mode 100644
index ea54c91..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java
+++ /dev/null

@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MIMEPackageImpl extends EPackageImpl implements MIMEPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimeContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimePartEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimeMultipartRelatedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimeMimeXmlEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imimePartEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imimeMultipartRelatedEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imimeContentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imimeMimeXmlEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType listEDataType = 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.eclipse.wst.wsdl.binding.mime.MIMEPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private MIMEPackageImpl() {
-		super(eNS_URI, MIMEFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- 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 MIMEPackage init() {
-		if (isInited) return (MIMEPackage)EPackage.Registry.INSTANCE.get(MIMEPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		MIMEPackageImpl theMIMEPackage = (MIMEPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MIMEPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XSDPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)(EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) : WSDLPackageImpl.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theMIMEPackage.createPackageContents();
-		theWSDLPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theMIMEPackage.initializePackageContents();
-		theWSDLPackage.initializePackageContents();
-
-		return theMIMEPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMIMEContent() {
-		return mimeContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMIMEContent_Type() {
-		return (EAttribute)mimeContentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMIMEContent_EPart() {
-		return (EReference)mimeContentEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMIMEPart() {
-		return mimePartEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMIMEMultipartRelated() {
-		return mimeMultipartRelatedEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMIMEMultipartRelated_EMIMEPart() {
-		return (EReference)mimeMultipartRelatedEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMIMEMimeXml() {
-		return mimeMimeXmlEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMIMEMimeXml_EPart() {
-		return (EReference)mimeMimeXmlEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIMIMEPart() {
-		return imimePartEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIMIMEMultipartRelated() {
-		return imimeMultipartRelatedEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIMIMEContent() {
-		return imimeContentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIMIMEMimeXml() {
-		return imimeMimeXmlEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getList() {
-		return listEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEFactory getMIMEFactory() {
-		return (MIMEFactory)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
-		mimeContentEClass = createEClass(MIME_CONTENT);
-		createEAttribute(mimeContentEClass, MIME_CONTENT__TYPE);
-		createEReference(mimeContentEClass, MIME_CONTENT__EPART);
-
-		mimePartEClass = createEClass(MIME_PART);
-
-		mimeMultipartRelatedEClass = createEClass(MIME_MULTIPART_RELATED);
-		createEReference(mimeMultipartRelatedEClass, MIME_MULTIPART_RELATED__EMIME_PART);
-
-		mimeMimeXmlEClass = createEClass(MIME_MIME_XML);
-		createEReference(mimeMimeXmlEClass, MIME_MIME_XML__EPART);
-
-		imimePartEClass = createEClass(IMIME_PART);
-
-		imimeMultipartRelatedEClass = createEClass(IMIME_MULTIPART_RELATED);
-
-		imimeContentEClass = createEClass(IMIME_CONTENT);
-
-		imimeMimeXmlEClass = createEClass(IMIME_MIME_XML);
-
-		// Create data types
-		listEDataType = createEDataType(LIST);
-	}
-
-	/**
-	 * <!-- 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
-		WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-
-		// Add supertypes to classes
-		mimeContentEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		mimeContentEClass.getESuperTypes().add(this.getIMIMEContent());
-		mimePartEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		mimePartEClass.getESuperTypes().add(this.getIMIMEPart());
-		mimeMultipartRelatedEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		mimeMultipartRelatedEClass.getESuperTypes().add(this.getIMIMEMultipartRelated());
-		mimeMimeXmlEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-		mimeMimeXmlEClass.getESuperTypes().add(this.getIMIMEMimeXml());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(mimeContentEClass, MIMEContent.class, "MIMEContent", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getMIMEContent_Type(), ecorePackage.getEString(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getMIMEContent_EPart(), theWSDLPackage.getPart(), null, "ePart", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		EOperation op = addEOperation(mimeContentEClass, null, "setPart");
-		addEParameter(op, ecorePackage.getEString(), "part");
-
-		addEOperation(mimeContentEClass, ecorePackage.getEString(), "getPart");
-
-		initEClass(mimePartEClass, MIMEPart.class, "MIMEPart", !IS_ABSTRACT, !IS_INTERFACE);
-
-		op = addEOperation(mimePartEClass, null, "addExtensibilityElement");
-		addEParameter(op, theWSDLPackage.getIExtensibilityElement(), "extensibilityElement");
-
-		addEOperation(mimePartEClass, this.getList(), "getExtensibilityElements");
-
-		initEClass(mimeMultipartRelatedEClass, MIMEMultipartRelated.class, "MIMEMultipartRelated", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getMIMEMultipartRelated_EMIMEPart(), this.getMIMEPart(), null, "eMIMEPart", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		op = addEOperation(mimeMultipartRelatedEClass, null, "addMIMEPart");
-		addEParameter(op, this.getIMIMEPart(), "mimePart");
-
-		addEOperation(mimeMultipartRelatedEClass, this.getList(), "getMIMEParts");
-
-		initEClass(mimeMimeXmlEClass, MIMEMimeXml.class, "MIMEMimeXml", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getMIMEMimeXml_EPart(), theWSDLPackage.getPart(), null, "ePart", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		op = addEOperation(mimeMimeXmlEClass, null, "setPart");
-		addEParameter(op, ecorePackage.getEString(), "part");
-
-		addEOperation(mimeMimeXmlEClass, ecorePackage.getEString(), "getPart");
-
-		initEClass(imimePartEClass, javax.wsdl.extensions.mime.MIMEPart.class, "IMIMEPart", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(imimeMultipartRelatedEClass, javax.wsdl.extensions.mime.MIMEMultipartRelated.class, "IMIMEMultipartRelated", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(imimeContentEClass, javax.wsdl.extensions.mime.MIMEContent.class, "IMIMEContent", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(imimeMimeXmlEClass, javax.wsdl.extensions.mime.MIMEMimeXml.class, "IMIMEMimeXml", IS_ABSTRACT, IS_INTERFACE);
-
-		// Initialize data types
-		initEDataType(listEDataType, List.class, "List", IS_SERIALIZABLE);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //MIMEPackageImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java
deleted file mode 100644
index b729a4c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.impl;
-
-import java.util.List;
-import java.util.Collection;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Part</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class MIMEPartImpl extends ExtensibilityElementImpl implements MIMEPart {
-	
-    /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-    private List extensibilityElements = new java.util.Vector();
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MIMEPartImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return MIMEPackage.eINSTANCE.getMIMEPart();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void addExtensibilityElement(ExtensibilityElement extensibilityElement) {
-      getExtensibilityElements().add(extensibilityElement);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public List getExtensibilityElements() {
-      return extensibilityElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_PART__DOCUMENTATION_ELEMENT:
-				return getDocumentationElement();
-			case MIMEPackage.MIME_PART__ELEMENT:
-				return getElement();
-			case MIMEPackage.MIME_PART__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case MIMEPackage.MIME_PART__ELEMENT_TYPE:
-				return getElementType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_PART__DOCUMENTATION_ELEMENT:
-				setDocumentationElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_PART__ELEMENT:
-				setElement((Element)newValue);
-				return;
-			case MIMEPackage.MIME_PART__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case MIMEPackage.MIME_PART__ELEMENT_TYPE:
-				setElementType((QName)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_PART__DOCUMENTATION_ELEMENT:
-				setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_PART__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_PART__REQUIRED:
-				setRequired(REQUIRED_EDEFAULT);
-				return;
-			case MIMEPackage.MIME_PART__ELEMENT_TYPE:
-				setElementType(ELEMENT_TYPE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case MIMEPackage.MIME_PART__DOCUMENTATION_ELEMENT:
-				return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-			case MIMEPackage.MIME_PART__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-			case MIMEPackage.MIME_PART__REQUIRED:
-				return required != REQUIRED_EDEFAULT;
-			case MIMEPackage.MIME_PART__ELEMENT_TYPE:
-				return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-	
-  //
-  // Reconciliation: DOM -> MODEL
-  //
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    if (!WSDLConstants.isMatchingNamespace(child.getNamespaceURI(), WSDLConstants.WSDL_NAMESPACE_URI))
-    {  
-      org.eclipse.wst.wsdl.ExtensibilityElement extensibilityElement = useExtensionFactories() ? 
-        ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createExtensibilityElement(getNamespace(child),getLocalName(child)) :
-            ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createUnknownExtensibilityElement();
-	          
-      extensibilityElement.setEnclosingDefinition(getEnclosingDefinition());
-      extensibilityElement.setElement(child);
-      addExtensibilityElement(extensibilityElement);
-    }
-  }
-	  
-  private boolean useExtensionFactories()
-  {
-  	// Use extension factories by default.
-    return getEnclosingDefinition() == null ? 
-      true : ((DefinitionImpl)getEnclosingDefinition()).getUseExtensionFactories();
-  }
-
-} //MIMEPartImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java
deleted file mode 100644
index aa887e1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java
+++ /dev/null

@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage
- * @generated
- */
-public class MIMEAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static MIMEPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMEAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = MIMEPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MIMESwitch modelSwitch =
-		new MIMESwitch() {
-			public Object caseMIMEContent(MIMEContent object) {
-				return createMIMEContentAdapter();
-			}
-			public Object caseMIMEPart(MIMEPart object) {
-				return createMIMEPartAdapter();
-			}
-			public Object caseMIMEMultipartRelated(MIMEMultipartRelated object) {
-				return createMIMEMultipartRelatedAdapter();
-			}
-			public Object caseMIMEMimeXml(MIMEMimeXml object) {
-				return createMIMEMimeXmlAdapter();
-			}
-			public Object caseIMIMEPart(javax.wsdl.extensions.mime.MIMEPart object) {
-				return createIMIMEPartAdapter();
-			}
-			public Object caseIMIMEMultipartRelated(javax.wsdl.extensions.mime.MIMEMultipartRelated object) {
-				return createIMIMEMultipartRelatedAdapter();
-			}
-			public Object caseIMIMEContent(javax.wsdl.extensions.mime.MIMEContent object) {
-				return createIMIMEContentAdapter();
-			}
-			public Object caseIMIMEMimeXml(javax.wsdl.extensions.mime.MIMEMimeXml object) {
-				return createIMIMEMimeXmlAdapter();
-			}
-			public Object caseWSDLElement(WSDLElement object) {
-				return createWSDLElementAdapter();
-			}
-			public Object caseIExtensibilityElement(ExtensibilityElement object) {
-				return createIExtensibilityElementAdapter();
-			}
-			public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object) {
-				return createExtensibilityElementAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEContent <em>Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEContent
-	 * @generated
-	 */
-	public Adapter createMIMEContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEPart <em>Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEPart
-	 * @generated
-	 */
-	public Adapter createMIMEPartAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated <em>Multipart Related</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated
-	 * @generated
-	 */
-	public Adapter createMIMEMultipartRelatedAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml <em>Mime Xml</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml
-	 * @generated
-	 */
-	public Adapter createMIMEMimeXmlAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.mime.MIMEPart <em>IMIME Part</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.mime.MIMEPart
-	 * @generated
-	 */
-	public Adapter createIMIMEPartAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.mime.MIMEMultipartRelated <em>IMIME Multipart Related</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.mime.MIMEMultipartRelated
-	 * @generated
-	 */
-	public Adapter createIMIMEMultipartRelatedAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.mime.MIMEContent <em>IMIME Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.mime.MIMEContent
-	 * @generated
-	 */
-	public Adapter createIMIMEContentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.mime.MIMEMimeXml <em>IMIME Mime Xml</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.mime.MIMEMimeXml
-	 * @generated
-	 */
-	public Adapter createIMIMEMimeXmlAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.WSDLElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.WSDLElement
-	 * @generated
-	 */
-	public Adapter createWSDLElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see javax.wsdl.extensions.ExtensibilityElement
-	 * @generated
-	 */
-	public Adapter createIExtensibilityElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.ExtensibilityElement <em>Extensibility Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.wst.wsdl.ExtensibilityElement
-	 * @generated
-	 */
-	public Adapter createExtensibilityElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //MIMEAdapterFactory

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java
deleted file mode 100644
index de89897..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.util;
-
-import org.w3c.dom.Element;
-
-public final class MIMEConstants 
-{
-  public static final String CONTENT_ELEMENT_TAG = "content";
-  public static final String MIME_XML_ELEMENT_TAG = "mimeXML";
-  public static final String MULTIPART_RELATED_ELEMENT_TAG = "multipartRelated";
-  public static final String PART_ELEMENT_TAG = "part";
-	  
-  public static final String MIME_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/mime/";
-
-  public static final String PART_ATTRIBUTE ="part";
-  public static final String TYPE_ATTRIBUTE ="type";
-  
-  public static String getAttribute(Element element, String attributeName)
-  {
-    return element.hasAttribute(attributeName) ? element.getAttribute(attributeName) : null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java
deleted file mode 100644
index 8a5d7bb..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.util;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-
-public class MIMEExtensibilityElementFactory implements ExtensibilityElementFactory
-{
-  public ExtensibilityElement createExtensibilityElement(String namespace, String localName)
-  {
-    if (MIMEConstants.MIME_NAMESPACE_URI.equals(namespace))
-    {
-      if (MIMEConstants.CONTENT_ELEMENT_TAG.equals(localName))
-      {
-        return MIMEFactory.eINSTANCE.createMIMEContent();
-      }
-      else if (MIMEConstants.MIME_XML_ELEMENT_TAG.equals(localName))
-      {
-        return MIMEFactory.eINSTANCE.createMIMEMimeXml();
-      }
-      else if (MIMEConstants.MULTIPART_RELATED_ELEMENT_TAG.equals(localName))
-      {
-        return MIMEFactory.eINSTANCE.createMIMEMultipartRelated();
-      }
-      /* TODO - fix the rose model
-      else if ("part".equals(localName))
-      {
-        return MIMEFactory.eINSTANCE.createMIMEPart();
-      }
-      */
-	  else
-	  {
-	    //System.out.println("Unhandled localName: " + localName);
-	    return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-      }
-    }
-    else
-    {
-      //System.out.println("Unhandled namespace: " + namespace);
-      return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java
deleted file mode 100644
index 53a56df..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java
+++ /dev/null

@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.mime.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage
- * @generated
- */
-public class MIMESwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static MIMEPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MIMESwitch() {
-		if (modelPackage == null) {
-			modelPackage = MIMEPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case MIMEPackage.MIME_CONTENT: {
-					MIMEContent mimeContent = (MIMEContent)theEObject;
-					Object result = caseMIMEContent(mimeContent);
-					if (result == null) result = caseExtensibilityElement(mimeContent);
-					if (result == null) result = caseIMIMEContent(mimeContent);
-					if (result == null) result = caseWSDLElement(mimeContent);
-					if (result == null) result = caseIExtensibilityElement(mimeContent);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case MIMEPackage.MIME_PART: {
-					MIMEPart mimePart = (MIMEPart)theEObject;
-					Object result = caseMIMEPart(mimePart);
-					if (result == null) result = caseExtensibilityElement(mimePart);
-					if (result == null) result = caseIMIMEPart(mimePart);
-					if (result == null) result = caseWSDLElement(mimePart);
-					if (result == null) result = caseIExtensibilityElement(mimePart);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case MIMEPackage.MIME_MULTIPART_RELATED: {
-					MIMEMultipartRelated mimeMultipartRelated = (MIMEMultipartRelated)theEObject;
-					Object result = caseMIMEMultipartRelated(mimeMultipartRelated);
-					if (result == null) result = caseExtensibilityElement(mimeMultipartRelated);
-					if (result == null) result = caseIMIMEMultipartRelated(mimeMultipartRelated);
-					if (result == null) result = caseWSDLElement(mimeMultipartRelated);
-					if (result == null) result = caseIExtensibilityElement(mimeMultipartRelated);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case MIMEPackage.MIME_MIME_XML: {
-					MIMEMimeXml mimeMimeXml = (MIMEMimeXml)theEObject;
-					Object result = caseMIMEMimeXml(mimeMimeXml);
-					if (result == null) result = caseExtensibilityElement(mimeMimeXml);
-					if (result == null) result = caseIMIMEMimeXml(mimeMimeXml);
-					if (result == null) result = caseWSDLElement(mimeMimeXml);
-					if (result == null) result = caseIExtensibilityElement(mimeMimeXml);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Content</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Content</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMIMEContent(MIMEContent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Part</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Part</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMIMEPart(MIMEPart object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Multipart Related</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Multipart Related</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMIMEMultipartRelated(MIMEMultipartRelated object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Mime Xml</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Mime Xml</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMIMEMimeXml(MIMEMimeXml object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMIME Part</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMIME Part</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIMIMEPart(javax.wsdl.extensions.mime.MIMEPart object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMIME Multipart Related</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMIME Multipart Related</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIMIMEMultipartRelated(javax.wsdl.extensions.mime.MIMEMultipartRelated object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMIME Content</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMIME Content</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIMIMEContent(javax.wsdl.extensions.mime.MIMEContent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IMIME Mime Xml</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IMIME Mime Xml</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIMIMEMimeXml(javax.wsdl.extensions.mime.MIMEMimeXml object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWSDLElement(WSDLElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIExtensibilityElement(ExtensibilityElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //MIMESwitch

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/model/SOAP.genmodel b/bundles/org.eclipse.wst.wsdl/src-soap/model/SOAP.genmodel
deleted file mode 100644
index bc441cf..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/model/SOAP.genmodel
+++ /dev/null

@@ -1,429 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.ibm.etools.wsdl.binding.soap/src"
-    editDirectory="/com.ibm.etools.wsdl.binding.soap.edit/src" editorDirectory="/com.ibm.etools.wsdl.binding.soap.editor/src"
-    modelPluginID="com.ibm.etools.wsdl.binding.soap" modelName="SOAP" editPluginClass=""
-    editorPluginClass="" usedGenPackages="../../../org.eclipse.xsd/src/model/XSD.genmodel#//xsd">
-  <foreignModel>..\rose\soap.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="SOAP" basePackage="com.ibm.etools.wsdl.binding" ecorePackage="soap.ecore#/">
-    <genDataTypes ecoreDataType="soap.ecore#//IString"/>
-    <genClasses ecoreClass="soap.ecore#//SOAPBinding">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPBinding/transportURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPBinding/style"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPBody">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPBody/use"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPBody/namespaceURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPBody/encodingStyles"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference soap.ecore#//SOAPBody/parts"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPHeaderBase">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPHeaderBase/use"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPHeaderBase/namespaceURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPHeaderBase/encodingStyles"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference soap.ecore#//SOAPHeaderBase/message"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference soap.ecore#//SOAPHeaderBase/part"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPFault">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPFault/use"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPFault/namespaceURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPFault/encodingStyles"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPOperation">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPOperation/soapActionURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPOperation/style"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPAddress">
-      <genFeatures ecoreFeature="ecore:EAttribute soap.ecore#//SOAPAddress/locationURI"/>
-    </genClasses>
-    <genClasses ecoreClass="soap.ecore#//SOAPHeaderFault"/>
-    <genClasses ecoreClass="soap.ecore#//SOAPHeader">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference soap.ecore#//SOAPHeader/headerFaults"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="WSDL" basePackage="com.ibm.etools" ecorePackage="wsdl.ecore#/">
-    <genDataTypes ecoreDataType="wsdl.ecore#//QName"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//OperationType"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMElement"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//WSDLException"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMDocument"/>
-    <genClasses ecoreClass="wsdl.ecore#//WSDLElement">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/documentationElement"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/element"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/getEnclosingDefinition"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/setEnclosingDefinition">
-        <genParameters ecoreParameter="wsdl.ecore#//WSDLElement/setEnclosingDefinition/definition"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//PortType">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/qName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/undefined"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/proxy"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/resourceURI"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//PortType/eOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Operation">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/style"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/name"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/undefined"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/proxy"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/resourceURI"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eInput"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eOutput"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eFaults"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eParameterOrdering"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Message">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/qName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/undefined"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/proxy"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/resourceURI"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Message/eParts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Part">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/name"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/elementName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/typeName"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/typeDefinition"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/elementDeclaration"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/eMessage"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Binding">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/qName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/undefined"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/proxy"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/resourceURI"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/ePortType"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/eBindingOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOperation">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOperation/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eOperation"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingInput"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingOutput"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingFaults"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Service">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/qName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/undefined"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/proxy"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/resourceURI"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Service/ePorts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Port">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Port/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Port/eBinding"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibilityElement">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/required"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/elementType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Definition">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/targetNamespace"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/location"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/qName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/encoding"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eMessages"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/ePortTypes"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eBindings"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eServices"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eNamespaces"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eTypes"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/getDocument"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/setDocument">
-        <genParameters ecoreParameter="wsdl.ecore#//Definition/setDocument/document"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Import">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/namespaceURI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/locationURI"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eDefinition"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/getSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/setSchema">
-        <genParameters ecoreParameter="wsdl.ecore#//Import/setSchema/schema"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibleElement">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//ExtensibleElement/eExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/getExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/addExtensibilityElement">
-        <genParameters ecoreParameter="wsdl.ecore#//ExtensibleElement/addExtensibilityElement/extElement"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Input"/>
-    <genClasses ecoreClass="wsdl.ecore#//Output"/>
-    <genClasses ecoreClass="wsdl.ecore#//Fault"/>
-    <genClasses ecoreClass="wsdl.ecore#//BindingInput">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingInput/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingInput/eInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingInput/setInput/input"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOutput">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOutput/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOutput/eOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingOutput/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingFault">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingFault/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingFault/eFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/getFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/setFault">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingFault/setFault/fault"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Namespace">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/URI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/prefix"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPortType">
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/addOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/addOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/addFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/addFault/fault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/getFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getParameterOrdering"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setParameterOrdering">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setParameterOrdering/parameterOrder"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setInput/input"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IInput">
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IInput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOutput">
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IOutput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IFault">
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IFault/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IMessage">
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/addPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/addPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getPart/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getParts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getOrderedParts">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getOrderedParts/partOrder"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPart">
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/setExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttributeNames"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/getExtensionAttribute/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IService">
-      <genOperations ecoreOperation="wsdl.ecore#//IService/addPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/addPort/port"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPorts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/getPort/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPort">
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/getBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/setBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IPort/setBinding/binding"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBinding">
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/addBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/addBindingOperation/bindingOperation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperations"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/setPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/setPortType/portType"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/addBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/addBindingFault/bindingFault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/getBindingFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingInput/bindingInput"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingOutput/bindingOutput"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingInput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOutput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingFault"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensibilityElement"/>
-    <genClasses ecoreClass="wsdl.ecore#//IDefinition">
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addBinding/binding"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addImport">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addImport/importDef"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addMessage/message"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/prefix"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addPortType/portType"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addService/service"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createImport"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPart"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPort"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createService"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBindings"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports.1">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getImports.1/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessages"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getNamespace/prefix"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespaces"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPrefix">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPrefix/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getServices"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getExtensionRegistry"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setExtensionRegistry">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setExtensionRegistry/extensionRegistry"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getDocumentBaseURI"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setDocumentBaseURI">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setDocumentBaseURI/documentBase"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removePortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removePortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setTypes">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setTypes/types"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IImport"/>
-    <genClasses ecoreClass="wsdl.ecore#//IList"/>
-    <genClasses ecoreClass="wsdl.ecore#//IMap"/>
-    <genClasses ecoreClass="wsdl.ecore#//IURL"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensionRegistry"/>
-    <genClasses ecoreClass="wsdl.ecore#//Types">
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas.1">
-        <genParameters ecoreParameter="wsdl.ecore#//Types/getSchemas.1/namespaceURI"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IIterator"/>
-    <genClasses ecoreClass="wsdl.ecore#//ITypes"/>
-    <genClasses ecoreClass="wsdl.ecore#//UnknownExtensibilityElement">
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/parent"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/children"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//XSDSchemaExtensibilityElement">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdl.ecore#//XSDSchemaExtensibilityElement/schema"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//MessageReference">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdl.ecore#//MessageReference/name"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference wsdl.ecore#//MessageReference/eMessage"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/model/com.ibm.etools.wsdl.bindings.SOAP.cat b/bundles/org.eclipse.wst.wsdl/src-soap/model/com.ibm.etools.wsdl.bindings.SOAP.cat
deleted file mode 100644
index a2b034f..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/model/com.ibm.etools.wsdl.bindings.SOAP.cat
+++ /dev/null

@@ -1,945 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Class_Category "soap"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"3A01CF0C01A2"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "SOAPBinding"
-	    quid       	"3A01D3B901AD"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE09A3801AB"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "transportURI"
-		    quid       	"3A01D3DF01E4"
-		    type       	"String")
-		(object ClassAttribute "style"
-		    quid       	"3A01D3F1029E"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "SOAPBody"
-	    quid       	"3A01DED5031F"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE09A450041"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "use"
-		    quid       	"3A01E2D501A5"
-		    type       	"String")
-		(object ClassAttribute "namespaceURI"
-		    quid       	"3A93477C01B2"
-		    type       	"String")
-		(object ClassAttribute "encodingStyles"
-		    quid       	"3EE4A4DB0072"
-		    stereotype 	"0..*"
-		    type       	"IString"))
-	    language   	"Java")
-	(object Class "SOAPHeaderBase"
-	    quid       	"3A01DEE7034D"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE09A3E0326"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "use"
-		    quid       	"3AD62E9C0056"
-		    type       	"String")
-		(object ClassAttribute "namespaceURI"
-		    quid       	"3AD62EA2025D"
-		    type       	"String")
-		(object ClassAttribute "encodingStyles"
-		    quid       	"3EE4A58F01AE"
-		    stereotype 	"0..*"
-		    type       	"IString"))
-	    language   	"Java")
-	(object Class "SOAPFault"
-	    quid       	"3A06D9FA00F7"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE09A4A0020"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "use"
-		    quid       	"3A09821A012B"
-		    type       	"String")
-		(object ClassAttribute "namespaceURI"
-		    quid       	"3AD6204803AE"
-		    type       	"String")
-		(object ClassAttribute "encodingStyles"
-		    quid       	"3EE4A56303AF"
-		    stereotype 	"0..*"
-		    type       	"IString"))
-	    language   	"Java")
-	(object Class "SOAPOperation"
-	    quid       	"3A0AD45500E8"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE09A4E031F"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "soapActionURI"
-		    quid       	"3A0AD464004A"
-		    type       	"String")
-		(object ClassAttribute "style"
-		    quid       	"3A0AD46C018C"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "SOAPAddress"
-	    quid       	"3AD1FF750287"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE095350098"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "locationURI"
-		    quid       	"3AD211C9025C"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "SOAPHeaderFault"
-	    quid       	"3AD632B803DD"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD633340038"
-		    supplier   	"Logical View::soap::SOAPHeaderBase"
-		    quidu      	"3A01DEE7034D"))
-	    language   	"Java")
-	(object Class "SOAPHeader"
-	    quid       	"3AD63309016D"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD63330017D"
-		    supplier   	"Logical View::soap::SOAPHeaderBase"
-		    quidu      	"3A01DEE7034D"))
-	    language   	"Java")
-	(object Class "IString"
-	    quid       	"3B8DD90C0220"
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.lang.String"
-		    quid       	"3B8DD9320383"
-		    stereotype 	"javaclass")))
-	(object Association "$UNNAMED$0"
-	    quid       	"3A06E0B50036"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$1"
-		    quid       	"3A06E0B600C4"
-		    supplier   	"Logical View::soap::SOAPBody"
-		    quidu      	"3A01DED5031F")
-		(object Role "parts"
-		    quid       	"3A06E0B600C5"
-		    label      	"parts"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$2"
-	    quid       	"3AD62DE60130"
-	    roles      	(list role_list
-		(object Role "message"
-		    quid       	"3AD62DE7004B"
-		    label      	"message"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3AD62DE70055"
-		    supplier   	"Logical View::soap::SOAPHeaderBase"
-		    quidu      	"3A01DEE7034D")))
-	(object Association "$UNNAMED$4"
-	    quid       	"3AD62DF802D1"
-	    roles      	(list role_list
-		(object Role "part"
-		    quid       	"3AD62DFA0002"
-		    label      	"part"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$5"
-		    quid       	"3AD62DFA0003"
-		    supplier   	"Logical View::soap::SOAPHeaderBase"
-		    quidu      	"3A01DEE7034D")))
-	(object Association "$UNNAMED$6"
-	    quid       	"3AD6333701CD"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$7"
-		    quid       	"3AD633370372"
-		    supplier   	"Logical View::soap::SOAPHeader"
-		    quidu      	"3AD63309016D"
-		    is_aggregate 	TRUE)
-		(object Role "headerFaults"
-		    quid       	"3AD633370373"
-		    label      	"headerFaults"
-		    supplier   	"Logical View::soap::SOAPHeaderFault"
-		    quidu      	"3AD632B803DD"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Binding"
-	    quid       	"3A01CF23029F"
-	    title      	"Binding"
-	    zoom       	87
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	324
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::soap::SOAPBinding" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(272, 208)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(55, 100)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	434
-			justify    	0
-			label      	"SOAPBinding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01D3B901AD"
-		    width      	452
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPOperation" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1040, 208)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(803, 100)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	474
-			justify    	0
-			label      	"SOAPOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0AD45500E8"
-		    width      	492
-		    height     	240
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::soap::SOAPHeader" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(560, 960)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(395, 907)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	330
-			justify    	0
-			label      	"SOAPHeader")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD63309016D"
-		    width      	348
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPHeaderFault" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1360, 960)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(1142, 907)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	436
-			justify    	0
-			label      	"SOAPHeaderFault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD632B803DD"
-		    width      	454
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$6" @5
-		    location   	(933, 961)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD6333701CD"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$7" @6
-			    Parent_View 	@5
-			    location   	(277, -543)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD633370372"
-			    client     	@5
-			    supplier   	@3
-			    line_style 	3
-			    origin_attachment 	(933, 961)
-			    terminal_attachment 	(734, 961))
-			(object RoleView "headerFaults" @7
-			    Parent_View 	@5
-			    location   	(277, -543)
-			    label      	(object SegLabel @8
-				Parent_View 	@7
-				location   	(928, 921)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	346
-				justify    	0
-				label      	"+headerFaults"
-				pctDist    	-0.030702
-				height     	41
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD633370373"
-			    client     	@5
-			    supplier   	@4
-			    line_style 	3
-			    origin_attachment 	(933, 961)
-			    terminal_attachment 	(1133, 961)
-			    label      	(object SegLabel @9
-				Parent_View 	@7
-				location   	(1080, 924)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.736842
-				height     	38
-				orientation 	0)
-			    label      	(object SegLabel @10
-				Parent_View 	@7
-				location   	(1056, 999)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	151
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.614035
-				height     	38
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::Message" @11
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1824, 496)
-		    label      	(object ItemLabel
-			Parent_View 	@11
-			location   	(1701, 419)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	246
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	264
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPHeaderBase" @12
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1040, 528)
-		    label      	(object ItemLabel
-			Parent_View 	@12
-			location   	(794, 420)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	492
-			justify    	0
-			label      	"SOAPHeaderBase")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01DEE7034D"
-		    width      	510
-		    height     	240
-		    annotation 	8)
-		(object AssociationViewNew "$UNNAMED$2" @13
-		    location   	(1493, 485)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD62DE60130"
-		    roleview_list 	(list RoleViews
-			(object RoleView "message" @14
-			    Parent_View 	@13
-			    location   	(341, -683)
-			    label      	(object SegLabel @15
-				Parent_View 	@14
-				location   	(1574, 515)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	256
-				justify    	0
-				label      	"+message"
-				pctDist    	0.412322
-				height     	30
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD62DE7004B"
-			    client     	@13
-			    supplier   	@11
-			    line_style 	3
-			    origin_attachment 	(1493, 485)
-			    terminal_attachment 	(1692, 485)
-			    label      	(object SegLabel @16
-				Parent_View 	@14
-				location   	(1630, 448)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.687204
-				height     	38
-				orientation 	0))
-			(object RoleView "$UNNAMED$3" @17
-			    Parent_View 	@13
-			    location   	(341, -683)
-			    label      	(object SegLabel @18
-				Parent_View 	@17
-				location   	(1420, 525)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	""
-				pctDist    	0.372254
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD62DE70055"
-			    client     	@13
-			    supplier   	@12
-			    line_style 	3
-			    origin_attachment 	(1493, 485)
-			    terminal_attachment 	(1295, 485))))
-		(object ClassView "Class" "Logical View::soap::SOAPBody" @19
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1040, 1344)
-		    label      	(object ItemLabel
-			Parent_View 	@19
-			location   	(794, 1236)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	492
-			justify    	0
-			label      	"SOAPBody")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01DED5031F"
-		    width      	510
-		    height     	240
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::Part" @20
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1824, 1200)
-		    label      	(object ItemLabel
-			Parent_View 	@20
-			location   	(1628, 956)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	392
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    width      	410
-		    height     	512
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$4" @21
-		    location   	(1590, 704)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD62DF802D1"
-		    roleview_list 	(list RoleViews
-			(object RoleView "part" @22
-			    Parent_View 	@21
-			    location   	(438, -464)
-			    label      	(object SegLabel @23
-				Parent_View 	@22
-				location   	(1917, 886)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	120
-				justify    	0
-				label      	"+part"
-				pctDist    	0.881465
-				height     	90
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD62DFA0002"
-			    client     	@21
-			    supplier   	@20
-			    vertices   	(list Points
-				(1590, 704)
-				(1827, 704)
-				(1827, 944))
-			    line_style 	3
-			    origin_attachment 	(1590, 704)
-			    terminal_attachment 	(1827, 944)
-			    label      	(object SegLabel @24
-				Parent_View 	@22
-				location   	(1774, 886)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.881465
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$5" @25
-			    Parent_View 	@21
-			    location   	(438, -464)
-			    label      	(object SegLabel @26
-				Parent_View 	@25
-				location   	(1209, 746)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	120
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD62DFA0003"
-			    client     	@21
-			    supplier   	@12
-			    vertices   	(list Points
-				(1590, 704)
-				(1170, 704)
-				(1170, 648))
-			    line_style 	3
-			    origin_attachment 	(1590, 704)
-			    terminal_attachment 	(1170, 648))))
-		(object AssociationViewNew "$UNNAMED$0" @27
-		    location   	(1457, 1390)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A06E0B50036"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$1" @28
-			    Parent_View 	@27
-			    location   	(225, -914)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A06E0B600C4"
-			    client     	@27
-			    supplier   	@19
-			    line_style 	3
-			    origin_attachment 	(1457, 1390)
-			    terminal_attachment 	(1295, 1390))
-			(object RoleView "parts" @29
-			    Parent_View 	@27
-			    location   	(225, -914)
-			    label      	(object SegLabel @30
-				Parent_View 	@29
-				location   	(1591, 1494)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	159
-				justify    	0
-				label      	"+parts"
-				pctDist    	0.833856
-				height     	104
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A06E0B600C5"
-			    client     	@27
-			    supplier   	@20
-			    line_style 	3
-			    origin_attachment 	(1457, 1390)
-			    terminal_attachment 	(1619, 1390)
-			    label      	(object SegLabel @31
-				Parent_View 	@29
-				location   	(1591, 1344)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.833856
-				height     	47
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::soap::SOAPFault" @32
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1040, 1648)
-		    label      	(object ItemLabel
-			Parent_View 	@32
-			location   	(794, 1540)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	492
-			justify    	0
-			label      	"SOAPFault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A06D9FA00F7"
-		    width      	510
-		    height     	240
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::soap::IString" @33
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(240, 1360)
-		    label      	(object ItemLabel
-			Parent_View 	@33
-			location   	(66, 1332)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	348
-			justify    	0
-			label      	"IString")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@33
-			location   	(66, 1282)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	348
-			justify    	0
-			label      	"<<datatype>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B8DD90C0220"
-		    width      	366
-		    height     	180
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @34
-		    location   	(1040, 750)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@12
-		    vertices   	(list Points
-			(1040, 750)
-			(1040, 648)))
-		(object InheritView "" @35
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD63330017D"
-		    client     	@3
-		    supplier   	@12
-		    line_style 	3
-		    origin_attachment 	(645, 895)
-		    terminal_attachment 	(645, 750)
-		    drawSupplier 	@34)
-		(object InheritView "" @36
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD633340038"
-		    client     	@4
-		    supplier   	@12
-		    line_style 	3
-		    origin_attachment 	(1316, 895)
-		    terminal_attachment 	(1316, 750)
-		    drawSupplier 	@34)))
-	(object ClassDiagram "Port"
-	    quid       	"3A085E30035C"
-	    title      	"Port"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::soap::SOAPAddress" @37
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(352, 320)
-		    label      	(object ItemLabel
-			Parent_View 	@37
-			location   	(151, 239)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	402
-			justify    	0
-			label      	"SOAPAddress")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD1FF750287"
-		    width      	420
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)))
-	(object ClassDiagram "Extensibility"
-	    quid       	"3AE099B10161"
-	    title      	"Extensibility"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::soap::SOAPAddress" @38
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1520, 576)
-		    label      	(object ItemLabel
-			Parent_View 	@38
-			location   	(1371, 527)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	298
-			justify    	0
-			label      	"SOAPAddress")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD1FF750287"
-		    width      	316
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPBinding" @39
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 592)
-		    label      	(object ItemLabel
-			Parent_View 	@39
-			location   	(162, 543)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	284
-			justify    	0
-			label      	"SOAPBinding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01D3B901AD"
-		    width      	302
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPBody" @40
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1072, 1104)
-		    label      	(object ItemLabel
-			Parent_View 	@40
-			location   	(950, 1055)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	244
-			justify    	0
-			label      	"SOAPBody")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01DED5031F"
-		    width      	262
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPFault" @41
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1232, 1264)
-		    label      	(object ItemLabel
-			Parent_View 	@41
-			location   	(1112, 1215)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	240
-			justify    	0
-			label      	"SOAPFault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A06D9FA00F7"
-		    width      	258
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPOperation" @42
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(512, 752)
-		    label      	(object ItemLabel
-			Parent_View 	@42
-			location   	(344, 703)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	336
-			justify    	0
-			label      	"SOAPOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0AD45500E8"
-		    width      	354
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::soap::SOAPHeaderBase" @43
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(816, 928)
-		    label      	(object ItemLabel
-			Parent_View 	@43
-			location   	(627, 879)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	378
-			justify    	0
-			label      	"SOAPHeaderBase")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A01DEE7034D"
-		    width      	396
-		    height     	122
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @44
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(608, 128)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@44
-			location   	(408, 53)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	400
-			justify    	0
-			label      	"ExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5DBB602A9"
-		    width      	418
-		    height     	174
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @45
-		    location   	(608, 305)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@44
-		    vertices   	(list Points
-			(608, 305)
-			(608, 215)))
-		(object InheritView "" @46
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE09A3801AB"
-		    client     	@39
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(344, 531)
-		    terminal_attachment 	(344, 305)
-		    drawSupplier 	@45)
-		(object InheritView "" @47
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE09A3E0326"
-		    client     	@43
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(815, 867)
-		    terminal_attachment 	(815, 305)
-		    drawSupplier 	@45)
-		(object InheritView "" @48
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE09A450041"
-		    client     	@40
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(1068, 1043)
-		    terminal_attachment 	(1068, 305)
-		    drawSupplier 	@45)
-		(object InheritView "" @49
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE09A4E031F"
-		    client     	@42
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(506, 691)
-		    terminal_attachment 	(506, 305)
-		    drawSupplier 	@45)
-		(object InheritView "" @50
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE09A4A0020"
-		    client     	@41
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(1231, 1203)
-		    terminal_attachment 	(1231, 305)
-		    drawSupplier 	@45)
-		(object InheritView "" @51
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE095350098"
-		    client     	@38
-		    supplier   	@44
-		    line_style 	3
-		    origin_attachment 	(1520, 515)
-		    terminal_attachment 	(1520, 305)
-		    drawSupplier 	@45)))))

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.ecore b/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.ecore
deleted file mode 100644
index 17aecb8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.ecore
+++ /dev/null

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0"
-  xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="soap"
-    nsURI="http://www.ibm.com/wsdl/2003/SOAP" nsPrefix="soap">
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPBinding" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="transportURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPBody" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="use" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="encodingStyles" upperBound="-1"
-        eType="#//IString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parts" upperBound="-1"
-        eType="ecore:EClass wsdl.ecore#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPHeaderBase" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="use" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="encodingStyles" upperBound="-1"
-        eType="#//IString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="message" lowerBound="1"
-        eType="ecore:EClass wsdl.ecore#//Message"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="part" lowerBound="1" eType="ecore:EClass wsdl.ecore#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPFault" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="use" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="encodingStyles" upperBound="-1"
-        eType="#//IString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPOperation" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="soapActionURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPAddress" eSuperTypes="wsdl.ecore#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPHeaderFault" eSuperTypes="#//SOAPHeaderBase"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPHeader" eSuperTypes="#//SOAPHeaderBase">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="headerFaults" upperBound="-1"
-        eType="#//SOAPHeaderFault" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="IString" instanceClassName="java.lang.String"/>
-</ecore:EPackage>

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.mdl b/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.mdl
deleted file mode 100644
index 43d0aa9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/model/soap.mdl
+++ /dev/null

@@ -1,32688 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"39E27F080064"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"39E27F080078"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"39E27F080063"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"39E27F080065"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "wsdl"
-		quid       	"3ADFB8E5021E"
-		documentation 	
-|The WSDL model contains classes for the Web Services Description Language (WSDL).
-|
-|WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
-|
-|WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
-|
-|The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
-|- 2.1 Definition, shows the WSDL definition element and the WSDL document structure
-|- 2.1.1 Naming and Linking, shows the namespace and import mechanism
-|- 2.1.3 Extensibility, shows the WSDL extensibility mechanism
-|- 2.2 Types, shows the use of XML Schema types in WSDL
-|- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
-|
-|The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "WSDLElement"
-			quid       	"3AD5C6A302DD"
-			documentation 	"This class represents a WSDL language element."
-			operations 	(list Operations
-			    (object Operation "getEnclosingDefinition"
-				quid       	"3CD1529600C8"
-				result     	"Definition"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setEnclosingDefinition"
-				quid       	"3CD152B80347"
-				parameters 	(list Parameters
-				    (object Parameter "definition"
-					type       	"Definition"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "documentationElement"
-				quid       	"3CCE443602A3"
-				type       	"DOMElement")
-			    (object ClassAttribute "element"
-				quid       	"3F97DBD30207"
-				type       	"DOMElement"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "PortType"
-			quid       	"3AD5C7F001A5"
-			documentation 	"This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5C9B70150"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FD8019F"
-				supplier   	"Logical View::wsdl::IPortType"
-				quidu      	"3B84A5BE0331"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB488E0023"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1E301E5"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CDEB0316"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4FD01BA"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Operation"
-			quid       	"3AD5C80D03CE"
-			documentation 	"This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE9DE98003C"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FE20171"
-				supplier   	"Logical View::wsdl::IOperation"
-				quidu      	"3B84A77600D1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "style"
-				quid       	"3AEB472601AC"
-				type       	"OperationType")
-			    (object ClassAttribute "name"
-				quid       	"3BDD9643004C"
-				type       	"String")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF235003E"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE2201AD"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D520011B"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Message"
-			quid       	"3AD5C9590078"
-			documentation 	"This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5D05501C4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3B84A8D102BA"
-				supplier   	"Logical View::wsdl::IMessage"
-				quidu      	"3B84A8AF004F"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB487C01FE"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1D20226"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE4B02B0"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D54200F1"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Part"
-			quid       	"3AD5CE1C032E"
-			documentation 	"This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84A96D02F1"
-				supplier   	"Logical View::wsdl::IPart"
-				quidu      	"3B84A93F01BE")
-			    (object Inheritance_Relationship
-				quid       	"3B897E230237"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3BCE70B703C8"
-				type       	"String")
-			    (object ClassAttribute "elementName"
-				quid       	"3B84B08703DB"
-				type       	"QName")
-			    (object ClassAttribute "typeName"
-				quid       	"3BCE70C303C5"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Binding"
-			quid       	"3AD5D2860261"
-			documentation 	"This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA0F02F0"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B8595410129"
-				supplier   	"Logical View::wsdl::IBinding"
-				quidu      	"3B84ABC60219"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB4899014B"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1F401A3"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18CE6D0151"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4DF035C"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOperation"
-			quid       	"3AD5D3CB0145"
-			documentation 	"This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD6009202F7"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84ADE401DC"
-				supplier   	"Logical View::wsdl::IBindingOperation"
-				quidu      	"3B84ADC00072"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B89C4CB0199"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Service"
-			quid       	"3AD5D8F002F8"
-			documentation 	"This class represents a WSDL service element. A service groups a set of related ports together."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA20025E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954E01B4"
-				supplier   	"Logical View::wsdl::IService"
-				quidu      	"3B84AB490287"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB48A40151"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF20D0203"
-				type       	"boolean")
-			    (object ClassAttribute "proxy"
-				quid       	"3D18D4810220"
-				type       	"boolean")
-			    (object ClassAttribute "resourceURI"
-				quid       	"3D18D4C501E2"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Port"
-			quid       	"3AD5D9170286"
-			documentation 	"This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD600CB00AA"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954502C9"
-				supplier   	"Logical View::wsdl::IPort"
-				quidu      	"3B84AB800326"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3AD5D9A00391"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibilityElement"
-			quid       	"3AD5DBB602A9"
-			documentation 	"This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84B14903D0"
-				supplier   	"Logical View::wsdl::IExtensibilityElement"
-				quidu      	"3B84B12402AB")
-			    (object Inheritance_Relationship
-				quid       	"3BDDF53502C3"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3AF9543C0073"
-				type       	"boolean")
-			    (object ClassAttribute "elementType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B85B21A0271"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Definition"
-			quid       	"3AD5E43F008E"
-			documentation 	"This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FDB803D4"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84B1F80382"
-				supplier   	"Logical View::wsdl::IDefinition"
-				quidu      	"3B84B1D90142"))
-			operations 	(list Operations
-			    (object Operation "getDocument"
-				quid       	"3CD14FC2012B"
-				result     	"DOMDocument"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocument"
-				quid       	"3CD150DE01E7"
-				parameters 	(list Parameters
-				    (object Parameter "document"
-					type       	"DOMDocument"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3AD5E474004E"
-				type       	"String")
-			    (object ClassAttribute "location"
-				quid       	"40352B7C0396"
-				type       	"String")
-			    (object ClassAttribute "qName"
-				quid       	"3AEB485702F5"
-				type       	"QName")
-			    (object ClassAttribute "encoding"
-				quid       	"3CADD00D000D"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Import"
-			quid       	"3AD5E4F903DE"
-			documentation 	"This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5EE58037A"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F200D0340"
-				supplier   	"Logical View::wsdl::IImport"
-				quidu      	"3B84B2020119"))
-			operations 	(list Operations
-			    (object Operation "getSchema"
-				quid       	"3C8672C10379"
-				result     	"XSDSchema"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setSchema"
-				quid       	"3C8672C10397"
-				parameters 	(list Parameters
-				    (object Parameter "schema"
-					type       	"XSDSchema"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD5E50A0036"
-				type       	"String")
-			    (object ClassAttribute "locationURI"
-				quid       	"3AD5E5140211"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibleElement"
-			quid       	"3AD5FCFA033A"
-			documentation 	" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FE3C03D4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			operations 	(list Operations
-			    (object Operation "getExtensibilityElements"
-				quid       	"3B85C12C03CD"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addExtensibilityElement"
-				quid       	"3B85C1470295"
-				parameters 	(list Parameters
-				    (object Parameter "extElement"
-					type       	"IExtensibilityElement"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "Input"
-			quid       	"3AE0789F0059"
-			documentation 	"This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C504025F"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67722802E7"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FEE031D"
-				supplier   	"Logical View::wsdl::IInput"
-				quidu      	"3B84A7EE0015"))
-			language   	"Java")
-		    (object Class "Output"
-			quid       	"3AE078B60232"
-			documentation 	"This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C50C035B"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723500DD"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FF801CD"
-				supplier   	"Logical View::wsdl::IOutput"
-				quidu      	"3B84A829027D"))
-			language   	"Java")
-		    (object Class "Fault"
-			quid       	"3AE078BE0108"
-			documentation 	"This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE1C82002F2"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723D0319"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F2002002D"
-				supplier   	"Logical View::wsdl::IFault"
-				quidu      	"3B84A861031D"))
-			language   	"Java")
-		    (object Class "BindingInput"
-			quid       	"3AE08A8202D4"
-			documentation 	"This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE1B0113"
-				supplier   	"Logical View::wsdl::IBindingInput"
-				quidu      	"3B84ADEB0100")
-			    (object Inheritance_Relationship
-				quid       	"3B85B59B0072"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getInput"
-				quid       	"3C8653A40203"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8653B503A2"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C1EA020E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOutput"
-			quid       	"3AE08A8F028C"
-			documentation 	"This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE4302AB"
-				supplier   	"Logical View::wsdl::IBindingOutput"
-				quidu      	"3B84AE210111")
-			    (object Inheritance_Relationship
-				quid       	"3B85B5A4027E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getOutput"
-				quid       	"3C8653D900F1"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8653F10326"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C20200BE"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingFault"
-			quid       	"3AE08A9E03A6"
-			documentation 	"This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE0938602C9"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84AE710333"
-				supplier   	"Logical View::wsdl::IBindingFault"
-				quidu      	"3B84AE4F00BD"))
-			operations 	(list Operations
-			    (object Operation "getFault"
-				quid       	"3C865413037F"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFault"
-				quid       	"3C8654210109"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85BF9E014A"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "QName"
-			quid       	"3AE8ED220140"
-			documentation 	"This class represents the javax.wsdl.QName class. A QName is a fully qualified name."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.xml.namespace.QName"
-				quid       	"3B849DA9003D"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "Namespace"
-			quid       	"3AEA3CD30030"
-			documentation 	"This class represents a namespace and the corresponding namespace prefix used in a WSDL document."
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "URI"
-				quid       	"3AEA3D2901B1"
-				type       	"String")
-			    (object ClassAttribute "prefix"
-				quid       	"3AEA3D320236"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "OperationType"
-			quid       	"3AEB4782024F"
-			documentation 	
-|ONE_WAY=1
-|REQUEST_RESPONSE=2
-|SOLICIT_RESPONSE=3
-|NOTIFICATION=4
-			
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.OperationType"
-				quid       	"3B85C35303E3"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IPortType"
-			quid       	"3B84A5BE0331"
-			documentation 	"This class represents the javax.wsdl.PortType non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addOperation"
-				quid       	"3B896AC101CA"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3B896BAF01A4"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperations"
-				quid       	"3B896BF7031A"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.PortType"
-				quid       	"3B84A632000D"
-				stereotype 	"javaclass")))
-		    (object Class "IOperation"
-			quid       	"3B84A77600D1"
-			documentation 	"This class represents the javax.wsdl.Operation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addFault"
-				quid       	"3B896C420065"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFault"
-				quid       	"3B896C59028F"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFaults"
-				quid       	"3B896C7102B1"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParameterOrdering"
-				quid       	"3B896C8101B0"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setParameterOrdering"
-				quid       	"3B896C99031D"
-				parameters 	(list Parameters
-				    (object Parameter "parameterOrder"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInput"
-				quid       	"3C8654E5018D"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8662C40107"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOutput"
-				quid       	"3C8662E40094"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8662F001D2"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Operation"
-				quid       	"3B84A799012B"
-				stereotype 	"javaclass")))
-		    (object Class "IInput"
-			quid       	"3B84A7EE0015"
-			documentation 	"This class represents the javax.wsdl.Input non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86633100EF"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8663470277"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Input"
-				quid       	"3B84A8000039"
-				stereotype 	"javaclass")))
-		    (object Class "IOutput"
-			quid       	"3B84A829027D"
-			documentation 	"This class represents the javax.wsdl.Output non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86643A035D"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C86644501C8"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Output"
-				quid       	"3B84A83901D5"
-				stereotype 	"javaclass")))
-		    (object Class "IFault"
-			quid       	"3B84A861031D"
-			documentation 	"This class represents the javax.wsdl.Fault non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86646A00BD"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8664750131"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Fault"
-				quid       	"3B84A8710208"
-				stereotype 	"javaclass")))
-		    (object Class "IMessage"
-			quid       	"3B84A8AF004F"
-			documentation 	"This class represents the javax.wsdl.Message non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPart"
-				quid       	"3B8972240273"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"IPart"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"3B89723D0233"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParts"
-				quid       	"3B897254025E"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOrderedParts"
-				quid       	"3B897261020D"
-				parameters 	(list Parameters
-				    (object Parameter "partOrder"
-					type       	"IList"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Message"
-				quid       	"3B84A8BC0260"
-				stereotype 	"javaclass")))
-		    (object Class "IPart"
-			quid       	"3B84A93F01BE"
-			documentation 	"This class represents the javax.wsdl.Part non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "setExtensionAttribute"
-				quid       	"3C4688450052"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName")
-				    (object Parameter "value"
-					type       	"QName"))
-				exceptions 	"WSDLException"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttributeNames"
-				quid       	"3C468A0101C3"
-				result     	"IIterator"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttribute"
-				quid       	"3C468A2D02D5"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"QName"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Part"
-				quid       	"3B84A9500231"
-				stereotype 	"javaclass")))
-		    (object Class "IService"
-			quid       	"3B84AB490287"
-			documentation 	"This class represents the javax.wsdl.Service non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPort"
-				quid       	"3B895D5601D1"
-				parameters 	(list Parameters
-				    (object Parameter "port"
-					type       	"IPort"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPorts"
-				quid       	"3B895DA20036"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPort"
-				quid       	"3B895DB001BC"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Service"
-				quid       	"3B84AB5B003E"
-				stereotype 	"javaclass")))
-		    (object Class "IPort"
-			quid       	"3B84AB800326"
-			documentation 	"This class represents the javax.wsdl.Port non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getBinding"
-				quid       	"3C8651F302B5"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBinding"
-				quid       	"3C86526302F2"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Port"
-				quid       	"3B84AB8C0016"
-				stereotype 	"javaclass")))
-		    (object Class "IBinding"
-			quid       	"3B84ABC60219"
-			documentation 	"This class represents the javax.wsdl.Binding non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingOperation"
-				quid       	"3B895F160153"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOperation"
-					type       	"IBindingOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperation"
-				quid       	"3B895F500066"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperations"
-				quid       	"3B895FA401C5"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3C8652A90284"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setPortType"
-				quid       	"3C8652BE01A8"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Binding"
-				quid       	"3B84ABCF0302"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOperation"
-			quid       	"3B84ADC00072"
-			documentation 	"This class represents the javax.wsdl.BindingOperation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingFault"
-				quid       	"3B8960BC0041"
-				parameters 	(list Parameters
-				    (object Parameter "bindingFault"
-					type       	"IBindingFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFault"
-				quid       	"3B8960D9009D"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFaults"
-				quid       	"3B8960FC0061"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3C86532D0017"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOperation"
-				quid       	"3C86533F037B"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingInput"
-				quid       	"3C86550900DA"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingInput"
-				quid       	"3C86551D007F"
-				parameters 	(list Parameters
-				    (object Parameter "bindingInput"
-					type       	"IBindingInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOutput"
-				quid       	"3C8655340349"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingOutput"
-				quid       	"3C86554702A6"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOutput"
-					type       	"IBindingOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOperation"
-				quid       	"3B84ADCB021C"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingInput"
-			quid       	"3B84ADEB0100"
-			documentation 	"This class represents the javax.wsdl.BindingInput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingInput"
-				quid       	"3B84ADFE000D"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOutput"
-			quid       	"3B84AE210111"
-			documentation 	"This class represents the javax.wsdl.BindingOutput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOutput"
-				quid       	"3B84AE2D0050"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingFault"
-			quid       	"3B84AE4F00BD"
-			documentation 	"This class represents the javax.wsdl.BindingFault non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingFault"
-				quid       	"3B84AE5F002A"
-				stereotype 	"javaclass")))
-		    (object Class "DOMElement"
-			quid       	"3B84AF3203DB"
-			documentation 	"This class represents the org.w3c.dom.Element non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B84AF560292"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensibilityElement"
-			quid       	"3B84B12402AB"
-			documentation 	"This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensibilityElement"
-				quid       	"3B84B13503D1"
-				stereotype 	"javaclass")))
-		    (object Class "IDefinition"
-			quid       	"3B84B1D90142"
-			documentation 	"This class represents the javax.wsdl.Definition non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBinding"
-				quid       	"3B8988F1039D"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addImport"
-				quid       	"3B8989490259"
-				parameters 	(list Parameters
-				    (object Parameter "importDef"
-					type       	"IImport"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addMessage"
-				quid       	"3B89896E005E"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addNamespace"
-				quid       	"3B898984004B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String")
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addPortType"
-				quid       	"3B8989C50045"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addService"
-				quid       	"3B8989E401EE"
-				parameters 	(list Parameters
-				    (object Parameter "service"
-					type       	"IService"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingFault"
-				quid       	"3B898A17038C"
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingInput"
-				quid       	"3B898A320286"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOutput"
-				quid       	"3B898A46013B"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOperation"
-				quid       	"3B898A5C00B0"
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBinding"
-				quid       	"3B8989FE037C"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createFault"
-				quid       	"3B898A7502E7"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createImport"
-				quid       	"3B898A83014C"
-				result     	"IImport"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createInput"
-				quid       	"3B898A9D033E"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createMessage"
-				quid       	"3B898AAF0254"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOperation"
-				quid       	"3B898AC203C4"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOutput"
-				quid       	"3B898AE800ED"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPart"
-				quid       	"3B898AF8026D"
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPort"
-				quid       	"3B898B0801DA"
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPortType"
-				quid       	"3B898B15039B"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createService"
-				quid       	"3B898B32013A"
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBinding"
-				quid       	"3B898B420075"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindings"
-				quid       	"3B898B920341"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BCD0060"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BE70144"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessage"
-				quid       	"3B898C170107"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessages"
-				quid       	"3B898C3E001D"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespace"
-				quid       	"3B898C62014B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespaces"
-				quid       	"3B898C740115"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3B898CBE0071"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortTypes"
-				quid       	"3B898CDA01C6"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPrefix"
-				quid       	"3B898CFD0017"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getService"
-				quid       	"3B898D2300A8"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getServices"
-				quid       	"3B898D3B03CE"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionRegistry"
-				quid       	"3B89D5B8012B"
-				result     	"IExtensionRegistry"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setExtensionRegistry"
-				quid       	"3B89D5D703BB"
-				parameters 	(list Parameters
-				    (object Parameter "extensionRegistry"
-					type       	"IExtensionRegistry"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDocumentBaseURI"
-				quid       	"3B89D5FE0208"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocumentBaseURI"
-				quid       	"3B89D6180328"
-				parameters 	(list Parameters
-				    (object Parameter "documentBase"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createTypes"
-				quid       	"3CADD0560080"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeService"
-				quid       	"3CADD07E004C"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeBinding"
-				quid       	"3CADD0BA0355"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removePortType"
-				quid       	"3CADD0D8029A"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeMessage"
-				quid       	"3CADD0FA0307"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getTypes"
-				quid       	"3C86706F031B"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setTypes"
-				quid       	"3C86709500EE"
-				parameters 	(list Parameters
-				    (object Parameter "types"
-					type       	"ITypes"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Definition"
-				quid       	"3B84B1E702A1"
-				stereotype 	"javaclass")))
-		    (object Class "IImport"
-			quid       	"3B84B2020119"
-			documentation 	"This class represents the javax.wsdl.Import non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Import"
-				quid       	"3B84B20C02EA"
-				stereotype 	"javaclass")))
-		    (object Class "IList"
-			quid       	"3B85C0A203C5"
-			documentation 	"This class represents the non-MOF java.util.List interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"3B85C0AF0297"
-				stereotype 	"javaclass")))
-		    (object Class "IMap"
-			quid       	"3B896B0300D4"
-			documentation 	"This class represents the non-MOF java.util.Map interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Map"
-				quid       	"3B896B1102B5"
-				stereotype 	"javaclass")))
-		    (object Class "IURL"
-			quid       	"3B89D5630274"
-			documentation 	"This class represents the non-MOF java.net.URL interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.net.URL"
-				quid       	"3B89D56E03E2"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensionRegistry"
-			quid       	"3B89D59302A5"
-			documentation 	"This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensionRegistry"
-				quid       	"3B89D59F02E8"
-				stereotype 	"javaclass")))
-		    (object Class "Types"
-			quid       	"3B8BE9A603A8"
-			documentation 	"This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B8BEB010311"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3CADCD3B0380"
-				supplier   	"Logical View::wsdl::ITypes"
-				quidu      	"3CADCBB20050"))
-			operations 	(list Operations
-			    (object Operation "getSchemas"
-				quid       	"3CADCF3803E6"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSchemas"
-				quid       	"3CADCF7E0301"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)))
-		    (object Class "IIterator"
-			quid       	"3C4687DA0167"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Iterator"
-				quid       	"3C46880800B9"
-				stereotype 	"javaclass")))
-		    (object Class "WSDLException"
-			quid       	"3C4689650313"
-			documentation 	"This class represents the javax.wsdl.Exception class."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.WSDLException"
-				quid       	"3C4689740315"
-				stereotype 	"javaclass")))
-		    (object Class "ITypes"
-			quid       	"3CADCBB20050"
-			documentation 	"This class represents the javax.wsdl.Types non-MOF interface"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Types"
-				quid       	"3CADCBF10173"
-				stereotype 	"javaclass")))
-		    (object Class "UnknownExtensibilityElement"
-			quid       	"3CB24AC002AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CB24AEC01CB"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "XSDSchemaExtensibilityElement"
-			quid       	"3CC360D7039C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CC3627F00B7"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "DOMDocument"
-			quid       	"3CD1502C023B"
-			documentation 	"This class represents the org.w3c.dom.Document non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3CD150600182"
-				stereotype 	"javaclass")))
-		    (object Class "MessageReference"
-			quid       	"3F6771DB02DC"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3F762A6A0308"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3F6780A001AB"
-				type       	"String"
-				exportControl 	"Protected"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Association "$UNNAMED$0"
-			quid       	"3AD5C824018C"
-			roles      	(list role_list
-			    (object Role "portType"
-				quid       	"3AD5C82701C3"
-				label      	"portType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				Containment 	"By Value"
-				is_aggregate 	TRUE)
-			    (object Role "eOperations"
-				quid       	"3AD5C82701CD"
-				label      	"eOperations"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$1"
-			quid       	"3AD5CEBE00E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$2"
-				quid       	"3AD5CEBF0057"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eParts"
-				quid       	"3AD5CEBF0061"
-				label      	"eParts"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$3"
-			quid       	"3AD5D352010F"
-			roles      	(list role_list
-			    (object Role "ePortType"
-				quid       	"3AD5D3540176"
-				label      	"ePortType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$4"
-				quid       	"3AD5D3540180"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261")))
-		    (object Association "$UNNAMED$5"
-			quid       	"3AD5D3E10179"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$6"
-				quid       	"3AD5D3E20225"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindingOperations"
-				quid       	"3AD5D3E20239"
-				label      	"eBindingOperations"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$7"
-			quid       	"3AD5D425038A"
-			roles      	(list role_list
-			    (object Role "eOperation"
-				quid       	"3AD5D42602F5"
-				label      	"eOperation"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$8"
-				quid       	"3AD5D42602FF"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145")))
-		    (object Association "$UNNAMED$9"
-			quid       	"3AD5D9400393"
-			roles      	(list role_list
-			    (object Role "ePorts"
-				quid       	"3AD5D941031C"
-				label      	"ePorts"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$10"
-				quid       	"3AD5D941031D"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$11"
-			quid       	"3AD5D9B8011F"
-			roles      	(list role_list
-			    (object Role "eBinding"
-				quid       	"3AD5D9B9024D"
-				label      	"eBinding"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$12"
-				quid       	"3AD5D9B90261"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286")))
-		    (object Association "$UNNAMED$13"
-			quid       	"3AD5E60301E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$14"
-				quid       	"3AD5E60400B7"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eMessages"
-				quid       	"3AD5E60400C1"
-				label      	"eMessages"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$15"
-			quid       	"3AD5E6710104"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$16"
-				quid       	"3AD5E672034A"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "ePortTypes"
-				quid       	"3AD5E6720354"
-				label      	"ePortTypes"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$17"
-			quid       	"3AD5E6770095"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$18"
-				quid       	"3AD5E6780371"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindings"
-				quid       	"3AD5E678037B"
-				label      	"eBindings"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$19"
-			quid       	"3AD5E67B0311"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$20"
-				quid       	"3AD5E67D007F"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eServices"
-				quid       	"3AD5E67D0089"
-				label      	"eServices"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$21"
-			quid       	"3AD5FD130079"
-			roles      	(list role_list
-			    (object Role "eExtensibilityElements"
-				quid       	"3AD5FD14019D"
-				label      	"eExtensibilityElements"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$22"
-				quid       	"3AD5FD14019E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$23"
-			quid       	"3ADF2E6401F5"
-			roles      	(list role_list
-			    (object Role "eBindingInput"
-				quid       	"3ADF2E650251"
-				label      	"eBindingInput"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$24"
-				quid       	"3ADF2E650252"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$25"
-			quid       	"3ADF2EB30163"
-			roles      	(list role_list
-			    (object Role "eBindingOutput"
-				quid       	"3ADF2EB4013C"
-				label      	"eBindingOutput"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$26"
-				quid       	"3ADF2EB4013D"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$27"
-			quid       	"3ADF2F94024D"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3ADF2F950190"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$28"
-				quid       	"3ADF2F95019A"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$29"
-			quid       	"3ADF2FB802F9"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3ADF2FB9020A"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$30"
-				quid       	"3ADF2FB9020B"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$31"
-			quid       	"3ADF331601A4"
-			roles      	(list role_list
-			    (object Role "eFaults"
-				quid       	"3ADF33180387"
-				label      	"eFaults"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$32"
-				quid       	"3ADF33180388"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$33"
-			quid       	"3ADF340003E5"
-			roles      	(list role_list
-			    (object Role "eBindingFaults"
-				quid       	"3ADF340103AA"
-				label      	"eBindingFaults"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$34"
-				quid       	"3ADF340103AB"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$35"
-			quid       	"3AE091F402F3"
-			roles      	(list role_list
-			    (object Role "eFault"
-				quid       	"3AE091F801FE"
-				label      	"eFault"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$36"
-				quid       	"3AE091F801FF"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6")))
-		    (object Association "$UNNAMED$37"
-			quid       	"3AEA3D55002D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$38"
-				quid       	"3AEA3D560328"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eNamespaces"
-				quid       	"3AEA3D560332"
-				label      	"eNamespaces"
-				supplier   	"Logical View::wsdl::Namespace"
-				quidu      	"3AEA3CD30030"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$39"
-			quid       	"3AEA3E3A002D"
-			roles      	(list role_list
-			    (object Role "eDefinition"
-				quid       	"3AEA3E3C01E8"
-				label      	"eDefinition"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$40"
-				quid       	"3AEA3E3C01F2"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$41"
-			quid       	"3AEA412F0035"
-			roles      	(list role_list
-			    (object Role "eParameterOrdering"
-				quid       	"3AEA41310255"
-				label      	"eParameterOrdering"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$42"
-				quid       	"3AEA4131025F"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE")))
-		    (object Association "$UNNAMED$43"
-			quid       	"3B84AD2400BD"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3B84AD250083"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$44"
-				quid       	"3B84AD250084"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4")))
-		    (object Association "$UNNAMED$45"
-			quid       	"3B84AD7900F2"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3B84AD7A014D"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$46"
-				quid       	"3B84AD7A014E"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C")))
-		    (object Association "$UNNAMED$47"
-			quid       	"3B8B1BE900C4"
-			roles      	(list role_list
-			    (object Role "typeDefinition"
-				quid       	"3B8B1BE90327"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$48"
-				quid       	"3B8B1BE90331"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$49"
-			quid       	"3B8B1C1203B2"
-			roles      	(list role_list
-			    (object Role "elementDeclaration"
-				quid       	"3B8B1C14001C"
-				label      	"elementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$50"
-				quid       	"3B8B1C140026"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$51"
-			quid       	"3B8B1DCC02E5"
-			roles      	(list role_list
-			    (object Role "eSchema"
-				quid       	"3B8B1DCE0270"
-				label      	"eSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$52"
-				quid       	"3B8B1DCE027A"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$53"
-			quid       	"3B8BEA27029F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$54"
-				quid       	"3B8BEA290356"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eTypes"
-				quid       	"3B8BEA29036A"
-				label      	"eTypes"
-				supplier   	"Logical View::wsdl::Types"
-				quidu      	"3B8BE9A603A8"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$55"
-			quid       	"3C46829303E5"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3C468296010E"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$56"
-				quid       	"3C4682960118"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$57"
-			quid       	"3C864DFF02EC"
-			roles      	(list role_list
-			    (object Role "eImports"
-				quid       	"3C864DFF02ED"
-				label      	"eImports"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$58"
-				quid       	"3C864DFF02EE"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$59"
-			quid       	"3CC3614500F2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$60"
-				quid       	"3CC36146023D"
-				supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-				quidu      	"3CC360D7039C"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "schema"
-				quid       	"3CC36146023E"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$61"
-			quid       	"3F74E78401B1"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3F74E786000F"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$62"
-				quid       	"3F74E7860023"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")))
-		    (object Association "$UNNAMED$63"
-			quid       	"3F7896A2026E"
-			roles      	(list role_list
-			    (object Role "parent"
-				quid       	"3F7896A7012B"
-				label      	"parent"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "children"
-				quid       	"3F7896A7012C"
-				label      	"children"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "2.7 Services"
-			quid       	"39AD3EF60127"
-			title      	"2.7 Services"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @1
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1173, 660)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1173, 610)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				width      	520
-				height     	404
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPort" @2
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(686, 481)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IPort")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(686, 431)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB800326"
-				width      	278
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IService" @3
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(126, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"IService")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(126, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB490287"
-				width      	246
-				height     	264
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @4
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@4
-				    location   	(44, 389)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @5
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954E01B4"
-				client     	@4
-				supplier   	@3
-				line_style 	3
-				origin_attachment 	(240, 377)
-				terminal_attachment 	(240, 292))
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @6
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@6
-				    location   	(1244, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	410
-				height     	302
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @7
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@6
-				supplier   	@1
-				line_style 	3
-				origin_attachment 	(1430, 1113)
-				terminal_attachment 	(1430, 1002))
-			    (object ClassView "Class" "Logical View::wsdl::Port" @8
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 912)
-				label      	(object ItemLabel
-				    Parent_View 	@8
-				    location   	(675, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	282
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				width      	300
-				height     	168
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @9
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954502C9"
-				client     	@8
-				supplier   	@2
-				line_style 	3
-				origin_attachment 	(809, 828)
-				terminal_attachment 	(809, 637))
-			    (object AssociationViewNew "$UNNAMED$9" @10
-				location   	(343, 916)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9400393"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePorts" @11
-					Parent_View 	@10
-					location   	(-121, 644)
-					label      	(object SegLabel @12
-					    Parent_View 	@11
-					    location   	(413, 945)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+ePorts"
-					    pctDist    	0.218978
-					    height     	29
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031C"
-					client     	@10
-					supplier   	@8
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(666, 916)
-					label      	(object SegLabel @13
-					    Parent_View 	@11
-					    location   	(539, 880)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	160
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.608000
-					    height     	37
-					    orientation 	0)
-					label      	(object SegLabel @14
-					    Parent_View 	@11
-					    location   	(448, 990)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.328467
-					    height     	74
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$10" @15
-					Parent_View 	@10
-					location   	(-121, 644)
-					label      	(object SegLabel @16
-					    Parent_View 	@15
-					    location   	(216, 744)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031D"
-					client     	@10
-					supplier   	@4
-					vertices   	(list Points
-					    (343, 916)
-					    (257, 916)
-					    (257, 679))
-					line_style 	3
-					origin_attachment 	(343, 916)
-					terminal_attachment 	(257, 679)
-					label      	(object SegLabel @17
-					    Parent_View 	@15
-					    location   	(301, 796)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.637097
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$11" @18
-				location   	(886, 1270)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9B8011F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBinding" @19
-					Parent_View 	@18
-					location   	(38, 422)
-					label      	(object SegLabel @20
-					    Parent_View 	@19
-					    location   	(1112, 1235)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eBinding"
-					    pctDist    	0.648571
-					    height     	36
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B9024D"
-					client     	@18
-					supplier   	@6
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(1235, 1270)
-					label      	(object SegLabel @21
-					    Parent_View 	@19
-					    location   	(1170, 1313)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.814286
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$12" @22
-					Parent_View 	@18
-					location   	(38, 422)
-					label      	(object SegLabel @23
-					    Parent_View 	@22
-					    location   	(852, 1106)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	""
-					    pctDist    	0.687943
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B90261"
-					client     	@18
-					supplier   	@8
-					vertices   	(list Points
-					    (886, 1270)
-					    (812, 1270)
-					    (812, 996))
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(812, 996))))))
-		    (object ClassDiagram "2.5 Bindings"
-			quid       	"39AD51270252"
-			title      	"2.5 Bindings"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @24
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(73, 114)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(73, 64)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				width      	480
-				height     	376
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOperation" @25
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 352)
-				label      	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(780, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"IBindingOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(780, 80)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADC00072"
-				width      	410
-				height     	568
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingInput" @26
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(62, 1334)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IBindingInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(62, 1284)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADEB0100"
-				width      	278
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOutput" @27
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@27
-				    location   	(61, 1638)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"IBindingOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@27
-				    location   	(61, 1588)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE210111"
-				width      	312
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingFault" @28
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(72, 1958)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"IBindingFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(72, 1908)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE4F00BD"
-				width      	290
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @29
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(1568, 486)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	673
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	691
-				height     	301
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @30
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(1756, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @31
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@31
-				    location   	(1756, 1587)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @32
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@32
-				    location   	(97, 539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @33
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@32
-				supplier   	@24
-				line_style 	3
-				origin_attachment 	(279, 527)
-				terminal_attachment 	(279, 428))
-			    (object AssociationViewNew "$UNNAMED$3" @34
-				location   	(1039, 742)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D352010F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePortType" @35
-					Parent_View 	@34
-					location   	(575, 598)
-					label      	(object SegLabel @36
-					    Parent_View 	@35
-					    location   	(1449, 781)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+ePortType"
-					    pctDist    	0.789292
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540176"
-					client     	@34
-					supplier   	@29
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(1559, 742)
-					label      	(object SegLabel @37
-					    Parent_View 	@35
-					    location   	(1492, 716)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.872193
-					    height     	27
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$4" @38
-					Parent_View 	@34
-					location   	(575, 598)
-					label      	(object SegLabel @39
-					    Parent_View 	@38
-					    location   	(776, 697)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	""
-					    pctDist    	0.509449
-					    height     	46
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540180"
-					client     	@34
-					supplier   	@32
-					line_style 	3
-					origin_attachment 	(1039, 742)
-					terminal_attachment 	(520, 742))))
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @40
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@40
-				    location   	(1672, 851)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				width      	450
-				height     	370
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @41
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@41
-				    location   	(476, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$43" @42
-				location   	(1264, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD2400BD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @43
-					Parent_View 	@42
-					location   	(96, 287)
-					label      	(object SegLabel @44
-					    Parent_View 	@43
-					    location   	(1637, 1316)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.775148
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250083"
-					client     	@42
-					supplier   	@30
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(1747, 1359)
-					label      	(object SegLabel @45
-					    Parent_View 	@43
-					    location   	(1694, 1398)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.889546
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$44" @46
-					Parent_View 	@42
-					location   	(96, 287)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250084"
-					client     	@42
-					supplier   	@41
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(781, 1359))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @47
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@47
-				    location   	(812, 1539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$45" @48
-				location   	(1432, 1654)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD7900F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @49
-					Parent_View 	@48
-					location   	(-120, 374)
-					label      	(object SegLabel @50
-					    Parent_View 	@49
-					    location   	(1645, 1612)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.674772
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014D"
-					client     	@48
-					supplier   	@31
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1747, 1654)
-					label      	(object SegLabel @51
-					    Parent_View 	@49
-					    location   	(1681, 1697)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.790274
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$46" @52
-					Parent_View 	@48
-					location   	(-120, 374)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014E"
-					client     	@48
-					supplier   	@47
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1117, 1654))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @53
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@53
-				    location   	(819, 931)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @54
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84ADE401DC"
-				client     	@53
-				supplier   	@25
-				line_style 	3
-				origin_attachment 	(966, 919)
-				terminal_attachment 	(966, 636))
-			    (object AssociationViewNew "$UNNAMED$5" @55
-				location   	(457, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D3E10179"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$6" @56
-					Parent_View 	@55
-					location   	(-1319, 494)
-					label      	(object SegLabel @57
-					    Parent_View 	@56
-					    location   	(235, 920)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20225"
-					client     	@55
-					supplier   	@32
-					vertices   	(list Points
-					    (457, 1022)
-					    (276, 1022)
-					    (276, 849))
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(276, 849)
-					label      	(object SegLabel @58
-					    Parent_View 	@56
-					    location   	(330, 884)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "eBindingOperations" @59
-					Parent_View 	@55
-					location   	(-1319, 494)
-					label      	(object SegLabel @60
-					    Parent_View 	@59
-					    location   	(531, 977)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+eBindingOperations"
-					    pctDist    	0.211699
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20239"
-					client     	@55
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(457, 1022)
-					terminal_attachment 	(810, 1022)
-					label      	(object SegLabel @61
-					    Parent_View 	@59
-					    location   	(769, 980)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.884956
-					    height     	43
-					    orientation 	0)
-					label      	(object SegLabel @62
-					    Parent_View 	@59
-					    location   	(714, 1067)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.727564
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$7" @63
-				location   	(1418, 1040)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D425038A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperation" @64
-					Parent_View 	@63
-					location   	(-358, 464)
-					label      	(object SegLabel @65
-					    Parent_View 	@64
-					    location   	(1520, 1079)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	228
-					    justify    	0
-					    label      	"+eOperation"
-					    pctDist    	0.420601
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602F5"
-					client     	@63
-					supplier   	@40
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1663, 1040)
-					label      	(object SegLabel @66
-					    Parent_View 	@64
-					    location   	(1589, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.696721
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$8" @67
-					Parent_View 	@63
-					location   	(-358, 464)
-					label      	(object SegLabel @68
-					    Parent_View 	@67
-					    location   	(1273, 1070)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.595420
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602FF"
-					client     	@63
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1174, 1040))))
-			    (object AssociationViewNew "$UNNAMED$23" @69
-				location   	(787, 1190)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2E6401F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingInput" @70
-					Parent_View 	@69
-					location   	(-381, 454)
-					label      	(object SegLabel @71
-					    Parent_View 	@70
-					    location   	(669, 1152)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+eBindingInput"
-					    pctDist    	0.511905
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650251"
-					client     	@69
-					supplier   	@41
-					vertices   	(list Points
-					    (787, 1190)
-					    (636, 1190)
-					    (636, 1271))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(636, 1271)
-					label      	(object SegLabel @72
-					    Parent_View 	@70
-					    location   	(685, 1222)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.440476
-					    height     	32
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$24" @73
-					Parent_View 	@69
-					location   	(-381, 454)
-					label      	(object SegLabel @74
-					    Parent_View 	@73
-					    location   	(885, 1144)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650252"
-					client     	@69
-					supplier   	@53
-					vertices   	(list Points
-					    (787, 1190)
-					    (926, 1190)
-					    (926, 1097))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(926, 1097)
-					label      	(object SegLabel @75
-					    Parent_View 	@73
-					    location   	(871, 1136)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.837758
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$25" @76
-				location   	(1024, 1312)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2EB30163"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingOutput" @77
-					Parent_View 	@76
-					location   	(-150, 578)
-					label      	(object SegLabel @78
-					    Parent_View 	@77
-					    location   	(1012, 1429)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	306
-					    justify    	0
-					    label      	"+eBindingOutput"
-					    pctDist    	0.545082
-					    height     	13
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013C"
-					client     	@76
-					supplier   	@47
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1527)
-					label      	(object SegLabel @79
-					    Parent_View 	@77
-					    location   	(967, 1479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.774590
-					    height     	58
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$26" @80
-					Parent_View 	@76
-					location   	(-150, 578)
-					label      	(object SegLabel @81
-					    Parent_View 	@80
-					    location   	(983, 1140)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013D"
-					client     	@76
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1097)
-					label      	(object SegLabel @82
-					    Parent_View 	@80
-					    location   	(1031, 1186)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.590164
-					    height     	7
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @83
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1920, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@83
-				    location   	(1772, 1907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @84
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@84
-				    location   	(1212, 1859)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @85
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE710333"
-				client     	@84
-				supplier   	@28
-				line_style 	3
-				origin_attachment 	(1203, 2007)
-				terminal_attachment 	(353, 2007))
-			    (object AssociationViewNew "$UNNAMED$33" @86
-				location   	(1356, 1352)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF340003E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingFaults" @87
-					Parent_View 	@86
-					location   	(188, 616)
-					label      	(object SegLabel @88
-					    Parent_View 	@87
-					    location   	(1382, 1750)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	300
-					    justify    	0
-					    label      	"+eBindingFaults"
-					    pctDist    	0.803150
-					    height     	26
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AA"
-					client     	@86
-					supplier   	@84
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1356, 1847)
-					label      	(object SegLabel @89
-					    Parent_View 	@87
-					    location   	(1409, 1797)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899194
-					    height     	53
-					    orientation 	0)
-					label      	(object SegLabel @90
-					    Parent_View 	@87
-					    location   	(1256, 1806)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.919291
-					    height     	101
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$34" @91
-					Parent_View 	@86
-					location   	(188, 616)
-					label      	(object SegLabel @92
-					    Parent_View 	@91
-					    location   	(1076, 1197)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AB"
-					client     	@86
-					supplier   	@53
-					vertices   	(list Points
-					    (1356, 1352)
-					    (1356, 1217)
-					    (1117, 1217)
-					    (1117, 1097))
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1117, 1097)
-					label      	(object SegLabel @93
-					    Parent_View 	@91
-					    location   	(1152, 1164)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.687008
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$35" @94
-				location   	(1640, 1970)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE091F402F3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFault" @95
-					Parent_View 	@94
-					location   	(-344, 818)
-					label      	(object SegLabel @96
-					    Parent_View 	@95
-					    location   	(1674, 1915)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eFault"
-					    pctDist    	0.276423
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FE"
-					client     	@94
-					supplier   	@83
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1763, 1970)
-					label      	(object SegLabel @97
-					    Parent_View 	@95
-					    location   	(1718, 2012)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.642276
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$36" @98
-					Parent_View 	@94
-					location   	(-344, 818)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FF"
-					client     	@94
-					supplier   	@84
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1517, 1970))))
-			    (object InheritView "" @99
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE4302AB"
-				client     	@47
-				supplier   	@27
-				line_style 	3
-				origin_attachment 	(803, 1656)
-				terminal_attachment 	(364, 1656))
-			    (object InheritView "" @100
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE1B0113"
-				client     	@41
-				supplier   	@26
-				line_style 	3
-				origin_attachment 	(467, 1385)
-				terminal_attachment 	(331, 1385))))
-		    (object ClassDiagram "2.4 PortTypes"
-			quid       	"3AD5D1C40366"
-			title      	"2.4 PortTypes"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IPortType" @101
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@101
-				    location   	(146, 172)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"IPortType")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@101
-				    location   	(146, 122)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A5BE0331"
-				width      	718
-				height     	196
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::IOperation" @102
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@102
-				    location   	(1116, 176)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"IOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@102
-				    location   	(1116, 126)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A77600D1"
-				width      	891
-				height     	188
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IInput" @103
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@103
-				    location   	(55, 1437)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@103
-				    location   	(55, 1387)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A7EE0015"
-				width      	644
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IOutput" @104
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@104
-				    location   	(56, 1757)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"IOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@104
-				    location   	(56, 1707)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A829027D"
-				width      	674
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IFault" @105
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@105
-				    location   	(55, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@105
-				    location   	(55, 2026)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A861031D"
-				width      	644
-				height     	196
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @106
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@106
-				    location   	(158, 672)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	695
-				height     	281
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @107
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2576, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@107
-				    location   	(2325, 692)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	520
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @108
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@108
-				    location   	(1647, 2060)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @109
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@109
-				    location   	(870, 1422)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	390
-				height     	125
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @110
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@110
-				    location   	(1232, 1742)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	274
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @111
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@111
-				    location   	(1214, 620)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				width      	695
-				height     	352
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$0" @112
-				location   	(1024, 797)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5C824018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperations" @113
-					Parent_View 	@112
-					location   	(592, 269)
-					label      	(object SegLabel @114
-					    Parent_View 	@113
-					    location   	(1088, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+eOperations"
-					    pctDist    	0.359649
-					    height     	50
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701CD"
-					client     	@112
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(1205, 797)
-					label      	(object SegLabel @115
-					    Parent_View 	@113
-					    location   	(1176, 861)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.840391
-					    height     	64
-					    orientation 	1)
-					label      	(object SegLabel @116
-					    Parent_View 	@113
-					    location   	(1074, 923)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.276243
-					    height     	126
-					    orientation 	1))
-				    (object RoleView "portType" @117
-					Parent_View 	@112
-					location   	(592, 269)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701C3"
-					client     	@112
-					supplier   	@106
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(843, 797)
-					label      	(object SegLabel @118
-					    Parent_View 	@117
-					    location   	(888, 757)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.753488
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$41" @119
-				location   	(2107, 773)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA412F0035"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParameterOrdering" @120
-					Parent_View 	@119
-					location   	(1819, 101)
-					label      	(object SegLabel @121
-					    Parent_View 	@120
-					    location   	(2145, 647)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+eParameterOrdering"
-					    pctDist    	0.183333
-					    height     	127
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA41310255"
-					client     	@119
-					supplier   	@107
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(2316, 773)
-					label      	(object SegLabel @122
-					    Parent_View 	@120
-					    location   	(2272, 822)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.796610
-					    height     	49
-					    orientation 	1)
-					label      	(object SegLabel @123
-					    Parent_View 	@120
-					    location   	(2171, 888)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.306220
-					    height     	115
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$42" @124
-					Parent_View 	@119
-					location   	(1819, 101)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA4131025F"
-					client     	@119
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(1899, 773))))
-			    (object AssociationViewNew "$UNNAMED$31" @125
-				location   	(1702, 1504)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF331601A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFaults" @126
-					Parent_View 	@125
-					location   	(1414, 832)
-					label      	(object SegLabel @127
-					    Parent_View 	@126
-					    location   	(1815, 1982)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eFaults"
-					    pctDist    	0.878992
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180387"
-					client     	@125
-					supplier   	@108
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 2048)
-					label      	(object SegLabel @128
-					    Parent_View 	@126
-					    location   	(1644, 2020)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.949580
-					    height     	59
-					    orientation 	1)
-					label      	(object SegLabel @129
-					    Parent_View 	@126
-					    location   	(1593, 1963)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.845378
-					    height     	110
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$32" @130
-					Parent_View 	@125
-					location   	(1414, 832)
-					label      	(object SegLabel @131
-					    Parent_View 	@130
-					    location   	(1661, 1069)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180388"
-					client     	@125
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 960)
-					label      	(object SegLabel @132
-					    Parent_View 	@130
-					    location   	(1821, 1039)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.857362
-					    height     	119
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$27" @133
-				location   	(1178, 1234)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2F94024D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @134
-					Parent_View 	@133
-					location   	(890, 562)
-					label      	(object SegLabel @135
-					    Parent_View 	@134
-					    location   	(878, 1343)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.819820
-					    height     	103
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F950190"
-					client     	@133
-					supplier   	@109
-					vertices   	(list Points
-					    (1178, 1234)
-					    (980, 1234)
-					    (980, 1410))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(980, 1410)
-					label      	(object SegLabel @136
-					    Parent_View 	@134
-					    location   	(1046, 1364)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.877660
-					    height     	66
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$28" @137
-					Parent_View 	@133
-					location   	(890, 562)
-					label      	(object SegLabel @138
-					    Parent_View 	@137
-					    location   	(1236, 1036)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F95019A"
-					client     	@133
-					supplier   	@111
-					vertices   	(list Points
-					    (1178, 1234)
-					    (1277, 1234)
-					    (1277, 960))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(1277, 960)
-					label      	(object SegLabel @139
-					    Parent_View 	@137
-					    location   	(1197, 1058)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736413
-					    height     	81
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$29" @140
-				location   	(1468, 1345)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2FB802F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @141
-					Parent_View 	@140
-					location   	(1180, 673)
-					label      	(object SegLabel @142
-					    Parent_View 	@141
-					    location   	(1362, 1669)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.840909
-					    height     	107
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020A"
-					client     	@140
-					supplier   	@110
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 1730)
-					label      	(object SegLabel @143
-					    Parent_View 	@141
-					    location   	(1546, 1676)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863636
-					    height     	78
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$30" @144
-					Parent_View 	@140
-					location   	(1180, 673)
-					label      	(object SegLabel @145
-					    Parent_View 	@144
-					    location   	(1427, 1037)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020B"
-					client     	@140
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 960)
-					label      	(object SegLabel @146
-					    Parent_View 	@144
-					    location   	(1523, 1080)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.690341
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @147
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FD8019F"
-				client     	@106
-				supplier   	@101
-				line_style 	0)
-			    (object InheritView "" @148
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FE20171"
-				client     	@111
-				supplier   	@102
-				line_style 	0)
-			    (object InheritView "" @149
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FEE031D"
-				client     	@109
-				supplier   	@103
-				line_style 	0)
-			    (object InheritView "" @150
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FF801CD"
-				client     	@110
-				supplier   	@104
-				line_style 	0)
-			    (object InheritView "" @151
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F2002002D"
-				client     	@108
-				supplier   	@105
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @152
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2224, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@152
-				    location   	(1937, 1312)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	575
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	593
-				height     	312
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::MessageReference" @153
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 2544)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@153
-				    location   	(1193, 2468)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	654
-				    justify    	0
-				    label      	"MessageReference")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3F6771DB02DC"
-				width      	672
-				height     	180
-				annotation 	8)
-			    (object InheritTreeView "" @154
-				location   	(1524, 2275)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@153
-				vertices   	(list Points
-				    (1524, 2275)
-				    (1524, 2454)))
-			    (object InheritView "" @155
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723D0319"
-				client     	@108
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(1776, 2176)
-				terminal_attachment 	(1776, 2275)
-				drawSupplier 	@154)
-			    (object InheritView "" @156
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723500DD"
-				client     	@110
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(1371, 1854)
-				terminal_attachment 	(1371, 2275)
-				drawSupplier 	@154)
-			    (object InheritView "" @157
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67722802E7"
-				client     	@109
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(980, 1534)
-				terminal_attachment 	(980, 2275)
-				drawSupplier 	@154)
-			    (object AssociationViewNew "$UNNAMED$61" @158
-				location   	(2206, 2259)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F74E78401B1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @159
-					Parent_View 	@158
-					location   	(734, -285)
-					label      	(object SegLabel @160
-					    Parent_View 	@159
-					    location   	(2068, 1670)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.912230
-					    height     	139
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E786000F"
-					client     	@158
-					supplier   	@152
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(2206, 1612)
-					label      	(object SegLabel @161
-					    Parent_View 	@159
-					    location   	(2260, 1678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$62" @162
-					Parent_View 	@158
-					location   	(734, -285)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E7860023"
-					client     	@158
-					supplier   	@153
-					vertices   	(list Points
-					    (2206, 2259)
-					    (2206, 2556)
-					    (1856, 2556))
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(1856, 2556))))))
-		    (object ClassDiagram "2.1 Definitions"
-			quid       	"3AD5E48A0262"
-			title      	"2.1 Definitions"
-			zoom       	83
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IDefinition" @163
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 192)
-				label      	(object ItemLabel
-				    Parent_View 	@163
-				    location   	(88, 161)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"IDefinition")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@163
-				    location   	(88, 111)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B1D90142"
-				width      	706
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @164
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@164
-				    location   	(1686, 896)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	294
-				height     	120
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Import" @165
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@165
-				    location   	(1910, 545)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				width      	486
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @166
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2112, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@166
-				    location   	(1900, 1056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @167
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1808, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@167
-				    location   	(1596, 1360)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @168
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2336, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@168
-				    location   	(2124, 1600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @169
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@169
-				    location   	(1073, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	510
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	528
-				height     	426
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @170
-				location   	(1358, 860)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$54" @171
-					Parent_View 	@170
-					location   	(62, -36)
-					label      	(object SegLabel @172
-					    Parent_View 	@171
-					    location   	(1317, 535)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@170
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1358, 453)
-					label      	(object SegLabel @173
-					    Parent_View 	@171
-					    location   	(1403, 511)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.856649
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eTypes" @174
-					Parent_View 	@170
-					location   	(62, -36)
-					label      	(object SegLabel @175
-					    Parent_View 	@174
-					    location   	(1586, 909)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.779097
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@170
-					supplier   	@164
-					vertices   	(list Points
-					    (1358, 860)
-					    (1358, 948)
-					    (1677, 948))
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1677, 948)
-					label      	(object SegLabel @176
-					    Parent_View 	@174
-					    location   	(1632, 987)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.892655
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$57" @177
-				location   	(1612, 595)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @178
-					Parent_View 	@177
-					location   	(12, 227)
-					label      	(object SegLabel @179
-					    Parent_View 	@178
-					    location   	(1423, 512)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@177
-					supplier   	@169
-					vertices   	(list Points
-					    (1612, 595)
-					    (1464, 595)
-					    (1464, 453))
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1464, 453)
-					label      	(object SegLabel @180
-					    Parent_View 	@178
-					    location   	(1524, 495)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.858667
-					    height     	60
-					    orientation 	1))
-				    (object RoleView "eImports" @181
-					Parent_View 	@177
-					location   	(12, 227)
-					label      	(object SegLabel @182
-					    Parent_View 	@181
-					    location   	(1692, 557)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.280335
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@177
-					supplier   	@165
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1901, 595)
-					label      	(object SegLabel @183
-					    Parent_View 	@181
-					    location   	(1854, 652)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.841004
-					    height     	57
-					    orientation 	1)
-					label      	(object SegLabel @184
-					    Parent_View 	@181
-					    location   	(1676, 646)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.225941
-					    height     	51
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$13" @185
-				location   	(1279, 1137)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E60301E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$14" @186
-					Parent_View 	@185
-					location   	(271, 273)
-					label      	(object SegLabel @187
-					    Parent_View 	@186
-					    location   	(1238, 591)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400B7"
-					client     	@185
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1279, 453)
-					label      	(object SegLabel @188
-					    Parent_View 	@186
-					    location   	(1320, 586)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.804974
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eMessages" @189
-					Parent_View 	@185
-					location   	(271, 273)
-					label      	(object SegLabel @190
-					    Parent_View 	@189
-					    location   	(1647, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+eMessages"
-					    pctDist    	0.643137
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400C1"
-					client     	@185
-					supplier   	@166
-					vertices   	(list Points
-					    (1279, 1137)
-					    (1279, 1208)
-					    (1891, 1208))
-					line_style 	3
-					origin_attachment 	(1279, 1137)
-					terminal_attachment 	(1891, 1208)
-					label      	(object SegLabel @191
-					    Parent_View 	@189
-					    location   	(1821, 1171)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899346
-					    height     	38
-					    orientation 	0)
-					label      	(object SegLabel @192
-					    Parent_View 	@189
-					    location   	(1797, 1244)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.864407
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$15" @193
-				location   	(1212, 1159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6710104"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$16" @194
-					Parent_View 	@193
-					location   	(-324, 215)
-					label      	(object SegLabel @195
-					    Parent_View 	@194
-					    location   	(1171, 594)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E672034A"
-					client     	@193
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1212, 453)
-					label      	(object SegLabel @196
-					    Parent_View 	@194
-					    location   	(1251, 624)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.757962
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "ePortTypes" @197
-					Parent_View 	@193
-					location   	(-324, 215)
-					label      	(object SegLabel @198
-					    Parent_View 	@197
-					    location   	(1391, 1451)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+ePortTypes"
-					    pctDist    	0.723698
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6720354"
-					client     	@193
-					supplier   	@167
-					vertices   	(list Points
-					    (1212, 1159)
-					    (1212, 1490)
-					    (1587, 1490))
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1587, 1490)
-					label      	(object SegLabel @199
-					    Parent_View 	@197
-					    location   	(1533, 1451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.925611
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @200
-					    Parent_View 	@197
-					    location   	(1512, 1540)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.895855
-					    height     	50
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$17" @201
-				location   	(1114, 1585)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6770095"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$18" @202
-					Parent_View 	@201
-					location   	(-406, 241)
-					label      	(object SegLabel @203
-					    Parent_View 	@202
-					    location   	(1073, 680)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6780371"
-					client     	@201
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(1114, 453)
-					label      	(object SegLabel @204
-					    Parent_View 	@202
-					    location   	(1155, 752)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736704
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eBindings" @205
-					Parent_View 	@201
-					location   	(-406, 241)
-					label      	(object SegLabel @206
-					    Parent_View 	@205
-					    location   	(1851, 1674)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eBindings"
-					    pctDist    	0.766347
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E678037B"
-					client     	@201
-					supplier   	@168
-					vertices   	(list Points
-					    (1114, 1585)
-					    (1114, 1716)
-					    (2115, 1716))
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(2115, 1716)
-					label      	(object SegLabel @207
-					    Parent_View 	@205
-					    location   	(2053, 1677)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.945074
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @208
-					    Parent_View 	@205
-					    location   	(2014, 1754)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.911072
-					    height     	38
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Service" @209
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@209
-				    location   	(1628, 1920)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	442
-				height     	280
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$19" @210
-				location   	(1066, 1533)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E67B0311"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$20" @211
-					Parent_View 	@210
-					location   	(-521, -111)
-					label      	(object SegLabel @212
-					    Parent_View 	@211
-					    location   	(1025, 669)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D007F"
-					client     	@210
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1066, 453)
-					label      	(object SegLabel @213
-					    Parent_View 	@211
-					    location   	(1109, 756)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.719697
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "eServices" @214
-					Parent_View 	@210
-					location   	(-521, -111)
-					label      	(object SegLabel @215
-					    Parent_View 	@214
-					    location   	(1393, 2028)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eServices"
-					    pctDist    	0.791824
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D0089"
-					client     	@210
-					supplier   	@209
-					vertices   	(list Points
-					    (1066, 1533)
-					    (1066, 2059)
-					    (1619, 2059))
-					line_style 	3
-					origin_attachment 	(1066, 1533)
-					terminal_attachment 	(1619, 2059)
-					label      	(object SegLabel @216
-					    Parent_View 	@214
-					    location   	(1554, 2031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.940197
-					    height     	29
-					    orientation 	0)
-					label      	(object SegLabel @217
-					    Parent_View 	@214
-					    location   	(1532, 2113)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.920515
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @218
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B1F80382"
-				client     	@169
-				supplier   	@163
-				line_style 	3
-				origin_attachment 	(1064, 263)
-				terminal_attachment 	(785, 263))))
-		    (object ClassDiagram "2.1.3 Extensibility"
-			quid       	"3AD60C510192"
-			title      	"2.1.3 Extensibility"
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @219
-				ShowCompartmentStereotypes 	TRUE
-				location   	(576, 1584)
-				label      	(object ItemLabel
-				    Parent_View 	@219
-				    location   	(494, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Port" @220
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1568, 1888)
-				label      	(object ItemLabel
-				    Parent_View 	@220
-				    location   	(1487, 1836)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @221
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1424, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@221
-				    location   	(1342, 1675)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @222
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1216, 2336)
-				label      	(object ItemLabel
-				    Parent_View 	@222
-				    location   	(1088, 2283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @223
-				ShowCompartmentStereotypes 	TRUE
-				location   	(736, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@223
-				    location   	(563, 1707)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	130
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IExtensibilityElement" @224
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@224
-				    location   	(1495, 136)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"IExtensibilityElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@224
-				    location   	(1495, 86)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B12402AB"
-				width      	804
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @225
-				ShowCompartmentStereotypes 	TRUE
-				location   	(928, 1952)
-				label      	(object ItemLabel
-				    Parent_View 	@225
-				    location   	(800, 1899)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @226
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1008, 2144)
-				label      	(object ItemLabel
-				    Parent_View 	@226
-				    location   	(863, 2091)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	290
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	308
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @227
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@227
-				    location   	(74, 1235)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	146
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @228
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(416, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@228
-				    location   	(335, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @229
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(480, 688)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@229
-				    location   	(209, 582)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	542
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				width      	560
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @230
-				location   	(480, 1039)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@229
-				vertices   	(list Points
-				    (480, 1039)
-				    (480, 808)))
-			    (object InheritView "" @231
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD600CB00AA"
-				client     	@220
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1566, 1824)
-				terminal_attachment 	(1566, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @232
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B5A4027E"
-				client     	@226
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1097, 2079)
-				terminal_attachment 	(1097, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @233
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE0938602C9"
-				client     	@222
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1219, 2271)
-				terminal_attachment 	(1219, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @234
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B59B0072"
-				client     	@225
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(988, 1887)
-				terminal_attachment 	(988, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @235
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6009202F7"
-				client     	@223
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(797, 1695)
-				terminal_attachment 	(797, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @236
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA0F02F0"
-				client     	@219
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(601, 1519)
-				terminal_attachment 	(601, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @237
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FDB803D4"
-				client     	@227
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(211, 1223)
-				terminal_attachment 	(211, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @238
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@228
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(414, 1344)
-				terminal_attachment 	(414, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @239
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA20025E"
-				client     	@221
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1429, 1663)
-				terminal_attachment 	(1429, 1039)
-				drawSupplier 	@230)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @240
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@240
-				    location   	(1632, 583)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	545
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	563
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @241
-				location   	(1191, 672)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @242
-					Parent_View 	@241
-					location   	(23, 560)
-					label      	(object SegLabel @243
-					    Parent_View 	@242
-					    location   	(847, 631)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@241
-					supplier   	@229
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(760, 672)
-					label      	(object SegLabel @244
-					    Parent_View 	@242
-					    location   	(830, 628)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.839695
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eExtensibilityElements" @245
-					Parent_View 	@241
-					location   	(23, 560)
-					label      	(object SegLabel @246
-					    Parent_View 	@245
-					    location   	(1355, 522)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	0.379070
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@241
-					supplier   	@240
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(1623, 672)
-					label      	(object SegLabel @247
-					    Parent_View 	@245
-					    location   	(1496, 627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.709402
-					    height     	46
-					    orientation 	0)
-					label      	(object SegLabel @248
-					    Parent_View 	@245
-					    location   	(1463, 764)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.632479
-					    height     	92
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::WSDLElement" @249
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1008, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@249
-				    location   	(630, 86)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	756
-				    justify    	0
-				    label      	"WSDLElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C6A302DD"
-				width      	774
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @250
-				location   	(1008, 402)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@249
-				vertices   	(list Points
-				    (1008, 402)
-				    (1008, 312)))
-			    (object InheritView "" @251
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FE3C03D4"
-				client     	@229
-				supplier   	@249
-				line_style 	3
-				origin_attachment 	(492, 568)
-				terminal_attachment 	(492, 402)
-				drawSupplier 	@250)
-			    (object InheritView "" @252
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B14903D0"
-				client     	@240
-				supplier   	@224
-				line_style 	3
-				origin_attachment 	(2015, 571)
-				terminal_attachment 	(2015, 246))
-			    (object InheritView "" @253
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BDDF53502C3"
-				client     	@240
-				supplier   	@249
-				line_style 	3
-				origin_attachment 	(1762, 571)
-				terminal_attachment 	(1762, 402)
-				drawSupplier 	@250)
-			    (object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @254
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2016, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@254
-				    location   	(1731, 1307)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	570
-				    justify    	0
-				    label      	"UnknownExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CB24AC002AE"
-				width      	588
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @255
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CB24AEC01CB"
-				client     	@254
-				supplier   	@240
-				line_style 	3
-				origin_attachment 	(1796, 1295)
-				terminal_attachment 	(1796, 805))
-			    (object AssociationViewNew "$UNNAMED$63" @256
-				location   	(2311, 1686)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F7896A2026E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "parent" @257
-					Parent_View 	@256
-					location   	(279, 294)
-					label      	(object SegLabel @258
-					    Parent_View 	@257
-					    location   	(2422, 1333)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+parent"
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012B"
-					client     	@256
-					supplier   	@254
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2432, 1686)
-					    (2432, 1374)
-					    (2310, 1374))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2310, 1374)
-					label      	(object SegLabel @259
-					    Parent_View 	@257
-					    location   	(2366, 1428)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "children" @260
-					Parent_View 	@256
-					location   	(279, 294)
-					label      	(object SegLabel @261
-					    Parent_View 	@260
-					    location   	(1899, 1537)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+children"
-					    pctDist    	0.798561
-					    height     	118
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012C"
-					client     	@256
-					supplier   	@254
-					vertices   	(list Points
-					    (2311, 1686)
-					    (2016, 1686)
-					    (2016, 1425))
-					line_style 	3
-					origin_attachment 	(2311, 1686)
-					terminal_attachment 	(2016, 1425)
-					label      	(object SegLabel @262
-					    Parent_View 	@260
-					    location   	(2070, 1481)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "2.1.1 Naming and Linking"
-			quid       	"3AE8ED7201BD"
-			title      	"2.1.1 Naming and Linking"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IImport" @263
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@263
-				    location   	(1422, 177)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"IImport")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@263
-				    location   	(1422, 127)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B2020119"
-				width      	598
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Namespace" @264
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@264
-				    location   	(202, 1041)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	461
-				    justify    	0
-				    label      	"Namespace")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AEA3CD30030"
-				width      	479
-				height     	215
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @265
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@265
-				    location   	(1294, 1142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	694
-				height     	173
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @266
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@266
-				    location   	(164, 236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	490
-				height     	320
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$37" @267
-				location   	(309, 786)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3D55002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eNamespaces" @268
-					Parent_View 	@267
-					location   	(-91, 258)
-					label      	(object SegLabel @269
-					    Parent_View 	@268
-					    location   	(461, 956)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+eNamespaces"
-					    pctDist    	0.698842
-					    height     	152
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560332"
-					client     	@267
-					supplier   	@264
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 1029)
-					label      	(object SegLabel @270
-					    Parent_View 	@268
-					    location   	(248, 973)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.768707
-					    height     	62
-					    orientation 	1)
-					label      	(object SegLabel @271
-					    Parent_View 	@268
-					    location   	(228, 913)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.525097
-					    height     	82
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$38" @272
-					Parent_View 	@267
-					location   	(-91, 258)
-					label      	(object SegLabel @273
-					    Parent_View 	@272
-					    location   	(268, 592)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560328"
-					client     	@267
-					supplier   	@266
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 544)
-					label      	(object SegLabel @274
-					    Parent_View 	@272
-					    location   	(239, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.844961
-					    height     	71
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::wsdl::Import" @275
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 720)
-				label      	(object ItemLabel
-				    Parent_View 	@275
-				    location   	(1255, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	434
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				width      	452
-				height     	304
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$51" @276
-				location   	(1486, 1001)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1DCC02E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eSchema" @277
-					Parent_View 	@276
-					location   	(510, -103)
-					label      	(object SegLabel @278
-					    Parent_View 	@277
-					    location   	(1737, 1018)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eSchema"
-					    pctDist    	0.592593
-					    height     	105
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE0270"
-					client     	@276
-					supplier   	@265
-					vertices   	(list Points
-					    (1486, 1001)
-					    (1632, 1001)
-					    (1632, 1130))
-					line_style 	3
-					origin_attachment 	(1486, 1001)
-					terminal_attachment 	(1632, 1130)
-					label      	(object SegLabel @279
-					    Parent_View 	@277
-					    location   	(1563, 1018)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.592593
-					    height     	70
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$52" @280
-					Parent_View 	@276
-					location   	(510, -103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE027A"
-					client     	@276
-					supplier   	@275
-					line_style 	3
-					origin_attachment 	(1486, 872)
-					terminal_attachment 	(1486, 872))))
-			    (object AssociationViewNew "$UNNAMED$39" @281
-				location   	(1087, 403)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3E3A002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$40" @282
-					Parent_View 	@281
-					location   	(687, -125)
-					label      	(object SegLabel @283
-					    Parent_View 	@282
-					    location   	(1406, 480)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01F2"
-					client     	@281
-					supplier   	@275
-					vertices   	(list Points
-					    (1087, 403)
-					    (1364, 403)
-					    (1364, 568))
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(1364, 568))
-				    (object RoleView "eDefinition" @284
-					Parent_View 	@281
-					location   	(687, -125)
-					label      	(object SegLabel @285
-					    Parent_View 	@284
-					    location   	(805, 363)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eDefinition"
-					    pctDist    	0.637532
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01E8"
-					client     	@281
-					supplier   	@266
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(645, 403)
-					label      	(object SegLabel @286
-					    Parent_View 	@284
-					    location   	(727, 456)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.814910
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$57" @287
-				location   	(737, 826)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @288
-					Parent_View 	@287
-					location   	(-671, 106)
-					label      	(object SegLabel @289
-					    Parent_View 	@288
-					    location   	(552, 647)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@287
-					supplier   	@266
-					vertices   	(list Points
-					    (737, 826)
-					    (510, 826)
-					    (510, 544))
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(510, 544)
-					label      	(object SegLabel @290
-					    Parent_View 	@288
-					    location   	(457, 595)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "eImports" @291
-					Parent_View 	@287
-					location   	(-671, 106)
-					label      	(object SegLabel @292
-					    Parent_View 	@291
-					    location   	(1144, 773)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.799189
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@287
-					supplier   	@275
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(1246, 826)
-					label      	(object SegLabel @293
-					    Parent_View 	@291
-					    location   	(1180, 879)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.872211
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @294
-					    Parent_View 	@291
-					    location   	(1162, 933)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.837728
-					    height     	107
-					    orientation 	1))))
-			    (object InheritView "" @295
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F200D0340"
-				client     	@275
-				supplier   	@263
-				line_style 	3
-				origin_attachment 	(1555, 568)
-				terminal_attachment 	(1555, 333))))
-		    (object ClassDiagram "2.2 Types"
-			quid       	"3B85AE59037E"
-			title      	"2.2 Types"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	81
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @296
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@296
-				    location   	(895, 1159)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ECD302A9"
-				width      	500
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @297
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@297
-				    location   	(906, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	478
-				height     	162
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @298
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@298
-				    location   	(1022, 1828)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	517
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	535
-				height     	305
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @299
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@299
-				    location   	(128, 1067)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	448
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	466
-				height     	258
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$47" @300
-				location   	(735, 1172)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1BE900C4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "typeDefinition" @301
-					Parent_View 	@300
-					location   	(143, 676)
-					label      	(object SegLabel @302
-					    Parent_View 	@301
-					    location   	(775, 1133)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.269006
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90327"
-					client     	@300
-					supplier   	@296
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(886, 1172)
-					label      	(object SegLabel @303
-					    Parent_View 	@301
-					    location   	(839, 1207)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.688705
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$48" @304
-					Parent_View 	@300
-					location   	(143, 676)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90331"
-					client     	@300
-					supplier   	@299
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(585, 1172))))
-			    (object AssociationViewNew "$UNNAMED$49" @305
-				location   	(527, 1592)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1C1203B2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "elementDeclaration" @306
-					Parent_View 	@305
-					location   	(-65, 1096)
-					label      	(object SegLabel @307
-					    Parent_View 	@306
-					    location   	(666, 1554)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+elementDeclaration"
-					    pctDist    	0.375394
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C14001C"
-					client     	@305
-					supplier   	@297
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(897, 1592)
-					label      	(object SegLabel @308
-					    Parent_View 	@306
-					    location   	(807, 1645)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.755877
-					    height     	53
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$50" @309
-					Parent_View 	@305
-					location   	(-65, 1096)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C140026"
-					client     	@305
-					supplier   	@299
-					vertices   	(list Points
-					    (527, 1592)
-					    (437, 1592)
-					    (437, 1313))
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(437, 1313))))
-			    (object AssociationViewNew "$UNNAMED$55" @310
-				location   	(322, 1911)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C46829303E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @311
-					Parent_View 	@310
-					location   	(-14, 1191)
-					label      	(object SegLabel @312
-					    Parent_View 	@311
-					    location   	(838, 1872)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.748560
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C468296010E"
-					client     	@310
-					supplier   	@298
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(1013, 1911)
-					label      	(object SegLabel @313
-					    Parent_View 	@311
-					    location   	(943, 1965)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$56" @314
-					Parent_View 	@310
-					location   	(-14, 1191)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C4682960118"
-					client     	@310
-					supplier   	@299
-					vertices   	(list Points
-					    (322, 1911)
-					    (229, 1911)
-					    (229, 1313))
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(229, 1313))))
-			    (object ClassView "Class" "Logical View::wsdl::Types" @315
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@315
-				    location   	(615, 512)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	371
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	389
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @316
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@316
-				    location   	(74, 107)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @317
-				location   	(234, 604)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eTypes" @318
-					Parent_View 	@317
-					location   	(-150, 396)
-					label      	(object SegLabel @319
-					    Parent_View 	@318
-					    location   	(480, 640)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	207
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.661017
-					    height     	36
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@317
-					supplier   	@315
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(606, 604)
-					label      	(object SegLabel @320
-					    Parent_View 	@318
-					    location   	(526, 569)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783883
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$54" @321
-					Parent_View 	@317
-					location   	(-150, 396)
-					label      	(object SegLabel @322
-					    Parent_View 	@321
-					    location   	(133, 313)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@317
-					supplier   	@316
-					vertices   	(list Points
-					    (234, 604)
-					    (174, 604)
-					    (174, 225))
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(174, 225)
-					label      	(object SegLabel @323
-					    Parent_View 	@321
-					    location   	(228, 271)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.897729
-					    height     	54
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::ITypes" @324
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@324
-				    location   	(525, 203)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"ITypes")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@324
-				    location   	(525, 153)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CADCBB20050"
-				width      	248
-				height     	166
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::XSDSchemaExtensibilityElement" @325
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@325
-				    location   	(1359, 753)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	739
-				    justify    	0
-				    label      	"XSDSchemaExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CC360D7039C"
-				width      	757
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @326
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@326
-				    location   	(1529, 1103)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	655
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	673
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$59" @327
-				location   	(1826, 975)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3614500F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$60" @328
-					Parent_View 	@327
-					location   	(306, 447)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023D"
-					client     	@327
-					supplier   	@325
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 859)
-					label      	(object SegLabel @329
-					    Parent_View 	@328
-					    location   	(1774, 900)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.656489
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "schema" @330
-					Parent_View 	@327
-					location   	(306, 447)
-					label      	(object SegLabel @331
-					    Parent_View 	@330
-					    location   	(2006, 1033)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	0.507576
-					    height     	180
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023E"
-					client     	@327
-					supplier   	@326
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 1091)
-					label      	(object SegLabel @332
-					    Parent_View 	@330
-					    location   	(1788, 1050)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.651515
-					    height     	39
-					    orientation 	1))))
-			    (object InheritView "" @333
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CADCD3B0380"
-				client     	@315
-				supplier   	@324
-				line_style 	3
-				origin_attachment 	(705, 500)
-				terminal_attachment 	(705, 307))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @334
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 224)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@334
-				    location   	(815, 132)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				width      	500
-				height     	212
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @335
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@315
-				supplier   	@334
-				line_style 	3
-				origin_attachment 	(854, 500)
-				terminal_attachment 	(854, 330))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @336
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1824, 464)
-				label      	(object ItemLabel
-				    Parent_View 	@336
-				    location   	(1490, 368)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	669
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	687
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @337
-				location   	(1206, 493)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @338
-					Parent_View 	@337
-					location   	(-586, 237)
-					label      	(object SegLabel @339
-					    Parent_View 	@338
-					    location   	(1136, 386)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@337
-					supplier   	@334
-					vertices   	(list Points
-					    (1206, 493)
-					    (1094, 493)
-					    (1094, 330))
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1094, 330)
-					label      	(object SegLabel @340
-					    Parent_View 	@338
-					    location   	(1042, 377)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.828326
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "eExtensibilityElements" @341
-					Parent_View 	@337
-					location   	(-586, 237)
-					label      	(object SegLabel @342
-					    Parent_View 	@341
-					    location   	(1196, 454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	-0.039711
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@337
-					supplier   	@336
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1481, 493)
-					label      	(object SegLabel @343
-					    Parent_View 	@341
-					    location   	(1415, 546)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.764957
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @344
-					    Parent_View 	@341
-					    location   	(1396, 392)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.694915
-					    height     	102
-					    orientation 	0))))
-			    (object InheritView "" @345
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3627F00B7"
-				client     	@325
-				supplier   	@336
-				line_style 	3
-				origin_attachment 	(1812, 741)
-				terminal_attachment 	(1812, 572))))
-		    (object ClassDiagram "2.3 Messages"
-			quid       	"3BCE853D02C8"
-			title      	"2.3 Messages"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IMessage" @346
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@346
-				    location   	(267, 122)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"IMessage")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@346
-				    location   	(267, 72)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A8AF004F"
-				width      	380
-				height     	328
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPart" @347
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@347
-				    location   	(1029, 124)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"IPart")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@347
-				    location   	(1029, 74)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A93F01BE"
-				width      	617
-				height     	324
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @348
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@348
-				    location   	(1075, 690)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	492
-				height     	276
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @349
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A96D02F1"
-				client     	@348
-				supplier   	@347
-				line_style 	3
-				origin_attachment 	(1304, 678)
-				terminal_attachment 	(1304, 386))
-			    (object ClassView "Class" "Logical View::wsdl::Message" @350
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@350
-				    location   	(241, 507)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @351
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A8D102BA"
-				client     	@350
-				supplier   	@346
-				line_style 	3
-				origin_attachment 	(445, 495)
-				terminal_attachment 	(445, 388))
-			    (object AssociationViewNew "$UNNAMED$1" @352
-				location   	(688, 952)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5CEBE00E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParts" @353
-					Parent_View 	@352
-					location   	(176, 328)
-					label      	(object SegLabel @354
-					    Parent_View 	@353
-					    location   	(952, 897)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eParts"
-					    pctDist    	0.697452
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0061"
-					client     	@352
-					supplier   	@348
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(1066, 952)
-					label      	(object SegLabel @355
-					    Parent_View 	@353
-					    location   	(987, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.789809
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @356
-					    Parent_View 	@353
-					    location   	(967, 1061)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.742038
-					    height     	109
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$2" @357
-					Parent_View 	@352
-					location   	(176, 328)
-					label      	(object SegLabel @358
-					    Parent_View 	@357
-					    location   	(404, 893)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0057"
-					client     	@352
-					supplier   	@350
-					vertices   	(list Points
-					    (688, 952)
-					    (445, 952)
-					    (445, 817))
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(445, 817)
-					label      	(object SegLabel @359
-					    Parent_View 	@357
-					    location   	(393, 912)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.747604
-					    height     	53
-					    orientation 	0))))))))
-	    (object Class_Category "soap"
-		quid       	"3A01CF0C01A2"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "SOAPBinding"
-			quid       	"3A01D3B901AD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A3801AB"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "transportURI"
-				quid       	"3A01D3DF01E4"
-				type       	"String")
-			    (object ClassAttribute "style"
-				quid       	"3A01D3F1029E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "SOAPBody"
-			quid       	"3A01DED5031F"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A450041"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "use"
-				quid       	"3A01E2D501A5"
-				type       	"String")
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3A93477C01B2"
-				type       	"String")
-			    (object ClassAttribute "encodingStyles"
-				quid       	"3EE4A4DB0072"
-				stereotype 	"0..*"
-				type       	"IString"))
-			language   	"Java")
-		    (object Class "SOAPHeaderBase"
-			quid       	"3A01DEE7034D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A3E0326"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "use"
-				quid       	"3AD62E9C0056"
-				type       	"String")
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD62EA2025D"
-				type       	"String")
-			    (object ClassAttribute "encodingStyles"
-				quid       	"3EE4A58F01AE"
-				stereotype 	"0..*"
-				type       	"IString"))
-			language   	"Java")
-		    (object Class "SOAPFault"
-			quid       	"3A06D9FA00F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A4A0020"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "use"
-				quid       	"3A09821A012B"
-				type       	"String")
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD6204803AE"
-				type       	"String")
-			    (object ClassAttribute "encodingStyles"
-				quid       	"3EE4A56303AF"
-				stereotype 	"0..*"
-				type       	"IString"))
-			language   	"Java")
-		    (object Class "SOAPOperation"
-			quid       	"3A0AD45500E8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A4E031F"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "soapActionURI"
-				quid       	"3A0AD464004A"
-				type       	"String")
-			    (object ClassAttribute "style"
-				quid       	"3A0AD46C018C"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "SOAPAddress"
-			quid       	"3AD1FF750287"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE095350098"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "locationURI"
-				quid       	"3AD211C9025C"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "SOAPHeaderFault"
-			quid       	"3AD632B803DD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD633340038"
-				supplier   	"Logical View::soap::SOAPHeaderBase"
-				quidu      	"3A01DEE7034D"))
-			language   	"Java")
-		    (object Class "SOAPHeader"
-			quid       	"3AD63309016D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD63330017D"
-				supplier   	"Logical View::soap::SOAPHeaderBase"
-				quidu      	"3A01DEE7034D"))
-			language   	"Java")
-		    (object Class "IString"
-			quid       	"3B8DD90C0220"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.lang.String"
-				quid       	"3B8DD9320383"
-				stereotype 	"javaclass")))
-		    (object Association "$UNNAMED$64"
-			quid       	"3A06E0B50036"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$65"
-				quid       	"3A06E0B600C4"
-				supplier   	"Logical View::soap::SOAPBody"
-				quidu      	"3A01DED5031F")
-			    (object Role "parts"
-				quid       	"3A06E0B600C5"
-				label      	"parts"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$66"
-			quid       	"3AD62DE60130"
-			roles      	(list role_list
-			    (object Role "message"
-				quid       	"3AD62DE7004B"
-				label      	"message"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$67"
-				quid       	"3AD62DE70055"
-				supplier   	"Logical View::soap::SOAPHeaderBase"
-				quidu      	"3A01DEE7034D")))
-		    (object Association "$UNNAMED$68"
-			quid       	"3AD62DF802D1"
-			roles      	(list role_list
-			    (object Role "part"
-				quid       	"3AD62DFA0002"
-				label      	"part"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$69"
-				quid       	"3AD62DFA0003"
-				supplier   	"Logical View::soap::SOAPHeaderBase"
-				quidu      	"3A01DEE7034D")))
-		    (object Association "$UNNAMED$70"
-			quid       	"3AD6333701CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$71"
-				quid       	"3AD633370372"
-				supplier   	"Logical View::soap::SOAPHeader"
-				quidu      	"3AD63309016D"
-				is_aggregate 	TRUE)
-			    (object Role "headerFaults"
-				quid       	"3AD633370373"
-				label      	"headerFaults"
-				supplier   	"Logical View::soap::SOAPHeaderFault"
-				quidu      	"3AD632B803DD"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Binding"
-			quid       	"3A01CF23029F"
-			title      	"Binding"
-			zoom       	87
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	324
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::soap::SOAPBinding" @360
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@360
-				    location   	(55, 100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	434
-				    justify    	0
-				    label      	"SOAPBinding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01D3B901AD"
-				compartment 	(object Compartment
-				    Parent_View 	@360
-				    location   	(55, 157)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	428)
-				width      	452
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPOperation" @361
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@361
-				    location   	(803, 100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"SOAPOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A0AD45500E8"
-				compartment 	(object Compartment
-				    Parent_View 	@361
-				    location   	(803, 157)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	471)
-				width      	492
-				height     	240
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::soap::SOAPHeader" @362
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(560, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@362
-				    location   	(395, 907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"SOAPHeader")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD63309016D"
-				width      	348
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPHeaderFault" @363
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@363
-				    location   	(1142, 907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	436
-				    justify    	0
-				    label      	"SOAPHeaderFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD632B803DD"
-				width      	454
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$70" @364
-				location   	(933, 961)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6333701CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$71" @365
-					Parent_View 	@364
-					location   	(277, -543)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD633370372"
-					client     	@364
-					supplier   	@362
-					line_style 	3
-					origin_attachment 	(933, 961)
-					terminal_attachment 	(734, 961))
-				    (object RoleView "headerFaults" @366
-					Parent_View 	@364
-					location   	(277, -543)
-					label      	(object SegLabel @367
-					    Parent_View 	@366
-					    location   	(928, 921)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	346
-					    justify    	0
-					    label      	"+headerFaults"
-					    pctDist    	-0.030702
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD633370373"
-					client     	@364
-					supplier   	@363
-					line_style 	3
-					origin_attachment 	(933, 961)
-					terminal_attachment 	(1133, 961)
-					label      	(object SegLabel @368
-					    Parent_View 	@366
-					    location   	(1080, 924)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.736842
-					    height     	38
-					    orientation 	0)
-					label      	(object SegLabel @369
-					    Parent_View 	@366
-					    location   	(1056, 999)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	151
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.614035
-					    height     	38
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Message" @370
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1824, 496)
-				label      	(object ItemLabel
-				    Parent_View 	@370
-				    location   	(1701, 419)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	246
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				width      	264
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPHeaderBase" @371
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@371
-				    location   	(794, 420)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"SOAPHeaderBase")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01DEE7034D"
-				compartment 	(object Compartment
-				    Parent_View 	@371
-				    location   	(794, 477)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	665)
-				width      	510
-				height     	240
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$66" @372
-				location   	(1493, 485)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD62DE60130"
-				roleview_list 	(list RoleViews
-				    (object RoleView "message" @373
-					Parent_View 	@372
-					location   	(341, -683)
-					label      	(object SegLabel @374
-					    Parent_View 	@373
-					    location   	(1574, 515)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	256
-					    justify    	0
-					    label      	"+message"
-					    pctDist    	0.412322
-					    height     	30
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD62DE7004B"
-					client     	@372
-					supplier   	@370
-					line_style 	3
-					origin_attachment 	(1493, 485)
-					terminal_attachment 	(1692, 485)
-					label      	(object SegLabel @375
-					    Parent_View 	@373
-					    location   	(1630, 448)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.687204
-					    height     	38
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$67" @376
-					Parent_View 	@372
-					location   	(341, -683)
-					label      	(object SegLabel @377
-					    Parent_View 	@376
-					    location   	(1420, 525)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.372254
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD62DE70055"
-					client     	@372
-					supplier   	@371
-					line_style 	3
-					origin_attachment 	(1493, 485)
-					terminal_attachment 	(1295, 485))))
-			    (object ClassView "Class" "Logical View::soap::SOAPBody" @378
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1344)
-				label      	(object ItemLabel
-				    Parent_View 	@378
-				    location   	(794, 1236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"SOAPBody")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01DED5031F"
-				compartment 	(object Compartment
-				    Parent_View 	@378
-				    location   	(794, 1293)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	665)
-				width      	510
-				height     	240
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @379
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@379
-				    location   	(1628, 956)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	410
-				height     	512
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$68" @380
-				location   	(1590, 704)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD62DF802D1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "part" @381
-					Parent_View 	@380
-					location   	(438, -464)
-					label      	(object SegLabel @382
-					    Parent_View 	@381
-					    location   	(1917, 886)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+part"
-					    pctDist    	0.881465
-					    height     	90
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD62DFA0002"
-					client     	@380
-					supplier   	@379
-					vertices   	(list Points
-					    (1590, 704)
-					    (1827, 704)
-					    (1827, 944))
-					line_style 	3
-					origin_attachment 	(1590, 704)
-					terminal_attachment 	(1827, 944)
-					label      	(object SegLabel @383
-					    Parent_View 	@381
-					    location   	(1774, 886)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.881465
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$69" @384
-					Parent_View 	@380
-					location   	(438, -464)
-					label      	(object SegLabel @385
-					    Parent_View 	@384
-					    location   	(1209, 746)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD62DFA0003"
-					client     	@380
-					supplier   	@371
-					vertices   	(list Points
-					    (1590, 704)
-					    (1170, 704)
-					    (1170, 648))
-					line_style 	3
-					origin_attachment 	(1590, 704)
-					terminal_attachment 	(1170, 648))))
-			    (object AssociationViewNew "$UNNAMED$64" @386
-				location   	(1457, 1390)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3A06E0B50036"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$65" @387
-					Parent_View 	@386
-					location   	(225, -914)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3A06E0B600C4"
-					client     	@386
-					supplier   	@378
-					line_style 	3
-					origin_attachment 	(1457, 1390)
-					terminal_attachment 	(1295, 1390))
-				    (object RoleView "parts" @388
-					Parent_View 	@386
-					location   	(225, -914)
-					label      	(object SegLabel @389
-					    Parent_View 	@388
-					    location   	(1591, 1494)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	159
-					    justify    	0
-					    label      	"+parts"
-					    pctDist    	0.833856
-					    height     	104
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3A06E0B600C5"
-					client     	@386
-					supplier   	@379
-					line_style 	3
-					origin_attachment 	(1457, 1390)
-					terminal_attachment 	(1619, 1390)
-					label      	(object SegLabel @390
-					    Parent_View 	@388
-					    location   	(1591, 1344)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.833856
-					    height     	47
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::soap::SOAPFault" @391
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@391
-				    location   	(794, 1540)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"SOAPFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A06D9FA00F7"
-				compartment 	(object Compartment
-				    Parent_View 	@391
-				    location   	(794, 1597)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	665)
-				width      	510
-				height     	240
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::soap::IString" @392
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@392
-				    location   	(66, 1332)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	348
-				    justify    	0
-				    label      	"IString")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@392
-				    location   	(66, 1282)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	348
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8DD90C0220"
-				width      	366
-				height     	180
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @393
-				location   	(1040, 750)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@371
-				vertices   	(list Points
-				    (1040, 750)
-				    (1040, 648)))
-			    (object InheritView "" @394
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD63330017D"
-				client     	@362
-				supplier   	@371
-				line_style 	3
-				origin_attachment 	(645, 895)
-				terminal_attachment 	(645, 750)
-				drawSupplier 	@393)
-			    (object InheritView "" @395
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD633340038"
-				client     	@363
-				supplier   	@371
-				line_style 	3
-				origin_attachment 	(1316, 895)
-				terminal_attachment 	(1316, 750)
-				drawSupplier 	@393)))
-		    (object ClassDiagram "Port"
-			quid       	"3A085E30035C"
-			title      	"Port"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::soap::SOAPAddress" @396
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@396
-				    location   	(151, 239)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"SOAPAddress")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD1FF750287"
-				compartment 	(object Compartment
-				    Parent_View 	@396
-				    location   	(151, 294)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	409)
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)))
-		    (object ClassDiagram "Extensibility"
-			quid       	"3AE099B10161"
-			title      	"Extensibility"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::soap::SOAPAddress" @397
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@397
-				    location   	(1371, 527)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	298
-				    justify    	0
-				    label      	"SOAPAddress")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD1FF750287"
-				width      	316
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPBinding" @398
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 592)
-				label      	(object ItemLabel
-				    Parent_View 	@398
-				    location   	(162, 543)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	284
-				    justify    	0
-				    label      	"SOAPBinding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01D3B901AD"
-				width      	302
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPBody" @399
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@399
-				    location   	(950, 1055)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	244
-				    justify    	0
-				    label      	"SOAPBody")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01DED5031F"
-				width      	262
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPFault" @400
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@400
-				    location   	(1112, 1215)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"SOAPFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A06D9FA00F7"
-				width      	258
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPOperation" @401
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(512, 752)
-				label      	(object ItemLabel
-				    Parent_View 	@401
-				    location   	(344, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"SOAPOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A0AD45500E8"
-				width      	354
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPHeaderBase" @402
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@402
-				    location   	(627, 879)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"SOAPHeaderBase")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01DEE7034D"
-				width      	396
-				height     	122
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @403
-				ShowCompartmentStereotypes 	TRUE
-				location   	(608, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@403
-				    location   	(408, 55)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	400
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	418
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @404
-				location   	(608, 305)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@403
-				vertices   	(list Points
-				    (608, 305)
-				    (608, 215)))
-			    (object InheritView "" @405
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A3801AB"
-				client     	@398
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(344, 531)
-				terminal_attachment 	(344, 305)
-				drawSupplier 	@404)
-			    (object InheritView "" @406
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A3E0326"
-				client     	@402
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(815, 867)
-				terminal_attachment 	(815, 305)
-				drawSupplier 	@404)
-			    (object InheritView "" @407
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A450041"
-				client     	@399
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(1068, 1043)
-				terminal_attachment 	(1068, 305)
-				drawSupplier 	@404)
-			    (object InheritView "" @408
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A4E031F"
-				client     	@401
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(506, 691)
-				terminal_attachment 	(506, 305)
-				drawSupplier 	@404)
-			    (object InheritView "" @409
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A4A0020"
-				client     	@400
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(1231, 1203)
-				terminal_attachment 	(1231, 305)
-				drawSupplier 	@404)
-			    (object InheritView "" @410
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE095350098"
-				client     	@397
-				supplier   	@403
-				line_style 	3
-				origin_attachment 	(1520, 515)
-				terminal_attachment 	(1520, 305)
-				drawSupplier 	@404)))))
-	    (object Class_Category "xsd"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"XSD")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"xsd")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/xsd/2002/XSD"))
-		quid       	"39ABDC6F01AA"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "XSDAnnotation"
-			quid       	"3B66EDC80233"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69E1770116"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4E20366"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "applicationInformation"
-				quid       	"3BBF7EBF02C8"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "userInformation"
-				quid       	"3BBF7EEA0157"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributes"
-				quid       	"3BBF7F0501E2"
-				stereotype 	"0..*"
-				type       	"DOMAttr"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeDeclaration"
-			quid       	"3B66ED2E0192"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69B7DC0193"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B688E6103BE"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F5202B4"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeGroupContent"
-			quid       	"3B6940200089"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D8E200EA"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDAttributeGroupDefinition"
-			quid       	"3B66ED840290"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69403A0221"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2EB02A8"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC800D2"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F7B0386"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUse"
-			quid       	"3B68354601A8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D737038F"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B72D7BB0349"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3B69CCF3027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B69CDDB03B7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CDE002D8"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "use"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7B0220382"
-				type       	"XSDAttributeUseCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C2719D90341"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDBoundedFacet"
-			quid       	"3B6C751D0344"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C763C0224"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C752A00CC"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinalityFacet"
-			quid       	"3B6C755D03D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C764F0131"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C756C0153"
-				type       	"XSDCardinality"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexTypeContent"
-			quid       	"3B683BA00196"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848B80286"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDComplexTypeDefinition"
-			quid       	"3B682B82031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69BAA20310"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2")
-			    (object Inheritance_Relationship
-				quid       	"3BA0D01901F1"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "derivationMethod"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C6E4020E"
-				type       	"XSDDerivationMethod"
-				initv      	"restriction"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B69C71D026A"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C73800C5"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "contentTypeCategory"
-				quid       	"3B69CA4202B8"
-				type       	"XSDContentTypeCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibitedSubstitutions"
-				quid       	"3B69CB8A03E6"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F618014D"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0FB97006E"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3C31AF5E03A6"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDComponent"
-			quid       	"3B6846E90029"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA903D2"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDConcreteComponent"
-			quid       	"3B6AD7B40065"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "element"
-				quid       	"3B6ADDB501A5"
-				type       	"DOMElement"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDConstrainingFacet"
-			quid       	"3B6C6B340093"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C800394"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDDiagnostic"
-			quid       	"3BFE5F910046"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3D4C0F4C01A1"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "severity"
-				quid       	"3BFE691C005D"
-				type       	"XSDDiagnosticSeverity"
-				exportControl 	"Public")
-			    (object ClassAttribute "message"
-				quid       	"3BFE5FDD0280"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "locationURI"
-				quid       	"3C063743016B"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "line"
-				quid       	"3BFE607E0213"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "column"
-				quid       	"3BFE611E0296"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "node"
-				quid       	"3C016B6B0200"
-				type       	"DOMNode"
-				exportControl 	"Public")
-			    (object ClassAttribute "annotationURI"
-				quid       	"3C06374F0186"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDElementDeclaration"
-			quid       	"3B66ED580214"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69EDEE01BF"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B685F17002E"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174")
-			    (object Inheritance_Relationship
-				quid       	"3B688E660339"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "nillable"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BFB4029F"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "disallowedSubstitutions"
-				quid       	"3B69C4680368"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "substitutionGroupExclusions"
-				quid       	"3B69C4A003B9"
-				stereotype 	"0..*"
-				type       	"XSDSubstitutionGroupExclusions"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C4E0000E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D14C00B2"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D16801C1"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289F6203CF"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C34DCB00018"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDEnumerationFacet"
-			quid       	"3B6C6ACE0141"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C9D03C7"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C640054"
-				stereotype 	"0..*"
-				type       	"Value"
-				exportControl 	"Public")))
-		    (object Class "XSDFacet"
-			quid       	"3B6C359403D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D25680259"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3B6C73740253"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "facetName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289FB401EC"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "effectiveValue"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28AAE303B6"
-				type       	"Value"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFeature"
-			quid       	"3B69B537026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C290A2C0307"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B69BF81020F"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BF8800C5"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "form"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F902B033E"
-				type       	"XSDForm"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C271A1B016F"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "global"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0070372"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "featureReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0440185"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFixedFacet"
-			quid       	"3B6C699E00C1"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8801B4"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C6A600201"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFractionDigitsFacet"
-			quid       	"3B6C79BE02EE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B990016"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79D2008A"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDFundamentalFacet"
-			quid       	"3B6C69E801D6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C7B0396"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDIdentityConstraintDefinition"
-			quid       	"3B682B2603A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684AA30242"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "identityConstraintCategory"
-				quid       	"3B69D1C70143"
-				type       	"XSDIdentityConstraintCategory"
-				exportControl 	"Public")))
-		    (object Class "XSDImport"
-			quid       	"3B688C93017F"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8D9003E"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespace"
-				quid       	"3B6ADB15036C"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDInclude"
-			quid       	"3B688C7D0250"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8DC0381"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDLengthFacet"
-			quid       	"3B6C776200E7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C778002DF"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C776C004B"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMaxExclusiveFacet"
-			quid       	"3B6C789600C2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8E0309"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxFacet"
-			quid       	"3C0A1CEB010E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D3103AD"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1EE201F7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A174027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1930354"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMaxInclusiveFacet"
-			quid       	"3B6C787D00DA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8303B8"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxLengthFacet"
-			quid       	"3B6C77C70146"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B7D00FC"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C77DA00F3"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMinExclusiveFacet"
-			quid       	"3B6C792D000A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B590281"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinFacet"
-			quid       	"3C0A1CDE037C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D240098"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1ED10398"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1A2008E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1BE03E2"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMinInclusiveFacet"
-			quid       	"3B6C788702C9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B520353"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinLengthFacet"
-			quid       	"3B6C778C0065"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C77C400C0"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7799015E"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroup"
-			quid       	"3B6834E00291"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A640279"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "compositor"
-				quid       	"3B69CF1D01CF"
-				type       	"XSDCompositor"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroupDefinition"
-			quid       	"3B66ED9A0205"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2E20381"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2550385"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC40090"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "modelGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1F602E8"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDNamedComponent"
-			quid       	"3B6846D303A4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA20197"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B6847000142"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B684704031E"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A57F0127"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "uRI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A58700E2"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasURI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A5AA02AF"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "qName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C290963025E"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDNotationDeclaration"
-			quid       	"3B66EDAA021C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B68494302F1"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4")
-			    (object Inheritance_Relationship
-				quid       	"3B688E4F023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "systemIdentifier"
-				quid       	"3B69D32E00F0"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "publicIdentifier"
-				quid       	"3B69D3340397"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDNumericFacet"
-			quid       	"3B6C75950206"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C76420074"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C75A30012"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDOrderedFacet"
-			quid       	"3B6C74DD0248"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7659012C"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C74F602DA"
-				type       	"XSDOrdered"
-				exportControl 	"Public")))
-		    (object Class "XSDParticle"
-			quid       	"3B682BBD01F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848FC01E7"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "minOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF8E03B2"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "maxOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF9903AE"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")))
-		    (object Class "XSDParticleContent"
-			quid       	"3B6BD22300C6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B780BD90059"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDPatternFacet"
-			quid       	"3B6C6ADB026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6CA5038D"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C790311"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDRedefinableComponent"
-			quid       	"3B7FCA8B020B"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4BA023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3C290A26036D"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A6800216"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefineContent"
-			quid       	"3B6AE2060172"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2B301D5"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefine"
-			quid       	"3B688C9B02AD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB640240"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDRepeatableFacet"
-			quid       	"3B6C6AA6031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8F002E"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			abstract   	TRUE)
-		    (object Class "XSDSchema"
-			quid       	"374B182500BB"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCC4A0182"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "document"
-				quid       	"3C2784E503DD"
-				type       	"DOMDocument"
-				exportControl 	"Public")
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6868EC0226"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B9F9BFF0180"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributeFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F904B0102"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F907800AC"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "finalDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0C4A70038"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "blockDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F59D02D8"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "version"
-				quid       	"3D22D6D80356"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDSchemaCompositor"
-			quid       	"3C21DB4102AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB560092"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaContent"
-			quid       	"3B688CB800BA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8E60372"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaDirective"
-			quid       	"3B6AD8A202A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE32102AF"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6AD9B30330"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDScope"
-			quid       	"3B69B54000F2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCD640231"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDSimpleTypeDefinition"
-			quid       	"3B682BA7005D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A1302A2"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")
-			    (object Inheritance_Relationship
-				quid       	"3B685F55032B"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C315800A9"
-				type       	"XSDVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B6D544F0146"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F65E035A"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "validFacets"
-				quid       	"3C28AB0F00B6"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDTerm"
-			quid       	"3B683C5E0174"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848AA01D3"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2440069"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"))
-			abstract   	TRUE)
-		    (object Class "XSDTotalDigitsFacet"
-			quid       	"3B6C79A0020E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B610337"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79AB0232"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDTypeDefinition"
-			quid       	"3B66ECD302A9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2F5013A"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAB1004D"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			abstract   	TRUE)
-		    (object Class "XSDWhiteSpaceFacet"
-			quid       	"3B6C784601B7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C78620045"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C78500201"
-				type       	"XSDWhiteSpace"
-				exportControl 	"Public")))
-		    (object Class "XSDWildcard"
-			quid       	"3B6838370031"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A3A0041"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceConstraintCategory"
-				quid       	"3B69D0E9019E"
-				type       	"XSDNamespaceConstraintCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "namespaceConstraint"
-				quid       	"3B97CF860223"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "processContents"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69D12E01E4"
-				type       	"XSDProcessContents"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalNamespaceConstraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7BDB701F9"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathDefinition"
-			quid       	"3B6D83BB0355"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D84F70092"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				quid       	"3B6D901503DE"
-				type       	"XSDXPathVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B7BBBE101B1"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "DOMAttr"
-			quid       	"3BBF8C8901B6"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Attr"
-				quid       	"3BBF8CB000D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMDocument"
-			quid       	"3C27850E0381"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3C27851B03C6"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMElement"
-			quid       	"3B8189790200"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B8189DB0374"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMNode"
-			quid       	"3BFE64A50117"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Node"
-				quid       	"3BFE65BF002D"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Value"
-			quid       	"3C040B5B031F"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.lang.Object"
-				quid       	"3C040B8D03D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUseCategory"
-			quid       	"3BA7B0E801A8"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "optional"
-				quid       	"3BA7B11502B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibited"
-				quid       	"3BA7B12202D3"
-				exportControl 	"Public")
-			    (object ClassAttribute "required"
-				quid       	"3BA7B12902F0"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinality"
-			quid       	"3BC7715D009B"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "finite"
-				quid       	"3BC771DC02ED"
-				exportControl 	"Public")
-			    (object ClassAttribute "countablyInfinite"
-				quid       	"3BC771EC0141"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexFinal"
-			quid       	"3B97C2CA01CB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C2E700DA"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2EA016A"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6D20112"
-				exportControl 	"Public")))
-		    (object Class "XSDCompositor"
-			quid       	"3B869B620037"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "all"
-				quid       	"3B869BD00003"
-				exportControl 	"Public")
-			    (object ClassAttribute "choice"
-				quid       	"3B869CB8011E"
-				exportControl 	"Public")
-			    (object ClassAttribute "sequence"
-				quid       	"3B869CE50057"
-				exportControl 	"Public")))
-		    (object Class "XSDConstraint"
-			quid       	"3B869E2601AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "default"
-				quid       	"3B869E8E0258"
-				exportControl 	"Public")
-			    (object ClassAttribute "fixed"
-				quid       	"3B869E990271"
-				exportControl 	"Public")))
-		    (object Class "XSDContentTypeCategory"
-			quid       	"3B86A79F03A2"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "empty"
-				quid       	"3B86A7CD02F0"
-				exportControl 	"Public")
-			    (object ClassAttribute "simple"
-				quid       	"3B86A7D100CE"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				quid       	"3B86A7D301B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementOnly"
-				quid       	"3B86A7D702E9"
-				exportControl 	"Public")))
-		    (object Class "XSDDerivationMethod"
-			quid       	"3B86A0B000CE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B86A0C80329"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B86A0CC0162"
-				exportControl 	"Public")))
-		    (object Class "XSDDiagnosticSeverity"
-			quid       	"3BFE68A7032F"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fatal"
-				quid       	"3BFE68C303D0"
-				exportControl 	"Public")
-			    (object ClassAttribute "error"
-				quid       	"3BFE68E700E3"
-				exportControl 	"Public")
-			    (object ClassAttribute "warning"
-				quid       	"3BFE68EA01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "information"
-				quid       	"3BFE7FC2019A"
-				exportControl 	"Public")))
-		    (object Class "XSDDisallowedSubstitutions"
-			quid       	"3B97C5A403DF"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "substitution"
-				quid       	"3B97C6790045"
-				exportControl 	"Public")
-			    (object ClassAttribute "extension"
-				quid       	"3B97C67F01AC"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C683020B"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2450069"
-				exportControl 	"Public")))
-		    (object Class "XSDForm"
-			quid       	"3B9F913B01EB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qualified"
-				quid       	"3B9F916F0023"
-				exportControl 	"Public")
-			    (object ClassAttribute "unqualified"
-				quid       	"3B9F918C007F"
-				exportControl 	"Public")))
-		    (object Class "XSDIdentityConstraintCategory"
-			quid       	"3B86A1E00272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "key"
-				quid       	"3B86A2120085"
-				exportControl 	"Public")
-			    (object ClassAttribute "keyref"
-				quid       	"3B86A213014F"
-				exportControl 	"Public")
-			    (object ClassAttribute "unique"
-				quid       	"3B86A2160365"
-				exportControl 	"Public")))
-		    (object Class "XSDNamespaceConstraintCategory"
-			quid       	"3B97C5EA0023"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "any"
-				quid       	"3B97D0600034"
-				exportControl 	"Public")
-			    (object ClassAttribute "not"
-				quid       	"3B97D062005F"
-				exportControl 	"Public")
-			    (object ClassAttribute "set"
-				quid       	"3B97D0650117"
-				exportControl 	"Public")))
-		    (object Class "XSDOrdered"
-			quid       	"3BC7715202E4"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "false"
-				quid       	"3BC771A90271"
-				exportControl 	"Public")
-			    (object ClassAttribute "partial"
-				quid       	"3BC771BB01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "total"
-				quid       	"3BC771C401B2"
-				exportControl 	"Public")))
-		    (object Class "XSDProcessContents"
-			quid       	"3B8FF8C70284"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "strict"
-				quid       	"3B8FF8F80045"
-				exportControl 	"Public")
-			    (object ClassAttribute "lax"
-				quid       	"3B8FF8F6038B"
-				exportControl 	"Public")
-			    (object ClassAttribute "skip"
-				quid       	"3B8FF8E802BA"
-				exportControl 	"Public")))
-		    (object Class "XSDProhibitedSubstitutions"
-			quid       	"3B97C5BE0272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C68B00B8"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C6940291"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2500295"
-				exportControl 	"Public")))
-		    (object Class "XSDSimpleFinal"
-			quid       	"3B97C25D0295"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "list"
-				quid       	"3B97C2810230"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2830138"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B97C288024E"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6E00374"
-				exportControl 	"Public")))
-		    (object Class "XSDSubstitutionGroupExclusions"
-			quid       	"3B97C59100AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C6640231"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C66D0216"
-				exportControl 	"Public")))
-		    (object Class "XSDVariety"
-			quid       	"3B8FF7730249"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "atomic"
-				quid       	"3B8FF7A702DF"
-				exportControl 	"Public")
-			    (object ClassAttribute "list"
-				quid       	"3B8FF7AD0139"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B8FF7AF039F"
-				exportControl 	"Public")))
-		    (object Class "XSDWhiteSpace"
-			quid       	"3BEED0F60342"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "preserve"
-				quid       	"3BEED10F0117"
-				exportControl 	"Public")
-			    (object ClassAttribute "replace"
-				quid       	"3BEED127034D"
-				exportControl 	"Public")
-			    (object ClassAttribute "collapse"
-				quid       	"3BEED1290396"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathVariety"
-			quid       	"3B8FFB89033A"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "selector"
-				quid       	"3B8FFBAC0192"
-				exportControl 	"Public")
-			    (object ClassAttribute "field"
-				quid       	"3B8FFBB30278"
-				exportControl 	"Public")))
-		    (object Association "$UNNAMED$72"
-			quid       	"3C626EA70102"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$73"
-				quid       	"3C626EA90191"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EA90192"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$74"
-			quid       	"3B69DADC02F5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$75"
-				quid       	"3B69DADD0238"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DADD0242"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$76"
-			quid       	"3B6890D6006F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$77"
-				quid       	"3B6890D6030E"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6890D60318"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$78"
-			quid       	"3B68356B02CB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$79"
-				quid       	"3B68356D00A6"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68356D00A7"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$80"
-			quid       	"3B6B426B0194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$81"
-				quid       	"3B6B426D0309"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B426D0313"
-				label      	"resolvedAttributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$82"
-			quid       	"3B69DB060291"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$83"
-				quid       	"3B69DB070171"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB070172"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$84"
-			quid       	"3B69404E0067"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$85"
-				quid       	"3B694050029B"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B69405002A5"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$86"
-			quid       	"3B68359F0086"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$87"
-				quid       	"3B6835A00069"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6835A0006A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$88"
-			quid       	"3C275D320220"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$89"
-				quid       	"3C275D3C010C"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3C275D3C010D"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$90"
-			quid       	"3B6887BF0150"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$91"
-				quid       	"3B6887C000A7"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6887C000A8"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$92"
-			quid       	"3B6B425E01F9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$93"
-				quid       	"3B6B42620046"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B42620050"
-				label      	"resolvedAttributeGroupDefinition"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$94"
-			quid       	"3B683585010D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$95"
-				quid       	"3B68358600FA"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68358600FB"
-				label      	"attributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$96"
-			quid       	"3B6F1DE9018A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$97"
-				quid       	"3B6F1DEA036C"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6F1DEA0380"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$98"
-			quid       	"3B90068801C2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$99"
-				quid       	"3B90068A0111"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentAnnotation"
-				quid       	"3B90068A011B"
-				label      	"contentAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$100"
-			quid       	"3B6833350340"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$101"
-				quid       	"3B683336028D"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683336028E"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$102"
-			quid       	"3B6FDDD70113"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$103"
-				quid       	"3B6FDDDA026B"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6FDDDA0275"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$104"
-			quid       	"3B6837DF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$105"
-				quid       	"3B6837E100FD"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6837E100FE"
-				label      	"contentType"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$106"
-			quid       	"3B683959006E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$107"
-				quid       	"3B6839590349"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683959034A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$108"
-			quid       	"3B698E360386"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$109"
-				quid       	"3B698E380072"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeContents"
-				quid       	"3B698E38007C"
-				label      	"attributeContents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$110"
-			quid       	"3B6851BA0126"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$111"
-				quid       	"3B6851BB0150"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6851BB0151"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$112"
-			quid       	"3B751B0803C7"
-			roles      	(list role_list
-			    (object Role "container"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B0C01CE"
-				label      	"container"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$113"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B0C01CF"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$114"
-			quid       	"3B751B480261"
-			roles      	(list role_list
-			    (object Role "rootContainer"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B4C0285"
-				label      	"rootContainer"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$115"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B4C0286"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$116"
-			quid       	"3B751C310356"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$117"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751C330331"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")
-			    (object Role "schema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751C33033B"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$118"
-			quid       	"3B69DB0A0066"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$119"
-				quid       	"3B69DB0B023F"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0B0249"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$120"
-			quid       	"3B68911401AF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$121"
-				quid       	"3B6891150016"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6891150017"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$122"
-			quid       	"3B68338C0058"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$123"
-				quid       	"3B68338C03BF"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68338C03C0"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$124"
-			quid       	"3B6833EF0160"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$125"
-				quid       	"3B6833F00298"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				quid       	"3B6833F00299"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$126"
-			quid       	"3B6B41E60251"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$127"
-				quid       	"3B6B41EA02F7"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedElementDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B41EA030B"
-				label      	"resolvedElementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$128"
-			quid       	"3B69C0590198"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$129"
-				quid       	"3B69C05D01E3"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214")
-			    (object Role "substitutionGroupAffiliation"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69C05D01ED"
-				label      	"substitutionGroupAffiliation"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$130"
-			quid       	"3C42DBDD0297"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$131"
-				quid       	"3C42DBE0011E"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "substitutionGroup"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C42DBE00128"
-				label      	"substitutionGroup"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$132"
-			quid       	"3B6D23B901CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$133"
-				quid       	"3B6D23BA01C4"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6D23BA01CE"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$134"
-			quid       	"3B6D597102EA"
-			roles      	(list role_list
-			    (object Role "simpleTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D59750105"
-				label      	"simpleTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$135"
-				attributes 	(list Attribute_Set)
-				quid       	"3B6D59750119"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2")))
-		    (object Association "$UNNAMED$136"
-			quid       	"3B69B653017A"
-			roles      	(list role_list
-			    (object Role "scope"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B69B654006D"
-				label      	"scope"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$137"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69B654006E"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$138"
-			quid       	"3C29010602D7"
-			roles      	(list role_list
-			    (object Role "resolvedFeature"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C29010B000E"
-				label      	"resolvedFeature"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$139"
-				attributes 	(list Attribute_Set)
-				quid       	"3C29010B0018"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$140"
-			quid       	"3B69DB0D0183"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$141"
-				quid       	"3B69DB0D033C"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0D0346"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$142"
-			quid       	"3B69D29E014D"
-			roles      	(list role_list
-			    (object Role "referencedKey"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69D2A80165"
-				label      	"referencedKey"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$143"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69D2A8016F"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2")))
-		    (object Association "$UNNAMED$144"
-			quid       	"3B6D8D3D003E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$145"
-				quid       	"3B6D8D3E022A"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "selector"
-				quid       	"3B6D8D3E0234"
-				label      	"selector"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$146"
-			quid       	"3B6D8D330025"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$147"
-				quid       	"3B6D8D330365"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "fields"
-				quid       	"3B6D8D330379"
-				label      	"fields"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$148"
-			quid       	"3B6ADCD802FC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$149"
-				quid       	"3B6ADCD9018B"
-				supplier   	"Logical View::xsd::XSDImport"
-				quidu      	"3B688C93017F"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCD9018C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$150"
-			quid       	"3B6ADCC5007E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$151"
-				quid       	"3B6ADCC6006B"
-				supplier   	"Logical View::xsd::XSDInclude"
-				quidu      	"3B688C7D0250"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCC6006C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$152"
-			quid       	"3B69DB1702C8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$153"
-				quid       	"3B69DB1803E2"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB190004"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$154"
-			quid       	"3B6BCEB102F8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$155"
-				quid       	"3B6BCEB6001B"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6BCEB60025"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$156"
-			quid       	"3B683606026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$157"
-				quid       	"3B6836070221"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "particles"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6836070222"
-				label      	"particles"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$158"
-			quid       	"3B69DB15008A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$159"
-				quid       	"3B69DB160096"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1600A0"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$160"
-			quid       	"3B6837AC025A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$161"
-				quid       	"3B6837AD0338"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroup"
-				quid       	"3B6837AD0339"
-				label      	"modelGroup"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$162"
-			quid       	"3B6B42450398"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$163"
-				quid       	"3B6B4249038A"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedModelGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B4249039E"
-				label      	"resolvedModelGroupDefinition"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$164"
-			quid       	"3B69DB0F0212"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$165"
-				quid       	"3B69DB1000C9"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1000D3"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$166"
-			quid       	"3B6B47150119"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$167"
-				quid       	"3B6B471A03AB"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6B471A03B5"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$168"
-			quid       	"3B683C890122"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$169"
-				quid       	"3B683C8A0110"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "term"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683C8A0111"
-				label      	"term"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$170"
-			quid       	"3B6ADE42009A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$171"
-				quid       	"3B6ADE4302FE"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6ADE430308"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$172"
-			quid       	"3B6AE8240051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$173"
-				quid       	"3B6AE82602AD"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6AE82602B7"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$174"
-			quid       	"3B688E6B003D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$175"
-				quid       	"3B688E6C0107"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B688E6C0111"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$176"
-			quid       	"3B66EE8D01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$177"
-				quid       	"3B66EE8E0198"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "elementDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE8E0199"
-				label      	"elementDeclarations"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$178"
-			quid       	"3B66FDFA00C3"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$179"
-				quid       	"3B66FDFB027D"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66FDFB027E"
-				label      	"attributeDeclarations"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$180"
-			quid       	"3B66EE920216"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$181"
-				quid       	"3B66EE93018B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE93018C"
-				label      	"attributeGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$182"
-			quid       	"3B66EE760049"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$183"
-				quid       	"3B66EE760374"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE76037E"
-				label      	"typeDefinitions"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$184"
-			quid       	"3B66EEFF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$185"
-				quid       	"3B66EF00025A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EF000264"
-				label      	"modelGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$186"
-			quid       	"3BFC2A1701ED"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$187"
-				quid       	"3BFC2A1A0273"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFC2A1A027D"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$188"
-			quid       	"3B66EEA7023E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$189"
-				quid       	"3B66EEA8038A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "notationDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EEA8038B"
-				label      	"notationDeclarations"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$190"
-			quid       	"3B69E4560290"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$191"
-				quid       	"3B69E4570165"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69E457016F"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$192"
-			quid       	"3B6D5CA50112"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$193"
-				quid       	"3B6D5CA703B4"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6D5CA703C8"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$194"
-			quid       	"3B6C35AD0374"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$195"
-				quid       	"3B6C35AF0006"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facetContents"
-				quid       	"3B6C35AF0010"
-				label      	"facetContents"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$196"
-			quid       	"3BC8AE0203A8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$197"
-				quid       	"3BC8AE060051"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BC8AE060065"
-				label      	"facets"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$198"
-			quid       	"3B6C34B70208"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$199"
-				quid       	"3B6C34BE0258"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "memberTypeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6C34BE0259"
-				label      	"memberTypeDefinitions"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$200"
-			quid       	"3B6C363201DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$201"
-				quid       	"3B6C36350059"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fundamentalFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B6C36350063"
-				label      	"fundamentalFacets"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$202"
-			quid       	"3B6D35AB0273"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$203"
-				quid       	"3B6D35B20291"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D35B202A5"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$204"
-			quid       	"3B6D5572016C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$205"
-				quid       	"3B6D5575022F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "primitiveTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D55750243"
-				label      	"primitiveTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$206"
-			quid       	"3B69E2910158"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$207"
-				quid       	"3B69E292019F"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69E29201A9"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$208"
-			quid       	"3B9006CF0088"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$209"
-				quid       	"3B9006D1015D"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "derivationAnnotation"
-				quid       	"3B9006D10167"
-				label      	"derivationAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$210"
-			quid       	"3B69DB330264"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$211"
-				quid       	"3B69DB340284"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69DB34028E"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$212"
-			quid       	"3B69DB11026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$213"
-				quid       	"3B69DB1201F9"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB120203"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$214"
-			quid       	"3C626EB30005"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$215"
-				quid       	"3C626EB40327"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EB40332"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$216"
-			quid       	"3BEBDC870247"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$217"
-				quid       	"3BEBDC8C02F9"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3BEBDC8C0303"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$218"
-			quid       	"3BFE622703CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$219"
-				attributes 	(list Attribute_Set)
-				quid       	"3BFE622B0061"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "components"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE622B006C"
-				label      	"components"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$220"
-			quid       	"3BFE62690165"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$221"
-				quid       	"3BFE626A0026"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				is_aggregate 	TRUE)
-			    (object Role "diagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3BFE626A0027"
-				label      	"diagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$222"
-			quid       	"3BFE6431035F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$223"
-				quid       	"3BFE643201C6"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "allDiagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE643201C7"
-				label      	"allDiagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$224"
-			quid       	"3C21DCC700EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$225"
-				quid       	"3C21DCCE0042"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DCCE0043"
-				label      	"resolvedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$226"
-			quid       	"3C21DD0C03DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$227"
-				quid       	"3C21DD100304"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DD100305"
-				label      	"incorporatedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$228"
-			quid       	"3C239134004F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$229"
-				quid       	"3C23913600CA"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3C23913600D4"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$230"
-			quid       	"3C25D3A60131"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$231"
-				quid       	"3C25D3A90370"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "referencingDirectives"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C25D3A90371"
-				label      	"referencingDirectives"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$232"
-			quid       	"3C25ECF0005E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$233"
-				quid       	"3C25ECF4001E"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "rootVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ECF40028"
-				label      	"rootVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$234"
-			quid       	"3C25ED0B011B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$235"
-				quid       	"3C25ED0F0121"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "originalVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ED0F012B"
-				label      	"originalVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$236"
-			quid       	"3C25EEAB001F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$237"
-				quid       	"3C25EEAF010B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedVersions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25EEAF0115"
-				label      	"incorporatedVersions"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$238"
-			quid       	"3C276DA000DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$239"
-				quid       	"3C276DA000DF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "itemTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C276DA000E0"
-				label      	"itemTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$240"
-			quid       	"3C2784730194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$241"
-				quid       	"3C27847501F1"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "schemaForSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C27847501FB"
-				label      	"schemaForSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$242"
-			quid       	"3C2880F503D9"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2880F9003C"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$243"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2880F90046"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A")))
-		    (object Association "$UNNAMED$244"
-			quid       	"3C2882C50137"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$245"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2882C70112"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "primaryComponent"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2882C70113"
-				label      	"primaryComponent"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$246"
-			quid       	"3C28A0F201A4"
-			roles      	(list role_list
-			    (object Role "type"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A0F302E5"
-				label      	"type"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$247"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A0F302F0"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$248"
-			quid       	"3C28A6DB01E5"
-			roles      	(list role_list
-			    (object Role "rootType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A6DD03DD"
-				label      	"rootType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$249"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A6DD03DE"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$250"
-			quid       	"3C28A7120108"
-			roles      	(list role_list
-			    (object Role "baseType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7140151"
-				label      	"baseType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$251"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A714015B"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$252"
-			quid       	"3C28A74B0178"
-			roles      	(list role_list
-			    (object Role "simpleType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A74D017B"
-				label      	"simpleType"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$253"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A74D0185"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$254"
-			quid       	"3C28A7ED03C0"
-			roles      	(list role_list
-			    (object Role "complexType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7F40117"
-				label      	"complexType"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$255"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A7F40121"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$256"
-			quid       	"3C28A994030A"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A99700DD"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$257"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A99700E7"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D")))
-		    (object Association "$UNNAMED$258"
-			quid       	"3C28B085025B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$259"
-				quid       	"3C28B0860270"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B086027A"
-				label      	"minFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$260"
-			quid       	"3C28B08D0252"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$261"
-				quid       	"3C28B08E0091"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B08E009B"
-				label      	"maxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$262"
-			quid       	"3C28B0AB0396"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$263"
-				quid       	"3C28B0AC03C9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0AC03D4"
-				label      	"maxInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxInclusiveFacet"
-				quidu      	"3B6C787D00DA"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$264"
-			quid       	"3C28B0AF0338"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$265"
-				quid       	"3C28B0B001F9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B00203"
-				label      	"minInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinInclusiveFacet"
-				quidu      	"3B6C788702C9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$266"
-			quid       	"3C28B0B30207"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$267"
-				quid       	"3C28B0B40190"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B4019A"
-				label      	"minExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinExclusiveFacet"
-				quidu      	"3B6C792D000A"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$268"
-			quid       	"3C28B0B6028D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$269"
-				quid       	"3C28B0B70217"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B70221"
-				label      	"maxExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxExclusiveFacet"
-				quidu      	"3B6C789600C2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$270"
-			quid       	"3C28B0BC0051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$271"
-				quid       	"3C28B0BC0246"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "lengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0BC0250"
-				label      	"lengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$272"
-			quid       	"3C28B0BF018C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$273"
-				quid       	"3C28B0C0006B"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "whiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C00075"
-				label      	"whiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$274"
-			quid       	"3C28B0C2021D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$275"
-				quid       	"3C28B0C300AB"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "enumerationFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C300AC"
-				label      	"enumerationFacets"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$276"
-			quid       	"3C28B0C50159"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$277"
-				quid       	"3C28B0C600B0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "patternFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C600BA"
-				label      	"patternFacets"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$278"
-			quid       	"3C28B0C802A7"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$279"
-				quid       	"3C28B0C901EA"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "cardinalityFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C901F5"
-				label      	"cardinalityFacet"
-				supplier   	"Logical View::xsd::XSDCardinalityFacet"
-				quidu      	"3B6C755D03D2"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$280"
-			quid       	"3C28B0CB039C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$281"
-				quid       	"3C28B0CC03D0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "numericFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0CC03D1"
-				label      	"numericFacet"
-				supplier   	"Logical View::xsd::XSDNumericFacet"
-				quidu      	"3B6C75950206"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$282"
-			quid       	"3C28B0CF0199"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$283"
-				quid       	"3C28B0D20085"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D2008F"
-				label      	"maxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$284"
-			quid       	"3C28B0D500C5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$285"
-				quid       	"3C28B0D6001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D60027"
-				label      	"minLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$286"
-			quid       	"3C28B0D800DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$287"
-				quid       	"3C28B0D803CD"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "totalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D803D7"
-				label      	"totalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$288"
-			quid       	"3C28B0DB0377"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$289"
-				quid       	"3C28B0DC035A"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DC0364"
-				label      	"fractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$290"
-			quid       	"3C28B0DF0048"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$291"
-				quid       	"3C28B0DF03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "orderedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DF03C3"
-				label      	"orderedFacet"
-				supplier   	"Logical View::xsd::XSDOrderedFacet"
-				quidu      	"3B6C74DD0248"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$292"
-			quid       	"3C28B0E300D9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$293"
-				quid       	"3C28B0E4038E"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "boundedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0E40398"
-				label      	"boundedFacet"
-				supplier   	"Logical View::xsd::XSDBoundedFacet"
-				quidu      	"3B6C751D0344"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$294"
-			quid       	"3C28B44401EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$295"
-				quid       	"3C28B4450360"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B445036A"
-				label      	"effectiveMaxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$296"
-			quid       	"3C28B54F0145"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$297"
-				quid       	"3C28B550038C"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveWhiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5500396"
-				label      	"effectiveWhiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$298"
-			quid       	"3C28B5C4011C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$299"
-				quid       	"3C28B5C5020D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5C50217"
-				label      	"effectiveMaxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$300"
-			quid       	"3C28B62A00AA"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$301"
-				quid       	"3C28B62B0138"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveFractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B62B0142"
-				label      	"effectiveFractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$302"
-			quid       	"3C28B6B003A6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$303"
-				quid       	"3C28B6B10311"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectivePatternFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B6B10312"
-				label      	"effectivePatternFacet"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$304"
-			quid       	"3C28B7CA026B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$305"
-				quid       	"3C28B7CB0186"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveEnumerationFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B7CB0190"
-				label      	"effectiveEnumerationFacet"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$306"
-			quid       	"3C28B8400062"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$307"
-				quid       	"3C28B841001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveTotalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8410027"
-				label      	"effectiveTotalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$308"
-			quid       	"3C28B898016D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$309"
-				quid       	"3C28B8990056"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8990060"
-				label      	"effectiveMinLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$310"
-			quid       	"3C28B8DC0052"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$311"
-				quid       	"3C28B8DC03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8DC03C3"
-				label      	"effectiveLengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$312"
-			quid       	"3C28B97001DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$313"
-				quid       	"3C28B97100CF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B97100D9"
-				label      	"effectiveMinFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$314"
-			quid       	"3D4BB4AE01CC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$315"
-				quid       	"3D4BB4AF010F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4AF011A"
-				label      	"syntheticFacets"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$316"
-			quid       	"3D4BB4D3028E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$317"
-				quid       	"3D4BB4D402F3"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticParticle"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4D402FD"
-				label      	"syntheticParticle"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$318"
-			quid       	"3D4BB4D901F6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$319"
-				quid       	"3D4BB4DA0284"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4DA028E"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$320"
-			quid       	"3D4C68FF01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$321"
-				quid       	"3D4C69020317"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				quid       	"3D4C69020318"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "1. Component Hierarchy (Part 1: Structures)"
-			quid       	"3B6847680138"
-			title      	"1. Component Hierarchy (Part 1: Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @411
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@411
-				    location   	(766, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @412
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1168, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@412
-				    location   	(940, 519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @413
-				location   	(928, 225)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@411
-				vertices   	(list Points
-				    (928, 225)
-				    (928, 135)))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @414
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@414
-				    location   	(1460, 279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @415
-				location   	(1203, 706)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@412
-				vertices   	(list Points
-				    (1203, 706)
-				    (1203, 615)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @416
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@416
-				    location   	(372, 519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @417
-				location   	(444, 709)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@416
-				vertices   	(list Points
-				    (444, 709)
-				    (444, 615)))
-			    (object InheritTreeView "" @418
-				location   	(1572, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@414
-				vertices   	(list Points
-				    (1572, 465)
-				    (1572, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @419
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@419
-				    location   	(290, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @420
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 1056)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@420
-				    location   	(262, 1015)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @421
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1104, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@421
-				    location   	(936, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @422
-				location   	(453, 1203)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@420
-				vertices   	(list Points
-				    (453, 1203)
-				    (453, 1111)))
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @423
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@423
-				    location   	(62, 279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @424
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@424
-				    location   	(1746, 759)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @425
-				location   	(1872, 950)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@424
-				vertices   	(list Points
-				    (1872, 950)
-				    (1872, 855)))
-			    (object InheritTreeView "" @426
-				location   	(181, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@423
-				vertices   	(list Points
-				    (181, 465)
-				    (181, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @427
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@427
-				    location   	(1670, 1233)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	550
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @428
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@428
-				    location   	(1734, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @429
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@429
-				    location   	(1569, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	656
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @430
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1184, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@430
-				    location   	(903, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	563
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	581
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @431
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@431
-				    location   	(1462, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	294
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @432
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@432
-				    location   	(778, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @433
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@433
-				    location   	(1806, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @434
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@434
-				    location   	(106, 1253)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @435
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@435
-				    location   	(60, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @436
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@436
-				    location   	(802, 1237)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	558
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @437
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@437
-				    location   	(30, 1441)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	694
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @438
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@438
-				    location   	(426, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	300
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	318
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @439
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@439
-				    location   	(1808, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @440
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@421
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(1094, 265)
-				terminal_attachment 	(1094, 225)
-				drawSupplier 	@413)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @441
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@441
-				    location   	(690, 759)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @442
-				location   	(962, 947)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@441
-				vertices   	(list Points
-				    (962, 947)
-				    (962, 855)))
-			    (object InheritView "" @443
-				stereotype 	(object SegLabel @444
-				    Parent_View 	@443
-				    location   	(218, 1154)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.163534
-				    height     	69
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@434
-				supplier   	@416
-				line_style 	3
-				origin_attachment 	(149, 1241)
-				terminal_attachment 	(149, 709)
-				drawSupplier 	@417)
-			    (object InheritView "" @445
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@434
-				supplier   	@420
-				line_style 	3
-				origin_attachment 	(256, 1241)
-				terminal_attachment 	(256, 1203)
-				drawSupplier 	@422)
-			    (object InheritView "" @446
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@435
-				supplier   	@423
-				line_style 	3
-				origin_attachment 	(284, 505)
-				terminal_attachment 	(284, 465)
-				drawSupplier 	@426)
-			    (object InheritView "" @447
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@433
-				supplier   	@414
-				line_style 	3
-				origin_attachment 	(2002, 505)
-				terminal_attachment 	(2002, 465)
-				drawSupplier 	@418)
-			    (object InheritView "" @448
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@414
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(1569, 265)
-				terminal_attachment 	(1569, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @449
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@431
-				supplier   	@414
-				line_style 	3
-				origin_attachment 	(1490, 505)
-				terminal_attachment 	(1490, 465)
-				drawSupplier 	@418)
-			    (object InheritView "" @450
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@419
-				supplier   	@416
-				line_style 	3
-				origin_attachment 	(510, 745)
-				terminal_attachment 	(510, 709)
-				drawSupplier 	@417)
-			    (object InheritView "" @451
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@436
-				supplier   	@441
-				line_style 	3
-				origin_attachment 	(1321, 1225)
-				terminal_attachment 	(1321, 947)
-				drawSupplier 	@442)
-			    (object InheritView "" @452
-				stereotype 	(object SegLabel @453
-				    Parent_View 	@452
-				    location   	(2137, 886)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.215812
-				    height     	64
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@428
-				supplier   	@414
-				line_style 	3
-				origin_attachment 	(2200, 1001)
-				terminal_attachment 	(2200, 465)
-				drawSupplier 	@418)
-			    (object InheritView "" @454
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@428
-				supplier   	@424
-				line_style 	3
-				origin_attachment 	(2093, 1001)
-				terminal_attachment 	(2093, 950)
-				drawSupplier 	@425)
-			    (object InheritView "" @455
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@420
-				supplier   	@441
-				line_style 	3
-				origin_attachment 	(450, 1001)
-				terminal_attachment 	(450, 947)
-				drawSupplier 	@442)
-			    (object InheritView "" @456
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@423
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(147, 265)
-				terminal_attachment 	(147, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @457
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D84F70092"
-				client     	@439
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(2012, 265)
-				terminal_attachment 	(2012, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @458
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848B80286"
-				client     	@416
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(834, 505)
-				terminal_attachment 	(834, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @459
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@412
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(1350, 505)
-				terminal_attachment 	(1350, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @460
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@438
-				supplier   	@411
-				line_style 	3
-				origin_attachment 	(572, 265)
-				terminal_attachment 	(572, 225)
-				drawSupplier 	@413)
-			    (object InheritView "" @461
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@427
-				supplier   	@424
-				line_style 	3
-				origin_attachment 	(1693, 1221)
-				terminal_attachment 	(1693, 950)
-				drawSupplier 	@425)
-			    (object InheritView "" @462
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@429
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(1590, 1432)
-				terminal_attachment 	(1590, 706)
-				drawSupplier 	@415)
-			    (object InheritView "" @463
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@430
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(1431, 1432)
-				terminal_attachment 	(1431, 706)
-				drawSupplier 	@415)
-			    (object InheritView "" @464
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@441
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(959, 745)
-				terminal_attachment 	(959, 706)
-				drawSupplier 	@415)
-			    (object InheritView "" @465
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@424
-				supplier   	@412
-				line_style 	3
-				origin_attachment 	(1872, 745)
-				terminal_attachment 	(1872, 706)
-				drawSupplier 	@415)
-			    (object InheritView "" @466
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@432
-				supplier   	@441
-				line_style 	3
-				origin_attachment 	(962, 1001)
-				terminal_attachment 	(962, 947)
-				drawSupplier 	@442)
-			    (object InheritView "" @467
-				stereotype 	(object SegLabel @468
-				    Parent_View 	@467
-				    location   	(95, 1388)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.042531
-				    height     	67
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B69BAA20310"
-				client     	@437
-				supplier   	@423
-				line_style 	3
-				origin_attachment 	(28, 1429)
-				terminal_attachment 	(28, 465)
-				drawSupplier 	@426)
-			    (object InheritView "" @469
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@437
-				supplier   	@420
-				line_style 	3
-				origin_attachment 	(656, 1429)
-				terminal_attachment 	(656, 1203)
-				drawSupplier 	@422)))
-		    (object ClassDiagram "2. Component Relations (Part 1 : Structures)"
-			quid       	"374B18190028"
-			title      	"2. Component Relations (Part 1 : Structures)"
-			zoom       	96
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @470
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(784, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@470
-				    location   	(670, 1593)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @471
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@471
-				    location   	(66, 1593)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$136" @472
-				location   	(494, 1627)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B653017A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "scope" @473
-					Parent_View 	@472
-					location   	(286, -485)
-					label      	(object SegLabel @474
-					    Parent_View 	@473
-					    location   	(555, 1589)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+scope"
-					    pctDist    	0.371257
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006D"
-					client     	@472
-					supplier   	@470
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(661, 1627)
-					label      	(object SegLabel @475
-					    Parent_View 	@473
-					    location   	(576, 1664)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.491018
-					    height     	37
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$137" @476
-					Parent_View 	@472
-					location   	(286, -485)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006E"
-					client     	@472
-					supplier   	@471
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(327, 1627))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @477
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@477
-				    location   	(2084, 1193)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @478
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2176, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@478
-				    location   	(2051, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$168" @479
-				location   	(2229, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683C890122"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$169" @480
-					Parent_View 	@479
-					location   	(549, -248)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0110"
-					client     	@479
-					supplier   	@478
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1045))
-				    (object RoleView "term" @481
-					Parent_View 	@479
-					location   	(549, -248)
-					label      	(object SegLabel @482
-					    Parent_View 	@481
-					    location   	(2157, 1121)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+term"
-					    pctDist    	0.134328
-					    height     	72
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0111"
-					client     	@479
-					supplier   	@477
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1179)
-					label      	(object SegLabel @483
-					    Parent_View 	@481
-					    location   	(2274, 1119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.119403
-					    height     	45
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @484
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@484
-				    location   	(1076, 1193)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @485
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@485
-				    location   	(1977, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$156" @486
-				location   	(2219, 880)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683606026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$157" @487
-					Parent_View 	@486
-					location   	(-357, -240)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070221"
-					client     	@486
-					supplier   	@485
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 821))
-				    (object RoleView "particles" @488
-					Parent_View 	@486
-					location   	(-357, -240)
-					label      	(object SegLabel @489
-					    Parent_View 	@488
-					    location   	(2105, 888)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+particles"
-					    pctDist    	0.156627
-					    height     	115
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070222"
-					client     	@486
-					supplier   	@478
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 939)
-					label      	(object SegLabel @490
-					    Parent_View 	@488
-					    location   	(2281, 888)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.156627
-					    height     	62
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @491
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@491
-				    location   	(1639, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @492
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@492
-				    location   	(905, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @493
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@493
-				    location   	(187, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$202" @494
-				location   	(590, 1140)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$203" @495
-					Parent_View 	@494
-					location   	(302, 148)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@494
-					supplier   	@493
-					vertices   	(list Points
-					    (590, 1140)
-					    (540, 1140)
-					    (540, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(540, 1045))
-				    (object RoleView "baseTypeDefinition" @496
-					Parent_View 	@494
-					location   	(302, 148)
-					label      	(object SegLabel @497
-					    Parent_View 	@496
-					    location   	(643, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.053571
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@494
-					supplier   	@493
-					vertices   	(list Points
-					    (590, 1140)
-					    (641, 1140)
-					    (641, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(641, 1045)
-					label      	(object SegLabel @498
-					    Parent_View 	@496
-					    location   	(584, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.122449
-					    height     	44
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @499
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@499
-				    location   	(745, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$104" @500
-				location   	(1119, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837DF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$105" @501
-					Parent_View 	@500
-					location   	(-1569, -8)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FD"
-					client     	@500
-					supplier   	@499
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1045))
-				    (object RoleView "contentType" @502
-					Parent_View 	@500
-					location   	(-1569, -8)
-					label      	(object SegLabel @503
-					    Parent_View 	@502
-					    location   	(1259, 1126)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+contentType"
-					    pctDist    	0.208955
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FE"
-					client     	@500
-					supplier   	@484
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1179)
-					label      	(object SegLabel @504
-					    Parent_View 	@502
-					    location   	(1063, 1126)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.208955
-					    height     	57
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$110" @505
-				location   	(1455, 982)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6851BA0126"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$111" @506
-					Parent_View 	@505
-					location   	(159, -570)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0150"
-					client     	@505
-					supplier   	@499
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1280, 982))
-				    (object RoleView "attributeWildcard" @507
-					Parent_View 	@505
-					location   	(159, -570)
-					label      	(object SegLabel @508
-					    Parent_View 	@507
-					    location   	(1445, 929)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	-0.062857
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0151"
-					client     	@505
-					supplier   	@491
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1630, 982)
-					label      	(object SegLabel @509
-					    Parent_View 	@507
-					    location   	(1550, 1022)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.542857
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$106" @510
-				location   	(921, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683959006E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$107" @511
-					Parent_View 	@510
-					location   	(-871, -376)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6839590349"
-					client     	@510
-					supplier   	@499
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1045))
-				    (object RoleView "attributeUses" @512
-					Parent_View 	@510
-					location   	(-871, -376)
-					label      	(object SegLabel @513
-					    Parent_View 	@512
-					    location   	(778, 1251)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.269939
-					    height     	144
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683959034A"
-					client     	@510
-					supplier   	@492
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1371)
-					label      	(object SegLabel @514
-					    Parent_View 	@512
-					    location   	(979, 1254)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.288344
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @515
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@515
-				    location   	(1122, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	380
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	398
-				height     	107
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @516
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@516
-				    location   	(1623, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @517
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@517
-				    location   	(1803, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$160" @518
-				location   	(2216, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$161" @519
-					Parent_View 	@518
-					location   	(-552, -816)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@518
-					supplier   	@517
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 501))
-				    (object RoleView "modelGroup" @520
-					Parent_View 	@518
-					location   	(-552, -816)
-					label      	(object SegLabel @521
-					    Parent_View 	@520
-					    location   	(2080, 628)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.182609
-					    height     	137
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@518
-					supplier   	@485
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 715)
-					label      	(object SegLabel @522
-					    Parent_View 	@520
-					    location   	(2256, 633)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.233645
-					    height     	40
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @523
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@523
-				    location   	(1619, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$90" @524
-				location   	(1676, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6887BF0150"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$91" @525
-					Parent_View 	@524
-					location   	(412, -344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A7"
-					client     	@524
-					supplier   	@523
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1371))
-				    (object RoleView "attributeWildcard" @526
-					Parent_View 	@524
-					location   	(412, -344)
-					label      	(object SegLabel @527
-					    Parent_View 	@526
-					    location   	(1857, 1106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	0.625767
-					    height     	181
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A8"
-					client     	@524
-					supplier   	@491
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1045)
-					label      	(object SegLabel @528
-					    Parent_View 	@526
-					    location   	(1618, 1108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.619632
-					    height     	59
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$86" @529
-				location   	(1429, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68359F0086"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$87" @530
-					Parent_View 	@529
-					location   	(-363, -146)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A00069"
-					client     	@529
-					supplier   	@523
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1610, 1438))
-				    (object RoleView "attributeUses" @531
-					Parent_View 	@529
-					location   	(-363, -146)
-					label      	(object SegLabel @532
-					    Parent_View 	@531
-					    location   	(1405, 1506)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.132597
-					    height     	68
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A0006A"
-					client     	@529
-					supplier   	@492
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1248, 1438)
-					label      	(object SegLabel @533
-					    Parent_View 	@531
-					    location   	(1327, 1391)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.563536
-					    height     	48
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @534
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@534
-				    location   	(183, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$94" @535
-				location   	(777, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683585010D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$95" @536
-					Parent_View 	@535
-					location   	(-519, -367)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FA"
-					client     	@535
-					supplier   	@492
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(896, 1425))
-				    (object RoleView "attributeDeclaration" @537
-					Parent_View 	@535
-					location   	(-519, -367)
-					label      	(object SegLabel @538
-					    Parent_View 	@537
-					    location   	(784, 1508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+attributeDeclaration"
-					    pctDist    	-0.059259
-					    height     	83
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FB"
-					client     	@535
-					supplier   	@534
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(658, 1425)
-					label      	(object SegLabel @539
-					    Parent_View 	@537
-					    location   	(721, 1385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.472441
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$78" @540
-				location   	(237, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68356B02CB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$79" @541
-					Parent_View 	@540
-					location   	(-1043, 72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A6"
-					client     	@540
-					supplier   	@534
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1371))
-				    (object RoleView "typeDefinition" @542
-					Parent_View 	@540
-					location   	(-1043, 72)
-					label      	(object SegLabel @543
-					    Parent_View 	@542
-					    location   	(388, 1247)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	-0.239264
-					    height     	151
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A7"
-					client     	@540
-					supplier   	@493
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1045)
-					label      	(object SegLabel @544
-					    Parent_View 	@542
-					    location   	(195, 1247)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.239264
-					    height     	43
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @545
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@545
-				    location   	(198, 745)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$100" @546
-				location   	(728, 775)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833350340"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$101" @547
-					Parent_View 	@546
-					location   	(-856, -57)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028D"
-					client     	@546
-					supplier   	@499
-					vertices   	(list Points
-					    (728, 775)
-					    (788, 775)
-					    (788, 939))
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(788, 939))
-				    (object RoleView "baseTypeDefinition" @548
-					Parent_View 	@546
-					location   	(-856, -57)
-					label      	(object SegLabel @549
-					    Parent_View 	@548
-					    location   	(558, 883)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.140940
-					    height     	108
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028E"
-					client     	@546
-					supplier   	@545
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(579, 775)
-					label      	(object SegLabel @550
-					    Parent_View 	@548
-					    location   	(750, 812)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.152439
-					    height     	37
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @551
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@551
-				    location   	(1017, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$142" @552
-				location   	(1629, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69D29E014D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencedKey" @553
-					Parent_View 	@552
-					location   	(-83, 94)
-					label      	(object SegLabel @554
-					    Parent_View 	@553
-					    location   	(1761, 608)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+referencedKey"
-					    pctDist    	-1.797297
-					    height     	34
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A80165"
-					client     	@552
-					supplier   	@551
-					vertices   	(list Points
-					    (1629, 574)
-					    (1555, 574)
-					    (1555, 501))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1555, 501)
-					label      	(object SegLabel @555
-					    Parent_View 	@553
-					    location   	(1622, 539)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.047619
-					    height     	36
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$143" @556
-					Parent_View 	@552
-					location   	(-83, 94)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A8016F"
-					client     	@552
-					supplier   	@551
-					vertices   	(list Points
-					    (1629, 574)
-					    (1689, 574)
-					    (1689, 444)
-					    (1616, 444))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1616, 444))))
-			    (object AssociationViewNew "$UNNAMED$146" @557
-				location   	(1197, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$147" @558
-					Parent_View 	@557
-					location   	(-115, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@557
-					supplier   	@551
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 501))
-				    (object RoleView "fields" @559
-					Parent_View 	@557
-					location   	(-115, 32)
-					label      	(object SegLabel @560
-					    Parent_View 	@559
-					    location   	(1119, 655)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.439252
-					    height     	78
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@557
-					supplier   	@515
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 715)
-					label      	(object SegLabel @561
-					    Parent_View 	@559
-					    location   	(1253, 654)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.429907
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$144" @562
-				location   	(1415, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$145" @563
-					Parent_View 	@562
-					location   	(103, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@562
-					supplier   	@551
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 501))
-				    (object RoleView "selector" @564
-					Parent_View 	@562
-					location   	(103, 32)
-					label      	(object SegLabel @565
-					    Parent_View 	@564
-					    location   	(1513, 651)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.411215
-					    height     	98
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@562
-					supplier   	@515
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 715)
-					label      	(object SegLabel @566
-					    Parent_View 	@564
-					    location   	(1381, 650)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.392523
-					    height     	34
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @567
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1312, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@567
-				    location   	(1022, 68)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	581
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	599
-				height     	209
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$188" @568
-				location   	(2395, 606)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEA7023E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$189" @569
-					Parent_View 	@568
-					location   	(-853, 174)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038A"
-					client     	@568
-					supplier   	@567
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 65)
-					    (1611, 65))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(1611, 65))
-				    (object RoleView "notationDeclarations" @570
-					Parent_View 	@568
-					location   	(-853, 174)
-					label      	(object SegLabel @571
-					    Parent_View 	@570
-					    location   	(2089, 104)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+notationDeclarations"
-					    pctDist    	-0.489776
-					    height     	307
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038B"
-					client     	@568
-					supplier   	@516
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 1633)
-					    (2098, 1633))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(2098, 1633)
-					label      	(object SegLabel @572
-					    Parent_View 	@570
-					    location   	(2344, 105)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.487829
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$184" @573
-				location   	(1772, 249)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEFF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$185" @574
-					Parent_View 	@573
-					location   	(-948, -327)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF00025A"
-					client     	@573
-					supplier   	@567
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1611, 249))
-				    (object RoleView "modelGroupDefinitions" @575
-					Parent_View 	@573
-					location   	(-948, -327)
-					label      	(object SegLabel @576
-					    Parent_View 	@575
-					    location   	(2076, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+modelGroupDefinitions"
-					    pctDist    	0.713592
-					    height     	244
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF000264"
-					client     	@573
-					supplier   	@517
-					vertices   	(list Points
-					    (1772, 249)
-					    (1832, 249)
-					    (1832, 395))
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1832, 395)
-					label      	(object SegLabel @577
-					    Parent_View 	@575
-					    location   	(1781, 340)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.737864
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$180" @578
-				location   	(2346, 518)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE920216"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$181" @579
-					Parent_View 	@578
-					location   	(154, 86)
-					label      	(object SegLabel @580
-					    Parent_View 	@579
-					    location   	(1872, 1857)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	-3.630072
-					    height     	475
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018B"
-					client     	@578
-					supplier   	@567
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 149)
-					    (1611, 149))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(1611, 149))
-				    (object RoleView "attributeGroupDefinitions" @581
-					Parent_View 	@578
-					location   	(154, 86)
-					label      	(object SegLabel @582
-					    Parent_View 	@581
-					    location   	(2008, 195)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+attributeGroupDefinitions"
-					    pctDist    	-0.349946
-					    height     	339
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018C"
-					client     	@578
-					supplier   	@523
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 1441)
-					    (2166, 1441))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(2166, 1441)
-					label      	(object SegLabel @583
-					    Parent_View 	@581
-					    location   	(2299, 197)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.348862
-					    height     	48
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$182" @584
-				location   	(203, 159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE760049"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$183" @585
-					Parent_View 	@584
-					location   	(-485, -273)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE760374"
-					client     	@584
-					supplier   	@567
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(1013, 159))
-				    (object RoleView "typeDefinitions" @586
-					Parent_View 	@584
-					location   	(-485, -273)
-					label      	(object SegLabel @587
-					    Parent_View 	@586
-					    location   	(349, 196)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+typeDefinitions"
-					    pctDist    	-1.475728
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE76037E"
-					client     	@584
-					supplier   	@545
-					vertices   	(list Points
-					    (203, 159)
-					    (104, 159)
-					    (104, 784)
-					    (189, 784))
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(189, 784)
-					label      	(object SegLabel @588
-					    Parent_View 	@586
-					    location   	(155, 200)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.059701
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$186" @589
-				location   	(1087, 329)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFC2A1701ED"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$187" @590
-					Parent_View 	@589
-					location   	(-577, -23)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A0273"
-					client     	@589
-					supplier   	@567
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 264))
-				    (object RoleView "identityConstraintDefinitions" @591
-					Parent_View 	@589
-					location   	(-577, -23)
-					label      	(object SegLabel @592
-					    Parent_View 	@591
-					    location   	(1375, 338)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.130952
-					    height     	288
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A027D"
-					client     	@589
-					supplier   	@551
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 395)
-					label      	(object SegLabel @593
-					    Parent_View 	@591
-					    location   	(1018, 336)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.107143
-					    height     	70
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$178" @594
-				location   	(48, 320)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66FDFA00C3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$179" @595
-					Parent_View 	@594
-					location   	(-1072, -288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027D"
-					client     	@594
-					supplier   	@567
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 68)
-					    (1013, 68))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(1013, 68))
-				    (object RoleView "attributeDeclarations" @596
-					Parent_View 	@594
-					location   	(-1072, -288)
-					label      	(object SegLabel @597
-					    Parent_View 	@596
-					    location   	(338, 106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+attributeDeclarations"
-					    pctDist    	-0.198536
-					    height     	289
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027E"
-					client     	@594
-					supplier   	@534
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 1415)
-					    (174, 1415))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(174, 1415)
-					label      	(object SegLabel @598
-					    Parent_View 	@596
-					    location   	(91, 108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.196706
-					    height     	42
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @599
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@599
-				    location   	(175, 412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	483
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	501
-				height     	97
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$128" @600
-				location   	(499, 589)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69C0590198"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$129" @601
-					Parent_View 	@600
-					location   	(-13, 109)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01E3"
-					client     	@600
-					supplier   	@599
-					vertices   	(list Points
-					    (499, 589)
-					    (452, 589)
-					    (452, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(452, 496))
-				    (object RoleView "substitutionGroupAffiliation" @602
-					Parent_View 	@600
-					location   	(-13, 109)
-					label      	(object SegLabel @603
-					    Parent_View 	@602
-					    location   	(811, 585)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+substitutionGroupAffiliation"
-					    pctDist    	6.520833
-					    height     	5
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01ED"
-					client     	@600
-					supplier   	@599
-					vertices   	(list Points
-					    (499, 589)
-					    (547, 589)
-					    (547, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(547, 496)
-					label      	(object SegLabel @604
-					    Parent_View 	@602
-					    location   	(499, 559)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.000000
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$122" @605
-				location   	(241, 613)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68338C0058"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$123" @606
-					Parent_View 	@605
-					location   	(-1343, -219)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03BF"
-					client     	@605
-					supplier   	@599
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 496))
-				    (object RoleView "typeDefinition" @607
-					Parent_View 	@605
-					location   	(-1343, -219)
-					label      	(object SegLabel @608
-					    Parent_View 	@607
-					    location   	(408, 694)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.686441
-					    height     	167
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03C0"
-					client     	@605
-					supplier   	@545
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 731)
-					label      	(object SegLabel @609
-					    Parent_View 	@607
-					    location   	(202, 685)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.610169
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$124" @610
-				location   	(837, 460)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$125" @611
-					Parent_View 	@610
-					location   	(-1819, -68)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@610
-					supplier   	@599
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(666, 460))
-				    (object RoleView "identityConstraintDefinitions" @612
-					Parent_View 	@610
-					location   	(-1819, -68)
-					label      	(object SegLabel @613
-					    Parent_View 	@612
-					    location   	(880, 528)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.251462
-					    height     	68
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@610
-					supplier   	@551
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(1008, 460)
-					label      	(object SegLabel @614
-					    Parent_View 	@612
-					    location   	(859, 407)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.130435
-					    height     	54
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$176" @615
-				location   	(541, 246)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE8D01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$177" @616
-					Parent_View 	@615
-					location   	(-1123, -186)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0198"
-					client     	@615
-					supplier   	@567
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(1013, 246))
-				    (object RoleView "elementDeclarations" @617
-					Parent_View 	@615
-					location   	(-1123, -186)
-					label      	(object SegLabel @618
-					    Parent_View 	@617
-					    location   	(443, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+elementDeclarations"
-					    pctDist    	0.209302
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0199"
-					client     	@615
-					supplier   	@599
-					vertices   	(list Points
-					    (541, 246)
-					    (224, 246)
-					    (224, 400))
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(224, 400)
-					label      	(object SegLabel @619
-					    Parent_View 	@617
-					    location   	(186, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.864693
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$130" @620
-				location   	(353, 621)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C42DBDD0297"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$131" @621
-					Parent_View 	@620
-					location   	(-63, 173)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE0011E"
-					client     	@620
-					supplier   	@599
-					vertices   	(list Points
-					    (353, 621)
-					    (306, 621)
-					    (306, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(306, 496))
-				    (object RoleView "substitutionGroup" @622
-					Parent_View 	@620
-					location   	(-63, 173)
-					label      	(object SegLabel @623
-					    Parent_View 	@622
-					    location   	(579, 636)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+substitutionGroup"
-					    pctDist    	4.808511
-					    height     	15
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE00128"
-					client     	@620
-					supplier   	@599
-					vertices   	(list Points
-					    (353, 621)
-					    (400, 621)
-					    (400, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(400, 496)
-					label      	(object SegLabel @624
-					    Parent_View 	@622
-					    location   	(350, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.069767
-					    height     	39
-					    orientation 	0))))))
-		    (object ClassDiagram "3. Component Attributes  (Part 1 : Structures)"
-			quid       	"3B69E78602C5"
-			title      	"3. Component Attributes  (Part 1 : Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @625
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@625
-				    location   	(46, 49)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	516
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@625
-				    location   	(46, 115)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	482
-				    compartmentItems 	(list Compartment
-					"+ name : String"
-					"+ targetNamespace : String"))
-				width      	534
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @626
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@626
-				    location   	(41, 1567)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	512
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @627
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 1680)
-				label      	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(1781, 1524)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1174
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@627
-				    location   	(1781, 1584)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	1139
-				    compartmentItems 	(list Compartment
-					"+ derivationMethod : XSDDerivationMethod = restriction"
-					"<<0..*>> + final : XSDComplexFinal"
-					"+ abstract : boolean"
-					"+ contentTypeCategory : XSDContentTypeCategory"
-					"<<0..*>> + prohibitedSubstitutions : XSDProhibitedSubstitutions"))
-				width      	1192
-				height     	336
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @628
-				location   	(463, 362)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@625
-				vertices   	(list Points
-				    (463, 362)
-				    (463, 221)))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @629
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@629
-				    location   	(1094, 1519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	628
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@629
-				    location   	(1094, 1579)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	592
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	646
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @630
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@630
-				    location   	(647, 38)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	530
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@630
-				    location   	(647, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	502
-				    compartmentItems 	(list Compartment
-					"+ required : boolean"
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	548
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @631
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@631
-				    location   	(45, 1830)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1286
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@631
-				    location   	(45, 1890)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	1260
-				    compartmentItems 	(list Compartment
-					"+ namespaceConstraintCategory : XSDNamespaceConstraintCategory"
-					"<<0..*>> + namespaceConstraint : String"
-					"+ processContents : XSDProcessContents"))
-				width      	1304
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @632
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 1440)
-				label      	(object ItemLabel
-				    Parent_View 	@632
-				    location   	(47, 1384)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	578
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	596
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @633
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@633
-				    location   	(36, 433)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@633
-				    location   	(36, 499)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	506
-				    compartmentItems 	(list Compartment
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	554
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @634
-				location   	(294, 697)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@633
-				vertices   	(list Points
-				    (294, 697)
-				    (294, 605)))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @635
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2256, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@635
-				    location   	(1995, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	540
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @636
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@636
-				    location   	(2418, 462)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @637
-				location   	(2684, 962)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@636
-				vertices   	(list Points
-				    (2684, 962)
-				    (2684, 576)))
-			    (object ClassView "Class" "Logical View::xsd::XSDCompositor" @638
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(45, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDCompositor")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(45, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869B620037"
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstraint" @639
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@639
-				    location   	(638, 469)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDConstraint")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@639
-				    location   	(638, 419)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869E2601AE"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDerivationMethod" @640
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(1980, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"XSDDerivationMethod")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(1980, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A0B000CE"
-				width      	442
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintCategory" @641
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@641
-				    location   	(1281, 88)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"XSDIdentityConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@641
-				    location   	(1281, 38)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A1E00272"
-				width      	625
-				height     	300
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDContentTypeCategory" @642
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2704, 2224)
-				label      	(object ItemLabel
-				    Parent_View 	@642
-				    location   	(2456, 2115)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"XSDContentTypeCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@642
-				    location   	(2456, 2065)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A79F03A2"
-				width      	514
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @643
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@643
-				    location   	(708, 1516)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@643
-				    location   	(708, 1466)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	362
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProcessContents" @644
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@644
-				    location   	(766, 2156)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDProcessContents")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@644
-				    location   	(766, 2106)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF8C70284"
-				width      	438
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathVariety" @645
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2768, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@645
-				    location   	(2587, 97)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"XSDXPathVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@645
-				    location   	(2587, 47)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FFB89033A"
-				width      	381
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @646
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 1872)
-				label      	(object ItemLabel
-				    Parent_View 	@646
-				    location   	(1389, 1788)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@646
-				    location   	(1389, 1738)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@646
-				    location   	(1389, 1848)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	199
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @647
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 2000)
-				label      	(object ItemLabel
-				    Parent_View 	@647
-				    location   	(1786, 1941)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@647
-				    location   	(1786, 1891)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				compartment 	(object Compartment
-				    Parent_View 	@647
-				    location   	(1786, 2001)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	382
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSubstitutionGroupExclusions" @648
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@648
-				    location   	(485, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"XSDSubstitutionGroupExclusions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@648
-				    location   	(485, 1075)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C59100AE"
-				width      	648
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @649
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@649
-				    location   	(1171, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@649
-				    location   	(1171, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@649
-				    location   	(1171, 1176)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	236
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"))
-				width      	556
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @650
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1664, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@650
-				    location   	(1398, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@650
-				    location   	(1398, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@650
-				    location   	(1398, 2273)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	550
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamespaceConstraintCategory" @651
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@651
-				    location   	(45, 2154)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"XSDNamespaceConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@651
-				    location   	(45, 2104)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5EA0023"
-				width      	696
-				height     	296
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @652
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1264, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@652
-				    location   	(571, 749)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1386
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@652
-				    location   	(571, 809)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	1357
-				    compartmentItems 	(list Compartment
-					"+ nillable : boolean"
-					"<<0..*>> + disallowedSubstitutions : XSDDisallowedSubstitutions"
-					"<<0..*>> + substitutionGroupExclusions : XSDSubstitutionGroupExclusions"
-					"+ abstract : boolean"))
-				width      	1404
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @653
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@652
-				supplier   	@633
-				line_style 	3
-				origin_attachment 	(681, 737)
-				terminal_attachment 	(681, 697)
-				drawSupplier 	@634)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @654
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@654
-				    location   	(35, 812)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @655
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@655
-				    location   	(2420, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @656
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@655
-				supplier   	@636
-				line_style 	3
-				origin_attachment 	(2862, 1088)
-				terminal_attachment 	(2862, 962)
-				drawSupplier 	@637)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @657
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1312)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@657
-				    location   	(2168, 1263)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @658
-				location   	(2375, 1465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@657
-				vertices   	(list Points
-				    (2375, 1465)
-				    (2375, 1375)))
-			    (object InheritView "" @659
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@657
-				supplier   	@636
-				line_style 	3
-				origin_attachment 	(2368, 1249)
-				terminal_attachment 	(2368, 962)
-				drawSupplier 	@637)
-			    (object InheritView "" @660
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@627
-				supplier   	@657
-				line_style 	3
-				origin_attachment 	(2818, 1512)
-				terminal_attachment 	(2818, 1465)
-				drawSupplier 	@658)
-			    (object InheritView "" @661
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@629
-				supplier   	@657
-				line_style 	3
-				origin_attachment 	(1406, 1507)
-				terminal_attachment 	(1406, 1465)
-				drawSupplier 	@658)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @662
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@662
-				    location   	(1818, 1101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @663
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@662
-				supplier   	@636
-				line_style 	3
-				origin_attachment 	(2115, 1089)
-				terminal_attachment 	(2115, 962)
-				drawSupplier 	@637)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @664
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@664
-				    location   	(1034, 468)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1132
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	1150
-				height     	144
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @665
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@664
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(1568, 456)
-				terminal_attachment 	(1568, 362)
-				drawSupplier 	@628)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @666
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@666
-				    location   	(2078, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	484
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	502
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @667
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@667
-				    location   	(43, 268)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @668
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@666
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(2290, 691)
-				terminal_attachment 	(2290, 362)
-				drawSupplier 	@628)
-			    (object InheritView "" @669
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@654
-				supplier   	@633
-				line_style 	3
-				origin_attachment 	(141, 800)
-				terminal_attachment 	(141, 697)
-				drawSupplier 	@634)
-			    (object InheritView "" @670
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@633
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(372, 419)
-				terminal_attachment 	(372, 362)
-				drawSupplier 	@628)
-			    (object InheritView "" @671
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@636
-				supplier   	@625
-				line_style 	3
-				origin_attachment 	(2687, 448)
-				terminal_attachment 	(2687, 362)
-				drawSupplier 	@628)))
-		    (object ClassDiagram "4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			quid       	"3B6C3265005F"
-			title      	"4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFixedFacet" @672
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@672
-				    location   	(32, 842)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	320
-				    justify    	0
-				    label      	"XSDFixedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C699E00C1"
-				width      	338
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @673
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@673
-				    location   	(504, 847)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @674
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@674
-				    location   	(266, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	478
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @675
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@675
-				    location   	(777, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	480
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @676
-				location   	(718, 1049)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@673
-				vertices   	(list Points
-				    (718, 1049)
-				    (718, 959)))
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @677
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@677
-				    location   	(1799, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	420
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @678
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@678
-				    location   	(1383, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	388
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @679
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2032, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@679
-				    location   	(1807, 1048)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	468
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @680
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@680
-				    location   	(1319, 1049)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	388
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @681
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@681
-				    location   	(491, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	348
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @682
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@682
-				    location   	(405, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	424
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @683
-				location   	(144, 1262)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@672
-				vertices   	(list Points
-				    (144, 1262)
-				    (144, 964)))
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @684
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1216, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@684
-				    location   	(1007, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @685
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@685
-				    location   	(880, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	498
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @686
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@686
-				    location   	(1090, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	462
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @687
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@687
-				    location   	(1193, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @688
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@688
-				    location   	(282, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	428
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	446
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @689
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@689
-				    location   	(124, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	474
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @690
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@690
-				    location   	(52, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	426
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @691
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@691
-				    location   	(1318, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	486
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @692
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C9D03C7"
-				client     	@674
-				supplier   	@673
-				line_style 	3
-				origin_attachment 	(394, 1100)
-				terminal_attachment 	(394, 1049)
-				drawSupplier 	@676)
-			    (object InheritView "" @693
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C78620045"
-				client     	@685
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(1119, 1308)
-				terminal_attachment 	(1119, 1262)
-				drawSupplier 	@683)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @694
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 160)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@694
-				    location   	(174, 119)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @695
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6CA5038D"
-				client     	@675
-				supplier   	@673
-				line_style 	3
-				origin_attachment 	(1044, 1100)
-				terminal_attachment 	(1044, 1049)
-				drawSupplier 	@676)
-			    (object InheritView "" @696
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C778002DF"
-				client     	@681
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(663, 1308)
-				terminal_attachment 	(663, 1262)
-				drawSupplier 	@683)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrdered" @697
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@697
-				    location   	(1835, 1324)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDOrdered")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@697
-				    location   	(1835, 1274)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715202E4"
-				width      	444
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinality" @698
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@698
-				    location   	(1835, 1669)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDCardinality")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@698
-				    location   	(1835, 1619)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715D009B"
-				width      	444
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpace" @699
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 2032)
-				label      	(object ItemLabel
-				    Parent_View 	@699
-				    location   	(1861, 1951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDWhiteSpace")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@699
-				    location   	(1861, 1901)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BEED0F60342"
-				width      	424
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::Value" @700
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@700
-				    location   	(571, 2062)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"Value")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@700
-				    location   	(571, 2012)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C040B5B031F"
-				width      	636
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @701
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B610337"
-				client     	@690
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(75, 2044)
-				terminal_attachment 	(75, 1262)
-				drawSupplier 	@683)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @702
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@702
-				    location   	(113, 1322)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	286
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@702
-				    location   	(113, 1388)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	254
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	304
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @703
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@703
-				    location   	(1440, 1322)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	288
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@703
-				    location   	(1440, 1388)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	258
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	306
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @704
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D240098"
-				client     	@702
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(235, 1308)
-				terminal_attachment 	(235, 1262)
-				drawSupplier 	@683)
-			    (object InheritView "" @705
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D3103AD"
-				client     	@703
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(1581, 1308)
-				terminal_attachment 	(1581, 1262)
-				drawSupplier 	@683)
-			    (object InheritView "" @706
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B520353"
-				client     	@688
-				supplier   	@702
-				line_style 	3
-				origin_attachment 	(285, 1664)
-				terminal_attachment 	(285, 1444))
-			    (object InheritView "" @707
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8303B8"
-				client     	@686
-				supplier   	@703
-				line_style 	3
-				origin_attachment 	(1500, 1664)
-				terminal_attachment 	(1500, 1444))
-			    (object InheritView "" @708
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8E0309"
-				client     	@687
-				supplier   	@703
-				line_style 	3
-				origin_attachment 	(1622, 1840)
-				terminal_attachment 	(1622, 1444))
-			    (object InheritView "" @709
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C77C400C0"
-				client     	@682
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(447, 1485)
-				terminal_attachment 	(447, 1262)
-				drawSupplier 	@683)
-			    (object InheritView "" @710
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B7D00FC"
-				client     	@684
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(1397, 1485)
-				terminal_attachment 	(1397, 1262)
-				drawSupplier 	@683)
-			    (object InheritView "" @711
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B990016"
-				client     	@691
-				supplier   	@672
-				line_style 	3
-				origin_attachment 	(1775, 2044)
-				terminal_attachment 	(1775, 1262)
-				drawSupplier 	@683)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @712
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 368)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@712
-				    location   	(174, 320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	406
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @713
-				location   	(366, 522)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@712
-				vertices   	(list Points
-				    (366, 522)
-				    (366, 430)))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @714
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@714
-				    location   	(34, 575)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	462
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @715
-				location   	(272, 781)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@714
-				vertices   	(list Points
-				    (272, 781)
-				    (272, 687)))
-			    (object InheritView "" @716
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@673
-				supplier   	@714
-				line_style 	3
-				origin_attachment 	(594, 833)
-				terminal_attachment 	(594, 781)
-				drawSupplier 	@715)
-			    (object ClassView "Class" "Logical View::xsd::XSDFundamentalFacet" @717
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@717
-				    location   	(526, 575)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDFundamentalFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C69E801D6"
-				width      	470
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @718
-				location   	(768, 789)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@717
-				vertices   	(list Points
-				    (768, 789)
-				    (768, 687)))
-			    (object InheritView "" @719
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7659012C"
-				client     	@677
-				supplier   	@717
-				line_style 	3
-				origin_attachment 	(2050, 860)
-				terminal_attachment 	(2050, 789)
-				drawSupplier 	@718)
-			    (object InheritView "" @720
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C763C0224"
-				client     	@678
-				supplier   	@717
-				line_style 	3
-				origin_attachment 	(1525, 860)
-				terminal_attachment 	(1525, 789)
-				drawSupplier 	@718)
-			    (object InheritView "" @721
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C764F0131"
-				client     	@679
-				supplier   	@717
-				line_style 	3
-				origin_attachment 	(2237, 1036)
-				terminal_attachment 	(2237, 789)
-				drawSupplier 	@718)
-			    (object InheritView "" @722
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C76420074"
-				client     	@680
-				supplier   	@717
-				line_style 	3
-				origin_attachment 	(1328, 1037)
-				terminal_attachment 	(1328, 789)
-				drawSupplier 	@718)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @723
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1456, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@723
-				    location   	(1137, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@723
-				    location   	(1137, 107)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	598
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	656
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$134" @724
-				location   	(775, 178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D597102EA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$135" @725
-					Parent_View 	@724
-					location   	(-1209, -46)
-					label      	(object SegLabel @726
-					    Parent_View 	@725
-					    location   	(509, 235)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750119"
-					client     	@724
-					supplier   	@712
-					vertices   	(list Points
-					    (775, 178)
-					    (550, 178)
-					    (550, 306))
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(550, 306))
-				    (object RoleView "simpleTypeDefinition" @727
-					Parent_View 	@724
-					location   	(-1209, -46)
-					label      	(object SegLabel @728
-					    Parent_View 	@727
-					    location   	(875, 136)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+simpleTypeDefinition"
-					    pctDist    	0.283133
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750105"
-					client     	@724
-					supplier   	@723
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(1128, 178)
-					label      	(object SegLabel @729
-					    Parent_View 	@727
-					    location   	(1061, 215)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.812500
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$196" @730
-				location   	(369, 72)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BC8AE0203A8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facets" @731
-					Parent_View 	@730
-					location   	(-1615, -152)
-					label      	(object SegLabel @732
-					    Parent_View 	@731
-					    location   	(187, 496)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+facets"
-					    pctDist    	0.913863
-					    height     	87
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060065"
-					client     	@730
-					supplier   	@714
-					vertices   	(list Points
-					    (369, 72)
-					    (100, 72)
-					    (100, 561))
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(100, 561)
-					label      	(object SegLabel @733
-					    Parent_View 	@731
-					    location   	(60, 498)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.917900
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$197" @734
-					Parent_View 	@730
-					location   	(-1615, -152)
-					label      	(object SegLabel @735
-					    Parent_View 	@734
-					    location   	(976, 31)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060051"
-					client     	@730
-					supplier   	@723
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(1128, 72))))
-			    (object AssociationViewNew "$UNNAMED$238" @736
-				location   	(1538, 508)
-				label      	(object SegLabel @737
-				    Parent_View 	@736
-				    location   	(1538, 449)
-				    font       	(object Font
-					italics    	TRUE)
-				    hidden     	TRUE
-				    anchor     	1
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	60
-				    justify    	0
-				    label      	""
-				    pctDist    	0.500000
-				    height     	60
-				    orientation 	0)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C276DA000DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$239" @738
-					Parent_View 	@736
-					location   	(-446, 284)
-					label      	(object SegLabel @739
-					    Parent_View 	@738
-					    location   	(1446, 340)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000DF"
-					client     	@736
-					supplier   	@723
-					vertices   	(list Points
-					    (1538, 508)
-					    (1487, 508)
-					    (1487, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1487, 285))
-				    (object RoleView "itemTypeDefinition" @740
-					Parent_View 	@736
-					location   	(-446, 284)
-					label      	(object SegLabel @741
-					    Parent_View 	@740
-					    location   	(1423, 577)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+itemTypeDefinition"
-					    pctDist    	-2.211539
-					    height     	69
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000E0"
-					client     	@736
-					supplier   	@723
-					vertices   	(list Points
-					    (1538, 508)
-					    (1590, 508)
-					    (1590, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1590, 285)
-					label      	(object SegLabel @742
-					    Parent_View 	@740
-					    location   	(1539, 468)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.003984
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$198" @743
-				location   	(1729, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C34B70208"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$199" @744
-					Parent_View 	@743
-					location   	(-255, 350)
-					label      	(object SegLabel @745
-					    Parent_View 	@744
-					    location   	(1637, 353)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0258"
-					client     	@743
-					supplier   	@723
-					vertices   	(list Points
-					    (1729, 574)
-					    (1678, 574)
-					    (1678, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1678, 285))
-				    (object RoleView "memberTypeDefinitions" @746
-					Parent_View 	@743
-					location   	(-255, 350)
-					label      	(object SegLabel @747
-					    Parent_View 	@746
-					    location   	(1559, 654)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+memberTypeDefinitions"
-					    pctDist    	-3.269231
-					    height     	80
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0259"
-					client     	@743
-					supplier   	@723
-					vertices   	(list Points
-					    (1729, 574)
-					    (1781, 574)
-					    (1781, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1781, 285)
-					label      	(object SegLabel @748
-					    Parent_View 	@746
-					    location   	(1730, 520)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.312121
-					    height     	52
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$200" @749
-				location   	(748, 269)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C363201DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fundamentalFacets" @750
-					Parent_View 	@749
-					location   	(-1236, 45)
-					label      	(object SegLabel @751
-					    Parent_View 	@750
-					    location   	(873, 312)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+fundamentalFacets"
-					    pctDist    	-1.409091
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350063"
-					client     	@749
-					supplier   	@717
-					vertices   	(list Points
-					    (748, 269)
-					    (659, 269)
-					    (659, 561))
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(659, 561)
-					label      	(object SegLabel @752
-					    Parent_View 	@750
-					    location   	(728, 385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.538028
-					    height     	69
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$201" @753
-					Parent_View 	@749
-					location   	(-1236, 45)
-					label      	(object SegLabel @754
-					    Parent_View 	@753
-					    location   	(1052, 228)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350059"
-					client     	@749
-					supplier   	@723
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(1128, 269))))
-			    (object AssociationViewNew "$UNNAMED$202" @755
-				location   	(1175, 396)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$203" @756
-					Parent_View 	@755
-					location   	(-809, 172)
-					label      	(object SegLabel @757
-					    Parent_View 	@756
-					    location   	(1094, 316)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@755
-					supplier   	@723
-					vertices   	(list Points
-					    (1175, 396)
-					    (1135, 396)
-					    (1135, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1135, 285))
-				    (object RoleView "baseTypeDefinition" @758
-					Parent_View 	@755
-					location   	(-809, 172)
-					label      	(object SegLabel @759
-					    Parent_View 	@758
-					    location   	(1074, 443)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	-2.533333
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@755
-					supplier   	@723
-					vertices   	(list Points
-					    (1175, 396)
-					    (1215, 396)
-					    (1215, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1215, 285)
-					label      	(object SegLabel @760
-					    Parent_View 	@758
-					    location   	(1172, 359)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.096154
-					    height     	38
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$204" @761
-				location   	(1360, 446)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5572016C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$205" @762
-					Parent_View 	@761
-					location   	(-624, 222)
-					label      	(object SegLabel @763
-					    Parent_View 	@762
-					    location   	(1268, 327)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5575022F"
-					client     	@761
-					supplier   	@723
-					vertices   	(list Points
-					    (1360, 446)
-					    (1309, 446)
-					    (1309, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1309, 285))
-				    (object RoleView "primitiveTypeDefinition" @764
-					Parent_View 	@761
-					location   	(-624, 222)
-					label      	(object SegLabel @765
-					    Parent_View 	@764
-					    location   	(1204, 508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+primitiveTypeDefinition"
-					    pctDist    	-3.000000
-					    height     	62
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D55750243"
-					client     	@761
-					supplier   	@723
-					vertices   	(list Points
-					    (1360, 446)
-					    (1412, 446)
-					    (1412, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1412, 285)
-					label      	(object SegLabel @766
-					    Parent_View 	@764
-					    location   	(1373, 409)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.062147
-					    height     	38
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @767
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 512)
-				label      	(object ItemLabel
-				    Parent_View 	@767
-				    location   	(1917, 428)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@767
-				    location   	(1917, 378)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@767
-				    location   	(1917, 488)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	3
-				    max_width  	202
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @768
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@768
-				    location   	(1918, 92)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@768
-				    location   	(1918, 42)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	342
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @769
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C7B0396"
-				client     	@717
-				supplier   	@712
-				line_style 	3
-				origin_attachment 	(591, 561)
-				terminal_attachment 	(591, 522)
-				drawSupplier 	@713)
-			    (object InheritView "" @770
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@714
-				supplier   	@712
-				line_style 	3
-				origin_attachment 	(272, 561)
-				terminal_attachment 	(272, 522)
-				drawSupplier 	@713)
-			    (object InheritView "" @771
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@712
-				supplier   	@694
-				line_style 	3
-				origin_attachment 	(366, 306)
-				terminal_attachment 	(366, 215))
-			    (object InheritView "" @772
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8801B4"
-				client     	@672
-				supplier   	@714
-				line_style 	3
-				origin_attachment 	(147, 828)
-				terminal_attachment 	(147, 781)
-				drawSupplier 	@715)
-			    (object InheritView "" @773
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B590281"
-				client     	@689
-				supplier   	@702
-				line_style 	3
-				origin_attachment 	(150, 1840)
-				terminal_attachment 	(150, 1444))))
-		    (object ClassDiagram "5. Component Annotations"
-			quid       	"3B69D68D00D2"
-			title      	"5. Component Annotations"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @774
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@774
-				    location   	(88, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @775
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@775
-				    location   	(82, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @776
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 1504)
-				label      	(object ItemLabel
-				    Parent_View 	@776
-				    location   	(1626, 1461)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @777
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 304)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@777
-				    location   	(1663, 263)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @778
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@778
-				    location   	(74, 1317)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	588
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	606
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @779
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@779
-				    location   	(86, 661)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @780
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@780
-				    location   	(74, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @781
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 544)
-				label      	(object ItemLabel
-				    Parent_View 	@781
-				    location   	(86, 501)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @782
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@782
-				    location   	(1068, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @783
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1216)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@783
-				    location   	(1750, 1175)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @784
-				location   	(1994, 1412)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@783
-				vertices   	(list Points
-				    (1994, 1412)
-				    (1994, 1271)))
-			    (object InheritView "" @785
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@776
-				supplier   	@783
-				line_style 	3
-				origin_attachment 	(2084, 1449)
-				terminal_attachment 	(2084, 1412)
-				drawSupplier 	@784)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @786
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@786
-				    location   	(80, 821)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @787
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@787
-				    location   	(1892, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	234
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @788
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@788
-				    location   	(84, 341)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @789
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@789
-				    location   	(86, 181)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @790
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@790
-				    location   	(1467, 1674)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	651
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	669
-				height     	100
-				annotation 	8)
-			    (object InheritView "" @791
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@790
-				supplier   	@783
-				line_style 	3
-				origin_attachment 	(1572, 1662)
-				terminal_attachment 	(1572, 1412)
-				drawSupplier 	@784)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @792
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@792
-				    location   	(78, 981)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @793
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@793
-				    location   	(1688, 519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @794
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@794
-				    location   	(71, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @795
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@795
-				    location   	(872, 685)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	720
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	738
-				height     	543
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$140" @796
-				location   	(865, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0D0183"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$141" @797
-					Parent_View 	@796
-					location   	(-255, 559)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D033C"
-					client     	@796
-					supplier   	@778
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(671, 1359))
-				    (object RoleView "annotation" @798
-					Parent_View 	@796
-					location   	(-255, 559)
-					label      	(object SegLabel @799
-					    Parent_View 	@798
-					    location   	(798, 1321)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-1.116667
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D0346"
-					client     	@796
-					supplier   	@795
-					vertices   	(list Points
-					    (865, 1359)
-					    (925, 1359)
-					    (925, 1215))
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(925, 1215)
-					label      	(object SegLabel @800
-					    Parent_View 	@798
-					    location   	(987, 1276)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.706422
-					    height     	62
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$164" @801
-				location   	(713, 709)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0F0212"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$165" @802
-					Parent_View 	@801
-					location   	(-407, -90)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000C9"
-					client     	@801
-					supplier   	@779
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(563, 709))
-				    (object RoleView "annotation" @803
-					Parent_View 	@801
-					location   	(-407, -90)
-					label      	(object SegLabel @804
-					    Parent_View 	@803
-					    location   	(727, 667)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.095238
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000D3"
-					client     	@801
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(863, 709)
-					label      	(object SegLabel @805
-					    Parent_View 	@803
-					    location   	(796, 753)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.553571
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$158" @806
-				location   	(719, 1193)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB15008A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$159" @807
-					Parent_View 	@806
-					location   	(-401, 393)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB160096"
-					client     	@806
-					supplier   	@780
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(575, 1193))
-				    (object RoleView "annotation" @808
-					Parent_View 	@806
-					location   	(-401, 393)
-					label      	(object SegLabel @809
-					    Parent_View 	@808
-					    location   	(720, 1147)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.006993
-					    height     	47
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1600A0"
-					client     	@806
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(863, 1193)
-					label      	(object SegLabel @810
-					    Parent_View 	@808
-					    location   	(806, 1240)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.604167
-					    height     	47
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$118" @811
-				location   	(785, 550)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0A0066"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$119" @812
-					Parent_View 	@811
-					location   	(-335, -250)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B023F"
-					client     	@811
-					supplier   	@781
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(563, 550))
-				    (object RoleView "annotation" @813
-					Parent_View 	@811
-					location   	(-335, -250)
-					label      	(object SegLabel @814
-					    Parent_View 	@813
-					    location   	(779, 516)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.070707
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B0249"
-					client     	@811
-					supplier   	@795
-					vertices   	(list Points
-					    (785, 550)
-					    (884, 550)
-					    (884, 673))
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(884, 673)
-					label      	(object SegLabel @815
-					    Parent_View 	@813
-					    location   	(935, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.729730
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$190" @816
-				location   	(1184, 404)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E4560290"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$191" @817
-					Parent_View 	@816
-					location   	(-32, -412)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E4570165"
-					client     	@816
-					supplier   	@782
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 135))
-				    (object RoleView "annotations" @818
-					Parent_View 	@816
-					location   	(-32, -412)
-					label      	(object SegLabel @819
-					    Parent_View 	@818
-					    location   	(1324, 226)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-0.665428
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E457016F"
-					client     	@816
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 673)
-					label      	(object SegLabel @820
-					    Parent_View 	@818
-					    location   	(1251, 615)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.784387
-					    height     	67
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$206" @821
-				location   	(1752, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E2910158"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$207" @822
-					Parent_View 	@821
-					location   	(536, 218)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E292019F"
-					client     	@821
-					supplier   	@783
-					vertices   	(list Points
-					    (1752, 1034)
-					    (1812, 1034)
-					    (1812, 1161))
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1812, 1161))
-				    (object RoleView "annotation" @823
-					Parent_View 	@821
-					location   	(536, 218)
-					label      	(object SegLabel @824
-					    Parent_View 	@823
-					    location   	(1743, 997)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.059603
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E29201A9"
-					client     	@821
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1601, 1034)
-					label      	(object SegLabel @825
-					    Parent_View 	@823
-					    location   	(1684, 1066)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.450331
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$208" @826
-				location   	(1896, 881)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B9006CF0088"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$209" @827
-					Parent_View 	@826
-					location   	(621, 40)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D1015D"
-					client     	@826
-					supplier   	@783
-					vertices   	(list Points
-					    (1896, 881)
-					    (1956, 881)
-					    (1956, 1161))
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1956, 1161))
-				    (object RoleView "derivationAnnotation" @828
-					Parent_View 	@826
-					location   	(621, 40)
-					label      	(object SegLabel @829
-					    Parent_View 	@828
-					    location   	(1821, 842)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	390
-					    justify    	0
-					    label      	"+derivationAnnotation"
-					    pctDist    	0.254237
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D10167"
-					client     	@826
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1601, 881)
-					label      	(object SegLabel @830
-					    Parent_View 	@828
-					    location   	(1689, 914)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.705085
-					    height     	33
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$210" @831
-				location   	(2040, 715)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB330264"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$211" @832
-					Parent_View 	@831
-					location   	(920, -85)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB340284"
-					client     	@831
-					supplier   	@783
-					vertices   	(list Points
-					    (2040, 715)
-					    (2100, 715)
-					    (2100, 1161))
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(2100, 1161))
-				    (object RoleView "annotations" @833
-					Parent_View 	@831
-					location   	(920, -85)
-					label      	(object SegLabel @834
-					    Parent_View 	@833
-					    location   	(1758, 681)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.643192
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB34028E"
-					client     	@831
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(1601, 715)
-					label      	(object SegLabel @835
-					    Parent_View 	@833
-					    location   	(1685, 746)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.809313
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$228" @836
-				location   	(668, 865)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C239134004F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$229" @837
-					Parent_View 	@836
-					location   	(-612, 33)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600CA"
-					client     	@836
-					supplier   	@786
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(473, 865))
-				    (object RoleView "annotation" @838
-					Parent_View 	@836
-					location   	(-612, 33)
-					label      	(object SegLabel @839
-					    Parent_View 	@838
-					    location   	(714, 825)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.234146
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600D4"
-					client     	@836
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(863, 865)
-					label      	(object SegLabel @840
-					    Parent_View 	@838
-					    location   	(801, 903)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.682051
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$132" @841
-				location   	(1472, 167)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D23B901CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$133" @842
-					Parent_View 	@841
-					location   	(256, -649)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01C4"
-					client     	@841
-					supplier   	@787
-					vertices   	(list Points
-					    (1472, 167)
-					    (1472, 72)
-					    (1883, 72))
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1883, 72))
-				    (object RoleView "annotation" @843
-					Parent_View 	@841
-					location   	(256, -649)
-					label      	(object SegLabel @844
-					    Parent_View 	@843
-					    location   	(1604, 129)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.076305
-					    height     	132
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01CE"
-					client     	@841
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1472, 673)
-					label      	(object SegLabel @845
-					    Parent_View 	@843
-					    location   	(1419, 618)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.893574
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$82" @846
-				location   	(927, 350)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB060291"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$83" @847
-					Parent_View 	@846
-					location   	(-193, -450)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070171"
-					client     	@846
-					supplier   	@788
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(629, 350))
-				    (object RoleView "annotation" @848
-					Parent_View 	@846
-					location   	(-193, -450)
-					label      	(object SegLabel @849
-					    Parent_View 	@848
-					    location   	(878, 310)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.816667
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070172"
-					client     	@846
-					supplier   	@795
-					vertices   	(list Points
-					    (927, 350)
-					    (987, 350)
-					    (987, 673))
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(987, 673)
-					label      	(object SegLabel @850
-					    Parent_View 	@848
-					    location   	(1037, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.843342
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$74" @851
-				location   	(1027, 222)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DADC02F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$75" @852
-					Parent_View 	@851
-					location   	(-93, -578)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0238"
-					client     	@851
-					supplier   	@789
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(563, 222))
-				    (object RoleView "annotation" @853
-					Parent_View 	@851
-					location   	(-93, -578)
-					label      	(object SegLabel @854
-					    Parent_View 	@853
-					    location   	(1003, 188)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.406250
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0242"
-					client     	@851
-					supplier   	@795
-					vertices   	(list Points
-					    (1027, 222)
-					    (1087, 222)
-					    (1087, 673))
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(1087, 673)
-					label      	(object SegLabel @855
-					    Parent_View 	@853
-					    location   	(1137, 613)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	100
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.882583
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$98" @856
-				location   	(1494, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B90068801C2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$99" @857
-					Parent_View 	@856
-					location   	(214, 590)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A0111"
-					client     	@856
-					supplier   	@790
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1662))
-				    (object RoleView "contentAnnotation" @858
-					Parent_View 	@856
-					location   	(214, 590)
-					label      	(object SegLabel @859
-					    Parent_View 	@858
-					    location   	(1696, 1356)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+contentAnnotation"
-					    pctDist    	0.367713
-					    height     	202
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A011B"
-					client     	@856
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1215)
-					label      	(object SegLabel @860
-					    Parent_View 	@858
-					    location   	(1443, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.713004
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$152" @861
-				location   	(637, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB1702C8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$153" @862
-					Parent_View 	@861
-					location   	(-483, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1803E2"
-					client     	@861
-					supplier   	@792
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(411, 1022))
-				    (object RoleView "annotation" @863
-					Parent_View 	@861
-					location   	(-483, 222)
-					label      	(object SegLabel @864
-					    Parent_View 	@863
-					    location   	(710, 979)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.328889
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB190004"
-					client     	@861
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(863, 1022)
-					label      	(object SegLabel @865
-					    Parent_View 	@863
-					    location   	(802, 1062)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.730088
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$72" @866
-				location   	(1581, 607)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EA70102"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$73" @867
-					Parent_View 	@866
-					location   	(301, -225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90191"
-					client     	@866
-					supplier   	@793
-					vertices   	(list Points
-					    (1581, 607)
-					    (1581, 547)
-					    (1679, 547))
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1679, 547))
-				    (object RoleView "annotations" @868
-					Parent_View 	@866
-					location   	(301, -225)
-					label      	(object SegLabel @869
-					    Parent_View 	@868
-					    location   	(1669, 462)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-2.196970
-					    height     	88
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90192"
-					client     	@866
-					supplier   	@795
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1581, 673)
-					label      	(object SegLabel @870
-					    Parent_View 	@868
-					    location   	(1539, 620)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.196970
-					    height     	42
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$212" @871
-				location   	(849, 1496)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB11026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$213" @872
-					Parent_View 	@871
-					location   	(-271, 696)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1201F9"
-					client     	@871
-					supplier   	@794
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(354, 1496))
-				    (object RoleView "annotation" @873
-					Parent_View 	@871
-					location   	(-271, 696)
-					label      	(object SegLabel @874
-					    Parent_View 	@873
-					    location   	(942, 1464)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.188259
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB120203"
-					client     	@871
-					supplier   	@795
-					vertices   	(list Points
-					    (849, 1496)
-					    (1062, 1496)
-					    (1062, 1215))
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(1062, 1215)
-					label      	(object SegLabel @875
-					    Parent_View 	@873
-					    location   	(1115, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.872690
-					    height     	53
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$214" @876
-				location   	(952, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EB30005"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$215" @877
-					Parent_View 	@876
-					location   	(-328, 733)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40327"
-					client     	@876
-					supplier   	@794
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(354, 1565))
-				    (object RoleView "annotations" @878
-					Parent_View 	@876
-					location   	(-328, 733)
-					label      	(object SegLabel @879
-					    Parent_View 	@878
-					    location   	(1075, 1538)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.204959
-					    height     	28
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40332"
-					client     	@876
-					supplier   	@795
-					vertices   	(list Points
-					    (952, 1565)
-					    (1200, 1565)
-					    (1200, 1215))
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(1200, 1215)
-					label      	(object SegLabel @880
-					    Parent_View 	@878
-					    location   	(1254, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @881
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@777
-				supplier   	@787
-				line_style 	3
-				origin_attachment 	(1984, 249)
-				terminal_attachment 	(1984, 135))
-			    (object InheritView "" @882
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@793
-				supplier   	@777
-				line_style 	3
-				origin_attachment 	(1997, 505)
-				terminal_attachment 	(1997, 359))))
-		    (object ClassDiagram "6. Concrete Components"
-			quid       	"3B6AD74D03C4"
-			title      	"6. Concrete Components"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @883
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@883
-				    location   	(126, 375)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @884
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@884
-				    location   	(568, 375)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @885
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@885
-				    location   	(991, 631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @886
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@886
-				    location   	(1156, 375)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @887
-				location   	(1360, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@886
-				vertices   	(list Points
-				    (1360, 561)
-				    (1360, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDInclude" @888
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@888
-				    location   	(1512, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"XSDInclude")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C7D0250"
-				width      	258
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @889
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@889
-				    location   	(1294, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @890
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@890
-				    location   	(1805, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @891
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@891
-				    location   	(375, 1153)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	851
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	869
-				height     	119
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$150" @892
-				location   	(1368, 1206)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCC5007E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$151" @893
-					Parent_View 	@892
-					location   	(1160, 406)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006B"
-					client     	@892
-					supplier   	@888
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1503, 1206))
-				    (object RoleView "annotation" @894
-					Parent_View 	@892
-					location   	(1160, 406)
-					label      	(object SegLabel @895
-					    Parent_View 	@894
-					    location   	(1347, 1154)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.154412
-					    height     	53
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006C"
-					client     	@892
-					supplier   	@891
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1234, 1206)
-					label      	(object SegLabel @896
-					    Parent_View 	@894
-					    location   	(1300, 1253)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	107
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.514706
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$148" @897
-				location   	(1168, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCD802FC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$149" @898
-					Parent_View 	@897
-					location   	(960, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018B"
-					client     	@897
-					supplier   	@889
-					vertices   	(list Points
-					    (1168, 1022)
-					    (1168, 962)
-					    (1285, 962))
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1285, 962))
-				    (object RoleView "annotation" @899
-					Parent_View 	@897
-					location   	(960, 222)
-					label      	(object SegLabel @900
-					    Parent_View 	@899
-					    location   	(1290, 1075)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.445378
-					    height     	122
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018C"
-					client     	@897
-					supplier   	@891
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1168, 1141)
-					label      	(object SegLabel @901
-					    Parent_View 	@899
-					    location   	(1127, 1074)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.436975
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$170" @902
-				location   	(1563, 1353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADE42009A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$171" @903
-					Parent_View 	@902
-					location   	(1355, 553)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE4302FE"
-					client     	@902
-					supplier   	@890
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1940, 1353)
-					    (1940, 1255))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1940, 1255))
-				    (object RoleView "annotations" @904
-					Parent_View 	@902
-					location   	(1355, 553)
-					label      	(object SegLabel @905
-					    Parent_View 	@904
-					    location   	(1317, 1322)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.516807
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE430308"
-					client     	@902
-					supplier   	@891
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1181, 1353)
-					    (1181, 1259))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1181, 1259)
-					label      	(object SegLabel @906
-					    Parent_View 	@904
-					    location   	(1130, 1326)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.861345
-					    height     	52
-					    orientation 	0))))
-			    (object InheritTreeView "" @907
-				location   	(288, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@883
-				vertices   	(list Points
-				    (288, 561)
-				    (288, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @908
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@908
-				    location   	(460, 631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @909
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@909
-				    location   	(1658, 375)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	396
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	414
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @910
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 960)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@910
-				    location   	(450, 919)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @911
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@911
-				    location   	(110, 631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @912
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@911
-				supplier   	@883
-				line_style 	3
-				origin_attachment 	(221, 617)
-				terminal_attachment 	(221, 561)
-				drawSupplier 	@907)
-			    (object InheritView "" @913
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@908
-				supplier   	@883
-				line_style 	3
-				origin_attachment 	(589, 617)
-				terminal_attachment 	(589, 561)
-				drawSupplier 	@907)
-			    (object InheritView "" @914
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@885
-				supplier   	@886
-				line_style 	3
-				origin_attachment 	(1016, 617)
-				terminal_attachment 	(1016, 561)
-				drawSupplier 	@887)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @915
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@915
-				    location   	(1590, 903)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	486
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @916
-				location   	(1824, 1089)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@915
-				vertices   	(list Points
-				    (1824, 1089)
-				    (1824, 999)))
-			    (object InheritView "" @917
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8DC0381"
-				client     	@888
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(1666, 1145)
-				terminal_attachment 	(1666, 1089)
-				drawSupplier 	@916)
-			    (object InheritView "" @918
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@890
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(1934, 1145)
-				terminal_attachment 	(1934, 1089)
-				drawSupplier 	@916)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @919
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@919
-				    location   	(1630, 631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	438
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @920
-				location   	(1762, 819)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@919
-				vertices   	(list Points
-				    (1762, 819)
-				    (1762, 727)))
-			    (object InheritView "" @921
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@889
-				supplier   	@919
-				line_style 	3
-				origin_attachment 	(1416, 889)
-				terminal_attachment 	(1416, 819)
-				drawSupplier 	@920)
-			    (object InheritView "" @922
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@919
-				supplier   	@886
-				line_style 	3
-				origin_attachment 	(1756, 617)
-				terminal_attachment 	(1756, 561)
-				drawSupplier 	@887)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @923
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1120, 144)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@923
-				    location   	(875, 103)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @924
-				location   	(1120, 289)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@923
-				vertices   	(list Points
-				    (1120, 289)
-				    (1120, 199)))
-			    (object AssociationViewNew "$UNNAMED$112" @925
-				location   	(1485, 215)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B0803C7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "container" @926
-					Parent_View 	@925
-					location   	(989, 103)
-					label      	(object SegLabel @927
-					    Parent_View 	@926
-					    location   	(1604, 210)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+container"
-					    pctDist    	0.033113
-					    height     	119
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CE"
-					client     	@925
-					supplier   	@923
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 176)
-					    (1374, 176))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1374, 176)
-					label      	(object SegLabel @928
-					    Parent_View 	@926
-					    location   	(1435, 226)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	69
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.602649
-					    height     	50
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$113" @929
-					Parent_View 	@925
-					location   	(989, 103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CF"
-					client     	@925
-					supplier   	@923
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 254)
-					    (1345, 254)
-					    (1345, 199))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1345, 199))))
-			    (object AssociationViewNew "$UNNAMED$114" @930
-				location   	(773, 216)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B480261"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootContainer" @931
-					Parent_View 	@930
-					location   	(53, 104)
-					label      	(object SegLabel @932
-					    Parent_View 	@931
-					    location   	(614, 217)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+rootContainer"
-					    pctDist    	-0.025000
-					    height     	160
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0285"
-					client     	@930
-					supplier   	@923
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 176)
-					    (866, 176))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(866, 176)
-					label      	(object SegLabel @933
-					    Parent_View 	@931
-					    location   	(800, 228)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.300000
-					    height     	27
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$115" @934
-					Parent_View 	@930
-					location   	(53, 104)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0286"
-					client     	@930
-					supplier   	@923
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 257)
-					    (895, 257)
-					    (895, 199))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(895, 199))))
-			    (object InheritView "" @935
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@886
-				supplier   	@923
-				line_style 	3
-				origin_attachment 	(1367, 361)
-				terminal_attachment 	(1367, 289)
-				drawSupplier 	@924)
-			    (object InheritView "" @936
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D8E200EA"
-				client     	@884
-				supplier   	@923
-				line_style 	3
-				origin_attachment 	(752, 361)
-				terminal_attachment 	(752, 289)
-				drawSupplier 	@924)
-			    (object InheritView "" @937
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@883
-				supplier   	@923
-				line_style 	3
-				origin_attachment 	(299, 361)
-				terminal_attachment 	(299, 289)
-				drawSupplier 	@924)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @938
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@938
-				    location   	(61, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @939
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@938
-				supplier   	@911
-				line_style 	3
-				origin_attachment 	(216, 1145)
-				terminal_attachment 	(216, 727))
-			    (object AssociationViewNew "$UNNAMED$226" @940
-				location   	(1382, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$227" @941
-					Parent_View 	@940
-					location   	(1190, 225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@940
-					supplier   	@915
-					vertices   	(list Points
-					    (1382, 1425)
-					    (2147, 1425)
-					    (2147, 943)
-					    (2067, 943))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(2067, 943))
-				    (object RoleView "incorporatedSchema" @942
-					Parent_View 	@940
-					location   	(1190, 225)
-					label      	(object SegLabel @943
-					    Parent_View 	@942
-					    location   	(445, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.706546
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@940
-					supplier   	@938
-					vertices   	(list Points
-					    (1382, 1425)
-					    (225, 1425)
-					    (225, 1255))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(225, 1255)
-					label      	(object SegLabel @944
-					    Parent_View 	@942
-					    location   	(183, 1392)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.896915
-					    height     	43
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$224" @945
-				location   	(1505, 1503)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$225" @946
-					Parent_View 	@945
-					location   	(1313, 303)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@945
-					supplier   	@919
-					vertices   	(list Points
-					    (1505, 1503)
-					    (2188, 1503)
-					    (2188, 675)
-					    (2059, 675))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(2059, 675))
-				    (object RoleView "resolvedSchema" @947
-					Parent_View 	@945
-					location   	(1313, 303)
-					label      	(object SegLabel @948
-					    Parent_View 	@947
-					    location   	(303, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.733333
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@945
-					supplier   	@938
-					vertices   	(list Points
-					    (1505, 1503)
-					    (113, 1503)
-					    (113, 1255))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(113, 1255)
-					label      	(object SegLabel @949
-					    Parent_View 	@947
-					    location   	(73, 1472)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.867683
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$116" @950
-				location   	(66, 244)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751C310356"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$117" @951
-					Parent_View 	@950
-					location   	(-94, -444)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C330331"
-					client     	@950
-					supplier   	@923
-					vertices   	(list Points
-					    (66, 244)
-					    (66, 144)
-					    (866, 144))
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(866, 144))
-				    (object RoleView "schema" @952
-					Parent_View 	@950
-					location   	(-94, -444)
-					label      	(object SegLabel @953
-					    Parent_View 	@952
-					    location   	(165, 93)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	-0.168113
-					    height     	99
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C33033B"
-					client     	@950
-					supplier   	@938
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(66, 1145)
-					label      	(object SegLabel @954
-					    Parent_View 	@952
-					    location   	(136, 184)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	113
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.066593
-					    height     	70
-					    orientation 	0))))
-			    (object InheritView "" @955
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B780BD90059"
-				client     	@909
-				supplier   	@923
-				line_style 	3
-				origin_attachment 	(1759, 361)
-				terminal_attachment 	(1759, 289)
-				drawSupplier 	@924)
-			    (object InheritView "" @956
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@891
-				supplier   	@883
-				line_style 	3
-				origin_attachment 	(400, 1141)
-				terminal_attachment 	(400, 561)
-				drawSupplier 	@907)
-			    (object InheritTreeView "" @957
-				location   	(1012, 837)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@885
-				vertices   	(list Points
-				    (1012, 837)
-				    (1012, 727)))
-			    (object InheritView "" @958
-				stereotype 	(object SegLabel @959
-				    Parent_View 	@958
-				    location   	(1071, 871)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.888158
-				    height     	34
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B7FD4E20366"
-				client     	@891
-				supplier   	@885
-				line_style 	3
-				origin_attachment 	(1037, 1141)
-				terminal_attachment 	(1037, 837)
-				drawSupplier 	@957)
-			    (object InheritView "" @960
-				stereotype 	(object SegLabel @961
-				    Parent_View 	@960
-				    location   	(890, 865)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	263
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.581633
-				    height     	36
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B7FD4BA023C"
-				client     	@910
-				supplier   	@885
-				line_style 	3
-				origin_attachment 	(925, 905)
-				terminal_attachment 	(925, 837)
-				drawSupplier 	@957)
-			    (object InheritView "" @962
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@915
-				supplier   	@919
-				line_style 	3
-				origin_attachment 	(1828, 889)
-				terminal_attachment 	(1828, 819)
-				drawSupplier 	@920)))
-		    (object ClassDiagram "7. Concrete Attributes"
-			quid       	"3B9F8F7602C7"
-			title      	"7. Concrete Attributes"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @963
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@963
-				    location   	(1938, 1361)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@963
-				    location   	(1938, 1427)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	382
-				    compartmentItems 	(list Compartment
-					"+ form : XSDForm"
-					"+ lexicalValue : String"))
-				width      	430
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDForm" @964
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2560, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(2398, 1365)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDForm")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(2398, 1315)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B9F913B01EB"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @965
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 96)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@965
-				    location   	(40, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	657
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				compartment 	(object Compartment
-				    Parent_View 	@965
-				    location   	(40, 105)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	446
-				    compartmentItems 	(list Compartment
-					"+ element : DOMElement"))
-				width      	675
-				height     	143
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @966
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@966
-				    location   	(687, 335)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	322
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	340
-				height     	126
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @967
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@967
-				    location   	(1678, 894)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	470
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @968
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 1408)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@968
-				    location   	(1328, 1358)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @969
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(864, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@969
-				    location   	(745, 575)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	256
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @970
-				location   	(850, 537)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@966
-				vertices   	(list Points
-				    (850, 537)
-				    (850, 447)))
-			    (object ClassView "Class" "Logical View::xsd::DOMElement" @971
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1248, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@971
-				    location   	(873, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"DOMElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@971
-				    location   	(873, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3B8189790200"
-				width      	769
-				height     	200
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @972
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 640)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@972
-				    location   	(41, 586)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	512
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @973
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@973
-				    location   	(38, 335)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	422
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @974
-				location   	(368, 263)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@965
-				vertices   	(list Points
-				    (368, 263)
-				    (368, 167)))
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @975
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@975
-				    location   	(723, 1347)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@975
-				    location   	(723, 1297)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@975
-				    location   	(723, 1407)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	225
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	556
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @976
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@976
-				    location   	(614, 1708)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@976
-				    location   	(614, 1658)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@976
-				    location   	(614, 1768)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	198
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	550
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @977
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@977
-				    location   	(532, 2040)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	760
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@977
-				    location   	(532, 2100)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	723
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDSimpleFinal"))
-				width      	778
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @978
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@978
-				    location   	(45, 1875)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@978
-				    location   	(45, 1825)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				width      	344
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @979
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2544, 2016)
-				label      	(object ItemLabel
-				    Parent_View 	@979
-				    location   	(2362, 1932)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@979
-				    location   	(2362, 1882)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				width      	382
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @980
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@980
-				    location   	(41, 1279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	622
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@980
-				    location   	(41, 1339)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	588
-				    compartmentItems 	(list Compartment
-					"+ use : XSDAttributeUseCategory"
-					"+ lexicalValue : String"))
-				width      	640
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUseCategory" @981
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@981
-				    location   	(41, 1548)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDAttributeUseCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@981
-				    location   	(41, 1498)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BA7B0E801A8"
-				width      	512
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @982
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2608, 928)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@982
-				    location   	(2498, 883)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	220
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	238
-				height     	119
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @983
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2240, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@983
-				    location   	(1757, 1631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	966
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@983
-				    location   	(1757, 1691)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	934
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDProhibitedSubstitutions"
-					"<<0..*>> + block : XSDDisallowedSubstitutions"))
-				width      	984
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @984
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@984
-				    location   	(1828, 1096)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	888
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@984
-				    location   	(1828, 1156)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	852
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalNamespaceConstraint : String"))
-				width      	906
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @985
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@985
-				    location   	(622, 777)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	996
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	1014
-				height     	486
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @986
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@986
-				    location   	(37, 904)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	424
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @987
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1344, 656)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@987
-				    location   	(1138, 602)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@987
-				    location   	(1138, 668)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	378
-				    compartmentItems 	(list Compartment
-					"+ lexicalValue : String"))
-				width      	430
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @988
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@988
-				    location   	(1410, 1942)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	860
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@988
-				    location   	(1410, 2002)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	822
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDComplexFinal"
-					"<<0..*>> + block : XSDProhibitedSubstitutions"
-					"+ mixed : boolean"))
-				width      	878
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @989
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1488, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@989
-				    location   	(1304, 1646)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @990
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@989
-				supplier   	@968
-				line_style 	3
-				origin_attachment 	(1506, 1632)
-				terminal_attachment 	(1506, 1472))
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @991
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2208, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@991
-				    location   	(1758, 598)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	900
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	918
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @992
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@982
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(2696, 869)
-				terminal_attachment 	(2696, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @993
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@983
-				supplier   	@963
-				line_style 	3
-				origin_attachment 	(2094, 1619)
-				terminal_attachment 	(2094, 1533))
-			    (object InheritTreeView "" @994
-				location   	(1487, 1856)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@989
-				vertices   	(list Points
-				    (1487, 1856)
-				    (1487, 1760)))
-			    (object ClassView "Class" "Logical View::xsd::DOMAttr" @995
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@995
-				    location   	(2080, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"DOMAttr")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@995
-				    location   	(2080, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BBF8C8901B6"
-				width      	658
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @996
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@988
-				supplier   	@989
-				line_style 	3
-				origin_attachment 	(1734, 1930)
-				terminal_attachment 	(1734, 1856)
-				drawSupplier 	@994)
-			    (object InheritView "" @997
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@987
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(1328, 588)
-				terminal_attachment 	(1328, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @998
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@991
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(2190, 586)
-				terminal_attachment 	(2190, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @999
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@972
-				supplier   	@973
-				line_style 	3
-				origin_attachment 	(222, 572)
-				terminal_attachment 	(222, 447))
-			    (object InheritView "" @1000
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@973
-				supplier   	@965
-				line_style 	3
-				origin_attachment 	(260, 321)
-				terminal_attachment 	(260, 263)
-				drawSupplier 	@974)
-			    (object InheritView "" @1001
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@986
-				supplier   	@972
-				line_style 	3
-				origin_attachment 	(223, 892)
-				terminal_attachment 	(223, 708))
-			    (object InheritView "" @1002
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@984
-				supplier   	@982
-				line_style 	3
-				origin_attachment 	(2600, 1084)
-				terminal_attachment 	(2600, 987))
-			    (object ClassView "Class" "Logical View::xsd::DOMDocument" @1003
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@1003
-				    location   	(1957, 94)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"DOMDocument")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1003
-				    location   	(1957, 44)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C27850E0381"
-				width      	776
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @1004
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@966
-				supplier   	@965
-				line_style 	3
-				origin_attachment 	(856, 321)
-				terminal_attachment 	(856, 263)
-				drawSupplier 	@974)
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @1005
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@1005
-				    location   	(1234, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1005
-				    location   	(1234, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @1006
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@969
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(850, 561)
-				terminal_attachment 	(850, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @1007
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@980
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(575, 1267)
-				terminal_attachment 	(575, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @1008
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@967
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(1694, 880)
-				terminal_attachment 	(1694, 537)
-				drawSupplier 	@970)
-			    (object InheritView "" @1009
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@985
-				supplier   	@969
-				line_style 	3
-				origin_attachment 	(856, 765)
-				terminal_attachment 	(856, 687))
-			    (object InheritTreeView "" @1010
-				location   	(1703, 1290)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@967
-				vertices   	(list Points
-				    (1703, 1290)
-				    (1703, 1008)))
-			    (object InheritView "" @1011
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@968
-				supplier   	@967
-				line_style 	3
-				origin_attachment 	(1503, 1344)
-				terminal_attachment 	(1503, 1290)
-				drawSupplier 	@1010)
-			    (object InheritView "" @1012
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@963
-				supplier   	@967
-				line_style 	3
-				origin_attachment 	(2093, 1347)
-				terminal_attachment 	(2093, 1290)
-				drawSupplier 	@1010)
-			    (object InheritView "" @1013
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@977
-				supplier   	@989
-				line_style 	3
-				origin_attachment 	(1253, 2028)
-				terminal_attachment 	(1253, 1856)
-				drawSupplier 	@994)))
-		    (object ClassDiagram "8. Concrete Containment"
-			quid       	"3B6A8097027A"
-			title      	"8. Concrete Containment"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @1014
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2672, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@1014
-				    location   	(2439, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1015
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2640, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1015
-				    location   	(2431, 535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @1016
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@1016
-				    location   	(2013, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @1017
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1017
-				    location   	(1854, 535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	438
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1018
-				location   	(1943, 868)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1017
-				vertices   	(list Points
-				    (1943, 868)
-				    (1943, 631)))
-			    (object AssociationViewNew "$UNNAMED$172" @1019
-				location   	(2125, 680)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE8240051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$173" @1020
-					Parent_View 	@1019
-					location   	(157, 344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602AD"
-					client     	@1019
-					supplier   	@1016
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 729))
-				    (object RoleView "contents" @1021
-					Parent_View 	@1019
-					location   	(157, 344)
-					label      	(object SegLabel @1022
-					    Parent_View 	@1021
-					    location   	(2255, 671)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.175439
-					    height     	130
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602B7"
-					client     	@1019
-					supplier   	@1017
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 631)
-					label      	(object SegLabel @1023
-					    Parent_View 	@1021
-					    location   	(2067, 671)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.175439
-					    height     	59
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @1024
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1024
-				    location   	(148, 279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1025
-				location   	(272, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1024
-				vertices   	(list Points
-				    (272, 465)
-				    (272, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1026
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1026
-				    location   	(2372, 1121)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	569
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	587
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @1027
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1027
-				    location   	(89, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$160" @1028
-				location   	(1170, 1356)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "modelGroup" @1029
-					Parent_View 	@1028
-					location   	(866, -20)
-					label      	(object SegLabel @1030
-					    Parent_View 	@1029
-					    location   	(269, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.534044
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@1028
-					supplier   	@1027
-					vertices   	(list Points
-					    (1170, 1356)
-					    (206, 1356)
-					    (206, 631))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(206, 631)
-					label      	(object SegLabel @1031
-					    Parent_View 	@1029
-					    location   	(226, 1322)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.559146
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$161" @1032
-					Parent_View 	@1028
-					location   	(866, -20)
-					label      	(object SegLabel @1033
-					    Parent_View 	@1032
-					    location   	(2521, 1398)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@1028
-					supplier   	@1026
-					vertices   	(list Points
-					    (1170, 1356)
-					    (2731, 1356)
-					    (2731, 1227))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(2731, 1227))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1034
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(160, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1034
-				    location   	(35, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$154" @1035
-				location   	(122, 1136)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6BCEB102F8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$155" @1036
-					Parent_View 	@1035
-					location   	(-630, -256)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB6001B"
-					client     	@1035
-					supplier   	@1027
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 631))
-				    (object RoleView "contents" @1037
-					Parent_View 	@1035
-					location   	(-630, -256)
-					label      	(object SegLabel @1038
-					    Parent_View 	@1037
-					    location   	(223, 1515)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.750495
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB60025"
-					client     	@1035
-					supplier   	@1034
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 1641)
-					label      	(object SegLabel @1039
-					    Parent_View 	@1037
-					    location   	(180, 1581)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.881188
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @1040
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1040
-				    location   	(41, 44)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	495
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	513
-				height     	100
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$166" @1041
-				location   	(47, 885)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B47150119"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$167" @1042
-					Parent_View 	@1041
-					location   	(-289, 821)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03AB"
-					client     	@1041
-					supplier   	@1034
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 1641))
-				    (object RoleView "content" @1043
-					Parent_View 	@1041
-					location   	(-289, 821)
-					label      	(object SegLabel @1044
-					    Parent_View 	@1043
-					    location   	(142, 189)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.921854
-					    height     	95
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03B5"
-					client     	@1041
-					supplier   	@1040
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 130)
-					label      	(object SegLabel @1045
-					    Parent_View 	@1043
-					    location   	(28, 192)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.917881
-					    height     	19
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @1046
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1046
-				    location   	(1252, 849)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	345
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	363
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1047
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1047
-				    location   	(1175, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$96" @1048
-				location   	(1319, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6F1DE9018A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$97" @1049
-					Parent_View 	@1048
-					location   	(-57, -102)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA036C"
-					client     	@1048
-					supplier   	@1046
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 955))
-				    (object RoleView "content" @1050
-					Parent_View 	@1048
-					location   	(-57, -102)
-					label      	(object SegLabel @1051
-					    Parent_View 	@1050
-					    location   	(1439, 1039)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.073171
-					    height     	120
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA0380"
-					client     	@1048
-					supplier   	@1047
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 1113)
-					label      	(object SegLabel @1052
-					    Parent_View 	@1050
-					    location   	(1279, 1031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.040816
-					    height     	41
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @1053
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1053
-				    location   	(1855, 1655)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1054
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1054
-				    location   	(1035, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$192" @1055
-				location   	(1351, 1840)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5CA50112"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$193" @1056
-					Parent_View 	@1055
-					location   	(-297, 224)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703B4"
-					client     	@1055
-					supplier   	@1054
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1294, 1840)
-					    (1294, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1294, 1751))
-				    (object RoleView "contents" @1057
-					Parent_View 	@1055
-					location   	(-297, 224)
-					label      	(object SegLabel @1058
-					    Parent_View 	@1057
-					    location   	(1517, 1806)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.632653
-					    height     	108
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703C8"
-					client     	@1055
-					supplier   	@1054
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1409, 1840)
-					    (1409, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1409, 1751)
-					label      	(object SegLabel @1059
-					    Parent_View 	@1057
-					    location   	(1361, 1801)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.072848
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$76" @1060
-				location   	(1190, 1432)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6890D6006F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1061
-					Parent_View 	@1060
-					location   	(774, -1832)
-					label      	(object SegLabel @1062
-					    Parent_View 	@1061
-					    location   	(1462, 1525)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.444976
-					    height     	272
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D60318"
-					client     	@1060
-					supplier   	@1054
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1641)
-					label      	(object SegLabel @1063
-					    Parent_View 	@1061
-					    location   	(1143, 1527)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.454545
-					    height     	47
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$77" @1064
-					Parent_View 	@1060
-					location   	(774, -1832)
-					label      	(object SegLabel @1065
-					    Parent_View 	@1064
-					    location   	(1149, 1266)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D6030E"
-					client     	@1060
-					supplier   	@1047
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1223))))
-			    (object AssociationViewNew "$UNNAMED$194" @1066
-				location   	(1690, 1684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C35AD0374"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facetContents" @1067
-					Parent_View 	@1066
-					location   	(-326, -12)
-					label      	(object SegLabel @1068
-					    Parent_View 	@1067
-					    location   	(1695, 1731)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+facetContents"
-					    pctDist    	0.032051
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0010"
-					client     	@1066
-					supplier   	@1053
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1846, 1684)
-					label      	(object SegLabel @1069
-					    Parent_View 	@1067
-					    location   	(1756, 1644)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	94
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420732
-					    height     	41
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$195" @1070
-					Parent_View 	@1066
-					location   	(-326, -12)
-					label      	(object SegLabel @1071
-					    Parent_View 	@1070
-					    location   	(1566, 1643)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0006"
-					client     	@1066
-					supplier   	@1054
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1534, 1684))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1072
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2624, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1072
-				    location   	(2388, 743)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @1073
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1073
-				    location   	(1108, 279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1074
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@1074
-				    location   	(557, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$174" @1075
-				location   	(963, 319)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B688E6B003D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1076
-					Parent_View 	@1075
-					location   	(595, -17)
-					label      	(object SegLabel @1077
-					    Parent_View 	@1076
-					    location   	(974, 361)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.081081
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0111"
-					client     	@1075
-					supplier   	@1073
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(1099, 319)
-					label      	(object SegLabel @1078
-					    Parent_View 	@1076
-					    location   	(1016, 290)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.396396
-					    height     	30
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$175" @1079
-					Parent_View 	@1075
-					location   	(595, -17)
-					label      	(object SegLabel @1080
-					    Parent_View 	@1079
-					    location   	(855, 361)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0107"
-					client     	@1075
-					supplier   	@1074
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(828, 319))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1081
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1081
-				    location   	(1974, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1082
-				location   	(2322, 1593)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1081
-				vertices   	(list Points
-				    (2322, 1593)
-				    (2322, 1047)))
-			    (object InheritView "" @1083
-				stereotype 	(object SegLabel @1084
-				    Parent_View 	@1083
-				    location   	(2146, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.460000
-				    height     	5
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2F5013A"
-				client     	@1081
-				supplier   	@1017
-				line_style 	3
-				origin_attachment 	(2150, 937)
-				terminal_attachment 	(2150, 868)
-				drawSupplier 	@1018)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1085
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1085
-				    location   	(510, 532)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	644
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	662
-				height     	112
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$120" @1086
-				location   	(1498, 1431)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68911401AF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1087
-					Parent_View 	@1086
-					location   	(1038, -1810)
-					label      	(object SegLabel @1088
-					    Parent_View 	@1087
-					    location   	(2027, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.454389
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150017"
-					client     	@1086
-					supplier   	@1081
-					vertices   	(list Points
-					    (1498, 1431)
-					    (2281, 1431)
-					    (2281, 1047))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(2281, 1047)
-					label      	(object SegLabel @1089
-					    Parent_View 	@1087
-					    location   	(2204, 1397)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.605419
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$121" @1090
-					Parent_View 	@1086
-					location   	(1038, -1810)
-					label      	(object SegLabel @1091
-					    Parent_View 	@1090
-					    location   	(1090, 866)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150016"
-					client     	@1086
-					supplier   	@1085
-					vertices   	(list Points
-					    (1498, 1431)
-					    (1131, 1431)
-					    (1131, 632))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(1131, 632))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @1092
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1092
-				    location   	(655, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	386
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	404
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @1093
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1093
-				    location   	(505, 853)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$124" @1094
-				location   	(534, 736)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "identityConstraintDefinitions" @1095
-					Parent_View 	@1094
-					location   	(86, -2144)
-					label      	(object SegLabel @1096
-					    Parent_View 	@1095
-					    location   	(820, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	550
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.111111
-					    height     	286
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@1094
-					supplier   	@1093
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 841)
-					label      	(object SegLabel @1097
-					    Parent_View 	@1095
-					    location   	(595, 807)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.675926
-					    height     	61
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$125" @1098
-					Parent_View 	@1094
-					location   	(86, -2144)
-					label      	(object SegLabel @1099
-					    Parent_View 	@1098
-					    location   	(576, 653)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@1094
-					supplier   	@1085
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 632))))
-			    (object AssociationViewNew "$UNNAMED$144" @1100
-				location   	(900, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "selector" @1101
-					Parent_View 	@1100
-					location   	(84, 120)
-					label      	(object SegLabel @1102
-					    Parent_View 	@1101
-					    location   	(1013, 1042)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.123288
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@1100
-					supplier   	@1092
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 1113)
-					label      	(object SegLabel @1103
-					    Parent_View 	@1101
-					    location   	(859, 1040)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.095890
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$145" @1104
-					Parent_View 	@1100
-					location   	(84, 120)
-					label      	(object SegLabel @1105
-					    Parent_View 	@1104
-					    location   	(859, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@1100
-					supplier   	@1093
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 951))))
-			    (object AssociationViewNew "$UNNAMED$146" @1106
-				location   	(700, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fields" @1107
-					Parent_View 	@1106
-					location   	(-116, 120)
-					label      	(object SegLabel @1108
-					    Parent_View 	@1107
-					    location   	(616, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.054795
-					    height     	85
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@1106
-					supplier   	@1092
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 1113)
-					label      	(object SegLabel @1109
-					    Parent_View 	@1107
-					    location   	(771, 1042)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.123077
-					    height     	71
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$147" @1110
-					Parent_View 	@1106
-					location   	(-116, 120)
-					label      	(object SegLabel @1111
-					    Parent_View 	@1110
-					    location   	(659, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@1106
-					supplier   	@1093
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 951))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @1112
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1112
-				    location   	(500, 1399)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1113
-				location   	(550, 1590)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1112
-				vertices   	(list Points
-				    (550, 1590)
-				    (550, 1495)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @1114
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1114
-				    location   	(1240, 535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1115
-				location   	(1406, 765)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1114
-				vertices   	(list Points
-				    (1406, 765)
-				    (1406, 631)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1116
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1116
-				    location   	(2393, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$102" @1117
-				location   	(1614, 1868)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6FDDD70113"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$103" @1118
-					Parent_View 	@1117
-					location   	(526, 476)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA026B"
-					client     	@1117
-					supplier   	@1116
-					vertices   	(list Points
-					    (1614, 1868)
-					    (2500, 1868)
-					    (2500, 1751))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(2500, 1751))
-				    (object RoleView "content" @1119
-					Parent_View 	@1117
-					location   	(526, 476)
-					label      	(object SegLabel @1120
-					    Parent_View 	@1119
-					    location   	(896, 1787)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.709870
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA0275"
-					client     	@1117
-					supplier   	@1112
-					vertices   	(list Points
-					    (1614, 1868)
-					    (984, 1868)
-					    (984, 1495))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(984, 1495)
-					label      	(object SegLabel @1121
-					    Parent_View 	@1119
-					    location   	(1042, 1824)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.571286
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$108" @1122
-				location   	(2927, 387)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B698E360386"
-				roleview_list 	(list RoleViews
-				    (object RoleView "attributeContents" @1123
-					Parent_View 	@1122
-					location   	(2463, -3757)
-					label      	(object SegLabel @1124
-					    Parent_View 	@1123
-					    location   	(1915, 357)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeContents"
-					    pctDist    	0.773060
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E38007C"
-					client     	@1122
-					supplier   	@1114
-					vertices   	(list Points
-					    (2927, 387)
-					    (1750, 387)
-					    (1750, 521))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(1750, 521)
-					label      	(object SegLabel @1125
-					    Parent_View 	@1123
-					    location   	(1804, 425)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.857247
-					    height     	38
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$109" @1126
-					Parent_View 	@1122
-					location   	(2463, -3757)
-					label      	(object SegLabel @1127
-					    Parent_View 	@1126
-					    location   	(2946, 1448)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E380072"
-					client     	@1122
-					supplier   	@1116
-					vertices   	(list Points
-					    (2927, 387)
-					    (2987, 387)
-					    (2987, 1671)
-					    (2928, 1671))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(2928, 1671))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1128
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1128
-				    location   	(1699, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$84" @1129
-				location   	(1750, 872)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69404E0067"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1130
-					Parent_View 	@1129
-					location   	(1462, -2392)
-					label      	(object SegLabel @1131
-					    Parent_View 	@1130
-					    location   	(1640, 691)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.751037
-					    height     	110
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69405002A5"
-					client     	@1129
-					supplier   	@1114
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 631)
-					label      	(object SegLabel @1132
-					    Parent_View 	@1130
-					    location   	(1814, 695)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.734440
-					    height     	64
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$85" @1133
-					Parent_View 	@1129
-					location   	(1462, -2392)
-					label      	(object SegLabel @1134
-					    Parent_View 	@1133
-					    location   	(1709, 1065)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B694050029B"
-					client     	@1129
-					supplier   	@1128
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 1113))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1135
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1135
-				    location   	(279, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$216" @1136
-				location   	(1252, 1896)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BEBDC870247"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$217" @1137
-					Parent_View 	@1136
-					location   	(708, 1288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C02F9"
-					client     	@1136
-					supplier   	@1116
-					vertices   	(list Points
-					    (1252, 1896)
-					    (2603, 1896)
-					    (2603, 1751))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(2603, 1751))
-				    (object RoleView "attributeWildcardContent" @1138
-					Parent_View 	@1136
-					location   	(708, 1288)
-					label      	(object SegLabel @1139
-					    Parent_View 	@1138
-					    location   	(682, 1858)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.381142
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C0303"
-					client     	@1136
-					supplier   	@1135
-					vertices   	(list Points
-					    (1252, 1896)
-					    (428, 1896)
-					    (428, 1223))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(428, 1223)
-					label      	(object SegLabel @1140
-					    Parent_View 	@1138
-					    location   	(382, 1860)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.575033
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$88" @1141
-				location   	(1199, 1321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C275D320220"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$89" @1142
-					Parent_View 	@1141
-					location   	(655, 713)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010C"
-					client     	@1141
-					supplier   	@1128
-					vertices   	(list Points
-					    (1199, 1321)
-					    (1897, 1321)
-					    (1897, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(1897, 1223))
-				    (object RoleView "attributeWildcardContent" @1143
-					Parent_View 	@1141
-					location   	(655, 713)
-					label      	(object SegLabel @1144
-					    Parent_View 	@1143
-					    location   	(857, 1279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.429569
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010D"
-					client     	@1141
-					supplier   	@1135
-					vertices   	(list Points
-					    (1199, 1321)
-					    (500, 1321)
-					    (500, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(500, 1223)
-					label      	(object SegLabel @1145
-					    Parent_View 	@1143
-					    location   	(576, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.782305
-					    height     	43
-					    orientation 	1))))
-			    (object InheritView "" @1146
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1116
-				supplier   	@1081
-				line_style 	3
-				origin_attachment 	(2606, 1641)
-				terminal_attachment 	(2606, 1593)
-				drawSupplier 	@1082)
-			    (object InheritView "" @1147
-				stereotype 	(object SegLabel @1148
-				    Parent_View 	@1147
-				    location   	(759, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.446429
-				    height     	6
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@1085
-				supplier   	@1024
-				line_style 	3
-				origin_attachment 	(753, 520)
-				terminal_attachment 	(753, 465)
-				drawSupplier 	@1025)
-			    (object InheritView "" @1149
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1054
-				supplier   	@1081
-				line_style 	3
-				origin_attachment 	(1409, 1641)
-				terminal_attachment 	(1409, 1593)
-				drawSupplier 	@1082)
-			    (object InheritView "" @1150
-				stereotype 	(object SegLabel @1151
-				    Parent_View 	@1150
-				    location   	(759, 1591)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	219
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.980392
-				    height     	385
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@1054
-				supplier   	@1112
-				line_style 	3
-				origin_attachment 	(1144, 1641)
-				terminal_attachment 	(1144, 1590)
-				drawSupplier 	@1113)
-			    (object InheritView "" @1152
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@1027
-				supplier   	@1024
-				line_style 	3
-				origin_attachment 	(166, 521)
-				terminal_attachment 	(166, 465)
-				drawSupplier 	@1025)
-			    (object InheritTreeView "" @1153
-				location   	(431, 222)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1040
-				vertices   	(list Points
-				    (431, 222)
-				    (431, 130)))
-			    (object InheritView "" @1154
-				stereotype 	(object SegLabel @1155
-				    Parent_View 	@1154
-				    location   	(361, 224)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	237
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.976744
-				    height     	86
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6BD2440069"
-				client     	@1024
-				supplier   	@1040
-				line_style 	3
-				origin_attachment 	(275, 265)
-				terminal_attachment 	(275, 222)
-				drawSupplier 	@1153)
-			    (object InheritTreeView "" @1156
-				location   	(1309, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1073
-				vertices   	(list Points
-				    (1309, 465)
-				    (1309, 375)))
-			    (object InheritView "" @1157
-				stereotype 	(object SegLabel @1158
-				    Parent_View 	@1157
-				    location   	(941, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.464286
-				    height     	10
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E660339"
-				client     	@1085
-				supplier   	@1073
-				line_style 	3
-				origin_attachment 	(931, 520)
-				terminal_attachment 	(931, 465)
-				drawSupplier 	@1156)
-			    (object InheritView "" @1159
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@1034
-				supplier   	@1112
-				line_style 	3
-				origin_attachment 	(250, 1641)
-				terminal_attachment 	(250, 1590)
-				drawSupplier 	@1113)
-			    (object InheritView "" @1160
-				stereotype 	(object SegLabel @1161
-				    Parent_View 	@1160
-				    location   	(1205, 493)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.958333
-				    height     	8
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E6103BE"
-				client     	@1047
-				supplier   	@1073
-				line_style 	3
-				origin_attachment 	(1197, 1113)
-				terminal_attachment 	(1197, 465)
-				drawSupplier 	@1156)
-			    (object InheritView "" @1162
-				stereotype 	(object SegLabel @1163
-				    Parent_View 	@1162
-				    location   	(1951, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.848980
-				    height     	73
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6AE2EB02A8"
-				client     	@1128
-				supplier   	@1017
-				line_style 	3
-				origin_attachment 	(1878, 1113)
-				terminal_attachment 	(1878, 868)
-				drawSupplier 	@1018)
-			    (object InheritView "" @1164
-				stereotype 	(object SegLabel @1165
-				    Parent_View 	@1164
-				    location   	(1642, 807)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.879310
-				    height     	61
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B69403A0221"
-				client     	@1128
-				supplier   	@1114
-				line_style 	3
-				origin_attachment 	(1703, 1113)
-				terminal_attachment 	(1703, 765)
-				drawSupplier 	@1115)
-			    (object InheritView "" @1166
-				stereotype 	(object SegLabel @1167
-				    Parent_View 	@1166
-				    location   	(1354, 801)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.500000
-				    height     	70
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B72D737038F"
-				client     	@1046
-				supplier   	@1114
-				line_style 	3
-				origin_attachment 	(1284, 837)
-				terminal_attachment 	(1284, 765)
-				drawSupplier 	@1115)
-			    (object InheritView "" @1168
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@1016
-				supplier   	@1072
-				line_style 	3
-				origin_attachment 	(2284, 762)
-				terminal_attachment 	(2379, 762))
-			    (object InheritView "" @1169
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@1015
-				supplier   	@1073
-				line_style 	3
-				origin_attachment 	(2637, 521)
-				terminal_attachment 	(2637, 465)
-				drawSupplier 	@1156)
-			    (object InheritView "" @1170
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1072
-				supplier   	@1015
-				line_style 	3
-				origin_attachment 	(2637, 729)
-				terminal_attachment 	(2637, 631))
-			    (object InheritView "" @1171
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@1017
-				supplier   	@1073
-				line_style 	3
-				origin_attachment 	(1950, 521)
-				terminal_attachment 	(1950, 465)
-				drawSupplier 	@1156)
-			    (object InheritView "" @1172
-				stereotype 	(object SegLabel @1173
-				    Parent_View 	@1172
-				    location   	(2821, 897)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	181
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.087719
-				    height     	76
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B688E4F023C"
-				client     	@1014
-				supplier   	@1073
-				line_style 	3
-				origin_attachment 	(2896, 937)
-				terminal_attachment 	(2896, 465)
-				drawSupplier 	@1156)
-			    (object InheritView "" @1174
-				stereotype 	(object SegLabel @1175
-				    Parent_View 	@1174
-				    location   	(2313, 904)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	207
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.850622
-				    height     	68
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2E20381"
-				client     	@1026
-				supplier   	@1017
-				line_style 	3
-				origin_attachment 	(2381, 1109)
-				terminal_attachment 	(2381, 868)
-				drawSupplier 	@1018)
-			    (object InheritView "" @1176
-				stereotype 	(object SegLabel @1177
-				    Parent_View 	@1176
-				    location   	(2878, 269)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.946667
-				    height     	66
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6BD2550385"
-				client     	@1026
-				supplier   	@1040
-				line_style 	3
-				origin_attachment 	(2943, 1109)
-				terminal_attachment 	(2943, 222)
-				drawSupplier 	@1153)
-			    (object InheritView "" @1178
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@1135
-				supplier   	@1024
-				line_style 	3
-				origin_attachment 	(462, 1113)
-				terminal_attachment 	(462, 465)
-				drawSupplier 	@1025)))
-		    (object ClassDiagram "9. Concrete Schema Composition"
-			quid       	"3C25EB7A038C"
-			title      	"9. Concrete Schema Composition"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1179
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1179
-				    location   	(73, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	480
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$126" @1180
-				location   	(228, 1695)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B41E60251"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$127" @1181
-					Parent_View 	@1180
-					location   	(-476, -385)
-					label      	(object SegLabel @1182
-					    Parent_View 	@1181
-					    location   	(217, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA02F7"
-					client     	@1180
-					supplier   	@1179
-					vertices   	(list Points
-					    (228, 1695)
-					    (175, 1695)
-					    (175, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(175, 1591))
-				    (object RoleView "resolvedElementDeclaration" @1183
-					Parent_View 	@1180
-					location   	(-476, -385)
-					label      	(object SegLabel @1184
-					    Parent_View 	@1183
-					    location   	(329, 1740)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedElementDeclaration"
-					    pctDist    	1.924528
-					    height     	45
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA030B"
-					client     	@1180
-					supplier   	@1179
-					vertices   	(list Points
-					    (228, 1695)
-					    (281, 1695)
-					    (281, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(281, 1591)
-					label      	(object SegLabel @1185
-					    Parent_View 	@1183
-					    location   	(229, 1646)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.005714
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1186
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1186
-				    location   	(790, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	500
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	518
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$162" @1187
-				location   	(952, 1698)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B42450398"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$163" @1188
-					Parent_View 	@1187
-					location   	(-1288, -318)
-					label      	(object SegLabel @1189
-					    Parent_View 	@1188
-					    location   	(860, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249038A"
-					client     	@1187
-					supplier   	@1186
-					vertices   	(list Points
-					    (952, 1698)
-					    (901, 1698)
-					    (901, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(901, 1591))
-				    (object RoleView "resolvedModelGroupDefinition" @1190
-					Parent_View 	@1187
-					location   	(-1288, -318)
-					label      	(object SegLabel @1191
-					    Parent_View 	@1190
-					    location   	(1020, 1739)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	564
-					    justify    	0
-					    label      	"+resolvedModelGroupDefinition"
-					    pctDist    	1.326923
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249039E"
-					client     	@1187
-					supplier   	@1186
-					vertices   	(list Points
-					    (952, 1698)
-					    (1004, 1698)
-					    (1004, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(1004, 1591)
-					label      	(object SegLabel @1192
-					    Parent_View 	@1190
-					    location   	(952, 1649)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.000000
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1193
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1193
-				    location   	(420, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1194
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1194
-				    location   	(412, 739)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	457
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	475
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1195
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 416)
-				label      	(object ItemLabel
-				    Parent_View 	@1195
-				    location   	(446, 285)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	406
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$226" @1196
-				location   	(1303, 679)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "incorporatedSchema" @1197
-					Parent_View 	@1196
-					location   	(-41, -857)
-					label      	(object SegLabel @1198
-					    Parent_View 	@1197
-					    location   	(1059, 381)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.700384
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@1196
-					supplier   	@1195
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 419)
-					    (843, 419))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(843, 419)
-					label      	(object SegLabel @1199
-					    Parent_View 	@1197
-					    location   	(922, 454)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.890746
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$227" @1200
-					Parent_View 	@1196
-					location   	(-41, -857)
-					label      	(object SegLabel @1201
-					    Parent_View 	@1200
-					    location   	(1045, 956)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@1196
-					supplier   	@1193
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 997)
-					    (901, 997))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(901, 997))))
-			    (object AssociationViewNew "$UNNAMED$224" @1202
-				location   	(1216, 649)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedSchema" @1203
-					Parent_View 	@1202
-					location   	(336, -1399)
-					label      	(object SegLabel @1204
-					    Parent_View 	@1203
-					    location   	(1038, 500)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.601923
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@1202
-					supplier   	@1195
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 534)
-					    (843, 534))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(843, 534)
-					label      	(object SegLabel @1205
-					    Parent_View 	@1203
-					    location   	(926, 577)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.831643
-					    height     	43
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$225" @1206
-					Parent_View 	@1202
-					location   	(336, -1399)
-					label      	(object SegLabel @1207
-					    Parent_View 	@1206
-					    location   	(974, 756)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@1202
-					supplier   	@1194
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 797)
-					    (877, 797))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(877, 797))))
-			    (object AssociationViewNew "$UNNAMED$230" @1208
-				location   	(662, 642)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25D3A60131"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencingDirectives" @1209
-					Parent_View 	@1208
-					location   	(-234, 114)
-					label      	(object SegLabel @1210
-					    Parent_View 	@1209
-					    location   	(878, 675)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+referencingDirectives"
-					    pctDist    	0.408759
-					    height     	216
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90371"
-					client     	@1208
-					supplier   	@1194
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 725)
-					label      	(object SegLabel @1211
-					    Parent_View 	@1209
-					    location   	(615, 678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.430657
-					    height     	48
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$231" @1212
-					Parent_View 	@1208
-					location   	(-234, 114)
-					label      	(object SegLabel @1213
-					    Parent_View 	@1212
-					    location   	(621, 576)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90370"
-					client     	@1208
-					supplier   	@1195
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 559))))
-			    (object AssociationViewNew "$UNNAMED$232" @1214
-				location   	(75, 188)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ECF0005E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$233" @1215
-					Parent_View 	@1214
-					location   	(-853, -308)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF4001E"
-					client     	@1214
-					supplier   	@1195
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 128)
-					    (510, 128)
-					    (510, 273))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(510, 273))
-				    (object RoleView "rootVersion" @1216
-					Parent_View 	@1214
-					location   	(-853, -308)
-					label      	(object SegLabel @1217
-					    Parent_View 	@1216
-					    location   	(176, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+rootVersion"
-					    pctDist    	-0.593750
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF40028"
-					client     	@1214
-					supplier   	@1195
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 380)
-					    (437, 380))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(437, 380)
-					label      	(object SegLabel @1218
-					    Parent_View 	@1216
-					    location   	(368, 328)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.874755
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$234" @1219
-				location   	(1262, 134)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ED0B011B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$235" @1220
-					Parent_View 	@1219
-					location   	(334, -362)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F0121"
-					client     	@1219
-					supplier   	@1195
-					vertices   	(list Points
-					    (1262, 134)
-					    (766, 134)
-					    (766, 273))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(766, 273))
-				    (object RoleView "originalVersion" @1221
-					Parent_View 	@1219
-					location   	(334, -362)
-					label      	(object SegLabel @1222
-					    Parent_View 	@1221
-					    location   	(1164, 97)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+originalVersion"
-					    pctDist    	-1.650000
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F012B"
-					client     	@1219
-					supplier   	@1195
-					vertices   	(list Points
-					    (1262, 134)
-					    (1322, 134)
-					    (1322, 334)
-					    (843, 334))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(843, 334)
-					label      	(object SegLabel @1223
-					    Parent_View 	@1221
-					    location   	(919, 279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898108
-					    height     	56
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$236" @1224
-				location   	(126, 656)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25EEAB001F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$237" @1225
-					Parent_View 	@1224
-					location   	(-834, 160)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF010B"
-					client     	@1224
-					supplier   	@1195
-					vertices   	(list Points
-					    (126, 656)
-					    (513, 656)
-					    (513, 559))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(513, 559))
-				    (object RoleView "incorporatedVersions" @1226
-					Parent_View 	@1224
-					location   	(-834, 160)
-					label      	(object SegLabel @1227
-					    Parent_View 	@1226
-					    location   	(217, 431)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+incorporatedVersions"
-					    pctDist    	0.643902
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF0115"
-					client     	@1224
-					supplier   	@1195
-					vertices   	(list Points
-					    (126, 656)
-					    (66, 656)
-					    (66, 472)
-					    (437, 472))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(437, 472)
-					label      	(object SegLabel @1228
-					    Parent_View 	@1226
-					    location   	(356, 526)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.868468
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$240" @1229
-				location   	(642, 126)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2784730194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$241" @1230
-					Parent_View 	@1229
-					location   	(82, -418)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501F1"
-					client     	@1229
-					supplier   	@1195
-					vertices   	(list Points
-					    (642, 126)
-					    (588, 126)
-					    (588, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(588, 273))
-				    (object RoleView "schemaForSchema" @1231
-					Parent_View 	@1229
-					location   	(82, -418)
-					label      	(object SegLabel @1232
-					    Parent_View 	@1231
-					    location   	(639, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+schemaForSchema"
-					    pctDist    	-0.055556
-					    height     	53
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501FB"
-					client     	@1229
-					supplier   	@1195
-					vertices   	(list Points
-					    (642, 126)
-					    (697, 126)
-					    (697, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(697, 273)
-					label      	(object SegLabel @1233
-					    Parent_View 	@1231
-					    location   	(643, 213)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.701863
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @1234
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1193
-				supplier   	@1194
-				line_style 	3
-				origin_attachment 	(638, 937)
-				terminal_attachment 	(638, 843))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1235
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1235
-				    location   	(67, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$80" @1236
-				location   	(234, 1340)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B426B0194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$81" @1237
-					Parent_View 	@1236
-					location   	(-310, -4)
-					label      	(object SegLabel @1238
-					    Parent_View 	@1237
-					    location   	(140, 1271)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0309"
-					client     	@1236
-					supplier   	@1235
-					vertices   	(list Points
-					    (234, 1340)
-					    (181, 1340)
-					    (181, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(181, 1239))
-				    (object RoleView "resolvedAttributeDeclaration" @1239
-					Parent_View 	@1236
-					location   	(-310, -4)
-					label      	(object SegLabel @1240
-					    Parent_View 	@1239
-					    location   	(333, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedAttributeDeclaration"
-					    pctDist    	1.867925
-					    height     	49
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0313"
-					client     	@1236
-					supplier   	@1235
-					vertices   	(list Points
-					    (234, 1340)
-					    (287, 1340)
-					    (287, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(287, 1239)
-					label      	(object SegLabel @1241
-					    Parent_View 	@1239
-					    location   	(241, 1295)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.042945
-					    height     	46
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1242
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1760, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@1242
-				    location   	(1517, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	486
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	504
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1243
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1243
-				    location   	(1599, 375)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	226
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C359403D2"
-				width      	244
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$314" @1244
-				location   	(1668, 280)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4AE01CC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$315" @1245
-					Parent_View 	@1244
-					location   	(8, -152)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF010F"
-					client     	@1244
-					supplier   	@1242
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 199))
-				    (object RoleView "syntheticFacets" @1246
-					Parent_View 	@1244
-					location   	(8, -152)
-					label      	(object SegLabel @1247
-					    Parent_View 	@1246
-					    location   	(1852, 300)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+syntheticFacets"
-					    pctDist    	0.246154
-					    height     	184
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF011A"
-					client     	@1244
-					supplier   	@1243
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 361)
-					label      	(object SegLabel @1248
-					    Parent_View 	@1246
-					    location   	(1625, 301)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.276923
-					    height     	44
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1249
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1249
-				    location   	(1426, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1250
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@1250
-				    location   	(1515, 597)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$316" @1251
-				location   	(1508, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D3028E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$317" @1252
-					Parent_View 	@1251
-					location   	(-12, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402F3"
-					client     	@1251
-					supplier   	@1250
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 695))
-				    (object RoleView "syntheticParticle" @1253
-					Parent_View 	@1251
-					location   	(-12, -280)
-					label      	(object SegLabel @1254
-					    Parent_View 	@1253
-					    location   	(1695, 767)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+syntheticParticle"
-					    pctDist    	-0.259259
-					    height     	187
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402FD"
-					client     	@1251
-					supplier   	@1249
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 889)
-					label      	(object SegLabel @1255
-					    Parent_View 	@1253
-					    location   	(1454, 829)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.395062
-					    height     	55
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1256
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1256
-				    location   	(756, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$92" @1257
-				location   	(919, 1349)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B425E01F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$93" @1258
-					Parent_View 	@1257
-					location   	(-233, -59)
-					label      	(object SegLabel @1259
-					    Parent_View 	@1258
-					    location   	(825, 1273)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620046"
-					client     	@1257
-					supplier   	@1256
-					vertices   	(list Points
-					    (919, 1349)
-					    (866, 1349)
-					    (866, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(866, 1239))
-				    (object RoleView "resolvedAttributeGroupDefinition" @1260
-					Parent_View 	@1257
-					location   	(-233, -59)
-					label      	(object SegLabel @1261
-					    Parent_View 	@1260
-					    location   	(993, 1393)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	600
-					    justify    	0
-					    label      	"+resolvedAttributeGroupDefinition"
-					    pctDist    	1.377358
-					    height     	44
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620050"
-					client     	@1257
-					supplier   	@1256
-					vertices   	(list Points
-					    (919, 1349)
-					    (973, 1349)
-					    (973, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(973, 1239)
-					label      	(object SegLabel @1262
-					    Parent_View 	@1260
-					    location   	(919, 1296)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.014925
-					    height     	54
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1263
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1952, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1263
-				    location   	(1816, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	290
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$318" @1264
-				location   	(2025, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D901F6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$319" @1265
-					Parent_View 	@1264
-					location   	(153, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA0284"
-					client     	@1264
-					supplier   	@1250
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 695))
-				    (object RoleView "syntheticWildcard" @1266
-					Parent_View 	@1264
-					location   	(153, -280)
-					label      	(object SegLabel @1267
-					    Parent_View 	@1266
-					    location   	(1826, 838)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.488095
-					    height     	200
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA028E"
-					client     	@1264
-					supplier   	@1263
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 889)
-					label      	(object SegLabel @1268
-					    Parent_View 	@1266
-					    location   	(2098, 840)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.506173
-					    height     	73
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$320" @1269
-				location   	(1754, 1178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C68FF01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$321" @1270
-					Parent_View 	@1269
-					location   	(-198, 234)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020317"
-					client     	@1269
-					supplier   	@1256
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(1301, 1178))
-				    (object RoleView "syntheticWildcard" @1271
-					Parent_View 	@1269
-					location   	(-198, 234)
-					label      	(object SegLabel @1272
-					    Parent_View 	@1271
-					    location   	(1828, 1261)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.163355
-					    height     	83
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020318"
-					client     	@1269
-					supplier   	@1263
-					vertices   	(list Points
-					    (1754, 1178)
-					    (2028, 1178)
-					    (2028, 999))
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(2028, 999)
-					label      	(object SegLabel @1273
-					    Parent_View 	@1271
-					    location   	(2082, 1098)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783664
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "10. Diagnostics"
-			quid       	"3BFE5F0803E2"
-			title      	"10. Diagnostics"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @1274
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(400, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@1274
-				    location   	(66, 990)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1274
-				    location   	(66, 940)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnosticSeverity" @1275
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@1275
-				    location   	(818, 547)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDDiagnosticSeverity")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1275
-				    location   	(818, 497)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BFE68A7032F"
-				width      	462
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1276
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1276
-				    location   	(59, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1277
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(896, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1277
-				    location   	(540, 64)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	713
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	731
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1278
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@1278
-				    location   	(64, 402)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	658
-				height     	436
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$222" @1279
-				location   	(144, 283)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE6431035F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$223" @1280
-					Parent_View 	@1279
-					location   	(-1088, -661)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C6"
-					client     	@1279
-					supplier   	@1276
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 176))
-				    (object RoleView "allDiagnostics" @1281
-					Parent_View 	@1279
-					location   	(-1088, -661)
-					label      	(object SegLabel @1282
-					    Parent_View 	@1281
-					    location   	(309, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+allDiagnostics"
-					    pctDist    	0.448598
-					    height     	165
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C7"
-					client     	@1279
-					supplier   	@1278
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 390)
-					label      	(object SegLabel @1283
-					    Parent_View 	@1281
-					    location   	(96, 327)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420561
-					    height     	49
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$218" @1284
-				location   	(1028, 440)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE622703CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$219" @1285
-					Parent_View 	@1284
-					location   	(-396, -72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B0061"
-					client     	@1284
-					supplier   	@1278
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(713, 440))
-				    (object RoleView "components" @1286
-					Parent_View 	@1284
-					location   	(-396, -72)
-					label      	(object SegLabel @1287
-					    Parent_View 	@1286
-					    location   	(938, 230)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+components"
-					    pctDist    	0.829181
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B006C"
-					client     	@1284
-					supplier   	@1277
-					vertices   	(list Points
-					    (1028, 440)
-					    (1088, 440)
-					    (1088, 174))
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(1088, 174)
-					label      	(object SegLabel @1288
-					    Parent_View 	@1286
-					    location   	(1143, 232)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.823848
-					    height     	55
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$220" @1289
-				location   	(688, 282)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE62690165"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$221" @1290
-					Parent_View 	@1289
-					location   	(160, -278)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0026"
-					client     	@1289
-					supplier   	@1277
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 174))
-				    (object RoleView "diagnostics" @1291
-					Parent_View 	@1289
-					location   	(160, -278)
-					label      	(object SegLabel @1292
-					    Parent_View 	@1291
-					    location   	(822, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+diagnostics"
-					    pctDist    	0.452632
-					    height     	134
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0027"
-					client     	@1289
-					supplier   	@1278
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 390)
-					label      	(object SegLabel @1293
-					    Parent_View 	@1291
-					    location   	(645, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.494737
-					    height     	44
-					    orientation 	1))))
-			    (object InheritView "" @1294
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C0F4C01A1"
-				client     	@1278
-				supplier   	@1277
-				line_style 	3
-				origin_attachment 	(575, 390)
-				terminal_attachment 	(575, 174))))
-		    (object ClassDiagram "11. Supplemental"
-			quid       	"3C287E49019B"
-			title      	"11. Supplemental"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1295
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(464, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@1295
-				    location   	(47, 760)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	834
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	852
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1296
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2112, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@1296
-				    location   	(1731, 824)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	762
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	780
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1297
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1297
-				    location   	(48, 62)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	498
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1298
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2384, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1298
-				    location   	(2236, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	314
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$244" @1299
-				location   	(1382, 84)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2882C50137"
-				roleview_list 	(list RoleViews
-				    (object RoleView "primaryComponent" @1300
-					Parent_View 	@1299
-					location   	(-250, -508)
-					label      	(object SegLabel @1301
-					    Parent_View 	@1300
-					    location   	(756, 116)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+primaryComponent"
-					    pctDist    	0.740828
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70113"
-					client     	@1299
-					supplier   	@1297
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(537, 84)
-					label      	(object SegLabel @1302
-					    Parent_View 	@1300
-					    location   	(624, 55)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.897260
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$245" @1303
-					Parent_View 	@1299
-					location   	(-250, -508)
-					label      	(object SegLabel @1304
-					    Parent_View 	@1303
-					    location   	(2058, 126)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70112"
-					client     	@1299
-					supplier   	@1298
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(2227, 84))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1305
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@1305
-				    location   	(1778, 607)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	764
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@1305
-				    location   	(1778, 667)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	722
-				    compartmentItems 	(list Compartment
-					"+ elementDeclarationReference : boolean"
-					"+ circular : boolean"))
-				width      	782
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1306
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1072)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1306
-				    location   	(2100, 993)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@1306
-				    location   	(2100, 1059)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	423
-				    compartmentItems 	(list Compartment
-					"+ facetName : String"
-					"+ effectiveValue : Value"))
-				width      	458
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1307
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@1307
-				    location   	(47, 568)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	802
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				compartment 	(object Compartment
-				    Parent_View 	@1307
-				    location   	(47, 628)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	769
-				    compartmentItems 	(list Compartment
-					"+ modelGroupDefinitionReference : boolean"))
-				width      	820
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @1308
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 288)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1308
-				    location   	(1005, 159)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	454
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@1308
-				    location   	(1005, 225)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	4
-				    max_width  	356
-				    compartmentItems 	(list Compartment
-					"+ aliasName : String"
-					"+ uRI : String"
-					"+ aliasURI : String"
-					"+ qName : String"))
-				width      	472
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @1309
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 352)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1309
-				    location   	(48, 298)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1310
-				location   	(320, 510)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1309
-				vertices   	(list Points
-				    (320, 510)
-				    (320, 420)))
-			    (object InheritView "" @1311
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@1307
-				supplier   	@1309
-				line_style 	3
-				origin_attachment 	(81, 556)
-				terminal_attachment 	(81, 510)
-				drawSupplier 	@1310)
-			    (object InheritView "" @1312
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@1295
-				supplier   	@1309
-				line_style 	3
-				origin_attachment 	(877, 748)
-				terminal_attachment 	(877, 510)
-				drawSupplier 	@1310)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @1313
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1808)
-				label      	(object ItemLabel
-				    Parent_View 	@1313
-				    location   	(2101, 1761)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	456
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @1314
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1776)
-				label      	(object ItemLabel
-				    Parent_View 	@1314
-				    location   	(35, 1729)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	493
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @1315
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@1315
-				    location   	(35, 1889)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	493
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @1316
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@1316
-				    location   	(2073, 1917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @1317
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@1317
-				    location   	(2134, 1372)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @1318
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@1318
-				    location   	(2163, 1212)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	396
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @1319
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 1392)
-				label      	(object ItemLabel
-				    Parent_View 	@1319
-				    location   	(43, 1340)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	380
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @1320
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1232)
-				label      	(object ItemLabel
-				    Parent_View 	@1320
-				    location   	(49, 1178)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	382
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	400
-				height     	132
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @1321
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1616)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1321
-				    location   	(2135, 1537)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@1321
-				    location   	(2135, 1603)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	363
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @1322
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2288)
-				label      	(object ItemLabel
-				    Parent_View 	@1322
-				    location   	(2102, 2236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	436
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	454
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @1323
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 2624)
-				label      	(object ItemLabel
-				    Parent_View 	@1323
-				    location   	(2074, 2572)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	478
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @1324
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 2128)
-				label      	(object ItemLabel
-				    Parent_View 	@1324
-				    location   	(2196, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	362
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @1325
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@1325
-				    location   	(36, 2044)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	458
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @1326
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@1326
-				    location   	(38, 2220)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	340
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	358
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @1327
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1584)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1327
-				    location   	(38, 1505)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@1327
-				    location   	(38, 1571)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	363
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	422
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @1328
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2464)
-				label      	(object ItemLabel
-				    Parent_View 	@1328
-				    location   	(2111, 2412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @1329
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2448)
-				label      	(object ItemLabel
-				    Parent_View 	@1329
-				    location   	(39, 2396)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	420
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @1330
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2608)
-				label      	(object ItemLabel
-				    Parent_View 	@1330
-				    location   	(38, 2556)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1331
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@1331
-				    location   	(667, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1332
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 1072)
-				label      	(object ItemLabel
-				    Parent_View 	@1332
-				    location   	(50, 1020)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1333
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@1333
-				    location   	(944, 1304)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	576
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@1333
-				    location   	(944, 1364)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	538
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + validFacets : String"))
-				width      	594
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$256" @1334
-				location   	(1446, 1218)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A994030A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1335
-					Parent_View 	@1334
-					location   	(582, -78)
-					label      	(object SegLabel @1336
-					    Parent_View 	@1335
-					    location   	(1580, 1173)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	3.268293
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700DD"
-					client     	@1334
-					supplier   	@1333
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1487, 1218)
-					    (1487, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1487, 1292)
-					label      	(object SegLabel @1337
-					    Parent_View 	@1335
-					    location   	(1439, 1257)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.184211
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$257" @1338
-					Parent_View 	@1334
-					location   	(582, -78)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700E7"
-					client     	@1334
-					supplier   	@1333
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1405, 1218)
-					    (1405, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1405, 1292))))
-			    (object AssociationViewNew "$UNNAMED$260" @1339
-				location   	(1733, 1575)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B08D0252"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$261" @1340
-					Parent_View 	@1339
-					location   	(917, 7)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E0091"
-					client     	@1339
-					supplier   	@1333
-					vertices   	(list Points
-					    (1733, 1575)
-					    (1487, 1575)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "maxFacet" @1341
-					Parent_View 	@1339
-					location   	(917, 7)
-					label      	(object SegLabel @1342
-					    Parent_View 	@1341
-					    location   	(1751, 1541)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+maxFacet"
-					    pctDist    	0.046243
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E009B"
-					client     	@1339
-					supplier   	@1321
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(2126, 1575)
-					label      	(object SegLabel @1343
-					    Parent_View 	@1341
-					    location   	(2042, 1536)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.789157
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$262" @1344
-				location   	(1587, 1793)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AB0396"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$263" @1345
-					Parent_View 	@1344
-					location   	(707, -31)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03C9"
-					client     	@1344
-					supplier   	@1333
-					vertices   	(list Points
-					    (1587, 1793)
-					    (1447, 1793)
-					    (1447, 1428))
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(1447, 1428))
-				    (object RoleView "maxInclusiveFacet" @1346
-					Parent_View 	@1344
-					location   	(707, -31)
-					label      	(object SegLabel @1347
-					    Parent_View 	@1346
-					    location   	(1737, 1751)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+maxInclusiveFacet"
-					    pctDist    	0.298441
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03D4"
-					client     	@1344
-					supplier   	@1313
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(2092, 1793)
-					label      	(object SegLabel @1348
-					    Parent_View 	@1346
-					    location   	(2020, 1754)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.859155
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$264" @1349
-				location   	(937, 1787)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AF0338"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$265" @1350
-					Parent_View 	@1349
-					location   	(617, -5)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B001F9"
-					client     	@1349
-					supplier   	@1333
-					vertices   	(list Points
-					    (937, 1787)
-					    (997, 1787)
-					    (997, 1428))
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(997, 1428))
-				    (object RoleView "minInclusiveFacet" @1351
-					Parent_View 	@1349
-					location   	(617, -5)
-					label      	(object SegLabel @1352
-					    Parent_View 	@1351
-					    location   	(792, 1745)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+minInclusiveFacet"
-					    pctDist    	0.346062
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B00203"
-					client     	@1349
-					supplier   	@1314
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(518, 1787)
-					label      	(object SegLabel @1353
-					    Parent_View 	@1351
-					    location   	(575, 1743)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863962
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$266" @1354
-				location   	(981, 1937)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B30207"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$267" @1355
-					Parent_View 	@1354
-					location   	(677, -79)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B40190"
-					client     	@1354
-					supplier   	@1333
-					vertices   	(list Points
-					    (981, 1937)
-					    (1041, 1937)
-					    (1041, 1428))
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(1041, 1428))
-				    (object RoleView "minExclusiveFacet" @1356
-					Parent_View 	@1354
-					location   	(677, -79)
-					label      	(object SegLabel @1357
-					    Parent_View 	@1356
-					    location   	(823, 1900)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+minExclusiveFacet"
-					    pctDist    	0.341253
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B4019A"
-					client     	@1354
-					supplier   	@1315
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(518, 1937)
-					label      	(object SegLabel @1358
-					    Parent_View 	@1356
-					    location   	(589, 1897)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.846652
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$268" @1359
-				location   	(1469, 1953)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B6028D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$269" @1360
-					Parent_View 	@1359
-					location   	(621, -95)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70217"
-					client     	@1359
-					supplier   	@1333
-					vertices   	(list Points
-					    (1469, 1953)
-					    (1400, 1953)
-					    (1400, 1428))
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(1400, 1428))
-				    (object RoleView "maxExclusiveFacet" @1361
-					Parent_View 	@1359
-					location   	(621, -95)
-					label      	(object SegLabel @1362
-					    Parent_View 	@1361
-					    location   	(1646, 1913)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+maxExclusiveFacet"
-					    pctDist    	0.298097
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70221"
-					client     	@1359
-					supplier   	@1316
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(2064, 1953)
-					label      	(object SegLabel @1363
-					    Parent_View 	@1361
-					    location   	(1961, 1913)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.827236
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$270" @1364
-				location   	(1122, 2180)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BC0051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$271" @1365
-					Parent_View 	@1364
-					location   	(-318, 628)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0246"
-					client     	@1364
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "lengthFacet" @1366
-					Parent_View 	@1364
-					location   	(-318, 628)
-					label      	(object SegLabel @1367
-					    Parent_View 	@1366
-					    location   	(804, 2204)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+lengthFacet"
-					    pctDist    	0.475472
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0250"
-					client     	@1364
-					supplier   	@1326
-					vertices   	(list Points
-					    (1122, 2180)
-					    (1122, 2240)
-					    (387, 2240))
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(387, 2240)
-					label      	(object SegLabel @1368
-					    Parent_View 	@1366
-					    location   	(471, 2204)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.895597
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$274" @1369
-				location   	(1084, 1989)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C2021D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$275" @1370
-					Parent_View 	@1369
-					location   	(-1380, 437)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AB"
-					client     	@1369
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "enumerationFacets" @1371
-					Parent_View 	@1369
-					location   	(-1380, 437)
-					label      	(object SegLabel @1372
-					    Parent_View 	@1371
-					    location   	(837, 2016)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+enumerationFacets"
-					    pctDist    	0.465857
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AC"
-					client     	@1369
-					supplier   	@1325
-					vertices   	(list Points
-					    (1084, 1989)
-					    (1084, 2049)
-					    (485, 2049))
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(485, 2049)
-					label      	(object SegLabel @1373
-					    Parent_View 	@1371
-					    location   	(583, 2021)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.851290
-					    height     	29
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$276" @1374
-				location   	(1451, 2074)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C50159"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$277" @1375
-					Parent_View 	@1374
-					location   	(-1525, 538)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600B0"
-					client     	@1374
-					supplier   	@1333
-					vertices   	(list Points
-					    (1451, 2074)
-					    (1362, 2074)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "patternFacets" @1376
-					Parent_View 	@1374
-					location   	(-1525, 538)
-					label      	(object SegLabel @1377
-					    Parent_View 	@1376
-					    location   	(1720, 2038)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+patternFacets"
-					    pctDist    	0.367223
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600BA"
-					client     	@1374
-					supplier   	@1324
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(2187, 2074)
-					label      	(object SegLabel @1378
-					    Parent_View 	@1376
-					    location   	(1972, 2035)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.708649
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$278" @1379
-				location   	(1827, 1400)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C802A7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$279" @1380
-					Parent_View 	@1379
-					location   	(-1149, -472)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901EA"
-					client     	@1379
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(1529, 1400))
-				    (object RoleView "cardinalityFacet" @1381
-					Parent_View 	@1379
-					location   	(-1149, -472)
-					label      	(object SegLabel @1382
-					    Parent_View 	@1381
-					    location   	(1847, 1358)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+cardinalityFacet"
-					    pctDist    	0.071730
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901F5"
-					client     	@1379
-					supplier   	@1317
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(2125, 1400)
-					label      	(object SegLabel @1383
-					    Parent_View 	@1381
-					    location   	(2083, 1357)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.863426
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$288" @1384
-				location   	(1262, 2413)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DB0377"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$289" @1385
-					Parent_View 	@1384
-					location   	(-786, 301)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC035A"
-					client     	@1384
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "fractionDigitsFacet" @1386
-					Parent_View 	@1384
-					location   	(-786, 301)
-					label      	(object SegLabel @1387
-					    Parent_View 	@1386
-					    location   	(1608, 2556)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+fractionDigitsFacet"
-					    pctDist    	0.537393
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC0364"
-					client     	@1384
-					supplier   	@1323
-					vertices   	(list Points
-					    (1262, 2413)
-					    (1262, 2596)
-					    (2065, 2596))
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(2065, 2596)
-					label      	(object SegLabel @1388
-					    Parent_View 	@1386
-					    location   	(1979, 2556)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913886
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$292" @1389
-				location   	(1841, 1306)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0E300D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$293" @1390
-					Parent_View 	@1389
-					location   	(-1135, -790)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E4038E"
-					client     	@1389
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(1529, 1306))
-				    (object RoleView "boundedFacet" @1391
-					Parent_View 	@1389
-					location   	(-1135, -790)
-					label      	(object SegLabel @1392
-					    Parent_View 	@1391
-					    location   	(1832, 1270)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+boundedFacet"
-					    pctDist    	-0.031746
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E40398"
-					client     	@1389
-					supplier   	@1318
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(2154, 1306)
-					label      	(object SegLabel @1393
-					    Parent_View 	@1391
-					    location   	(2077, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.754717
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$272" @1394
-				location   	(1328, 2186)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BF018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$273" @1395
-					Parent_View 	@1394
-					location   	(-640, 634)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C0006B"
-					client     	@1394
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "whiteSpaceFacet" @1396
-					Parent_View 	@1394
-					location   	(-640, 634)
-					label      	(object SegLabel @1397
-					    Parent_View 	@1396
-					    location   	(1673, 2207)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+whiteSpaceFacet"
-					    pctDist    	0.490909
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C00075"
-					client     	@1394
-					supplier   	@1322
-					vertices   	(list Points
-					    (1328, 2186)
-					    (1328, 2246)
-					    (2093, 2246))
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(2093, 2246)
-					label      	(object SegLabel @1398
-					    Parent_View 	@1396
-					    location   	(2033, 2203)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926763
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$290" @1399
-				location   	(674, 1390)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DF0048"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$291" @1400
-					Parent_View 	@1399
-					location   	(-1854, -706)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03B9"
-					client     	@1399
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(935, 1390))
-				    (object RoleView "orderedFacet" @1401
-					Parent_View 	@1399
-					location   	(-1854, -706)
-					label      	(object SegLabel @1402
-					    Parent_View 	@1401
-					    location   	(658, 1353)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+orderedFacet"
-					    pctDist    	0.061538
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03C3"
-					client     	@1399
-					supplier   	@1319
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(414, 1390)
-					label      	(object SegLabel @1403
-					    Parent_View 	@1401
-					    location   	(510, 1355)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.634615
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$280" @1404
-				location   	(687, 1296)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CB039C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$281" @1405
-					Parent_View 	@1404
-					location   	(-1809, -576)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D0"
-					client     	@1404
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(935, 1296))
-				    (object RoleView "numericFacet" @1406
-					Parent_View 	@1404
-					location   	(-1809, -576)
-					label      	(object SegLabel @1407
-					    Parent_View 	@1406
-					    location   	(668, 1257)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+numericFacet"
-					    pctDist    	0.080972
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D1"
-					client     	@1404
-					supplier   	@1320
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(440, 1296)
-					label      	(object SegLabel @1408
-					    Parent_View 	@1406
-					    location   	(506, 1260)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.736842
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$294" @1409
-				location   	(1689, 1662)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B44401EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$295" @1410
-					Parent_View 	@1409
-					location   	(-183, -354)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B4450360"
-					client     	@1409
-					supplier   	@1333
-					vertices   	(list Points
-					    (1689, 1662)
-					    (1487, 1662)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "effectiveMaxFacet" @1411
-					Parent_View 	@1409
-					location   	(-183, -354)
-					label      	(object SegLabel @1412
-					    Parent_View 	@1411
-					    location   	(1769, 1623)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+effectiveMaxFacet"
-					    pctDist    	0.182051
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B445036A"
-					client     	@1409
-					supplier   	@1321
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(2126, 1662)
-					label      	(object SegLabel @1413
-					    Parent_View 	@1411
-					    location   	(2044, 1627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.815385
-					    height     	36
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$296" @1414
-				location   	(1328, 2258)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B54F0145"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$297" @1415
-					Parent_View 	@1414
-					location   	(-1072, -462)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B550038C"
-					client     	@1414
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "effectiveWhiteSpaceFacet" @1416
-					Parent_View 	@1414
-					location   	(-1072, -462)
-					label      	(object SegLabel @1417
-					    Parent_View 	@1416
-					    location   	(1685, 2288)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+effectiveWhiteSpaceFacet"
-					    pctDist    	0.508541
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5500396"
-					client     	@1414
-					supplier   	@1322
-					vertices   	(list Points
-					    (1328, 2258)
-					    (1328, 2324)
-					    (2093, 2324))
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(2093, 2324)
-					label      	(object SegLabel @1418
-					    Parent_View 	@1416
-					    location   	(2009, 2293)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898817
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$298" @1419
-				location   	(1297, 2366)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B5C4011C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$299" @1420
-					Parent_View 	@1419
-					location   	(-607, -722)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C5020D"
-					client     	@1419
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "effectiveMaxLengthFacet" @1421
-					Parent_View 	@1419
-					location   	(-607, -722)
-					label      	(object SegLabel @1422
-					    Parent_View 	@1421
-					    location   	(1657, 2463)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+effectiveMaxLengthFacet"
-					    pctDist    	0.526906
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C50217"
-					client     	@1419
-					supplier   	@1328
-					vertices   	(list Points
-					    (1297, 2366)
-					    (1297, 2499)
-					    (2102, 2499))
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(2102, 2499)
-					label      	(object SegLabel @1423
-					    Parent_View 	@1421
-					    location   	(2007, 2471)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.899308
-					    height     	29
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$300" @1424
-				location   	(1262, 2449)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B62A00AA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$301" @1425
-					Parent_View 	@1424
-					location   	(-1170, -815)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0138"
-					client     	@1424
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "effectiveFractionDigitsFacet" @1426
-					Parent_View 	@1424
-					location   	(-1170, -815)
-					label      	(object SegLabel @1427
-					    Parent_View 	@1426
-					    location   	(1640, 2634)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+effectiveFractionDigitsFacet"
-					    pctDist    	0.585315
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0142"
-					client     	@1424
-					supplier   	@1323
-					vertices   	(list Points
-					    (1262, 2449)
-					    (1262, 2668)
-					    (2065, 2668))
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(2065, 2668)
-					label      	(object SegLabel @1428
-					    Parent_View 	@1426
-					    location   	(1989, 2629)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926485
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$302" @1429
-				location   	(1422, 2159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B6B003A6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$303" @1430
-					Parent_View 	@1429
-					location   	(-770, -1313)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10311"
-					client     	@1429
-					supplier   	@1333
-					vertices   	(list Points
-					    (1422, 2159)
-					    (1362, 2159)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "effectivePatternFacet" @1431
-					Parent_View 	@1429
-					location   	(-770, -1313)
-					label      	(object SegLabel @1432
-					    Parent_View 	@1431
-					    location   	(1727, 2125)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+effectivePatternFacet"
-					    pctDist    	0.399090
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10312"
-					client     	@1429
-					supplier   	@1324
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(2187, 2159)
-					label      	(object SegLabel @1433
-					    Parent_View 	@1431
-					    location   	(2102, 2119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.889226
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$304" @1434
-				location   	(1084, 2083)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B7CA026B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$305" @1435
-					Parent_View 	@1434
-					location   	(828, -1373)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0186"
-					client     	@1434
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "effectiveEnumerationFacet" @1436
-					Parent_View 	@1434
-					location   	(828, -1373)
-					label      	(object SegLabel @1437
-					    Parent_View 	@1436
-					    location   	(822, 2101)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+effectiveEnumerationFacet"
-					    pctDist    	0.488619
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0190"
-					client     	@1434
-					supplier   	@1325
-					vertices   	(list Points
-					    (1084, 2083)
-					    (1084, 2143)
-					    (485, 2143))
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(485, 2143)
-					label      	(object SegLabel @1438
-					    Parent_View 	@1436
-					    location   	(531, 2100)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.931715
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$310" @1439
-				location   	(1122, 2241)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8DC0052"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$311" @1440
-					Parent_View 	@1439
-					location   	(866, -479)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03B9"
-					client     	@1439
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "effectiveLengthFacet" @1441
-					Parent_View 	@1439
-					location   	(866, -479)
-					label      	(object SegLabel @1442
-					    Parent_View 	@1441
-					    location   	(800, 2279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+effectiveLengthFacet"
-					    pctDist    	0.491731
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03C3"
-					client     	@1439
-					supplier   	@1326
-					vertices   	(list Points
-					    (1122, 2241)
-					    (1122, 2318)
-					    (387, 2318))
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(387, 2318)
-					label      	(object SegLabel @1443
-					    Parent_View 	@1441
-					    location   	(470, 2279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898567
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$258" @1444
-				location   	(773, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B085025B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$259" @1445
-					Parent_View 	@1444
-					location   	(469, 13)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0860270"
-					client     	@1444
-					supplier   	@1333
-					vertices   	(list Points
-					    (773, 1565)
-					    (959, 1565)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "minFacet" @1446
-					Parent_View 	@1444
-					location   	(469, 13)
-					label      	(object SegLabel @1447
-					    Parent_View 	@1446
-					    location   	(753, 1532)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+minFacet"
-					    pctDist    	0.063091
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B086027A"
-					client     	@1444
-					supplier   	@1327
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(451, 1565)
-					label      	(object SegLabel @1448
-					    Parent_View 	@1446
-					    location   	(534, 1523)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.746667
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$312" @1449
-				location   	(816, 1650)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B97001DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$313" @1450
-					Parent_View 	@1449
-					location   	(496, -334)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100CF"
-					client     	@1449
-					supplier   	@1333
-					vertices   	(list Points
-					    (816, 1650)
-					    (959, 1650)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "effectiveMinFacet" @1451
-					Parent_View 	@1449
-					location   	(496, -334)
-					label      	(object SegLabel @1452
-					    Parent_View 	@1451
-					    location   	(764, 1614)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+effectiveMinFacet"
-					    pctDist    	0.141618
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100D9"
-					client     	@1449
-					supplier   	@1327
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(451, 1650)
-					label      	(object SegLabel @1453
-					    Parent_View 	@1451
-					    location   	(523, 1606)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.802740
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$282" @1454
-				location   	(1297, 2321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CF0199"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$283" @1455
-					Parent_View 	@1454
-					location   	(-719, 497)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D20085"
-					client     	@1454
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "maxLengthFacet" @1456
-					Parent_View 	@1454
-					location   	(-719, 497)
-					label      	(object SegLabel @1457
-					    Parent_View 	@1456
-					    location   	(1630, 2380)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+maxLengthFacet"
-					    pctDist    	0.472255
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D2008F"
-					client     	@1454
-					supplier   	@1328
-					vertices   	(list Points
-					    (1297, 2321)
-					    (1297, 2409)
-					    (2102, 2409))
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(2102, 2409)
-					label      	(object SegLabel @1458
-					    Parent_View 	@1456
-					    location   	(1994, 2366)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.879208
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$284" @1459
-				location   	(1159, 2273)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D500C5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$285" @1460
-					Parent_View 	@1459
-					location   	(-281, 449)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D6001D"
-					client     	@1459
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(1159, 1428))
-				    (object RoleView "minLengthFacet" @1461
-					Parent_View 	@1459
-					location   	(-281, 449)
-					label      	(object SegLabel @1462
-					    Parent_View 	@1461
-					    location   	(857, 2372)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+minLengthFacet"
-					    pctDist    	0.519527
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D60027"
-					client     	@1459
-					supplier   	@1329
-					vertices   	(list Points
-					    (1159, 2273)
-					    (1159, 2409)
-					    (450, 2409))
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(450, 2409)
-					label      	(object SegLabel @1463
-					    Parent_View 	@1461
-					    location   	(523, 2369)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913610
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$308" @1464
-				location   	(1197, 2334)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B898016D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$309" @1465
-					Parent_View 	@1464
-					location   	(941, -610)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990056"
-					client     	@1464
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(1197, 1428))
-				    (object RoleView "effectiveMinLengthFacet" @1466
-					Parent_View 	@1464
-					location   	(941, -610)
-					label      	(object SegLabel @1467
-					    Parent_View 	@1466
-					    location   	(856, 2454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveMinLengthFacet"
-					    pctDist    	0.552604
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990060"
-					client     	@1464
-					supplier   	@1329
-					vertices   	(list Points
-					    (1197, 2334)
-					    (1197, 2493)
-					    (450, 2493))
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(450, 2493)
-					label      	(object SegLabel @1468
-					    Parent_View 	@1466
-					    location   	(527, 2451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.916047
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$306" @1469
-				location   	(1231, 2438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8400062"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$307" @1470
-					Parent_View 	@1469
-					location   	(863, -746)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B841001D"
-					client     	@1469
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "effectiveTotalDigitsFacet" @1471
-					Parent_View 	@1469
-					location   	(863, -746)
-					label      	(object SegLabel @1472
-					    Parent_View 	@1471
-					    location   	(859, 2632)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveTotalDigitsFacet"
-					    pctDist    	0.597030
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8410027"
-					client     	@1469
-					supplier   	@1330
-					vertices   	(list Points
-					    (1231, 2438)
-					    (1231, 2668)
-					    (451, 2668))
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(451, 2668)
-					label      	(object SegLabel @1473
-					    Parent_View 	@1471
-					    location   	(534, 2631)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.918812
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$286" @1474
-				location   	(1231, 2397)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D800DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$287" @1475
-					Parent_View 	@1474
-					location   	(-209, 253)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803CD"
-					client     	@1474
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "totalDigitsFacet" @1476
-					Parent_View 	@1474
-					location   	(-209, 253)
-					label      	(object SegLabel @1477
-					    Parent_View 	@1476
-					    location   	(853, 2550)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+totalDigitsFacet"
-					    pctDist    	0.585567
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803D7"
-					client     	@1474
-					supplier   	@1330
-					vertices   	(list Points
-					    (1231, 2397)
-					    (1231, 2587)
-					    (451, 2587))
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(451, 2587)
-					label      	(object SegLabel @1478
-					    Parent_View 	@1476
-					    location   	(535, 2560)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.914647
-					    height     	28
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1479
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 768)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1479
-				    location   	(1019, 576)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	444
-				height     	413
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1480
-				location   	(1209, 1065)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1479
-				vertices   	(list Points
-				    (1209, 1065)
-				    (1209, 974)))
-			    (object AssociationViewNew "$UNNAMED$242" @1481
-				location   	(1090, 1031)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2880F503D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1482
-					Parent_View 	@1481
-					location   	(322, -25)
-					label      	(object SegLabel @1483
-					    Parent_View 	@1482
-					    location   	(897, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	-0.098765
-					    height     	194
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F9003C"
-					client     	@1481
-					supplier   	@1479
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 974)
-					label      	(object SegLabel @1484
-					    Parent_View 	@1482
-					    location   	(1121, 1034)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.061728
-					    height     	31
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$243" @1485
-					Parent_View 	@1481
-					location   	(322, -25)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F90046"
-					client     	@1481
-					supplier   	@1331
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 1088))))
-			    (object AssociationViewNew "$UNNAMED$248" @1486
-				location   	(1538, 873)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A6DB01E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootType" @1487
-					Parent_View 	@1486
-					location   	(178, 105)
-					label      	(object SegLabel @1488
-					    Parent_View 	@1487
-					    location   	(1558, 792)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+rootType"
-					    pctDist    	-1.760870
-					    height     	20
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DD"
-					client     	@1486
-					supplier   	@1479
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 919)
-					    (1454, 919))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 919)
-					label      	(object SegLabel @1489
-					    Parent_View 	@1487
-					    location   	(1509, 875)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.016667
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$249" @1490
-					Parent_View 	@1486
-					location   	(178, 105)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DE"
-					client     	@1486
-					supplier   	@1479
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 828)
-					    (1454, 828))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 828))))
-			    (object AssociationViewNew "$UNNAMED$250" @1491
-				location   	(1535, 684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7120108"
-				roleview_list 	(list RoleViews
-				    (object RoleView "baseType" @1492
-					Parent_View 	@1491
-					location   	(175, -84)
-					label      	(object SegLabel @1493
-					    Parent_View 	@1492
-					    location   	(1559, 597)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+baseType"
-					    pctDist    	-1.977273
-					    height     	24
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7140151"
-					client     	@1491
-					supplier   	@1479
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 728)
-					    (1454, 728))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 728)
-					label      	(object SegLabel @1494
-					    Parent_View 	@1492
-					    location   	(1506, 683)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.027778
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$251" @1495
-					Parent_View 	@1491
-					location   	(175, -84)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A714015B"
-					client     	@1491
-					supplier   	@1479
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 641)
-					    (1454, 641))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 641))))
-			    (object AssociationViewNew "$UNNAMED$254" @1496
-				location   	(613, 940)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7ED03C0"
-				roleview_list 	(list RoleViews
-				    (object RoleView "complexType" @1497
-					Parent_View 	@1496
-					location   	(-747, 172)
-					label      	(object SegLabel @1498
-					    Parent_View 	@1497
-					    location   	(465, 983)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+complexType"
-					    pctDist    	0.373057
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40117"
-					client     	@1496
-					supplier   	@1332
-					vertices   	(list Points
-					    (613, 940)
-					    (284, 940)
-					    (284, 1008))
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(284, 1008)
-					label      	(object SegLabel @1499
-					    Parent_View 	@1497
-					    location   	(224, 972)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.909320
-					    height     	61
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$255" @1500
-					Parent_View 	@1496
-					location   	(-747, 172)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40121"
-					client     	@1496
-					supplier   	@1479
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(1010, 940))))
-			    (object InheritView "" @1501
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@1479
-				supplier   	@1309
-				line_style 	3
-				origin_attachment 	(1112, 562)
-				terminal_attachment 	(1112, 510)
-				drawSupplier 	@1310)
-			    (object InheritView "" @1502
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1331
-				supplier   	@1479
-				line_style 	3
-				origin_attachment 	(1146, 1088)
-				terminal_attachment 	(1146, 1065)
-				drawSupplier 	@1480)
-			    (object AssociationViewNew "$UNNAMED$252" @1503
-				location   	(1362, 1133)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A74B0178"
-				roleview_list 	(list RoleViews
-				    (object RoleView "simpleType" @1504
-					Parent_View 	@1503
-					location   	(-158, -163)
-					label      	(object SegLabel @1505
-					    Parent_View 	@1504
-					    location   	(1499, 1094)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+simpleType"
-					    pctDist    	-0.246753
-					    height     	137
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D017B"
-					client     	@1503
-					supplier   	@1333
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 1292)
-					label      	(object SegLabel @1506
-					    Parent_View 	@1504
-					    location   	(1321, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.227273
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$253" @1507
-					Parent_View 	@1503
-					location   	(-158, -163)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D0185"
-					client     	@1503
-					supplier   	@1479
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 974))))
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @1508
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1508
-				    location   	(2002, 305)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@1508
-				    location   	(2002, 371)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	508
-				    compartmentItems 	(list Compartment
-					"+ global : boolean"
-					"+ featureReference : boolean"))
-				width      	558
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1509
-				location   	(2262, 568)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1508
-				vertices   	(list Points
-				    (2262, 568)
-				    (2262, 477)))
-			    (object InheritView "" @1510
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@1305
-				supplier   	@1508
-				line_style 	3
-				origin_attachment 	(2346, 595)
-				terminal_attachment 	(2346, 568)
-				drawSupplier 	@1509)
-			    (object AssociationViewNew "$UNNAMED$246" @1511
-				location   	(1553, 453)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A0F201A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "type" @1512
-					Parent_View 	@1511
-					location   	(801, 293)
-					label      	(object SegLabel @1513
-					    Parent_View 	@1512
-					    location   	(1331, 499)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+type"
-					    pctDist    	0.506266
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302E5"
-					client     	@1511
-					supplier   	@1479
-					vertices   	(list Points
-					    (1553, 453)
-					    (1222, 453)
-					    (1222, 562))
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1222, 562)
-					label      	(object SegLabel @1514
-					    Parent_View 	@1512
-					    location   	(1185, 479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.812030
-					    height     	38
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$247" @1515
-					Parent_View 	@1511
-					location   	(801, 293)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302F0"
-					client     	@1511
-					supplier   	@1508
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1993, 453))))
-			    (object AssociationViewNew "$UNNAMED$138" @1516
-				location   	(1908, 353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C29010602D7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedFeature" @1517
-					Parent_View 	@1516
-					location   	(-268, -159)
-					label      	(object SegLabel @1518
-					    Parent_View 	@1517
-					    location   	(1729, 352)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+resolvedFeature"
-					    pctDist    	-0.029412
-					    height     	180
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B000E"
-					client     	@1516
-					supplier   	@1508
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 387)
-					    (1993, 387))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 387)
-					label      	(object SegLabel @1519
-					    Parent_View 	@1517
-					    location   	(1945, 354)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.596639
-					    height     	34
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$139" @1520
-					Parent_View 	@1516
-					location   	(-268, -159)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B0018"
-					client     	@1516
-					supplier   	@1508
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 319)
-					    (1993, 319))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 319))))
-			    (object InheritView "" @1521
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@1309
-				supplier   	@1308
-				vertices   	(list Points
-				    (494, 284)
-				    (494, 244)
-				    (996, 244))
-				line_style 	3
-				origin_attachment 	(494, 284)
-				terminal_attachment 	(996, 244))
-			    (object InheritView "" @1522
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@1296
-				supplier   	@1508
-				line_style 	3
-				origin_attachment 	(1718, 812)
-				terminal_attachment 	(1718, 568)
-				drawSupplier 	@1509)
-			    (object InheritView "" @1523
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1333
-				supplier   	@1479
-				line_style 	3
-				origin_attachment 	(1265, 1292)
-				terminal_attachment 	(1265, 1065)
-				drawSupplier 	@1480)
-			    (object InheritView "" @1524
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@1508
-				supplier   	@1308
-				vertices   	(list Points
-				    (2147, 291)
-				    (2147, 244)
-				    (1468, 244))
-				line_style 	3
-				origin_attachment 	(2147, 291)
-				terminal_attachment 	(1468, 244)))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"39E27F080076"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::wsdl" @1525
-			location   	(272, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@1525
-			    location   	(128, 172)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsdl")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3ADFB8E5021E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::soap" @1526
-			location   	(704, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@1526
-			    location   	(560, 172)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"soap")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3A01CF0C01A2"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::xsd" @1527
-			location   	(1152, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@1527
-			    location   	(1008, 172)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"xsd")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39ABDC6F01AA"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"39E27F080065"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"39E27F080077"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"39E27F080066"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"39E27F080068"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.soap/src/rose/soapbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.soap/src/rose/soapbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"IBM"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Repository"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.soap/src/rose/soapbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.binding.soap/src/rose/soapbindingMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	"0")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"None"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"R2Editor"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"39E27F080067"))

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java
deleted file mode 100644
index f7efead..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Address</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPAddress#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPAddress()
- * @model 
- * @generated
- */
-public interface SOAPAddress extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPAddress {
-
-
-} // SOAPAddress

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java
deleted file mode 100644
index 6c5414d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getTransportURI <em>Transport URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPBinding()
- * @model 
- * @generated
- */
-public interface SOAPBinding extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPBinding {
-} // SOAPBinding

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java
deleted file mode 100644
index cb416ba..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Body</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getEncodingStyles <em>Encoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getParts <em>Parts</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPBody()
- * @model 
- * @generated
- */
-public interface SOAPBody extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPBody {
-} // SOAPBody

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java
deleted file mode 100644
index 3177e3d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- 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 -->
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage
- * @generated
- */
-public interface SOAPFactory extends EFactory{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	SOAPFactory eINSTANCE = new org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFactoryImpl();
-
-  /**
-   * Returns a new object of class '<em>Binding</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding</em>'.
-   * @generated
-   */
-	SOAPBinding createSOAPBinding();
-
-  /**
-   * Returns a new object of class '<em>Body</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Body</em>'.
-   * @generated
-   */
-	SOAPBody createSOAPBody();
-
-  /**
-   * Returns a new object of class '<em>Header Base</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Header Base</em>'.
-   * @generated
-   */
-	SOAPHeaderBase createSOAPHeaderBase();
-
-  /**
-   * Returns a new object of class '<em>Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Fault</em>'.
-   * @generated
-   */
-	SOAPFault createSOAPFault();
-
-  /**
-   * Returns a new object of class '<em>Operation</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Operation</em>'.
-   * @generated
-   */
-	SOAPOperation createSOAPOperation();
-
-  /**
-   * Returns a new object of class '<em>Address</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Address</em>'.
-   * @generated
-   */
-	SOAPAddress createSOAPAddress();
-
-  /**
-   * Returns a new object of class '<em>Header Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Header Fault</em>'.
-   * @generated
-   */
-	SOAPHeaderFault createSOAPHeaderFault();
-
-  /**
-   * Returns a new object of class '<em>Header</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Header</em>'.
-   * @generated
-   */
-	SOAPHeader createSOAPHeader();
-
-  /*
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated NOT
-   */
-	//SOAPPackage getSOAPPackage();
-
-} //SOAPFactory

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java
deleted file mode 100644
index 8d56bf1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Fault</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getEncodingStyles <em>Encoding Styles</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPFault()
- * @model 
- * @generated
- */
-public interface SOAPFault extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPFault {
-
-} // SOAPFault

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java
deleted file mode 100644
index ff9312d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Header</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeader#getHeaderFaults <em>Header Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeader()
- * @model 
- * @generated
- */
-public interface SOAPHeader extends SOAPHeaderBase {
-  /**
-   * Returns the value of the '<em><b>Header Faults</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Header Faults</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Header Faults</em>' containment reference list.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeader_HeaderFaults()
-   * @model type="org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault" containment="true"
-   * @generated
-   */
-	EList getHeaderFaults();
-
-} // SOAPHeader

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java
deleted file mode 100644
index debb9e5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Header Base</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getEncodingStyles <em>Encoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart <em>Part</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase()
- * @model 
- * @generated
- */
-public interface SOAPHeaderBase extends ExtensibilityElement{
-  /**
-   * Returns the value of the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Use</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Use</em>' attribute.
-   * @see #setUse(String)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_Use()
-   * @model 
-   * @generated
-   */
-	String getUse();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getUse <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Use</em>' attribute.
-   * @see #getUse()
-   * @generated
-   */
-	void setUse(String value);
-
-  /**
-   * Returns the value of the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Namespace URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Namespace URI</em>' attribute.
-   * @see #setNamespaceURI(String)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_NamespaceURI()
-   * @model 
-   * @generated
-   */
-	String getNamespaceURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getNamespaceURI <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Namespace URI</em>' attribute.
-   * @see #getNamespaceURI()
-   * @generated
-   */
-	void setNamespaceURI(String value);
-
-  /**
-   * Returns the value of the '<em><b>Encoding Styles</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Encoding Styles</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Encoding Styles</em>' attribute list.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_EncodingStyles()
-   * @model type="java.lang.String" dataType="org.eclipse.wst.wsdl.binding.soap.IString"
-   * @generated
-   */
-	EList getEncodingStyles();
-
-  /**
-   * Returns the value of the '<em><b>Message</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Message</em>' reference.
-   * @see #setMessage(Message)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_Message()
-   * @model required="true"
-   * @generated
-   */
-	Message getMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage <em>Message</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Message</em>' reference.
-   * @see #getMessage()
-   * @generated
-   */
-	void setMessage(Message value);
-
-  /**
-   * Returns the value of the '<em><b>Part</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Part</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Part</em>' reference.
-   * @see #setPart(Part)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_Part()
-   * @model required="true"
-   * @generated
-   */
-	Part getPart();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart <em>Part</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Part</em>' reference.
-   * @see #getPart()
-   * @generated
-   */
-	void setPart(Part value);
-
-} // SOAPHeaderBase

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java
deleted file mode 100644
index 2d48851..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Header Fault</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.wst.wsdl.bindings.soap.SOAPPackage#getSOAPHeaderFault()
- * @model 
- * @generated
- */
-public interface SOAPHeaderFault extends SOAPHeaderBase {
-} // SOAPHeaderFault

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java
deleted file mode 100644
index be38dd3..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getSoapActionURI <em>Soap Action URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPOperation()
- * @model 
- * @generated
- */
-public interface SOAPOperation extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPOperation {
-} // SOAPOperation

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java
deleted file mode 100644
index 20fae55..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java
+++ /dev/null

@@ -1,1068 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-/**
- * <!-- 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.eclipse.wst.wsdl.binding.soap.SOAPFactory
- * @generated
- */
-public interface SOAPPackage extends EPackage{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	String eNAME = "soap";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	String eNS_URI = "http://www.ibm.com/wsdl/2003/SOAP";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	String eNS_PREFIX = "soap";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	SOAPPackage eINSTANCE = org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBindingImpl <em>Binding</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBindingImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPBinding()
-   * @generated
-   */
-	int SOAP_BINDING = 0;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Transport URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__TRANSPORT_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Style</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING__STYLE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Binding</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BINDING_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl <em>Body</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPBody()
-   * @generated
-   */
-	int SOAP_BODY = 1;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__USE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__NAMESPACE_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Encoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__ENCODING_STYLES = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Parts</b></em>' reference list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY__PARTS = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of the the '<em>Body</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_BODY_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl <em>Header Base</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPHeaderBase()
-   * @generated
-   */
-	int SOAP_HEADER_BASE = 2;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__USE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__NAMESPACE_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Encoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__ENCODING_STYLES = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Message</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__MESSAGE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Part</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE__PART = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Header Base</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_BASE_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl <em>Fault</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPFault()
-   * @generated
-   */
-	int SOAP_FAULT = 3;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__USE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__NAMESPACE_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Encoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT__ENCODING_STYLES = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the the '<em>Fault</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_FAULT_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPOperationImpl <em>Operation</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPOperationImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPOperation()
-   * @generated
-   */
-	int SOAP_OPERATION = 4;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Soap Action URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__SOAP_ACTION_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Style</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION__STYLE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Operation</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_OPERATION_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPAddressImpl <em>Address</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPAddressImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPAddress()
-   * @generated
-   */
-	int SOAP_ADDRESS = 5;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS__DOCUMENTATION_ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS__ELEMENT = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS__REQUIRED = WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS__ELEMENT_TYPE = WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Location URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS__LOCATION_URI = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the the '<em>Address</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_ADDRESS_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderFaultImpl <em>Header Fault</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderFaultImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPHeaderFault()
-   * @generated
-   */
-	int SOAP_HEADER_FAULT = 6;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__DOCUMENTATION_ELEMENT = SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__ELEMENT = SOAP_HEADER_BASE__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__REQUIRED = SOAP_HEADER_BASE__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__ELEMENT_TYPE = SOAP_HEADER_BASE__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__USE = SOAP_HEADER_BASE__USE;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__NAMESPACE_URI = SOAP_HEADER_BASE__NAMESPACE_URI;
-
-  /**
-   * The feature id for the '<em><b>Encoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__ENCODING_STYLES = SOAP_HEADER_BASE__ENCODING_STYLES;
-
-  /**
-   * The feature id for the '<em><b>Message</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__MESSAGE = SOAP_HEADER_BASE__MESSAGE;
-
-  /**
-   * The feature id for the '<em><b>Part</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT__PART = SOAP_HEADER_BASE__PART;
-
-  /**
-   * The number of structural features of the the '<em>Header Fault</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FAULT_FEATURE_COUNT = SOAP_HEADER_BASE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderImpl <em>Header</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderImpl
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getSOAPHeader()
-   * @generated
-   */
-	int SOAP_HEADER = 7;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__DOCUMENTATION_ELEMENT = SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__ELEMENT = SOAP_HEADER_BASE__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__REQUIRED = SOAP_HEADER_BASE__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__ELEMENT_TYPE = SOAP_HEADER_BASE__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Use</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__USE = SOAP_HEADER_BASE__USE;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__NAMESPACE_URI = SOAP_HEADER_BASE__NAMESPACE_URI;
-
-  /**
-   * The feature id for the '<em><b>Encoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__ENCODING_STYLES = SOAP_HEADER_BASE__ENCODING_STYLES;
-
-  /**
-   * The feature id for the '<em><b>Message</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__MESSAGE = SOAP_HEADER_BASE__MESSAGE;
-
-  /**
-   * The feature id for the '<em><b>Part</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__PART = SOAP_HEADER_BASE__PART;
-
-  /**
-   * The feature id for the '<em><b>Header Faults</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER__HEADER_FAULTS = SOAP_HEADER_BASE_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the the '<em>Header</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int SOAP_HEADER_FEATURE_COUNT = SOAP_HEADER_BASE_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '<em>IString</em>' data type.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see java.lang.String
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getIString()
-   * @generated
-   */
-	int ISTRING = 8;
-
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding <em>Binding</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBinding
-   * @generated
-   */
-	EClass getSOAPBinding();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getTransportURI <em>Transport URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Transport URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getTransportURI()
-   * @see #getSOAPBinding()
-   * @generated
-   */
-	EAttribute getSOAPBinding_TransportURI();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getStyle <em>Style</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Style</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getStyle()
-   * @see #getSOAPBinding()
-   * @generated
-   */
-	EAttribute getSOAPBinding_Style();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody <em>Body</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Body</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody
-   * @generated
-   */
-	EClass getSOAPBody();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getUse <em>Use</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Use</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody#getUse()
-   * @see #getSOAPBody()
-   * @generated
-   */
-	EAttribute getSOAPBody_Use();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getNamespaceURI <em>Namespace URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Namespace URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody#getNamespaceURI()
-   * @see #getSOAPBody()
-   * @generated
-   */
-	EAttribute getSOAPBody_NamespaceURI();
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getEncodingStyles <em>Encoding Styles</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>Encoding Styles</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody#getEncodingStyles()
-   * @see #getSOAPBody()
-   * @generated
-   */
-	EAttribute getSOAPBody_EncodingStyles();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getParts <em>Parts</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>Parts</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody#getParts()
-   * @see #getSOAPBody()
-   * @generated
-   */
-	EReference getSOAPBody_Parts();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase <em>Header Base</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Header Base</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase
-   * @generated
-   */
-	EClass getSOAPHeaderBase();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getUse <em>Use</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Use</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getUse()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-	EAttribute getSOAPHeaderBase_Use();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getNamespaceURI <em>Namespace URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Namespace URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getNamespaceURI()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-	EAttribute getSOAPHeaderBase_NamespaceURI();
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getEncodingStyles <em>Encoding Styles</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>Encoding Styles</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getEncodingStyles()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-	EAttribute getSOAPHeaderBase_EncodingStyles();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage <em>Message</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Message</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-	EReference getSOAPHeaderBase_Message();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart <em>Part</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Part</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-	EReference getSOAPHeaderBase_Part();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault <em>Fault</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Fault</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault
-   * @generated
-   */
-	EClass getSOAPFault();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getUse <em>Use</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Use</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault#getUse()
-   * @see #getSOAPFault()
-   * @generated
-   */
-	EAttribute getSOAPFault_Use();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getNamespaceURI <em>Namespace URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Namespace URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault#getNamespaceURI()
-   * @see #getSOAPFault()
-   * @generated
-   */
-	EAttribute getSOAPFault_NamespaceURI();
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#getEncodingStyles <em>Encoding Styles</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>Encoding Styles</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault#getEncodingStyles()
-   * @see #getSOAPFault()
-   * @generated
-   */
-	EAttribute getSOAPFault_EncodingStyles();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation <em>Operation</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Operation</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPOperation
-   * @generated
-   */
-	EClass getSOAPOperation();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getSoapActionURI <em>Soap Action URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Soap Action URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getSoapActionURI()
-   * @see #getSOAPOperation()
-   * @generated
-   */
-	EAttribute getSOAPOperation_SoapActionURI();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getStyle <em>Style</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Style</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getStyle()
-   * @see #getSOAPOperation()
-   * @generated
-   */
-	EAttribute getSOAPOperation_Style();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPAddress <em>Address</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Address</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPAddress
-   * @generated
-   */
-	EClass getSOAPAddress();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPAddress#getLocationURI <em>Location URI</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Location URI</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPAddress#getLocationURI()
-   * @see #getSOAPAddress()
-   * @generated
-   */
-	EAttribute getSOAPAddress_LocationURI();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault <em>Header Fault</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Header Fault</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault
-   * @generated
-   */
-	EClass getSOAPHeaderFault();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeader <em>Header</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Header</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeader
-   * @generated
-   */
-	EClass getSOAPHeader();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeader#getHeaderFaults <em>Header Faults</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Header Faults</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeader#getHeaderFaults()
-   * @see #getSOAPHeader()
-   * @generated
-   */
-	EReference getSOAPHeader_HeaderFaults();
-
-  /**
-   * Returns the meta object for data type '{@link java.lang.String <em>IString</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>IString</em>'.
-   * @see java.lang.String
-   * @model instanceClass="java.lang.String"
-   * @generated
-   */
-	EDataType getIString();
-
-  /**
-   * 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
-   */
-	SOAPFactory getSOAPFactory();
-
-} //SOAPPackage

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java
deleted file mode 100644
index 2f0287d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java
+++ /dev/null

@@ -1,366 +0,0 @@
-package org.eclipse.wst.wsdl.binding.soap.internal.generator;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-
-public class SOAPContentGenerator implements ContentGenerator
-{	
-	public static final int OPTION_NOT_SET = -1;
-	
-	public static final int STYLE_DOCUMENT = 1;
-	public static final int STYLE_RPC = 2;
-	
-	public static final int USE_LITERAL = 1;
-	public static final int USE_ENCODED = 2;
-	
-	private int styleOption = OPTION_NOT_SET;
-	private int useOption = OPTION_NOT_SET;
-
-  protected String namespaceValue = "";
-  protected String addressLocation = ContentGenerator.ADDRESS_LOCATION;
-
-  protected final static String[] requiredNamespaces = {"http://schemas.xmlsoap.org/wsdl/soap/"};
-  protected final static String[] preferredNamespacePrefixes = {"soap"};
-  
-     
-  public String[] getRequiredNamespaces()
-  {
-    return requiredNamespaces;
-  }
-  
-  public String getPreferredNamespacePrefix(String namespace)
-  {
-	  if (namespace.equals("http://schemas.xmlsoap.org/wsdl/soap/")) {
-		  return "soap";
-	  }
-	  
-	  return "";
-  }
-  
-  public void setStyle(int style) {
-	  styleOption = style;
-  }
-  
-  public void setUse(int use) {
-	  useOption = use;
-  }
-  
-  public void setAddressLocation(String addressLocation) {
-	  this.addressLocation = addressLocation;
-  }
-
-  public void generatePortContent(Port port)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(port.getEExtensibilityElements());	  
-	  removeExtensebilityElements(port.getEExtensibilityElements(), removeList);
-
-	  SOAPAddress soapAddress= SOAPFactory.eINSTANCE.createSOAPAddress();
-	  soapAddress.setLocationURI(addressLocation);
-	  port.addExtensibilityElement(soapAddress);
-  }  
-
-  public void generateBindingContent(Binding binding, PortType portType)
-  {	  
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(binding.getEExtensibilityElements());	  
-	  removeExtensebilityElements(binding.getEExtensibilityElements(), removeList);
-	
-	SOAPFactory soapFactory = SOAPFactory.eINSTANCE;
-	SOAPBinding soapBinding = soapFactory.createSOAPBinding();
-	soapBinding.setStyle((getStyleOption(binding) == STYLE_DOCUMENT) ? "document" : "rpc");
-	soapBinding.setTransportURI("http://schemas.xmlsoap.org/soap/http");
-	
-	binding.addExtensibilityElement(soapBinding);	
-  }
-
-  public void generateBindingOperationContent(BindingOperation bindingOperation, Operation operation)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingOperation.getEExtensibilityElements());
-	removeExtensebilityElements(bindingOperation.getEExtensibilityElements(), removeList);
-	
-	SOAPOperation soapOperation = SOAPFactory.eINSTANCE.createSOAPOperation();	
-	
-    String soapActionValue = getNamespace(bindingOperation);
-    if (!soapActionValue.endsWith("/"))
-    {                
-      soapActionValue += "/";
-    }                        
-    soapActionValue += operation.getName();
-	
-	soapOperation.setSoapActionURI(soapActionValue);
-	
-	bindingOperation.addExtensibilityElement(soapOperation);	
-  }  
-
-  public void generateBindingInputContent(BindingInput bindingInput, Input input)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingInput.getEExtensibilityElements());
-	removeExtensebilityElements(bindingInput.getEExtensibilityElements(), removeList);
-	
-	SOAPFactory soapFactory = SOAPFactory.eINSTANCE;
-	SOAPBody soapBody = soapFactory.createSOAPBody();
-	soapBody.setUse((getUseOption(null) == USE_ENCODED) ? "encoded" : "literal");
-	if (getUseOption(bindingInput) == USE_ENCODED && getStyleOption(bindingInput) == STYLE_RPC)
-    {
-		List encodingList = new BasicEList();
-		encodingList.add("http://schemas.xmlsoap.org/soap/encoding/");
-		soapBody.setEncodingStyles(encodingList);
-	  	soapBody.setNamespaceURI(getNamespace(bindingInput));
-    }
-    else if (getUseOption(bindingInput) == USE_LITERAL && getStyleOption(bindingInput) == STYLE_RPC) {
-	  	soapBody.setNamespaceURI(getNamespace(bindingInput));
-    }
-	
-	bindingInput.addExtensibilityElement(soapBody);
-  }
-
-  public void generateBindingOutputContent(BindingOutput bindingOutput, Output output)
-  {
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingOutput.getEExtensibilityElements());
-	removeExtensebilityElements(bindingOutput.getEExtensibilityElements(), removeList);
-	
-	SOAPFactory soapFactory = SOAPFactory.eINSTANCE;
-	SOAPBody soapBody = soapFactory.createSOAPBody();
-	soapBody.setUse((getUseOption(bindingOutput) == USE_ENCODED) ? "encoded" : "literal");
-	if (getUseOption(bindingOutput) == USE_ENCODED && getStyleOption(bindingOutput) == STYLE_RPC)
-    {
-		List encodingList = new BasicEList();
-		encodingList.add("http://schemas.xmlsoap.org/soap/encoding/");
-		soapBody.setEncodingStyles(encodingList);
-	  	soapBody.setNamespaceURI(getNamespace(bindingOutput));
-    }
-    else if (getUseOption(bindingOutput) == USE_LITERAL && getStyleOption(bindingOutput) == STYLE_RPC) {
-	  	soapBody.setNamespaceURI(getNamespace(bindingOutput));
-    }
-	
-	bindingOutput.addExtensibilityElement(soapBody);	
-  }         
-
-  public void generateBindingFaultContent(BindingFault bindingFault, Fault fault)
-  {                            
-	  // We blow away any existing ExtensibilityElements/content before we generate it
-	  // Is it worth being smarter?  Look for matching content first and create those which aren't found????
-	  List removeList = new ArrayList(bindingFault.getEExtensibilityElements());
-	removeExtensebilityElements(bindingFault.getEExtensibilityElements(), removeList);
-	
-	SOAPFactory soapFactory = SOAPFactory.eINSTANCE;
-	SOAPFault soapFault = soapFactory.createSOAPFault();
-	soapFault.setUse((getUseOption(bindingFault) == USE_ENCODED) ? "encoded" : "literal");
-	soapFault.setName(fault.getName());
-	soapFault.setNamespaceURI(getNamespace(bindingFault));
-
-	if (getUseOption(bindingFault) == USE_ENCODED && getStyleOption(bindingFault) == STYLE_RPC)
-    {
-		List encodingList = new BasicEList();
-		encodingList.add("http://schemas.xmlsoap.org/soap/encoding/");
-		soapFault.setEncodingStyles(encodingList);
-    }
-	
-	bindingFault.addExtensibilityElement(soapFault);
-  }
-  
-  private String getNamespace(WSDLElement wsdlElement) {
-	  if (namespaceValue.equals("") && wsdlElement != null) {
-		  namespaceValue = wsdlElement.getEnclosingDefinition().getTargetNamespace();
-	  }
-	  if (namespaceValue == null) {
-		  namespaceValue = "";
-	  }
-	  
-	  return namespaceValue;
-  }
-  
-  private void removeExtensebilityElements(List originalList, List removeList) {
-	  Iterator removeIt = removeList.iterator();
-	  while (removeIt.hasNext()) {
-		  originalList.remove(removeIt.next());
-	  }
-  }
-  
-  private Binding getBindingObject(Object genericBindingObject) {
-	  Object parent = genericBindingObject;
-	  
-	  int index = 0;
-	  while (parent != null && index < 5) {
-		  parent = getGenericBindingObjectParent(parent);
-		  if (parent instanceof Binding) {
-			  break;
-		  }
-		  index++;
-	  }
-
-	  return (parent instanceof Binding)? (Binding) parent : null;
-  }
-  
-  private Object getGenericBindingObjectParent(Object genericBindingObject) {
-	  Object parent = null;
-	  
-	  if (genericBindingObject != null) {
-		  if (genericBindingObject instanceof BindingOperation) {
-			  parent = ((BindingOperation) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingInput) {
-			  parent = ((BindingInput) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingOutput) {
-			  parent = ((BindingOutput) genericBindingObject).getContainer();
-		  }
-		  else if (genericBindingObject instanceof BindingFault) {
-			  parent = ((BindingFault) genericBindingObject).getContainer();
-		  }	  
-	  }
-	  
-	  return parent;	  
-  }
-  
-    private int getStyleOption(Object genericBindingObject) {
-	  if (styleOption == OPTION_NOT_SET && genericBindingObject != null) {
-		  // init() was never called, try to determine the 'style' based on what we have/know
-		  Binding binding = getBindingObject(genericBindingObject);
-		  
-		  // Try to determine the style from the Binding Object
-		  if (binding != null) {
-			  List list = binding.getEExtensibilityElements();
-			  Iterator valuesIt = getExtensibilityElementAttributeValue(list, "style").iterator();
-
-			  while (valuesIt.hasNext()) {
-				  String style = (String) valuesIt.next();
-				  
-				  if (style.equals("document")) {
-					  styleOption = STYLE_DOCUMENT;
-				  }
-				  else if (style.equals("rpc")) {
-					  styleOption = STYLE_RPC;  
-				  }
-				  
-				  if (styleOption != OPTION_NOT_SET) {
-					  break;
-				  }
-			  }
-		  }
-	  }
-	  
-	  if (styleOption == OPTION_NOT_SET) {
-		  styleOption = STYLE_DOCUMENT;
-	  }
-	  
-	  return styleOption;
-  }
-	
-	  private int getUseOption(Object genericBindingObject) {
-		  if (useOption == OPTION_NOT_SET) {
-			  // init() was never called, try to determine the 'use' based on what we have/know
-			  Iterator messageRefIt = getMessageReferenceBindingObjects(genericBindingObject).iterator();
-			  
-			  // Try to determine the use from the list of BindingInputs, BindingOutputs, and BindingFaults
-			  while (messageRefIt.hasNext()) {
-				  Object messageRef = messageRefIt.next();
-				  List values = new ArrayList();
-				  
-				  if (messageRef instanceof BindingInput) {
-					  List list = ((BindingInput) messageRef).getEExtensibilityElements();
-					  values = getExtensibilityElementAttributeValue(list, "use");
-				  }
-				  else if (messageRef instanceof BindingOutput) {
-					  List list = ((BindingOutput) messageRef).getEExtensibilityElements();
-					  values = getExtensibilityElementAttributeValue(list, "use");
-				  }
-				  else if (messageRef instanceof BindingFault) {
-					  List list = ((BindingFault) messageRef).getEExtensibilityElements();
-					  values = getExtensibilityElementAttributeValue(list, "use");				  
-				  }
-
-				  Iterator valuesIt = values.iterator();
-				  while (valuesIt.hasNext()) {
-					  String use = (String) valuesIt.next();
-					  
-					  if (use.equals("literal")) {
-						  useOption = USE_LITERAL;
-					  }
-					  else if (use.equals("encoded")) {
-						  useOption = USE_ENCODED;  
-					  }
-				  }
-				  
-				  if (useOption != OPTION_NOT_SET) {
-					  break;
-				  }
-			  }
-		  }
-
-		  if (useOption == OPTION_NOT_SET) {
-			  useOption = USE_LITERAL;
-		  }
-		  
-		  return useOption;
-	  }
-	  
-	  private List getMessageReferenceBindingObjects(Object genericBindingObject) {
-		  List list = new ArrayList();
-		  Binding binding = getBindingObject(genericBindingObject);
-		  
-		  if (binding != null) {
-			  Iterator operationsIt = binding.getEBindingOperations().iterator();
-		  
-			  while (operationsIt.hasNext()) {
-				  BindingOperation op = (BindingOperation) operationsIt.next();
-				  list.add(op.getEBindingInput());
-				  list.add(op.getEBindingOutput());
-				  list.addAll(op.getEBindingFaults());
-			  }	  
-		  }
-		  
-		  return list;
-	  }
-	
-	  private List getExtensibilityElementAttributeValue(List eeList, String attributeKey) {
-		  List values = new ArrayList();
-		  Iterator eeElementsIt = eeList.iterator();
-		  
-		  while (eeElementsIt.hasNext()) {
-			  ExtensibilityElement eeElement = (ExtensibilityElement) eeElementsIt.next();
-			  String attributeValue = eeElement.getElement().getAttribute(attributeKey);
-			  if (attributeValue != null && !attributeValue.equals("")) {
-				  values.add(attributeValue);
-			  }		  
-		  }
-		  
-		  return values;
-	  }
-	  
-	  public String getProtocol() {
-		  return "SOAP";
-	  }
-} 
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java
deleted file mode 100644
index 5149af8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java
+++ /dev/null

@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Address</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPAddressImpl#getLocationURI <em>Location URI</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPAddressImpl extends ExtensibilityElementImpl implements SOAPAddress {
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getLocationURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String LOCATION_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getLocationURI()
-   * @generated
-   * @ordered
-   */
-	protected String locationURI = LOCATION_URI_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPAddressImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPAddress();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getLocationURI()
-  {
-    return locationURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setLocationURI(String newLocationURI)
-  {
-    String oldLocationURI = locationURI;
-    locationURI = newLocationURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_ADDRESS__LOCATION_URI, oldLocationURI, locationURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_ADDRESS__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_ADDRESS__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-        return getLocationURI();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_ADDRESS__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-        setLocationURI((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_ADDRESS__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-        setLocationURI(LOCATION_URI_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_ADDRESS__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_ADDRESS__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_ADDRESS__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-        return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (locationURI: ");
-    result.append(locationURI);
-    result.append(')');
-    return result.toString();
-  }
-	
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setLocationURI
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.LOCATION_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPAddress_LocationURI())
-        niceSetAttribute(theElement,SOAPConstants.LOCATION_ATTRIBUTE,getLocationURI());
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.ADDRESS_ELEMENT_TAG);
-    return elementType;
-  } 
-} //SOAPAddressImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java
deleted file mode 100644
index 4159219..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java
+++ /dev/null

@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBindingImpl#getTransportURI <em>Transport URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBindingImpl#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPBindingImpl extends ExtensibilityElementImpl implements SOAPBinding {
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getTransportURI() <em>Transport URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getTransportURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String TRANSPORT_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getTransportURI() <em>Transport URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getTransportURI()
-   * @generated
-   * @ordered
-   */
-	protected String transportURI = TRANSPORT_URI_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-	protected static final String STYLE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-	protected String style = STYLE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPBindingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPBinding();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getTransportURI()
-  {
-    return transportURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setTransportURI(String newTransportURI)
-  {
-    String oldTransportURI = transportURI;
-    transportURI = newTransportURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_BINDING__TRANSPORT_URI, oldTransportURI, transportURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getStyle()
-  {
-    return style;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setStyle(String newStyle)
-  {
-    String oldStyle = style;
-    style = newStyle;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_BINDING__STYLE, oldStyle, style));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BINDING__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_BINDING__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_BINDING__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_BINDING__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-        return getTransportURI();
-      case SOAPPackage.SOAP_BINDING__STYLE:
-        return getStyle();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BINDING__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_BINDING__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_BINDING__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_BINDING__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-        setTransportURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_BINDING__STYLE:
-        setStyle((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BINDING__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BINDING__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BINDING__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BINDING__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-        setTransportURI(TRANSPORT_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BINDING__STYLE:
-        setStyle(STYLE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BINDING__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_BINDING__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_BINDING__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_BINDING__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-        return TRANSPORT_URI_EDEFAULT == null ? transportURI != null : !TRANSPORT_URI_EDEFAULT.equals(transportURI);
-      case SOAPPackage.SOAP_BINDING__STYLE:
-        return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (transportURI: ");
-    result.append(transportURI);
-    result.append(", style: ");
-    result.append(style);
-    result.append(')');
-    return result.toString();
-  }
-	
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setStyle
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.STYLE_ATTRIBUTE));
-    setTransportURI
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.TRANSPORT_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPBinding_Style())
-        niceSetAttribute(theElement,SOAPConstants.STYLE_ATTRIBUTE,getStyle());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPBinding_TransportURI())
-        niceSetAttribute(theElement,SOAPConstants.TRANSPORT_ATTRIBUTE,getTransportURI());
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.BINDING_ELEMENT_TAG);
-    return elementType;
-  }
-} //SOAPBindingImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java
deleted file mode 100644
index 35feb2f..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java
+++ /dev/null

@@ -1,497 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Body</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl#getEncodingStyles <em>Encoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl#getParts <em>Parts</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPBodyImpl extends ExtensibilityElementImpl implements SOAPBody {
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected static final String USE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected String use = USE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEncodingStyles() <em>Encoding Styles</em>}' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getEncodingStyles()
-   * @generated
-   * @ordered
-   */
-	protected EList encodingStyles = null;
-
-  /**
-   * The cached value of the '{@link #getParts() <em>Parts</em>}' reference list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getParts()
-   * @generated NOT
-   * @ordered
-   */
-	protected List parts = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPBodyImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPBody();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getUse()
-  {
-    return use;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setUse(String newUse)
-  {
-    String oldUse = use;
-    use = newUse;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_BODY__USE, oldUse, use));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setNamespaceURI(String newNamespaceURI)
-  {
-    String oldNamespaceURI = namespaceURI;
-    namespaceURI = newNamespaceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_BODY__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-  }
-
-public void setEncodingStyles(List list)
-{
-  encodingStyles = (EList)list;
-}
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public List getEncodingStyles()
-  {
-    if (encodingStyles == null)
-    {
-      encodingStyles = new EDataTypeUniqueEList(String.class, this, SOAPPackage.SOAP_BODY__ENCODING_STYLES);
-    }
-    return encodingStyles;
-  }
-
-  public void setParts(List list)
-  {
-    parts = list;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getParts()
-  {
-    if (parts == null)
-    {
-      parts = new EObjectResolvingEList(Part.class, this, SOAPPackage.SOAP_BODY__PARTS);
-    }
-    
-    if (parts.size() == 0)
-    {
-      List implicitParts = new java.util.Vector();
-      
-      // Try to find an implicit one.
-      if(eContainer() instanceof BindingInput)
-      {
-      	Message message = ((BindingInput)eContainer()).getEInput().getEMessage();
-      	if(message.getEParts().size() > 0)
-      	{
-      	  implicitParts.addAll(message.getEParts());
-      	}
-      }
-      if(eContainer() instanceof BindingOutput)
-      {
-      	Message message = ((BindingOutput)eContainer()).getEOutput().getEMessage();
-      	if(message.getEParts().size() > 0)
-      	{
-      	  implicitParts.addAll(message.getEParts());
-      	}
-      }
-      if(eContainer() instanceof BindingFault)
-      {
-      	Message message = ((BindingFault)eContainer()).getEFault().getEMessage();
-      	if(message.getEParts().size() > 0)
-      	{
-      	  implicitParts.addAll(message.getEParts());
-      	}
-      }
-      return implicitParts;
-    }
-    
-    return parts;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BODY__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_BODY__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_BODY__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_BODY__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_BODY__USE:
-        return getUse();
-      case SOAPPackage.SOAP_BODY__NAMESPACE_URI:
-        return getNamespaceURI();
-      case SOAPPackage.SOAP_BODY__ENCODING_STYLES:
-        return getEncodingStyles();
-      case SOAPPackage.SOAP_BODY__PARTS:
-        return getParts();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BODY__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_BODY__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_BODY__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_BODY__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_BODY__USE:
-        setUse((String)newValue);
-        return;
-      case SOAPPackage.SOAP_BODY__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_BODY__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        getEncodingStyles().addAll((Collection)newValue);
-        return;
-      case SOAPPackage.SOAP_BODY__PARTS:
-        getParts().clear();
-        getParts().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BODY__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BODY__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BODY__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BODY__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BODY__USE:
-        setUse(USE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BODY__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_BODY__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        return;
-      case SOAPPackage.SOAP_BODY__PARTS:
-        getParts().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_BODY__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_BODY__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_BODY__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_BODY__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_BODY__USE:
-        return USE_EDEFAULT == null ? use != null : !USE_EDEFAULT.equals(use);
-      case SOAPPackage.SOAP_BODY__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case SOAPPackage.SOAP_BODY__ENCODING_STYLES:
-        return encodingStyles != null && !encodingStyles.isEmpty();
-      case SOAPPackage.SOAP_BODY__PARTS:
-        return parts != null && !parts.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: ");
-    result.append(use);
-    result.append(", namespaceURI: ");
-    result.append(namespaceURI);
-    result.append(", encodingStyles: ");
-    result.append(encodingStyles);
-    result.append(')');
-    return result.toString();
-  }
-	
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    if (changedElement.hasAttribute(SOAPConstants.USE_ATTRIBUTE))
-      setUse(changedElement.getAttribute(SOAPConstants.USE_ATTRIBUTE));
-    if (changedElement.hasAttribute(SOAPConstants.NAMESPACE_ATTRIBUTE))
-      setNamespaceURI(changedElement.getAttribute(SOAPConstants.NAMESPACE_ATTRIBUTE));
-    if (changedElement.hasAttribute(SOAPConstants.ENCODING_STYLE_ATTRIBUTE)) 
-    {
-      String encodingStyles = changedElement.getAttribute(SOAPConstants.ENCODING_STYLE_ATTRIBUTE);
-      StringTokenizer tokenizer = new StringTokenizer(encodingStyles);
-      while (tokenizer.hasMoreTokens())
-      	getEncodingStyles().add(tokenizer.nextToken());
-    }   
-    reconcileReferences(false);
-  }
-  
-  public void reconcileReferences(boolean deep)
-  {
-    // TBD - resolve Parts reference here.
-    super.reconcileReferences(deep);
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPBody_Use())
-        niceSetAttribute(theElement,SOAPConstants.USE_ATTRIBUTE,getUse());
-      if(eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPBody_NamespaceURI())
-        niceSetAttribute(theElement,SOAPConstants.NAMESPACE_ATTRIBUTE,getNamespaceURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPBody_EncodingStyles())
-      {
-        List encodingStyleList = getEncodingStyles();
-        String encodingStyles = "";
-        Iterator iterator = encodingStyleList.iterator();
-        while (iterator.hasNext())
-        {
-          if (encodingStyles.equals("")) // first iteration
-            encodingStyles += (String)iterator.next();
-          else
-          	encodingStyles += " " + (String)iterator.next();
-        }
-        if (!encodingStyles.equals(""))
-          niceSetAttribute(theElement,SOAPConstants.ENCODING_STYLE_ATTRIBUTE,encodingStyles);
-      }
-    }
-  }
-  
-  /*
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.PART :
-        Part part = WSDLFactory.eINSTANCE.createPart();
-        part.setEnclosingDefinition(getEnclosingDefinition());
-        part.setElement(child);
-        getParts().add(part);
-        break;
-      default :
-        break;
-    }
-  }
-  */
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.BODY_ELEMENT_TAG);
-    return elementType;
-  } 
-} //SOAPBodyImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java
deleted file mode 100644
index 0fcdae9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java
+++ /dev/null

@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SOAPFactoryImpl extends EFactoryImpl implements SOAPFactory {
-  /**
-   * Creates and instance of the factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case SOAPPackage.SOAP_BINDING: return createSOAPBinding();
-      case SOAPPackage.SOAP_BODY: return createSOAPBody();
-      case SOAPPackage.SOAP_HEADER_BASE: return createSOAPHeaderBase();
-      case SOAPPackage.SOAP_FAULT: return createSOAPFault();
-      case SOAPPackage.SOAP_OPERATION: return createSOAPOperation();
-      case SOAPPackage.SOAP_ADDRESS: return createSOAPAddress();
-      case SOAPPackage.SOAP_HEADER_FAULT: return createSOAPHeaderFault();
-      case SOAPPackage.SOAP_HEADER: return createSOAPHeader();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object createFromString(EDataType eDataType, String initialValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      case SOAPPackage.ISTRING:
-        return createIStringFromString(eDataType, initialValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String convertToString(EDataType eDataType, Object instanceValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      case SOAPPackage.ISTRING:
-        return convertIStringToString(eDataType, instanceValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPBinding createSOAPBinding()
-  {
-    SOAPBindingImpl soapBinding = new SOAPBindingImpl();
-    return soapBinding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPBody createSOAPBody()
-  {
-    SOAPBodyImpl soapBody = new SOAPBodyImpl();
-    return soapBody;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPHeaderBase createSOAPHeaderBase()
-  {
-    SOAPHeaderBaseImpl soapHeaderBase = new SOAPHeaderBaseImpl();
-    return soapHeaderBase;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPFault createSOAPFault()
-  {
-    SOAPFaultImpl soapFault = new SOAPFaultImpl();
-    return soapFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPOperation createSOAPOperation()
-  {
-    SOAPOperationImpl soapOperation = new SOAPOperationImpl();
-    return soapOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPAddress createSOAPAddress()
-  {
-    SOAPAddressImpl soapAddress = new SOAPAddressImpl();
-    return soapAddress;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPHeaderFault createSOAPHeaderFault()
-  {
-    SOAPHeaderFaultImpl soapHeaderFault = new SOAPHeaderFaultImpl();
-    return soapHeaderFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPHeader createSOAPHeader()
-  {
-    SOAPHeaderImpl soapHeader = new SOAPHeaderImpl();
-    return soapHeader;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String createIStringFromString(EDataType eDataType, String initialValue)
-  {
-    return (String)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String convertIStringToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPPackage getSOAPPackage()
-  {
-    return (SOAPPackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-	public static SOAPPackage getPackage()
-  {
-    return SOAPPackage.eINSTANCE;
-  }
-} //SOAPFactoryImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java
deleted file mode 100644
index b96bbac..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java
+++ /dev/null

@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Fault</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl#getEncodingStyles <em>Encoding Styles</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPFaultImpl extends ExtensibilityElementImpl implements SOAPFault {
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected static final String USE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected String use = USE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEncodingStyles() <em>Encoding Styles</em>}' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getEncodingStyles()
-   * @generated
-   * @ordered
-   */
-	protected EList encodingStyles = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPFaultImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPFault();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getUse()
-  {
-    return use;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setUse(String newUse)
-  {
-    String oldUse = use;
-    use = newUse;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_FAULT__USE, oldUse, use));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setNamespaceURI(String newNamespaceURI)
-  {
-    String oldNamespaceURI = namespaceURI;
-    namespaceURI = newNamespaceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_FAULT__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-  }
-
-private String name;
-public String getName()
-{
-  return name;
-}
-
-public void setName(String name)
-{
-  this.name = name;
-}
-
-public void setEncodingStyles(List list)
-{
-  encodingStyles = (EList)list;
-}
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public List getEncodingStyles()
-  {
-    if (encodingStyles == null)
-    {
-      encodingStyles = new EDataTypeUniqueEList(String.class, this, SOAPPackage.SOAP_FAULT__ENCODING_STYLES);
-    }
-    return encodingStyles;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_FAULT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_FAULT__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_FAULT__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_FAULT__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_FAULT__USE:
-        return getUse();
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-        return getNamespaceURI();
-      case SOAPPackage.SOAP_FAULT__ENCODING_STYLES:
-        return getEncodingStyles();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_FAULT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_FAULT__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_FAULT__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_FAULT__USE:
-        setUse((String)newValue);
-        return;
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_FAULT__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        getEncodingStyles().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__USE:
-        setUse(USE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_FAULT__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_FAULT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_FAULT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_FAULT__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_FAULT__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_FAULT__USE:
-        return USE_EDEFAULT == null ? use != null : !USE_EDEFAULT.equals(use);
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case SOAPPackage.SOAP_FAULT__ENCODING_STYLES:
-        return encodingStyles != null && !encodingStyles.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: ");
-    result.append(use);
-    result.append(", namespaceURI: ");
-    result.append(namespaceURI);
-    result.append(", encodingStyles: ");
-    result.append(encodingStyles);
-    result.append(')');
-    return result.toString();
-  }
-	
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setName
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.NAME_ATTRIBUTE));
-    setNamespaceURI
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.NAMESPACE_URI_ATTRIBUTE));
-    setUse
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.USE_ATTRIBUTE));
-    
-    // TBD - handle encodingStyles
-    
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPFault_NamespaceURI())
-        niceSetAttribute(theElement,SOAPConstants.NAMESPACE_ATTRIBUTE,getNamespaceURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPFault_Use())
-        niceSetAttribute(theElement,SOAPConstants.USE_ATTRIBUTE,getUse());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPFault_EncodingStyles())
-	  {
-	        List encodingStyleList = getEncodingStyles();
-	        String encodingStyles = "";
-	        Iterator iterator = encodingStyleList.iterator();
-	        while (iterator.hasNext())
-	        {
-	          if (encodingStyles.equals("")) // first iteration
-	            encodingStyles += (String)iterator.next();
-	          else
-	          	encodingStyles += " " + (String)iterator.next();
-	        }
-	        if (!encodingStyles.equals(""))
-	          niceSetAttribute(theElement,SOAPConstants.ENCODING_STYLE_ATTRIBUTE,encodingStyles);
-	      } // TBD - Is this the proper way to handle encodingStyles
-      if (getName() != null)
-      	niceSetAttribute(theElement,SOAPConstants.NAME_ATTRIBUTE,getName()); // Revisit Rose model
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.FAULT_ELEMENT_TAG);
-    return elementType;
-  }
-
-} //SOAPFaultImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java
deleted file mode 100644
index 992b050..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java
+++ /dev/null

@@ -1,564 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Header Base</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getUse <em>Use</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getEncodingStyles <em>Encoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getPart <em>Part</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPHeaderBaseImpl extends ExtensibilityElementImpl implements SOAPHeaderBase {
-  /**
-   * The default value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected static final String USE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getUse() <em>Use</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getUse()
-   * @generated
-   * @ordered
-   */
-	protected String use = USE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-	protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEncodingStyles() <em>Encoding Styles</em>}' attribute list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getEncodingStyles()
-   * @generated
-   * @ordered
-   */
-	protected EList encodingStyles = null;
-
-  /**
-   * The cached value of the '{@link #getMessage() <em>Message</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getMessage()
-   * @generated
-   * @ordered
-   */
-	protected Message message = null;
-
-  /**
-   * The cached value of the '{@link #getPart() <em>Part</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getPart()
-   * @generated
-   * @ordered
-   */
-	protected Part part = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPHeaderBaseImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPHeaderBase();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getUse()
-  {
-    return use;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setUse(String newUse)
-  {
-    String oldUse = use;
-    use = newUse;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_HEADER_BASE__USE, oldUse, use));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setNamespaceURI(String newNamespaceURI)
-  {
-    String oldNamespaceURI = namespaceURI;
-    namespaceURI = newNamespaceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EList getEncodingStyles()
-  {
-    if (encodingStyles == null)
-    {
-      encodingStyles = new EDataTypeUniqueEList(String.class, this, SOAPPackage.SOAP_HEADER_BASE__ENCODING_STYLES);
-    }
-    return encodingStyles;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Message getMessage()
-  {
-    if (message != null && message.eIsProxy())
-    {
-      Message oldMessage = message;
-      message = (Message)eResolveProxy((InternalEObject)message);
-      if (message != oldMessage)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SOAPPackage.SOAP_HEADER_BASE__MESSAGE, oldMessage, message));
-      }
-    }
-    return message;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Message basicGetMessage()
-  {
-    return message;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setMessage(Message newMessage)
-  {
-    Message oldMessage = message;
-    message = newMessage;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_HEADER_BASE__MESSAGE, oldMessage, message));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Part getPart()
-  {
-    if (part != null && part.eIsProxy())
-    {
-      Part oldPart = part;
-      part = (Part)eResolveProxy((InternalEObject)part);
-      if (part != oldPart)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SOAPPackage.SOAP_HEADER_BASE__PART, oldPart, part));
-      }
-    }
-    return part;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Part basicGetPart()
-  {
-    return part;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setPart(Part newPart)
-  {
-    Part oldPart = part;
-    part = newPart;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_HEADER_BASE__PART, oldPart, part));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_HEADER_BASE__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_HEADER_BASE__USE:
-        return getUse();
-      case SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI:
-        return getNamespaceURI();
-      case SOAPPackage.SOAP_HEADER_BASE__ENCODING_STYLES:
-        return getEncodingStyles();
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-        if (resolve) return getMessage();
-        return basicGetMessage();
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-        if (resolve) return getPart();
-        return basicGetPart();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__USE:
-        setUse((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        getEncodingStyles().addAll((Collection)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-        setMessage((Message)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-        setPart((Part)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__USE:
-        setUse(USE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-        setMessage((Message)null);
-        return;
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-        setPart((Part)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_BASE__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_HEADER_BASE__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_HEADER_BASE__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_HEADER_BASE__USE:
-        return USE_EDEFAULT == null ? use != null : !USE_EDEFAULT.equals(use);
-      case SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case SOAPPackage.SOAP_HEADER_BASE__ENCODING_STYLES:
-        return encodingStyles != null && !encodingStyles.isEmpty();
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-        return message != null;
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-        return part != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: ");
-    result.append(use);
-    result.append(", namespaceURI: ");
-    result.append(namespaceURI);
-    result.append(", encodingStyles: ");
-    result.append(encodingStyles);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    if (changedElement.hasAttribute(SOAPConstants.USE_ATTRIBUTE))
-      setUse(changedElement.getAttribute(SOAPConstants.USE_ATTRIBUTE));
-    if (changedElement.hasAttribute(SOAPConstants.NAMESPACE_ATTRIBUTE))
-      setNamespaceURI(changedElement.getAttribute(SOAPConstants.NAMESPACE_ATTRIBUTE));
-    if (changedElement.hasAttribute(SOAPConstants.ENCODING_STYLE_ATTRIBUTE)) 
-    {
-      String encodingStyles = changedElement.getAttribute(SOAPConstants.ENCODING_STYLE_ATTRIBUTE);
-      StringTokenizer tokenizer = new StringTokenizer(encodingStyles);
-      while (tokenizer.hasMoreTokens())
-      	getEncodingStyles().add(tokenizer.nextToken());
-    } 
-    
-    reconcileReferences(false);
-  }
-  
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null && element.hasAttribute(SOAPConstants.MESSAGE_ATTRIBUTE))
-    {
-      Definition definition = getEnclosingDefinition();
-      QName messageQName = createQName(definition, element.getAttribute(SOAPConstants.MESSAGE_ATTRIBUTE));
-      Message newMessage = (messageQName != null) ? (Message) definition.getMessage(messageQName) : null;
-      if (newMessage != null && newMessage != getMessage())
-        setMessage(newMessage);
-      
-      if (element.hasAttribute(SOAPConstants.PART_ATTRIBUTE))
-      {
-        String partName = element.getAttribute(SOAPConstants.PART_ATTRIBUTE);
-        Part newPart = (newMessage != null) ? (Part) newMessage.getPart(partName) : null;
-        if (newPart != null && newPart != getPart())
-          setPart(newPart);
-      }   
-    }
-    super.reconcileReferences(deep);
-  }	  
- 
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPHeaderBase_Use())
-        niceSetAttribute(theElement,SOAPConstants.USE_ATTRIBUTE,getUse());
-      if(eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPHeaderBase_NamespaceURI())
-        niceSetAttribute(theElement,SOAPConstants.NAMESPACE_ATTRIBUTE,getNamespaceURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPHeaderBase_EncodingStyles())
-      {
-        List encodingStyleList = getEncodingStyles();
-        String encodingStyles = "";
-        Iterator iterator = encodingStyleList.iterator();
-        while (iterator.hasNext())
-        {
-          if (encodingStyles.equals("")) // first iteration
-            encodingStyles += (String)iterator.next();
-          else
-  	        encodingStyles += " " + (String)iterator.next();
-        }
-        if (!encodingStyles.equals(""))
-          niceSetAttribute(theElement,SOAPConstants.ENCODING_STYLE_ATTRIBUTE,encodingStyles);
-      }
-    }
-  }
-  
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == SOAPPackage.eINSTANCE.getSOAPHeaderBase_Message())
-      {
-        Message message = getMessage();
-        if (message != null)
-        {
-          QName qName = message.getQName();
-          niceSetAttributeURIValue(theElement, SOAPConstants.MESSAGE_ATTRIBUTE, qName.getNamespaceURI() + "#" + qName.getLocalPart());
-        }
-      }
-      
-      if (eReference == null || eReference == SOAPPackage.eINSTANCE.getSOAPHeaderBase_Part())
-      {
-        Part part = getPart();
-        if (part != null)
-        {
-          String partName = part.getName();
-          niceSetAttribute(theElement, SOAPConstants.PART_ATTRIBUTE,partName);
-        }
-      }
-    }
-  }
-} //SOAPHeaderBaseImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java
deleted file mode 100644
index c4333f2..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java
+++ /dev/null

@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import java.util.Collection;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Header Fault</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class SOAPHeaderFaultImpl extends SOAPHeaderBaseImpl implements SOAPHeaderFault {
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPHeaderFaultImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPHeaderFault();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_FAULT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_HEADER_FAULT__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_HEADER_FAULT__USE:
-        return getUse();
-      case SOAPPackage.SOAP_HEADER_FAULT__NAMESPACE_URI:
-        return getNamespaceURI();
-      case SOAPPackage.SOAP_HEADER_FAULT__ENCODING_STYLES:
-        return getEncodingStyles();
-      case SOAPPackage.SOAP_HEADER_FAULT__MESSAGE:
-        if (resolve) return getMessage();
-        return basicGetMessage();
-      case SOAPPackage.SOAP_HEADER_FAULT__PART:
-        if (resolve) return getPart();
-        return basicGetPart();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__USE:
-        setUse((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        getEncodingStyles().addAll((Collection)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__MESSAGE:
-        setMessage((Message)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__PART:
-        setPart((Part)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__USE:
-        setUse(USE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__MESSAGE:
-        setMessage((Message)null);
-        return;
-      case SOAPPackage.SOAP_HEADER_FAULT__PART:
-        setPart((Part)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER_FAULT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_HEADER_FAULT__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_HEADER_FAULT__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_HEADER_FAULT__USE:
-        return USE_EDEFAULT == null ? use != null : !USE_EDEFAULT.equals(use);
-      case SOAPPackage.SOAP_HEADER_FAULT__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case SOAPPackage.SOAP_HEADER_FAULT__ENCODING_STYLES:
-        return encodingStyles != null && !encodingStyles.isEmpty();
-      case SOAPPackage.SOAP_HEADER_FAULT__MESSAGE:
-        return message != null;
-      case SOAPPackage.SOAP_HEADER_FAULT__PART:
-        return part != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.HEADER_FAULT_ELEMENT_TAG);
-    return elementType;
-  } 
-
-} //SOAPHeaderFaultImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java
deleted file mode 100644
index 297791c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java
+++ /dev/null

@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Header</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderImpl#getHeaderFaults <em>Header Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPHeaderImpl extends SOAPHeaderBaseImpl implements SOAPHeader {
-  /**
-   * The cached value of the '{@link #getHeaderFaults() <em>Header Faults</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getHeaderFaults()
-   * @generated
-   * @ordered
-   */
-	protected EList headerFaults = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPHeaderImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPHeader();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EList getHeaderFaults()
-  {
-    if (headerFaults == null)
-    {
-      headerFaults = new EObjectContainmentEList(SOAPHeaderFault.class, this, SOAPPackage.SOAP_HEADER__HEADER_FAULTS);
-    }
-    return headerFaults;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-          return ((InternalEList)getHeaderFaults()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_HEADER__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_HEADER__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_HEADER__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_HEADER__USE:
-        return getUse();
-      case SOAPPackage.SOAP_HEADER__NAMESPACE_URI:
-        return getNamespaceURI();
-      case SOAPPackage.SOAP_HEADER__ENCODING_STYLES:
-        return getEncodingStyles();
-      case SOAPPackage.SOAP_HEADER__MESSAGE:
-        if (resolve) return getMessage();
-        return basicGetMessage();
-      case SOAPPackage.SOAP_HEADER__PART:
-        if (resolve) return getPart();
-        return basicGetPart();
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-        return getHeaderFaults();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_HEADER__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__USE:
-        setUse((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        getEncodingStyles().addAll((Collection)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__MESSAGE:
-        setMessage((Message)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__PART:
-        setPart((Part)newValue);
-        return;
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-        getHeaderFaults().clear();
-        getHeaderFaults().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__USE:
-        setUse(USE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_HEADER__ENCODING_STYLES:
-        getEncodingStyles().clear();
-        return;
-      case SOAPPackage.SOAP_HEADER__MESSAGE:
-        setMessage((Message)null);
-        return;
-      case SOAPPackage.SOAP_HEADER__PART:
-        setPart((Part)null);
-        return;
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-        getHeaderFaults().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_HEADER__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_HEADER__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_HEADER__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_HEADER__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_HEADER__USE:
-        return USE_EDEFAULT == null ? use != null : !USE_EDEFAULT.equals(use);
-      case SOAPPackage.SOAP_HEADER__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case SOAPPackage.SOAP_HEADER__ENCODING_STYLES:
-        return encodingStyles != null && !encodingStyles.isEmpty();
-      case SOAPPackage.SOAP_HEADER__MESSAGE:
-        return message != null;
-      case SOAPPackage.SOAP_HEADER__PART:
-        return part != null;
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-        return headerFaults != null && !headerFaults.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    if (SOAPConstants.HEADER_FAULT_ELEMENT_TAG.equals(child.getLocalName()))
-    {
-      SOAPHeaderFault fault = SOAPFactory.eINSTANCE.createSOAPHeaderFault();
-      fault.setEnclosingDefinition(getEnclosingDefinition());
-      fault.setElement(child);
-      getHeaderFaults().add(fault);
-    }
-  }
-  
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    SOAPHeader header = (SOAPHeader) component;
-    if (modelObject instanceof SOAPHeaderFault)
-    {
-      header.getHeaderFaults().remove(modelObject);
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.HEADER_ELEMENT_TAG);
-    return elementType;
-  } 
-
-} //SOAPHeaderImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java
deleted file mode 100644
index fb05a32..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java
+++ /dev/null

@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPOperationImpl#getSoapActionURI <em>Soap Action URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPOperationImpl#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPOperationImpl extends ExtensibilityElementImpl implements SOAPOperation {
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getSoapActionURI() <em>Soap Action URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getSoapActionURI()
-   * @generated
-   * @ordered
-   */
-	protected static final String SOAP_ACTION_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getSoapActionURI() <em>Soap Action URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getSoapActionURI()
-   * @generated
-   * @ordered
-   */
-	protected String soapActionURI = SOAP_ACTION_URI_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-	protected static final String STYLE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-	protected String style = STYLE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPOperationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected EClass eStaticClass()
-  {
-    return SOAPPackage.eINSTANCE.getSOAPOperation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getSoapActionURI()
-  {
-    return soapActionURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setSoapActionURI(String newSoapActionURI)
-  {
-    String oldSoapActionURI = soapActionURI;
-    soapActionURI = newSoapActionURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI, oldSoapActionURI, soapActionURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String getStyle()
-  {
-    return style;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void setStyle(String newStyle)
-  {
-    String oldStyle = style;
-    style = newStyle;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SOAPPackage.SOAP_OPERATION__STYLE, oldStyle, style));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_OPERATION__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case SOAPPackage.SOAP_OPERATION__ELEMENT:
-        return getElement();
-      case SOAPPackage.SOAP_OPERATION__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT_TYPE:
-        return getElementType();
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-        return getSoapActionURI();
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-        return getStyle();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case SOAPPackage.SOAP_OPERATION__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-        setSoapActionURI((String)newValue);
-        return;
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-        setStyle((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_OPERATION__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-        setSoapActionURI(SOAP_ACTION_URI_EDEFAULT);
-        return;
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-        setStyle(STYLE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case SOAPPackage.SOAP_OPERATION__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case SOAPPackage.SOAP_OPERATION__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case SOAPPackage.SOAP_OPERATION__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case SOAPPackage.SOAP_OPERATION__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-        return SOAP_ACTION_URI_EDEFAULT == null ? soapActionURI != null : !SOAP_ACTION_URI_EDEFAULT.equals(soapActionURI);
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-        return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (soapActionURI: ");
-    result.append(soapActionURI);
-    result.append(", style: ");
-    result.append(style);
-    result.append(')');
-    return result.toString();
-  }
-	
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setSoapActionURI
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.SOAP_ACTION_ATTRIBUTE));
-    setStyle
-      (SOAPConstants.getAttribute(changedElement, SOAPConstants.STYLE_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-  
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPOperation_SoapActionURI())
-        niceSetAttribute(theElement,SOAPConstants.SOAP_ACTION_ATTRIBUTE,getSoapActionURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.eINSTANCE.getSOAPOperation_Style())
-        niceSetAttribute(theElement,SOAPConstants.STYLE_ATTRIBUTE,getStyle());
-    }
-  }
-  
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.OPERATION_ELEMENT_TAG);
-    return elementType;
-  } 
-
-} //SOAPOperationImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java
deleted file mode 100644
index 3d25452..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java
+++ /dev/null

@@ -1,594 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SOAPPackageImpl extends EPackageImpl implements SOAPPackage {
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapBindingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapBodyEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapHeaderBaseEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapFaultEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapOperationEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapAddressEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapHeaderFaultEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EClass soapHeaderEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	private EDataType iStringEDataType = 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.eclipse.wst.wsdl.binding.soap.SOAPPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-	private SOAPPackageImpl()
-  {
-    super(eNS_URI, SOAPFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- 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 SOAPPackage init()
-  {
-    if (isInited) return (SOAPPackage)EPackage.Registry.INSTANCE.get(SOAPPackage.eNS_URI);
-
-    // Obtain or create and register package.
-    SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SOAPPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    XSDPackageImpl.init();
-
-    // Obtain or create and register interdependencies
-    WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)(EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(WSDLPackage.eNS_URI) : WSDLPackageImpl.eINSTANCE);
-
-    // Step 1: create meta-model objects
-    theSOAPPackage.createPackageContents();
-    theWSDLPackage.createPackageContents();
-
-    // Step 2: complete initialization
-    theSOAPPackage.initializePackageContents();
-    theWSDLPackage.initializePackageContents();
-
-    return theSOAPPackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPBinding()
-  {
-    return soapBindingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPBinding_TransportURI()
-  {
-    return (EAttribute)soapBindingEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPBinding_Style()
-  {
-    return (EAttribute)soapBindingEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPBody()
-  {
-    return soapBodyEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPBody_Use()
-  {
-    return (EAttribute)soapBodyEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPBody_NamespaceURI()
-  {
-    return (EAttribute)soapBodyEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPBody_EncodingStyles()
-  {
-    return (EAttribute)soapBodyEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EReference getSOAPBody_Parts()
-  {
-    return (EReference)soapBodyEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPHeaderBase()
-  {
-    return soapHeaderBaseEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPHeaderBase_Use()
-  {
-    return (EAttribute)soapHeaderBaseEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPHeaderBase_NamespaceURI()
-  {
-    return (EAttribute)soapHeaderBaseEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPHeaderBase_EncodingStyles()
-  {
-    return (EAttribute)soapHeaderBaseEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EReference getSOAPHeaderBase_Message()
-  {
-    return (EReference)soapHeaderBaseEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EReference getSOAPHeaderBase_Part()
-  {
-    return (EReference)soapHeaderBaseEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPFault()
-  {
-    return soapFaultEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPFault_Use()
-  {
-    return (EAttribute)soapFaultEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPFault_NamespaceURI()
-  {
-    return (EAttribute)soapFaultEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPFault_EncodingStyles()
-  {
-    return (EAttribute)soapFaultEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPOperation()
-  {
-    return soapOperationEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPOperation_SoapActionURI()
-  {
-    return (EAttribute)soapOperationEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPOperation_Style()
-  {
-    return (EAttribute)soapOperationEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPAddress()
-  {
-    return soapAddressEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getSOAPAddress_LocationURI()
-  {
-    return (EAttribute)soapAddressEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPHeaderFault()
-  {
-    return soapHeaderFaultEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getSOAPHeader()
-  {
-    return soapHeaderEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EReference getSOAPHeader_HeaderFaults()
-  {
-    return (EReference)soapHeaderEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EDataType getIString()
-  {
-    return iStringEDataType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPFactory getSOAPFactory()
-  {
-    return (SOAPFactory)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
-    soapBindingEClass = createEClass(SOAP_BINDING);
-    createEAttribute(soapBindingEClass, SOAP_BINDING__TRANSPORT_URI);
-    createEAttribute(soapBindingEClass, SOAP_BINDING__STYLE);
-
-    soapBodyEClass = createEClass(SOAP_BODY);
-    createEAttribute(soapBodyEClass, SOAP_BODY__USE);
-    createEAttribute(soapBodyEClass, SOAP_BODY__NAMESPACE_URI);
-    createEAttribute(soapBodyEClass, SOAP_BODY__ENCODING_STYLES);
-    createEReference(soapBodyEClass, SOAP_BODY__PARTS);
-
-    soapHeaderBaseEClass = createEClass(SOAP_HEADER_BASE);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__USE);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__NAMESPACE_URI);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__ENCODING_STYLES);
-    createEReference(soapHeaderBaseEClass, SOAP_HEADER_BASE__MESSAGE);
-    createEReference(soapHeaderBaseEClass, SOAP_HEADER_BASE__PART);
-
-    soapFaultEClass = createEClass(SOAP_FAULT);
-    createEAttribute(soapFaultEClass, SOAP_FAULT__USE);
-    createEAttribute(soapFaultEClass, SOAP_FAULT__NAMESPACE_URI);
-    createEAttribute(soapFaultEClass, SOAP_FAULT__ENCODING_STYLES);
-
-    soapOperationEClass = createEClass(SOAP_OPERATION);
-    createEAttribute(soapOperationEClass, SOAP_OPERATION__SOAP_ACTION_URI);
-    createEAttribute(soapOperationEClass, SOAP_OPERATION__STYLE);
-
-    soapAddressEClass = createEClass(SOAP_ADDRESS);
-    createEAttribute(soapAddressEClass, SOAP_ADDRESS__LOCATION_URI);
-
-    soapHeaderFaultEClass = createEClass(SOAP_HEADER_FAULT);
-
-    soapHeaderEClass = createEClass(SOAP_HEADER);
-    createEReference(soapHeaderEClass, SOAP_HEADER__HEADER_FAULTS);
-
-    // Create data types
-    iStringEDataType = createEDataType(ISTRING);
-  }
-
-  /**
-   * <!-- 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
-    WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-
-    // Add supertypes to classes
-    soapBindingEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapBodyEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapHeaderBaseEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapFaultEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapOperationEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapAddressEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapHeaderFaultEClass.getESuperTypes().add(this.getSOAPHeaderBase());
-    soapHeaderEClass.getESuperTypes().add(this.getSOAPHeaderBase());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(soapBindingEClass, SOAPBinding.class, "SOAPBinding", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPBinding_TransportURI(), ecorePackage.getEString(), "transportURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPBinding_Style(), ecorePackage.getEString(), "style", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapBodyEClass, SOAPBody.class, "SOAPBody", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPBody_Use(), ecorePackage.getEString(), "use", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPBody_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPBody_EncodingStyles(), this.getIString(), "encodingStyles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEReference(getSOAPBody_Parts(), theWSDLPackage.getPart(), null, "parts", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapHeaderBaseEClass, SOAPHeaderBase.class, "SOAPHeaderBase", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPHeaderBase_Use(), ecorePackage.getEString(), "use", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPHeaderBase_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPHeaderBase_EncodingStyles(), this.getIString(), "encodingStyles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEReference(getSOAPHeaderBase_Message(), theWSDLPackage.getMessage(), null, "message", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-    initEReference(getSOAPHeaderBase_Part(), theWSDLPackage.getPart(), null, "part", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapFaultEClass, SOAPFault.class, "SOAPFault", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPFault_Use(), ecorePackage.getEString(), "use", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPFault_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPFault_EncodingStyles(), this.getIString(), "encodingStyles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapOperationEClass, SOAPOperation.class, "SOAPOperation", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPOperation_SoapActionURI(), ecorePackage.getEString(), "soapActionURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-    initEAttribute(getSOAPOperation_Style(), ecorePackage.getEString(), "style", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapAddressEClass, SOAPAddress.class, "SOAPAddress", !IS_ABSTRACT, !IS_INTERFACE);
-    initEAttribute(getSOAPAddress_LocationURI(), ecorePackage.getEString(), "locationURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-    initEClass(soapHeaderFaultEClass, SOAPHeaderFault.class, "SOAPHeaderFault", !IS_ABSTRACT, !IS_INTERFACE);
-
-    initEClass(soapHeaderEClass, SOAPHeader.class, "SOAPHeader", !IS_ABSTRACT, !IS_INTERFACE);
-    initEReference(getSOAPHeader_HeaderFaults(), this.getSOAPHeaderFault(), null, "headerFaults", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-    // Initialize data types
-    initEDataType(iStringEDataType, String.class, "IString", IS_SERIALIZABLE);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-} //SOAPPackageImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java
deleted file mode 100644
index b4be227..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java
+++ /dev/null

@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage
- * @generated
- */
-public class SOAPAdapterFactory extends AdapterFactoryImpl {
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected static SOAPPackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = SOAPPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-	public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch the delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected SOAPSwitch modelSwitch =
-    new SOAPSwitch()
-    {
-      public Object caseSOAPBinding(SOAPBinding object)
-      {
-        return createSOAPBindingAdapter();
-      }
-      public Object caseSOAPBody(SOAPBody object)
-      {
-        return createSOAPBodyAdapter();
-      }
-      public Object caseSOAPHeaderBase(SOAPHeaderBase object)
-      {
-        return createSOAPHeaderBaseAdapter();
-      }
-      public Object caseSOAPFault(SOAPFault object)
-      {
-        return createSOAPFaultAdapter();
-      }
-      public Object caseSOAPOperation(SOAPOperation object)
-      {
-        return createSOAPOperationAdapter();
-      }
-      public Object caseSOAPAddress(SOAPAddress object)
-      {
-        return createSOAPAddressAdapter();
-      }
-      public Object caseSOAPHeaderFault(SOAPHeaderFault object)
-      {
-        return createSOAPHeaderFaultAdapter();
-      }
-      public Object caseSOAPHeader(SOAPHeader object)
-      {
-        return createSOAPHeaderAdapter();
-      }
-      public Object caseWSDLElement(WSDLElement object)
-      {
-        return createWSDLElementAdapter();
-      }
-      public Object caseIExtensibilityElement(ExtensibilityElement object)
-      {
-        return createIExtensibilityElementAdapter();
-      }
-      public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object)
-      {
-        return createExtensibilityElementAdapter();
-      }
-      public Object defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-	public Adapter createAdapter(Notifier target)
-  {
-    return (Adapter)modelSwitch.doSwitch((EObject)target);
-  }
-
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding <em>Binding</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBinding
-   * @generated
-   */
-	public Adapter createSOAPBindingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody <em>Body</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody
-   * @generated
-   */
-	public Adapter createSOAPBodyAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase <em>Header Base</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase
-   * @generated
-   */
-	public Adapter createSOAPHeaderBaseAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault <em>Fault</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault
-   * @generated
-   */
-	public Adapter createSOAPFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation <em>Operation</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPOperation
-   * @generated
-   */
-	public Adapter createSOAPOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPAddress <em>Address</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPAddress
-   * @generated
-   */
-	public Adapter createSOAPAddressAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault <em>Header Fault</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault
-   * @generated
-   */
-	public Adapter createSOAPHeaderFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeader <em>Header</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeader
-   * @generated
-   */
-	public Adapter createSOAPHeaderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.WSDLElement <em>Element</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.WSDLElement
-   * @generated
-   */
-	public Adapter createWSDLElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.extensions.ExtensibilityElement
-   * @generated
-   */
-	public Adapter createIExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wst.wsdl.ExtensibilityElement <em>Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.ExtensibilityElement
-   * @generated
-   */
-	public Adapter createExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-	public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} //SOAPAdapterFactory

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java
deleted file mode 100644
index 7790c31..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.util;
-
-import org.w3c.dom.Element;
-
-public final class SOAPConstants 
-{
-  public static final String ADDRESS_ELEMENT_TAG = "address";
-  public static final String BINDING_ELEMENT_TAG = "binding";
-  public static final String BODY_ELEMENT_TAG = "body";
-  public static final String FAULT_ELEMENT_TAG = "fault";
-  public static final String HEADER_ELEMENT_TAG = "header";
-  public static final String HEADER_FAULT_ELEMENT_TAG = "headerfault";
-  public static final String OPERATION_ELEMENT_TAG = "operation";
-	  
-  public static final String SOAP_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/soap/";
- 
-  public static final String SOAP_ACTION_ATTRIBUTE ="soapAction";
-  public static final String STYLE_ATTRIBUTE ="style";
-  public static final String LOCATION_ATTRIBUTE ="location";
-  public static final String TRANSPORT_ATTRIBUTE ="transport";
-  public static final String USE_ATTRIBUTE ="use";
-  public static final String NAMESPACE_ATTRIBUTE ="namespace";
-  public static final String NAMESPACE_URI_ATTRIBUTE ="namespaceURI";
-  public static final String NAME_ATTRIBUTE ="name";
-  public static final String ENCODING_STYLE_ATTRIBUTE ="encodingStyle";
-  public static final String MESSAGE_ATTRIBUTE ="message";
-  public static final String PART_ATTRIBUTE ="part";
-  
-  public static String getAttribute(Element element, String attributeName)
-  {
-    return element.hasAttribute(attributeName) ? element.getAttribute(attributeName) : null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java
deleted file mode 100644
index fa2dada..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.util;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-
-public class SOAPExtensibilityElementFactory implements ExtensibilityElementFactory
-{
-  public ExtensibilityElement createExtensibilityElement(String namespace, String localName)
-  {
-    if (SOAPConstants.SOAP_NAMESPACE_URI.equals(namespace))
-    {
-      if (SOAPConstants.ADDRESS_ELEMENT_TAG.equals(localName))
-      {
-        return SOAPFactory.eINSTANCE.createSOAPAddress();
-      }
-      else if (SOAPConstants.BINDING_ELEMENT_TAG.equals(localName))
-      {
-        return SOAPFactory.eINSTANCE.createSOAPBinding();
-      }
-      else if (SOAPConstants.BODY_ELEMENT_TAG.equals(localName))
-      {
-        return SOAPFactory.eINSTANCE.createSOAPBody();
-      }
-      else if (SOAPConstants.FAULT_ELEMENT_TAG.equals(localName))
-      {
-      	return SOAPFactory.eINSTANCE.createSOAPFault();
-      }
-      else if (SOAPConstants.OPERATION_ELEMENT_TAG.equals(localName))
-      {
-      	return SOAPFactory.eINSTANCE.createSOAPOperation();
-      }
-      else if (SOAPConstants.HEADER_ELEMENT_TAG.equals(localName))
-      {
-      	return SOAPFactory.eINSTANCE.createSOAPHeader();
-      }
-      else if (SOAPConstants.HEADER_FAULT_ELEMENT_TAG.equals(localName))
-      {
-      	return SOAPFactory.eINSTANCE.createSOAPHeaderFault();
-      }
-      else
-      {
-        //System.out.println("Unhandled localName: " + localName);
-        return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-      }
-    }
-    else
-    {
-      //System.out.println("Unhandled namespace: " + namespace);
-      return WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java
deleted file mode 100644
index 9714981..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java
+++ /dev/null

@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.binding.soap.internal.util;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage
- * @generated
- */
-public class SOAPSwitch {
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	protected static SOAPPackage modelPackage;
-
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public SOAPSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = SOAPPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-	public Object doSwitch(EObject theEObject)
-  {
-    EClass theEClass = theEObject.eClass();
-    if (theEClass.eContainer() == modelPackage)
-    {
-      switch (theEClass.getClassifierID())
-      {
-        case SOAPPackage.SOAP_BINDING:
-        {
-          SOAPBinding soapBinding = (SOAPBinding)theEObject;
-          Object result = caseSOAPBinding(soapBinding);
-          if (result == null) result = caseExtensibilityElement(soapBinding);
-          if (result == null) result = caseWSDLElement(soapBinding);
-          if (result == null) result = caseIExtensibilityElement(soapBinding);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_BODY:
-        {
-          SOAPBody soapBody = (SOAPBody)theEObject;
-          Object result = caseSOAPBody(soapBody);
-          if (result == null) result = caseExtensibilityElement(soapBody);
-          if (result == null) result = caseWSDLElement(soapBody);
-          if (result == null) result = caseIExtensibilityElement(soapBody);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_HEADER_BASE:
-        {
-          SOAPHeaderBase soapHeaderBase = (SOAPHeaderBase)theEObject;
-          Object result = caseSOAPHeaderBase(soapHeaderBase);
-          if (result == null) result = caseExtensibilityElement(soapHeaderBase);
-          if (result == null) result = caseWSDLElement(soapHeaderBase);
-          if (result == null) result = caseIExtensibilityElement(soapHeaderBase);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_FAULT:
-        {
-          SOAPFault soapFault = (SOAPFault)theEObject;
-          Object result = caseSOAPFault(soapFault);
-          if (result == null) result = caseExtensibilityElement(soapFault);
-          if (result == null) result = caseWSDLElement(soapFault);
-          if (result == null) result = caseIExtensibilityElement(soapFault);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_OPERATION:
-        {
-          SOAPOperation soapOperation = (SOAPOperation)theEObject;
-          Object result = caseSOAPOperation(soapOperation);
-          if (result == null) result = caseExtensibilityElement(soapOperation);
-          if (result == null) result = caseWSDLElement(soapOperation);
-          if (result == null) result = caseIExtensibilityElement(soapOperation);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_ADDRESS:
-        {
-          SOAPAddress soapAddress = (SOAPAddress)theEObject;
-          Object result = caseSOAPAddress(soapAddress);
-          if (result == null) result = caseExtensibilityElement(soapAddress);
-          if (result == null) result = caseWSDLElement(soapAddress);
-          if (result == null) result = caseIExtensibilityElement(soapAddress);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_HEADER_FAULT:
-        {
-          SOAPHeaderFault soapHeaderFault = (SOAPHeaderFault)theEObject;
-          Object result = caseSOAPHeaderFault(soapHeaderFault);
-          if (result == null) result = caseSOAPHeaderBase(soapHeaderFault);
-          if (result == null) result = caseExtensibilityElement(soapHeaderFault);
-          if (result == null) result = caseWSDLElement(soapHeaderFault);
-          if (result == null) result = caseIExtensibilityElement(soapHeaderFault);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case SOAPPackage.SOAP_HEADER:
-        {
-          SOAPHeader soapHeader = (SOAPHeader)theEObject;
-          Object result = caseSOAPHeader(soapHeader);
-          if (result == null) result = caseSOAPHeaderBase(soapHeader);
-          if (result == null) result = caseExtensibilityElement(soapHeader);
-          if (result == null) result = caseWSDLElement(soapHeader);
-          if (result == null) result = caseIExtensibilityElement(soapHeader);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        default: return defaultCase(theEObject);
-      }
-    }
-    return defaultCase(theEObject);
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPBinding(SOAPBinding object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Body</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Body</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPBody(SOAPBody object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Header Base</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Header Base</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPHeaderBase(SOAPHeaderBase object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPFault(SOAPFault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Operation</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Operation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPOperation(SOAPOperation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Address</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Address</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPAddress(SOAPAddress object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Header Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Header Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPHeaderFault(SOAPHeaderFault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Header</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Header</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseSOAPHeader(SOAPHeader object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseWSDLElement(WSDLElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseIExtensibilityElement(ExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-	public Object defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //SOAPSwitch

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html
deleted file mode 100644
index 9554345..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html
+++ /dev/null

@@ -1,21 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>WSDL Model SOAP Binding Extension API Overview</title>
-</head>
-<body>
-<p>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</p>
-<table width="500">
-<tr>
-<td>
-<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p>
-</td>
-</tr>
-</table>
-</body>
-</html>

diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml
deleted file mode 100644
index c2cb92a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml
+++ /dev/null

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>WSDL Model SOAP Binding Extension API Overview</title>
-	</head>
-
-	<body>
-		<abstract>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</abstract>
-		<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p> 
-	</body>
-</html>

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/WSDL.mdl b/bundles/org.eclipse.wst.wsdl/src-wsdl/model/WSDL.mdl
deleted file mode 100644
index c1dea8d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/WSDL.mdl
+++ /dev/null

@@ -1,31023 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"39E27F080064"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"39E27F080078"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"39E27F080063"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"39E27F080065"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "wsdl"
-		quid       	"3ADFB8E5021E"
-		documentation 	
-|The WSDL model contains classes for the Web Services Description Language (WSDL).
-|
-|WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
-|
-|WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
-|
-|The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
-|- 2.1 Definition, shows the WSDL definition element and the WSDL document structure
-|- 2.1.1 Naming and Linking, shows the namespace and import mechanism
-|- 2.1.3 Extensibility, shows the WSDL extensibility mechanism
-|- 2.2 Types, shows the use of XML Schema types in WSDL
-|- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
-|
-|The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
-		
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "WSDLElement"
-			quid       	"3AD5C6A302DD"
-			documentation 	"This class represents a WSDL language element."
-			operations 	(list Operations
-			    (object Operation "getEnclosingDefinition"
-				quid       	"3CD1529600C8"
-				result     	"Definition"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setEnclosingDefinition"
-				quid       	"3CD152B80347"
-				parameters 	(list Parameters
-				    (object Parameter "definition"
-					type       	"Definition"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "documentationElement"
-				quid       	"3CCE443602A3"
-				type       	"DOMElement")
-			    (object ClassAttribute "element"
-				quid       	"3F97DBD30207"
-				type       	"DOMElement"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "PortType"
-			quid       	"3AD5C7F001A5"
-			documentation 	"This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5C9B70150"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FD8019F"
-				supplier   	"Logical View::wsdl::IPortType"
-				quidu      	"3B84A5BE0331"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB488E0023"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1E301E5"
-				type       	"boolean"))
-			language   	"Java")
-		    (object Class "Operation"
-			quid       	"3AD5C80D03CE"
-			documentation 	"This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE9DE98003C"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FE20171"
-				supplier   	"Logical View::wsdl::IOperation"
-				quidu      	"3B84A77600D1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "style"
-				quid       	"3AEB472601AC"
-				type       	"OperationType")
-			    (object ClassAttribute "name"
-				quid       	"3BDD9643004C"
-				type       	"String")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF235003E"
-				type       	"boolean"))
-			language   	"Java")
-		    (object Class "Message"
-			quid       	"3AD5C9590078"
-			documentation 	"This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5D05501C4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3B84A8D102BA"
-				supplier   	"Logical View::wsdl::IMessage"
-				quidu      	"3B84A8AF004F"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB487C01FE"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1D20226"
-				type       	"boolean"))
-			language   	"Java")
-		    (object Class "Part"
-			quid       	"3AD5CE1C032E"
-			documentation 	"This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84A96D02F1"
-				supplier   	"Logical View::wsdl::IPart"
-				quidu      	"3B84A93F01BE")
-			    (object Inheritance_Relationship
-				quid       	"3B897E230237"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3BCE70B703C8"
-				type       	"String")
-			    (object ClassAttribute "elementName"
-				quid       	"3B84B08703DB"
-				type       	"QName")
-			    (object ClassAttribute "typeName"
-				quid       	"3BCE70C303C5"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Binding"
-			quid       	"3AD5D2860261"
-			documentation 	"This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA0F02F0"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B8595410129"
-				supplier   	"Logical View::wsdl::IBinding"
-				quidu      	"3B84ABC60219"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB4899014B"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF1F401A3"
-				type       	"boolean"))
-			language   	"Java")
-		    (object Class "BindingOperation"
-			quid       	"3AD5D3CB0145"
-			documentation 	"This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD6009202F7"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84ADE401DC"
-				supplier   	"Logical View::wsdl::IBindingOperation"
-				quidu      	"3B84ADC00072"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B89C4CB0199"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Service"
-			quid       	"3AD5D8F002F8"
-			documentation 	"This class represents a WSDL service element. A service groups a set of related ports together."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FA20025E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954E01B4"
-				supplier   	"Logical View::wsdl::IService"
-				quidu      	"3B84AB490287"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qName"
-				quid       	"3AEB48A40151"
-				type       	"QName")
-			    (object ClassAttribute "undefined"
-				quid       	"3BDDF20D0203"
-				type       	"boolean"))
-			language   	"Java")
-		    (object Class "Port"
-			quid       	"3AD5D9170286"
-			documentation 	"This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD600CB00AA"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B85954502C9"
-				supplier   	"Logical View::wsdl::IPort"
-				quidu      	"3B84AB800326"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3AD5D9A00391"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibilityElement"
-			quid       	"3AD5DBB602A9"
-			documentation 	"This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84B14903D0"
-				supplier   	"Logical View::wsdl::IExtensibilityElement"
-				quidu      	"3B84B12402AB")
-			    (object Inheritance_Relationship
-				quid       	"3BDDF53502C3"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3AF9543C0073"
-				type       	"boolean")
-			    (object ClassAttribute "elementType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B85B21A0271"
-				type       	"QName"))
-			language   	"Java")
-		    (object Class "Definition"
-			quid       	"3AD5E43F008E"
-			documentation 	"This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FDB803D4"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84B1F80382"
-				supplier   	"Logical View::wsdl::IDefinition"
-				quidu      	"3B84B1D90142"))
-			operations 	(list Operations
-			    (object Operation "getDocument"
-				quid       	"3CD14FC2012B"
-				result     	"DOMDocument"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocument"
-				quid       	"3CD150DE01E7"
-				parameters 	(list Parameters
-				    (object Parameter "document"
-					type       	"DOMDocument"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3AD5E474004E"
-				type       	"String")
-			    (object ClassAttribute "location"
-				quid       	"40352B7C0396"
-				type       	"String")
-			    (object ClassAttribute "qName"
-				quid       	"3AEB485702F5"
-				type       	"QName")
-			    (object ClassAttribute "encoding"
-				quid       	"3CADD00D000D"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "Import"
-			quid       	"3AD5E4F903DE"
-			documentation 	"This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5EE58037A"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F6F200D0340"
-				supplier   	"Logical View::wsdl::IImport"
-				quidu      	"3B84B2020119"))
-			operations 	(list Operations
-			    (object Operation "getSchema"
-				quid       	"3C8672C10379"
-				result     	"XSDSchema"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setSchema"
-				quid       	"3C8672C10397"
-				parameters 	(list Parameters
-				    (object Parameter "schema"
-					type       	"XSDSchema"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD5E50A0036"
-				type       	"String")
-			    (object ClassAttribute "locationURI"
-				quid       	"3AD5E5140211"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "ExtensibleElement"
-			quid       	"3AD5FCFA033A"
-			documentation 	" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD5FE3C03D4"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			operations 	(list Operations
-			    (object Operation "getExtensibilityElements"
-				quid       	"3B85C12C03CD"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addExtensibilityElement"
-				quid       	"3B85C1470295"
-				parameters 	(list Parameters
-				    (object Parameter "extElement"
-					type       	"IExtensibilityElement"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Class "Input"
-			quid       	"3AE0789F0059"
-			documentation 	"This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C504025F"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67722802E7"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FEE031D"
-				supplier   	"Logical View::wsdl::IInput"
-				quidu      	"3B84A7EE0015"))
-			language   	"Java")
-		    (object Class "Output"
-			quid       	"3AE078B60232"
-			documentation 	"This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B85C50C035B"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723500DD"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F1FF801CD"
-				supplier   	"Logical View::wsdl::IOutput"
-				quidu      	"3B84A829027D"))
-			language   	"Java")
-		    (object Class "Fault"
-			quid       	"3AE078BE0108"
-			documentation 	"This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE1C82002F2"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD")
-			    (object Inheritance_Relationship
-				quid       	"3F67723D0319"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")
-			    (object Inheritance_Relationship
-				quid       	"3F6F2002002D"
-				supplier   	"Logical View::wsdl::IFault"
-				quidu      	"3B84A861031D"))
-			language   	"Java")
-		    (object Class "BindingInput"
-			quid       	"3AE08A8202D4"
-			documentation 	"This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE1B0113"
-				supplier   	"Logical View::wsdl::IBindingInput"
-				quidu      	"3B84ADEB0100")
-			    (object Inheritance_Relationship
-				quid       	"3B85B59B0072"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getInput"
-				quid       	"3C8653A40203"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8653B503A2"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C1EA020E"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingOutput"
-			quid       	"3AE08A8F028C"
-			documentation 	"This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B84AE4302AB"
-				supplier   	"Logical View::wsdl::IBindingOutput"
-				quidu      	"3B84AE210111")
-			    (object Inheritance_Relationship
-				quid       	"3B85B5A4027E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"))
-			operations 	(list Operations
-			    (object Operation "getOutput"
-				quid       	"3C8653D900F1"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8653F10326"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85C20200BE"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "BindingFault"
-			quid       	"3AE08A9E03A6"
-			documentation 	"This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE0938602C9"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3B84AE710333"
-				supplier   	"Logical View::wsdl::IBindingFault"
-				quidu      	"3B84AE4F00BD"))
-			operations 	(list Operations
-			    (object Operation "getFault"
-				quid       	"3C865413037F"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFault"
-				quid       	"3C8654210109"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B85BF9E014A"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "QName"
-			quid       	"3AE8ED220140"
-			documentation 	"This class represents the javax.wsdl.QName class. A QName is a fully qualified name."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.xml.namespace.QName"
-				quid       	"3B849DA9003D"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "Namespace"
-			quid       	"3AEA3CD30030"
-			documentation 	"This class represents a namespace and the corresponding namespace prefix used in a WSDL document."
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "URI"
-				quid       	"3AEA3D2901B1"
-				type       	"String")
-			    (object ClassAttribute "prefix"
-				quid       	"3AEA3D320236"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "OperationType"
-			quid       	"3AEB4782024F"
-			documentation 	
-|ONE_WAY=1
-|REQUEST_RESPONSE=2
-|SOLICIT_RESPONSE=3
-|NOTIFICATION=4
-			
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.OperationType"
-				quid       	"3B85C35303E3"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "IPortType"
-			quid       	"3B84A5BE0331"
-			documentation 	"This class represents the javax.wsdl.PortType non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addOperation"
-				quid       	"3B896AC101CA"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3B896BAF01A4"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperations"
-				quid       	"3B896BF7031A"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.PortType"
-				quid       	"3B84A632000D"
-				stereotype 	"javaclass")))
-		    (object Class "IOperation"
-			quid       	"3B84A77600D1"
-			documentation 	"This class represents the javax.wsdl.Operation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addFault"
-				quid       	"3B896C420065"
-				parameters 	(list Parameters
-				    (object Parameter "fault"
-					type       	"IFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFault"
-				quid       	"3B896C59028F"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFaults"
-				quid       	"3B896C7102B1"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParameterOrdering"
-				quid       	"3B896C8101B0"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setParameterOrdering"
-				quid       	"3B896C99031D"
-				parameters 	(list Parameters
-				    (object Parameter "parameterOrder"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInput"
-				quid       	"3C8654E5018D"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInput"
-				quid       	"3C8662C40107"
-				parameters 	(list Parameters
-				    (object Parameter "input"
-					type       	"IInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOutput"
-				quid       	"3C8662E40094"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOutput"
-				quid       	"3C8662F001D2"
-				parameters 	(list Parameters
-				    (object Parameter "output"
-					type       	"IOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Operation"
-				quid       	"3B84A799012B"
-				stereotype 	"javaclass")))
-		    (object Class "IInput"
-			quid       	"3B84A7EE0015"
-			documentation 	"This class represents the javax.wsdl.Input non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86633100EF"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8663470277"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Input"
-				quid       	"3B84A8000039"
-				stereotype 	"javaclass")))
-		    (object Class "IOutput"
-			quid       	"3B84A829027D"
-			documentation 	"This class represents the javax.wsdl.Output non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86643A035D"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C86644501C8"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Output"
-				quid       	"3B84A83901D5"
-				stereotype 	"javaclass")))
-		    (object Class "IFault"
-			quid       	"3B84A861031D"
-			documentation 	"This class represents the javax.wsdl.Fault non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getMessage"
-				quid       	"3C86646A00BD"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setMessage"
-				quid       	"3C8664750131"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Fault"
-				quid       	"3B84A8710208"
-				stereotype 	"javaclass")))
-		    (object Class "IMessage"
-			quid       	"3B84A8AF004F"
-			documentation 	"This class represents the javax.wsdl.Message non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPart"
-				quid       	"3B8972240273"
-				parameters 	(list Parameters
-				    (object Parameter "part"
-					type       	"IPart"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPart"
-				quid       	"3B89723D0233"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getParts"
-				quid       	"3B897254025E"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOrderedParts"
-				quid       	"3B897261020D"
-				parameters 	(list Parameters
-				    (object Parameter "partOrder"
-					type       	"IList"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Message"
-				quid       	"3B84A8BC0260"
-				stereotype 	"javaclass")))
-		    (object Class "IPart"
-			quid       	"3B84A93F01BE"
-			documentation 	"This class represents the javax.wsdl.Part non-MOF interface"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "setExtensionAttribute"
-				quid       	"3C4688450052"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName")
-				    (object Parameter "value"
-					type       	"QName"))
-				exceptions 	"WSDLException"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttributeNames"
-				quid       	"3C468A0101C3"
-				result     	"IIterator"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionAttribute"
-				quid       	"3C468A2D02D5"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"QName"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Part"
-				quid       	"3B84A9500231"
-				stereotype 	"javaclass")))
-		    (object Class "IService"
-			quid       	"3B84AB490287"
-			documentation 	"This class represents the javax.wsdl.Service non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addPort"
-				quid       	"3B895D5601D1"
-				parameters 	(list Parameters
-				    (object Parameter "port"
-					type       	"IPort"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPorts"
-				quid       	"3B895DA20036"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPort"
-				quid       	"3B895DB001BC"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Service"
-				quid       	"3B84AB5B003E"
-				stereotype 	"javaclass")))
-		    (object Class "IPort"
-			quid       	"3B84AB800326"
-			documentation 	"This class represents the javax.wsdl.Port non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getBinding"
-				quid       	"3C8651F302B5"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBinding"
-				quid       	"3C86526302F2"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Port"
-				quid       	"3B84AB8C0016"
-				stereotype 	"javaclass")))
-		    (object Class "IBinding"
-			quid       	"3B84ABC60219"
-			documentation 	"This class represents the javax.wsdl.Binding non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingOperation"
-				quid       	"3B895F160153"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOperation"
-					type       	"IBindingOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperation"
-				quid       	"3B895F500066"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String")
-				    (object Parameter "inputName"
-					type       	"String")
-				    (object Parameter "outputName"
-					type       	"String"))
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOperations"
-				quid       	"3B895FA401C5"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3C8652A90284"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setPortType"
-				quid       	"3C8652BE01A8"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Binding"
-				quid       	"3B84ABCF0302"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOperation"
-			quid       	"3B84ADC00072"
-			documentation 	"This class represents the javax.wsdl.BindingOperation non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBindingFault"
-				quid       	"3B8960BC0041"
-				parameters 	(list Parameters
-				    (object Parameter "bindingFault"
-					type       	"IBindingFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFault"
-				quid       	"3B8960D9009D"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"String"))
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingFaults"
-				quid       	"3B8960FC0061"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOperation"
-				quid       	"3C86532D0017"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setOperation"
-				quid       	"3C86533F037B"
-				parameters 	(list Parameters
-				    (object Parameter "operation"
-					type       	"IOperation"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingInput"
-				quid       	"3C86550900DA"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingInput"
-				quid       	"3C86551D007F"
-				parameters 	(list Parameters
-				    (object Parameter "bindingInput"
-					type       	"IBindingInput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindingOutput"
-				quid       	"3C8655340349"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBindingOutput"
-				quid       	"3C86554702A6"
-				parameters 	(list Parameters
-				    (object Parameter "bindingOutput"
-					type       	"IBindingOutput"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOperation"
-				quid       	"3B84ADCB021C"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingInput"
-			quid       	"3B84ADEB0100"
-			documentation 	"This class represents the javax.wsdl.BindingInput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingInput"
-				quid       	"3B84ADFE000D"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingOutput"
-			quid       	"3B84AE210111"
-			documentation 	"This class represents the javax.wsdl.BindingOutput non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingOutput"
-				quid       	"3B84AE2D0050"
-				stereotype 	"javaclass")))
-		    (object Class "IBindingFault"
-			quid       	"3B84AE4F00BD"
-			documentation 	"This class represents the javax.wsdl.BindingFault non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.BindingFault"
-				quid       	"3B84AE5F002A"
-				stereotype 	"javaclass")))
-		    (object Class "DOMElement"
-			quid       	"3B84AF3203DB"
-			documentation 	"This class represents the org.w3c.dom.Element non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B84AF560292"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensibilityElement"
-			quid       	"3B84B12402AB"
-			documentation 	"This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensibilityElement"
-				quid       	"3B84B13503D1"
-				stereotype 	"javaclass")))
-		    (object Class "IDefinition"
-			quid       	"3B84B1D90142"
-			documentation 	"This class represents the javax.wsdl.Definition non-MOF interface."
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "addBinding"
-				quid       	"3B8988F1039D"
-				parameters 	(list Parameters
-				    (object Parameter "binding"
-					type       	"IBinding"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addImport"
-				quid       	"3B8989490259"
-				parameters 	(list Parameters
-				    (object Parameter "importDef"
-					type       	"IImport"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addMessage"
-				quid       	"3B89896E005E"
-				parameters 	(list Parameters
-				    (object Parameter "message"
-					type       	"IMessage"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addNamespace"
-				quid       	"3B898984004B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String")
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addPortType"
-				quid       	"3B8989C50045"
-				parameters 	(list Parameters
-				    (object Parameter "portType"
-					type       	"IPortType"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addService"
-				quid       	"3B8989E401EE"
-				parameters 	(list Parameters
-				    (object Parameter "service"
-					type       	"IService"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingFault"
-				quid       	"3B898A17038C"
-				result     	"IBindingFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingInput"
-				quid       	"3B898A320286"
-				result     	"IBindingInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOutput"
-				quid       	"3B898A46013B"
-				result     	"IBindingOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBindingOperation"
-				quid       	"3B898A5C00B0"
-				result     	"IBindingOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createBinding"
-				quid       	"3B8989FE037C"
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createFault"
-				quid       	"3B898A7502E7"
-				result     	"IFault"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createImport"
-				quid       	"3B898A83014C"
-				result     	"IImport"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createInput"
-				quid       	"3B898A9D033E"
-				result     	"IInput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createMessage"
-				quid       	"3B898AAF0254"
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOperation"
-				quid       	"3B898AC203C4"
-				result     	"IOperation"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createOutput"
-				quid       	"3B898AE800ED"
-				result     	"IOutput"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPart"
-				quid       	"3B898AF8026D"
-				result     	"IPart"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPort"
-				quid       	"3B898B0801DA"
-				result     	"IPort"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createPortType"
-				quid       	"3B898B15039B"
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createService"
-				quid       	"3B898B32013A"
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBinding"
-				quid       	"3B898B420075"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBindings"
-				quid       	"3B898B920341"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BCD0060"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getImports"
-				quid       	"3B898BE70144"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessage"
-				quid       	"3B898C170107"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getMessages"
-				quid       	"3B898C3E001D"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespace"
-				quid       	"3B898C62014B"
-				parameters 	(list Parameters
-				    (object Parameter "prefix"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getNamespaces"
-				quid       	"3B898C740115"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortType"
-				quid       	"3B898CBE0071"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPortTypes"
-				quid       	"3B898CDA01C6"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getPrefix"
-				quid       	"3B898CFD0017"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getService"
-				quid       	"3B898D2300A8"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getServices"
-				quid       	"3B898D3B03CE"
-				result     	"IMap"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getExtensionRegistry"
-				quid       	"3B89D5B8012B"
-				result     	"IExtensionRegistry"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setExtensionRegistry"
-				quid       	"3B89D5D703BB"
-				parameters 	(list Parameters
-				    (object Parameter "extensionRegistry"
-					type       	"IExtensionRegistry"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDocumentBaseURI"
-				quid       	"3B89D5FE0208"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDocumentBaseURI"
-				quid       	"3B89D6180328"
-				parameters 	(list Parameters
-				    (object Parameter "documentBase"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createTypes"
-				quid       	"3CADD0560080"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeService"
-				quid       	"3CADD07E004C"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IService"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeBinding"
-				quid       	"3CADD0BA0355"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IBinding"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removePortType"
-				quid       	"3CADD0D8029A"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IPortType"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "removeMessage"
-				quid       	"3CADD0FA0307"
-				parameters 	(list Parameters
-				    (object Parameter "name"
-					type       	"QName"))
-				result     	"IMessage"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getTypes"
-				quid       	"3C86706F031B"
-				result     	"ITypes"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setTypes"
-				quid       	"3C86709500EE"
-				parameters 	(list Parameters
-				    (object Parameter "types"
-					type       	"ITypes"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Definition"
-				quid       	"3B84B1E702A1"
-				stereotype 	"javaclass")))
-		    (object Class "IImport"
-			quid       	"3B84B2020119"
-			documentation 	"This class represents the javax.wsdl.Import non-MOF interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Import"
-				quid       	"3B84B20C02EA"
-				stereotype 	"javaclass")))
-		    (object Class "IList"
-			quid       	"3B85C0A203C5"
-			documentation 	"This class represents the non-MOF java.util.List interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"3B85C0AF0297"
-				stereotype 	"javaclass")))
-		    (object Class "IMap"
-			quid       	"3B896B0300D4"
-			documentation 	"This class represents the non-MOF java.util.Map interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Map"
-				quid       	"3B896B1102B5"
-				stereotype 	"javaclass")))
-		    (object Class "IURL"
-			quid       	"3B89D5630274"
-			documentation 	"This class represents the non-MOF java.net.URL interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.net.URL"
-				quid       	"3B89D56E03E2"
-				stereotype 	"javaclass")))
-		    (object Class "IExtensionRegistry"
-			quid       	"3B89D59302A5"
-			documentation 	"This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.ExtensionRegistry"
-				quid       	"3B89D59F02E8"
-				stereotype 	"javaclass")))
-		    (object Class "Types"
-			quid       	"3B8BE9A603A8"
-			documentation 	"This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B8BEB010311"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A")
-			    (object Inheritance_Relationship
-				quid       	"3CADCD3B0380"
-				supplier   	"Logical View::wsdl::ITypes"
-				quidu      	"3CADCBB20050"))
-			operations 	(list Operations
-			    (object Operation "getSchemas"
-				quid       	"3CADCF3803E6"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSchemas"
-				quid       	"3CADCF7E0301"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String"))
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)))
-		    (object Class "IIterator"
-			quid       	"3C4687DA0167"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.Iterator"
-				quid       	"3C46880800B9"
-				stereotype 	"javaclass")))
-		    (object Class "WSDLException"
-			quid       	"3C4689650313"
-			documentation 	"This class represents the javax.wsdl.Exception class."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.WSDLException"
-				quid       	"3C4689740315"
-				stereotype 	"javaclass")))
-		    (object Class "ITypes"
-			quid       	"3CADCBB20050"
-			documentation 	"This class represents the javax.wsdl.Types non-MOF interface"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.Types"
-				quid       	"3CADCBF10173"
-				stereotype 	"javaclass")))
-		    (object Class "UnknownExtensibilityElement"
-			quid       	"3CB24AC002AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CB24AEC01CB"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "XSDSchemaExtensibilityElement"
-			quid       	"3CC360D7039C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3CC3627F00B7"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")))
-		    (object Class "DOMDocument"
-			quid       	"3CD1502C023B"
-			documentation 	"This class represents the org.w3c.dom.Document non-MOF interface."
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3CD150600182"
-				stereotype 	"javaclass")))
-		    (object Class "MessageReference"
-			quid       	"3F6771DB02DC"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3F762A6A0308"
-				supplier   	"Logical View::wsdl::WSDLElement"
-				quidu      	"3AD5C6A302DD"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3F6780A001AB"
-				type       	"String"
-				exportControl 	"Protected"))
-			language   	"Java"
-			abstract   	TRUE)
-		    (object Association "$UNNAMED$0"
-			quid       	"3AD5C824018C"
-			roles      	(list role_list
-			    (object Role "portType"
-				quid       	"3AD5C82701C3"
-				label      	"portType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				Containment 	"By Value"
-				is_aggregate 	TRUE)
-			    (object Role "eOperations"
-				quid       	"3AD5C82701CD"
-				label      	"eOperations"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$1"
-			quid       	"3AD5CEBE00E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$2"
-				quid       	"3AD5CEBF0057"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eParts"
-				quid       	"3AD5CEBF0061"
-				label      	"eParts"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$3"
-			quid       	"3AD5D352010F"
-			roles      	(list role_list
-			    (object Role "ePortType"
-				quid       	"3AD5D3540176"
-				label      	"ePortType"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$4"
-				quid       	"3AD5D3540180"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261")))
-		    (object Association "$UNNAMED$5"
-			quid       	"3AD5D3E10179"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$6"
-				quid       	"3AD5D3E20225"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindingOperations"
-				quid       	"3AD5D3E20239"
-				label      	"eBindingOperations"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$7"
-			quid       	"3AD5D425038A"
-			roles      	(list role_list
-			    (object Role "eOperation"
-				quid       	"3AD5D42602F5"
-				label      	"eOperation"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$8"
-				quid       	"3AD5D42602FF"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145")))
-		    (object Association "$UNNAMED$9"
-			quid       	"3AD5D9400393"
-			roles      	(list role_list
-			    (object Role "ePorts"
-				quid       	"3AD5D941031C"
-				label      	"ePorts"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$10"
-				quid       	"3AD5D941031D"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$11"
-			quid       	"3AD5D9B8011F"
-			roles      	(list role_list
-			    (object Role "eBinding"
-				quid       	"3AD5D9B9024D"
-				label      	"eBinding"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$12"
-				quid       	"3AD5D9B90261"
-				supplier   	"Logical View::wsdl::Port"
-				quidu      	"3AD5D9170286")))
-		    (object Association "$UNNAMED$13"
-			quid       	"3AD5E60301E2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$14"
-				quid       	"3AD5E60400B7"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eMessages"
-				quid       	"3AD5E60400C1"
-				label      	"eMessages"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$15"
-			quid       	"3AD5E6710104"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$16"
-				quid       	"3AD5E672034A"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "ePortTypes"
-				quid       	"3AD5E6720354"
-				label      	"ePortTypes"
-				supplier   	"Logical View::wsdl::PortType"
-				quidu      	"3AD5C7F001A5"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$17"
-			quid       	"3AD5E6770095"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$18"
-				quid       	"3AD5E6780371"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eBindings"
-				quid       	"3AD5E678037B"
-				label      	"eBindings"
-				supplier   	"Logical View::wsdl::Binding"
-				quidu      	"3AD5D2860261"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$19"
-			quid       	"3AD5E67B0311"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$20"
-				quid       	"3AD5E67D007F"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eServices"
-				quid       	"3AD5E67D0089"
-				label      	"eServices"
-				supplier   	"Logical View::wsdl::Service"
-				quidu      	"3AD5D8F002F8"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$21"
-			quid       	"3AD5FD130079"
-			roles      	(list role_list
-			    (object Role "eExtensibilityElements"
-				quid       	"3AD5FD14019D"
-				label      	"eExtensibilityElements"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$22"
-				quid       	"3AD5FD14019E"
-				supplier   	"Logical View::wsdl::ExtensibleElement"
-				quidu      	"3AD5FCFA033A"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$23"
-			quid       	"3ADF2E6401F5"
-			roles      	(list role_list
-			    (object Role "eBindingInput"
-				quid       	"3ADF2E650251"
-				label      	"eBindingInput"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$24"
-				quid       	"3ADF2E650252"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$25"
-			quid       	"3ADF2EB30163"
-			roles      	(list role_list
-			    (object Role "eBindingOutput"
-				quid       	"3ADF2EB4013C"
-				label      	"eBindingOutput"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$26"
-				quid       	"3ADF2EB4013D"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$27"
-			quid       	"3ADF2F94024D"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3ADF2F950190"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$28"
-				quid       	"3ADF2F95019A"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$29"
-			quid       	"3ADF2FB802F9"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3ADF2FB9020A"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$30"
-				quid       	"3ADF2FB9020B"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$31"
-			quid       	"3ADF331601A4"
-			roles      	(list role_list
-			    (object Role "eFaults"
-				quid       	"3ADF33180387"
-				label      	"eFaults"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$32"
-				quid       	"3ADF33180388"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$33"
-			quid       	"3ADF340003E5"
-			roles      	(list role_list
-			    (object Role "eBindingFaults"
-				quid       	"3ADF340103AA"
-				label      	"eBindingFaults"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$34"
-				quid       	"3ADF340103AB"
-				supplier   	"Logical View::wsdl::BindingOperation"
-				quidu      	"3AD5D3CB0145"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$35"
-			quid       	"3AE091F402F3"
-			roles      	(list role_list
-			    (object Role "eFault"
-				quid       	"3AE091F801FE"
-				label      	"eFault"
-				supplier   	"Logical View::wsdl::Fault"
-				quidu      	"3AE078BE0108"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$36"
-				quid       	"3AE091F801FF"
-				supplier   	"Logical View::wsdl::BindingFault"
-				quidu      	"3AE08A9E03A6")))
-		    (object Association "$UNNAMED$37"
-			quid       	"3AEA3D55002D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$38"
-				quid       	"3AEA3D560328"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eNamespaces"
-				quid       	"3AEA3D560332"
-				label      	"eNamespaces"
-				supplier   	"Logical View::wsdl::Namespace"
-				quidu      	"3AEA3CD30030"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$39"
-			quid       	"3AEA3E3A002D"
-			roles      	(list role_list
-			    (object Role "eDefinition"
-				quid       	"3AEA3E3C01E8"
-				label      	"eDefinition"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$40"
-				quid       	"3AEA3E3C01F2"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$41"
-			quid       	"3AEA412F0035"
-			roles      	(list role_list
-			    (object Role "eParameterOrdering"
-				quid       	"3AEA41310255"
-				label      	"eParameterOrdering"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$42"
-				quid       	"3AEA4131025F"
-				supplier   	"Logical View::wsdl::Operation"
-				quidu      	"3AD5C80D03CE")))
-		    (object Association "$UNNAMED$43"
-			quid       	"3B84AD2400BD"
-			roles      	(list role_list
-			    (object Role "eInput"
-				quid       	"3B84AD250083"
-				label      	"eInput"
-				supplier   	"Logical View::wsdl::Input"
-				quidu      	"3AE0789F0059"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$44"
-				quid       	"3B84AD250084"
-				supplier   	"Logical View::wsdl::BindingInput"
-				quidu      	"3AE08A8202D4")))
-		    (object Association "$UNNAMED$45"
-			quid       	"3B84AD7900F2"
-			roles      	(list role_list
-			    (object Role "eOutput"
-				quid       	"3B84AD7A014D"
-				label      	"eOutput"
-				supplier   	"Logical View::wsdl::Output"
-				quidu      	"3AE078B60232"
-				client_cardinality 	(value cardinality "1..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$46"
-				quid       	"3B84AD7A014E"
-				supplier   	"Logical View::wsdl::BindingOutput"
-				quidu      	"3AE08A8F028C")))
-		    (object Association "$UNNAMED$47"
-			quid       	"3B8B1BE900C4"
-			roles      	(list role_list
-			    (object Role "typeDefinition"
-				quid       	"3B8B1BE90327"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$48"
-				quid       	"3B8B1BE90331"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$49"
-			quid       	"3B8B1C1203B2"
-			roles      	(list role_list
-			    (object Role "elementDeclaration"
-				quid       	"3B8B1C14001C"
-				label      	"elementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$50"
-				quid       	"3B8B1C140026"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$51"
-			quid       	"3B8B1DCC02E5"
-			roles      	(list role_list
-			    (object Role "eSchema"
-				quid       	"3B8B1DCE0270"
-				label      	"eSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$52"
-				quid       	"3B8B1DCE027A"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE")))
-		    (object Association "$UNNAMED$53"
-			quid       	"3B8BEA27029F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$54"
-				quid       	"3B8BEA290356"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "eTypes"
-				quid       	"3B8BEA29036A"
-				label      	"eTypes"
-				supplier   	"Logical View::wsdl::Types"
-				quidu      	"3B8BE9A603A8"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$55"
-			quid       	"3C46829303E5"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3C468296010E"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$56"
-				quid       	"3C4682960118"
-				supplier   	"Logical View::wsdl::Part"
-				quidu      	"3AD5CE1C032E")))
-		    (object Association "$UNNAMED$57"
-			quid       	"3C864DFF02EC"
-			roles      	(list role_list
-			    (object Role "eImports"
-				quid       	"3C864DFF02ED"
-				label      	"eImports"
-				supplier   	"Logical View::wsdl::Import"
-				quidu      	"3AD5E4F903DE"
-				client_cardinality 	(value cardinality "0..n")
-				Constraints 	"ordered"
-				Containment 	"By Value"
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$58"
-				quid       	"3C864DFF02EE"
-				supplier   	"Logical View::wsdl::Definition"
-				quidu      	"3AD5E43F008E"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)))
-		    (object Association "$UNNAMED$59"
-			quid       	"3CC3614500F2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$60"
-				quid       	"3CC36146023D"
-				supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-				quidu      	"3CC360D7039C"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	TRUE)
-			    (object Role "schema"
-				quid       	"3CC36146023E"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$61"
-			quid       	"3F74E78401B1"
-			roles      	(list role_list
-			    (object Role "eMessage"
-				quid       	"3F74E786000F"
-				label      	"eMessage"
-				supplier   	"Logical View::wsdl::Message"
-				quidu      	"3AD5C9590078"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$62"
-				quid       	"3F74E7860023"
-				supplier   	"Logical View::wsdl::MessageReference"
-				quidu      	"3F6771DB02DC")))
-		    (object Association "$UNNAMED$63"
-			quid       	"3F7896A2026E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$64"
-				quid       	"3F7896A7012B"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "1")
-				is_aggregate 	TRUE)
-			    (object Role "children"
-				quid       	"3F7896A7012C"
-				label      	"children"
-				supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-				quidu      	"3CB24AC002AE"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "2.7 Services"
-			quid       	"39AD3EF60127"
-			title      	"2.7 Services"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @1
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1173, 660)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1173, 610)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				compartment 	(object Compartment
-				    Parent_View 	@1
-				    location   	(1173, 715)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	471)
-				width      	520
-				height     	404
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPort" @2
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(686, 481)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IPort")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(686, 431)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB800326"
-				compartment 	(object Compartment
-				    Parent_View 	@2
-				    location   	(686, 536)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	275)
-				width      	278
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IService" @3
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(126, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"IService")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(126, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AB490287"
-				compartment 	(object Compartment
-				    Parent_View 	@3
-				    location   	(126, 145)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	237)
-				width      	246
-				height     	264
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @4
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@4
-				    location   	(44, 432)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				compartment 	(object Compartment
-				    Parent_View 	@4
-				    location   	(44, 487)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	389)
-				width      	410
-				height     	214
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @5
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954E01B4"
-				client     	@4
-				supplier   	@3
-				line_style 	3
-				origin_attachment 	(240, 421)
-				terminal_attachment 	(240, 292))
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @6
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@6
-				    location   	(1244, 1168)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@6
-				    location   	(1244, 1223)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	389)
-				width      	410
-				height     	214
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @7
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@6
-				supplier   	@1
-				line_style 	3
-				origin_attachment 	(1430, 1157)
-				terminal_attachment 	(1430, 1002))
-			    (object ClassView "Class" "Logical View::wsdl::Port" @8
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 912)
-				label      	(object ItemLabel
-				    Parent_View 	@8
-				    location   	(675, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	282
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				compartment 	(object Compartment
-				    Parent_View 	@8
-				    location   	(675, 895)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	303)
-				width      	300
-				height     	168
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @9
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85954502C9"
-				client     	@8
-				supplier   	@2
-				line_style 	3
-				origin_attachment 	(809, 828)
-				terminal_attachment 	(809, 637))
-			    (object AssociationViewNew "$UNNAMED$9" @10
-				location   	(321, 916)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9400393"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePorts" @11
-					Parent_View 	@10
-					location   	(-143, 644)
-					label      	(object SegLabel @12
-					    Parent_View 	@11
-					    location   	(397, 945)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+ePorts"
-					    pctDist    	0.218978
-					    height     	29
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031C"
-					client     	@10
-					supplier   	@8
-					line_style 	3
-					origin_attachment 	(321, 916)
-					terminal_attachment 	(666, 916)
-					label      	(object SegLabel @13
-					    Parent_View 	@11
-					    location   	(530, 880)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	160
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.608000
-					    height     	37
-					    orientation 	0)
-					label      	(object SegLabel @14
-					    Parent_View 	@11
-					    location   	(433, 990)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.328467
-					    height     	74
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$10" @15
-					Parent_View 	@10
-					location   	(-143, 644)
-					label      	(object SegLabel @16
-					    Parent_View 	@15
-					    location   	(216, 704)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D941031D"
-					client     	@10
-					supplier   	@4
-					vertices   	(list Points
-					    (321, 916)
-					    (257, 916)
-					    (257, 635))
-					line_style 	3
-					origin_attachment 	(321, 916)
-					terminal_attachment 	(257, 635)
-					label      	(object SegLabel @17
-					    Parent_View 	@15
-					    location   	(301, 760)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.637097
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$11" @18
-				location   	(886, 1270)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D9B8011F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBinding" @19
-					Parent_View 	@18
-					location   	(38, 422)
-					label      	(object SegLabel @20
-					    Parent_View 	@19
-					    location   	(1112, 1235)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eBinding"
-					    pctDist    	0.648571
-					    height     	36
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B9024D"
-					client     	@18
-					supplier   	@6
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(1235, 1270)
-					label      	(object SegLabel @21
-					    Parent_View 	@19
-					    location   	(1170, 1313)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.814286
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$12" @22
-					Parent_View 	@18
-					location   	(38, 422)
-					label      	(object SegLabel @23
-					    Parent_View 	@22
-					    location   	(852, 1106)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	""
-					    pctDist    	0.687943
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D9B90261"
-					client     	@18
-					supplier   	@8
-					vertices   	(list Points
-					    (886, 1270)
-					    (812, 1270)
-					    (812, 996))
-					line_style 	3
-					origin_attachment 	(886, 1270)
-					terminal_attachment 	(812, 996))))))
-		    (object ClassDiagram "2.5 Bindings"
-			quid       	"39AD51270252"
-			title      	"2.5 Bindings"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IBinding" @24
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(73, 114)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"IBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(73, 64)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ABC60219"
-				compartment 	(object Compartment
-				    Parent_View 	@24
-				    location   	(73, 172)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	471)
-				width      	480
-				height     	376
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOperation" @25
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 352)
-				label      	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(780, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"IBindingOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(780, 80)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	392
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADC00072"
-				compartment 	(object Compartment
-				    Parent_View 	@25
-				    location   	(780, 188)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	9
-				    max_width  	396)
-				width      	410
-				height     	568
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingInput" @26
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(62, 1334)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"IBindingInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@26
-				    location   	(62, 1284)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	260
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84ADEB0100"
-				width      	278
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingOutput" @27
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@27
-				    location   	(61, 1638)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"IBindingOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@27
-				    location   	(61, 1588)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE210111"
-				width      	312
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IBindingFault" @28
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(72, 1958)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"IBindingFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@28
-				    location   	(72, 1908)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84AE4F00BD"
-				width      	290
-				height     	176
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @29
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(1697, 522)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@29
-				    location   	(1697, 580)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	411)
-				width      	432
-				height     	228
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @30
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(1756, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @31
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@31
-				    location   	(1756, 1587)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @32
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@32
-				    location   	(97, 586)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@32
-				    location   	(97, 644)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	411)
-				width      	432
-				height     	228
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @33
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8595410129"
-				client     	@32
-				supplier   	@24
-				line_style 	3
-				origin_attachment 	(279, 574)
-				terminal_attachment 	(279, 428))
-			    (object AssociationViewNew "$UNNAMED$3" @34
-				location   	(1104, 742)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D352010F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePortType" @35
-					Parent_View 	@34
-					location   	(640, 598)
-					label      	(object SegLabel @36
-					    Parent_View 	@35
-					    location   	(1565, 781)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+ePortType"
-					    pctDist    	0.789292
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540176"
-					client     	@34
-					supplier   	@29
-					line_style 	3
-					origin_attachment 	(1104, 742)
-					terminal_attachment 	(1688, 742)
-					label      	(object SegLabel @37
-					    Parent_View 	@35
-					    location   	(1613, 716)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.872193
-					    height     	27
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$4" @38
-					Parent_View 	@34
-					location   	(640, 598)
-					label      	(object SegLabel @39
-					    Parent_View 	@38
-					    location   	(806, 697)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	""
-					    pctDist    	0.509449
-					    height     	46
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3540180"
-					client     	@34
-					supplier   	@32
-					line_style 	3
-					origin_attachment 	(1104, 742)
-					terminal_attachment 	(520, 742))))
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @40
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@40
-				    location   	(1672, 898)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				compartment 	(object Compartment
-				    Parent_View 	@40
-				    location   	(1672, 956)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	430)
-				width      	450
-				height     	276
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @41
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@41
-				    location   	(476, 1283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				compartment 	(object Compartment
-				    Parent_View 	@41
-				    location   	(476, 1341)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$43" @42
-				location   	(1264, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD2400BD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @43
-					Parent_View 	@42
-					location   	(96, 287)
-					label      	(object SegLabel @44
-					    Parent_View 	@43
-					    location   	(1637, 1316)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.775148
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250083"
-					client     	@42
-					supplier   	@30
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(1747, 1359)
-					label      	(object SegLabel @45
-					    Parent_View 	@43
-					    location   	(1694, 1398)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.889546
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$44" @46
-					Parent_View 	@42
-					location   	(96, 287)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD250084"
-					client     	@42
-					supplier   	@41
-					line_style 	3
-					origin_attachment 	(1264, 1359)
-					terminal_attachment 	(781, 1359))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @47
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 1664)
-				label      	(object ItemLabel
-				    Parent_View 	@47
-				    location   	(812, 1539)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				compartment 	(object Compartment
-				    Parent_View 	@47
-				    location   	(812, 1597)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$45" @48
-				location   	(1432, 1654)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AD7900F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @49
-					Parent_View 	@48
-					location   	(-120, 374)
-					label      	(object SegLabel @50
-					    Parent_View 	@49
-					    location   	(1645, 1612)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.674772
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014D"
-					client     	@48
-					supplier   	@31
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1747, 1654)
-					label      	(object SegLabel @51
-					    Parent_View 	@49
-					    location   	(1681, 1697)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.790274
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$46" @52
-					Parent_View 	@48
-					location   	(-120, 374)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B84AD7A014E"
-					client     	@48
-					supplier   	@47
-					line_style 	3
-					origin_attachment 	(1432, 1654)
-					terminal_attachment 	(1117, 1654))))
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @53
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@53
-				    location   	(819, 931)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				compartment 	(object Compartment
-				    Parent_View 	@53
-				    location   	(819, 989)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	303)
-				width      	364
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @54
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84ADE401DC"
-				client     	@53
-				supplier   	@25
-				line_style 	3
-				origin_attachment 	(966, 919)
-				terminal_attachment 	(966, 636))
-			    (object AssociationViewNew "$UNNAMED$5" @55
-				location   	(433, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D3E10179"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$6" @56
-					Parent_View 	@55
-					location   	(-1343, 494)
-					label      	(object SegLabel @57
-					    Parent_View 	@56
-					    location   	(235, 877)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20225"
-					client     	@55
-					supplier   	@32
-					vertices   	(list Points
-					    (433, 1022)
-					    (276, 1022)
-					    (276, 802))
-					line_style 	3
-					origin_attachment 	(433, 1022)
-					terminal_attachment 	(276, 802)
-					label      	(object SegLabel @58
-					    Parent_View 	@56
-					    location   	(330, 841)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "eBindingOperations" @59
-					Parent_View 	@55
-					location   	(-1343, 494)
-					label      	(object SegLabel @60
-					    Parent_View 	@59
-					    location   	(513, 977)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+eBindingOperations"
-					    pctDist    	0.211699
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D3E20239"
-					client     	@55
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(433, 1022)
-					terminal_attachment 	(810, 1022)
-					label      	(object SegLabel @61
-					    Parent_View 	@59
-					    location   	(766, 980)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.884956
-					    height     	43
-					    orientation 	0)
-					label      	(object SegLabel @62
-					    Parent_View 	@59
-					    location   	(706, 1067)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.727564
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$7" @63
-				location   	(1418, 1040)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5D425038A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperation" @64
-					Parent_View 	@63
-					location   	(-358, 464)
-					label      	(object SegLabel @65
-					    Parent_View 	@64
-					    location   	(1520, 1079)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	228
-					    justify    	0
-					    label      	"+eOperation"
-					    pctDist    	0.420601
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602F5"
-					client     	@63
-					supplier   	@40
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1663, 1040)
-					label      	(object SegLabel @66
-					    Parent_View 	@64
-					    location   	(1589, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.696721
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$8" @67
-					Parent_View 	@63
-					location   	(-358, 464)
-					label      	(object SegLabel @68
-					    Parent_View 	@67
-					    location   	(1273, 1070)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.595420
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5D42602FF"
-					client     	@63
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(1418, 1040)
-					terminal_attachment 	(1174, 1040))))
-			    (object AssociationViewNew "$UNNAMED$23" @69
-				location   	(787, 1190)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2E6401F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingInput" @70
-					Parent_View 	@69
-					location   	(-381, 454)
-					label      	(object SegLabel @71
-					    Parent_View 	@70
-					    location   	(669, 1152)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+eBindingInput"
-					    pctDist    	0.511905
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650251"
-					client     	@69
-					supplier   	@41
-					vertices   	(list Points
-					    (787, 1190)
-					    (636, 1190)
-					    (636, 1271))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(636, 1271)
-					label      	(object SegLabel @72
-					    Parent_View 	@70
-					    location   	(685, 1222)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.440476
-					    height     	32
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$24" @73
-					Parent_View 	@69
-					location   	(-381, 454)
-					label      	(object SegLabel @74
-					    Parent_View 	@73
-					    location   	(885, 1144)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2E650252"
-					client     	@69
-					supplier   	@53
-					vertices   	(list Points
-					    (787, 1190)
-					    (926, 1190)
-					    (926, 1097))
-					line_style 	3
-					origin_attachment 	(787, 1190)
-					terminal_attachment 	(926, 1097)
-					label      	(object SegLabel @75
-					    Parent_View 	@73
-					    location   	(871, 1136)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.837758
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$25" @76
-				location   	(1024, 1312)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2EB30163"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingOutput" @77
-					Parent_View 	@76
-					location   	(-150, 578)
-					label      	(object SegLabel @78
-					    Parent_View 	@77
-					    location   	(1012, 1429)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	306
-					    justify    	0
-					    label      	"+eBindingOutput"
-					    pctDist    	0.545082
-					    height     	13
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013C"
-					client     	@76
-					supplier   	@47
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1527)
-					label      	(object SegLabel @79
-					    Parent_View 	@77
-					    location   	(967, 1479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.774590
-					    height     	58
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$26" @80
-					Parent_View 	@76
-					location   	(-150, 578)
-					label      	(object SegLabel @81
-					    Parent_View 	@80
-					    location   	(983, 1140)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2EB4013D"
-					client     	@76
-					supplier   	@53
-					line_style 	3
-					origin_attachment 	(1024, 1312)
-					terminal_attachment 	(1024, 1097)
-					label      	(object SegLabel @82
-					    Parent_View 	@80
-					    location   	(1031, 1186)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.590164
-					    height     	7
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @83
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1920, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@83
-				    location   	(1772, 1907)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				width      	314
-				height     	178
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @84
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@84
-				    location   	(1212, 1859)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				compartment 	(object Compartment
-				    Parent_View 	@84
-				    location   	(1212, 1917)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	303)
-				width      	314
-				height     	274
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @85
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE710333"
-				client     	@84
-				supplier   	@28
-				line_style 	3
-				origin_attachment 	(1203, 2007)
-				terminal_attachment 	(353, 2007))
-			    (object AssociationViewNew "$UNNAMED$33" @86
-				location   	(1356, 1352)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF340003E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eBindingFaults" @87
-					Parent_View 	@86
-					location   	(188, 616)
-					label      	(object SegLabel @88
-					    Parent_View 	@87
-					    location   	(1382, 1750)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	300
-					    justify    	0
-					    label      	"+eBindingFaults"
-					    pctDist    	0.803150
-					    height     	26
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AA"
-					client     	@86
-					supplier   	@84
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1356, 1847)
-					label      	(object SegLabel @89
-					    Parent_View 	@87
-					    location   	(1409, 1797)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899194
-					    height     	53
-					    orientation 	0)
-					label      	(object SegLabel @90
-					    Parent_View 	@87
-					    location   	(1256, 1806)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.919291
-					    height     	101
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$34" @91
-					Parent_View 	@86
-					location   	(188, 616)
-					label      	(object SegLabel @92
-					    Parent_View 	@91
-					    location   	(1076, 1197)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF340103AB"
-					client     	@86
-					supplier   	@53
-					vertices   	(list Points
-					    (1356, 1352)
-					    (1356, 1217)
-					    (1117, 1217)
-					    (1117, 1097))
-					line_style 	3
-					origin_attachment 	(1356, 1352)
-					terminal_attachment 	(1117, 1097)
-					label      	(object SegLabel @93
-					    Parent_View 	@91
-					    location   	(1152, 1164)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.687008
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$35" @94
-				location   	(1640, 1970)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE091F402F3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFault" @95
-					Parent_View 	@94
-					location   	(-344, 818)
-					label      	(object SegLabel @96
-					    Parent_View 	@95
-					    location   	(1674, 1915)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eFault"
-					    pctDist    	0.276423
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FE"
-					client     	@94
-					supplier   	@83
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1763, 1970)
-					label      	(object SegLabel @97
-					    Parent_View 	@95
-					    location   	(1718, 2012)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.642276
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$36" @98
-					Parent_View 	@94
-					location   	(-344, 818)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AE091F801FF"
-					client     	@94
-					supplier   	@84
-					line_style 	3
-					origin_attachment 	(1640, 1970)
-					terminal_attachment 	(1517, 1970))))
-			    (object InheritView "" @99
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE4302AB"
-				client     	@47
-				supplier   	@27
-				line_style 	3
-				origin_attachment 	(803, 1656)
-				terminal_attachment 	(364, 1656))
-			    (object InheritView "" @100
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84AE1B0113"
-				client     	@41
-				supplier   	@26
-				line_style 	3
-				origin_attachment 	(467, 1385)
-				terminal_attachment 	(331, 1385))))
-		    (object ClassDiagram "2.4 PortTypes"
-			quid       	"3AD5D1C40366"
-			title      	"2.4 PortTypes"
-			documentation 	"This class represents the non-MOF java.util.Iterator interface."
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IPortType" @101
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@101
-				    location   	(146, 172)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"IPortType")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@101
-				    location   	(146, 122)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	700
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A5BE0331"
-				compartment 	(object Compartment
-				    Parent_View 	@101
-				    location   	(146, 233)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	696)
-				width      	718
-				height     	196
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::IOperation" @102
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 208)
-				label      	(object ItemLabel
-				    Parent_View 	@102
-				    location   	(1116, 176)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"IOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@102
-				    location   	(1116, 126)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	873
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A77600D1"
-				compartment 	(object Compartment
-				    Parent_View 	@102
-				    location   	(1116, 237)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	709)
-				width      	891
-				height     	188
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IInput" @103
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@103
-				    location   	(55, 1437)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IInput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@103
-				    location   	(55, 1387)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A7EE0015"
-				compartment 	(object Compartment
-				    Parent_View 	@103
-				    location   	(55, 1498)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	621)
-				width      	644
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IOutput" @104
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@104
-				    location   	(56, 1757)
-				    fill_color 	16777215
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"IOutput")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@104
-				    location   	(56, 1707)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	656
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A829027D"
-				compartment 	(object Compartment
-				    Parent_View 	@104
-				    location   	(56, 1818)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	656)
-				width      	674
-				height     	194
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IFault" @105
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@105
-				    location   	(55, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"IFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@105
-				    location   	(55, 2026)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	626
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A861031D"
-				compartment 	(object Compartment
-				    Parent_View 	@105
-				    location   	(55, 2137)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	625)
-				width      	644
-				height     	196
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @106
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@106
-				    location   	(158, 672)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@106
-				    location   	(158, 733)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	409)
-				width      	695
-				height     	281
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @107
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2576, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@107
-				    location   	(2325, 692)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	502
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				compartment 	(object Compartment
-				    Parent_View 	@107
-				    location   	(2325, 753)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	484)
-				width      	520
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Fault" @108
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@108
-				    location   	(1647, 2060)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Fault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078BE0108"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Input" @109
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 1472)
-				label      	(object ItemLabel
-				    Parent_View 	@109
-				    location   	(870, 1422)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"Input")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE0789F0059"
-				width      	390
-				height     	125
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Output" @110
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@110
-				    location   	(1232, 1742)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"Output")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE078B60232"
-				width      	274
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Operation" @111
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@111
-				    location   	(1214, 620)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	677
-				    justify    	0
-				    label      	"Operation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C80D03CE"
-				compartment 	(object Compartment
-				    Parent_View 	@111
-				    location   	(1214, 681)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	446)
-				width      	695
-				height     	352
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$0" @112
-				location   	(1024, 797)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5C824018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOperations" @113
-					Parent_View 	@112
-					location   	(592, 269)
-					label      	(object SegLabel @114
-					    Parent_View 	@113
-					    location   	(1088, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+eOperations"
-					    pctDist    	0.359649
-					    height     	50
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701CD"
-					client     	@112
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(1205, 797)
-					label      	(object SegLabel @115
-					    Parent_View 	@113
-					    location   	(1176, 861)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.840391
-					    height     	64
-					    orientation 	1)
-					label      	(object SegLabel @116
-					    Parent_View 	@113
-					    location   	(1074, 923)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.276243
-					    height     	126
-					    orientation 	1))
-				    (object RoleView "portType" @117
-					Parent_View 	@112
-					location   	(592, 269)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5C82701C3"
-					client     	@112
-					supplier   	@106
-					line_style 	3
-					origin_attachment 	(1024, 797)
-					terminal_attachment 	(843, 797)
-					label      	(object SegLabel @118
-					    Parent_View 	@117
-					    location   	(888, 757)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.753488
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$41" @119
-				location   	(2107, 773)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA412F0035"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParameterOrdering" @120
-					Parent_View 	@119
-					location   	(1819, 101)
-					label      	(object SegLabel @121
-					    Parent_View 	@120
-					    location   	(2145, 647)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+eParameterOrdering"
-					    pctDist    	0.183333
-					    height     	127
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA41310255"
-					client     	@119
-					supplier   	@107
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(2316, 773)
-					label      	(object SegLabel @122
-					    Parent_View 	@120
-					    location   	(2272, 822)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.796610
-					    height     	49
-					    orientation 	1)
-					label      	(object SegLabel @123
-					    Parent_View 	@120
-					    location   	(2171, 888)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.306220
-					    height     	115
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$42" @124
-					Parent_View 	@119
-					location   	(1819, 101)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA4131025F"
-					client     	@119
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(2107, 773)
-					terminal_attachment 	(1899, 773))))
-			    (object AssociationViewNew "$UNNAMED$31" @125
-				location   	(1702, 1504)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF331601A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eFaults" @126
-					Parent_View 	@125
-					location   	(1414, 832)
-					label      	(object SegLabel @127
-					    Parent_View 	@126
-					    location   	(1815, 1982)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eFaults"
-					    pctDist    	0.878992
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180387"
-					client     	@125
-					supplier   	@108
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 2048)
-					label      	(object SegLabel @128
-					    Parent_View 	@126
-					    location   	(1644, 2020)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.949580
-					    height     	59
-					    orientation 	1)
-					label      	(object SegLabel @129
-					    Parent_View 	@126
-					    location   	(1593, 1963)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.845378
-					    height     	110
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$32" @130
-					Parent_View 	@125
-					location   	(1414, 832)
-					label      	(object SegLabel @131
-					    Parent_View 	@130
-					    location   	(1661, 1069)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF33180388"
-					client     	@125
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1702, 1504)
-					terminal_attachment 	(1702, 960)
-					label      	(object SegLabel @132
-					    Parent_View 	@130
-					    location   	(1821, 1039)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.857362
-					    height     	119
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$27" @133
-				location   	(1178, 1234)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2F94024D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eInput" @134
-					Parent_View 	@133
-					location   	(890, 562)
-					label      	(object SegLabel @135
-					    Parent_View 	@134
-					    location   	(878, 1343)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+eInput"
-					    pctDist    	0.819820
-					    height     	103
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F950190"
-					client     	@133
-					supplier   	@109
-					vertices   	(list Points
-					    (1178, 1234)
-					    (980, 1234)
-					    (980, 1410))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(980, 1410)
-					label      	(object SegLabel @136
-					    Parent_View 	@134
-					    location   	(1046, 1364)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.877660
-					    height     	66
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$28" @137
-					Parent_View 	@133
-					location   	(890, 562)
-					label      	(object SegLabel @138
-					    Parent_View 	@137
-					    location   	(1236, 1036)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2F95019A"
-					client     	@133
-					supplier   	@111
-					vertices   	(list Points
-					    (1178, 1234)
-					    (1277, 1234)
-					    (1277, 960))
-					line_style 	3
-					origin_attachment 	(1178, 1234)
-					terminal_attachment 	(1277, 960)
-					label      	(object SegLabel @139
-					    Parent_View 	@137
-					    location   	(1197, 1058)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736413
-					    height     	81
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$29" @140
-				location   	(1468, 1345)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3ADF2FB802F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eOutput" @141
-					Parent_View 	@140
-					location   	(1180, 673)
-					label      	(object SegLabel @142
-					    Parent_View 	@141
-					    location   	(1362, 1669)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+eOutput"
-					    pctDist    	0.840909
-					    height     	107
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020A"
-					client     	@140
-					supplier   	@110
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 1730)
-					label      	(object SegLabel @143
-					    Parent_View 	@141
-					    location   	(1546, 1676)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863636
-					    height     	78
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$30" @144
-					Parent_View 	@140
-					location   	(1180, 673)
-					label      	(object SegLabel @145
-					    Parent_View 	@144
-					    location   	(1427, 1037)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3ADF2FB9020B"
-					client     	@140
-					supplier   	@111
-					line_style 	3
-					origin_attachment 	(1468, 1345)
-					terminal_attachment 	(1468, 960)
-					label      	(object SegLabel @146
-					    Parent_View 	@144
-					    location   	(1523, 1080)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.690341
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @147
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FD8019F"
-				client     	@106
-				supplier   	@101
-				line_style 	0)
-			    (object InheritView "" @148
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FE20171"
-				client     	@111
-				supplier   	@102
-				line_style 	0)
-			    (object InheritView "" @149
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FEE031D"
-				client     	@109
-				supplier   	@103
-				line_style 	0)
-			    (object InheritView "" @150
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F1FF801CD"
-				client     	@110
-				supplier   	@104
-				line_style 	0)
-			    (object InheritView "" @151
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F2002002D"
-				client     	@108
-				supplier   	@105
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @152
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2224, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@152
-				    location   	(1937, 1312)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	575
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@152
-				    location   	(1937, 1371)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	425)
-				width      	593
-				height     	312
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::MessageReference" @153
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 2544)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@153
-				    location   	(1193, 2466)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	654
-				    justify    	0
-				    label      	"MessageReference")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3F6771DB02DC"
-				compartment 	(object Compartment
-				    Parent_View 	@153
-				    location   	(1193, 2527)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	303)
-				width      	672
-				height     	180
-				annotation 	8)
-			    (object InheritTreeView "" @154
-				location   	(1524, 2275)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@153
-				vertices   	(list Points
-				    (1524, 2275)
-				    (1524, 2454)))
-			    (object InheritView "" @155
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723D0319"
-				client     	@108
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(1776, 2176)
-				terminal_attachment 	(1776, 2275)
-				drawSupplier 	@154)
-			    (object InheritView "" @156
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67723500DD"
-				client     	@110
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(1371, 1854)
-				terminal_attachment 	(1371, 2275)
-				drawSupplier 	@154)
-			    (object InheritView "" @157
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F67722802E7"
-				client     	@109
-				supplier   	@153
-				line_style 	3
-				origin_attachment 	(980, 1534)
-				terminal_attachment 	(980, 2275)
-				drawSupplier 	@154)
-			    (object AssociationViewNew "$UNNAMED$61" @158
-				location   	(2206, 2259)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F74E78401B1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @159
-					Parent_View 	@158
-					location   	(734, -285)
-					label      	(object SegLabel @160
-					    Parent_View 	@159
-					    location   	(2068, 1670)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.912230
-					    height     	139
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E786000F"
-					client     	@158
-					supplier   	@152
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(2206, 1612)
-					label      	(object SegLabel @161
-					    Parent_View 	@159
-					    location   	(2260, 1678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$62" @162
-					Parent_View 	@158
-					location   	(734, -285)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F74E7860023"
-					client     	@158
-					supplier   	@153
-					vertices   	(list Points
-					    (2206, 2259)
-					    (2206, 2556)
-					    (1856, 2556))
-					line_style 	3
-					origin_attachment 	(2206, 2259)
-					terminal_attachment 	(1856, 2556))))))
-		    (object ClassDiagram "2.1 Definitions"
-			quid       	"3AD5E48A0262"
-			title      	"2.1 Definitions"
-			zoom       	83
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IDefinition" @163
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 192)
-				label      	(object ItemLabel
-				    Parent_View 	@163
-				    location   	(88, 161)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"IDefinition")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@163
-				    location   	(88, 111)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	688
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B1D90142"
-				compartment 	(object Compartment
-				    Parent_View 	@163
-				    location   	(88, 220)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	700)
-				width      	706
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @164
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@164
-				    location   	(1686, 896)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	294
-				height     	120
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Import" @165
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@165
-				    location   	(1910, 545)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				compartment 	(object Compartment
-				    Parent_View 	@165
-				    location   	(1910, 604)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	478)
-				width      	486
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @166
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2112, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@166
-				    location   	(1900, 1105)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@166
-				    location   	(1900, 1164)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	422)
-				width      	442
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::PortType" @167
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1808, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@167
-				    location   	(1596, 1409)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"PortType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C7F001A5"
-				compartment 	(object Compartment
-				    Parent_View 	@167
-				    location   	(1596, 1468)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	422)
-				width      	442
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @168
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(2336, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@168
-				    location   	(2124, 1649)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				compartment 	(object Compartment
-				    Parent_View 	@168
-				    location   	(2124, 1708)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	422)
-				width      	442
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @169
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 240)
-				label      	(object ItemLabel
-				    Parent_View 	@169
-				    location   	(1073, 39)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	510
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				compartment 	(object Compartment
-				    Parent_View 	@169
-				    location   	(1073, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	7
-				    max_width  	521)
-				width      	528
-				height     	426
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @170
-				location   	(1358, 860)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$54" @171
-					Parent_View 	@170
-					location   	(62, -36)
-					label      	(object SegLabel @172
-					    Parent_View 	@171
-					    location   	(1317, 535)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@170
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1358, 453)
-					label      	(object SegLabel @173
-					    Parent_View 	@171
-					    location   	(1403, 511)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.856649
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eTypes" @174
-					Parent_View 	@170
-					location   	(62, -36)
-					label      	(object SegLabel @175
-					    Parent_View 	@174
-					    location   	(1586, 909)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	156
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.779097
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@170
-					supplier   	@164
-					vertices   	(list Points
-					    (1358, 860)
-					    (1358, 948)
-					    (1677, 948))
-					line_style 	3
-					origin_attachment 	(1358, 860)
-					terminal_attachment 	(1677, 948)
-					label      	(object SegLabel @176
-					    Parent_View 	@174
-					    location   	(1632, 987)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.892655
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$57" @177
-				location   	(1612, 595)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @178
-					Parent_View 	@177
-					location   	(12, 227)
-					label      	(object SegLabel @179
-					    Parent_View 	@178
-					    location   	(1423, 512)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@177
-					supplier   	@169
-					vertices   	(list Points
-					    (1612, 595)
-					    (1464, 595)
-					    (1464, 453))
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1464, 453)
-					label      	(object SegLabel @180
-					    Parent_View 	@178
-					    location   	(1524, 495)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.858667
-					    height     	60
-					    orientation 	1))
-				    (object RoleView "eImports" @181
-					Parent_View 	@177
-					location   	(12, 227)
-					label      	(object SegLabel @182
-					    Parent_View 	@181
-					    location   	(1692, 557)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.280335
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@177
-					supplier   	@165
-					line_style 	3
-					origin_attachment 	(1612, 595)
-					terminal_attachment 	(1901, 595)
-					label      	(object SegLabel @183
-					    Parent_View 	@181
-					    location   	(1854, 652)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.841004
-					    height     	57
-					    orientation 	1)
-					label      	(object SegLabel @184
-					    Parent_View 	@181
-					    location   	(1676, 646)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.225941
-					    height     	51
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$13" @185
-				location   	(1279, 1136)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E60301E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$14" @186
-					Parent_View 	@185
-					location   	(271, 272)
-					label      	(object SegLabel @187
-					    Parent_View 	@186
-					    location   	(1238, 591)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400B7"
-					client     	@185
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1279, 1136)
-					terminal_attachment 	(1279, 453)
-					label      	(object SegLabel @188
-					    Parent_View 	@186
-					    location   	(1320, 587)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.804974
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eMessages" @189
-					Parent_View 	@185
-					location   	(271, 272)
-					label      	(object SegLabel @190
-					    Parent_View 	@189
-					    location   	(1647, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+eMessages"
-					    pctDist    	0.643137
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E60400C1"
-					client     	@185
-					supplier   	@166
-					vertices   	(list Points
-					    (1279, 1136)
-					    (1279, 1208)
-					    (1891, 1208))
-					line_style 	3
-					origin_attachment 	(1279, 1136)
-					terminal_attachment 	(1891, 1208)
-					label      	(object SegLabel @191
-					    Parent_View 	@189
-					    location   	(1821, 1171)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.899346
-					    height     	38
-					    orientation 	0)
-					label      	(object SegLabel @192
-					    Parent_View 	@189
-					    location   	(1797, 1244)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.864407
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$15" @193
-				location   	(1212, 1159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6710104"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$16" @194
-					Parent_View 	@193
-					location   	(-324, 215)
-					label      	(object SegLabel @195
-					    Parent_View 	@194
-					    location   	(1171, 594)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E672034A"
-					client     	@193
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1212, 453)
-					label      	(object SegLabel @196
-					    Parent_View 	@194
-					    location   	(1251, 624)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.757962
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "ePortTypes" @197
-					Parent_View 	@193
-					location   	(-324, 215)
-					label      	(object SegLabel @198
-					    Parent_View 	@197
-					    location   	(1391, 1451)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+ePortTypes"
-					    pctDist    	0.723698
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6720354"
-					client     	@193
-					supplier   	@167
-					vertices   	(list Points
-					    (1212, 1159)
-					    (1212, 1490)
-					    (1587, 1490))
-					line_style 	3
-					origin_attachment 	(1212, 1159)
-					terminal_attachment 	(1587, 1490)
-					label      	(object SegLabel @199
-					    Parent_View 	@197
-					    location   	(1533, 1451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.925611
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @200
-					    Parent_View 	@197
-					    location   	(1512, 1540)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.895855
-					    height     	50
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$17" @201
-				location   	(1114, 1585)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E6770095"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$18" @202
-					Parent_View 	@201
-					location   	(-406, 241)
-					label      	(object SegLabel @203
-					    Parent_View 	@202
-					    location   	(1073, 680)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E6780371"
-					client     	@201
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(1114, 453)
-					label      	(object SegLabel @204
-					    Parent_View 	@202
-					    location   	(1155, 752)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.736704
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "eBindings" @205
-					Parent_View 	@201
-					location   	(-406, 241)
-					label      	(object SegLabel @206
-					    Parent_View 	@205
-					    location   	(1851, 1674)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eBindings"
-					    pctDist    	0.766347
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E678037B"
-					client     	@201
-					supplier   	@168
-					vertices   	(list Points
-					    (1114, 1585)
-					    (1114, 1716)
-					    (2115, 1716))
-					line_style 	3
-					origin_attachment 	(1114, 1585)
-					terminal_attachment 	(2115, 1716)
-					label      	(object SegLabel @207
-					    Parent_View 	@205
-					    location   	(2053, 1677)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.945074
-					    height     	40
-					    orientation 	0)
-					label      	(object SegLabel @208
-					    Parent_View 	@205
-					    location   	(2014, 1754)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.911072
-					    height     	38
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::Service" @209
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@209
-				    location   	(1628, 1969)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				compartment 	(object Compartment
-				    Parent_View 	@209
-				    location   	(1628, 2028)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	422)
-				width      	442
-				height     	182
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$19" @210
-				location   	(1066, 1532)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5E67B0311"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$20" @211
-					Parent_View 	@210
-					location   	(-521, -112)
-					label      	(object SegLabel @212
-					    Parent_View 	@211
-					    location   	(1025, 670)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D007F"
-					client     	@210
-					supplier   	@169
-					line_style 	3
-					origin_attachment 	(1066, 1532)
-					terminal_attachment 	(1066, 453)
-					label      	(object SegLabel @213
-					    Parent_View 	@211
-					    location   	(1109, 756)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.719697
-					    height     	43
-					    orientation 	1))
-				    (object RoleView "eServices" @214
-					Parent_View 	@210
-					location   	(-521, -112)
-					label      	(object SegLabel @215
-					    Parent_View 	@214
-					    location   	(1393, 2028)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eServices"
-					    pctDist    	0.791824
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5E67D0089"
-					client     	@210
-					supplier   	@209
-					vertices   	(list Points
-					    (1066, 1532)
-					    (1066, 2059)
-					    (1619, 2059))
-					line_style 	3
-					origin_attachment 	(1066, 1532)
-					terminal_attachment 	(1619, 2059)
-					label      	(object SegLabel @216
-					    Parent_View 	@214
-					    location   	(1554, 2031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.940197
-					    height     	29
-					    orientation 	0)
-					label      	(object SegLabel @217
-					    Parent_View 	@214
-					    location   	(1532, 2113)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	158
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.920515
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @218
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B1F80382"
-				client     	@169
-				supplier   	@163
-				line_style 	3
-				origin_attachment 	(1064, 263)
-				terminal_attachment 	(785, 263))))
-		    (object ClassDiagram "2.1.3 Extensibility"
-			quid       	"3AD60C510192"
-			title      	"2.1.3 Extensibility"
-			zoom       	80
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::Binding" @219
-				ShowCompartmentStereotypes 	TRUE
-				location   	(576, 1584)
-				label      	(object ItemLabel
-				    Parent_View 	@219
-				    location   	(494, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	164
-				    justify    	0
-				    label      	"Binding")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D2860261"
-				width      	182
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Port" @220
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1568, 1888)
-				label      	(object ItemLabel
-				    Parent_View 	@220
-				    location   	(1487, 1836)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Port")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D9170286"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Service" @221
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1424, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@221
-				    location   	(1343, 1675)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Service")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D8F002F8"
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingFault" @222
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1216, 2336)
-				label      	(object ItemLabel
-				    Parent_View 	@222
-				    location   	(1088, 2283)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A9E03A6"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOperation" @223
-				ShowCompartmentStereotypes 	TRUE
-				location   	(736, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@223
-				    location   	(563, 1707)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	346
-				    justify    	0
-				    label      	"BindingOperation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5D3CB0145"
-				width      	364
-				height     	130
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IExtensibilityElement" @224
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@224
-				    location   	(1495, 136)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"IExtensibilityElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@224
-				    location   	(1495, 86)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	786
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B12402AB"
-				width      	804
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingInput" @225
-				ShowCompartmentStereotypes 	TRUE
-				location   	(928, 1952)
-				label      	(object ItemLabel
-				    Parent_View 	@225
-				    location   	(800, 1899)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	256
-				    justify    	0
-				    label      	"BindingInput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8202D4"
-				width      	274
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::BindingOutput" @226
-				ShowCompartmentStereotypes 	TRUE
-				location   	(1008, 2144)
-				label      	(object ItemLabel
-				    Parent_View 	@226
-				    location   	(863, 2091)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	290
-				    justify    	0
-				    label      	"BindingOutput")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AE08A8F028C"
-				width      	308
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @227
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@227
-				    location   	(74, 1235)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	146
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Types" @228
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(416, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@228
-				    location   	(335, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	162
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @229
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(480, 688)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@229
-				    location   	(209, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	542
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				compartment 	(object Compartment
-				    Parent_View 	@229
-				    location   	(209, 641)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	531)
-				width      	560
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @230
-				location   	(480, 1039)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@229
-				vertices   	(list Points
-				    (480, 1039)
-				    (480, 808)))
-			    (object InheritView "" @231
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD600CB00AA"
-				client     	@220
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1566, 1824)
-				terminal_attachment 	(1566, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @232
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B5A4027E"
-				client     	@226
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1097, 2079)
-				terminal_attachment 	(1097, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @233
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE0938602C9"
-				client     	@222
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1219, 2271)
-				terminal_attachment 	(1219, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @234
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B85B59B0072"
-				client     	@225
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(988, 1887)
-				terminal_attachment 	(988, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @235
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6009202F7"
-				client     	@223
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(797, 1695)
-				terminal_attachment 	(797, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @236
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA0F02F0"
-				client     	@219
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(601, 1519)
-				terminal_attachment 	(601, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @237
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FDB803D4"
-				client     	@227
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(211, 1223)
-				terminal_attachment 	(211, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @238
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@228
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(414, 1344)
-				terminal_attachment 	(414, 1039)
-				drawSupplier 	@230)
-			    (object InheritView "" @239
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FA20025E"
-				client     	@221
-				supplier   	@229
-				line_style 	3
-				origin_attachment 	(1429, 1663)
-				terminal_attachment 	(1429, 1039)
-				drawSupplier 	@230)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @240
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@240
-				    location   	(1632, 583)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	545
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				compartment 	(object Compartment
-				    Parent_View 	@240
-				    location   	(1632, 644)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	465)
-				width      	563
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @241
-				location   	(1191, 672)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @242
-					Parent_View 	@241
-					location   	(23, 560)
-					label      	(object SegLabel @243
-					    Parent_View 	@242
-					    location   	(847, 631)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@241
-					supplier   	@229
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(760, 672)
-					label      	(object SegLabel @244
-					    Parent_View 	@242
-					    location   	(830, 628)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.839695
-					    height     	45
-					    orientation 	1))
-				    (object RoleView "eExtensibilityElements" @245
-					Parent_View 	@241
-					location   	(23, 560)
-					label      	(object SegLabel @246
-					    Parent_View 	@245
-					    location   	(1355, 522)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	0.379070
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@241
-					supplier   	@240
-					line_style 	3
-					origin_attachment 	(1191, 672)
-					terminal_attachment 	(1623, 672)
-					label      	(object SegLabel @247
-					    Parent_View 	@245
-					    location   	(1496, 627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.709402
-					    height     	46
-					    orientation 	0)
-					label      	(object SegLabel @248
-					    Parent_View 	@245
-					    location   	(1463, 764)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	164
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.632479
-					    height     	92
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::WSDLElement" @249
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1008, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@249
-				    location   	(630, 84)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	756
-				    justify    	0
-				    label      	"WSDLElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C6A302DD"
-				compartment 	(object Compartment
-				    Parent_View 	@249
-				    location   	(630, 145)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	753)
-				width      	774
-				height     	240
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @250
-				location   	(1008, 402)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@249
-				vertices   	(list Points
-				    (1008, 402)
-				    (1008, 312)))
-			    (object InheritView "" @251
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FE3C03D4"
-				client     	@229
-				supplier   	@249
-				line_style 	3
-				origin_attachment 	(492, 568)
-				terminal_attachment 	(492, 402)
-				drawSupplier 	@250)
-			    (object InheritView "" @252
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84B14903D0"
-				client     	@240
-				supplier   	@224
-				line_style 	3
-				origin_attachment 	(2015, 571)
-				terminal_attachment 	(2015, 246))
-			    (object InheritView "" @253
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BDDF53502C3"
-				client     	@240
-				supplier   	@249
-				line_style 	3
-				origin_attachment 	(1762, 571)
-				terminal_attachment 	(1762, 402)
-				drawSupplier 	@250)
-			    (object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @254
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@254
-				    location   	(1729, 1303)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	927
-				    justify    	0
-				    label      	"UnknownExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CB24AC002AE"
-				width      	945
-				height     	235
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @255
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CB24AEC01CB"
-				client     	@254
-				supplier   	@240
-				line_style 	3
-				origin_attachment 	(1796, 1291)
-				terminal_attachment 	(1796, 805))
-			    (object AssociationViewNew "$UNNAMED$63" @256
-				location   	(2639, 1734)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F7896A2026E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$64" @257
-					Parent_View 	@256
-					location   	(607, 342)
-					label      	(object SegLabel @258
-					    Parent_View 	@257
-					    location   	(2797, 1380)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012B"
-					client     	@256
-					supplier   	@254
-					vertices   	(list Points
-					    (2639, 1734)
-					    (2824, 1734)
-					    (2824, 1421)
-					    (2664, 1421))
-					line_style 	3
-					origin_attachment 	(2639, 1734)
-					terminal_attachment 	(2664, 1421)
-					label      	(object SegLabel @259
-					    Parent_View 	@257
-					    location   	(2731, 1475)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "children" @260
-					Parent_View 	@256
-					location   	(607, 342)
-					label      	(object SegLabel @261
-					    Parent_View 	@260
-					    location   	(2074, 1658)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+children"
-					    pctDist    	0.798561
-					    height     	118
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3F7896A7012C"
-					client     	@256
-					supplier   	@254
-					vertices   	(list Points
-					    (2639, 1734)
-					    (2191, 1734)
-					    (2191, 1525))
-					line_style 	3
-					origin_attachment 	(2639, 1734)
-					terminal_attachment 	(2191, 1525)
-					label      	(object SegLabel @262
-					    Parent_View 	@260
-					    location   	(2245, 1591)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "2.1.1 Naming and Linking"
-			quid       	"3AE8ED7201BD"
-			title      	"2.1.1 Naming and Linking"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IImport" @263
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@263
-				    location   	(1422, 177)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"IImport")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@263
-				    location   	(1422, 127)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	580
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84B2020119"
-				compartment 	(object Compartment
-				    Parent_View 	@263
-				    location   	(1422, 232)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	646)
-				width      	598
-				height     	218
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Namespace" @264
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@264
-				    location   	(202, 1041)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	461
-				    justify    	0
-				    label      	"Namespace")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AEA3CD30030"
-				compartment 	(object Compartment
-				    Parent_View 	@264
-				    location   	(202, 1096)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	300)
-				width      	479
-				height     	215
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @265
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@265
-				    location   	(1294, 1142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	694
-				height     	173
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @266
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@266
-				    location   	(164, 236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				compartment 	(object Compartment
-				    Parent_View 	@266
-				    location   	(164, 291)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	521)
-				width      	490
-				height     	320
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$37" @267
-				location   	(309, 786)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3D55002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eNamespaces" @268
-					Parent_View 	@267
-					location   	(-91, 258)
-					label      	(object SegLabel @269
-					    Parent_View 	@268
-					    location   	(461, 956)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+eNamespaces"
-					    pctDist    	0.698842
-					    height     	152
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560332"
-					client     	@267
-					supplier   	@264
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 1029)
-					label      	(object SegLabel @270
-					    Parent_View 	@268
-					    location   	(248, 973)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.768707
-					    height     	62
-					    orientation 	1)
-					label      	(object SegLabel @271
-					    Parent_View 	@268
-					    location   	(228, 913)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.525097
-					    height     	82
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$38" @272
-					Parent_View 	@267
-					location   	(-91, 258)
-					label      	(object SegLabel @273
-					    Parent_View 	@272
-					    location   	(268, 592)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3D560328"
-					client     	@267
-					supplier   	@266
-					line_style 	3
-					origin_attachment 	(309, 786)
-					terminal_attachment 	(309, 544)
-					label      	(object SegLabel @274
-					    Parent_View 	@272
-					    location   	(239, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.844961
-					    height     	71
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::wsdl::Import" @275
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 720)
-				label      	(object ItemLabel
-				    Parent_View 	@275
-				    location   	(1255, 580)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	434
-				    justify    	0
-				    label      	"Import")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E4F903DE"
-				compartment 	(object Compartment
-				    Parent_View 	@275
-				    location   	(1255, 635)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	478)
-				width      	452
-				height     	304
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$51" @276
-				location   	(1486, 1001)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1DCC02E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eSchema" @277
-					Parent_View 	@276
-					location   	(510, -103)
-					label      	(object SegLabel @278
-					    Parent_View 	@277
-					    location   	(1737, 1018)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+eSchema"
-					    pctDist    	0.592593
-					    height     	105
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE0270"
-					client     	@276
-					supplier   	@265
-					vertices   	(list Points
-					    (1486, 1001)
-					    (1632, 1001)
-					    (1632, 1130))
-					line_style 	3
-					origin_attachment 	(1486, 1001)
-					terminal_attachment 	(1632, 1130)
-					label      	(object SegLabel @279
-					    Parent_View 	@277
-					    location   	(1563, 1018)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.592593
-					    height     	70
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$52" @280
-					Parent_View 	@276
-					location   	(510, -103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1DCE027A"
-					client     	@276
-					supplier   	@275
-					line_style 	3
-					origin_attachment 	(1486, 872)
-					terminal_attachment 	(1486, 872))))
-			    (object AssociationViewNew "$UNNAMED$39" @281
-				location   	(1087, 403)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEA3E3A002D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$40" @282
-					Parent_View 	@281
-					location   	(687, -125)
-					label      	(object SegLabel @283
-					    Parent_View 	@282
-					    location   	(1406, 480)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01F2"
-					client     	@281
-					supplier   	@275
-					vertices   	(list Points
-					    (1087, 403)
-					    (1364, 403)
-					    (1364, 568))
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(1364, 568))
-				    (object RoleView "eDefinition" @284
-					Parent_View 	@281
-					location   	(687, -125)
-					label      	(object SegLabel @285
-					    Parent_View 	@284
-					    location   	(805, 363)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eDefinition"
-					    pctDist    	0.637532
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AEA3E3C01E8"
-					client     	@281
-					supplier   	@266
-					line_style 	3
-					origin_attachment 	(1087, 403)
-					terminal_attachment 	(645, 403)
-					label      	(object SegLabel @286
-					    Parent_View 	@284
-					    location   	(727, 456)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.814910
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$57" @287
-				location   	(737, 826)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C864DFF02EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$58" @288
-					Parent_View 	@287
-					location   	(-671, 106)
-					label      	(object SegLabel @289
-					    Parent_View 	@288
-					    location   	(552, 647)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02EE"
-					client     	@287
-					supplier   	@266
-					vertices   	(list Points
-					    (737, 826)
-					    (510, 826)
-					    (510, 544))
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(510, 544)
-					label      	(object SegLabel @290
-					    Parent_View 	@288
-					    location   	(457, 595)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))
-				    (object RoleView "eImports" @291
-					Parent_View 	@287
-					location   	(-671, 106)
-					label      	(object SegLabel @292
-					    Parent_View 	@291
-					    location   	(1144, 773)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+eImports"
-					    pctDist    	0.799189
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C864DFF02ED"
-					client     	@287
-					supplier   	@275
-					line_style 	3
-					origin_attachment 	(737, 826)
-					terminal_attachment 	(1246, 826)
-					label      	(object SegLabel @293
-					    Parent_View 	@291
-					    location   	(1180, 879)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.872211
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @294
-					    Parent_View 	@291
-					    location   	(1162, 933)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.837728
-					    height     	107
-					    orientation 	1))))
-			    (object InheritView "" @295
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3F6F200D0340"
-				client     	@275
-				supplier   	@263
-				line_style 	3
-				origin_attachment 	(1555, 568)
-				terminal_attachment 	(1555, 333))))
-		    (object ClassDiagram "2.2 Types"
-			quid       	"3B85AE59037E"
-			title      	"2.2 Types"
-			zoom       	90
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	81
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @296
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@296
-				    location   	(895, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ECD302A9"
-				width      	500
-				height     	174
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @297
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1136, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@297
-				    location   	(906, 1531)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	478
-				height     	162
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Message" @298
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@298
-				    location   	(1022, 1828)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	517
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@298
-				    location   	(1022, 1900)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	30)
-				width      	535
-				height     	305
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @299
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@299
-				    location   	(128, 1067)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	448
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	466
-				height     	258
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$47" @300
-				location   	(735, 1172)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1BE900C4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "typeDefinition" @301
-					Parent_View 	@300
-					location   	(143, 676)
-					label      	(object SegLabel @302
-					    Parent_View 	@301
-					    location   	(775, 1133)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.269006
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90327"
-					client     	@300
-					supplier   	@296
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(886, 1172)
-					label      	(object SegLabel @303
-					    Parent_View 	@301
-					    location   	(839, 1207)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.688705
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$48" @304
-					Parent_View 	@300
-					location   	(143, 676)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1BE90331"
-					client     	@300
-					supplier   	@299
-					line_style 	3
-					origin_attachment 	(735, 1172)
-					terminal_attachment 	(585, 1172))))
-			    (object AssociationViewNew "$UNNAMED$49" @305
-				location   	(527, 1592)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8B1C1203B2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "elementDeclaration" @306
-					Parent_View 	@305
-					location   	(-65, 1096)
-					label      	(object SegLabel @307
-					    Parent_View 	@306
-					    location   	(666, 1554)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+elementDeclaration"
-					    pctDist    	0.375394
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C14001C"
-					client     	@305
-					supplier   	@297
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(897, 1592)
-					label      	(object SegLabel @308
-					    Parent_View 	@306
-					    location   	(807, 1645)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.755877
-					    height     	53
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$50" @309
-					Parent_View 	@305
-					location   	(-65, 1096)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8B1C140026"
-					client     	@305
-					supplier   	@299
-					vertices   	(list Points
-					    (527, 1592)
-					    (437, 1592)
-					    (437, 1313))
-					line_style 	3
-					origin_attachment 	(527, 1592)
-					terminal_attachment 	(437, 1313))))
-			    (object AssociationViewNew "$UNNAMED$55" @310
-				location   	(322, 1911)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C46829303E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @311
-					Parent_View 	@310
-					location   	(-14, 1191)
-					label      	(object SegLabel @312
-					    Parent_View 	@311
-					    location   	(838, 1872)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.748560
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C468296010E"
-					client     	@310
-					supplier   	@298
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(1013, 1911)
-					label      	(object SegLabel @313
-					    Parent_View 	@311
-					    location   	(943, 1965)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$56" @314
-					Parent_View 	@310
-					location   	(-14, 1191)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C4682960118"
-					client     	@310
-					supplier   	@299
-					vertices   	(list Points
-					    (322, 1911)
-					    (229, 1911)
-					    (229, 1313))
-					line_style 	3
-					origin_attachment 	(322, 1911)
-					terminal_attachment 	(229, 1313))))
-			    (object ClassView "Class" "Logical View::wsdl::Types" @315
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@315
-				    location   	(615, 512)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	371
-				    justify    	0
-				    label      	"Types")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B8BE9A603A8"
-				width      	389
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::Definition" @316
-				ShowCompartmentStereotypes 	TRUE
-				location   	(176, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@316
-				    location   	(74, 107)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	204
-				    justify    	0
-				    label      	"Definition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5E43F008E"
-				width      	222
-				height     	130
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$53" @317
-				location   	(234, 604)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEA27029F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eTypes" @318
-					Parent_View 	@317
-					location   	(-150, 396)
-					label      	(object SegLabel @319
-					    Parent_View 	@318
-					    location   	(480, 640)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	207
-					    justify    	0
-					    label      	"+eTypes"
-					    pctDist    	0.661017
-					    height     	36
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA29036A"
-					client     	@317
-					supplier   	@315
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(606, 604)
-					label      	(object SegLabel @320
-					    Parent_View 	@318
-					    location   	(526, 569)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783883
-					    height     	36
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$54" @321
-					Parent_View 	@317
-					location   	(-150, 396)
-					label      	(object SegLabel @322
-					    Parent_View 	@321
-					    location   	(133, 313)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B8BEA290356"
-					client     	@317
-					supplier   	@316
-					vertices   	(list Points
-					    (234, 604)
-					    (174, 604)
-					    (174, 225))
-					line_style 	3
-					origin_attachment 	(234, 604)
-					terminal_attachment 	(174, 225)
-					label      	(object SegLabel @323
-					    Parent_View 	@321
-					    location   	(228, 271)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.897729
-					    height     	54
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::wsdl::ITypes" @324
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@324
-				    location   	(525, 203)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"ITypes")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@324
-				    location   	(525, 153)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	230
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CADCBB20050"
-				width      	248
-				height     	166
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::XSDSchemaExtensibilityElement" @325
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1728, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@325
-				    location   	(1359, 753)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	739
-				    justify    	0
-				    label      	"XSDSchemaExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3CC360D7039C"
-				width      	757
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @326
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1216)
-				label      	(object ItemLabel
-				    Parent_View 	@326
-				    location   	(1529, 1103)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	655
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	673
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$59" @327
-				location   	(1826, 975)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3614500F2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$60" @328
-					Parent_View 	@327
-					location   	(306, 447)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023D"
-					client     	@327
-					supplier   	@325
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 859)
-					label      	(object SegLabel @329
-					    Parent_View 	@328
-					    location   	(1774, 900)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.656489
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "schema" @330
-					Parent_View 	@327
-					location   	(306, 447)
-					label      	(object SegLabel @331
-					    Parent_View 	@330
-					    location   	(2006, 1033)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	0.507576
-					    height     	180
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3CC36146023E"
-					client     	@327
-					supplier   	@326
-					line_style 	3
-					origin_attachment 	(1826, 975)
-					terminal_attachment 	(1826, 1091)
-					label      	(object SegLabel @332
-					    Parent_View 	@330
-					    location   	(1788, 1050)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.651515
-					    height     	39
-					    orientation 	1))))
-			    (object InheritView "" @333
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CADCD3B0380"
-				client     	@315
-				supplier   	@324
-				line_style 	3
-				origin_attachment 	(705, 500)
-				terminal_attachment 	(705, 307))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @334
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1056, 224)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@334
-				    location   	(815, 130)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	482
-				    justify    	0
-				    label      	"ExtensibleElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5FCFA033A"
-				width      	500
-				height     	212
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @335
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B8BEB010311"
-				client     	@315
-				supplier   	@334
-				line_style 	3
-				origin_attachment 	(854, 500)
-				terminal_attachment 	(854, 330))
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @336
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				location   	(1824, 464)
-				label      	(object ItemLabel
-				    Parent_View 	@336
-				    location   	(1490, 368)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	669
-				    justify    	0
-				    label      	"ExtensibilityElement")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5DBB602A9"
-				width      	687
-				height     	216
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @337
-				location   	(1206, 493)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5FD130079"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @338
-					Parent_View 	@337
-					location   	(-586, 237)
-					label      	(object SegLabel @339
-					    Parent_View 	@338
-					    location   	(1136, 386)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019E"
-					client     	@337
-					supplier   	@334
-					vertices   	(list Points
-					    (1206, 493)
-					    (1094, 493)
-					    (1094, 330))
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1094, 330)
-					label      	(object SegLabel @340
-					    Parent_View 	@338
-					    location   	(1042, 377)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.828326
-					    height     	53
-					    orientation 	0))
-				    (object RoleView "eExtensibilityElements" @341
-					Parent_View 	@337
-					location   	(-586, 237)
-					label      	(object SegLabel @342
-					    Parent_View 	@341
-					    location   	(1196, 454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	-0.039711
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5FD14019D"
-					client     	@337
-					supplier   	@336
-					line_style 	3
-					origin_attachment 	(1206, 493)
-					terminal_attachment 	(1481, 493)
-					label      	(object SegLabel @343
-					    Parent_View 	@341
-					    location   	(1415, 546)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.764957
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @344
-					    Parent_View 	@341
-					    location   	(1396, 392)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	146
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.694915
-					    height     	102
-					    orientation 	0))))
-			    (object InheritView "" @345
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3CC3627F00B7"
-				client     	@325
-				supplier   	@336
-				line_style 	3
-				origin_attachment 	(1812, 741)
-				terminal_attachment 	(1812, 572))))
-		    (object ClassDiagram "2.3 Messages"
-			quid       	"3BCE853D02C8"
-			title      	"2.3 Messages"
-			zoom       	85
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::wsdl::IMessage" @346
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@346
-				    location   	(267, 122)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"IMessage")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@346
-				    location   	(267, 72)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A8AF004F"
-				width      	380
-				height     	328
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::IPart" @347
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@347
-				    location   	(1029, 124)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"IPart")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@347
-				    location   	(1029, 74)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	599
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B84A93F01BE"
-				width      	617
-				height     	324
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @348
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@348
-				    location   	(1075, 690)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	492
-				height     	276
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @349
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A96D02F1"
-				client     	@348
-				supplier   	@347
-				line_style 	3
-				origin_attachment 	(1304, 678)
-				terminal_attachment 	(1304, 386))
-			    (object ClassView "Class" "Logical View::wsdl::Message" @350
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@350
-				    location   	(241, 507)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	414
-				    justify    	0
-				    label      	"Message")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5C9590078"
-				compartment 	(object Compartment
-				    Parent_View 	@350
-				    location   	(241, 579)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	30)
-				width      	432
-				height     	322
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @351
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B84A8D102BA"
-				client     	@350
-				supplier   	@346
-				line_style 	3
-				origin_attachment 	(445, 495)
-				terminal_attachment 	(445, 388))
-			    (object AssociationViewNew "$UNNAMED$1" @352
-				location   	(688, 952)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD5CEBE00E2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eParts" @353
-					Parent_View 	@352
-					location   	(176, 328)
-					label      	(object SegLabel @354
-					    Parent_View 	@353
-					    location   	(952, 897)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eParts"
-					    pctDist    	0.697452
-					    height     	56
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0061"
-					client     	@352
-					supplier   	@348
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(1066, 952)
-					label      	(object SegLabel @355
-					    Parent_View 	@353
-					    location   	(987, 1005)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.789809
-					    height     	53
-					    orientation 	1)
-					label      	(object SegLabel @356
-					    Parent_View 	@353
-					    location   	(967, 1061)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	154
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.742038
-					    height     	109
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$2" @357
-					Parent_View 	@352
-					location   	(176, 328)
-					label      	(object SegLabel @358
-					    Parent_View 	@357
-					    location   	(404, 893)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD5CEBF0057"
-					client     	@352
-					supplier   	@350
-					vertices   	(list Points
-					    (688, 952)
-					    (445, 952)
-					    (445, 817))
-					line_style 	3
-					origin_attachment 	(688, 952)
-					terminal_attachment 	(445, 817)
-					label      	(object SegLabel @359
-					    Parent_View 	@357
-					    location   	(393, 912)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.747604
-					    height     	53
-					    orientation 	0))))))))
-	    (object Class_Category "xsd"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"XSD")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"xsd")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/xsd/2002/XSD"))
-		quid       	"39ABDC6F01AA"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "XSDAnnotation"
-			quid       	"3B66EDC80233"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69E1770116"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4E20366"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "applicationInformation"
-				quid       	"3BBF7EBF02C8"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "userInformation"
-				quid       	"3BBF7EEA0157"
-				stereotype 	"0..*"
-				type       	"DOMElement"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributes"
-				quid       	"3BBF7F0501E2"
-				stereotype 	"0..*"
-				type       	"DOMAttr"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeDeclaration"
-			quid       	"3B66ED2E0192"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69B7DC0193"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B688E6103BE"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F5202B4"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeGroupContent"
-			quid       	"3B6940200089"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D8E200EA"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDAttributeGroupDefinition"
-			quid       	"3B66ED840290"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69403A0221"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2EB02A8"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC800D2"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "attributeGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C287F7B0386"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUse"
-			quid       	"3B68354601A8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B72D737038F"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089")
-			    (object Inheritance_Relationship
-				quid       	"3B72D7BB0349"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "required"
-				quid       	"3B69CCF3027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B69CDDB03B7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CDE002D8"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "use"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7B0220382"
-				type       	"XSDAttributeUseCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C2719D90341"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDBoundedFacet"
-			quid       	"3B6C751D0344"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C763C0224"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C752A00CC"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinalityFacet"
-			quid       	"3B6C755D03D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C764F0131"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C756C0153"
-				type       	"XSDCardinality"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexTypeContent"
-			quid       	"3B683BA00196"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848B80286"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDComplexTypeDefinition"
-			quid       	"3B682B82031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69BAA20310"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2")
-			    (object Inheritance_Relationship
-				quid       	"3BA0D01901F1"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "derivationMethod"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C6E4020E"
-				type       	"XSDDerivationMethod"
-				initv      	"restriction"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B69C71D026A"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C73800C5"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "contentTypeCategory"
-				quid       	"3B69CA4202B8"
-				type       	"XSDContentTypeCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibitedSubstitutions"
-				quid       	"3B69CB8A03E6"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F618014D"
-				stereotype 	"0..*"
-				type       	"XSDComplexFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0FB97006E"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3C31AF5E03A6"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDComponent"
-			quid       	"3B6846E90029"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA903D2"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDConcreteComponent"
-			quid       	"3B6AD7B40065"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "element"
-				quid       	"3B6ADDB501A5"
-				type       	"DOMElement"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDConstrainingFacet"
-			quid       	"3B6C6B340093"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C800394"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDDiagnostic"
-			quid       	"3BFE5F910046"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3D4C0F4C01A1"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "severity"
-				quid       	"3BFE691C005D"
-				type       	"XSDDiagnosticSeverity"
-				exportControl 	"Public")
-			    (object ClassAttribute "message"
-				quid       	"3BFE5FDD0280"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "locationURI"
-				quid       	"3C063743016B"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "line"
-				quid       	"3BFE607E0213"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "column"
-				quid       	"3BFE611E0296"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "node"
-				quid       	"3C016B6B0200"
-				type       	"DOMNode"
-				exportControl 	"Public")
-			    (object ClassAttribute "annotationURI"
-				quid       	"3C06374F0186"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDElementDeclaration"
-			quid       	"3B66ED580214"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B69EDEE01BF"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")
-			    (object Inheritance_Relationship
-				quid       	"3B685F17002E"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174")
-			    (object Inheritance_Relationship
-				quid       	"3B688E660339"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "nillable"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BFB4029F"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "disallowedSubstitutions"
-				quid       	"3B69C4680368"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "substitutionGroupExclusions"
-				quid       	"3B69C4A003B9"
-				stereotype 	"0..*"
-				type       	"XSDSubstitutionGroupExclusions"
-				exportControl 	"Public")
-			    (object ClassAttribute "abstract"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69C4E0000E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D14C00B2"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "block"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0D16801C1"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementDeclarationReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289F6203CF"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C34DCB00018"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDEnumerationFacet"
-			quid       	"3B6C6ACE0141"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C9D03C7"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C640054"
-				stereotype 	"0..*"
-				type       	"Value"
-				exportControl 	"Public")))
-		    (object Class "XSDFacet"
-			quid       	"3B6C359403D2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D25680259"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3B6C73740253"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "facetName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C289FB401EC"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "effectiveValue"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28AAE303B6"
-				type       	"Value"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFeature"
-			quid       	"3B69B537026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C290A2C0307"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B69BF81020F"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "constraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69BF8800C5"
-				type       	"XSDConstraint"
-				exportControl 	"Public")
-			    (object ClassAttribute "form"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F902B033E"
-				type       	"XSDForm"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalValue"
-				quid       	"3C271A1B016F"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "global"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0070372"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "featureReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A0440185"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFixedFacet"
-			quid       	"3B6C699E00C1"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8801B4"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C6A600201"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDFractionDigitsFacet"
-			quid       	"3B6C79BE02EE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B990016"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79D2008A"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDFundamentalFacet"
-			quid       	"3B6C69E801D6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C7B0396"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"))
-			abstract   	TRUE)
-		    (object Class "XSDIdentityConstraintDefinition"
-			quid       	"3B682B2603A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684AA30242"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "identityConstraintCategory"
-				quid       	"3B69D1C70143"
-				type       	"XSDIdentityConstraintCategory"
-				exportControl 	"Public")))
-		    (object Class "XSDImport"
-			quid       	"3B688C93017F"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8D9003E"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespace"
-				quid       	"3B6ADB15036C"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDInclude"
-			quid       	"3B688C7D0250"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8DC0381"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDLengthFacet"
-			quid       	"3B6C776200E7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C778002DF"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C776C004B"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMaxExclusiveFacet"
-			quid       	"3B6C789600C2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8E0309"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxFacet"
-			quid       	"3C0A1CEB010E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D3103AD"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1EE201F7"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A174027D"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1930354"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMaxInclusiveFacet"
-			quid       	"3B6C787D00DA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B8303B8"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E")))
-		    (object Class "XSDMaxLengthFacet"
-			quid       	"3B6C77C70146"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B7D00FC"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C77DA00F3"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDMinExclusiveFacet"
-			quid       	"3B6C792D000A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B590281"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinFacet"
-			quid       	"3C0A1CDE037C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C0A1D240098"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3C0A1ED10398"
-				type       	"Value"
-				exportControl 	"Public")
-			    (object ClassAttribute "inclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1A2008E"
-				type       	"boolean"
-				exportControl 	"Public")
-			    (object ClassAttribute "exclusive"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1BE03E2"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDMinInclusiveFacet"
-			quid       	"3B6C788702C9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B520353"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C")))
-		    (object Class "XSDMinLengthFacet"
-			quid       	"3B6C778C0065"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C77C400C0"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7799015E"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroup"
-			quid       	"3B6834E00291"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A640279"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "compositor"
-				quid       	"3B69CF1D01CF"
-				type       	"XSDCompositor"
-				exportControl 	"Public")))
-		    (object Class "XSDModelGroupDefinition"
-			quid       	"3B66ED9A0205"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2E20381"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2550385"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAC40090"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "modelGroupDefinitionReference"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A1F602E8"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDNamedComponent"
-			quid       	"3B6846D303A4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3BA0CEA20197"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
-				quid       	"3B6847000142"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B684704031E"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A57F0127"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "uRI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A58700E2"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "aliasURI"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A5AA02AF"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "qName"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C290963025E"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDNotationDeclaration"
-			quid       	"3B66EDAA021C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B68494302F1"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4")
-			    (object Inheritance_Relationship
-				quid       	"3B688E4F023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "systemIdentifier"
-				quid       	"3B69D32E00F0"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "publicIdentifier"
-				quid       	"3B69D3340397"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDNumericFacet"
-			quid       	"3B6C75950206"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C76420074"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C75A30012"
-				type       	"boolean"
-				exportControl 	"Public")))
-		    (object Class "XSDOrderedFacet"
-			quid       	"3B6C74DD0248"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7659012C"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C74F602DA"
-				type       	"XSDOrdered"
-				exportControl 	"Public")))
-		    (object Class "XSDParticle"
-			quid       	"3B682BBD01F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848FC01E7"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "minOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF8E03B2"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")
-			    (object ClassAttribute "maxOccurs"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69CF9903AE"
-				type       	"int"
-				initv      	"1"
-				exportControl 	"Public")))
-		    (object Class "XSDParticleContent"
-			quid       	"3B6BD22300C6"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B780BD90059"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDPatternFacet"
-			quid       	"3B6C6ADB026C"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6CA5038D"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C7C790311"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDRedefinableComponent"
-			quid       	"3B7FCA8B020B"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FD4BA023C"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3C290A26036D"
-				supplier   	"Logical View::xsd::XSDNamedComponent"
-				quidu      	"3B6846D303A4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "circular"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"3C28A6800216"
-				type       	"boolean"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefineContent"
-			quid       	"3B6AE2060172"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2B301D5"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			abstract   	TRUE)
-		    (object Class "XSDRedefine"
-			quid       	"3B688C9B02AD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB640240"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE")))
-		    (object Class "XSDRepeatableFacet"
-			quid       	"3B6C6AA6031A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C6C8F002E"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"))
-			abstract   	TRUE)
-		    (object Class "XSDSchema"
-			quid       	"374B182500BB"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCC4A0182"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "document"
-				quid       	"3C2784E503DD"
-				type       	"DOMDocument"
-				exportControl 	"Public")
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6868EC0226"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "targetNamespace"
-				quid       	"3B9F9BFF0180"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "attributeFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F904B0102"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementFormDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B9F907800AC"
-				type       	"XSDForm"
-				initv      	"unqualified"
-				exportControl 	"Public")
-			    (object ClassAttribute "finalDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0C4A70038"
-				stereotype 	"0..*"
-				type       	"XSDProhibitedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "blockDefault"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F59D02D8"
-				stereotype 	"0..*"
-				type       	"XSDDisallowedSubstitutions"
-				exportControl 	"Public")
-			    (object ClassAttribute "version"
-				quid       	"3D22D6D80356"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDSchemaCompositor"
-			quid       	"3C21DB4102AE"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3C21DB560092"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaContent"
-			quid       	"3B688CB800BA"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AD8E60372"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"))
-			abstract   	TRUE)
-		    (object Class "XSDSchemaDirective"
-			quid       	"3B6AD8A202A2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE32102AF"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "schemaLocation"
-				quid       	"3B6AD9B30330"
-				type       	"String"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "XSDScope"
-			quid       	"3B69B54000F2"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B7FCD640231"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			abstract   	TRUE)
-		    (object Class "XSDSimpleTypeDefinition"
-			quid       	"3B682BA7005D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A1302A2"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")
-			    (object Inheritance_Relationship
-				quid       	"3B685F55032B"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B6C315800A9"
-				type       	"XSDVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "final"
-				quid       	"3B6D544F0146"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalFinal"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA0F65E035A"
-				stereotype 	"0..*"
-				type       	"XSDSimpleFinal"
-				exportControl 	"Public")
-			    (object ClassAttribute "validFacets"
-				quid       	"3C28AB0F00B6"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDTerm"
-			quid       	"3B683C5E0174"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6848AA01D3"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029")
-			    (object Inheritance_Relationship
-				quid       	"3B6BD2440069"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"))
-			abstract   	TRUE)
-		    (object Class "XSDTotalDigitsFacet"
-			quid       	"3B6C79A0020E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C7B610337"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C79AB0232"
-				type       	"int"
-				exportControl 	"Public")))
-		    (object Class "XSDTypeDefinition"
-			quid       	"3B66ECD302A9"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6AE2F5013A"
-				stereotype 	"mixin"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172")
-			    (object Inheritance_Relationship
-				quid       	"3B7FCAB1004D"
-				supplier   	"Logical View::xsd::XSDRedefinableComponent"
-				quidu      	"3B7FCA8B020B"))
-			abstract   	TRUE)
-		    (object Class "XSDWhiteSpaceFacet"
-			quid       	"3B6C784601B7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6C78620045"
-				supplier   	"Logical View::xsd::XSDFixedFacet"
-				quidu      	"3B6C699E00C1"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "value"
-				quid       	"3B6C78500201"
-				type       	"XSDWhiteSpace"
-				exportControl 	"Public")))
-		    (object Class "XSDWildcard"
-			quid       	"3B6838370031"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B684A3A0041"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "namespaceConstraintCategory"
-				quid       	"3B69D0E9019E"
-				type       	"XSDNamespaceConstraintCategory"
-				exportControl 	"Public")
-			    (object ClassAttribute "namespaceConstraint"
-				quid       	"3B97CF860223"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")
-			    (object ClassAttribute "processContents"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3B69D12E01E4"
-				type       	"XSDProcessContents"
-				exportControl 	"Public")
-			    (object ClassAttribute "lexicalNamespaceConstraint"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnsettable"
-					value      	TRUE))
-				quid       	"3BA7BDB701F9"
-				stereotype 	"0..*"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathDefinition"
-			quid       	"3B6D83BB0355"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3B6D84F70092"
-				supplier   	"Logical View::xsd::XSDComponent"
-				quidu      	"3B6846E90029"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "variety"
-				quid       	"3B6D901503DE"
-				type       	"XSDXPathVariety"
-				exportControl 	"Public")
-			    (object ClassAttribute "value"
-				quid       	"3B7BBBE101B1"
-				type       	"String"
-				exportControl 	"Public")))
-		    (object Class "DOMAttr"
-			quid       	"3BBF8C8901B6"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Attr"
-				quid       	"3BBF8CB000D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMDocument"
-			quid       	"3C27850E0381"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Document"
-				quid       	"3C27851B03C6"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMElement"
-			quid       	"3B8189790200"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Element"
-				quid       	"3B8189DB0374"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DOMNode"
-			quid       	"3BFE64A50117"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "org.w3c.dom.Node"
-				quid       	"3BFE65BF002D"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Value"
-			quid       	"3C040B5B031F"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.lang.Object"
-				quid       	"3C040B8D03D5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "XSDAttributeUseCategory"
-			quid       	"3BA7B0E801A8"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "optional"
-				quid       	"3BA7B11502B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "prohibited"
-				quid       	"3BA7B12202D3"
-				exportControl 	"Public")
-			    (object ClassAttribute "required"
-				quid       	"3BA7B12902F0"
-				exportControl 	"Public")))
-		    (object Class "XSDCardinality"
-			quid       	"3BC7715D009B"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "finite"
-				quid       	"3BC771DC02ED"
-				exportControl 	"Public")
-			    (object ClassAttribute "countablyInfinite"
-				quid       	"3BC771EC0141"
-				exportControl 	"Public")))
-		    (object Class "XSDComplexFinal"
-			quid       	"3B97C2CA01CB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C2E700DA"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2EA016A"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6D20112"
-				exportControl 	"Public")))
-		    (object Class "XSDCompositor"
-			quid       	"3B869B620037"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "all"
-				quid       	"3B869BD00003"
-				exportControl 	"Public")
-			    (object ClassAttribute "choice"
-				quid       	"3B869CB8011E"
-				exportControl 	"Public")
-			    (object ClassAttribute "sequence"
-				quid       	"3B869CE50057"
-				exportControl 	"Public")))
-		    (object Class "XSDConstraint"
-			quid       	"3B869E2601AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "default"
-				quid       	"3B869E8E0258"
-				exportControl 	"Public")
-			    (object ClassAttribute "fixed"
-				quid       	"3B869E990271"
-				exportControl 	"Public")))
-		    (object Class "XSDContentTypeCategory"
-			quid       	"3B86A79F03A2"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "empty"
-				quid       	"3B86A7CD02F0"
-				exportControl 	"Public")
-			    (object ClassAttribute "simple"
-				quid       	"3B86A7D100CE"
-				exportControl 	"Public")
-			    (object ClassAttribute "mixed"
-				quid       	"3B86A7D301B7"
-				exportControl 	"Public")
-			    (object ClassAttribute "elementOnly"
-				quid       	"3B86A7D702E9"
-				exportControl 	"Public")))
-		    (object Class "XSDDerivationMethod"
-			quid       	"3B86A0B000CE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B86A0C80329"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B86A0CC0162"
-				exportControl 	"Public")))
-		    (object Class "XSDDiagnosticSeverity"
-			quid       	"3BFE68A7032F"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "fatal"
-				quid       	"3BFE68C303D0"
-				exportControl 	"Public")
-			    (object ClassAttribute "error"
-				quid       	"3BFE68E700E3"
-				exportControl 	"Public")
-			    (object ClassAttribute "warning"
-				quid       	"3BFE68EA01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "information"
-				quid       	"3BFE7FC2019A"
-				exportControl 	"Public")))
-		    (object Class "XSDDisallowedSubstitutions"
-			quid       	"3B97C5A403DF"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "substitution"
-				quid       	"3B97C6790045"
-				exportControl 	"Public")
-			    (object ClassAttribute "extension"
-				quid       	"3B97C67F01AC"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C683020B"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2450069"
-				exportControl 	"Public")))
-		    (object Class "XSDForm"
-			quid       	"3B9F913B01EB"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "qualified"
-				quid       	"3B9F916F0023"
-				exportControl 	"Public")
-			    (object ClassAttribute "unqualified"
-				quid       	"3B9F918C007F"
-				exportControl 	"Public")))
-		    (object Class "XSDIdentityConstraintCategory"
-			quid       	"3B86A1E00272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "key"
-				quid       	"3B86A2120085"
-				exportControl 	"Public")
-			    (object ClassAttribute "keyref"
-				quid       	"3B86A213014F"
-				exportControl 	"Public")
-			    (object ClassAttribute "unique"
-				quid       	"3B86A2160365"
-				exportControl 	"Public")))
-		    (object Class "XSDNamespaceConstraintCategory"
-			quid       	"3B97C5EA0023"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "any"
-				quid       	"3B97D0600034"
-				exportControl 	"Public")
-			    (object ClassAttribute "not"
-				quid       	"3B97D062005F"
-				exportControl 	"Public")
-			    (object ClassAttribute "set"
-				quid       	"3B97D0650117"
-				exportControl 	"Public")))
-		    (object Class "XSDOrdered"
-			quid       	"3BC7715202E4"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "false"
-				quid       	"3BC771A90271"
-				exportControl 	"Public")
-			    (object ClassAttribute "partial"
-				quid       	"3BC771BB01FF"
-				exportControl 	"Public")
-			    (object ClassAttribute "total"
-				quid       	"3BC771C401B2"
-				exportControl 	"Public")))
-		    (object Class "XSDProcessContents"
-			quid       	"3B8FF8C70284"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "strict"
-				quid       	"3B8FF8F80045"
-				exportControl 	"Public")
-			    (object ClassAttribute "lax"
-				quid       	"3B8FF8F6038B"
-				exportControl 	"Public")
-			    (object ClassAttribute "skip"
-				quid       	"3B8FF8E802BA"
-				exportControl 	"Public")))
-		    (object Class "XSDProhibitedSubstitutions"
-			quid       	"3B97C5BE0272"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C68B00B8"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C6940291"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F2500295"
-				exportControl 	"Public")))
-		    (object Class "XSDSimpleFinal"
-			quid       	"3B97C25D0295"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "list"
-				quid       	"3B97C2810230"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C2830138"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B97C288024E"
-				exportControl 	"Public")
-			    (object ClassAttribute "all"
-				quid       	"3BA0F6E00374"
-				exportControl 	"Public")))
-		    (object Class "XSDSubstitutionGroupExclusions"
-			quid       	"3B97C59100AE"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "extension"
-				quid       	"3B97C6640231"
-				exportControl 	"Public")
-			    (object ClassAttribute "restriction"
-				quid       	"3B97C66D0216"
-				exportControl 	"Public")))
-		    (object Class "XSDVariety"
-			quid       	"3B8FF7730249"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "atomic"
-				quid       	"3B8FF7A702DF"
-				exportControl 	"Public")
-			    (object ClassAttribute "list"
-				quid       	"3B8FF7AD0139"
-				exportControl 	"Public")
-			    (object ClassAttribute "union"
-				quid       	"3B8FF7AF039F"
-				exportControl 	"Public")))
-		    (object Class "XSDWhiteSpace"
-			quid       	"3BEED0F60342"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "preserve"
-				quid       	"3BEED10F0117"
-				exportControl 	"Public")
-			    (object ClassAttribute "replace"
-				quid       	"3BEED127034D"
-				exportControl 	"Public")
-			    (object ClassAttribute "collapse"
-				quid       	"3BEED1290396"
-				exportControl 	"Public")))
-		    (object Class "XSDXPathVariety"
-			quid       	"3B8FFB89033A"
-			stereotype 	"enumeration"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "selector"
-				quid       	"3B8FFBAC0192"
-				exportControl 	"Public")
-			    (object ClassAttribute "field"
-				quid       	"3B8FFBB30278"
-				exportControl 	"Public")))
-		    (object Association "$UNNAMED$65"
-			quid       	"3C626EA70102"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$66"
-				quid       	"3C626EA90191"
-				supplier   	"Logical View::xsd::XSDRepeatableFacet"
-				quidu      	"3B6C6AA6031A"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EA90192"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$67"
-			quid       	"3B69DADC02F5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$68"
-				quid       	"3B69DADD0238"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DADD0242"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$69"
-			quid       	"3B6890D6006F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$70"
-				quid       	"3B6890D6030E"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6890D60318"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$71"
-			quid       	"3B68356B02CB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$72"
-				quid       	"3B68356D00A6"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68356D00A7"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$73"
-			quid       	"3B6B426B0194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$74"
-				quid       	"3B6B426D0309"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B426D0313"
-				label      	"resolvedAttributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$75"
-			quid       	"3B69DB060291"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$76"
-				quid       	"3B69DB070171"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB070172"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$77"
-			quid       	"3B69404E0067"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$78"
-				quid       	"3B694050029B"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B69405002A5"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$79"
-			quid       	"3B68359F0086"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$80"
-				quid       	"3B6835A00069"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6835A0006A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$81"
-			quid       	"3C275D320220"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$82"
-				quid       	"3C275D3C010C"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3C275D3C010D"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$83"
-			quid       	"3B6887BF0150"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$84"
-				quid       	"3B6887C000A7"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6887C000A8"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$85"
-			quid       	"3B6B425E01F9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$86"
-				quid       	"3B6B42620046"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedAttributeGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B42620050"
-				label      	"resolvedAttributeGroupDefinition"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$87"
-			quid       	"3B683585010D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$88"
-				quid       	"3B68358600FA"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68358600FB"
-				label      	"attributeDeclaration"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$89"
-			quid       	"3B6F1DE9018A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$90"
-				quid       	"3B6F1DEA036C"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6F1DEA0380"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$91"
-			quid       	"3B90068801C2"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$92"
-				quid       	"3B90068A0111"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentAnnotation"
-				quid       	"3B90068A011B"
-				label      	"contentAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$93"
-			quid       	"3B6833350340"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$94"
-				quid       	"3B683336028D"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683336028E"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$95"
-			quid       	"3B6FDDD70113"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$96"
-				quid       	"3B6FDDDA026B"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6FDDDA0275"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$97"
-			quid       	"3B6837DF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$98"
-				quid       	"3B6837E100FD"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "contentType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6837E100FE"
-				label      	"contentType"
-				supplier   	"Logical View::xsd::XSDComplexTypeContent"
-				quidu      	"3B683BA00196"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$99"
-			quid       	"3B683959006E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$100"
-				quid       	"3B6839590349"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeUses"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683959034A"
-				label      	"attributeUses"
-				supplier   	"Logical View::xsd::XSDAttributeUse"
-				quidu      	"3B68354601A8"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$101"
-			quid       	"3B698E360386"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$102"
-				quid       	"3B698E380072"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeContents"
-				quid       	"3B698E38007C"
-				label      	"attributeContents"
-				supplier   	"Logical View::xsd::XSDAttributeGroupContent"
-				quidu      	"3B6940200089"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$103"
-			quid       	"3B6851BA0126"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$104"
-				quid       	"3B6851BB0150"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6851BB0151"
-				label      	"attributeWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$105"
-			quid       	"3B751B0803C7"
-			roles      	(list role_list
-			    (object Role "container"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B0C01CE"
-				label      	"container"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$106"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B0C01CF"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$107"
-			quid       	"3B751B480261"
-			roles      	(list role_list
-			    (object Role "rootContainer"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751B4C0285"
-				label      	"rootContainer"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$108"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751B4C0286"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")))
-		    (object Association "$UNNAMED$109"
-			quid       	"3B751C310356"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$110"
-				attributes 	(list Attribute_Set)
-				quid       	"3B751C330331"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065")
-			    (object Role "schema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B751C33033B"
-				label      	"schema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$111"
-			quid       	"3B69DB0A0066"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$112"
-				quid       	"3B69DB0B023F"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0B0249"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$113"
-			quid       	"3B68911401AF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$114"
-				quid       	"3B6891150016"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "anonymousTypeDefinition"
-				quid       	"3B6891150017"
-				label      	"anonymousTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$115"
-			quid       	"3B68338C0058"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$116"
-				quid       	"3B68338C03BF"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B68338C03C0"
-				label      	"typeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$117"
-			quid       	"3B6833EF0160"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$118"
-				quid       	"3B6833F00298"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				quid       	"3B6833F00299"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$119"
-			quid       	"3B6B41E60251"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$120"
-				quid       	"3B6B41EA02F7"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedElementDeclaration"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B41EA030B"
-				label      	"resolvedElementDeclaration"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$121"
-			quid       	"3B69C0590198"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$122"
-				quid       	"3B69C05D01E3"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214")
-			    (object Role "substitutionGroupAffiliation"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69C05D01ED"
-				label      	"substitutionGroupAffiliation"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$123"
-			quid       	"3C42DBDD0297"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$124"
-				quid       	"3C42DBE0011E"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				is_aggregate 	TRUE)
-			    (object Role "substitutionGroup"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C42DBE00128"
-				label      	"substitutionGroup"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$125"
-			quid       	"3B6D23B901CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$126"
-				quid       	"3B6D23BA01C4"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6D23BA01CE"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$127"
-			quid       	"3B6D597102EA"
-			roles      	(list role_list
-			    (object Role "simpleTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D59750105"
-				label      	"simpleTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$128"
-				attributes 	(list Attribute_Set)
-				quid       	"3B6D59750119"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2")))
-		    (object Association "$UNNAMED$129"
-			quid       	"3B69B653017A"
-			roles      	(list role_list
-			    (object Role "scope"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B69B654006D"
-				label      	"scope"
-				supplier   	"Logical View::xsd::XSDScope"
-				quidu      	"3B69B54000F2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$130"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69B654006E"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$131"
-			quid       	"3C29010602D7"
-			roles      	(list role_list
-			    (object Role "resolvedFeature"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C29010B000E"
-				label      	"resolvedFeature"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$132"
-				attributes 	(list Attribute_Set)
-				quid       	"3C29010B0018"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$133"
-			quid       	"3B69DB0D0183"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$134"
-				quid       	"3B69DB0D033C"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB0D0346"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$135"
-			quid       	"3B69D29E014D"
-			roles      	(list role_list
-			    (object Role "referencedKey"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69D2A80165"
-				label      	"referencedKey"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$136"
-				attributes 	(list Attribute_Set)
-				quid       	"3B69D2A8016F"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2")))
-		    (object Association "$UNNAMED$137"
-			quid       	"3B6D8D3D003E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$138"
-				quid       	"3B6D8D3E022A"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "selector"
-				quid       	"3B6D8D3E0234"
-				label      	"selector"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$139"
-			quid       	"3B6D8D330025"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$140"
-				quid       	"3B6D8D330365"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				is_aggregate 	TRUE)
-			    (object Role "fields"
-				quid       	"3B6D8D330379"
-				label      	"fields"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$141"
-			quid       	"3B6ADCD802FC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$142"
-				quid       	"3B6ADCD9018B"
-				supplier   	"Logical View::xsd::XSDImport"
-				quidu      	"3B688C93017F"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCD9018C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$143"
-			quid       	"3B6ADCC5007E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$144"
-				quid       	"3B6ADCC6006B"
-				supplier   	"Logical View::xsd::XSDInclude"
-				quidu      	"3B688C7D0250"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B6ADCC6006C"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$145"
-			quid       	"3B69DB1702C8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$146"
-				quid       	"3B69DB1803E2"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB190004"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$147"
-			quid       	"3B6BCEB102F8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$148"
-				quid       	"3B6BCEB6001B"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6BCEB60025"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$149"
-			quid       	"3B683606026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$150"
-				quid       	"3B6836070221"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				is_aggregate 	TRUE)
-			    (object Role "particles"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6836070222"
-				label      	"particles"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$151"
-			quid       	"3B69DB15008A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$152"
-				quid       	"3B69DB160096"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1600A0"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$153"
-			quid       	"3B6837AC025A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$154"
-				quid       	"3B6837AD0338"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroup"
-				quid       	"3B6837AD0339"
-				label      	"modelGroup"
-				supplier   	"Logical View::xsd::XSDModelGroup"
-				quidu      	"3B6834E00291"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$155"
-			quid       	"3B6B42450398"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$156"
-				quid       	"3B6B4249038A"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedModelGroupDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6B4249039E"
-				label      	"resolvedModelGroupDefinition"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$157"
-			quid       	"3B69DB0F0212"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$158"
-				quid       	"3B69DB1000C9"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB1000D3"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$159"
-			quid       	"3B6B47150119"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$160"
-				quid       	"3B6B471A03AB"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "content"
-				quid       	"3B6B471A03B5"
-				label      	"content"
-				supplier   	"Logical View::xsd::XSDParticleContent"
-				quidu      	"3B6BD22300C6"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$161"
-			quid       	"3B683C890122"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$162"
-				quid       	"3B683C8A0110"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				is_aggregate 	TRUE)
-			    (object Role "term"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B683C8A0111"
-				label      	"term"
-				supplier   	"Logical View::xsd::XSDTerm"
-				quidu      	"3B683C5E0174"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$163"
-			quid       	"3B6ADE42009A"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$164"
-				quid       	"3B6ADE4302FE"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6ADE430308"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$165"
-			quid       	"3B6AE8240051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$166"
-				quid       	"3B6AE82602AD"
-				supplier   	"Logical View::xsd::XSDRedefine"
-				quidu      	"3B688C9B02AD"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6AE82602B7"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDRedefineContent"
-				quidu      	"3B6AE2060172"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$167"
-			quid       	"3B688E6B003D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$168"
-				quid       	"3B688E6C0107"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B688E6C0111"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSchemaContent"
-				quidu      	"3B688CB800BA"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$169"
-			quid       	"3B66EE8D01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$170"
-				quid       	"3B66EE8E0198"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "elementDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE8E0199"
-				label      	"elementDeclarations"
-				supplier   	"Logical View::xsd::XSDElementDeclaration"
-				quidu      	"3B66ED580214"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$171"
-			quid       	"3B66FDFA00C3"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$172"
-				quid       	"3B66FDFB027D"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66FDFB027E"
-				label      	"attributeDeclarations"
-				supplier   	"Logical View::xsd::XSDAttributeDeclaration"
-				quidu      	"3B66ED2E0192"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$173"
-			quid       	"3B66EE920216"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$174"
-				quid       	"3B66EE93018B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "attributeGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE93018C"
-				label      	"attributeGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$175"
-			quid       	"3B66EE760049"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$176"
-				quid       	"3B66EE760374"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "typeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EE76037E"
-				label      	"typeDefinitions"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$177"
-			quid       	"3B66EEFF024F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$178"
-				quid       	"3B66EF00025A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "modelGroupDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EF000264"
-				label      	"modelGroupDefinitions"
-				supplier   	"Logical View::xsd::XSDModelGroupDefinition"
-				quidu      	"3B66ED9A0205"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$179"
-			quid       	"3BFC2A1701ED"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$180"
-				quid       	"3BFC2A1A0273"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "identityConstraintDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFC2A1A027D"
-				label      	"identityConstraintDefinitions"
-				supplier   	"Logical View::xsd::XSDIdentityConstraintDefinition"
-				quidu      	"3B682B2603A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$181"
-			quid       	"3B66EEA7023E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$182"
-				quid       	"3B66EEA8038A"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "notationDeclarations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B66EEA8038B"
-				label      	"notationDeclarations"
-				supplier   	"Logical View::xsd::XSDNotationDeclaration"
-				quidu      	"3B66EDAA021C"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Reference"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$183"
-			quid       	"3B69E4560290"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$184"
-				quid       	"3B69E4570165"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69E457016F"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$185"
-			quid       	"3B6D5CA50112"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$186"
-				quid       	"3B6D5CA703B4"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "contents"
-				quid       	"3B6D5CA703C8"
-				label      	"contents"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$187"
-			quid       	"3B6C35AD0374"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$188"
-				quid       	"3B6C35AF0006"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facetContents"
-				quid       	"3B6C35AF0010"
-				label      	"facetContents"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$189"
-			quid       	"3BC8AE0203A8"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$190"
-				quid       	"3BC8AE060051"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "facets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BC8AE060065"
-				label      	"facets"
-				supplier   	"Logical View::xsd::XSDConstrainingFacet"
-				quidu      	"3B6C6B340093"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$191"
-			quid       	"3B6C34B70208"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$192"
-				quid       	"3B6C34BE0258"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "memberTypeDefinitions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6C34BE0259"
-				label      	"memberTypeDefinitions"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$193"
-			quid       	"3B6C363201DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$194"
-				quid       	"3B6C36350059"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fundamentalFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3B6C36350063"
-				label      	"fundamentalFacets"
-				supplier   	"Logical View::xsd::XSDFundamentalFacet"
-				quidu      	"3B6C69E801D6"
-				client_cardinality 	(value cardinality "1..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$195"
-			quid       	"3B6D35AB0273"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$196"
-				quid       	"3B6D35B20291"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "baseTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D35B202A5"
-				label      	"baseTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$197"
-			quid       	"3B6D5572016C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$198"
-				quid       	"3B6D5575022F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "primitiveTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B6D55750243"
-				label      	"primitiveTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$199"
-			quid       	"3B69E2910158"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$200"
-				quid       	"3B69E292019F"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69E29201A9"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$201"
-			quid       	"3B9006CF0088"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$202"
-				quid       	"3B9006D1015D"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "derivationAnnotation"
-				quid       	"3B9006D10167"
-				label      	"derivationAnnotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$203"
-			quid       	"3B69DB330264"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$204"
-				quid       	"3B69DB340284"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3B69DB34028E"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$205"
-			quid       	"3B69DB11026F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$206"
-				quid       	"3B69DB1201F9"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3B69DB120203"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$207"
-			quid       	"3C626EB30005"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$208"
-				quid       	"3C626EB40327"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				is_aggregate 	TRUE)
-			    (object Role "annotations"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C626EB40332"
-				label      	"annotations"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$209"
-			quid       	"3BEBDC870247"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$210"
-				quid       	"3BEBDC8C02F9"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "attributeWildcardContent"
-				quid       	"3BEBDC8C0303"
-				label      	"attributeWildcardContent"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$211"
-			quid       	"3BFE622703CD"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$212"
-				attributes 	(list Attribute_Set)
-				quid       	"3BFE622B0061"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "components"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE622B006C"
-				label      	"components"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$213"
-			quid       	"3BFE62690165"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$214"
-				quid       	"3BFE626A0026"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				is_aggregate 	TRUE)
-			    (object Role "diagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3BFE626A0027"
-				label      	"diagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$215"
-			quid       	"3BFE6431035F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$216"
-				quid       	"3BFE643201C6"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "allDiagnostics"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3BFE643201C7"
-				label      	"allDiagnostics"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$217"
-			quid       	"3C21DCC700EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$218"
-				quid       	"3C21DCCE0042"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				is_aggregate 	TRUE)
-			    (object Role "resolvedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DCCE0043"
-				label      	"resolvedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$219"
-			quid       	"3C21DD0C03DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$220"
-				quid       	"3C21DD100304"
-				supplier   	"Logical View::xsd::XSDSchemaCompositor"
-				quidu      	"3C21DB4102AE"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C21DD100305"
-				label      	"incorporatedSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$221"
-			quid       	"3C239134004F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$222"
-				quid       	"3C23913600CA"
-				supplier   	"Logical View::xsd::XSDXPathDefinition"
-				quidu      	"3B6D83BB0355"
-				is_aggregate 	TRUE)
-			    (object Role "annotation"
-				quid       	"3C23913600D4"
-				label      	"annotation"
-				supplier   	"Logical View::xsd::XSDAnnotation"
-				quidu      	"3B66EDC80233"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$223"
-			quid       	"3C25D3A60131"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$224"
-				quid       	"3C25D3A90370"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "referencingDirectives"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C25D3A90371"
-				label      	"referencingDirectives"
-				supplier   	"Logical View::xsd::XSDSchemaDirective"
-				quidu      	"3B6AD8A202A2"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$225"
-			quid       	"3C25ECF0005E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$226"
-				quid       	"3C25ECF4001E"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "rootVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ECF40028"
-				label      	"rootVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$227"
-			quid       	"3C25ED0B011B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$228"
-				quid       	"3C25ED0F0121"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "originalVersion"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25ED0F012B"
-				label      	"originalVersion"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$229"
-			quid       	"3C25EEAB001F"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$230"
-				quid       	"3C25EEAF010B"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				is_aggregate 	TRUE)
-			    (object Role "incorporatedVersions"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C25EEAF0115"
-				label      	"incorporatedVersions"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$231"
-			quid       	"3C276DA000DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$232"
-				quid       	"3C276DA000DF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "itemTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3C276DA000E0"
-				label      	"itemTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$233"
-			quid       	"3C2784730194"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$234"
-				quid       	"3C27847501F1"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB")
-			    (object Role "schemaForSchema"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C27847501FB"
-				label      	"schemaForSchema"
-				supplier   	"Logical View::xsd::XSDSchema"
-				quidu      	"374B182500BB"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$235"
-			quid       	"3C2880F503D9"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2880F9003C"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$236"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2880F90046"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A")))
-		    (object Association "$UNNAMED$237"
-			quid       	"3C2882C50137"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$238"
-				attributes 	(list Attribute_Set)
-				quid       	"3C2882C70112"
-				supplier   	"Logical View::xsd::XSDDiagnostic"
-				quidu      	"3BFE5F910046")
-			    (object Role "primaryComponent"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C2882C70113"
-				label      	"primaryComponent"
-				supplier   	"Logical View::xsd::XSDConcreteComponent"
-				quidu      	"3B6AD7B40065"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$239"
-			quid       	"3C28A0F201A4"
-			roles      	(list role_list
-			    (object Role "type"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A0F302E5"
-				label      	"type"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$240"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A0F302F0"
-				supplier   	"Logical View::xsd::XSDFeature"
-				quidu      	"3B69B537026C")))
-		    (object Association "$UNNAMED$241"
-			quid       	"3C28A6DB01E5"
-			roles      	(list role_list
-			    (object Role "rootType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A6DD03DD"
-				label      	"rootType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$242"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A6DD03DE"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$243"
-			quid       	"3C28A7120108"
-			roles      	(list role_list
-			    (object Role "baseType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7140151"
-				label      	"baseType"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$244"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A714015B"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$245"
-			quid       	"3C28A74B0178"
-			roles      	(list role_list
-			    (object Role "simpleType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A74D017B"
-				label      	"simpleType"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$246"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A74D0185"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$247"
-			quid       	"3C28A7ED03C0"
-			roles      	(list role_list
-			    (object Role "complexType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A7F40117"
-				label      	"complexType"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$248"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A7F40121"
-				supplier   	"Logical View::xsd::XSDTypeDefinition"
-				quidu      	"3B66ECD302A9")))
-		    (object Association "$UNNAMED$249"
-			quid       	"3C28A994030A"
-			roles      	(list role_list
-			    (object Role "rootTypeDefinition"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28A99700DD"
-				label      	"rootTypeDefinition"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "$UNNAMED$250"
-				attributes 	(list Attribute_Set)
-				quid       	"3C28A99700E7"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D")))
-		    (object Association "$UNNAMED$251"
-			quid       	"3C28B085025B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$252"
-				quid       	"3C28B0860270"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B086027A"
-				label      	"minFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$253"
-			quid       	"3C28B08D0252"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$254"
-				quid       	"3C28B08E0091"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B08E009B"
-				label      	"maxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$255"
-			quid       	"3C28B0AB0396"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$256"
-				quid       	"3C28B0AC03C9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0AC03D4"
-				label      	"maxInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxInclusiveFacet"
-				quidu      	"3B6C787D00DA"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$257"
-			quid       	"3C28B0AF0338"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$258"
-				quid       	"3C28B0B001F9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minInclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B00203"
-				label      	"minInclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinInclusiveFacet"
-				quidu      	"3B6C788702C9"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$259"
-			quid       	"3C28B0B30207"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$260"
-				quid       	"3C28B0B40190"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B4019A"
-				label      	"minExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMinExclusiveFacet"
-				quidu      	"3B6C792D000A"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$261"
-			quid       	"3C28B0B6028D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$262"
-				quid       	"3C28B0B70217"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxExclusiveFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0B70221"
-				label      	"maxExclusiveFacet"
-				supplier   	"Logical View::xsd::XSDMaxExclusiveFacet"
-				quidu      	"3B6C789600C2"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$263"
-			quid       	"3C28B0BC0051"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$264"
-				quid       	"3C28B0BC0246"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "lengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0BC0250"
-				label      	"lengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$265"
-			quid       	"3C28B0BF018C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$266"
-				quid       	"3C28B0C0006B"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "whiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C00075"
-				label      	"whiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$267"
-			quid       	"3C28B0C2021D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$268"
-				quid       	"3C28B0C300AB"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "enumerationFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C300AC"
-				label      	"enumerationFacets"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$269"
-			quid       	"3C28B0C50159"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$270"
-				quid       	"3C28B0C600B0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "patternFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C600BA"
-				label      	"patternFacets"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..n")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$271"
-			quid       	"3C28B0C802A7"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$272"
-				quid       	"3C28B0C901EA"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "cardinalityFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0C901F5"
-				label      	"cardinalityFacet"
-				supplier   	"Logical View::xsd::XSDCardinalityFacet"
-				quidu      	"3B6C755D03D2"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$273"
-			quid       	"3C28B0CB039C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$274"
-				quid       	"3C28B0CC03D0"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "numericFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0CC03D1"
-				label      	"numericFacet"
-				supplier   	"Logical View::xsd::XSDNumericFacet"
-				quidu      	"3B6C75950206"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$275"
-			quid       	"3C28B0CF0199"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$276"
-				quid       	"3C28B0D20085"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "maxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D2008F"
-				label      	"maxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$277"
-			quid       	"3C28B0D500C5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$278"
-				quid       	"3C28B0D6001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "minLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D60027"
-				label      	"minLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$279"
-			quid       	"3C28B0D800DE"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$280"
-				quid       	"3C28B0D803CD"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "totalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0D803D7"
-				label      	"totalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$281"
-			quid       	"3C28B0DB0377"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$282"
-				quid       	"3C28B0DC035A"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "fractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DC0364"
-				label      	"fractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$283"
-			quid       	"3C28B0DF0048"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$284"
-				quid       	"3C28B0DF03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "orderedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0DF03C3"
-				label      	"orderedFacet"
-				supplier   	"Logical View::xsd::XSDOrderedFacet"
-				quidu      	"3B6C74DD0248"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$285"
-			quid       	"3C28B0E300D9"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$286"
-				quid       	"3C28B0E4038E"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "boundedFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B0E40398"
-				label      	"boundedFacet"
-				supplier   	"Logical View::xsd::XSDBoundedFacet"
-				quidu      	"3B6C751D0344"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$287"
-			quid       	"3C28B44401EC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$288"
-				quid       	"3C28B4450360"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B445036A"
-				label      	"effectiveMaxFacet"
-				supplier   	"Logical View::xsd::XSDMaxFacet"
-				quidu      	"3C0A1CEB010E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$289"
-			quid       	"3C28B54F0145"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$290"
-				quid       	"3C28B550038C"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveWhiteSpaceFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5500396"
-				label      	"effectiveWhiteSpaceFacet"
-				supplier   	"Logical View::xsd::XSDWhiteSpaceFacet"
-				quidu      	"3B6C784601B7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$291"
-			quid       	"3C28B5C4011C"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$292"
-				quid       	"3C28B5C5020D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMaxLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B5C50217"
-				label      	"effectiveMaxLengthFacet"
-				supplier   	"Logical View::xsd::XSDMaxLengthFacet"
-				quidu      	"3B6C77C70146"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$293"
-			quid       	"3C28B62A00AA"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$294"
-				quid       	"3C28B62B0138"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveFractionDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B62B0142"
-				label      	"effectiveFractionDigitsFacet"
-				supplier   	"Logical View::xsd::XSDFractionDigitsFacet"
-				quidu      	"3B6C79BE02EE"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$295"
-			quid       	"3C28B6B003A6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$296"
-				quid       	"3C28B6B10311"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectivePatternFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B6B10312"
-				label      	"effectivePatternFacet"
-				supplier   	"Logical View::xsd::XSDPatternFacet"
-				quidu      	"3B6C6ADB026C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$297"
-			quid       	"3C28B7CA026B"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$298"
-				quid       	"3C28B7CB0186"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveEnumerationFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B7CB0190"
-				label      	"effectiveEnumerationFacet"
-				supplier   	"Logical View::xsd::XSDEnumerationFacet"
-				quidu      	"3B6C6ACE0141"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$299"
-			quid       	"3C28B8400062"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$300"
-				quid       	"3C28B841001D"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveTotalDigitsFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8410027"
-				label      	"effectiveTotalDigitsFacet"
-				supplier   	"Logical View::xsd::XSDTotalDigitsFacet"
-				quidu      	"3B6C79A0020E"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$301"
-			quid       	"3C28B898016D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$302"
-				quid       	"3C28B8990056"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8990060"
-				label      	"effectiveMinLengthFacet"
-				supplier   	"Logical View::xsd::XSDMinLengthFacet"
-				quidu      	"3B6C778C0065"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$303"
-			quid       	"3C28B8DC0052"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$304"
-				quid       	"3C28B8DC03B9"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveLengthFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B8DC03C3"
-				label      	"effectiveLengthFacet"
-				supplier   	"Logical View::xsd::XSDLengthFacet"
-				quidu      	"3B6C776200E7"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$305"
-			quid       	"3C28B97001DB"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$306"
-				quid       	"3C28B97100CF"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "effectiveMinFacet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3C28B97100D9"
-				label      	"effectiveMinFacet"
-				supplier   	"Logical View::xsd::XSDMinFacet"
-				quidu      	"3C0A1CDE037C"
-				client_cardinality 	(value cardinality "0..1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$307"
-			quid       	"3D4BB4AE01CC"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$308"
-				quid       	"3D4BB4AF010F"
-				supplier   	"Logical View::xsd::XSDSimpleTypeDefinition"
-				quidu      	"3B682BA7005D"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticFacets"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4AF011A"
-				label      	"syntheticFacets"
-				supplier   	"Logical View::xsd::XSDFacet"
-				quidu      	"3B6C359403D2"
-				client_cardinality 	(value cardinality "0..n")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$309"
-			quid       	"3D4BB4D3028E"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$310"
-				quid       	"3D4BB4D402F3"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticParticle"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4D402FD"
-				label      	"syntheticParticle"
-				supplier   	"Logical View::xsd::XSDParticle"
-				quidu      	"3B682BBD01F7"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$311"
-			quid       	"3D4BB4D901F6"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$312"
-				quid       	"3D4BB4DA0284"
-				supplier   	"Logical View::xsd::XSDComplexTypeDefinition"
-				quidu      	"3B682B82031A"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3D4BB4DA028E"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$313"
-			quid       	"3D4C68FF01BF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$314"
-				quid       	"3D4C69020317"
-				supplier   	"Logical View::xsd::XSDAttributeGroupDefinition"
-				quidu      	"3B66ED840290"
-				is_aggregate 	TRUE)
-			    (object Role "syntheticWildcard"
-				quid       	"3D4C69020318"
-				label      	"syntheticWildcard"
-				supplier   	"Logical View::xsd::XSDWildcard"
-				quidu      	"3B6838370031"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "1. Component Hierarchy (Part 1: Structures)"
-			quid       	"3B6847680138"
-			title      	"1. Component Hierarchy (Part 1: Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @360
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@360
-				    location   	(766, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @361
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1168, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@361
-				    location   	(940, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @362
-				location   	(928, 225)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@360
-				vertices   	(list Points
-				    (928, 225)
-				    (928, 135)))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @363
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@363
-				    location   	(1460, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @364
-				location   	(1203, 706)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@361
-				vertices   	(list Points
-				    (1203, 706)
-				    (1203, 615)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @365
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(624, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@365
-				    location   	(372, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @366
-				location   	(444, 709)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@365
-				vertices   	(list Points
-				    (444, 709)
-				    (444, 615)))
-			    (object InheritTreeView "" @367
-				location   	(1572, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@363
-				vertices   	(list Points
-				    (1572, 465)
-				    (1572, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @368
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 800)
-				label      	(object ItemLabel
-				    Parent_View 	@368
-				    location   	(290, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @369
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 1056)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@369
-				    location   	(262, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @370
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1104, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@370
-				    location   	(936, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @371
-				location   	(453, 1203)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@369
-				vertices   	(list Points
-				    (453, 1203)
-				    (453, 1111)))
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @372
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@372
-				    location   	(62, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @373
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@373
-				    location   	(1746, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @374
-				location   	(1872, 950)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@373
-				vertices   	(list Points
-				    (1872, 950)
-				    (1872, 855)))
-			    (object InheritTreeView "" @375
-				location   	(181, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@372
-				vertices   	(list Points
-				    (181, 465)
-				    (181, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @376
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@376
-				    location   	(1670, 1233)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	550
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @377
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@377
-				    location   	(1734, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @378
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@378
-				    location   	(1569, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	656
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @379
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1184, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@379
-				    location   	(903, 1444)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	563
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	581
-				height     	112
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @380
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@380
-				    location   	(1462, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	276
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	294
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @381
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@381
-				    location   	(778, 1013)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @382
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@382
-				    location   	(1806, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @383
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@383
-				    location   	(106, 1253)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @384
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@384
-				    location   	(60, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @385
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1280)
-				label      	(object ItemLabel
-				    Parent_View 	@385
-				    location   	(802, 1237)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	558
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @386
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1488)
-				label      	(object ItemLabel
-				    Parent_View 	@386
-				    location   	(30, 1441)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	676
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	694
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @387
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@387
-				    location   	(426, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	300
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	318
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @388
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@388
-				    location   	(1808, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @389
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@370
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(1094, 265)
-				terminal_attachment 	(1094, 225)
-				drawSupplier 	@362)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @390
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(960, 800)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@390
-				    location   	(690, 757)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @391
-				location   	(962, 947)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@390
-				vertices   	(list Points
-				    (962, 947)
-				    (962, 855)))
-			    (object InheritView "" @392
-				stereotype 	(object SegLabel @393
-				    Parent_View 	@392
-				    location   	(218, 1154)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.163534
-				    height     	69
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@383
-				supplier   	@365
-				line_style 	3
-				origin_attachment 	(149, 1241)
-				terminal_attachment 	(149, 709)
-				drawSupplier 	@366)
-			    (object InheritView "" @394
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@383
-				supplier   	@369
-				line_style 	3
-				origin_attachment 	(256, 1241)
-				terminal_attachment 	(256, 1203)
-				drawSupplier 	@371)
-			    (object InheritView "" @395
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@384
-				supplier   	@372
-				line_style 	3
-				origin_attachment 	(284, 505)
-				terminal_attachment 	(284, 465)
-				drawSupplier 	@375)
-			    (object InheritView "" @396
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@382
-				supplier   	@363
-				line_style 	3
-				origin_attachment 	(2002, 505)
-				terminal_attachment 	(2002, 465)
-				drawSupplier 	@367)
-			    (object InheritView "" @397
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@363
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(1569, 265)
-				terminal_attachment 	(1569, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @398
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@380
-				supplier   	@363
-				line_style 	3
-				origin_attachment 	(1490, 505)
-				terminal_attachment 	(1490, 465)
-				drawSupplier 	@367)
-			    (object InheritView "" @399
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@368
-				supplier   	@365
-				line_style 	3
-				origin_attachment 	(510, 745)
-				terminal_attachment 	(510, 709)
-				drawSupplier 	@366)
-			    (object InheritView "" @400
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@385
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(1321, 1225)
-				terminal_attachment 	(1321, 947)
-				drawSupplier 	@391)
-			    (object InheritView "" @401
-				stereotype 	(object SegLabel @402
-				    Parent_View 	@401
-				    location   	(2137, 886)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.215812
-				    height     	64
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@377
-				supplier   	@363
-				line_style 	3
-				origin_attachment 	(2200, 1001)
-				terminal_attachment 	(2200, 465)
-				drawSupplier 	@367)
-			    (object InheritView "" @403
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@377
-				supplier   	@373
-				line_style 	3
-				origin_attachment 	(2093, 1001)
-				terminal_attachment 	(2093, 950)
-				drawSupplier 	@374)
-			    (object InheritView "" @404
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@369
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(450, 1001)
-				terminal_attachment 	(450, 947)
-				drawSupplier 	@391)
-			    (object InheritView "" @405
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@372
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(147, 265)
-				terminal_attachment 	(147, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @406
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D84F70092"
-				client     	@388
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(2012, 265)
-				terminal_attachment 	(2012, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @407
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848B80286"
-				client     	@365
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(834, 505)
-				terminal_attachment 	(834, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @408
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@361
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(1350, 505)
-				terminal_attachment 	(1350, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @409
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@387
-				supplier   	@360
-				line_style 	3
-				origin_attachment 	(572, 265)
-				terminal_attachment 	(572, 225)
-				drawSupplier 	@362)
-			    (object InheritView "" @410
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@376
-				supplier   	@373
-				line_style 	3
-				origin_attachment 	(1693, 1221)
-				terminal_attachment 	(1693, 950)
-				drawSupplier 	@374)
-			    (object InheritView "" @411
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@378
-				supplier   	@361
-				line_style 	3
-				origin_attachment 	(1590, 1432)
-				terminal_attachment 	(1590, 706)
-				drawSupplier 	@364)
-			    (object InheritView "" @412
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@379
-				supplier   	@361
-				line_style 	3
-				origin_attachment 	(1431, 1432)
-				terminal_attachment 	(1431, 706)
-				drawSupplier 	@364)
-			    (object InheritView "" @413
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@390
-				supplier   	@361
-				line_style 	3
-				origin_attachment 	(959, 745)
-				terminal_attachment 	(959, 706)
-				drawSupplier 	@364)
-			    (object InheritView "" @414
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@373
-				supplier   	@361
-				line_style 	3
-				origin_attachment 	(1872, 745)
-				terminal_attachment 	(1872, 706)
-				drawSupplier 	@364)
-			    (object InheritView "" @415
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@381
-				supplier   	@390
-				line_style 	3
-				origin_attachment 	(962, 1001)
-				terminal_attachment 	(962, 947)
-				drawSupplier 	@391)
-			    (object InheritView "" @416
-				stereotype 	(object SegLabel @417
-				    Parent_View 	@416
-				    location   	(95, 1388)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.042531
-				    height     	67
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B69BAA20310"
-				client     	@386
-				supplier   	@372
-				line_style 	3
-				origin_attachment 	(28, 1429)
-				terminal_attachment 	(28, 465)
-				drawSupplier 	@375)
-			    (object InheritView "" @418
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@386
-				supplier   	@369
-				line_style 	3
-				origin_attachment 	(656, 1429)
-				terminal_attachment 	(656, 1203)
-				drawSupplier 	@371)))
-		    (object ClassDiagram "2. Component Relations (Part 1 : Structures)"
-			quid       	"374B18190028"
-			title      	"2. Component Relations (Part 1 : Structures)"
-			zoom       	96
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @419
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(784, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@419
-				    location   	(670, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @420
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1632)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@420
-				    location   	(66, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				width      	270
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$129" @421
-				location   	(494, 1627)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B653017A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "scope" @422
-					Parent_View 	@421
-					location   	(286, -485)
-					label      	(object SegLabel @423
-					    Parent_View 	@422
-					    location   	(555, 1589)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+scope"
-					    pctDist    	0.371257
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006D"
-					client     	@421
-					supplier   	@419
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(661, 1627)
-					label      	(object SegLabel @424
-					    Parent_View 	@422
-					    location   	(576, 1664)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.491018
-					    height     	37
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$130" @425
-					Parent_View 	@421
-					location   	(286, -485)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69B654006E"
-					client     	@421
-					supplier   	@420
-					line_style 	3
-					origin_attachment 	(494, 1627)
-					terminal_attachment 	(327, 1627))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @426
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@426
-				    location   	(2084, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @427
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2176, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@427
-				    location   	(2051, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$161" @428
-				location   	(2229, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683C890122"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$162" @429
-					Parent_View 	@428
-					location   	(549, -248)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0110"
-					client     	@428
-					supplier   	@427
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1045))
-				    (object RoleView "term" @430
-					Parent_View 	@428
-					location   	(549, -248)
-					label      	(object SegLabel @431
-					    Parent_View 	@430
-					    location   	(2157, 1121)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+term"
-					    pctDist    	0.134328
-					    height     	72
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683C8A0111"
-					client     	@428
-					supplier   	@426
-					line_style 	3
-					origin_attachment 	(2229, 1112)
-					terminal_attachment 	(2229, 1179)
-					label      	(object SegLabel @432
-					    Parent_View 	@430
-					    location   	(2274, 1119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.119403
-					    height     	45
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @433
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 1232)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@433
-				    location   	(1076, 1191)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @434
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@434
-				    location   	(1977, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$149" @435
-				location   	(2219, 880)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683606026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$150" @436
-					Parent_View 	@435
-					location   	(-357, -240)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070221"
-					client     	@435
-					supplier   	@434
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 821))
-				    (object RoleView "particles" @437
-					Parent_View 	@435
-					location   	(-357, -240)
-					label      	(object SegLabel @438
-					    Parent_View 	@437
-					    location   	(2105, 888)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+particles"
-					    pctDist    	0.156627
-					    height     	115
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6836070222"
-					client     	@435
-					supplier   	@427
-					line_style 	3
-					origin_attachment 	(2219, 880)
-					terminal_attachment 	(2219, 939)
-					label      	(object SegLabel @439
-					    Parent_View 	@437
-					    location   	(2281, 888)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.156627
-					    height     	62
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @440
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@440
-				    location   	(1639, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @441
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@441
-				    location   	(905, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	352
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @442
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(432, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@442
-				    location   	(187, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$195" @443
-				location   	(590, 1140)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$196" @444
-					Parent_View 	@443
-					location   	(302, 148)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@443
-					supplier   	@442
-					vertices   	(list Points
-					    (590, 1140)
-					    (540, 1140)
-					    (540, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(540, 1045))
-				    (object RoleView "baseTypeDefinition" @445
-					Parent_View 	@443
-					location   	(302, 148)
-					label      	(object SegLabel @446
-					    Parent_View 	@445
-					    location   	(643, 1171)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.053571
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@443
-					supplier   	@442
-					vertices   	(list Points
-					    (590, 1140)
-					    (641, 1140)
-					    (641, 1045))
-					line_style 	3
-					origin_attachment 	(590, 1140)
-					terminal_attachment 	(641, 1045)
-					label      	(object SegLabel @447
-					    Parent_View 	@445
-					    location   	(584, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.122449
-					    height     	44
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @448
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@448
-				    location   	(745, 951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$97" @449
-				location   	(1119, 1112)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837DF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$98" @450
-					Parent_View 	@449
-					location   	(-1569, -8)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FD"
-					client     	@449
-					supplier   	@448
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1045))
-				    (object RoleView "contentType" @451
-					Parent_View 	@449
-					location   	(-1569, -8)
-					label      	(object SegLabel @452
-					    Parent_View 	@451
-					    location   	(1259, 1126)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+contentType"
-					    pctDist    	0.208955
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837E100FE"
-					client     	@449
-					supplier   	@433
-					line_style 	3
-					origin_attachment 	(1119, 1112)
-					terminal_attachment 	(1119, 1179)
-					label      	(object SegLabel @453
-					    Parent_View 	@451
-					    location   	(1063, 1126)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.208955
-					    height     	57
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$103" @454
-				location   	(1455, 982)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6851BA0126"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$104" @455
-					Parent_View 	@454
-					location   	(159, -570)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0150"
-					client     	@454
-					supplier   	@448
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1280, 982))
-				    (object RoleView "attributeWildcard" @456
-					Parent_View 	@454
-					location   	(159, -570)
-					label      	(object SegLabel @457
-					    Parent_View 	@456
-					    location   	(1445, 929)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	-0.062857
-					    height     	54
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6851BB0151"
-					client     	@454
-					supplier   	@440
-					line_style 	3
-					origin_attachment 	(1455, 982)
-					terminal_attachment 	(1630, 982)
-					label      	(object SegLabel @458
-					    Parent_View 	@456
-					    location   	(1550, 1022)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.542857
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$99" @459
-				location   	(921, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683959006E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$100" @460
-					Parent_View 	@459
-					location   	(-871, -376)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6839590349"
-					client     	@459
-					supplier   	@448
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1045))
-				    (object RoleView "attributeUses" @461
-					Parent_View 	@459
-					location   	(-871, -376)
-					label      	(object SegLabel @462
-					    Parent_View 	@461
-					    location   	(778, 1251)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.269939
-					    height     	144
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683959034A"
-					client     	@459
-					supplier   	@441
-					line_style 	3
-					origin_attachment 	(921, 1208)
-					terminal_attachment 	(921, 1371)
-					label      	(object SegLabel @463
-					    Parent_View 	@461
-					    location   	(979, 1254)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.288344
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @464
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 768)
-				label      	(object ItemLabel
-				    Parent_View 	@464
-				    location   	(1122, 727)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	380
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	398
-				height     	107
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @465
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@465
-				    location   	(1623, 1591)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @466
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@466
-				    location   	(1803, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	508
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$153" @467
-				location   	(2216, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$154" @468
-					Parent_View 	@467
-					location   	(-552, -816)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@467
-					supplier   	@466
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 501))
-				    (object RoleView "modelGroup" @469
-					Parent_View 	@467
-					location   	(-552, -816)
-					label      	(object SegLabel @470
-					    Parent_View 	@469
-					    location   	(2080, 628)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.182609
-					    height     	137
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@467
-					supplier   	@434
-					line_style 	3
-					origin_attachment 	(2216, 608)
-					terminal_attachment 	(2216, 715)
-					label      	(object SegLabel @471
-					    Parent_View 	@469
-					    location   	(2256, 633)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.233645
-					    height     	40
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @472
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@472
-				    location   	(1619, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$83" @473
-				location   	(1676, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6887BF0150"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$84" @474
-					Parent_View 	@473
-					location   	(412, -344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A7"
-					client     	@473
-					supplier   	@472
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1371))
-				    (object RoleView "attributeWildcard" @475
-					Parent_View 	@473
-					location   	(412, -344)
-					label      	(object SegLabel @476
-					    Parent_View 	@475
-					    location   	(1857, 1106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeWildcard"
-					    pctDist    	0.625767
-					    height     	181
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6887C000A8"
-					client     	@473
-					supplier   	@440
-					line_style 	3
-					origin_attachment 	(1676, 1208)
-					terminal_attachment 	(1676, 1045)
-					label      	(object SegLabel @477
-					    Parent_View 	@475
-					    location   	(1618, 1108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.619632
-					    height     	59
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$79" @478
-				location   	(1429, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68359F0086"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$80" @479
-					Parent_View 	@478
-					location   	(-363, -146)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A00069"
-					client     	@478
-					supplier   	@472
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1610, 1438))
-				    (object RoleView "attributeUses" @480
-					Parent_View 	@478
-					location   	(-363, -146)
-					label      	(object SegLabel @481
-					    Parent_View 	@480
-					    location   	(1405, 1506)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+attributeUses"
-					    pctDist    	0.132597
-					    height     	68
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6835A0006A"
-					client     	@478
-					supplier   	@441
-					line_style 	3
-					origin_attachment 	(1429, 1438)
-					terminal_attachment 	(1248, 1438)
-					label      	(object SegLabel @482
-					    Parent_View 	@480
-					    location   	(1327, 1391)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.563536
-					    height     	48
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @483
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@483
-				    location   	(183, 1383)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$87" @484
-				location   	(777, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B683585010D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$88" @485
-					Parent_View 	@484
-					location   	(-519, -367)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FA"
-					client     	@484
-					supplier   	@441
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(896, 1425))
-				    (object RoleView "attributeDeclaration" @486
-					Parent_View 	@484
-					location   	(-519, -367)
-					label      	(object SegLabel @487
-					    Parent_View 	@486
-					    location   	(784, 1508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+attributeDeclaration"
-					    pctDist    	-0.059259
-					    height     	83
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68358600FB"
-					client     	@484
-					supplier   	@483
-					line_style 	3
-					origin_attachment 	(777, 1425)
-					terminal_attachment 	(658, 1425)
-					label      	(object SegLabel @488
-					    Parent_View 	@486
-					    location   	(721, 1385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.472441
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$71" @489
-				location   	(237, 1208)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68356B02CB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$72" @490
-					Parent_View 	@489
-					location   	(-1043, 72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A6"
-					client     	@489
-					supplier   	@483
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1371))
-				    (object RoleView "typeDefinition" @491
-					Parent_View 	@489
-					location   	(-1043, 72)
-					label      	(object SegLabel @492
-					    Parent_View 	@491
-					    location   	(388, 1247)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	-0.239264
-					    height     	151
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68356D00A7"
-					client     	@489
-					supplier   	@442
-					line_style 	3
-					origin_attachment 	(237, 1208)
-					terminal_attachment 	(237, 1045)
-					label      	(object SegLabel @493
-					    Parent_View 	@491
-					    location   	(195, 1247)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.239264
-					    height     	43
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @494
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@494
-				    location   	(198, 743)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$93" @495
-				location   	(728, 775)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833350340"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$94" @496
-					Parent_View 	@495
-					location   	(-856, -57)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028D"
-					client     	@495
-					supplier   	@448
-					vertices   	(list Points
-					    (728, 775)
-					    (788, 775)
-					    (788, 939))
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(788, 939))
-				    (object RoleView "baseTypeDefinition" @497
-					Parent_View 	@495
-					location   	(-856, -57)
-					label      	(object SegLabel @498
-					    Parent_View 	@497
-					    location   	(558, 883)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	1.140940
-					    height     	108
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B683336028E"
-					client     	@495
-					supplier   	@494
-					line_style 	3
-					origin_attachment 	(728, 775)
-					terminal_attachment 	(579, 775)
-					label      	(object SegLabel @499
-					    Parent_View 	@497
-					    location   	(750, 812)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.152439
-					    height     	37
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @500
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@500
-				    location   	(1017, 407)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	107
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$135" @501
-				location   	(1629, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69D29E014D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencedKey" @502
-					Parent_View 	@501
-					location   	(-83, 94)
-					label      	(object SegLabel @503
-					    Parent_View 	@502
-					    location   	(1761, 608)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+referencedKey"
-					    pctDist    	-1.797297
-					    height     	34
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A80165"
-					client     	@501
-					supplier   	@500
-					vertices   	(list Points
-					    (1629, 574)
-					    (1555, 574)
-					    (1555, 501))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1555, 501)
-					label      	(object SegLabel @504
-					    Parent_View 	@502
-					    location   	(1622, 539)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.047619
-					    height     	36
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$136" @505
-					Parent_View 	@501
-					location   	(-83, 94)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69D2A8016F"
-					client     	@501
-					supplier   	@500
-					vertices   	(list Points
-					    (1629, 574)
-					    (1689, 574)
-					    (1689, 444)
-					    (1616, 444))
-					line_style 	3
-					origin_attachment 	(1629, 574)
-					terminal_attachment 	(1616, 444))))
-			    (object AssociationViewNew "$UNNAMED$139" @506
-				location   	(1197, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$140" @507
-					Parent_View 	@506
-					location   	(-115, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@506
-					supplier   	@500
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 501))
-				    (object RoleView "fields" @508
-					Parent_View 	@506
-					location   	(-115, 32)
-					label      	(object SegLabel @509
-					    Parent_View 	@508
-					    location   	(1119, 655)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.439252
-					    height     	78
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@506
-					supplier   	@464
-					line_style 	3
-					origin_attachment 	(1197, 608)
-					terminal_attachment 	(1197, 715)
-					label      	(object SegLabel @510
-					    Parent_View 	@508
-					    location   	(1253, 654)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.429907
-					    height     	56
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$137" @511
-				location   	(1415, 608)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$138" @512
-					Parent_View 	@511
-					location   	(103, 32)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@511
-					supplier   	@500
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 501))
-				    (object RoleView "selector" @513
-					Parent_View 	@511
-					location   	(103, 32)
-					label      	(object SegLabel @514
-					    Parent_View 	@513
-					    location   	(1513, 651)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.411215
-					    height     	98
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@511
-					supplier   	@464
-					line_style 	3
-					origin_attachment 	(1415, 608)
-					terminal_attachment 	(1415, 715)
-					label      	(object SegLabel @515
-					    Parent_View 	@513
-					    location   	(1381, 650)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.392523
-					    height     	34
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @516
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1312, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@516
-				    location   	(1022, 68)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	581
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	599
-				height     	209
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$181" @517
-				location   	(2395, 606)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEA7023E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$182" @518
-					Parent_View 	@517
-					location   	(-853, 174)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038A"
-					client     	@517
-					supplier   	@516
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 65)
-					    (1611, 65))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(1611, 65))
-				    (object RoleView "notationDeclarations" @519
-					Parent_View 	@517
-					location   	(-853, 174)
-					label      	(object SegLabel @520
-					    Parent_View 	@519
-					    location   	(2089, 104)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+notationDeclarations"
-					    pctDist    	-0.489776
-					    height     	307
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EEA8038B"
-					client     	@517
-					supplier   	@465
-					vertices   	(list Points
-					    (2395, 606)
-					    (2395, 1633)
-					    (2098, 1633))
-					line_style 	3
-					origin_attachment 	(2395, 606)
-					terminal_attachment 	(2098, 1633)
-					label      	(object SegLabel @521
-					    Parent_View 	@519
-					    location   	(2344, 105)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.487829
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$177" @522
-				location   	(1772, 249)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EEFF024F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$178" @523
-					Parent_View 	@522
-					location   	(-948, -327)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF00025A"
-					client     	@522
-					supplier   	@516
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1611, 249))
-				    (object RoleView "modelGroupDefinitions" @524
-					Parent_View 	@522
-					location   	(-948, -327)
-					label      	(object SegLabel @525
-					    Parent_View 	@524
-					    location   	(2076, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+modelGroupDefinitions"
-					    pctDist    	0.713592
-					    height     	244
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EF000264"
-					client     	@522
-					supplier   	@466
-					vertices   	(list Points
-					    (1772, 249)
-					    (1832, 249)
-					    (1832, 395))
-					line_style 	3
-					origin_attachment 	(1772, 249)
-					terminal_attachment 	(1832, 395)
-					label      	(object SegLabel @526
-					    Parent_View 	@524
-					    location   	(1781, 340)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.737864
-					    height     	52
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$173" @527
-				location   	(2346, 518)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE920216"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$174" @528
-					Parent_View 	@527
-					location   	(154, 86)
-					label      	(object SegLabel @529
-					    Parent_View 	@528
-					    location   	(1872, 1857)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	60
-					    justify    	0
-					    label      	""
-					    pctDist    	-3.630072
-					    height     	475
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018B"
-					client     	@527
-					supplier   	@516
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 149)
-					    (1611, 149))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(1611, 149))
-				    (object RoleView "attributeGroupDefinitions" @530
-					Parent_View 	@527
-					location   	(154, 86)
-					label      	(object SegLabel @531
-					    Parent_View 	@530
-					    location   	(2008, 195)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+attributeGroupDefinitions"
-					    pctDist    	-0.349946
-					    height     	339
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE93018C"
-					client     	@527
-					supplier   	@472
-					vertices   	(list Points
-					    (2346, 518)
-					    (2346, 1441)
-					    (2166, 1441))
-					line_style 	3
-					origin_attachment 	(2346, 518)
-					terminal_attachment 	(2166, 1441)
-					label      	(object SegLabel @532
-					    Parent_View 	@530
-					    location   	(2299, 197)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.348862
-					    height     	48
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$175" @533
-				location   	(203, 159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE760049"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$176" @534
-					Parent_View 	@533
-					location   	(-485, -273)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE760374"
-					client     	@533
-					supplier   	@516
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(1013, 159))
-				    (object RoleView "typeDefinitions" @535
-					Parent_View 	@533
-					location   	(-485, -273)
-					label      	(object SegLabel @536
-					    Parent_View 	@535
-					    location   	(349, 196)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+typeDefinitions"
-					    pctDist    	-1.475728
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE76037E"
-					client     	@533
-					supplier   	@494
-					vertices   	(list Points
-					    (203, 159)
-					    (104, 159)
-					    (104, 784)
-					    (189, 784))
-					line_style 	3
-					origin_attachment 	(203, 159)
-					terminal_attachment 	(189, 784)
-					label      	(object SegLabel @537
-					    Parent_View 	@535
-					    location   	(155, 200)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.059701
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$179" @538
-				location   	(1087, 329)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFC2A1701ED"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$180" @539
-					Parent_View 	@538
-					location   	(-577, -23)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A0273"
-					client     	@538
-					supplier   	@516
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 264))
-				    (object RoleView "identityConstraintDefinitions" @540
-					Parent_View 	@538
-					location   	(-577, -23)
-					label      	(object SegLabel @541
-					    Parent_View 	@540
-					    location   	(1375, 338)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.130952
-					    height     	288
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFC2A1A027D"
-					client     	@538
-					supplier   	@500
-					line_style 	3
-					origin_attachment 	(1087, 329)
-					terminal_attachment 	(1087, 395)
-					label      	(object SegLabel @542
-					    Parent_View 	@540
-					    location   	(1018, 336)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.107143
-					    height     	70
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$171" @543
-				location   	(48, 320)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66FDFA00C3"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$172" @544
-					Parent_View 	@543
-					location   	(-1072, -288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027D"
-					client     	@543
-					supplier   	@516
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 68)
-					    (1013, 68))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(1013, 68))
-				    (object RoleView "attributeDeclarations" @545
-					Parent_View 	@543
-					location   	(-1072, -288)
-					label      	(object SegLabel @546
-					    Parent_View 	@545
-					    location   	(338, 106)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+attributeDeclarations"
-					    pctDist    	-0.198536
-					    height     	289
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66FDFB027E"
-					client     	@543
-					supplier   	@483
-					vertices   	(list Points
-					    (49, 322)
-					    (49, 1415)
-					    (174, 1415))
-					line_style 	3
-					origin_attachment 	(49, 322)
-					terminal_attachment 	(174, 1415)
-					label      	(object SegLabel @547
-					    Parent_View 	@545
-					    location   	(91, 108)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.196706
-					    height     	42
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @548
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 448)
-				label      	(object ItemLabel
-				    Parent_View 	@548
-				    location   	(175, 412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	483
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	501
-				height     	97
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$121" @549
-				location   	(499, 589)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69C0590198"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$122" @550
-					Parent_View 	@549
-					location   	(-13, 109)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01E3"
-					client     	@549
-					supplier   	@548
-					vertices   	(list Points
-					    (499, 589)
-					    (452, 589)
-					    (452, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(452, 496))
-				    (object RoleView "substitutionGroupAffiliation" @551
-					Parent_View 	@549
-					location   	(-13, 109)
-					label      	(object SegLabel @552
-					    Parent_View 	@551
-					    location   	(811, 585)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+substitutionGroupAffiliation"
-					    pctDist    	6.520833
-					    height     	5
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69C05D01ED"
-					client     	@549
-					supplier   	@548
-					vertices   	(list Points
-					    (499, 589)
-					    (547, 589)
-					    (547, 496))
-					line_style 	3
-					origin_attachment 	(499, 589)
-					terminal_attachment 	(547, 496)
-					label      	(object SegLabel @553
-					    Parent_View 	@551
-					    location   	(499, 559)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.000000
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$115" @554
-				location   	(241, 613)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68338C0058"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$116" @555
-					Parent_View 	@554
-					location   	(-1343, -219)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03BF"
-					client     	@554
-					supplier   	@548
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 496))
-				    (object RoleView "typeDefinition" @556
-					Parent_View 	@554
-					location   	(-1343, -219)
-					label      	(object SegLabel @557
-					    Parent_View 	@556
-					    location   	(408, 694)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+typeDefinition"
-					    pctDist    	0.686441
-					    height     	167
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B68338C03C0"
-					client     	@554
-					supplier   	@494
-					line_style 	3
-					origin_attachment 	(241, 613)
-					terminal_attachment 	(241, 731)
-					label      	(object SegLabel @558
-					    Parent_View 	@556
-					    location   	(202, 685)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.610169
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$117" @559
-				location   	(837, 460)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$118" @560
-					Parent_View 	@559
-					location   	(-1819, -68)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@559
-					supplier   	@548
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(666, 460))
-				    (object RoleView "identityConstraintDefinitions" @561
-					Parent_View 	@559
-					location   	(-1819, -68)
-					label      	(object SegLabel @562
-					    Parent_View 	@561
-					    location   	(880, 528)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.251462
-					    height     	68
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@559
-					supplier   	@500
-					line_style 	3
-					origin_attachment 	(837, 460)
-					terminal_attachment 	(1008, 460)
-					label      	(object SegLabel @563
-					    Parent_View 	@561
-					    location   	(859, 407)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.130435
-					    height     	54
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$169" @564
-				location   	(541, 246)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B66EE8D01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$170" @565
-					Parent_View 	@564
-					location   	(-1123, -186)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0198"
-					client     	@564
-					supplier   	@516
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(1013, 246))
-				    (object RoleView "elementDeclarations" @566
-					Parent_View 	@564
-					location   	(-1123, -186)
-					label      	(object SegLabel @567
-					    Parent_View 	@566
-					    location   	(443, 335)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+elementDeclarations"
-					    pctDist    	0.209302
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B66EE8E0199"
-					client     	@564
-					supplier   	@548
-					vertices   	(list Points
-					    (541, 246)
-					    (224, 246)
-					    (224, 400))
-					line_style 	3
-					origin_attachment 	(541, 246)
-					terminal_attachment 	(224, 400)
-					label      	(object SegLabel @568
-					    Parent_View 	@566
-					    location   	(186, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.864693
-					    height     	39
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$123" @569
-				location   	(353, 621)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C42DBDD0297"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$124" @570
-					Parent_View 	@569
-					location   	(-63, 173)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE0011E"
-					client     	@569
-					supplier   	@548
-					vertices   	(list Points
-					    (353, 621)
-					    (306, 621)
-					    (306, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(306, 496))
-				    (object RoleView "substitutionGroup" @571
-					Parent_View 	@569
-					location   	(-63, 173)
-					label      	(object SegLabel @572
-					    Parent_View 	@571
-					    location   	(579, 636)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+substitutionGroup"
-					    pctDist    	4.808511
-					    height     	15
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C42DBE00128"
-					client     	@569
-					supplier   	@548
-					vertices   	(list Points
-					    (353, 621)
-					    (400, 621)
-					    (400, 496))
-					line_style 	3
-					origin_attachment 	(353, 621)
-					terminal_attachment 	(400, 496)
-					label      	(object SegLabel @573
-					    Parent_View 	@571
-					    location   	(350, 583)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	-0.069767
-					    height     	39
-					    orientation 	0))))))
-		    (object ClassDiagram "3. Component Attributes  (Part 1 : Structures)"
-			quid       	"3B69E78602C5"
-			title      	"3. Component Attributes  (Part 1 : Structures)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @574
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@574
-				    location   	(46, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	516
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@574
-				    location   	(46, 107)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	524
-				    compartmentItems 	(list Compartment
-					"+ name : String"
-					"+ targetNamespace : String"))
-				width      	534
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @575
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@575
-				    location   	(41, 1567)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	512
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @576
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 1680)
-				label      	(object ItemLabel
-				    Parent_View 	@576
-				    location   	(1781, 1524)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1174
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@576
-				    location   	(1781, 1584)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	1177
-				    compartmentItems 	(list Compartment
-					"+ derivationMethod : XSDDerivationMethod = restriction"
-					"<<0..*>> + final : XSDComplexFinal"
-					"+ abstract : boolean"
-					"+ contentTypeCategory : XSDContentTypeCategory"
-					"<<0..*>> + prohibitedSubstitutions : XSDProhibitedSubstitutions"))
-				width      	1192
-				height     	336
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @577
-				location   	(463, 362)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@574
-				vertices   	(list Points
-				    (463, 362)
-				    (463, 221)))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @578
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@578
-				    location   	(1094, 1519)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	628
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@578
-				    location   	(1094, 1579)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	628
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	646
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @579
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@579
-				    location   	(647, 38)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	530
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@579
-				    location   	(647, 98)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	538
-				    compartmentItems 	(list Compartment
-					"+ required : boolean"
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	548
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @580
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@580
-				    location   	(45, 1830)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1286
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@580
-				    location   	(45, 1890)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	1294
-				    compartmentItems 	(list Compartment
-					"+ namespaceConstraintCategory : XSDNamespaceConstraintCategory"
-					"<<0..*>> + namespaceConstraint : String"
-					"+ processContents : XSDProcessContents"))
-				width      	1304
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @581
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 1440)
-				label      	(object ItemLabel
-				    Parent_View 	@581
-				    location   	(47, 1384)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	578
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	596
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @582
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@582
-				    location   	(36, 431)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@582
-				    location   	(36, 491)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	548
-				    compartmentItems 	(list Compartment
-					"+ value : Value"
-					"+ constraint : XSDConstraint"))
-				width      	554
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @583
-				location   	(294, 697)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@582
-				vertices   	(list Points
-				    (294, 697)
-				    (294, 605)))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @584
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2256, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@584
-				    location   	(1995, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	540
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @585
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 512)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@585
-				    location   	(2418, 460)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @586
-				location   	(2684, 962)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@585
-				vertices   	(list Points
-				    (2684, 962)
-				    (2684, 576)))
-			    (object ClassView "Class" "Logical View::xsd::XSDCompositor" @587
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@587
-				    location   	(45, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDCompositor")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@587
-				    location   	(45, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869B620037"
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstraint" @588
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@588
-				    location   	(638, 469)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDConstraint")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@588
-				    location   	(638, 419)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B869E2601AE"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDerivationMethod" @589
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2192, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@589
-				    location   	(1980, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"XSDDerivationMethod")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@589
-				    location   	(1980, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	424
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A0B000CE"
-				width      	442
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintCategory" @590
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@590
-				    location   	(1281, 88)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"XSDIdentityConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@590
-				    location   	(1281, 38)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	607
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A1E00272"
-				width      	625
-				height     	300
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDContentTypeCategory" @591
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2704, 2224)
-				label      	(object ItemLabel
-				    Parent_View 	@591
-				    location   	(2456, 2115)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"XSDContentTypeCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@591
-				    location   	(2456, 2065)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	496
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B86A79F03A2"
-				width      	514
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @592
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1600)
-				label      	(object ItemLabel
-				    Parent_View 	@592
-				    location   	(708, 1516)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@592
-				    location   	(708, 1466)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	362
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProcessContents" @593
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@593
-				    location   	(766, 2156)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDProcessContents")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@593
-				    location   	(766, 2106)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF8C70284"
-				width      	438
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathVariety" @594
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2768, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@594
-				    location   	(2587, 97)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"XSDXPathVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@594
-				    location   	(2587, 47)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	363
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FFB89033A"
-				width      	381
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @595
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 1872)
-				label      	(object ItemLabel
-				    Parent_View 	@595
-				    location   	(1389, 1788)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@595
-				    location   	(1389, 1738)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@595
-				    location   	(1389, 1848)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	241
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @596
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 2000)
-				label      	(object ItemLabel
-				    Parent_View 	@596
-				    location   	(1786, 1941)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@596
-				    location   	(1786, 1891)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				compartment 	(object Compartment
-				    Parent_View 	@596
-				    location   	(1786, 2001)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	382
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSubstitutionGroupExclusions" @597
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@597
-				    location   	(485, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"XSDSubstitutionGroupExclusions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@597
-				    location   	(485, 1075)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	630
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C59100AE"
-				width      	648
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @598
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1440, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@598
-				    location   	(1171, 1116)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@598
-				    location   	(1171, 1066)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@598
-				    location   	(1171, 1176)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	264
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"))
-				width      	556
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @599
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1664, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@599
-				    location   	(1398, 2213)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@599
-				    location   	(1398, 2163)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@599
-				    location   	(1398, 2273)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"))
-				width      	550
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamespaceConstraintCategory" @600
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@600
-				    location   	(45, 2154)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"XSDNamespaceConstraintCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@600
-				    location   	(45, 2104)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	678
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5EA0023"
-				width      	696
-				height     	296
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @601
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1264, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@601
-				    location   	(571, 749)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1386
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@601
-				    location   	(571, 809)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	1396
-				    compartmentItems 	(list Compartment
-					"+ nillable : boolean"
-					"<<0..*>> + disallowedSubstitutions : XSDDisallowedSubstitutions"
-					"<<0..*>> + substitutionGroupExclusions : XSDSubstitutionGroupExclusions"
-					"+ abstract : boolean"))
-				width      	1404
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @602
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@601
-				supplier   	@582
-				line_style 	3
-				origin_attachment 	(681, 737)
-				terminal_attachment 	(681, 697)
-				drawSupplier 	@583)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @603
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@603
-				    location   	(35, 812)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @604
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2688, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@604
-				    location   	(2420, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @605
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@604
-				supplier   	@585
-				line_style 	3
-				origin_attachment 	(2862, 1088)
-				terminal_attachment 	(2862, 962)
-				drawSupplier 	@586)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @606
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1312)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@606
-				    location   	(2168, 1261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @607
-				location   	(2375, 1465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@606
-				vertices   	(list Points
-				    (2375, 1465)
-				    (2375, 1375)))
-			    (object InheritView "" @608
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@606
-				supplier   	@585
-				line_style 	3
-				origin_attachment 	(2368, 1249)
-				terminal_attachment 	(2368, 962)
-				drawSupplier 	@586)
-			    (object InheritView "" @609
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@576
-				supplier   	@606
-				line_style 	3
-				origin_attachment 	(2818, 1512)
-				terminal_attachment 	(2818, 1465)
-				drawSupplier 	@607)
-			    (object InheritView "" @610
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@578
-				supplier   	@606
-				line_style 	3
-				origin_attachment 	(1406, 1507)
-				terminal_attachment 	(1406, 1465)
-				drawSupplier 	@607)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @611
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@611
-				    location   	(1818, 1101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @612
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@611
-				supplier   	@585
-				line_style 	3
-				origin_attachment 	(2115, 1089)
-				terminal_attachment 	(2115, 962)
-				drawSupplier 	@586)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @613
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 528)
-				label      	(object ItemLabel
-				    Parent_View 	@613
-				    location   	(1034, 468)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1132
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	1150
-				height     	144
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @614
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684AA30242"
-				client     	@613
-				supplier   	@574
-				line_style 	3
-				origin_attachment 	(1568, 456)
-				terminal_attachment 	(1568, 362)
-				drawSupplier 	@577)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @615
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@615
-				    location   	(2078, 703)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	484
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	502
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @616
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@616
-				    location   	(43, 268)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @617
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68494302F1"
-				client     	@615
-				supplier   	@574
-				line_style 	3
-				origin_attachment 	(2290, 691)
-				terminal_attachment 	(2290, 362)
-				drawSupplier 	@577)
-			    (object InheritView "" @618
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@603
-				supplier   	@582
-				line_style 	3
-				origin_attachment 	(141, 800)
-				terminal_attachment 	(141, 697)
-				drawSupplier 	@583)
-			    (object InheritView "" @619
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@582
-				supplier   	@574
-				line_style 	3
-				origin_attachment 	(372, 419)
-				terminal_attachment 	(372, 362)
-				drawSupplier 	@577)
-			    (object InheritView "" @620
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@585
-				supplier   	@574
-				line_style 	3
-				origin_attachment 	(2687, 448)
-				terminal_attachment 	(2687, 362)
-				drawSupplier 	@577)))
-		    (object ClassDiagram "4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			quid       	"3B6C3265005F"
-			title      	"4. Component Hierarchy, Relations and Attributes (Part 2: Datatypes)"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFixedFacet" @621
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@621
-				    location   	(32, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	320
-				    justify    	0
-				    label      	"XSDFixedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C699E00C1"
-				width      	338
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @622
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 896)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@622
-				    location   	(504, 845)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @623
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@623
-				    location   	(266, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	478
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @624
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1008, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@624
-				    location   	(777, 1112)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	480
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @625
-				location   	(718, 1049)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@622
-				vertices   	(list Points
-				    (718, 1049)
-				    (718, 959)))
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @626
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@626
-				    location   	(1799, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	420
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @627
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@627
-				    location   	(1383, 872)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	388
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @628
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2032, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@628
-				    location   	(1807, 1048)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	468
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @629
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@629
-				    location   	(1319, 1049)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	388
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @630
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@630
-				    location   	(491, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	330
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	348
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @631
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@631
-				    location   	(405, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	424
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @632
-				location   	(144, 1262)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@621
-				vertices   	(list Points
-				    (144, 1262)
-				    (144, 964)))
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @633
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1216, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@633
-				    location   	(1007, 1497)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	134
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @634
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@634
-				    location   	(880, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	498
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @635
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@635
-				    location   	(1090, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	462
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @636
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@636
-				    location   	(1193, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @637
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(496, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@637
-				    location   	(282, 1676)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	428
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	446
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @638
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1904)
-				label      	(object ItemLabel
-				    Parent_View 	@638
-				    location   	(124, 1852)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	474
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @639
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@639
-				    location   	(52, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	426
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @640
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 2112)
-				label      	(object ItemLabel
-				    Parent_View 	@640
-				    location   	(1318, 2056)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	486
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @641
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C9D03C7"
-				client     	@623
-				supplier   	@622
-				line_style 	3
-				origin_attachment 	(394, 1100)
-				terminal_attachment 	(394, 1049)
-				drawSupplier 	@625)
-			    (object InheritView "" @642
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C78620045"
-				client     	@634
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(1119, 1308)
-				terminal_attachment 	(1119, 1262)
-				drawSupplier 	@632)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @643
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(336, 160)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@643
-				    location   	(174, 117)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @644
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6CA5038D"
-				client     	@624
-				supplier   	@622
-				line_style 	3
-				origin_attachment 	(1044, 1100)
-				terminal_attachment 	(1044, 1049)
-				drawSupplier 	@625)
-			    (object InheritView "" @645
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C778002DF"
-				client     	@630
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(663, 1308)
-				terminal_attachment 	(663, 1262)
-				drawSupplier 	@632)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrdered" @646
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1408)
-				label      	(object ItemLabel
-				    Parent_View 	@646
-				    location   	(1835, 1324)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDOrdered")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@646
-				    location   	(1835, 1274)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715202E4"
-				width      	444
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinality" @647
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2048, 1728)
-				label      	(object ItemLabel
-				    Parent_View 	@647
-				    location   	(1835, 1669)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDCardinality")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@647
-				    location   	(1835, 1619)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BC7715D009B"
-				width      	444
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpace" @648
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 2032)
-				label      	(object ItemLabel
-				    Parent_View 	@648
-				    location   	(1861, 1951)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDWhiteSpace")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@648
-				    location   	(1861, 1901)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BEED0F60342"
-				width      	424
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::Value" @649
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@649
-				    location   	(571, 2062)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"Value")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@649
-				    location   	(571, 2012)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	618
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C040B5B031F"
-				width      	636
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @650
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B610337"
-				client     	@639
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(75, 2044)
-				terminal_attachment 	(75, 1262)
-				drawSupplier 	@632)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @651
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@651
-				    location   	(113, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	286
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@651
-				    location   	(113, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	290
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	304
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @652
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1584, 1376)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@652
-				    location   	(1440, 1320)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	288
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@652
-				    location   	(1440, 1380)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	294
-				    compartmentItems 	(list Compartment
-					"+ value : Value"))
-				width      	306
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @653
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D240098"
-				client     	@651
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(235, 1308)
-				terminal_attachment 	(235, 1262)
-				drawSupplier 	@632)
-			    (object InheritView "" @654
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C0A1D3103AD"
-				client     	@652
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(1581, 1308)
-				terminal_attachment 	(1581, 1262)
-				drawSupplier 	@632)
-			    (object InheritView "" @655
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B520353"
-				client     	@637
-				supplier   	@651
-				line_style 	3
-				origin_attachment 	(285, 1664)
-				terminal_attachment 	(285, 1444))
-			    (object InheritView "" @656
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8303B8"
-				client     	@635
-				supplier   	@652
-				line_style 	3
-				origin_attachment 	(1500, 1664)
-				terminal_attachment 	(1500, 1444))
-			    (object InheritView "" @657
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B8E0309"
-				client     	@636
-				supplier   	@652
-				line_style 	3
-				origin_attachment 	(1622, 1840)
-				terminal_attachment 	(1622, 1444))
-			    (object InheritView "" @658
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C77C400C0"
-				client     	@631
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(447, 1485)
-				terminal_attachment 	(447, 1262)
-				drawSupplier 	@632)
-			    (object InheritView "" @659
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B7D00FC"
-				client     	@633
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(1397, 1485)
-				terminal_attachment 	(1397, 1262)
-				drawSupplier 	@632)
-			    (object InheritView "" @660
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B990016"
-				client     	@640
-				supplier   	@621
-				line_style 	3
-				origin_attachment 	(1775, 2044)
-				terminal_attachment 	(1775, 1262)
-				drawSupplier 	@632)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @661
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 368)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@661
-				    location   	(174, 318)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	406
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @662
-				location   	(366, 522)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@661
-				vertices   	(list Points
-				    (366, 522)
-				    (366, 430)))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @663
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@663
-				    location   	(34, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	462
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @664
-				location   	(272, 781)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@663
-				vertices   	(list Points
-				    (272, 781)
-				    (272, 687)))
-			    (object InheritView "" @665
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@622
-				supplier   	@663
-				line_style 	3
-				origin_attachment 	(594, 833)
-				terminal_attachment 	(594, 781)
-				drawSupplier 	@664)
-			    (object ClassView "Class" "Logical View::xsd::XSDFundamentalFacet" @666
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@666
-				    location   	(526, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDFundamentalFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C69E801D6"
-				width      	470
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @667
-				location   	(768, 789)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@666
-				vertices   	(list Points
-				    (768, 789)
-				    (768, 687)))
-			    (object InheritView "" @668
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7659012C"
-				client     	@626
-				supplier   	@666
-				line_style 	3
-				origin_attachment 	(2050, 860)
-				terminal_attachment 	(2050, 789)
-				drawSupplier 	@667)
-			    (object InheritView "" @669
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C763C0224"
-				client     	@627
-				supplier   	@666
-				line_style 	3
-				origin_attachment 	(1525, 860)
-				terminal_attachment 	(1525, 789)
-				drawSupplier 	@667)
-			    (object InheritView "" @670
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C764F0131"
-				client     	@628
-				supplier   	@666
-				line_style 	3
-				origin_attachment 	(2237, 1036)
-				terminal_attachment 	(2237, 789)
-				drawSupplier 	@667)
-			    (object InheritView "" @671
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C76420074"
-				client     	@629
-				supplier   	@666
-				line_style 	3
-				origin_attachment 	(1328, 1037)
-				terminal_attachment 	(1328, 789)
-				drawSupplier 	@667)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @672
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1456, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@672
-				    location   	(1137, 47)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	638
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@672
-				    location   	(1137, 107)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	628
-				    compartmentItems 	(list Compartment
-					"+ variety : XSDVariety"
-					"<<0..*>> + final : XSDSimpleFinal"))
-				width      	656
-				height     	250
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$127" @673
-				location   	(775, 178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D597102EA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$128" @674
-					Parent_View 	@673
-					location   	(-1209, -46)
-					label      	(object SegLabel @675
-					    Parent_View 	@674
-					    location   	(509, 235)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750119"
-					client     	@673
-					supplier   	@661
-					vertices   	(list Points
-					    (775, 178)
-					    (550, 178)
-					    (550, 306))
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(550, 306))
-				    (object RoleView "simpleTypeDefinition" @676
-					Parent_View 	@673
-					location   	(-1209, -46)
-					label      	(object SegLabel @677
-					    Parent_View 	@676
-					    location   	(875, 136)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+simpleTypeDefinition"
-					    pctDist    	0.283133
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D59750105"
-					client     	@673
-					supplier   	@672
-					line_style 	3
-					origin_attachment 	(775, 178)
-					terminal_attachment 	(1128, 178)
-					label      	(object SegLabel @678
-					    Parent_View 	@676
-					    location   	(1061, 215)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.812500
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$189" @679
-				location   	(369, 72)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BC8AE0203A8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facets" @680
-					Parent_View 	@679
-					location   	(-1615, -152)
-					label      	(object SegLabel @681
-					    Parent_View 	@680
-					    location   	(187, 496)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	132
-					    justify    	0
-					    label      	"+facets"
-					    pctDist    	0.913863
-					    height     	87
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060065"
-					client     	@679
-					supplier   	@663
-					vertices   	(list Points
-					    (369, 72)
-					    (100, 72)
-					    (100, 561))
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(100, 561)
-					label      	(object SegLabel @682
-					    Parent_View 	@680
-					    location   	(60, 498)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.917900
-					    height     	41
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$190" @683
-					Parent_View 	@679
-					location   	(-1615, -152)
-					label      	(object SegLabel @684
-					    Parent_View 	@683
-					    location   	(976, 31)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BC8AE060051"
-					client     	@679
-					supplier   	@672
-					line_style 	3
-					origin_attachment 	(369, 72)
-					terminal_attachment 	(1128, 72))))
-			    (object AssociationViewNew "$UNNAMED$231" @685
-				location   	(1538, 508)
-				label      	(object SegLabel @686
-				    Parent_View 	@685
-				    location   	(1538, 449)
-				    font       	(object Font
-					italics    	TRUE)
-				    hidden     	TRUE
-				    anchor     	1
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	60
-				    justify    	0
-				    label      	""
-				    pctDist    	0.500000
-				    height     	60
-				    orientation 	0)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C276DA000DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$232" @687
-					Parent_View 	@685
-					location   	(-446, 284)
-					label      	(object SegLabel @688
-					    Parent_View 	@687
-					    location   	(1446, 340)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000DF"
-					client     	@685
-					supplier   	@672
-					vertices   	(list Points
-					    (1538, 508)
-					    (1487, 508)
-					    (1487, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1487, 285))
-				    (object RoleView "itemTypeDefinition" @689
-					Parent_View 	@685
-					location   	(-446, 284)
-					label      	(object SegLabel @690
-					    Parent_View 	@689
-					    location   	(1423, 577)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+itemTypeDefinition"
-					    pctDist    	-2.211539
-					    height     	69
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C276DA000E0"
-					client     	@685
-					supplier   	@672
-					vertices   	(list Points
-					    (1538, 508)
-					    (1590, 508)
-					    (1590, 285))
-					line_style 	3
-					origin_attachment 	(1538, 508)
-					terminal_attachment 	(1590, 285)
-					label      	(object SegLabel @691
-					    Parent_View 	@689
-					    location   	(1539, 468)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.003984
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$191" @692
-				location   	(1729, 574)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C34B70208"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$192" @693
-					Parent_View 	@692
-					location   	(-255, 350)
-					label      	(object SegLabel @694
-					    Parent_View 	@693
-					    location   	(1637, 353)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0258"
-					client     	@692
-					supplier   	@672
-					vertices   	(list Points
-					    (1729, 574)
-					    (1678, 574)
-					    (1678, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1678, 285))
-				    (object RoleView "memberTypeDefinitions" @695
-					Parent_View 	@692
-					location   	(-255, 350)
-					label      	(object SegLabel @696
-					    Parent_View 	@695
-					    location   	(1559, 654)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+memberTypeDefinitions"
-					    pctDist    	-3.269231
-					    height     	80
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C34BE0259"
-					client     	@692
-					supplier   	@672
-					vertices   	(list Points
-					    (1729, 574)
-					    (1781, 574)
-					    (1781, 285))
-					line_style 	3
-					origin_attachment 	(1729, 574)
-					terminal_attachment 	(1781, 285)
-					label      	(object SegLabel @697
-					    Parent_View 	@695
-					    location   	(1730, 520)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.312121
-					    height     	52
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$193" @698
-				location   	(748, 269)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C363201DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fundamentalFacets" @699
-					Parent_View 	@698
-					location   	(-1236, 45)
-					label      	(object SegLabel @700
-					    Parent_View 	@699
-					    location   	(873, 312)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+fundamentalFacets"
-					    pctDist    	-1.409091
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350063"
-					client     	@698
-					supplier   	@666
-					vertices   	(list Points
-					    (748, 269)
-					    (659, 269)
-					    (659, 561))
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(659, 561)
-					label      	(object SegLabel @701
-					    Parent_View 	@699
-					    location   	(728, 385)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.538028
-					    height     	69
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$194" @702
-					Parent_View 	@698
-					location   	(-1236, 45)
-					label      	(object SegLabel @703
-					    Parent_View 	@702
-					    location   	(1052, 228)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C36350059"
-					client     	@698
-					supplier   	@672
-					line_style 	3
-					origin_attachment 	(748, 269)
-					terminal_attachment 	(1128, 269))))
-			    (object AssociationViewNew "$UNNAMED$195" @704
-				location   	(1175, 396)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D35AB0273"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$196" @705
-					Parent_View 	@704
-					location   	(-809, 172)
-					label      	(object SegLabel @706
-					    Parent_View 	@705
-					    location   	(1094, 316)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B20291"
-					client     	@704
-					supplier   	@672
-					vertices   	(list Points
-					    (1175, 396)
-					    (1135, 396)
-					    (1135, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1135, 285))
-				    (object RoleView "baseTypeDefinition" @707
-					Parent_View 	@704
-					location   	(-809, 172)
-					label      	(object SegLabel @708
-					    Parent_View 	@707
-					    location   	(1074, 443)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+baseTypeDefinition"
-					    pctDist    	-2.533333
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D35B202A5"
-					client     	@704
-					supplier   	@672
-					vertices   	(list Points
-					    (1175, 396)
-					    (1215, 396)
-					    (1215, 285))
-					line_style 	3
-					origin_attachment 	(1175, 396)
-					terminal_attachment 	(1215, 285)
-					label      	(object SegLabel @709
-					    Parent_View 	@707
-					    location   	(1172, 359)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.096154
-					    height     	38
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$197" @710
-				location   	(1360, 446)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5572016C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$198" @711
-					Parent_View 	@710
-					location   	(-624, 222)
-					label      	(object SegLabel @712
-					    Parent_View 	@711
-					    location   	(1268, 327)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5575022F"
-					client     	@710
-					supplier   	@672
-					vertices   	(list Points
-					    (1360, 446)
-					    (1309, 446)
-					    (1309, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1309, 285))
-				    (object RoleView "primitiveTypeDefinition" @713
-					Parent_View 	@710
-					location   	(-624, 222)
-					label      	(object SegLabel @714
-					    Parent_View 	@713
-					    location   	(1204, 508)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	432
-					    justify    	0
-					    label      	"+primitiveTypeDefinition"
-					    pctDist    	-3.000000
-					    height     	62
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D55750243"
-					client     	@710
-					supplier   	@672
-					vertices   	(list Points
-					    (1360, 446)
-					    (1412, 446)
-					    (1412, 285))
-					line_style 	3
-					origin_attachment 	(1360, 446)
-					terminal_attachment 	(1412, 285)
-					label      	(object SegLabel @715
-					    Parent_View 	@713
-					    location   	(1373, 409)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.062147
-					    height     	38
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @716
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 512)
-				label      	(object ItemLabel
-				    Parent_View 	@716
-				    location   	(1917, 428)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@716
-				    location   	(1917, 378)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				compartment 	(object Compartment
-				    Parent_View 	@716
-				    location   	(1917, 488)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	3
-				    max_width  	238
-				    compartmentItems 	(list Compartment
-					"+ list"
-					"+ restriction"
-					"+ union"))
-				width      	344
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDVariety" @717
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 176)
-				label      	(object ItemLabel
-				    Parent_View 	@717
-				    location   	(1918, 92)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDVariety")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@717
-				    location   	(1918, 42)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B8FF7730249"
-				width      	342
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @718
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C7B0396"
-				client     	@666
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(591, 561)
-				terminal_attachment 	(591, 522)
-				drawSupplier 	@662)
-			    (object InheritView "" @719
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@663
-				supplier   	@661
-				line_style 	3
-				origin_attachment 	(272, 561)
-				terminal_attachment 	(272, 522)
-				drawSupplier 	@662)
-			    (object InheritView "" @720
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@661
-				supplier   	@643
-				line_style 	3
-				origin_attachment 	(366, 306)
-				terminal_attachment 	(366, 215))
-			    (object InheritView "" @721
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8801B4"
-				client     	@621
-				supplier   	@663
-				line_style 	3
-				origin_attachment 	(147, 828)
-				terminal_attachment 	(147, 781)
-				drawSupplier 	@664)
-			    (object InheritView "" @722
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C7B590281"
-				client     	@638
-				supplier   	@651
-				line_style 	3
-				origin_attachment 	(150, 1840)
-				terminal_attachment 	(150, 1444))))
-		    (object ClassDiagram "5. Component Annotations"
-			quid       	"3B69D68D00D2"
-			title      	"5. Component Annotations"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @723
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@723
-				    location   	(88, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	336
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	354
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @724
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@724
-				    location   	(82, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @725
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1872, 1504)
-				label      	(object ItemLabel
-				    Parent_View 	@725
-				    location   	(1626, 1461)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	510
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @726
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1888, 304)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@726
-				    location   	(1663, 261)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @727
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@727
-				    location   	(74, 1317)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	588
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	606
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @728
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@728
-				    location   	(86, 661)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @729
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@729
-				    location   	(74, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	492
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	510
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @730
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 544)
-				label      	(object ItemLabel
-				    Parent_View 	@730
-				    location   	(86, 501)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @731
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 80)
-				label      	(object ItemLabel
-				    Parent_View 	@731
-				    location   	(1068, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	264
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	282
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @732
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1216)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@732
-				    location   	(1750, 1173)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @733
-				location   	(1994, 1412)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@732
-				vertices   	(list Points
-				    (1994, 1412)
-				    (1994, 1271)))
-			    (object InheritView "" @734
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@725
-				supplier   	@732
-				line_style 	3
-				origin_attachment 	(2084, 1449)
-				terminal_attachment 	(2084, 1412)
-				drawSupplier 	@733)
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @735
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@735
-				    location   	(80, 821)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	384
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	402
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @736
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2000, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@736
-				    location   	(1892, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				width      	234
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @737
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@737
-				    location   	(84, 341)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @738
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 224)
-				label      	(object ItemLabel
-				    Parent_View 	@738
-				    location   	(86, 181)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	486
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @739
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@739
-				    location   	(1467, 1674)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	651
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	669
-				height     	100
-				annotation 	8)
-			    (object InheritView "" @740
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@739
-				supplier   	@732
-				line_style 	3
-				origin_attachment 	(1572, 1662)
-				terminal_attachment 	(1572, 1412)
-				drawSupplier 	@733)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @741
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@741
-				    location   	(78, 981)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRepeatableFacet" @742
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 560)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@742
-				    location   	(1688, 517)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"XSDRepeatableFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6AA6031A"
-				width      	450
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @743
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@743
-				    location   	(71, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @744
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@744
-				    location   	(872, 685)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	720
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	738
-				height     	543
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$133" @745
-				location   	(865, 1359)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0D0183"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$134" @746
-					Parent_View 	@745
-					location   	(-255, 559)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D033C"
-					client     	@745
-					supplier   	@727
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(671, 1359))
-				    (object RoleView "annotation" @747
-					Parent_View 	@745
-					location   	(-255, 559)
-					label      	(object SegLabel @748
-					    Parent_View 	@747
-					    location   	(798, 1321)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-1.116667
-					    height     	39
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0D0346"
-					client     	@745
-					supplier   	@744
-					vertices   	(list Points
-					    (865, 1359)
-					    (925, 1359)
-					    (925, 1215))
-					line_style 	3
-					origin_attachment 	(865, 1359)
-					terminal_attachment 	(925, 1215)
-					label      	(object SegLabel @749
-					    Parent_View 	@747
-					    location   	(987, 1276)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.706422
-					    height     	62
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$157" @750
-				location   	(713, 709)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0F0212"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$158" @751
-					Parent_View 	@750
-					location   	(-407, -90)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000C9"
-					client     	@750
-					supplier   	@728
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(563, 709))
-				    (object RoleView "annotation" @752
-					Parent_View 	@750
-					location   	(-407, -90)
-					label      	(object SegLabel @753
-					    Parent_View 	@752
-					    location   	(727, 667)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.095238
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1000D3"
-					client     	@750
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(713, 709)
-					terminal_attachment 	(863, 709)
-					label      	(object SegLabel @754
-					    Parent_View 	@752
-					    location   	(796, 753)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.553571
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$151" @755
-				location   	(719, 1193)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB15008A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$152" @756
-					Parent_View 	@755
-					location   	(-401, 393)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB160096"
-					client     	@755
-					supplier   	@729
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(575, 1193))
-				    (object RoleView "annotation" @757
-					Parent_View 	@755
-					location   	(-401, 393)
-					label      	(object SegLabel @758
-					    Parent_View 	@757
-					    location   	(720, 1147)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.006993
-					    height     	47
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1600A0"
-					client     	@755
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(719, 1193)
-					terminal_attachment 	(863, 1193)
-					label      	(object SegLabel @759
-					    Parent_View 	@757
-					    location   	(806, 1240)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.604167
-					    height     	47
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$111" @760
-				location   	(785, 550)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB0A0066"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$112" @761
-					Parent_View 	@760
-					location   	(-335, -250)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B023F"
-					client     	@760
-					supplier   	@730
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(563, 550))
-				    (object RoleView "annotation" @762
-					Parent_View 	@760
-					location   	(-335, -250)
-					label      	(object SegLabel @763
-					    Parent_View 	@762
-					    location   	(779, 516)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.070707
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB0B0249"
-					client     	@760
-					supplier   	@744
-					vertices   	(list Points
-					    (785, 550)
-					    (884, 550)
-					    (884, 673))
-					line_style 	3
-					origin_attachment 	(785, 550)
-					terminal_attachment 	(884, 673)
-					label      	(object SegLabel @764
-					    Parent_View 	@762
-					    location   	(935, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.729730
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$183" @765
-				location   	(1184, 404)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E4560290"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$184" @766
-					Parent_View 	@765
-					location   	(-32, -412)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E4570165"
-					client     	@765
-					supplier   	@731
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 135))
-				    (object RoleView "annotations" @767
-					Parent_View 	@765
-					location   	(-32, -412)
-					label      	(object SegLabel @768
-					    Parent_View 	@767
-					    location   	(1324, 226)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	249
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-0.665428
-					    height     	140
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E457016F"
-					client     	@765
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1184, 404)
-					terminal_attachment 	(1184, 673)
-					label      	(object SegLabel @769
-					    Parent_View 	@767
-					    location   	(1251, 615)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.784387
-					    height     	67
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$199" @770
-				location   	(1752, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E2910158"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$200" @771
-					Parent_View 	@770
-					location   	(536, 218)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E292019F"
-					client     	@770
-					supplier   	@732
-					vertices   	(list Points
-					    (1752, 1034)
-					    (1812, 1034)
-					    (1812, 1161))
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1812, 1161))
-				    (object RoleView "annotation" @772
-					Parent_View 	@770
-					location   	(536, 218)
-					label      	(object SegLabel @773
-					    Parent_View 	@772
-					    location   	(1743, 997)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.059603
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69E29201A9"
-					client     	@770
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1752, 1034)
-					terminal_attachment 	(1601, 1034)
-					label      	(object SegLabel @774
-					    Parent_View 	@772
-					    location   	(1684, 1066)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.450331
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$201" @775
-				location   	(1896, 881)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B9006CF0088"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$202" @776
-					Parent_View 	@775
-					location   	(621, 40)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D1015D"
-					client     	@775
-					supplier   	@732
-					vertices   	(list Points
-					    (1896, 881)
-					    (1956, 881)
-					    (1956, 1161))
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1956, 1161))
-				    (object RoleView "derivationAnnotation" @777
-					Parent_View 	@775
-					location   	(621, 40)
-					label      	(object SegLabel @778
-					    Parent_View 	@777
-					    location   	(1821, 842)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	390
-					    justify    	0
-					    label      	"+derivationAnnotation"
-					    pctDist    	0.254237
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B9006D10167"
-					client     	@775
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1896, 881)
-					terminal_attachment 	(1601, 881)
-					label      	(object SegLabel @779
-					    Parent_View 	@777
-					    location   	(1689, 914)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.705085
-					    height     	33
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$203" @780
-				location   	(2040, 715)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB330264"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$204" @781
-					Parent_View 	@780
-					location   	(920, -85)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB340284"
-					client     	@780
-					supplier   	@732
-					vertices   	(list Points
-					    (2040, 715)
-					    (2100, 715)
-					    (2100, 1161))
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(2100, 1161))
-				    (object RoleView "annotations" @782
-					Parent_View 	@780
-					location   	(920, -85)
-					label      	(object SegLabel @783
-					    Parent_View 	@782
-					    location   	(1758, 681)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.643192
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB34028E"
-					client     	@780
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(2040, 715)
-					terminal_attachment 	(1601, 715)
-					label      	(object SegLabel @784
-					    Parent_View 	@782
-					    location   	(1685, 746)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.809313
-					    height     	31
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$221" @785
-				location   	(668, 865)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C239134004F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$222" @786
-					Parent_View 	@785
-					location   	(-612, 33)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600CA"
-					client     	@785
-					supplier   	@735
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(473, 865))
-				    (object RoleView "annotation" @787
-					Parent_View 	@785
-					location   	(-612, 33)
-					label      	(object SegLabel @788
-					    Parent_View 	@787
-					    location   	(714, 825)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.234146
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C23913600D4"
-					client     	@785
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(668, 865)
-					terminal_attachment 	(863, 865)
-					label      	(object SegLabel @789
-					    Parent_View 	@787
-					    location   	(801, 903)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.682051
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$125" @790
-				location   	(1472, 167)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D23B901CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$126" @791
-					Parent_View 	@790
-					location   	(256, -649)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01C4"
-					client     	@790
-					supplier   	@736
-					vertices   	(list Points
-					    (1472, 167)
-					    (1472, 72)
-					    (1883, 72))
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1883, 72))
-				    (object RoleView "annotation" @792
-					Parent_View 	@790
-					location   	(256, -649)
-					label      	(object SegLabel @793
-					    Parent_View 	@792
-					    location   	(1604, 129)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.076305
-					    height     	132
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D23BA01CE"
-					client     	@790
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1472, 167)
-					terminal_attachment 	(1472, 673)
-					label      	(object SegLabel @794
-					    Parent_View 	@792
-					    location   	(1419, 618)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.893574
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$75" @795
-				location   	(927, 350)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB060291"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$76" @796
-					Parent_View 	@795
-					location   	(-193, -450)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070171"
-					client     	@795
-					supplier   	@737
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(629, 350))
-				    (object RoleView "annotation" @797
-					Parent_View 	@795
-					location   	(-193, -450)
-					label      	(object SegLabel @798
-					    Parent_View 	@797
-					    location   	(878, 310)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.816667
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB070172"
-					client     	@795
-					supplier   	@744
-					vertices   	(list Points
-					    (927, 350)
-					    (987, 350)
-					    (987, 673))
-					line_style 	3
-					origin_attachment 	(927, 350)
-					terminal_attachment 	(987, 673)
-					label      	(object SegLabel @799
-					    Parent_View 	@797
-					    location   	(1037, 612)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.843342
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$67" @800
-				location   	(1027, 222)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DADC02F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$68" @801
-					Parent_View 	@800
-					location   	(-93, -578)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0238"
-					client     	@800
-					supplier   	@738
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(563, 222))
-				    (object RoleView "annotation" @802
-					Parent_View 	@800
-					location   	(-93, -578)
-					label      	(object SegLabel @803
-					    Parent_View 	@802
-					    location   	(1003, 188)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	-0.406250
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DADD0242"
-					client     	@800
-					supplier   	@744
-					vertices   	(list Points
-					    (1027, 222)
-					    (1087, 222)
-					    (1087, 673))
-					line_style 	3
-					origin_attachment 	(1027, 222)
-					terminal_attachment 	(1087, 673)
-					label      	(object SegLabel @804
-					    Parent_View 	@802
-					    location   	(1137, 613)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	100
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.882583
-					    height     	50
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$91" @805
-				location   	(1494, 1438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B90068801C2"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$92" @806
-					Parent_View 	@805
-					location   	(214, 590)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A0111"
-					client     	@805
-					supplier   	@739
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1662))
-				    (object RoleView "contentAnnotation" @807
-					Parent_View 	@805
-					location   	(214, 590)
-					label      	(object SegLabel @808
-					    Parent_View 	@807
-					    location   	(1696, 1356)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+contentAnnotation"
-					    pctDist    	0.367713
-					    height     	202
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B90068A011B"
-					client     	@805
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1494, 1438)
-					terminal_attachment 	(1494, 1215)
-					label      	(object SegLabel @809
-					    Parent_View 	@807
-					    location   	(1443, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.713004
-					    height     	51
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$145" @810
-				location   	(637, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB1702C8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$146" @811
-					Parent_View 	@810
-					location   	(-483, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1803E2"
-					client     	@810
-					supplier   	@741
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(411, 1022))
-				    (object RoleView "annotation" @812
-					Parent_View 	@810
-					location   	(-483, 222)
-					label      	(object SegLabel @813
-					    Parent_View 	@812
-					    location   	(710, 979)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.328889
-					    height     	44
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB190004"
-					client     	@810
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(637, 1022)
-					terminal_attachment 	(863, 1022)
-					label      	(object SegLabel @814
-					    Parent_View 	@812
-					    location   	(802, 1062)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.730088
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$65" @815
-				location   	(1581, 607)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EA70102"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$66" @816
-					Parent_View 	@815
-					location   	(301, -225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90191"
-					client     	@815
-					supplier   	@742
-					vertices   	(list Points
-					    (1581, 607)
-					    (1581, 547)
-					    (1679, 547))
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1679, 547))
-				    (object RoleView "annotations" @817
-					Parent_View 	@815
-					location   	(301, -225)
-					label      	(object SegLabel @818
-					    Parent_View 	@817
-					    location   	(1669, 462)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	-2.196970
-					    height     	88
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EA90192"
-					client     	@815
-					supplier   	@744
-					line_style 	3
-					origin_attachment 	(1581, 607)
-					terminal_attachment 	(1581, 673)
-					label      	(object SegLabel @819
-					    Parent_View 	@817
-					    location   	(1539, 620)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.196970
-					    height     	42
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$205" @820
-				location   	(849, 1496)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69DB11026F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$206" @821
-					Parent_View 	@820
-					location   	(-271, 696)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB1201F9"
-					client     	@820
-					supplier   	@743
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(354, 1496))
-				    (object RoleView "annotation" @822
-					Parent_View 	@820
-					location   	(-271, 696)
-					label      	(object SegLabel @823
-					    Parent_View 	@822
-					    location   	(942, 1464)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.188259
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69DB120203"
-					client     	@820
-					supplier   	@744
-					vertices   	(list Points
-					    (849, 1496)
-					    (1062, 1496)
-					    (1062, 1215))
-					line_style 	3
-					origin_attachment 	(849, 1496)
-					terminal_attachment 	(1062, 1215)
-					label      	(object SegLabel @824
-					    Parent_View 	@822
-					    location   	(1115, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.872690
-					    height     	53
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$207" @825
-				location   	(952, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C626EB30005"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$208" @826
-					Parent_View 	@825
-					location   	(-328, 733)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40327"
-					client     	@825
-					supplier   	@743
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(354, 1565))
-				    (object RoleView "annotations" @827
-					Parent_View 	@825
-					location   	(-328, 733)
-					label      	(object SegLabel @828
-					    Parent_View 	@827
-					    location   	(1075, 1538)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.204959
-					    height     	28
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C626EB40332"
-					client     	@825
-					supplier   	@744
-					vertices   	(list Points
-					    (952, 1565)
-					    (1200, 1565)
-					    (1200, 1215))
-					line_style 	3
-					origin_attachment 	(952, 1565)
-					terminal_attachment 	(1200, 1215)
-					label      	(object SegLabel @829
-					    Parent_View 	@827
-					    location   	(1254, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	1))))
-			    (object InheritView "" @830
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C800394"
-				client     	@726
-				supplier   	@736
-				line_style 	3
-				origin_attachment 	(1984, 249)
-				terminal_attachment 	(1984, 135))
-			    (object InheritView "" @831
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C6C8F002E"
-				client     	@742
-				supplier   	@726
-				line_style 	3
-				origin_attachment 	(1997, 505)
-				terminal_attachment 	(1997, 359))))
-		    (object ClassDiagram "6. Concrete Components"
-			quid       	"3B6AD74D03C4"
-			title      	"6. Concrete Components"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @832
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@832
-				    location   	(126, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	342
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @833
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@833
-				    location   	(568, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @834
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1200, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@834
-				    location   	(991, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @835
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1360, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@835
-				    location   	(1156, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @836
-				location   	(1360, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@835
-				vertices   	(list Points
-				    (1360, 561)
-				    (1360, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDInclude" @837
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1632, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@837
-				    location   	(1512, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"XSDInclude")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C7D0250"
-				width      	258
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @838
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@838
-				    location   	(1294, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	246
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @839
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1936, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@839
-				    location   	(1805, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @840
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@840
-				    location   	(375, 1153)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	851
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	869
-				height     	119
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$143" @841
-				location   	(1368, 1206)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCC5007E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$144" @842
-					Parent_View 	@841
-					location   	(1160, 406)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006B"
-					client     	@841
-					supplier   	@837
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1503, 1206))
-				    (object RoleView "annotation" @843
-					Parent_View 	@841
-					location   	(1160, 406)
-					label      	(object SegLabel @844
-					    Parent_View 	@843
-					    location   	(1347, 1154)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.154412
-					    height     	53
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCC6006C"
-					client     	@841
-					supplier   	@840
-					line_style 	3
-					origin_attachment 	(1368, 1206)
-					terminal_attachment 	(1234, 1206)
-					label      	(object SegLabel @845
-					    Parent_View 	@843
-					    location   	(1300, 1253)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	107
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.514706
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$141" @846
-				location   	(1168, 1022)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADCD802FC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$142" @847
-					Parent_View 	@846
-					location   	(960, 222)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018B"
-					client     	@846
-					supplier   	@838
-					vertices   	(list Points
-					    (1168, 1022)
-					    (1168, 962)
-					    (1285, 962))
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1285, 962))
-				    (object RoleView "annotation" @848
-					Parent_View 	@846
-					location   	(960, 222)
-					label      	(object SegLabel @849
-					    Parent_View 	@848
-					    location   	(1290, 1075)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+annotation"
-					    pctDist    	0.445378
-					    height     	122
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADCD9018C"
-					client     	@846
-					supplier   	@840
-					line_style 	3
-					origin_attachment 	(1168, 1022)
-					terminal_attachment 	(1168, 1141)
-					label      	(object SegLabel @850
-					    Parent_View 	@848
-					    location   	(1127, 1074)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.436975
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$163" @851
-				location   	(1563, 1353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6ADE42009A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$164" @852
-					Parent_View 	@851
-					location   	(1355, 553)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE4302FE"
-					client     	@851
-					supplier   	@839
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1940, 1353)
-					    (1940, 1255))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1940, 1255))
-				    (object RoleView "annotations" @853
-					Parent_View 	@851
-					location   	(1355, 553)
-					label      	(object SegLabel @854
-					    Parent_View 	@853
-					    location   	(1317, 1322)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+annotations"
-					    pctDist    	0.516807
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6ADE430308"
-					client     	@851
-					supplier   	@840
-					vertices   	(list Points
-					    (1563, 1353)
-					    (1181, 1353)
-					    (1181, 1259))
-					line_style 	3
-					origin_attachment 	(1563, 1353)
-					terminal_attachment 	(1181, 1259)
-					label      	(object SegLabel @855
-					    Parent_View 	@853
-					    location   	(1130, 1326)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.861345
-					    height     	52
-					    orientation 	0))))
-			    (object InheritTreeView "" @856
-				location   	(288, 561)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@832
-				vertices   	(list Points
-				    (288, 561)
-				    (288, 471)))
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @857
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@857
-				    location   	(460, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	456
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	474
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @858
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1856, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@858
-				    location   	(1658, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	396
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	414
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @859
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(720, 960)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@859
-				    location   	(450, 917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	558
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @860
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@860
-				    location   	(110, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	228
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	246
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @861
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@860
-				supplier   	@832
-				line_style 	3
-				origin_attachment 	(221, 617)
-				terminal_attachment 	(221, 561)
-				drawSupplier 	@856)
-			    (object InheritView "" @862
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@857
-				supplier   	@832
-				line_style 	3
-				origin_attachment 	(589, 617)
-				terminal_attachment 	(589, 561)
-				drawSupplier 	@856)
-			    (object InheritView "" @863
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@834
-				supplier   	@835
-				line_style 	3
-				origin_attachment 	(1016, 617)
-				terminal_attachment 	(1016, 561)
-				drawSupplier 	@836)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @864
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1824, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@864
-				    location   	(1590, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	468
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	486
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @865
-				location   	(1824, 1089)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@864
-				vertices   	(list Points
-				    (1824, 1089)
-				    (1824, 999)))
-			    (object InheritView "" @866
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8DC0381"
-				client     	@837
-				supplier   	@864
-				line_style 	3
-				origin_attachment 	(1666, 1145)
-				terminal_attachment 	(1666, 1089)
-				drawSupplier 	@865)
-			    (object InheritView "" @867
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@839
-				supplier   	@864
-				line_style 	3
-				origin_attachment 	(1934, 1145)
-				terminal_attachment 	(1934, 1089)
-				drawSupplier 	@865)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @868
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 672)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@868
-				    location   	(1630, 629)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	438
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @869
-				location   	(1762, 819)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@868
-				vertices   	(list Points
-				    (1762, 819)
-				    (1762, 727)))
-			    (object InheritView "" @870
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@838
-				supplier   	@868
-				line_style 	3
-				origin_attachment 	(1416, 889)
-				terminal_attachment 	(1416, 819)
-				drawSupplier 	@869)
-			    (object InheritView "" @871
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@868
-				supplier   	@835
-				line_style 	3
-				origin_attachment 	(1756, 617)
-				terminal_attachment 	(1756, 561)
-				drawSupplier 	@836)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @872
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1120, 144)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@872
-				    location   	(875, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @873
-				location   	(1120, 289)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@872
-				vertices   	(list Points
-				    (1120, 289)
-				    (1120, 199)))
-			    (object AssociationViewNew "$UNNAMED$105" @874
-				location   	(1485, 215)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B0803C7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "container" @875
-					Parent_View 	@874
-					location   	(989, 103)
-					label      	(object SegLabel @876
-					    Parent_View 	@875
-					    location   	(1604, 210)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+container"
-					    pctDist    	0.033113
-					    height     	119
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CE"
-					client     	@874
-					supplier   	@872
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 176)
-					    (1374, 176))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1374, 176)
-					label      	(object SegLabel @877
-					    Parent_View 	@875
-					    location   	(1435, 226)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	69
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.602649
-					    height     	50
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$106" @878
-					Parent_View 	@874
-					location   	(989, 103)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B0C01CF"
-					client     	@874
-					supplier   	@872
-					vertices   	(list Points
-					    (1485, 215)
-					    (1485, 254)
-					    (1345, 254)
-					    (1345, 199))
-					line_style 	3
-					origin_attachment 	(1485, 215)
-					terminal_attachment 	(1345, 199))))
-			    (object AssociationViewNew "$UNNAMED$107" @879
-				location   	(773, 216)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751B480261"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootContainer" @880
-					Parent_View 	@879
-					location   	(53, 104)
-					label      	(object SegLabel @881
-					    Parent_View 	@880
-					    location   	(614, 217)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+rootContainer"
-					    pctDist    	-0.025000
-					    height     	160
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0285"
-					client     	@879
-					supplier   	@872
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 176)
-					    (866, 176))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(866, 176)
-					label      	(object SegLabel @882
-					    Parent_View 	@880
-					    location   	(800, 228)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.300000
-					    height     	27
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$108" @883
-					Parent_View 	@879
-					location   	(53, 104)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751B4C0286"
-					client     	@879
-					supplier   	@872
-					vertices   	(list Points
-					    (773, 216)
-					    (773, 257)
-					    (895, 257)
-					    (895, 199))
-					line_style 	3
-					origin_attachment 	(773, 216)
-					terminal_attachment 	(895, 199))))
-			    (object InheritView "" @884
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@835
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(1367, 361)
-				terminal_attachment 	(1367, 289)
-				drawSupplier 	@873)
-			    (object InheritView "" @885
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D8E200EA"
-				client     	@833
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(752, 361)
-				terminal_attachment 	(752, 289)
-				drawSupplier 	@873)
-			    (object InheritView "" @886
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@832
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(299, 361)
-				terminal_attachment 	(299, 289)
-				drawSupplier 	@873)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @887
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 1200)
-				label      	(object ItemLabel
-				    Parent_View 	@887
-				    location   	(61, 1157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @888
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@887
-				supplier   	@860
-				line_style 	3
-				origin_attachment 	(216, 1145)
-				terminal_attachment 	(216, 727))
-			    (object AssociationViewNew "$UNNAMED$219" @889
-				location   	(1382, 1425)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$220" @890
-					Parent_View 	@889
-					location   	(1190, 225)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@889
-					supplier   	@864
-					vertices   	(list Points
-					    (1382, 1425)
-					    (2147, 1425)
-					    (2147, 943)
-					    (2067, 943))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(2067, 943))
-				    (object RoleView "incorporatedSchema" @891
-					Parent_View 	@889
-					location   	(1190, 225)
-					label      	(object SegLabel @892
-					    Parent_View 	@891
-					    location   	(445, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.706546
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@889
-					supplier   	@887
-					vertices   	(list Points
-					    (1382, 1425)
-					    (225, 1425)
-					    (225, 1255))
-					line_style 	3
-					origin_attachment 	(1382, 1425)
-					terminal_attachment 	(225, 1255)
-					label      	(object SegLabel @893
-					    Parent_View 	@891
-					    location   	(183, 1392)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.896915
-					    height     	43
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$217" @894
-				location   	(1505, 1503)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$218" @895
-					Parent_View 	@894
-					location   	(1313, 303)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@894
-					supplier   	@868
-					vertices   	(list Points
-					    (1505, 1503)
-					    (2188, 1503)
-					    (2188, 675)
-					    (2059, 675))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(2059, 675))
-				    (object RoleView "resolvedSchema" @896
-					Parent_View 	@894
-					location   	(1313, 303)
-					label      	(object SegLabel @897
-					    Parent_View 	@896
-					    location   	(303, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.733333
-					    height     	32
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@894
-					supplier   	@887
-					vertices   	(list Points
-					    (1505, 1503)
-					    (113, 1503)
-					    (113, 1255))
-					line_style 	3
-					origin_attachment 	(1505, 1503)
-					terminal_attachment 	(113, 1255)
-					label      	(object SegLabel @898
-					    Parent_View 	@896
-					    location   	(73, 1472)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.867683
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$109" @899
-				location   	(66, 244)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B751C310356"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$110" @900
-					Parent_View 	@899
-					location   	(-94, -444)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C330331"
-					client     	@899
-					supplier   	@872
-					vertices   	(list Points
-					    (66, 244)
-					    (66, 144)
-					    (866, 144))
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(866, 144))
-				    (object RoleView "schema" @901
-					Parent_View 	@899
-					location   	(-94, -444)
-					label      	(object SegLabel @902
-					    Parent_View 	@901
-					    location   	(165, 93)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+schema"
-					    pctDist    	-0.168113
-					    height     	99
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B751C33033B"
-					client     	@899
-					supplier   	@887
-					line_style 	3
-					origin_attachment 	(66, 244)
-					terminal_attachment 	(66, 1145)
-					label      	(object SegLabel @903
-					    Parent_View 	@901
-					    location   	(136, 184)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	113
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.066593
-					    height     	70
-					    orientation 	0))))
-			    (object InheritView "" @904
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B780BD90059"
-				client     	@858
-				supplier   	@872
-				line_style 	3
-				origin_attachment 	(1759, 361)
-				terminal_attachment 	(1759, 289)
-				drawSupplier 	@873)
-			    (object InheritView "" @905
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@840
-				supplier   	@832
-				line_style 	3
-				origin_attachment 	(400, 1141)
-				terminal_attachment 	(400, 561)
-				drawSupplier 	@856)
-			    (object InheritTreeView "" @906
-				location   	(1012, 837)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@834
-				vertices   	(list Points
-				    (1012, 837)
-				    (1012, 727)))
-			    (object InheritView "" @907
-				stereotype 	(object SegLabel @908
-				    Parent_View 	@907
-				    location   	(1071, 871)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.888158
-				    height     	34
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B7FD4E20366"
-				client     	@840
-				supplier   	@834
-				line_style 	3
-				origin_attachment 	(1037, 1141)
-				terminal_attachment 	(1037, 837)
-				drawSupplier 	@906)
-			    (object InheritView "" @909
-				stereotype 	(object SegLabel @910
-				    Parent_View 	@909
-				    location   	(890, 865)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	263
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.581633
-				    height     	36
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B7FD4BA023C"
-				client     	@859
-				supplier   	@834
-				line_style 	3
-				origin_attachment 	(925, 905)
-				terminal_attachment 	(925, 837)
-				drawSupplier 	@906)
-			    (object InheritView "" @911
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@864
-				supplier   	@868
-				line_style 	3
-				origin_attachment 	(1828, 889)
-				terminal_attachment 	(1828, 819)
-				drawSupplier 	@869)))
-		    (object ClassDiagram "7. Concrete Attributes"
-			quid       	"3B9F8F7602C7"
-			title      	"7. Concrete Attributes"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @912
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@912
-				    location   	(1938, 1359)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@912
-				    location   	(1938, 1419)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	412
-				    compartmentItems 	(list Compartment
-					"+ form : XSDForm"
-					"+ lexicalValue : String"))
-				width      	430
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDForm" @913
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2560, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@913
-				    location   	(2398, 1365)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"XSDForm")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@913
-				    location   	(2398, 1315)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	324
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B9F913B01EB"
-				width      	342
-				height     	242
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @914
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(368, 96)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@914
-				    location   	(40, 37)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	657
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				compartment 	(object Compartment
-				    Parent_View 	@914
-				    location   	(40, 97)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	482
-				    compartmentItems 	(list Compartment
-					"+ element : DOMElement"))
-				width      	675
-				height     	143
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDComponent" @915
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@915
-				    location   	(687, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	322
-				    justify    	0
-				    label      	"XSDComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846E90029"
-				width      	340
-				height     	126
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @916
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1904, 944)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@916
-				    location   	(1678, 892)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	452
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				width      	470
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @917
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1600, 1408)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@917
-				    location   	(1328, 1356)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDScope" @918
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(864, 624)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@918
-				    location   	(745, 573)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"XSDScope")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B54000F2"
-				width      	256
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @919
-				location   	(850, 537)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@915
-				vertices   	(list Points
-				    (850, 537)
-				    (850, 447)))
-			    (object ClassView "Class" "Logical View::xsd::DOMElement" @920
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1248, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@920
-				    location   	(873, 90)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"DOMElement")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@920
-				    location   	(873, 40)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	751
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3B8189790200"
-				width      	769
-				height     	200
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @921
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 640)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@921
-				    location   	(41, 584)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	512
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @922
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@922
-				    location   	(38, 333)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	422
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @923
-				location   	(368, 263)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@914
-				vertices   	(list Points
-				    (368, 263)
-				    (368, 167)))
-			    (object ClassView "Class" "Logical View::xsd::XSDDisallowedSubstitutions" @924
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(992, 1456)
-				label      	(object ItemLabel
-				    Parent_View 	@924
-				    location   	(723, 1347)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDDisallowedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@924
-				    location   	(723, 1297)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5A403DF"
-				compartment 	(object Compartment
-				    Parent_View 	@924
-				    location   	(723, 1407)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	264
-				    compartmentItems 	(list Compartment
-					"+ substitution"
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	556
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDProhibitedSubstitutions" @925
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(880, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@925
-				    location   	(614, 1708)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"XSDProhibitedSubstitutions")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@925
-				    location   	(614, 1658)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	532
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C5BE0272"
-				compartment 	(object Compartment
-				    Parent_View 	@925
-				    location   	(614, 1768)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	234
-				    compartmentItems 	(list Compartment
-					"+ extension"
-					"+ restriction"
-					"+ all"))
-				width      	550
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @926
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(912, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@926
-				    location   	(532, 2040)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	760
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@926
-				    location   	(532, 2100)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	764
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDSimpleFinal"))
-				width      	778
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleFinal" @927
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 1984)
-				label      	(object ItemLabel
-				    Parent_View 	@927
-				    location   	(45, 1875)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"XSDSimpleFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@927
-				    location   	(45, 1825)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	326
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C25D0295"
-				width      	344
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexFinal" @928
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2544, 2016)
-				label      	(object ItemLabel
-				    Parent_View 	@928
-				    location   	(2362, 1932)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"XSDComplexFinal")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@928
-				    location   	(2362, 1882)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	364
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3B97C2CA01CB"
-				width      	382
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @929
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(352, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@929
-				    location   	(41, 1279)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	622
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				compartment 	(object Compartment
-				    Parent_View 	@929
-				    location   	(41, 1339)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	630
-				    compartmentItems 	(list Compartment
-					"+ use : XSDAttributeUseCategory"
-					"+ lexicalValue : String"))
-				width      	640
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUseCategory" @930
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 1632)
-				label      	(object ItemLabel
-				    Parent_View 	@930
-				    location   	(41, 1548)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"XSDAttributeUseCategory")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@930
-				    location   	(41, 1498)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	494
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BA7B0E801A8"
-				width      	512
-				height     	292
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @931
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2608, 928)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@931
-				    location   	(2498, 881)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	220
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	238
-				height     	119
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @932
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2240, 1712)
-				label      	(object ItemLabel
-				    Parent_View 	@932
-				    location   	(1757, 1631)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	966
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@932
-				    location   	(1757, 1691)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	973
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDProhibitedSubstitutions"
-					"<<0..*>> + block : XSDDisallowedSubstitutions"))
-				width      	984
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @933
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@933
-				    location   	(1828, 1096)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	888
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				compartment 	(object Compartment
-				    Parent_View 	@933
-				    location   	(1828, 1156)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	888
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalNamespaceConstraint : String"))
-				width      	906
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @934
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1120, 1008)
-				label      	(object ItemLabel
-				    Parent_View 	@934
-				    location   	(622, 777)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	996
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	1014
-				height     	486
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDImport" @935
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 960)
-				label      	(object ItemLabel
-				    Parent_View 	@935
-				    location   	(37, 904)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	406
-				    justify    	0
-				    label      	"XSDImport")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C93017F"
-				width      	424
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @936
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1344, 656)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@936
-				    location   	(1138, 600)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	412
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@936
-				    location   	(1138, 660)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	414
-				    compartmentItems 	(list Compartment
-					"+ lexicalValue : String"))
-				width      	430
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @937
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1840, 2048)
-				label      	(object ItemLabel
-				    Parent_View 	@937
-				    location   	(1410, 1942)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	860
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				compartment 	(object Compartment
-				    Parent_View 	@937
-				    location   	(1410, 2002)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	870
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + lexicalFinal : XSDComplexFinal"
-					"<<0..*>> + block : XSDProhibitedSubstitutions"
-					"+ mixed : boolean"))
-				width      	878
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @938
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1488, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@938
-				    location   	(1304, 1644)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	368
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	386
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @939
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@938
-				supplier   	@917
-				line_style 	3
-				origin_attachment 	(1506, 1632)
-				terminal_attachment 	(1506, 1472))
-			    (object ClassView "Class" "Logical View::xsd::XSDAnnotation" @940
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2208, 704)
-				label      	(object ItemLabel
-				    Parent_View 	@940
-				    location   	(1758, 598)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	900
-				    justify    	0
-				    label      	"XSDAnnotation")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDC80233"
-				width      	918
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @941
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848AA01D3"
-				client     	@931
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(2696, 869)
-				terminal_attachment 	(2696, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @942
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@932
-				supplier   	@912
-				line_style 	3
-				origin_attachment 	(2094, 1619)
-				terminal_attachment 	(2094, 1533))
-			    (object InheritTreeView "" @943
-				location   	(1487, 1856)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@938
-				vertices   	(list Points
-				    (1487, 1856)
-				    (1487, 1760)))
-			    (object ClassView "Class" "Logical View::xsd::DOMAttr" @944
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2400, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@944
-				    location   	(2080, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"DOMAttr")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@944
-				    location   	(2080, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BBF8C8901B6"
-				width      	658
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @945
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@937
-				supplier   	@938
-				line_style 	3
-				origin_attachment 	(1734, 1930)
-				terminal_attachment 	(1734, 1856)
-				drawSupplier 	@943)
-			    (object InheritView "" @946
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D25680259"
-				client     	@936
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(1328, 588)
-				terminal_attachment 	(1328, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @947
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69E1770116"
-				client     	@940
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(2190, 586)
-				terminal_attachment 	(2190, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @948
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@921
-				supplier   	@922
-				line_style 	3
-				origin_attachment 	(222, 572)
-				terminal_attachment 	(222, 447))
-			    (object InheritView "" @949
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8E60372"
-				client     	@922
-				supplier   	@914
-				line_style 	3
-				origin_attachment 	(260, 321)
-				terminal_attachment 	(260, 263)
-				drawSupplier 	@923)
-			    (object InheritView "" @950
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AD8D9003E"
-				client     	@935
-				supplier   	@921
-				line_style 	3
-				origin_attachment 	(223, 892)
-				terminal_attachment 	(223, 708))
-			    (object InheritView "" @951
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@933
-				supplier   	@931
-				line_style 	3
-				origin_attachment 	(2600, 1084)
-				terminal_attachment 	(2600, 987))
-			    (object ClassView "Class" "Logical View::xsd::DOMDocument" @952
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 128)
-				label      	(object ItemLabel
-				    Parent_View 	@952
-				    location   	(1957, 94)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"DOMDocument")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@952
-				    location   	(1957, 44)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	758
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3C27850E0381"
-				width      	776
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @953
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA903D2"
-				client     	@915
-				supplier   	@914
-				line_style 	3
-				origin_attachment 	(856, 321)
-				terminal_attachment 	(856, 263)
-				drawSupplier 	@923)
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @954
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1568, 384)
-				label      	(object ItemLabel
-				    Parent_View 	@954
-				    location   	(1234, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@954
-				    location   	(1234, 300)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @955
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCD640231"
-				client     	@918
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(850, 561)
-				terminal_attachment 	(850, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @956
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B72D7BB0349"
-				client     	@929
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(575, 1267)
-				terminal_attachment 	(575, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @957
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0CEA20197"
-				client     	@916
-				supplier   	@915
-				line_style 	3
-				origin_attachment 	(1694, 880)
-				terminal_attachment 	(1694, 537)
-				drawSupplier 	@919)
-			    (object InheritView "" @958
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCC4A0182"
-				client     	@934
-				supplier   	@918
-				line_style 	3
-				origin_attachment 	(856, 765)
-				terminal_attachment 	(856, 687))
-			    (object InheritTreeView "" @959
-				location   	(1703, 1290)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@916
-				vertices   	(list Points
-				    (1703, 1290)
-				    (1703, 1008)))
-			    (object InheritView "" @960
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@917
-				supplier   	@916
-				line_style 	3
-				origin_attachment 	(1503, 1344)
-				terminal_attachment 	(1503, 1290)
-				drawSupplier 	@959)
-			    (object InheritView "" @961
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@912
-				supplier   	@916
-				line_style 	3
-				origin_attachment 	(2093, 1347)
-				terminal_attachment 	(2093, 1290)
-				drawSupplier 	@959)
-			    (object InheritView "" @962
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@926
-				supplier   	@938
-				line_style 	3
-				origin_attachment 	(1253, 2028)
-				terminal_attachment 	(1253, 1856)
-				drawSupplier 	@943)))
-		    (object ClassDiagram "8. Concrete Containment"
-			quid       	"3B6A8097027A"
-			title      	"8. Concrete Containment"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDNotationDeclaration" @963
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2672, 992)
-				label      	(object ItemLabel
-				    Parent_View 	@963
-				    location   	(2439, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDNotationDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66EDAA021C"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @964
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2640, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@964
-				    location   	(2431, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	436
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefine" @965
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2144, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@965
-				    location   	(2013, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDRedefine")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B688C9B02AD"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefineContent" @966
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2064, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@966
-				    location   	(1854, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	420
-				    justify    	0
-				    label      	"XSDRedefineContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AE2060172"
-				width      	438
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @967
-				location   	(1943, 868)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@966
-				vertices   	(list Points
-				    (1943, 868)
-				    (1943, 631)))
-			    (object AssociationViewNew "$UNNAMED$165" @968
-				location   	(2125, 680)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE8240051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$166" @969
-					Parent_View 	@968
-					location   	(157, 344)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602AD"
-					client     	@968
-					supplier   	@965
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 729))
-				    (object RoleView "contents" @970
-					Parent_View 	@968
-					location   	(157, 344)
-					label      	(object SegLabel @971
-					    Parent_View 	@970
-					    location   	(2255, 671)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.175439
-					    height     	130
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6AE82602B7"
-					client     	@968
-					supplier   	@966
-					line_style 	3
-					origin_attachment 	(2125, 680)
-					terminal_attachment 	(2125, 631)
-					label      	(object SegLabel @972
-					    Parent_View 	@970
-					    location   	(2067, 671)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.175439
-					    height     	59
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTerm" @973
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@973
-				    location   	(148, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	216
-				    justify    	0
-				    label      	"XSDTerm")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683C5E0174"
-				width      	234
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @974
-				location   	(272, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@973
-				vertices   	(list Points
-				    (272, 465)
-				    (272, 375)))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @975
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@975
-				    location   	(2372, 1121)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	569
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	587
-				height     	118
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroup" @976
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@976
-				    location   	(89, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	334
-				    justify    	0
-				    label      	"XSDModelGroup")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6834E00291"
-				width      	352
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$153" @977
-				location   	(1170, 1356)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6837AC025A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "modelGroup" @978
-					Parent_View 	@977
-					location   	(866, -20)
-					label      	(object SegLabel @979
-					    Parent_View 	@978
-					    location   	(269, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+modelGroup"
-					    pctDist    	0.534044
-					    height     	33
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0339"
-					client     	@977
-					supplier   	@976
-					vertices   	(list Points
-					    (1170, 1356)
-					    (206, 1356)
-					    (206, 631))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(206, 631)
-					label      	(object SegLabel @980
-					    Parent_View 	@978
-					    location   	(226, 1322)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.559146
-					    height     	35
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$154" @981
-					Parent_View 	@977
-					location   	(866, -20)
-					label      	(object SegLabel @982
-					    Parent_View 	@981
-					    location   	(2521, 1398)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6837AD0338"
-					client     	@977
-					supplier   	@975
-					vertices   	(list Points
-					    (1170, 1356)
-					    (2731, 1356)
-					    (2731, 1227))
-					line_style 	3
-					origin_attachment 	(1170, 1356)
-					terminal_attachment 	(2731, 1227))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @983
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(160, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@983
-				    location   	(35, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	250
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	268
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$147" @984
-				location   	(122, 1136)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6BCEB102F8"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$148" @985
-					Parent_View 	@984
-					location   	(-630, -256)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB6001B"
-					client     	@984
-					supplier   	@976
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 631))
-				    (object RoleView "contents" @986
-					Parent_View 	@984
-					location   	(-630, -256)
-					label      	(object SegLabel @987
-					    Parent_View 	@986
-					    location   	(223, 1515)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.750495
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6BCEB60025"
-					client     	@984
-					supplier   	@983
-					line_style 	3
-					origin_attachment 	(122, 1136)
-					terminal_attachment 	(122, 1641)
-					label      	(object SegLabel @988
-					    Parent_View 	@986
-					    location   	(180, 1581)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.881188
-					    height     	58
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticleContent" @989
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 80)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@989
-				    location   	(41, 42)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	495
-				    justify    	0
-				    label      	"XSDParticleContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6BD22300C6"
-				width      	513
-				height     	100
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$159" @990
-				location   	(47, 885)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B47150119"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$160" @991
-					Parent_View 	@990
-					location   	(-289, 821)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03AB"
-					client     	@990
-					supplier   	@983
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 1641))
-				    (object RoleView "content" @992
-					Parent_View 	@990
-					location   	(-289, 821)
-					label      	(object SegLabel @993
-					    Parent_View 	@992
-					    location   	(142, 189)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.921854
-					    height     	95
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B471A03B5"
-					client     	@990
-					supplier   	@989
-					line_style 	3
-					origin_attachment 	(47, 885)
-					terminal_attachment 	(47, 130)
-					label      	(object SegLabel @994
-					    Parent_View 	@992
-					    location   	(28, 192)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.917881
-					    height     	19
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeUse" @995
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1424, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@995
-				    location   	(1252, 849)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	345
-				    justify    	0
-				    label      	"XSDAttributeUse")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B68354601A8"
-				width      	363
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @996
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1408, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@996
-				    location   	(1175, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	466
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	484
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$89" @997
-				location   	(1319, 1034)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6F1DE9018A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$90" @998
-					Parent_View 	@997
-					location   	(-57, -102)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA036C"
-					client     	@997
-					supplier   	@995
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 955))
-				    (object RoleView "content" @999
-					Parent_View 	@997
-					location   	(-57, -102)
-					label      	(object SegLabel @1000
-					    Parent_View 	@999
-					    location   	(1439, 1039)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.073171
-					    height     	120
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6F1DEA0380"
-					client     	@997
-					supplier   	@996
-					line_style 	3
-					origin_attachment 	(1319, 1034)
-					terminal_attachment 	(1319, 1113)
-					label      	(object SegLabel @1001
-					    Parent_View 	@999
-					    location   	(1279, 1031)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.040816
-					    height     	41
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDConstrainingFacet" @1002
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2080, 1696)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1002
-				    location   	(1855, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"XSDConstrainingFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C6B340093"
-				width      	468
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1003
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1280, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1003
-				    location   	(1035, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	490
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	508
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$185" @1004
-				location   	(1351, 1840)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D5CA50112"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$186" @1005
-					Parent_View 	@1004
-					location   	(-297, 224)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703B4"
-					client     	@1004
-					supplier   	@1003
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1294, 1840)
-					    (1294, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1294, 1751))
-				    (object RoleView "contents" @1006
-					Parent_View 	@1004
-					location   	(-297, 224)
-					label      	(object SegLabel @1007
-					    Parent_View 	@1006
-					    location   	(1517, 1806)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.632653
-					    height     	108
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D5CA703C8"
-					client     	@1004
-					supplier   	@1003
-					vertices   	(list Points
-					    (1351, 1840)
-					    (1409, 1840)
-					    (1409, 1751))
-					line_style 	3
-					origin_attachment 	(1351, 1840)
-					terminal_attachment 	(1409, 1751)
-					label      	(object SegLabel @1008
-					    Parent_View 	@1006
-					    location   	(1361, 1801)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.072848
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$69" @1009
-				location   	(1190, 1432)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6890D6006F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1010
-					Parent_View 	@1009
-					location   	(774, -1832)
-					label      	(object SegLabel @1011
-					    Parent_View 	@1010
-					    location   	(1462, 1525)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.444976
-					    height     	272
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D60318"
-					client     	@1009
-					supplier   	@1003
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1641)
-					label      	(object SegLabel @1012
-					    Parent_View 	@1010
-					    location   	(1143, 1527)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.454545
-					    height     	47
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$70" @1013
-					Parent_View 	@1009
-					location   	(774, -1832)
-					label      	(object SegLabel @1014
-					    Parent_View 	@1013
-					    location   	(1149, 1266)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6890D6030E"
-					client     	@1009
-					supplier   	@996
-					line_style 	3
-					origin_attachment 	(1190, 1432)
-					terminal_attachment 	(1190, 1223))))
-			    (object AssociationViewNew "$UNNAMED$187" @1015
-				location   	(1690, 1684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6C35AD0374"
-				roleview_list 	(list RoleViews
-				    (object RoleView "facetContents" @1016
-					Parent_View 	@1015
-					location   	(-326, -12)
-					label      	(object SegLabel @1017
-					    Parent_View 	@1016
-					    location   	(1695, 1731)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+facetContents"
-					    pctDist    	0.032051
-					    height     	47
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0010"
-					client     	@1015
-					supplier   	@1002
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1846, 1684)
-					label      	(object SegLabel @1018
-					    Parent_View 	@1016
-					    location   	(1756, 1644)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	94
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420732
-					    height     	41
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$188" @1019
-					Parent_View 	@1015
-					location   	(-326, -12)
-					label      	(object SegLabel @1020
-					    Parent_View 	@1019
-					    location   	(1566, 1643)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6C35AF0006"
-					client     	@1015
-					supplier   	@1003
-					line_style 	3
-					origin_attachment 	(1690, 1684)
-					terminal_attachment 	(1534, 1684))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1021
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2624, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1021
-				    location   	(2388, 741)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaContent" @1022
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1312, 320)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1022
-				    location   	(1108, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	408
-				    justify    	0
-				    label      	"XSDSchemaContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B688CB800BA"
-				width      	426
-				height     	110
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1023
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(688, 320)
-				label      	(object ItemLabel
-				    Parent_View 	@1023
-				    location   	(557, 277)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	262
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	280
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$167" @1024
-				location   	(963, 319)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B688E6B003D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1025
-					Parent_View 	@1024
-					location   	(595, -17)
-					label      	(object SegLabel @1026
-					    Parent_View 	@1025
-					    location   	(974, 361)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.081081
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0111"
-					client     	@1024
-					supplier   	@1022
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(1099, 319)
-					label      	(object SegLabel @1027
-					    Parent_View 	@1025
-					    location   	(1016, 290)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.396396
-					    height     	30
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$168" @1028
-					Parent_View 	@1024
-					location   	(595, -17)
-					label      	(object SegLabel @1029
-					    Parent_View 	@1028
-					    location   	(855, 361)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B688E6C0107"
-					client     	@1024
-					supplier   	@1023
-					line_style 	3
-					origin_attachment 	(963, 319)
-					terminal_attachment 	(828, 319))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1030
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1030
-				    location   	(1974, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	372
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	390
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1031
-				location   	(2322, 1593)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1030
-				vertices   	(list Points
-				    (2322, 1593)
-				    (2322, 1047)))
-			    (object InheritView "" @1032
-				stereotype 	(object SegLabel @1033
-				    Parent_View 	@1032
-				    location   	(2146, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.460000
-				    height     	5
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2F5013A"
-				client     	@1030
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(2150, 937)
-				terminal_attachment 	(2150, 868)
-				drawSupplier 	@967)
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1034
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(832, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@1034
-				    location   	(510, 532)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	644
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	662
-				height     	112
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$113" @1035
-				location   	(1498, 1431)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B68911401AF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "anonymousTypeDefinition" @1036
-					Parent_View 	@1035
-					location   	(1038, -1810)
-					label      	(object SegLabel @1037
-					    Parent_View 	@1036
-					    location   	(2027, 1472)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+anonymousTypeDefinition"
-					    pctDist    	0.454389
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150017"
-					client     	@1035
-					supplier   	@1030
-					vertices   	(list Points
-					    (1498, 1431)
-					    (2281, 1431)
-					    (2281, 1047))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(2281, 1047)
-					label      	(object SegLabel @1038
-					    Parent_View 	@1036
-					    location   	(2204, 1397)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.605419
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$114" @1039
-					Parent_View 	@1035
-					location   	(1038, -1810)
-					label      	(object SegLabel @1040
-					    Parent_View 	@1039
-					    location   	(1090, 866)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6891150016"
-					client     	@1035
-					supplier   	@1034
-					vertices   	(list Points
-					    (1498, 1431)
-					    (1131, 1431)
-					    (1131, 632))
-					line_style 	3
-					origin_attachment 	(1498, 1431)
-					terminal_attachment 	(1131, 632))))
-			    (object ClassView "Class" "Logical View::xsd::XSDXPathDefinition" @1041
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1041
-				    location   	(655, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	386
-				    justify    	0
-				    label      	"XSDXPathDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6D83BB0355"
-				width      	404
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDIdentityConstraintDefinition" @1042
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(800, 896)
-				label      	(object ItemLabel
-				    Parent_View 	@1042
-				    location   	(505, 853)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	590
-				    justify    	0
-				    label      	"XSDIdentityConstraintDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B2603A2"
-				width      	608
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$117" @1043
-				location   	(534, 736)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6833EF0160"
-				roleview_list 	(list RoleViews
-				    (object RoleView "identityConstraintDefinitions" @1044
-					Parent_View 	@1043
-					location   	(86, -2144)
-					label      	(object SegLabel @1045
-					    Parent_View 	@1044
-					    location   	(820, 748)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	550
-					    justify    	0
-					    label      	"+identityConstraintDefinitions"
-					    pctDist    	0.111111
-					    height     	286
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00299"
-					client     	@1043
-					supplier   	@1042
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 841)
-					label      	(object SegLabel @1046
-					    Parent_View 	@1044
-					    location   	(595, 807)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.675926
-					    height     	61
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$118" @1047
-					Parent_View 	@1043
-					location   	(86, -2144)
-					label      	(object SegLabel @1048
-					    Parent_View 	@1047
-					    location   	(576, 653)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6833F00298"
-					client     	@1043
-					supplier   	@1034
-					line_style 	3
-					origin_attachment 	(534, 736)
-					terminal_attachment 	(534, 632))))
-			    (object AssociationViewNew "$UNNAMED$137" @1049
-				location   	(900, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D3D003E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "selector" @1050
-					Parent_View 	@1049
-					location   	(84, 120)
-					label      	(object SegLabel @1051
-					    Parent_View 	@1050
-					    location   	(1013, 1042)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+selector"
-					    pctDist    	0.123288
-					    height     	113
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E0234"
-					client     	@1049
-					supplier   	@1041
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 1113)
-					label      	(object SegLabel @1052
-					    Parent_View 	@1050
-					    location   	(859, 1040)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.095890
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$138" @1053
-					Parent_View 	@1049
-					location   	(84, 120)
-					label      	(object SegLabel @1054
-					    Parent_View 	@1053
-					    location   	(859, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D3E022A"
-					client     	@1049
-					supplier   	@1042
-					line_style 	3
-					origin_attachment 	(900, 1032)
-					terminal_attachment 	(900, 951))))
-			    (object AssociationViewNew "$UNNAMED$139" @1055
-				location   	(700, 1032)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6D8D330025"
-				roleview_list 	(list RoleViews
-				    (object RoleView "fields" @1056
-					Parent_View 	@1055
-					location   	(-116, 120)
-					label      	(object SegLabel @1057
-					    Parent_View 	@1056
-					    location   	(616, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+fields"
-					    pctDist    	0.054795
-					    height     	85
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330379"
-					client     	@1055
-					supplier   	@1041
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 1113)
-					label      	(object SegLabel @1058
-					    Parent_View 	@1056
-					    location   	(771, 1042)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.123077
-					    height     	71
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$140" @1059
-					Parent_View 	@1055
-					location   	(-116, 120)
-					label      	(object SegLabel @1060
-					    Parent_View 	@1059
-					    location   	(659, 968)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6D8D330365"
-					client     	@1055
-					supplier   	@1042
-					line_style 	3
-					origin_attachment 	(700, 1032)
-					terminal_attachment 	(700, 951))))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeContent" @1061
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1440)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1061
-				    location   	(500, 1397)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	504
-				    justify    	0
-				    label      	"XSDComplexTypeContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B683BA00196"
-				width      	522
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1062
-				location   	(550, 1590)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1061
-				vertices   	(list Points
-				    (550, 1590)
-				    (550, 1495)))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupContent" @1063
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1504, 576)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1063
-				    location   	(1240, 533)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	528
-				    justify    	0
-				    label      	"XSDAttributeGroupContent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6940200089"
-				width      	546
-				height     	110
-				annotation 	8)
-			    (object InheritTreeView "" @1064
-				location   	(1406, 765)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1063
-				vertices   	(list Points
-				    (1406, 765)
-				    (1406, 631)))
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1065
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2656, 1696)
-				label      	(object ItemLabel
-				    Parent_View 	@1065
-				    location   	(2393, 1653)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	544
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$95" @1066
-				location   	(1614, 1868)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6FDDD70113"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$96" @1067
-					Parent_View 	@1066
-					location   	(526, 476)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA026B"
-					client     	@1066
-					supplier   	@1065
-					vertices   	(list Points
-					    (1614, 1868)
-					    (2500, 1868)
-					    (2500, 1751))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(2500, 1751))
-				    (object RoleView "content" @1068
-					Parent_View 	@1066
-					location   	(526, 476)
-					label      	(object SegLabel @1069
-					    Parent_View 	@1068
-					    location   	(896, 1787)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	168
-					    justify    	0
-					    label      	"+content"
-					    pctDist    	0.709870
-					    height     	89
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6FDDDA0275"
-					client     	@1066
-					supplier   	@1061
-					vertices   	(list Points
-					    (1614, 1868)
-					    (984, 1868)
-					    (984, 1495))
-					line_style 	3
-					origin_attachment 	(1614, 1868)
-					terminal_attachment 	(984, 1495)
-					label      	(object SegLabel @1070
-					    Parent_View 	@1068
-					    location   	(1042, 1824)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	72
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.571286
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$101" @1071
-				location   	(2927, 387)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B698E360386"
-				roleview_list 	(list RoleViews
-				    (object RoleView "attributeContents" @1072
-					Parent_View 	@1071
-					location   	(2463, -3757)
-					label      	(object SegLabel @1073
-					    Parent_View 	@1072
-					    location   	(1915, 357)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+attributeContents"
-					    pctDist    	0.773060
-					    height     	31
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E38007C"
-					client     	@1071
-					supplier   	@1063
-					vertices   	(list Points
-					    (2927, 387)
-					    (1750, 387)
-					    (1750, 521))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(1750, 521)
-					label      	(object SegLabel @1074
-					    Parent_View 	@1072
-					    location   	(1804, 425)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.857247
-					    height     	38
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$102" @1075
-					Parent_View 	@1071
-					location   	(2463, -3757)
-					label      	(object SegLabel @1076
-					    Parent_View 	@1075
-					    location   	(2946, 1448)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B698E380072"
-					client     	@1071
-					supplier   	@1065
-					vertices   	(list Points
-					    (2927, 387)
-					    (2987, 387)
-					    (2987, 1671)
-					    (2928, 1671))
-					line_style 	3
-					origin_attachment 	(2927, 387)
-					terminal_attachment 	(2928, 1671))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1077
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1968, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1077
-				    location   	(1699, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	538
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	556
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$77" @1078
-				location   	(1750, 872)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69404E0067"
-				roleview_list 	(list RoleViews
-				    (object RoleView "contents" @1079
-					Parent_View 	@1078
-					location   	(1462, -2392)
-					label      	(object SegLabel @1080
-					    Parent_View 	@1079
-					    location   	(1640, 691)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+contents"
-					    pctDist    	0.751037
-					    height     	110
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B69405002A5"
-					client     	@1078
-					supplier   	@1063
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 631)
-					label      	(object SegLabel @1081
-					    Parent_View 	@1079
-					    location   	(1814, 695)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.734440
-					    height     	64
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$78" @1082
-					Parent_View 	@1078
-					location   	(1462, -2392)
-					label      	(object SegLabel @1083
-					    Parent_View 	@1082
-					    location   	(1709, 1065)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B694050029B"
-					client     	@1078
-					supplier   	@1077
-					line_style 	3
-					origin_attachment 	(1750, 872)
-					terminal_attachment 	(1750, 1113))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1084
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(416, 1168)
-				label      	(object ItemLabel
-				    Parent_View 	@1084
-				    location   	(279, 1125)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	274
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	292
-				height     	110
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$209" @1085
-				location   	(1252, 1896)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BEBDC870247"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$210" @1086
-					Parent_View 	@1085
-					location   	(708, 1288)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C02F9"
-					client     	@1085
-					supplier   	@1065
-					vertices   	(list Points
-					    (1252, 1896)
-					    (2603, 1896)
-					    (2603, 1751))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(2603, 1751))
-				    (object RoleView "attributeWildcardContent" @1087
-					Parent_View 	@1085
-					location   	(708, 1288)
-					label      	(object SegLabel @1088
-					    Parent_View 	@1087
-					    location   	(682, 1858)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.381142
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BEBDC8C0303"
-					client     	@1085
-					supplier   	@1084
-					vertices   	(list Points
-					    (1252, 1896)
-					    (428, 1896)
-					    (428, 1223))
-					line_style 	3
-					origin_attachment 	(1252, 1896)
-					terminal_attachment 	(428, 1223)
-					label      	(object SegLabel @1089
-					    Parent_View 	@1087
-					    location   	(382, 1860)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.575033
-					    height     	47
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$81" @1090
-				location   	(1199, 1321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C275D320220"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$82" @1091
-					Parent_View 	@1090
-					location   	(655, 713)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010C"
-					client     	@1090
-					supplier   	@1077
-					vertices   	(list Points
-					    (1199, 1321)
-					    (1897, 1321)
-					    (1897, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(1897, 1223))
-				    (object RoleView "attributeWildcardContent" @1092
-					Parent_View 	@1090
-					location   	(655, 713)
-					label      	(object SegLabel @1093
-					    Parent_View 	@1092
-					    location   	(857, 1279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+attributeWildcardContent"
-					    pctDist    	0.429569
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C275D3C010D"
-					client     	@1090
-					supplier   	@1084
-					vertices   	(list Points
-					    (1199, 1321)
-					    (500, 1321)
-					    (500, 1223))
-					line_style 	3
-					origin_attachment 	(1199, 1321)
-					terminal_attachment 	(500, 1223)
-					label      	(object SegLabel @1094
-					    Parent_View 	@1092
-					    location   	(576, 1279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.782305
-					    height     	43
-					    orientation 	1))))
-			    (object InheritView "" @1095
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1065
-				supplier   	@1030
-				line_style 	3
-				origin_attachment 	(2606, 1641)
-				terminal_attachment 	(2606, 1593)
-				drawSupplier 	@1031)
-			    (object InheritView "" @1096
-				stereotype 	(object SegLabel @1097
-				    Parent_View 	@1096
-				    location   	(759, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	243
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.446429
-				    height     	6
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B685F17002E"
-				client     	@1034
-				supplier   	@973
-				line_style 	3
-				origin_attachment 	(753, 520)
-				terminal_attachment 	(753, 465)
-				drawSupplier 	@974)
-			    (object InheritView "" @1098
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1003
-				supplier   	@1030
-				line_style 	3
-				origin_attachment 	(1409, 1641)
-				terminal_attachment 	(1409, 1593)
-				drawSupplier 	@1031)
-			    (object InheritView "" @1099
-				stereotype 	(object SegLabel @1100
-				    Parent_View 	@1099
-				    location   	(759, 1591)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	219
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.980392
-				    height     	385
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B685F55032B"
-				client     	@1003
-				supplier   	@1061
-				line_style 	3
-				origin_attachment 	(1144, 1641)
-				terminal_attachment 	(1144, 1590)
-				drawSupplier 	@1062)
-			    (object InheritView "" @1101
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A640279"
-				client     	@976
-				supplier   	@973
-				line_style 	3
-				origin_attachment 	(166, 521)
-				terminal_attachment 	(166, 465)
-				drawSupplier 	@974)
-			    (object InheritTreeView "" @1102
-				location   	(431, 222)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@989
-				vertices   	(list Points
-				    (431, 222)
-				    (431, 130)))
-			    (object InheritView "" @1103
-				stereotype 	(object SegLabel @1104
-				    Parent_View 	@1103
-				    location   	(361, 224)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	237
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.976744
-				    height     	86
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6BD2440069"
-				client     	@973
-				supplier   	@989
-				line_style 	3
-				origin_attachment 	(275, 265)
-				terminal_attachment 	(275, 222)
-				drawSupplier 	@1102)
-			    (object InheritTreeView "" @1105
-				location   	(1309, 465)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1022
-				vertices   	(list Points
-				    (1309, 465)
-				    (1309, 375)))
-			    (object InheritView "" @1106
-				stereotype 	(object SegLabel @1107
-				    Parent_View 	@1106
-				    location   	(941, 495)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.464286
-				    height     	10
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E660339"
-				client     	@1034
-				supplier   	@1022
-				line_style 	3
-				origin_attachment 	(931, 520)
-				terminal_attachment 	(931, 465)
-				drawSupplier 	@1105)
-			    (object InheritView "" @1108
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6848FC01E7"
-				client     	@983
-				supplier   	@1061
-				line_style 	3
-				origin_attachment 	(250, 1641)
-				terminal_attachment 	(250, 1590)
-				drawSupplier 	@1062)
-			    (object InheritView "" @1109
-				stereotype 	(object SegLabel @1110
-				    Parent_View 	@1109
-				    location   	(1205, 493)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.958333
-				    height     	8
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B688E6103BE"
-				client     	@996
-				supplier   	@1022
-				line_style 	3
-				origin_attachment 	(1197, 1113)
-				terminal_attachment 	(1197, 465)
-				drawSupplier 	@1105)
-			    (object InheritView "" @1111
-				stereotype 	(object SegLabel @1112
-				    Parent_View 	@1111
-				    location   	(1951, 905)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.848980
-				    height     	73
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B6AE2EB02A8"
-				client     	@1077
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(1878, 1113)
-				terminal_attachment 	(1878, 868)
-				drawSupplier 	@967)
-			    (object InheritView "" @1113
-				stereotype 	(object SegLabel @1114
-				    Parent_View 	@1113
-				    location   	(1642, 807)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	187
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.879310
-				    height     	61
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B69403A0221"
-				client     	@1077
-				supplier   	@1063
-				line_style 	3
-				origin_attachment 	(1703, 1113)
-				terminal_attachment 	(1703, 765)
-				drawSupplier 	@1064)
-			    (object InheritView "" @1115
-				stereotype 	(object SegLabel @1116
-				    Parent_View 	@1115
-				    location   	(1354, 801)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	225
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.500000
-				    height     	70
-				    orientation 	1)
-				line_color 	3342489
-				quidu      	"3B72D737038F"
-				client     	@995
-				supplier   	@1063
-				line_style 	3
-				origin_attachment 	(1284, 837)
-				terminal_attachment 	(1284, 765)
-				drawSupplier 	@1064)
-			    (object InheritView "" @1117
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB640240"
-				client     	@965
-				supplier   	@1021
-				line_style 	3
-				origin_attachment 	(2284, 762)
-				terminal_attachment 	(2379, 762))
-			    (object InheritView "" @1118
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE32102AF"
-				client     	@964
-				supplier   	@1022
-				line_style 	3
-				origin_attachment 	(2637, 521)
-				terminal_attachment 	(2637, 465)
-				drawSupplier 	@1105)
-			    (object InheritView "" @1119
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1021
-				supplier   	@964
-				line_style 	3
-				origin_attachment 	(2637, 729)
-				terminal_attachment 	(2637, 631))
-			    (object InheritView "" @1120
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6AE2B301D5"
-				client     	@966
-				supplier   	@1022
-				line_style 	3
-				origin_attachment 	(1950, 521)
-				terminal_attachment 	(1950, 465)
-				drawSupplier 	@1105)
-			    (object InheritView "" @1121
-				stereotype 	(object SegLabel @1122
-				    Parent_View 	@1121
-				    location   	(2821, 897)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	181
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.087719
-				    height     	76
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B688E4F023C"
-				client     	@963
-				supplier   	@1022
-				line_style 	3
-				origin_attachment 	(2896, 937)
-				terminal_attachment 	(2896, 465)
-				drawSupplier 	@1105)
-			    (object InheritView "" @1123
-				stereotype 	(object SegLabel @1124
-				    Parent_View 	@1123
-				    location   	(2313, 904)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	207
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.850622
-				    height     	68
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6AE2E20381"
-				client     	@975
-				supplier   	@966
-				line_style 	3
-				origin_attachment 	(2381, 1109)
-				terminal_attachment 	(2381, 868)
-				drawSupplier 	@967)
-			    (object InheritView "" @1125
-				stereotype 	(object SegLabel @1126
-				    Parent_View 	@1125
-				    location   	(2878, 269)
-				    font       	(object Font
-					size       	8)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	238
-				    justify    	0
-				    label      	"<<mixin>>"
-				    pctDist    	0.946667
-				    height     	66
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"3B6BD2550385"
-				client     	@975
-				supplier   	@989
-				line_style 	3
-				origin_attachment 	(2943, 1109)
-				terminal_attachment 	(2943, 222)
-				drawSupplier 	@1102)
-			    (object InheritView "" @1127
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A3A0041"
-				client     	@1084
-				supplier   	@973
-				line_style 	3
-				origin_attachment 	(462, 1113)
-				terminal_attachment 	(462, 465)
-				drawSupplier 	@974)))
-		    (object ClassDiagram "9. Concrete Schema Composition"
-			quid       	"3C25EB7A038C"
-			title      	"9. Concrete Schema Composition"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1128
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1128
-				    location   	(73, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				width      	480
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$119" @1129
-				location   	(228, 1695)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B41E60251"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$120" @1130
-					Parent_View 	@1129
-					location   	(-476, -385)
-					label      	(object SegLabel @1131
-					    Parent_View 	@1130
-					    location   	(217, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA02F7"
-					client     	@1129
-					supplier   	@1128
-					vertices   	(list Points
-					    (228, 1695)
-					    (175, 1695)
-					    (175, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(175, 1591))
-				    (object RoleView "resolvedElementDeclaration" @1132
-					Parent_View 	@1129
-					location   	(-476, -385)
-					label      	(object SegLabel @1133
-					    Parent_View 	@1132
-					    location   	(329, 1740)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedElementDeclaration"
-					    pctDist    	1.924528
-					    height     	45
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B41EA030B"
-					client     	@1129
-					supplier   	@1128
-					vertices   	(list Points
-					    (228, 1695)
-					    (281, 1695)
-					    (281, 1591))
-					line_style 	3
-					origin_attachment 	(228, 1695)
-					terminal_attachment 	(281, 1591)
-					label      	(object SegLabel @1134
-					    Parent_View 	@1132
-					    location   	(229, 1646)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.005714
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1135
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@1135
-				    location   	(790, 1493)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	500
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				width      	518
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$155" @1136
-				location   	(952, 1698)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B42450398"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$156" @1137
-					Parent_View 	@1136
-					location   	(-1288, -318)
-					label      	(object SegLabel @1138
-					    Parent_View 	@1137
-					    location   	(860, 1623)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249038A"
-					client     	@1136
-					supplier   	@1135
-					vertices   	(list Points
-					    (952, 1698)
-					    (901, 1698)
-					    (901, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(901, 1591))
-				    (object RoleView "resolvedModelGroupDefinition" @1139
-					Parent_View 	@1136
-					location   	(-1288, -318)
-					label      	(object SegLabel @1140
-					    Parent_View 	@1139
-					    location   	(1020, 1739)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	564
-					    justify    	0
-					    label      	"+resolvedModelGroupDefinition"
-					    pctDist    	1.326923
-					    height     	41
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B4249039E"
-					client     	@1136
-					supplier   	@1135
-					vertices   	(list Points
-					    (952, 1698)
-					    (1004, 1698)
-					    (1004, 1591))
-					line_style 	3
-					origin_attachment 	(952, 1698)
-					terminal_attachment 	(1004, 1591)
-					label      	(object SegLabel @1141
-					    Parent_View 	@1139
-					    location   	(952, 1649)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.000000
-					    height     	50
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaCompositor" @1142
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(656, 992)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1142
-				    location   	(420, 949)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	472
-				    justify    	0
-				    label      	"XSDSchemaCompositor")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C21DB4102AE"
-				width      	490
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchemaDirective" @1143
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 784)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1143
-				    location   	(412, 737)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	457
-				    justify    	0
-				    label      	"XSDSchemaDirective")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD8A202A2"
-				width      	475
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1144
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(640, 416)
-				label      	(object ItemLabel
-				    Parent_View 	@1144
-				    location   	(446, 285)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	388
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	406
-				height     	287
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$219" @1145
-				location   	(1303, 679)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DD0C03DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "incorporatedSchema" @1146
-					Parent_View 	@1145
-					location   	(-41, -857)
-					label      	(object SegLabel @1147
-					    Parent_View 	@1146
-					    location   	(1059, 381)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+incorporatedSchema"
-					    pctDist    	0.700384
-					    height     	39
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100305"
-					client     	@1145
-					supplier   	@1144
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 419)
-					    (843, 419))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(843, 419)
-					label      	(object SegLabel @1148
-					    Parent_View 	@1146
-					    location   	(922, 454)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.890746
-					    height     	35
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$220" @1149
-					Parent_View 	@1145
-					location   	(-41, -857)
-					label      	(object SegLabel @1150
-					    Parent_View 	@1149
-					    location   	(1045, 956)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DD100304"
-					client     	@1145
-					supplier   	@1142
-					vertices   	(list Points
-					    (1303, 679)
-					    (1303, 997)
-					    (901, 997))
-					line_style 	3
-					origin_attachment 	(1303, 679)
-					terminal_attachment 	(901, 997))))
-			    (object AssociationViewNew "$UNNAMED$217" @1151
-				location   	(1216, 649)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DCC700EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedSchema" @1152
-					Parent_View 	@1151
-					location   	(336, -1399)
-					label      	(object SegLabel @1153
-					    Parent_View 	@1152
-					    location   	(1038, 500)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+resolvedSchema"
-					    pctDist    	0.601923
-					    height     	35
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0043"
-					client     	@1151
-					supplier   	@1144
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 534)
-					    (843, 534))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(843, 534)
-					label      	(object SegLabel @1154
-					    Parent_View 	@1152
-					    location   	(926, 577)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.831643
-					    height     	43
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$218" @1155
-					Parent_View 	@1151
-					location   	(336, -1399)
-					label      	(object SegLabel @1156
-					    Parent_View 	@1155
-					    location   	(974, 756)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C21DCCE0042"
-					client     	@1151
-					supplier   	@1143
-					vertices   	(list Points
-					    (1216, 649)
-					    (1216, 797)
-					    (877, 797))
-					line_style 	3
-					origin_attachment 	(1216, 649)
-					terminal_attachment 	(877, 797))))
-			    (object AssociationViewNew "$UNNAMED$223" @1157
-				location   	(662, 642)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25D3A60131"
-				roleview_list 	(list RoleViews
-				    (object RoleView "referencingDirectives" @1158
-					Parent_View 	@1157
-					location   	(-234, 114)
-					label      	(object SegLabel @1159
-					    Parent_View 	@1158
-					    location   	(878, 675)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+referencingDirectives"
-					    pctDist    	0.408759
-					    height     	216
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90371"
-					client     	@1157
-					supplier   	@1143
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 725)
-					label      	(object SegLabel @1160
-					    Parent_View 	@1158
-					    location   	(615, 678)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.430657
-					    height     	48
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$224" @1161
-					Parent_View 	@1157
-					location   	(-234, 114)
-					label      	(object SegLabel @1162
-					    Parent_View 	@1161
-					    location   	(621, 576)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25D3A90370"
-					client     	@1157
-					supplier   	@1144
-					line_style 	3
-					origin_attachment 	(662, 642)
-					terminal_attachment 	(662, 559))))
-			    (object AssociationViewNew "$UNNAMED$225" @1163
-				location   	(75, 188)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ECF0005E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$226" @1164
-					Parent_View 	@1163
-					location   	(-853, -308)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF4001E"
-					client     	@1163
-					supplier   	@1144
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 128)
-					    (510, 128)
-					    (510, 273))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(510, 273))
-				    (object RoleView "rootVersion" @1165
-					Parent_View 	@1163
-					location   	(-853, -308)
-					label      	(object SegLabel @1166
-					    Parent_View 	@1165
-					    location   	(176, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+rootVersion"
-					    pctDist    	-0.593750
-					    height     	101
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ECF40028"
-					client     	@1163
-					supplier   	@1144
-					vertices   	(list Points
-					    (75, 188)
-					    (75, 380)
-					    (437, 380))
-					line_style 	3
-					origin_attachment 	(75, 188)
-					terminal_attachment 	(437, 380)
-					label      	(object SegLabel @1167
-					    Parent_View 	@1165
-					    location   	(368, 328)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.874755
-					    height     	53
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$227" @1168
-				location   	(1262, 134)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25ED0B011B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$228" @1169
-					Parent_View 	@1168
-					location   	(334, -362)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F0121"
-					client     	@1168
-					supplier   	@1144
-					vertices   	(list Points
-					    (1262, 134)
-					    (766, 134)
-					    (766, 273))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(766, 273))
-				    (object RoleView "originalVersion" @1170
-					Parent_View 	@1168
-					location   	(334, -362)
-					label      	(object SegLabel @1171
-					    Parent_View 	@1170
-					    location   	(1164, 97)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+originalVersion"
-					    pctDist    	-1.650000
-					    height     	38
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25ED0F012B"
-					client     	@1168
-					supplier   	@1144
-					vertices   	(list Points
-					    (1262, 134)
-					    (1322, 134)
-					    (1322, 334)
-					    (843, 334))
-					line_style 	3
-					origin_attachment 	(1262, 134)
-					terminal_attachment 	(843, 334)
-					label      	(object SegLabel @1172
-					    Parent_View 	@1170
-					    location   	(919, 279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898108
-					    height     	56
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$229" @1173
-				location   	(126, 656)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C25EEAB001F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$230" @1174
-					Parent_View 	@1173
-					location   	(-834, 160)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF010B"
-					client     	@1173
-					supplier   	@1144
-					vertices   	(list Points
-					    (126, 656)
-					    (513, 656)
-					    (513, 559))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(513, 559))
-				    (object RoleView "incorporatedVersions" @1175
-					Parent_View 	@1173
-					location   	(-834, 160)
-					label      	(object SegLabel @1176
-					    Parent_View 	@1175
-					    location   	(217, 431)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+incorporatedVersions"
-					    pctDist    	0.643902
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C25EEAF0115"
-					client     	@1173
-					supplier   	@1144
-					vertices   	(list Points
-					    (126, 656)
-					    (66, 656)
-					    (66, 472)
-					    (437, 472))
-					line_style 	3
-					origin_attachment 	(126, 656)
-					terminal_attachment 	(437, 472)
-					label      	(object SegLabel @1177
-					    Parent_View 	@1175
-					    location   	(356, 526)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.868468
-					    height     	54
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$233" @1178
-				location   	(642, 126)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2784730194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$234" @1179
-					Parent_View 	@1178
-					location   	(82, -418)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501F1"
-					client     	@1178
-					supplier   	@1144
-					vertices   	(list Points
-					    (642, 126)
-					    (588, 126)
-					    (588, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(588, 273))
-				    (object RoleView "schemaForSchema" @1180
-					Parent_View 	@1178
-					location   	(82, -418)
-					label      	(object SegLabel @1181
-					    Parent_View 	@1180
-					    location   	(639, 74)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+schemaForSchema"
-					    pctDist    	-0.055556
-					    height     	53
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C27847501FB"
-					client     	@1178
-					supplier   	@1144
-					vertices   	(list Points
-					    (642, 126)
-					    (697, 126)
-					    (697, 273))
-					line_style 	3
-					origin_attachment 	(642, 126)
-					terminal_attachment 	(697, 273)
-					label      	(object SegLabel @1182
-					    Parent_View 	@1180
-					    location   	(643, 213)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.701863
-					    height     	55
-					    orientation 	1))))
-			    (object InheritView "" @1183
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C21DB560092"
-				client     	@1142
-				supplier   	@1143
-				line_style 	3
-				origin_attachment 	(638, 937)
-				terminal_attachment 	(638, 843))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1184
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1184
-				    location   	(67, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	474
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	492
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$73" @1185
-				location   	(234, 1340)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B426B0194"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$74" @1186
-					Parent_View 	@1185
-					location   	(-310, -4)
-					label      	(object SegLabel @1187
-					    Parent_View 	@1186
-					    location   	(140, 1271)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0309"
-					client     	@1185
-					supplier   	@1184
-					vertices   	(list Points
-					    (234, 1340)
-					    (181, 1340)
-					    (181, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(181, 1239))
-				    (object RoleView "resolvedAttributeDeclaration" @1188
-					Parent_View 	@1185
-					location   	(-310, -4)
-					label      	(object SegLabel @1189
-					    Parent_View 	@1188
-					    location   	(333, 1389)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+resolvedAttributeDeclaration"
-					    pctDist    	1.867925
-					    height     	49
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B426D0313"
-					client     	@1185
-					supplier   	@1184
-					vertices   	(list Points
-					    (234, 1340)
-					    (287, 1340)
-					    (287, 1239))
-					line_style 	3
-					origin_attachment 	(234, 1340)
-					terminal_attachment 	(287, 1239)
-					label      	(object SegLabel @1190
-					    Parent_View 	@1188
-					    location   	(241, 1295)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.042945
-					    height     	46
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1191
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1760, 144)
-				label      	(object ItemLabel
-				    Parent_View 	@1191
-				    location   	(1517, 101)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	486
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				width      	504
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1192
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1712, 416)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1192
-				    location   	(1599, 373)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	226
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C359403D2"
-				width      	244
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$307" @1193
-				location   	(1668, 280)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4AE01CC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$308" @1194
-					Parent_View 	@1193
-					location   	(8, -152)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF010F"
-					client     	@1193
-					supplier   	@1191
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 199))
-				    (object RoleView "syntheticFacets" @1195
-					Parent_View 	@1193
-					location   	(8, -152)
-					label      	(object SegLabel @1196
-					    Parent_View 	@1195
-					    location   	(1852, 300)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+syntheticFacets"
-					    pctDist    	0.246154
-					    height     	184
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4AF011A"
-					client     	@1193
-					supplier   	@1192
-					line_style 	3
-					origin_attachment 	(1668, 280)
-					terminal_attachment 	(1668, 361)
-					label      	(object SegLabel @1197
-					    Parent_View 	@1195
-					    location   	(1625, 301)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.276923
-					    height     	44
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1198
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1552, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1198
-				    location   	(1426, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1199
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1776, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@1199
-				    location   	(1515, 597)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$309" @1200
-				location   	(1508, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D3028E"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$310" @1201
-					Parent_View 	@1200
-					location   	(-12, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402F3"
-					client     	@1200
-					supplier   	@1199
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 695))
-				    (object RoleView "syntheticParticle" @1202
-					Parent_View 	@1200
-					location   	(-12, -280)
-					label      	(object SegLabel @1203
-					    Parent_View 	@1202
-					    location   	(1695, 767)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+syntheticParticle"
-					    pctDist    	-0.259259
-					    height     	187
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4D402FD"
-					client     	@1200
-					supplier   	@1198
-					line_style 	3
-					origin_attachment 	(1508, 792)
-					terminal_attachment 	(1508, 889)
-					label      	(object SegLabel @1204
-					    Parent_View 	@1202
-					    location   	(1454, 829)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.395062
-					    height     	55
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1205
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1024, 1184)
-				label      	(object ItemLabel
-				    Parent_View 	@1205
-				    location   	(756, 1141)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	536
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	554
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$85" @1206
-				location   	(919, 1349)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B6B425E01F9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$86" @1207
-					Parent_View 	@1206
-					location   	(-233, -59)
-					label      	(object SegLabel @1208
-					    Parent_View 	@1207
-					    location   	(825, 1273)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620046"
-					client     	@1206
-					supplier   	@1205
-					vertices   	(list Points
-					    (919, 1349)
-					    (866, 1349)
-					    (866, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(866, 1239))
-				    (object RoleView "resolvedAttributeGroupDefinition" @1209
-					Parent_View 	@1206
-					location   	(-233, -59)
-					label      	(object SegLabel @1210
-					    Parent_View 	@1209
-					    location   	(993, 1393)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	600
-					    justify    	0
-					    label      	"+resolvedAttributeGroupDefinition"
-					    pctDist    	1.377358
-					    height     	44
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3B6B42620050"
-					client     	@1206
-					supplier   	@1205
-					vertices   	(list Points
-					    (919, 1349)
-					    (973, 1349)
-					    (973, 1239))
-					line_style 	3
-					origin_attachment 	(919, 1349)
-					terminal_attachment 	(973, 1239)
-					label      	(object SegLabel @1211
-					    Parent_View 	@1209
-					    location   	(919, 1296)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.014925
-					    height     	54
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::xsd::XSDWildcard" @1212
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1952, 944)
-				label      	(object ItemLabel
-				    Parent_View 	@1212
-				    location   	(1816, 901)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	272
-				    justify    	0
-				    label      	"XSDWildcard")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6838370031"
-				width      	290
-				height     	110
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$311" @1213
-				location   	(2025, 792)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4BB4D901F6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$312" @1214
-					Parent_View 	@1213
-					location   	(153, -280)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA0284"
-					client     	@1213
-					supplier   	@1199
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 695))
-				    (object RoleView "syntheticWildcard" @1215
-					Parent_View 	@1213
-					location   	(153, -280)
-					label      	(object SegLabel @1216
-					    Parent_View 	@1215
-					    location   	(1826, 838)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.488095
-					    height     	200
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4BB4DA028E"
-					client     	@1213
-					supplier   	@1212
-					line_style 	3
-					origin_attachment 	(2025, 792)
-					terminal_attachment 	(2025, 889)
-					label      	(object SegLabel @1217
-					    Parent_View 	@1215
-					    location   	(2098, 840)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.506173
-					    height     	73
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$313" @1218
-				location   	(1754, 1178)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C68FF01BF"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$314" @1219
-					Parent_View 	@1218
-					location   	(-198, 234)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020317"
-					client     	@1218
-					supplier   	@1205
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(1301, 1178))
-				    (object RoleView "syntheticWildcard" @1220
-					Parent_View 	@1218
-					location   	(-198, 234)
-					label      	(object SegLabel @1221
-					    Parent_View 	@1220
-					    location   	(1828, 1261)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+syntheticWildcard"
-					    pctDist    	0.163355
-					    height     	83
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3D4C69020318"
-					client     	@1218
-					supplier   	@1212
-					vertices   	(list Points
-					    (1754, 1178)
-					    (2028, 1178)
-					    (2028, 999))
-					line_style 	3
-					origin_attachment 	(1754, 1178)
-					terminal_attachment 	(2028, 999)
-					label      	(object SegLabel @1222
-					    Parent_View 	@1220
-					    location   	(2082, 1098)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.783664
-					    height     	54
-					    orientation 	1))))))
-		    (object ClassDiagram "10. Diagnostics"
-			quid       	"3BFE5F0803E2"
-			title      	"10. Diagnostics"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::DOMNode" @1223
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(400, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@1223
-				    location   	(66, 990)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"DOMNode")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1223
-				    location   	(66, 940)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	668
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	14671839
-				quidu      	"3BFE64A50117"
-				width      	686
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnosticSeverity" @1224
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1040, 656)
-				label      	(object ItemLabel
-				    Parent_View 	@1224
-				    location   	(818, 547)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"XSDDiagnosticSeverity")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1224
-				    location   	(818, 497)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	444
-				    justify    	0
-				    label      	"<<enumeration>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8432127
-				quidu      	"3BFE68A7032F"
-				width      	462
-				height     	342
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSchema" @1225
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(192, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1225
-				    location   	(59, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	266
-				    justify    	0
-				    label      	"XSDSchema")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"374B182500BB"
-				width      	284
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1226
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(896, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1226
-				    location   	(540, 62)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	713
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	731
-				height     	125
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1227
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(384, 608)
-				label      	(object ItemLabel
-				    Parent_View 	@1227
-				    location   	(64, 402)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	640
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	658
-				height     	436
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$215" @1228
-				location   	(144, 283)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE6431035F"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$216" @1229
-					Parent_View 	@1228
-					location   	(-1088, -661)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C6"
-					client     	@1228
-					supplier   	@1225
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 176))
-				    (object RoleView "allDiagnostics" @1230
-					Parent_View 	@1228
-					location   	(-1088, -661)
-					label      	(object SegLabel @1231
-					    Parent_View 	@1230
-					    location   	(309, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+allDiagnostics"
-					    pctDist    	0.448598
-					    height     	165
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE643201C7"
-					client     	@1228
-					supplier   	@1227
-					line_style 	3
-					origin_attachment 	(144, 283)
-					terminal_attachment 	(144, 390)
-					label      	(object SegLabel @1232
-					    Parent_View 	@1230
-					    location   	(96, 327)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.420561
-					    height     	49
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$211" @1233
-				location   	(1028, 440)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE622703CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$212" @1234
-					Parent_View 	@1233
-					location   	(-396, -72)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B0061"
-					client     	@1233
-					supplier   	@1227
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(713, 440))
-				    (object RoleView "components" @1235
-					Parent_View 	@1233
-					location   	(-396, -72)
-					label      	(object SegLabel @1236
-					    Parent_View 	@1235
-					    location   	(938, 230)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+components"
-					    pctDist    	0.829181
-					    height     	151
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE622B006C"
-					client     	@1233
-					supplier   	@1226
-					vertices   	(list Points
-					    (1028, 440)
-					    (1088, 440)
-					    (1088, 174))
-					line_style 	3
-					origin_attachment 	(1028, 440)
-					terminal_attachment 	(1088, 174)
-					label      	(object SegLabel @1237
-					    Parent_View 	@1235
-					    location   	(1143, 232)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"1..*"
-					    pctDist    	0.823848
-					    height     	55
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$213" @1238
-				location   	(688, 282)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BFE62690165"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$214" @1239
-					Parent_View 	@1238
-					location   	(160, -278)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0026"
-					client     	@1238
-					supplier   	@1226
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 174))
-				    (object RoleView "diagnostics" @1240
-					Parent_View 	@1238
-					location   	(160, -278)
-					label      	(object SegLabel @1241
-					    Parent_View 	@1240
-					    location   	(822, 330)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+diagnostics"
-					    pctDist    	0.452632
-					    height     	134
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3BFE626A0027"
-					client     	@1238
-					supplier   	@1227
-					line_style 	3
-					origin_attachment 	(688, 282)
-					terminal_attachment 	(688, 390)
-					label      	(object SegLabel @1242
-					    Parent_View 	@1240
-					    location   	(645, 335)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	70
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.494737
-					    height     	44
-					    orientation 	1))))
-			    (object InheritView "" @1243
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3D4C0F4C01A1"
-				client     	@1227
-				supplier   	@1226
-				line_style 	3
-				origin_attachment 	(575, 390)
-				terminal_attachment 	(575, 174))))
-		    (object ClassDiagram "11. Supplemental"
-			quid       	"3C287E49019B"
-			title      	"11. Supplemental"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeGroupDefinition" @1244
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(464, 816)
-				label      	(object ItemLabel
-				    Parent_View 	@1244
-				    location   	(47, 760)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	834
-				    justify    	0
-				    label      	"XSDAttributeGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED840290"
-				width      	852
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDAttributeDeclaration" @1245
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2112, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@1245
-				    location   	(1731, 824)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	762
-				    justify    	0
-				    label      	"XSDAttributeDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED2E0192"
-				width      	780
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDConcreteComponent" @1246
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(288, 112)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1246
-				    location   	(48, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	480
-				    justify    	0
-				    label      	"XSDConcreteComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6AD7B40065"
-				width      	498
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDDiagnostic" @1247
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2384, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@1247
-				    location   	(2236, 60)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	296
-				    justify    	0
-				    label      	"XSDDiagnostic")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3BFE5F910046"
-				width      	314
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$237" @1248
-				location   	(1382, 84)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2882C50137"
-				roleview_list 	(list RoleViews
-				    (object RoleView "primaryComponent" @1249
-					Parent_View 	@1248
-					location   	(-250, -508)
-					label      	(object SegLabel @1250
-					    Parent_View 	@1249
-					    location   	(756, 116)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+primaryComponent"
-					    pctDist    	0.740828
-					    height     	32
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70113"
-					client     	@1248
-					supplier   	@1246
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(537, 84)
-					label      	(object SegLabel @1251
-					    Parent_View 	@1249
-					    location   	(624, 55)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.897260
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$238" @1252
-					Parent_View 	@1248
-					location   	(-250, -508)
-					label      	(object SegLabel @1253
-					    Parent_View 	@1252
-					    location   	(2058, 126)
-					    hidden     	TRUE
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	450
-					    justify    	0
-					    label      	""
-					    pctDist    	0.800000
-					    height     	42
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2882C70112"
-					client     	@1248
-					supplier   	@1247
-					line_style 	3
-					origin_attachment 	(1382, 84)
-					terminal_attachment 	(2227, 84))))
-			    (object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @1254
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2160, 688)
-				label      	(object ItemLabel
-				    Parent_View 	@1254
-				    location   	(1778, 607)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	764
-				    justify    	0
-				    label      	"XSDElementDeclaration")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED580214"
-				compartment 	(object Compartment
-				    Parent_View 	@1254
-				    location   	(1778, 667)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	764
-				    compartmentItems 	(list Compartment
-					"+ elementDeclarationReference : boolean"
-					"+ circular : boolean"))
-				width      	782
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFacet" @1255
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1072)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1255
-				    location   	(2100, 991)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6C359403D2"
-				compartment 	(object Compartment
-				    Parent_View 	@1255
-				    location   	(2100, 1051)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	459
-				    compartmentItems 	(list Compartment
-					"+ facetName : String"
-					"+ effectiveValue : Value"))
-				width      	458
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDModelGroupDefinition" @1256
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 624)
-				label      	(object ItemLabel
-				    Parent_View 	@1256
-				    location   	(47, 568)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	802
-				    justify    	0
-				    label      	"XSDModelGroupDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B66ED9A0205"
-				compartment 	(object Compartment
-				    Parent_View 	@1256
-				    location   	(47, 628)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	805
-				    compartmentItems 	(list Compartment
-					"+ modelGroupDefinitionReference : boolean"))
-				width      	820
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNamedComponent" @1257
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 288)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1257
-				    location   	(1005, 157)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	454
-				    justify    	0
-				    label      	"XSDNamedComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B6846D303A4"
-				compartment 	(object Compartment
-				    Parent_View 	@1257
-				    location   	(1005, 217)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	4
-				    max_width  	392
-				    compartmentItems 	(list Compartment
-					"+ aliasName : String"
-					"+ uRI : String"
-					"+ aliasURI : String"
-					"+ qName : String"))
-				width      	472
-				height     	286
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDRedefinableComponent" @1258
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(320, 352)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1258
-				    location   	(48, 296)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"XSDRedefinableComponent")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B7FCA8B020B"
-				width      	562
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1259
-				location   	(320, 510)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1258
-				vertices   	(list Points
-				    (320, 510)
-				    (320, 420)))
-			    (object InheritView "" @1260
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC40090"
-				client     	@1256
-				supplier   	@1258
-				line_style 	3
-				origin_attachment 	(81, 556)
-				terminal_attachment 	(81, 510)
-				drawSupplier 	@1259)
-			    (object InheritView "" @1261
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAC800D2"
-				client     	@1244
-				supplier   	@1258
-				line_style 	3
-				origin_attachment 	(877, 748)
-				terminal_attachment 	(877, 510)
-				drawSupplier 	@1259)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxInclusiveFacet" @1262
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 1808)
-				label      	(object ItemLabel
-				    Parent_View 	@1262
-				    location   	(2101, 1761)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	438
-				    justify    	0
-				    label      	"XSDMaxInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C787D00DA"
-				width      	456
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinInclusiveFacet" @1263
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1776)
-				label      	(object ItemLabel
-				    Parent_View 	@1263
-				    location   	(35, 1729)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinInclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C788702C9"
-				width      	493
-				height     	119
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinExclusiveFacet" @1264
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(272, 1936)
-				label      	(object ItemLabel
-				    Parent_View 	@1264
-				    location   	(35, 1889)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	475
-				    justify    	0
-				    label      	"XSDMinExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C792D000A"
-				width      	493
-				height     	118
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxExclusiveFacet" @1265
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 1968)
-				label      	(object ItemLabel
-				    Parent_View 	@1265
-				    location   	(2073, 1917)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	462
-				    justify    	0
-				    label      	"XSDMaxExclusiveFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C789600C2"
-				width      	480
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDCardinalityFacet" @1266
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1424)
-				label      	(object ItemLabel
-				    Parent_View 	@1266
-				    location   	(2134, 1372)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDCardinalityFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C755D03D2"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDBoundedFacet" @1267
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2352, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@1267
-				    location   	(2163, 1212)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"XSDBoundedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C751D0344"
-				width      	396
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDOrderedFacet" @1268
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(224, 1392)
-				label      	(object ItemLabel
-				    Parent_View 	@1268
-				    location   	(43, 1340)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	362
-				    justify    	0
-				    label      	"XSDOrderedFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C74DD0248"
-				width      	380
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDNumericFacet" @1269
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1232)
-				label      	(object ItemLabel
-				    Parent_View 	@1269
-				    location   	(49, 1178)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	382
-				    justify    	0
-				    label      	"XSDNumericFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C75950206"
-				width      	400
-				height     	132
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxFacet" @1270
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2336, 1616)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1270
-				    location   	(2135, 1535)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMaxFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CEB010E"
-				compartment 	(object Compartment
-				    Parent_View 	@1270
-				    location   	(2135, 1595)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	405
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	420
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDWhiteSpaceFacet" @1271
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2288)
-				label      	(object ItemLabel
-				    Parent_View 	@1271
-				    location   	(2102, 2236)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	436
-				    justify    	0
-				    label      	"XSDWhiteSpaceFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C784601B7"
-				width      	454
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDFractionDigitsFacet" @1272
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2304, 2624)
-				label      	(object ItemLabel
-				    Parent_View 	@1272
-				    location   	(2074, 2572)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	460
-				    justify    	0
-				    label      	"XSDFractionDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79BE02EE"
-				width      	478
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDPatternFacet" @1273
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2368, 2128)
-				label      	(object ItemLabel
-				    Parent_View 	@1273
-				    location   	(2196, 2076)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	344
-				    justify    	0
-				    label      	"XSDPatternFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ADB026C"
-				width      	362
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDEnumerationFacet" @1274
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(256, 2096)
-				label      	(object ItemLabel
-				    Parent_View 	@1274
-				    location   	(36, 2044)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	440
-				    justify    	0
-				    label      	"XSDEnumerationFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C6ACE0141"
-				width      	458
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDLengthFacet" @1275
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(208, 2272)
-				label      	(object ItemLabel
-				    Parent_View 	@1275
-				    location   	(38, 2220)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	340
-				    justify    	0
-				    label      	"XSDLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C776200E7"
-				width      	358
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinFacet" @1276
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 1584)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1276
-				    location   	(38, 1503)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDMinFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3C0A1CDE037C"
-				compartment 	(object Compartment
-				    Parent_View 	@1276
-				    location   	(38, 1563)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	405
-				    compartmentItems 	(list Compartment
-					"+ inclusive : boolean"
-					"+ exclusive : boolean"))
-				width      	422
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMaxLengthFacet" @1277
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2320, 2464)
-				label      	(object ItemLabel
-				    Parent_View 	@1277
-				    location   	(2111, 2412)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	418
-				    justify    	0
-				    label      	"XSDMaxLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C77C70146"
-				width      	436
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDMinLengthFacet" @1278
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2448)
-				label      	(object ItemLabel
-				    Parent_View 	@1278
-				    location   	(39, 2396)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	402
-				    justify    	0
-				    label      	"XSDMinLengthFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C778C0065"
-				width      	420
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDTotalDigitsFacet" @1279
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(240, 2608)
-				label      	(object ItemLabel
-				    Parent_View 	@1279
-				    location   	(38, 2556)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	404
-				    justify    	0
-				    label      	"XSDTotalDigitsFacet")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B6C79A0020E"
-				width      	422
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDComplexTypeDefinition" @1280
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(928, 1152)
-				label      	(object ItemLabel
-				    Parent_View 	@1280
-				    location   	(667, 1100)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	522
-				    justify    	0
-				    label      	"XSDComplexTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682B82031A"
-				width      	540
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDParticle" @1281
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(176, 1072)
-				label      	(object ItemLabel
-				    Parent_View 	@1281
-				    location   	(50, 1020)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	252
-				    justify    	0
-				    label      	"XSDParticle")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BBD01F7"
-				width      	270
-				height     	128
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::xsd::XSDSimpleTypeDefinition" @1282
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1360)
-				label      	(object ItemLabel
-				    Parent_View 	@1282
-				    location   	(944, 1304)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	576
-				    justify    	0
-				    label      	"XSDSimpleTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3B682BA7005D"
-				compartment 	(object Compartment
-				    Parent_View 	@1282
-				    location   	(944, 1364)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	1
-				    max_width  	575
-				    compartmentItems 	(list Compartment
-					"<<0..*>> + validFacets : String"))
-				width      	594
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$249" @1283
-				location   	(1446, 1218)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A994030A"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1284
-					Parent_View 	@1283
-					location   	(582, -78)
-					label      	(object SegLabel @1285
-					    Parent_View 	@1284
-					    location   	(1580, 1173)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	3.268293
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700DD"
-					client     	@1283
-					supplier   	@1282
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1487, 1218)
-					    (1487, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1487, 1292)
-					label      	(object SegLabel @1286
-					    Parent_View 	@1284
-					    location   	(1439, 1257)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.184211
-					    height     	39
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$250" @1287
-					Parent_View 	@1283
-					location   	(582, -78)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A99700E7"
-					client     	@1283
-					supplier   	@1282
-					vertices   	(list Points
-					    (1446, 1218)
-					    (1405, 1218)
-					    (1405, 1292))
-					line_style 	3
-					origin_attachment 	(1446, 1218)
-					terminal_attachment 	(1405, 1292))))
-			    (object AssociationViewNew "$UNNAMED$253" @1288
-				location   	(1733, 1575)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B08D0252"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$254" @1289
-					Parent_View 	@1288
-					location   	(917, 7)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E0091"
-					client     	@1288
-					supplier   	@1282
-					vertices   	(list Points
-					    (1733, 1575)
-					    (1487, 1575)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "maxFacet" @1290
-					Parent_View 	@1288
-					location   	(917, 7)
-					label      	(object SegLabel @1291
-					    Parent_View 	@1290
-					    location   	(1751, 1541)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+maxFacet"
-					    pctDist    	0.046243
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B08E009B"
-					client     	@1288
-					supplier   	@1270
-					line_style 	3
-					origin_attachment 	(1733, 1575)
-					terminal_attachment 	(2126, 1575)
-					label      	(object SegLabel @1292
-					    Parent_View 	@1290
-					    location   	(2042, 1536)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.789157
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$255" @1293
-				location   	(1587, 1793)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AB0396"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$256" @1294
-					Parent_View 	@1293
-					location   	(707, -31)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03C9"
-					client     	@1293
-					supplier   	@1282
-					vertices   	(list Points
-					    (1587, 1793)
-					    (1447, 1793)
-					    (1447, 1428))
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(1447, 1428))
-				    (object RoleView "maxInclusiveFacet" @1295
-					Parent_View 	@1293
-					location   	(707, -31)
-					label      	(object SegLabel @1296
-					    Parent_View 	@1295
-					    location   	(1737, 1751)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+maxInclusiveFacet"
-					    pctDist    	0.298441
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0AC03D4"
-					client     	@1293
-					supplier   	@1262
-					line_style 	3
-					origin_attachment 	(1587, 1793)
-					terminal_attachment 	(2092, 1793)
-					label      	(object SegLabel @1297
-					    Parent_View 	@1295
-					    location   	(2020, 1754)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.859155
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$257" @1298
-				location   	(937, 1787)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0AF0338"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$258" @1299
-					Parent_View 	@1298
-					location   	(617, -5)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B001F9"
-					client     	@1298
-					supplier   	@1282
-					vertices   	(list Points
-					    (937, 1787)
-					    (997, 1787)
-					    (997, 1428))
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(997, 1428))
-				    (object RoleView "minInclusiveFacet" @1300
-					Parent_View 	@1298
-					location   	(617, -5)
-					label      	(object SegLabel @1301
-					    Parent_View 	@1300
-					    location   	(792, 1745)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+minInclusiveFacet"
-					    pctDist    	0.346062
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B00203"
-					client     	@1298
-					supplier   	@1263
-					line_style 	3
-					origin_attachment 	(937, 1787)
-					terminal_attachment 	(518, 1787)
-					label      	(object SegLabel @1302
-					    Parent_View 	@1300
-					    location   	(575, 1743)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.863962
-					    height     	45
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$259" @1303
-				location   	(981, 1937)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B30207"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$260" @1304
-					Parent_View 	@1303
-					location   	(677, -79)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B40190"
-					client     	@1303
-					supplier   	@1282
-					vertices   	(list Points
-					    (981, 1937)
-					    (1041, 1937)
-					    (1041, 1428))
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(1041, 1428))
-				    (object RoleView "minExclusiveFacet" @1305
-					Parent_View 	@1303
-					location   	(677, -79)
-					label      	(object SegLabel @1306
-					    Parent_View 	@1305
-					    location   	(823, 1900)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+minExclusiveFacet"
-					    pctDist    	0.341253
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B4019A"
-					client     	@1303
-					supplier   	@1264
-					line_style 	3
-					origin_attachment 	(981, 1937)
-					terminal_attachment 	(518, 1937)
-					label      	(object SegLabel @1307
-					    Parent_View 	@1305
-					    location   	(589, 1897)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.846652
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$261" @1308
-				location   	(1469, 1953)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0B6028D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$262" @1309
-					Parent_View 	@1308
-					location   	(621, -95)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70217"
-					client     	@1308
-					supplier   	@1282
-					vertices   	(list Points
-					    (1469, 1953)
-					    (1400, 1953)
-					    (1400, 1428))
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(1400, 1428))
-				    (object RoleView "maxExclusiveFacet" @1310
-					Parent_View 	@1308
-					location   	(621, -95)
-					label      	(object SegLabel @1311
-					    Parent_View 	@1310
-					    location   	(1646, 1913)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	384
-					    justify    	0
-					    label      	"+maxExclusiveFacet"
-					    pctDist    	0.298097
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0B70221"
-					client     	@1308
-					supplier   	@1265
-					line_style 	3
-					origin_attachment 	(1469, 1953)
-					terminal_attachment 	(2064, 1953)
-					label      	(object SegLabel @1312
-					    Parent_View 	@1310
-					    location   	(1961, 1913)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.827236
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$263" @1313
-				location   	(1122, 2180)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BC0051"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$264" @1314
-					Parent_View 	@1313
-					location   	(-318, 628)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0246"
-					client     	@1313
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "lengthFacet" @1315
-					Parent_View 	@1313
-					location   	(-318, 628)
-					label      	(object SegLabel @1316
-					    Parent_View 	@1315
-					    location   	(804, 2204)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+lengthFacet"
-					    pctDist    	0.475472
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0BC0250"
-					client     	@1313
-					supplier   	@1275
-					vertices   	(list Points
-					    (1122, 2180)
-					    (1122, 2240)
-					    (387, 2240))
-					line_style 	3
-					origin_attachment 	(1122, 2180)
-					terminal_attachment 	(387, 2240)
-					label      	(object SegLabel @1317
-					    Parent_View 	@1315
-					    location   	(471, 2204)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.895597
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$267" @1318
-				location   	(1084, 1989)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C2021D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$268" @1319
-					Parent_View 	@1318
-					location   	(-1380, 437)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AB"
-					client     	@1318
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "enumerationFacets" @1320
-					Parent_View 	@1318
-					location   	(-1380, 437)
-					label      	(object SegLabel @1321
-					    Parent_View 	@1320
-					    location   	(837, 2016)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	372
-					    justify    	0
-					    label      	"+enumerationFacets"
-					    pctDist    	0.465857
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C300AC"
-					client     	@1318
-					supplier   	@1274
-					vertices   	(list Points
-					    (1084, 1989)
-					    (1084, 2049)
-					    (485, 2049))
-					line_style 	3
-					origin_attachment 	(1084, 1989)
-					terminal_attachment 	(485, 2049)
-					label      	(object SegLabel @1322
-					    Parent_View 	@1320
-					    location   	(583, 2021)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.851290
-					    height     	29
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$269" @1323
-				location   	(1451, 2074)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C50159"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$270" @1324
-					Parent_View 	@1323
-					location   	(-1525, 538)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600B0"
-					client     	@1323
-					supplier   	@1282
-					vertices   	(list Points
-					    (1451, 2074)
-					    (1362, 2074)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "patternFacets" @1325
-					Parent_View 	@1323
-					location   	(-1525, 538)
-					label      	(object SegLabel @1326
-					    Parent_View 	@1325
-					    location   	(1720, 2038)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+patternFacets"
-					    pctDist    	0.367223
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C600BA"
-					client     	@1323
-					supplier   	@1273
-					line_style 	3
-					origin_attachment 	(1451, 2074)
-					terminal_attachment 	(2187, 2074)
-					label      	(object SegLabel @1327
-					    Parent_View 	@1325
-					    location   	(1972, 2035)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.708649
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$271" @1328
-				location   	(1827, 1400)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0C802A7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$272" @1329
-					Parent_View 	@1328
-					location   	(-1149, -472)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901EA"
-					client     	@1328
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(1529, 1400))
-				    (object RoleView "cardinalityFacet" @1330
-					Parent_View 	@1328
-					location   	(-1149, -472)
-					label      	(object SegLabel @1331
-					    Parent_View 	@1330
-					    location   	(1847, 1358)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+cardinalityFacet"
-					    pctDist    	0.071730
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C901F5"
-					client     	@1328
-					supplier   	@1266
-					line_style 	3
-					origin_attachment 	(1827, 1400)
-					terminal_attachment 	(2125, 1400)
-					label      	(object SegLabel @1332
-					    Parent_View 	@1330
-					    location   	(2083, 1357)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.863426
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$281" @1333
-				location   	(1262, 2413)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DB0377"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$282" @1334
-					Parent_View 	@1333
-					location   	(-786, 301)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC035A"
-					client     	@1333
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "fractionDigitsFacet" @1335
-					Parent_View 	@1333
-					location   	(-786, 301)
-					label      	(object SegLabel @1336
-					    Parent_View 	@1335
-					    location   	(1608, 2556)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+fractionDigitsFacet"
-					    pctDist    	0.537393
-					    height     	41
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DC0364"
-					client     	@1333
-					supplier   	@1272
-					vertices   	(list Points
-					    (1262, 2413)
-					    (1262, 2596)
-					    (2065, 2596))
-					line_style 	3
-					origin_attachment 	(1262, 2413)
-					terminal_attachment 	(2065, 2596)
-					label      	(object SegLabel @1337
-					    Parent_View 	@1335
-					    location   	(1979, 2556)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913886
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$285" @1338
-				location   	(1841, 1306)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0E300D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$286" @1339
-					Parent_View 	@1338
-					location   	(-1135, -790)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E4038E"
-					client     	@1338
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(1529, 1306))
-				    (object RoleView "boundedFacet" @1340
-					Parent_View 	@1338
-					location   	(-1135, -790)
-					label      	(object SegLabel @1341
-					    Parent_View 	@1340
-					    location   	(1832, 1270)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	288
-					    justify    	0
-					    label      	"+boundedFacet"
-					    pctDist    	-0.031746
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0E40398"
-					client     	@1338
-					supplier   	@1267
-					line_style 	3
-					origin_attachment 	(1841, 1306)
-					terminal_attachment 	(2154, 1306)
-					label      	(object SegLabel @1342
-					    Parent_View 	@1340
-					    location   	(2077, 1275)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.754717
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$265" @1343
-				location   	(1328, 2186)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0BF018C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$266" @1344
-					Parent_View 	@1343
-					location   	(-640, 634)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C0006B"
-					client     	@1343
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "whiteSpaceFacet" @1345
-					Parent_View 	@1343
-					location   	(-640, 634)
-					label      	(object SegLabel @1346
-					    Parent_View 	@1345
-					    location   	(1673, 2207)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+whiteSpaceFacet"
-					    pctDist    	0.490909
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0C00075"
-					client     	@1343
-					supplier   	@1271
-					vertices   	(list Points
-					    (1328, 2186)
-					    (1328, 2246)
-					    (2093, 2246))
-					line_style 	3
-					origin_attachment 	(1328, 2186)
-					terminal_attachment 	(2093, 2246)
-					label      	(object SegLabel @1347
-					    Parent_View 	@1345
-					    location   	(2033, 2203)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926763
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$283" @1348
-				location   	(674, 1390)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0DF0048"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$284" @1349
-					Parent_View 	@1348
-					location   	(-1854, -706)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03B9"
-					client     	@1348
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(935, 1390))
-				    (object RoleView "orderedFacet" @1350
-					Parent_View 	@1348
-					location   	(-1854, -706)
-					label      	(object SegLabel @1351
-					    Parent_View 	@1350
-					    location   	(658, 1353)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+orderedFacet"
-					    pctDist    	0.061538
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0DF03C3"
-					client     	@1348
-					supplier   	@1268
-					line_style 	3
-					origin_attachment 	(674, 1390)
-					terminal_attachment 	(414, 1390)
-					label      	(object SegLabel @1352
-					    Parent_View 	@1350
-					    location   	(510, 1355)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.634615
-					    height     	36
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$273" @1353
-				location   	(687, 1296)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CB039C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$274" @1354
-					Parent_View 	@1353
-					location   	(-1809, -576)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D0"
-					client     	@1353
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(935, 1296))
-				    (object RoleView "numericFacet" @1355
-					Parent_View 	@1353
-					location   	(-1809, -576)
-					label      	(object SegLabel @1356
-					    Parent_View 	@1355
-					    location   	(668, 1257)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	276
-					    justify    	0
-					    label      	"+numericFacet"
-					    pctDist    	0.080972
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0CC03D1"
-					client     	@1353
-					supplier   	@1269
-					line_style 	3
-					origin_attachment 	(687, 1296)
-					terminal_attachment 	(440, 1296)
-					label      	(object SegLabel @1357
-					    Parent_View 	@1355
-					    location   	(506, 1260)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.736842
-					    height     	37
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$287" @1358
-				location   	(1689, 1662)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B44401EC"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$288" @1359
-					Parent_View 	@1358
-					location   	(-183, -354)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B4450360"
-					client     	@1358
-					supplier   	@1282
-					vertices   	(list Points
-					    (1689, 1662)
-					    (1487, 1662)
-					    (1487, 1428))
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(1487, 1428))
-				    (object RoleView "effectiveMaxFacet" @1360
-					Parent_View 	@1358
-					location   	(-183, -354)
-					label      	(object SegLabel @1361
-					    Parent_View 	@1360
-					    location   	(1769, 1623)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+effectiveMaxFacet"
-					    pctDist    	0.182051
-					    height     	40
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B445036A"
-					client     	@1358
-					supplier   	@1270
-					line_style 	3
-					origin_attachment 	(1689, 1662)
-					terminal_attachment 	(2126, 1662)
-					label      	(object SegLabel @1362
-					    Parent_View 	@1360
-					    location   	(2044, 1627)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.815385
-					    height     	36
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$289" @1363
-				location   	(1328, 2258)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B54F0145"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$290" @1364
-					Parent_View 	@1363
-					location   	(-1072, -462)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B550038C"
-					client     	@1363
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(1328, 1428))
-				    (object RoleView "effectiveWhiteSpaceFacet" @1365
-					Parent_View 	@1363
-					location   	(-1072, -462)
-					label      	(object SegLabel @1366
-					    Parent_View 	@1365
-					    location   	(1685, 2288)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	492
-					    justify    	0
-					    label      	"+effectiveWhiteSpaceFacet"
-					    pctDist    	0.508541
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5500396"
-					client     	@1363
-					supplier   	@1271
-					vertices   	(list Points
-					    (1328, 2258)
-					    (1328, 2324)
-					    (2093, 2324))
-					line_style 	3
-					origin_attachment 	(1328, 2258)
-					terminal_attachment 	(2093, 2324)
-					label      	(object SegLabel @1367
-					    Parent_View 	@1365
-					    location   	(2009, 2293)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898817
-					    height     	32
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$291" @1368
-				location   	(1297, 2366)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B5C4011C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$292" @1369
-					Parent_View 	@1368
-					location   	(-607, -722)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C5020D"
-					client     	@1368
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "effectiveMaxLengthFacet" @1370
-					Parent_View 	@1368
-					location   	(-607, -722)
-					label      	(object SegLabel @1371
-					    Parent_View 	@1370
-					    location   	(1657, 2463)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	480
-					    justify    	0
-					    label      	"+effectiveMaxLengthFacet"
-					    pctDist    	0.526906
-					    height     	37
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B5C50217"
-					client     	@1368
-					supplier   	@1277
-					vertices   	(list Points
-					    (1297, 2366)
-					    (1297, 2499)
-					    (2102, 2499))
-					line_style 	3
-					origin_attachment 	(1297, 2366)
-					terminal_attachment 	(2102, 2499)
-					label      	(object SegLabel @1372
-					    Parent_View 	@1370
-					    location   	(2007, 2471)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.899308
-					    height     	29
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$293" @1373
-				location   	(1262, 2449)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B62A00AA"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$294" @1374
-					Parent_View 	@1373
-					location   	(-1170, -815)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0138"
-					client     	@1373
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(1262, 1428))
-				    (object RoleView "effectiveFractionDigitsFacet" @1375
-					Parent_View 	@1373
-					location   	(-1170, -815)
-					label      	(object SegLabel @1376
-					    Parent_View 	@1375
-					    location   	(1640, 2634)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	528
-					    justify    	0
-					    label      	"+effectiveFractionDigitsFacet"
-					    pctDist    	0.585315
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B62B0142"
-					client     	@1373
-					supplier   	@1272
-					vertices   	(list Points
-					    (1262, 2449)
-					    (1262, 2668)
-					    (2065, 2668))
-					line_style 	3
-					origin_attachment 	(1262, 2449)
-					terminal_attachment 	(2065, 2668)
-					label      	(object SegLabel @1377
-					    Parent_View 	@1375
-					    location   	(1989, 2629)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.926485
-					    height     	40
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$295" @1378
-				location   	(1422, 2159)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B6B003A6"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$296" @1379
-					Parent_View 	@1378
-					location   	(-770, -1313)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10311"
-					client     	@1378
-					supplier   	@1282
-					vertices   	(list Points
-					    (1422, 2159)
-					    (1362, 2159)
-					    (1362, 1428))
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(1362, 1428))
-				    (object RoleView "effectivePatternFacet" @1380
-					Parent_View 	@1378
-					location   	(-770, -1313)
-					label      	(object SegLabel @1381
-					    Parent_View 	@1380
-					    location   	(1727, 2125)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	408
-					    justify    	0
-					    label      	"+effectivePatternFacet"
-					    pctDist    	0.399090
-					    height     	35
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B6B10312"
-					client     	@1378
-					supplier   	@1273
-					line_style 	3
-					origin_attachment 	(1422, 2159)
-					terminal_attachment 	(2187, 2159)
-					label      	(object SegLabel @1382
-					    Parent_View 	@1380
-					    location   	(2102, 2119)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.889226
-					    height     	41
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$297" @1383
-				location   	(1084, 2083)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B7CA026B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$298" @1384
-					Parent_View 	@1383
-					location   	(828, -1373)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0186"
-					client     	@1383
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(1084, 1428))
-				    (object RoleView "effectiveEnumerationFacet" @1385
-					Parent_View 	@1383
-					location   	(828, -1373)
-					label      	(object SegLabel @1386
-					    Parent_View 	@1385
-					    location   	(822, 2101)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	504
-					    justify    	0
-					    label      	"+effectiveEnumerationFacet"
-					    pctDist    	0.488619
-					    height     	43
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B7CB0190"
-					client     	@1383
-					supplier   	@1274
-					vertices   	(list Points
-					    (1084, 2083)
-					    (1084, 2143)
-					    (485, 2143))
-					line_style 	3
-					origin_attachment 	(1084, 2083)
-					terminal_attachment 	(485, 2143)
-					label      	(object SegLabel @1387
-					    Parent_View 	@1385
-					    location   	(531, 2100)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.931715
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$303" @1388
-				location   	(1122, 2241)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8DC0052"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$304" @1389
-					Parent_View 	@1388
-					location   	(866, -479)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03B9"
-					client     	@1388
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(1122, 1428))
-				    (object RoleView "effectiveLengthFacet" @1390
-					Parent_View 	@1388
-					location   	(866, -479)
-					label      	(object SegLabel @1391
-					    Parent_View 	@1390
-					    location   	(800, 2279)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	396
-					    justify    	0
-					    label      	"+effectiveLengthFacet"
-					    pctDist    	0.491731
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8DC03C3"
-					client     	@1388
-					supplier   	@1275
-					vertices   	(list Points
-					    (1122, 2241)
-					    (1122, 2318)
-					    (387, 2318))
-					line_style 	3
-					origin_attachment 	(1122, 2241)
-					terminal_attachment 	(387, 2318)
-					label      	(object SegLabel @1392
-					    Parent_View 	@1390
-					    location   	(470, 2279)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.898567
-					    height     	40
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$251" @1393
-				location   	(773, 1565)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B085025B"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$252" @1394
-					Parent_View 	@1393
-					location   	(469, 13)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0860270"
-					client     	@1393
-					supplier   	@1282
-					vertices   	(list Points
-					    (773, 1565)
-					    (959, 1565)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "minFacet" @1395
-					Parent_View 	@1393
-					location   	(469, 13)
-					label      	(object SegLabel @1396
-					    Parent_View 	@1395
-					    location   	(753, 1532)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	192
-					    justify    	0
-					    label      	"+minFacet"
-					    pctDist    	0.063091
-					    height     	34
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B086027A"
-					client     	@1393
-					supplier   	@1276
-					line_style 	3
-					origin_attachment 	(773, 1565)
-					terminal_attachment 	(451, 1565)
-					label      	(object SegLabel @1397
-					    Parent_View 	@1395
-					    location   	(534, 1523)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.746667
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$305" @1398
-				location   	(816, 1650)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B97001DB"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$306" @1399
-					Parent_View 	@1398
-					location   	(496, -334)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100CF"
-					client     	@1398
-					supplier   	@1282
-					vertices   	(list Points
-					    (816, 1650)
-					    (959, 1650)
-					    (959, 1428))
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(959, 1428))
-				    (object RoleView "effectiveMinFacet" @1400
-					Parent_View 	@1398
-					location   	(496, -334)
-					label      	(object SegLabel @1401
-					    Parent_View 	@1400
-					    location   	(764, 1614)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+effectiveMinFacet"
-					    pctDist    	0.141618
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B97100D9"
-					client     	@1398
-					supplier   	@1276
-					line_style 	3
-					origin_attachment 	(816, 1650)
-					terminal_attachment 	(451, 1650)
-					label      	(object SegLabel @1402
-					    Parent_View 	@1400
-					    location   	(523, 1606)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.802740
-					    height     	44
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$275" @1403
-				location   	(1297, 2321)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0CF0199"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$276" @1404
-					Parent_View 	@1403
-					location   	(-719, 497)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D20085"
-					client     	@1403
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(1297, 1428))
-				    (object RoleView "maxLengthFacet" @1405
-					Parent_View 	@1403
-					location   	(-719, 497)
-					label      	(object SegLabel @1406
-					    Parent_View 	@1405
-					    location   	(1630, 2380)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	336
-					    justify    	0
-					    label      	"+maxLengthFacet"
-					    pctDist    	0.472255
-					    height     	30
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D2008F"
-					client     	@1403
-					supplier   	@1277
-					vertices   	(list Points
-					    (1297, 2321)
-					    (1297, 2409)
-					    (2102, 2409))
-					line_style 	3
-					origin_attachment 	(1297, 2321)
-					terminal_attachment 	(2102, 2409)
-					label      	(object SegLabel @1407
-					    Parent_View 	@1405
-					    location   	(1994, 2366)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.879208
-					    height     	44
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$277" @1408
-				location   	(1159, 2273)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D500C5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$278" @1409
-					Parent_View 	@1408
-					location   	(-281, 449)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D6001D"
-					client     	@1408
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(1159, 1428))
-				    (object RoleView "minLengthFacet" @1410
-					Parent_View 	@1408
-					location   	(-281, 449)
-					label      	(object SegLabel @1411
-					    Parent_View 	@1410
-					    location   	(857, 2372)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	324
-					    justify    	0
-					    label      	"+minLengthFacet"
-					    pctDist    	0.519527
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D60027"
-					client     	@1408
-					supplier   	@1278
-					vertices   	(list Points
-					    (1159, 2273)
-					    (1159, 2409)
-					    (450, 2409))
-					line_style 	3
-					origin_attachment 	(1159, 2273)
-					terminal_attachment 	(450, 2409)
-					label      	(object SegLabel @1412
-					    Parent_View 	@1410
-					    location   	(523, 2369)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.913610
-					    height     	41
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$301" @1413
-				location   	(1197, 2334)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B898016D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$302" @1414
-					Parent_View 	@1413
-					location   	(941, -610)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990056"
-					client     	@1413
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(1197, 1428))
-				    (object RoleView "effectiveMinLengthFacet" @1415
-					Parent_View 	@1413
-					location   	(941, -610)
-					label      	(object SegLabel @1416
-					    Parent_View 	@1415
-					    location   	(856, 2454)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveMinLengthFacet"
-					    pctDist    	0.552604
-					    height     	40
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8990060"
-					client     	@1413
-					supplier   	@1278
-					vertices   	(list Points
-					    (1197, 2334)
-					    (1197, 2493)
-					    (450, 2493))
-					line_style 	3
-					origin_attachment 	(1197, 2334)
-					terminal_attachment 	(450, 2493)
-					label      	(object SegLabel @1417
-					    Parent_View 	@1415
-					    location   	(527, 2451)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.916047
-					    height     	43
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$299" @1418
-				location   	(1231, 2438)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B8400062"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$300" @1419
-					Parent_View 	@1418
-					location   	(863, -746)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B841001D"
-					client     	@1418
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "effectiveTotalDigitsFacet" @1420
-					Parent_View 	@1418
-					location   	(863, -746)
-					label      	(object SegLabel @1421
-					    Parent_View 	@1420
-					    location   	(859, 2632)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	468
-					    justify    	0
-					    label      	"+effectiveTotalDigitsFacet"
-					    pctDist    	0.597030
-					    height     	37
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B8410027"
-					client     	@1418
-					supplier   	@1279
-					vertices   	(list Points
-					    (1231, 2438)
-					    (1231, 2668)
-					    (451, 2668))
-					line_style 	3
-					origin_attachment 	(1231, 2438)
-					terminal_attachment 	(451, 2668)
-					label      	(object SegLabel @1422
-					    Parent_View 	@1420
-					    location   	(534, 2631)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.918812
-					    height     	38
-					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$279" @1423
-				location   	(1231, 2397)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28B0D800DE"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$280" @1424
-					Parent_View 	@1423
-					location   	(-209, 253)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803CD"
-					client     	@1423
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(1231, 1428))
-				    (object RoleView "totalDigitsFacet" @1425
-					Parent_View 	@1423
-					location   	(-209, 253)
-					label      	(object SegLabel @1426
-					    Parent_View 	@1425
-					    location   	(853, 2550)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+totalDigitsFacet"
-					    pctDist    	0.585567
-					    height     	38
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28B0D803D7"
-					client     	@1423
-					supplier   	@1279
-					vertices   	(list Points
-					    (1231, 2397)
-					    (1231, 2587)
-					    (451, 2587))
-					line_style 	3
-					origin_attachment 	(1231, 2397)
-					terminal_attachment 	(451, 2587)
-					label      	(object SegLabel @1427
-					    Parent_View 	@1425
-					    location   	(535, 2560)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.914647
-					    height     	28
-					    orientation 	1))))
-			    (object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @1428
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 768)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1428
-				    location   	(1019, 574)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	426
-				    justify    	0
-				    label      	"XSDTypeDefinition")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B66ECD302A9"
-				width      	444
-				height     	413
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1429
-				location   	(1209, 1065)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1428
-				vertices   	(list Points
-				    (1209, 1065)
-				    (1209, 974)))
-			    (object AssociationViewNew "$UNNAMED$235" @1430
-				location   	(1090, 1031)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C2880F503D9"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootTypeDefinition" @1431
-					Parent_View 	@1430
-					location   	(322, -25)
-					label      	(object SegLabel @1432
-					    Parent_View 	@1431
-					    location   	(897, 1036)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	348
-					    justify    	0
-					    label      	"+rootTypeDefinition"
-					    pctDist    	-0.098765
-					    height     	194
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F9003C"
-					client     	@1430
-					supplier   	@1428
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 974)
-					label      	(object SegLabel @1433
-					    Parent_View 	@1431
-					    location   	(1121, 1034)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.061728
-					    height     	31
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$236" @1434
-					Parent_View 	@1430
-					location   	(322, -25)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C2880F90046"
-					client     	@1430
-					supplier   	@1280
-					line_style 	3
-					origin_attachment 	(1090, 1031)
-					terminal_attachment 	(1090, 1088))))
-			    (object AssociationViewNew "$UNNAMED$241" @1435
-				location   	(1538, 873)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A6DB01E5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "rootType" @1436
-					Parent_View 	@1435
-					location   	(178, 105)
-					label      	(object SegLabel @1437
-					    Parent_View 	@1436
-					    location   	(1558, 792)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	180
-					    justify    	0
-					    label      	"+rootType"
-					    pctDist    	-1.760870
-					    height     	20
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DD"
-					client     	@1435
-					supplier   	@1428
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 919)
-					    (1454, 919))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 919)
-					label      	(object SegLabel @1438
-					    Parent_View 	@1436
-					    location   	(1509, 875)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.016667
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$242" @1439
-					Parent_View 	@1435
-					location   	(178, 105)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A6DD03DE"
-					client     	@1435
-					supplier   	@1428
-					vertices   	(list Points
-					    (1538, 873)
-					    (1538, 828)
-					    (1454, 828))
-					line_style 	3
-					origin_attachment 	(1538, 873)
-					terminal_attachment 	(1454, 828))))
-			    (object AssociationViewNew "$UNNAMED$243" @1440
-				location   	(1535, 684)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7120108"
-				roleview_list 	(list RoleViews
-				    (object RoleView "baseType" @1441
-					Parent_View 	@1440
-					location   	(175, -84)
-					label      	(object SegLabel @1442
-					    Parent_View 	@1441
-					    location   	(1559, 597)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	204
-					    justify    	0
-					    label      	"+baseType"
-					    pctDist    	-1.977273
-					    height     	24
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7140151"
-					client     	@1440
-					supplier   	@1428
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 728)
-					    (1454, 728))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 728)
-					label      	(object SegLabel @1443
-					    Parent_View 	@1441
-					    location   	(1506, 683)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	-0.027778
-					    height     	30
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$244" @1444
-					Parent_View 	@1440
-					location   	(175, -84)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A714015B"
-					client     	@1440
-					supplier   	@1428
-					vertices   	(list Points
-					    (1535, 684)
-					    (1535, 641)
-					    (1454, 641))
-					line_style 	3
-					origin_attachment 	(1535, 684)
-					terminal_attachment 	(1454, 641))))
-			    (object AssociationViewNew "$UNNAMED$247" @1445
-				location   	(613, 940)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A7ED03C0"
-				roleview_list 	(list RoleViews
-				    (object RoleView "complexType" @1446
-					Parent_View 	@1445
-					location   	(-747, 172)
-					label      	(object SegLabel @1447
-					    Parent_View 	@1446
-					    location   	(465, 983)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	264
-					    justify    	0
-					    label      	"+complexType"
-					    pctDist    	0.373057
-					    height     	43
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40117"
-					client     	@1445
-					supplier   	@1281
-					vertices   	(list Points
-					    (613, 940)
-					    (284, 940)
-					    (284, 1008))
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(284, 1008)
-					label      	(object SegLabel @1448
-					    Parent_View 	@1446
-					    location   	(224, 972)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.909320
-					    height     	61
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$248" @1449
-					Parent_View 	@1445
-					location   	(-747, 172)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A7F40121"
-					client     	@1445
-					supplier   	@1428
-					line_style 	3
-					origin_attachment 	(613, 940)
-					terminal_attachment 	(1010, 940))))
-			    (object InheritView "" @1450
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B7FCAB1004D"
-				client     	@1428
-				supplier   	@1258
-				line_style 	3
-				origin_attachment 	(1112, 562)
-				terminal_attachment 	(1112, 510)
-				drawSupplier 	@1259)
-			    (object InheritView "" @1451
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3BA0D01901F1"
-				client     	@1280
-				supplier   	@1428
-				line_style 	3
-				origin_attachment 	(1146, 1088)
-				terminal_attachment 	(1146, 1065)
-				drawSupplier 	@1429)
-			    (object AssociationViewNew "$UNNAMED$245" @1452
-				location   	(1362, 1133)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A74B0178"
-				roleview_list 	(list RoleViews
-				    (object RoleView "simpleType" @1453
-					Parent_View 	@1452
-					location   	(-158, -163)
-					label      	(object SegLabel @1454
-					    Parent_View 	@1453
-					    location   	(1499, 1094)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+simpleType"
-					    pctDist    	-0.246753
-					    height     	137
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D017B"
-					client     	@1452
-					supplier   	@1282
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 1292)
-					label      	(object SegLabel @1455
-					    Parent_View 	@1453
-					    location   	(1321, 1097)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	-0.227273
-					    height     	42
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$246" @1456
-					Parent_View 	@1452
-					location   	(-158, -163)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A74D0185"
-					client     	@1452
-					supplier   	@1428
-					line_style 	3
-					origin_attachment 	(1362, 1133)
-					terminal_attachment 	(1362, 974))))
-			    (object ClassView "Class" "Logical View::xsd::XSDFeature" @1457
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2272, 384)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@1457
-				    location   	(2002, 303)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	540
-				    justify    	0
-				    label      	"XSDFeature")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16777088
-				quidu      	"3B69B537026C"
-				compartment 	(object Compartment
-				    Parent_View 	@1457
-				    location   	(2002, 363)
-				    font       	(object Font
-					italics    	TRUE)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	2
-				    max_width  	550
-				    compartmentItems 	(list Compartment
-					"+ global : boolean"
-					"+ featureReference : boolean"))
-				width      	558
-				height     	186
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @1458
-				location   	(2262, 568)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@1457
-				vertices   	(list Points
-				    (2262, 568)
-				    (2262, 477)))
-			    (object InheritView "" @1459
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69EDEE01BF"
-				client     	@1254
-				supplier   	@1457
-				line_style 	3
-				origin_attachment 	(2346, 595)
-				terminal_attachment 	(2346, 568)
-				drawSupplier 	@1458)
-			    (object AssociationViewNew "$UNNAMED$239" @1460
-				location   	(1553, 453)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C28A0F201A4"
-				roleview_list 	(list RoleViews
-				    (object RoleView "type" @1461
-					Parent_View 	@1460
-					location   	(801, 293)
-					label      	(object SegLabel @1462
-					    Parent_View 	@1461
-					    location   	(1331, 499)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	108
-					    justify    	0
-					    label      	"+type"
-					    pctDist    	0.506266
-					    height     	46
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302E5"
-					client     	@1460
-					supplier   	@1428
-					vertices   	(list Points
-					    (1553, 453)
-					    (1222, 453)
-					    (1222, 562))
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1222, 562)
-					label      	(object SegLabel @1463
-					    Parent_View 	@1461
-					    location   	(1185, 479)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.812030
-					    height     	38
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$240" @1464
-					Parent_View 	@1460
-					location   	(801, 293)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C28A0F302F0"
-					client     	@1460
-					supplier   	@1457
-					line_style 	3
-					origin_attachment 	(1553, 453)
-					terminal_attachment 	(1993, 453))))
-			    (object AssociationViewNew "$UNNAMED$131" @1465
-				location   	(1908, 353)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C29010602D7"
-				roleview_list 	(list RoleViews
-				    (object RoleView "resolvedFeature" @1466
-					Parent_View 	@1465
-					location   	(-268, -159)
-					label      	(object SegLabel @1467
-					    Parent_View 	@1466
-					    location   	(1729, 352)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	312
-					    justify    	0
-					    label      	"+resolvedFeature"
-					    pctDist    	-0.029412
-					    height     	180
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B000E"
-					client     	@1465
-					supplier   	@1457
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 387)
-					    (1993, 387))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 387)
-					label      	(object SegLabel @1468
-					    Parent_View 	@1466
-					    location   	(1945, 354)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.596639
-					    height     	34
-					    orientation 	0))
-				    (object RoleView "$UNNAMED$132" @1469
-					Parent_View 	@1465
-					location   	(-268, -159)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3C29010B0018"
-					client     	@1465
-					supplier   	@1457
-					vertices   	(list Points
-					    (1908, 353)
-					    (1908, 319)
-					    (1993, 319))
-					line_style 	3
-					origin_attachment 	(1908, 353)
-					terminal_attachment 	(1993, 319))))
-			    (object InheritView "" @1470
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A26036D"
-				client     	@1258
-				supplier   	@1257
-				vertices   	(list Points
-				    (494, 284)
-				    (494, 244)
-				    (996, 244))
-				line_style 	3
-				origin_attachment 	(494, 284)
-				terminal_attachment 	(996, 244))
-			    (object InheritView "" @1471
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B69B7DC0193"
-				client     	@1245
-				supplier   	@1457
-				line_style 	3
-				origin_attachment 	(1718, 812)
-				terminal_attachment 	(1718, 568)
-				drawSupplier 	@1458)
-			    (object InheritView "" @1472
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3B684A1302A2"
-				client     	@1282
-				supplier   	@1428
-				line_style 	3
-				origin_attachment 	(1265, 1292)
-				terminal_attachment 	(1265, 1065)
-				drawSupplier 	@1429)
-			    (object InheritView "" @1473
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3C290A2C0307"
-				client     	@1457
-				supplier   	@1257
-				vertices   	(list Points
-				    (2147, 291)
-				    (2147, 244)
-				    (1468, 244))
-				line_style 	3
-				origin_attachment 	(2147, 291)
-				terminal_attachment 	(1468, 244)))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"39E27F080076"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::wsdl" @1474
-			location   	(272, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@1474
-			    location   	(128, 172)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsdl")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3ADFB8E5021E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::xsd" @1475
-			location   	(272, 576)
-			label      	(object ItemLabel
-			    Parent_View 	@1475
-			    location   	(128, 492)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"xsd")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39ABDC6F01AA"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"39E27F080065"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"39E27F080077"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"39E27F080066"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"39E27F080068"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.services/src/rose/wsdlMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.services/src/rose/wsdlMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Repository"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.services/src/rose/wsdlMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/com.ibm.etools.ctc.services/src/rose/wsdlMdl.mdl, ctc, ibmctc"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	"0")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"None"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"39E27F080067"))

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/com.ibm.etools.WSDL.cat b/bundles/org.eclipse.wst.wsdl/src-wsdl/model/com.ibm.etools.WSDL.cat
deleted file mode 100644
index 4627bd7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/com.ibm.etools.WSDL.cat
+++ /dev/null

@@ -1,6997 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8054a"
-    charSet    	0)
-
-(object Class_Category "wsdl"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    quid       	"3ADFB8E5021E"
-    documentation 	
-|The WSDL model contains classes for the Web Services Description Language (WSDL).
-|
-|WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
-|
-|WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
-|
-|The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
-|- 2.1 Definition, shows the WSDL definition element and the WSDL document structure
-|- 2.1.1 Naming and Linking, shows the namespace and import mechanism
-|- 2.1.3 Extensibility, shows the WSDL extensibility mechanism
-|- 2.2 Types, shows the use of XML Schema types in WSDL
-|- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
-|
-|The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
-    
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "WSDLElement"
-	    quid       	"3AD5C6A302DD"
-	    documentation 	"This class represents a WSDL language element."
-	    operations 	(list Operations
-		(object Operation "getEnclosingDefinition"
-		    quid       	"3CD1529600C8"
-		    result     	"Definition"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setEnclosingDefinition"
-		    quid       	"3CD152B80347"
-		    parameters 	(list Parameters
-			(object Parameter "definition"
-			    type       	"Definition"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "documentationElement"
-		    quid       	"3CCE443602A3"
-		    type       	"DOMElement")
-		(object ClassAttribute "element"
-		    quid       	"3F97DBD30207"
-		    type       	"DOMElement"))
-	    language   	"Java"
-	    abstract   	TRUE)
-	(object Class "PortType"
-	    quid       	"3AD5C7F001A5"
-	    documentation 	"This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5C9B70150"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F6F1FD8019F"
-		    supplier   	"Logical View::wsdl::IPortType"
-		    quidu      	"3B84A5BE0331"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "qName"
-		    quid       	"3AEB488E0023"
-		    type       	"QName")
-		(object ClassAttribute "undefined"
-		    quid       	"3BDDF1E301E5"
-		    type       	"boolean")
-		(object ClassAttribute "proxy"
-		    quid       	"3D18CDEB0316"
-		    type       	"boolean")
-		(object ClassAttribute "resourceURI"
-		    quid       	"3D18D4FD01BA"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Operation"
-	    quid       	"3AD5C80D03CE"
-	    documentation 	"This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE9DE98003C"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F6F1FE20171"
-		    supplier   	"Logical View::wsdl::IOperation"
-		    quidu      	"3B84A77600D1"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "style"
-		    quid       	"3AEB472601AC"
-		    type       	"OperationType")
-		(object ClassAttribute "name"
-		    quid       	"3BDD9643004C"
-		    type       	"String")
-		(object ClassAttribute "undefined"
-		    quid       	"3BDDF235003E"
-		    type       	"boolean")
-		(object ClassAttribute "proxy"
-		    quid       	"3D18CE2201AD"
-		    type       	"boolean")
-		(object ClassAttribute "resourceURI"
-		    quid       	"3D18D520011B"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Message"
-	    quid       	"3AD5C9590078"
-	    documentation 	"This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5D05501C4"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3B84A8D102BA"
-		    supplier   	"Logical View::wsdl::IMessage"
-		    quidu      	"3B84A8AF004F"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "qName"
-		    quid       	"3AEB487C01FE"
-		    type       	"QName")
-		(object ClassAttribute "undefined"
-		    quid       	"3BDDF1D20226"
-		    type       	"boolean")
-		(object ClassAttribute "proxy"
-		    quid       	"3D18CE4B02B0"
-		    type       	"boolean")
-		(object ClassAttribute "resourceURI"
-		    quid       	"3D18D54200F1"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Part"
-	    quid       	"3AD5CE1C032E"
-	    documentation 	"This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B84A96D02F1"
-		    supplier   	"Logical View::wsdl::IPart"
-		    quidu      	"3B84A93F01BE")
-		(object Inheritance_Relationship
-		    quid       	"3B897E230237"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3BCE70B703C8"
-		    type       	"String")
-		(object ClassAttribute "elementName"
-		    quid       	"3B84B08703DB"
-		    type       	"QName")
-		(object ClassAttribute "typeName"
-		    quid       	"3BCE70C303C5"
-		    type       	"QName"))
-	    language   	"Java")
-	(object Class "Binding"
-	    quid       	"3AD5D2860261"
-	    documentation 	"This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5FA0F02F0"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B8595410129"
-		    supplier   	"Logical View::wsdl::IBinding"
-		    quidu      	"3B84ABC60219"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "qName"
-		    quid       	"3AEB4899014B"
-		    type       	"QName")
-		(object ClassAttribute "undefined"
-		    quid       	"3BDDF1F401A3"
-		    type       	"boolean")
-		(object ClassAttribute "proxy"
-		    quid       	"3D18CE6D0151"
-		    type       	"boolean")
-		(object ClassAttribute "resourceURI"
-		    quid       	"3D18D4DF035C"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "BindingOperation"
-	    quid       	"3AD5D3CB0145"
-	    documentation 	"This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD6009202F7"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B84ADE401DC"
-		    supplier   	"Logical View::wsdl::IBindingOperation"
-		    quidu      	"3B84ADC00072"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3B89C4CB0199"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Service"
-	    quid       	"3AD5D8F002F8"
-	    documentation 	"This class represents a WSDL service element. A service groups a set of related ports together."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5FA20025E"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B85954E01B4"
-		    supplier   	"Logical View::wsdl::IService"
-		    quidu      	"3B84AB490287"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "qName"
-		    quid       	"3AEB48A40151"
-		    type       	"QName")
-		(object ClassAttribute "undefined"
-		    quid       	"3BDDF20D0203"
-		    type       	"boolean")
-		(object ClassAttribute "proxy"
-		    quid       	"3D18D4810220"
-		    type       	"boolean")
-		(object ClassAttribute "resourceURI"
-		    quid       	"3D18D4C501E2"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Port"
-	    quid       	"3AD5D9170286"
-	    documentation 	"This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD600CB00AA"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B85954502C9"
-		    supplier   	"Logical View::wsdl::IPort"
-		    quidu      	"3B84AB800326"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3AD5D9A00391"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "ExtensibilityElement"
-	    quid       	"3AD5DBB602A9"
-	    documentation 	"This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B84B14903D0"
-		    supplier   	"Logical View::wsdl::IExtensibilityElement"
-		    quidu      	"3B84B12402AB")
-		(object Inheritance_Relationship
-		    quid       	"3BDDF53502C3"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "required"
-		    quid       	"3AF9543C0073"
-		    type       	"boolean")
-		(object ClassAttribute "elementType"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE))
-		    quid       	"3B85B21A0271"
-		    type       	"QName"))
-	    language   	"Java")
-	(object Class "Definition"
-	    quid       	"3AD5E43F008E"
-	    documentation 	"This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5FDB803D4"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B84B1F80382"
-		    supplier   	"Logical View::wsdl::IDefinition"
-		    quidu      	"3B84B1D90142"))
-	    operations 	(list Operations
-		(object Operation "getDocument"
-		    quid       	"3CD14FC2012B"
-		    result     	"DOMDocument"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setDocument"
-		    quid       	"3CD150DE01E7"
-		    parameters 	(list Parameters
-			(object Parameter "document"
-			    type       	"DOMDocument"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "targetNamespace"
-		    quid       	"3AD5E474004E"
-		    type       	"String")
-		(object ClassAttribute "location"
-		    quid       	"40352B7C0396"
-		    type       	"String")
-		(object ClassAttribute "qName"
-		    quid       	"3AEB485702F5"
-		    type       	"QName")
-		(object ClassAttribute "encoding"
-		    quid       	"3CADD00D000D"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "Import"
-	    quid       	"3AD5E4F903DE"
-	    documentation 	"This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5EE58037A"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F6F200D0340"
-		    supplier   	"Logical View::wsdl::IImport"
-		    quidu      	"3B84B2020119"))
-	    operations 	(list Operations
-		(object Operation "getSchema"
-		    quid       	"3C8672C10379"
-		    result     	"XSDSchema"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setSchema"
-		    quid       	"3C8672C10397"
-		    parameters 	(list Parameters
-			(object Parameter "schema"
-			    type       	"XSDSchema"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "namespaceURI"
-		    quid       	"3AD5E50A0036"
-		    type       	"String")
-		(object ClassAttribute "locationURI"
-		    quid       	"3AD5E5140211"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "ExtensibleElement"
-	    quid       	"3AD5FCFA033A"
-	    documentation 	" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AD5FE3C03D4"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD"))
-	    operations 	(list Operations
-		(object Operation "getExtensibilityElements"
-		    quid       	"3B85C12C03CD"
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addExtensibilityElement"
-		    quid       	"3B85C1470295"
-		    parameters 	(list Parameters
-			(object Parameter "extElement"
-			    type       	"IExtensibilityElement"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    language   	"Java"
-	    abstract   	TRUE)
-	(object Class "Input"
-	    quid       	"3AE0789F0059"
-	    documentation 	"This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B85C504025F"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F67722802E7"
-		    supplier   	"Logical View::wsdl::MessageReference"
-		    quidu      	"3F6771DB02DC")
-		(object Inheritance_Relationship
-		    quid       	"3F6F1FEE031D"
-		    supplier   	"Logical View::wsdl::IInput"
-		    quidu      	"3B84A7EE0015"))
-	    language   	"Java")
-	(object Class "Output"
-	    quid       	"3AE078B60232"
-	    documentation 	"This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B85C50C035B"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F67723500DD"
-		    supplier   	"Logical View::wsdl::MessageReference"
-		    quidu      	"3F6771DB02DC")
-		(object Inheritance_Relationship
-		    quid       	"3F6F1FF801CD"
-		    supplier   	"Logical View::wsdl::IOutput"
-		    quidu      	"3B84A829027D"))
-	    language   	"Java")
-	(object Class "Fault"
-	    quid       	"3AE078BE0108"
-	    documentation 	"This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE1C82002F2"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD")
-		(object Inheritance_Relationship
-		    quid       	"3F67723D0319"
-		    supplier   	"Logical View::wsdl::MessageReference"
-		    quidu      	"3F6771DB02DC")
-		(object Inheritance_Relationship
-		    quid       	"3F6F2002002D"
-		    supplier   	"Logical View::wsdl::IFault"
-		    quidu      	"3B84A861031D"))
-	    language   	"Java")
-	(object Class "BindingInput"
-	    quid       	"3AE08A8202D4"
-	    documentation 	"This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B84AE1B0113"
-		    supplier   	"Logical View::wsdl::IBindingInput"
-		    quidu      	"3B84ADEB0100")
-		(object Inheritance_Relationship
-		    quid       	"3B85B59B0072"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"))
-	    operations 	(list Operations
-		(object Operation "getInput"
-		    quid       	"3C8653A40203"
-		    result     	"IInput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setInput"
-		    quid       	"3C8653B503A2"
-		    parameters 	(list Parameters
-			(object Parameter "input"
-			    type       	"IInput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3B85C1EA020E"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "BindingOutput"
-	    quid       	"3AE08A8F028C"
-	    documentation 	"This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B84AE4302AB"
-		    supplier   	"Logical View::wsdl::IBindingOutput"
-		    quidu      	"3B84AE210111")
-		(object Inheritance_Relationship
-		    quid       	"3B85B5A4027E"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"))
-	    operations 	(list Operations
-		(object Operation "getOutput"
-		    quid       	"3C8653D900F1"
-		    result     	"IOutput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setOutput"
-		    quid       	"3C8653F10326"
-		    parameters 	(list Parameters
-			(object Parameter "output"
-			    type       	"IOutput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3B85C20200BE"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "BindingFault"
-	    quid       	"3AE08A9E03A6"
-	    documentation 	"This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3AE0938602C9"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3B84AE710333"
-		    supplier   	"Logical View::wsdl::IBindingFault"
-		    quidu      	"3B84AE4F00BD"))
-	    operations 	(list Operations
-		(object Operation "getFault"
-		    quid       	"3C865413037F"
-		    result     	"IFault"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setFault"
-		    quid       	"3C8654210109"
-		    parameters 	(list Parameters
-			(object Parameter "fault"
-			    type       	"IFault"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3B85BF9E014A"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "QName"
-	    quid       	"3AE8ED220140"
-	    documentation 	"This class represents the javax.wsdl.QName class. A QName is a fully qualified name."
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.xml.namespace.QName"
-		    quid       	"3B849DA9003D"
-		    stereotype 	"javaclass"))
-	    language   	"Java")
-	(object Class "Namespace"
-	    quid       	"3AEA3CD30030"
-	    documentation 	"This class represents a namespace and the corresponding namespace prefix used in a WSDL document."
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "URI"
-		    quid       	"3AEA3D2901B1"
-		    type       	"String")
-		(object ClassAttribute "prefix"
-		    quid       	"3AEA3D320236"
-		    type       	"String"))
-	    language   	"Java")
-	(object Class "OperationType"
-	    quid       	"3AEB4782024F"
-	    documentation 	
-|ONE_WAY=1
-|REQUEST_RESPONSE=2
-|SOLICIT_RESPONSE=3
-|NOTIFICATION=4
-	    
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.OperationType"
-		    quid       	"3B85C35303E3"
-		    stereotype 	"javaclass"))
-	    language   	"Java")
-	(object Class "IPortType"
-	    quid       	"3B84A5BE0331"
-	    documentation 	"This class represents the javax.wsdl.PortType non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addOperation"
-		    quid       	"3B896AC101CA"
-		    parameters 	(list Parameters
-			(object Parameter "operation"
-			    type       	"IOperation"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getOperation"
-		    quid       	"3B896BAF01A4"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String")
-			(object Parameter "inputName"
-			    type       	"String")
-			(object Parameter "outputName"
-			    type       	"String"))
-		    result     	"IOperation"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getOperations"
-		    quid       	"3B896BF7031A"
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.PortType"
-		    quid       	"3B84A632000D"
-		    stereotype 	"javaclass")))
-	(object Class "IOperation"
-	    quid       	"3B84A77600D1"
-	    documentation 	"This class represents the javax.wsdl.Operation non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addFault"
-		    quid       	"3B896C420065"
-		    parameters 	(list Parameters
-			(object Parameter "fault"
-			    type       	"IFault"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getFault"
-		    quid       	"3B896C59028F"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String"))
-		    result     	"IFault"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getFaults"
-		    quid       	"3B896C7102B1"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getParameterOrdering"
-		    quid       	"3B896C8101B0"
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setParameterOrdering"
-		    quid       	"3B896C99031D"
-		    parameters 	(list Parameters
-			(object Parameter "parameterOrder"
-			    type       	"IList"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getInput"
-		    quid       	"3C8654E5018D"
-		    result     	"IInput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setInput"
-		    quid       	"3C8662C40107"
-		    parameters 	(list Parameters
-			(object Parameter "input"
-			    type       	"IInput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getOutput"
-		    quid       	"3C8662E40094"
-		    result     	"IOutput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setOutput"
-		    quid       	"3C8662F001D2"
-		    parameters 	(list Parameters
-			(object Parameter "output"
-			    type       	"IOutput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Operation"
-		    quid       	"3B84A799012B"
-		    stereotype 	"javaclass")))
-	(object Class "IInput"
-	    quid       	"3B84A7EE0015"
-	    documentation 	"This class represents the javax.wsdl.Input non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "getMessage"
-		    quid       	"3C86633100EF"
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setMessage"
-		    quid       	"3C8663470277"
-		    parameters 	(list Parameters
-			(object Parameter "message"
-			    type       	"IMessage"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Input"
-		    quid       	"3B84A8000039"
-		    stereotype 	"javaclass")))
-	(object Class "IOutput"
-	    quid       	"3B84A829027D"
-	    documentation 	"This class represents the javax.wsdl.Output non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "getMessage"
-		    quid       	"3C86643A035D"
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setMessage"
-		    quid       	"3C86644501C8"
-		    parameters 	(list Parameters
-			(object Parameter "message"
-			    type       	"IMessage"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Output"
-		    quid       	"3B84A83901D5"
-		    stereotype 	"javaclass")))
-	(object Class "IFault"
-	    quid       	"3B84A861031D"
-	    documentation 	"This class represents the javax.wsdl.Fault non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "getMessage"
-		    quid       	"3C86646A00BD"
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setMessage"
-		    quid       	"3C8664750131"
-		    parameters 	(list Parameters
-			(object Parameter "message"
-			    type       	"IMessage"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Fault"
-		    quid       	"3B84A8710208"
-		    stereotype 	"javaclass")))
-	(object Class "IMessage"
-	    quid       	"3B84A8AF004F"
-	    documentation 	"This class represents the javax.wsdl.Message non-MOF interface"
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addPart"
-		    quid       	"3B8972240273"
-		    parameters 	(list Parameters
-			(object Parameter "part"
-			    type       	"IPart"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPart"
-		    quid       	"3B89723D0233"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String"))
-		    result     	"IPart"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getParts"
-		    quid       	"3B897254025E"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getOrderedParts"
-		    quid       	"3B897261020D"
-		    parameters 	(list Parameters
-			(object Parameter "partOrder"
-			    type       	"IList"))
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Message"
-		    quid       	"3B84A8BC0260"
-		    stereotype 	"javaclass")))
-	(object Class "IPart"
-	    quid       	"3B84A93F01BE"
-	    documentation 	"This class represents the javax.wsdl.Part non-MOF interface"
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "setExtensionAttribute"
-		    quid       	"3C4688450052"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName")
-			(object Parameter "value"
-			    type       	"QName"))
-		    exceptions 	"WSDLException"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getExtensionAttributeNames"
-		    quid       	"3C468A0101C3"
-		    result     	"IIterator"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getExtensionAttribute"
-		    quid       	"3C468A2D02D5"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"QName"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Part"
-		    quid       	"3B84A9500231"
-		    stereotype 	"javaclass")))
-	(object Class "IService"
-	    quid       	"3B84AB490287"
-	    documentation 	"This class represents the javax.wsdl.Service non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addPort"
-		    quid       	"3B895D5601D1"
-		    parameters 	(list Parameters
-			(object Parameter "port"
-			    type       	"IPort"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPorts"
-		    quid       	"3B895DA20036"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPort"
-		    quid       	"3B895DB001BC"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String"))
-		    result     	"IPort"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Service"
-		    quid       	"3B84AB5B003E"
-		    stereotype 	"javaclass")))
-	(object Class "IPort"
-	    quid       	"3B84AB800326"
-	    documentation 	"This class represents the javax.wsdl.Port non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "getBinding"
-		    quid       	"3C8651F302B5"
-		    result     	"IBinding"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setBinding"
-		    quid       	"3C86526302F2"
-		    parameters 	(list Parameters
-			(object Parameter "binding"
-			    type       	"IBinding"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Port"
-		    quid       	"3B84AB8C0016"
-		    stereotype 	"javaclass")))
-	(object Class "IBinding"
-	    quid       	"3B84ABC60219"
-	    documentation 	"This class represents the javax.wsdl.Binding non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addBindingOperation"
-		    quid       	"3B895F160153"
-		    parameters 	(list Parameters
-			(object Parameter "bindingOperation"
-			    type       	"IBindingOperation"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingOperation"
-		    quid       	"3B895F500066"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String")
-			(object Parameter "inputName"
-			    type       	"String")
-			(object Parameter "outputName"
-			    type       	"String"))
-		    result     	"IBindingOperation"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingOperations"
-		    quid       	"3B895FA401C5"
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPortType"
-		    quid       	"3C8652A90284"
-		    result     	"IPortType"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setPortType"
-		    quid       	"3C8652BE01A8"
-		    parameters 	(list Parameters
-			(object Parameter "portType"
-			    type       	"IPortType"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Binding"
-		    quid       	"3B84ABCF0302"
-		    stereotype 	"javaclass")))
-	(object Class "IBindingOperation"
-	    quid       	"3B84ADC00072"
-	    documentation 	"This class represents the javax.wsdl.BindingOperation non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addBindingFault"
-		    quid       	"3B8960BC0041"
-		    parameters 	(list Parameters
-			(object Parameter "bindingFault"
-			    type       	"IBindingFault"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingFault"
-		    quid       	"3B8960D9009D"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"String"))
-		    result     	"IBindingFault"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingFaults"
-		    quid       	"3B8960FC0061"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getOperation"
-		    quid       	"3C86532D0017"
-		    result     	"IOperation"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setOperation"
-		    quid       	"3C86533F037B"
-		    parameters 	(list Parameters
-			(object Parameter "operation"
-			    type       	"IOperation"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingInput"
-		    quid       	"3C86550900DA"
-		    result     	"IBindingInput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setBindingInput"
-		    quid       	"3C86551D007F"
-		    parameters 	(list Parameters
-			(object Parameter "bindingInput"
-			    type       	"IBindingInput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindingOutput"
-		    quid       	"3C8655340349"
-		    result     	"IBindingOutput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setBindingOutput"
-		    quid       	"3C86554702A6"
-		    parameters 	(list Parameters
-			(object Parameter "bindingOutput"
-			    type       	"IBindingOutput"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.BindingOperation"
-		    quid       	"3B84ADCB021C"
-		    stereotype 	"javaclass")))
-	(object Class "IBindingInput"
-	    quid       	"3B84ADEB0100"
-	    documentation 	"This class represents the javax.wsdl.BindingInput non-MOF interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.BindingInput"
-		    quid       	"3B84ADFE000D"
-		    stereotype 	"javaclass")))
-	(object Class "IBindingOutput"
-	    quid       	"3B84AE210111"
-	    documentation 	"This class represents the javax.wsdl.BindingOutput non-MOF interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.BindingOutput"
-		    quid       	"3B84AE2D0050"
-		    stereotype 	"javaclass")))
-	(object Class "IBindingFault"
-	    quid       	"3B84AE4F00BD"
-	    documentation 	"This class represents the javax.wsdl.BindingFault non-MOF interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.BindingFault"
-		    quid       	"3B84AE5F002A"
-		    stereotype 	"javaclass")))
-	(object Class "DOMElement"
-	    quid       	"3B84AF3203DB"
-	    documentation 	"This class represents the org.w3c.dom.Element non-MOF interface."
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "org.w3c.dom.Element"
-		    quid       	"3B84AF560292"
-		    stereotype 	"javaclass")))
-	(object Class "IExtensibilityElement"
-	    quid       	"3B84B12402AB"
-	    documentation 	"This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.extensions.ExtensibilityElement"
-		    quid       	"3B84B13503D1"
-		    stereotype 	"javaclass")))
-	(object Class "IDefinition"
-	    quid       	"3B84B1D90142"
-	    documentation 	"This class represents the javax.wsdl.Definition non-MOF interface."
-	    stereotype 	"Interface"
-	    operations 	(list Operations
-		(object Operation "addBinding"
-		    quid       	"3B8988F1039D"
-		    parameters 	(list Parameters
-			(object Parameter "binding"
-			    type       	"IBinding"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addImport"
-		    quid       	"3B8989490259"
-		    parameters 	(list Parameters
-			(object Parameter "importDef"
-			    type       	"IImport"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addMessage"
-		    quid       	"3B89896E005E"
-		    parameters 	(list Parameters
-			(object Parameter "message"
-			    type       	"IMessage"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addNamespace"
-		    quid       	"3B898984004B"
-		    parameters 	(list Parameters
-			(object Parameter "prefix"
-			    type       	"String")
-			(object Parameter "namespaceURI"
-			    type       	"String"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addPortType"
-		    quid       	"3B8989C50045"
-		    parameters 	(list Parameters
-			(object Parameter "portType"
-			    type       	"IPortType"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "addService"
-		    quid       	"3B8989E401EE"
-		    parameters 	(list Parameters
-			(object Parameter "service"
-			    type       	"IService"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createBindingFault"
-		    quid       	"3B898A17038C"
-		    result     	"IBindingFault"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createBindingInput"
-		    quid       	"3B898A320286"
-		    result     	"IBindingInput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createBindingOutput"
-		    quid       	"3B898A46013B"
-		    result     	"IBindingOutput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createBindingOperation"
-		    quid       	"3B898A5C00B0"
-		    result     	"IBindingOperation"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createBinding"
-		    quid       	"3B8989FE037C"
-		    result     	"IBinding"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createFault"
-		    quid       	"3B898A7502E7"
-		    result     	"IFault"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createImport"
-		    quid       	"3B898A83014C"
-		    result     	"IImport"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createInput"
-		    quid       	"3B898A9D033E"
-		    result     	"IInput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createMessage"
-		    quid       	"3B898AAF0254"
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createOperation"
-		    quid       	"3B898AC203C4"
-		    result     	"IOperation"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createOutput"
-		    quid       	"3B898AE800ED"
-		    result     	"IOutput"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createPart"
-		    quid       	"3B898AF8026D"
-		    result     	"IPart"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createPort"
-		    quid       	"3B898B0801DA"
-		    result     	"IPort"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createPortType"
-		    quid       	"3B898B15039B"
-		    result     	"IPortType"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createService"
-		    quid       	"3B898B32013A"
-		    result     	"IService"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBinding"
-		    quid       	"3B898B420075"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IBinding"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getBindings"
-		    quid       	"3B898B920341"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getImports"
-		    quid       	"3B898BCD0060"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getImports"
-		    quid       	"3B898BE70144"
-		    parameters 	(list Parameters
-			(object Parameter "namespaceURI"
-			    type       	"String"))
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getMessage"
-		    quid       	"3B898C170107"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getMessages"
-		    quid       	"3B898C3E001D"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getNamespace"
-		    quid       	"3B898C62014B"
-		    parameters 	(list Parameters
-			(object Parameter "prefix"
-			    type       	"String"))
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getNamespaces"
-		    quid       	"3B898C740115"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPortType"
-		    quid       	"3B898CBE0071"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IPortType"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPortTypes"
-		    quid       	"3B898CDA01C6"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getPrefix"
-		    quid       	"3B898CFD0017"
-		    parameters 	(list Parameters
-			(object Parameter "namespaceURI"
-			    type       	"String"))
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getService"
-		    quid       	"3B898D2300A8"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IService"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getServices"
-		    quid       	"3B898D3B03CE"
-		    result     	"IMap"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getExtensionRegistry"
-		    quid       	"3B89D5B8012B"
-		    result     	"IExtensionRegistry"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setExtensionRegistry"
-		    quid       	"3B89D5D703BB"
-		    parameters 	(list Parameters
-			(object Parameter "extensionRegistry"
-			    type       	"IExtensionRegistry"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getDocumentBaseURI"
-		    quid       	"3B89D5FE0208"
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setDocumentBaseURI"
-		    quid       	"3B89D6180328"
-		    parameters 	(list Parameters
-			(object Parameter "documentBase"
-			    type       	"String"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "createTypes"
-		    quid       	"3CADD0560080"
-		    result     	"ITypes"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "removeService"
-		    quid       	"3CADD07E004C"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IService"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "removeBinding"
-		    quid       	"3CADD0BA0355"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IBinding"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "removePortType"
-		    quid       	"3CADD0D8029A"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IPortType"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "removeMessage"
-		    quid       	"3CADD0FA0307"
-		    parameters 	(list Parameters
-			(object Parameter "name"
-			    type       	"QName"))
-		    result     	"IMessage"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getTypes"
-		    quid       	"3C86706F031B"
-		    result     	"ITypes"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "setTypes"
-		    quid       	"3C86709500EE"
-		    parameters 	(list Parameters
-			(object Parameter "types"
-			    type       	"ITypes"))
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Definition"
-		    quid       	"3B84B1E702A1"
-		    stereotype 	"javaclass")))
-	(object Class "IImport"
-	    quid       	"3B84B2020119"
-	    documentation 	"This class represents the javax.wsdl.Import non-MOF interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Import"
-		    quid       	"3B84B20C02EA"
-		    stereotype 	"javaclass")))
-	(object Class "IList"
-	    quid       	"3B85C0A203C5"
-	    documentation 	"This class represents the non-MOF java.util.List interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.util.List"
-		    quid       	"3B85C0AF0297"
-		    stereotype 	"javaclass")))
-	(object Class "IMap"
-	    quid       	"3B896B0300D4"
-	    documentation 	"This class represents the non-MOF java.util.Map interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.util.Map"
-		    quid       	"3B896B1102B5"
-		    stereotype 	"javaclass")))
-	(object Class "IURL"
-	    quid       	"3B89D5630274"
-	    documentation 	"This class represents the non-MOF java.net.URL interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.net.URL"
-		    quid       	"3B89D56E03E2"
-		    stereotype 	"javaclass")))
-	(object Class "IExtensionRegistry"
-	    quid       	"3B89D59302A5"
-	    documentation 	"This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.extensions.ExtensionRegistry"
-		    quid       	"3B89D59F02E8"
-		    stereotype 	"javaclass")))
-	(object Class "Types"
-	    quid       	"3B8BE9A603A8"
-	    documentation 	"This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3B8BEB010311"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(object Inheritance_Relationship
-		    quid       	"3CADCD3B0380"
-		    supplier   	"Logical View::wsdl::ITypes"
-		    quidu      	"3CADCBB20050"))
-	    operations 	(list Operations
-		(object Operation "getSchemas"
-		    quid       	"3CADCF3803E6"
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)
-		(object Operation "getSchemas"
-		    quid       	"3CADCF7E0301"
-		    parameters 	(list Parameters
-			(object Parameter "namespaceURI"
-			    type       	"String"))
-		    result     	"IList"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0)))
-	(object Class "IIterator"
-	    quid       	"3C4687DA0167"
-	    documentation 	"This class represents the non-MOF java.util.Iterator interface."
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "java.util.Iterator"
-		    quid       	"3C46880800B9"
-		    stereotype 	"javaclass")))
-	(object Class "WSDLException"
-	    quid       	"3C4689650313"
-	    documentation 	"This class represents the javax.wsdl.Exception class."
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.WSDLException"
-		    quid       	"3C4689740315"
-		    stereotype 	"javaclass")))
-	(object Class "ITypes"
-	    quid       	"3CADCBB20050"
-	    documentation 	"This class represents the javax.wsdl.Types non-MOF interface"
-	    stereotype 	"Interface"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "javax.wsdl.Types"
-		    quid       	"3CADCBF10173"
-		    stereotype 	"javaclass")))
-	(object Class "UnknownExtensibilityElement"
-	    quid       	"3CB24AC002AE"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3CB24AEC01CB"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9")))
-	(object Class "XSDSchemaExtensibilityElement"
-	    quid       	"3CC360D7039C"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3CC3627F00B7"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9")))
-	(object Class "DOMDocument"
-	    quid       	"3CD1502C023B"
-	    documentation 	"This class represents the org.w3c.dom.Document non-MOF interface."
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "org.w3c.dom.Document"
-		    quid       	"3CD150600182"
-		    stereotype 	"javaclass")))
-	(object Class "MessageReference"
-	    quid       	"3F6771DB02DC"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F762A6A0308"
-		    supplier   	"Logical View::wsdl::WSDLElement"
-		    quidu      	"3AD5C6A302DD"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3F6780A001AB"
-		    type       	"String"
-		    exportControl 	"Protected"))
-	    language   	"Java"
-	    abstract   	TRUE)
-	(object Association "$UNNAMED$0"
-	    quid       	"3AD5C824018C"
-	    roles      	(list role_list
-		(object Role "portType"
-		    quid       	"3AD5C82701C3"
-		    label      	"portType"
-		    supplier   	"Logical View::wsdl::PortType"
-		    quidu      	"3AD5C7F001A5"
-		    client_cardinality 	(value cardinality "1..1")
-		    Containment 	"By Value"
-		    is_aggregate 	TRUE)
-		(object Role "eOperations"
-		    quid       	"3AD5C82701CD"
-		    label      	"eOperations"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$1"
-	    quid       	"3AD5CEBE00E2"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$2"
-		    quid       	"3AD5CEBF0057"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eParts"
-		    quid       	"3AD5CEBF0061"
-		    label      	"eParts"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$3"
-	    quid       	"3AD5D352010F"
-	    roles      	(list role_list
-		(object Role "ePortType"
-		    quid       	"3AD5D3540176"
-		    label      	"ePortType"
-		    supplier   	"Logical View::wsdl::PortType"
-		    quidu      	"3AD5C7F001A5"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$4"
-		    quid       	"3AD5D3540180"
-		    supplier   	"Logical View::wsdl::Binding"
-		    quidu      	"3AD5D2860261")))
-	(object Association "$UNNAMED$5"
-	    quid       	"3AD5D3E10179"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$6"
-		    quid       	"3AD5D3E20225"
-		    supplier   	"Logical View::wsdl::Binding"
-		    quidu      	"3AD5D2860261"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eBindingOperations"
-		    quid       	"3AD5D3E20239"
-		    label      	"eBindingOperations"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$7"
-	    quid       	"3AD5D425038A"
-	    roles      	(list role_list
-		(object Role "eOperation"
-		    quid       	"3AD5D42602F5"
-		    label      	"eOperation"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$8"
-		    quid       	"3AD5D42602FF"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145")))
-	(object Association "$UNNAMED$9"
-	    quid       	"3AD5D9400393"
-	    roles      	(list role_list
-		(object Role "ePorts"
-		    quid       	"3AD5D941031C"
-		    label      	"ePorts"
-		    supplier   	"Logical View::wsdl::Port"
-		    quidu      	"3AD5D9170286"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$10"
-		    quid       	"3AD5D941031D"
-		    supplier   	"Logical View::wsdl::Service"
-		    quidu      	"3AD5D8F002F8"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$11"
-	    quid       	"3AD5D9B8011F"
-	    roles      	(list role_list
-		(object Role "eBinding"
-		    quid       	"3AD5D9B9024D"
-		    label      	"eBinding"
-		    supplier   	"Logical View::wsdl::Binding"
-		    quidu      	"3AD5D2860261"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$12"
-		    quid       	"3AD5D9B90261"
-		    supplier   	"Logical View::wsdl::Port"
-		    quidu      	"3AD5D9170286")))
-	(object Association "$UNNAMED$13"
-	    quid       	"3AD5E60301E2"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$14"
-		    quid       	"3AD5E60400B7"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eMessages"
-		    quid       	"3AD5E60400C1"
-		    label      	"eMessages"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$15"
-	    quid       	"3AD5E6710104"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$16"
-		    quid       	"3AD5E672034A"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "ePortTypes"
-		    quid       	"3AD5E6720354"
-		    label      	"ePortTypes"
-		    supplier   	"Logical View::wsdl::PortType"
-		    quidu      	"3AD5C7F001A5"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$17"
-	    quid       	"3AD5E6770095"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$18"
-		    quid       	"3AD5E6780371"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eBindings"
-		    quid       	"3AD5E678037B"
-		    label      	"eBindings"
-		    supplier   	"Logical View::wsdl::Binding"
-		    quidu      	"3AD5D2860261"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$19"
-	    quid       	"3AD5E67B0311"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$20"
-		    quid       	"3AD5E67D007F"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eServices"
-		    quid       	"3AD5E67D0089"
-		    label      	"eServices"
-		    supplier   	"Logical View::wsdl::Service"
-		    quidu      	"3AD5D8F002F8"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$21"
-	    quid       	"3AD5FD130079"
-	    roles      	(list role_list
-		(object Role "eExtensibilityElements"
-		    quid       	"3AD5FD14019D"
-		    label      	"eExtensibilityElements"
-		    supplier   	"Logical View::wsdl::ExtensibilityElement"
-		    quidu      	"3AD5DBB602A9"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$22"
-		    quid       	"3AD5FD14019E"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$23"
-	    quid       	"3ADF2E6401F5"
-	    roles      	(list role_list
-		(object Role "eBindingInput"
-		    quid       	"3ADF2E650251"
-		    label      	"eBindingInput"
-		    supplier   	"Logical View::wsdl::BindingInput"
-		    quidu      	"3AE08A8202D4"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$24"
-		    quid       	"3ADF2E650252"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$25"
-	    quid       	"3ADF2EB30163"
-	    roles      	(list role_list
-		(object Role "eBindingOutput"
-		    quid       	"3ADF2EB4013C"
-		    label      	"eBindingOutput"
-		    supplier   	"Logical View::wsdl::BindingOutput"
-		    quidu      	"3AE08A8F028C"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$26"
-		    quid       	"3ADF2EB4013D"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$27"
-	    quid       	"3ADF2F94024D"
-	    roles      	(list role_list
-		(object Role "eInput"
-		    quid       	"3ADF2F950190"
-		    label      	"eInput"
-		    supplier   	"Logical View::wsdl::Input"
-		    quidu      	"3AE0789F0059"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$28"
-		    quid       	"3ADF2F95019A"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$29"
-	    quid       	"3ADF2FB802F9"
-	    roles      	(list role_list
-		(object Role "eOutput"
-		    quid       	"3ADF2FB9020A"
-		    label      	"eOutput"
-		    supplier   	"Logical View::wsdl::Output"
-		    quidu      	"3AE078B60232"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$30"
-		    quid       	"3ADF2FB9020B"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$31"
-	    quid       	"3ADF331601A4"
-	    roles      	(list role_list
-		(object Role "eFaults"
-		    quid       	"3ADF33180387"
-		    label      	"eFaults"
-		    supplier   	"Logical View::wsdl::Fault"
-		    quidu      	"3AE078BE0108"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$32"
-		    quid       	"3ADF33180388"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$33"
-	    quid       	"3ADF340003E5"
-	    roles      	(list role_list
-		(object Role "eBindingFaults"
-		    quid       	"3ADF340103AA"
-		    label      	"eBindingFaults"
-		    supplier   	"Logical View::wsdl::BindingFault"
-		    quidu      	"3AE08A9E03A6"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$34"
-		    quid       	"3ADF340103AB"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$35"
-	    quid       	"3AE091F402F3"
-	    roles      	(list role_list
-		(object Role "eFault"
-		    quid       	"3AE091F801FE"
-		    label      	"eFault"
-		    supplier   	"Logical View::wsdl::Fault"
-		    quidu      	"3AE078BE0108"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$36"
-		    quid       	"3AE091F801FF"
-		    supplier   	"Logical View::wsdl::BindingFault"
-		    quidu      	"3AE08A9E03A6")))
-	(object Association "$UNNAMED$37"
-	    quid       	"3AEA3D55002D"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$38"
-		    quid       	"3AEA3D560328"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eNamespaces"
-		    quid       	"3AEA3D560332"
-		    label      	"eNamespaces"
-		    supplier   	"Logical View::wsdl::Namespace"
-		    quidu      	"3AEA3CD30030"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$39"
-	    quid       	"3AEA3E3A002D"
-	    roles      	(list role_list
-		(object Role "eDefinition"
-		    quid       	"3AEA3E3C01E8"
-		    label      	"eDefinition"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$40"
-		    quid       	"3AEA3E3C01F2"
-		    supplier   	"Logical View::wsdl::Import"
-		    quidu      	"3AD5E4F903DE")))
-	(object Association "$UNNAMED$41"
-	    quid       	"3AEA412F0035"
-	    roles      	(list role_list
-		(object Role "eParameterOrdering"
-		    quid       	"3AEA41310255"
-		    label      	"eParameterOrdering"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$42"
-		    quid       	"3AEA4131025F"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE")))
-	(object Association "$UNNAMED$43"
-	    quid       	"3B84AD2400BD"
-	    roles      	(list role_list
-		(object Role "eInput"
-		    quid       	"3B84AD250083"
-		    label      	"eInput"
-		    supplier   	"Logical View::wsdl::Input"
-		    quidu      	"3AE0789F0059"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$44"
-		    quid       	"3B84AD250084"
-		    supplier   	"Logical View::wsdl::BindingInput"
-		    quidu      	"3AE08A8202D4")))
-	(object Association "$UNNAMED$45"
-	    quid       	"3B84AD7900F2"
-	    roles      	(list role_list
-		(object Role "eOutput"
-		    quid       	"3B84AD7A014D"
-		    label      	"eOutput"
-		    supplier   	"Logical View::wsdl::Output"
-		    quidu      	"3AE078B60232"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$46"
-		    quid       	"3B84AD7A014E"
-		    supplier   	"Logical View::wsdl::BindingOutput"
-		    quidu      	"3AE08A8F028C")))
-	(object Association "$UNNAMED$47"
-	    quid       	"3B8B1BE900C4"
-	    roles      	(list role_list
-		(object Role "typeDefinition"
-		    quid       	"3B8B1BE90327"
-		    label      	"typeDefinition"
-		    supplier   	"Logical View::xsd::XSDTypeDefinition"
-		    quidu      	"3B66ECD302A9"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$48"
-		    quid       	"3B8B1BE90331"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E")))
-	(object Association "$UNNAMED$49"
-	    quid       	"3B8B1C1203B2"
-	    roles      	(list role_list
-		(object Role "elementDeclaration"
-		    quid       	"3B8B1C14001C"
-		    label      	"elementDeclaration"
-		    supplier   	"Logical View::xsd::XSDElementDeclaration"
-		    quidu      	"3B66ED580214"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$50"
-		    quid       	"3B8B1C140026"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E")))
-	(object Association "$UNNAMED$51"
-	    quid       	"3B8B1DCC02E5"
-	    roles      	(list role_list
-		(object Role "eSchema"
-		    quid       	"3B8B1DCE0270"
-		    label      	"eSchema"
-		    supplier   	"Logical View::xsd::XSDSchema"
-		    quidu      	"374B182500BB"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$52"
-		    quid       	"3B8B1DCE027A"
-		    supplier   	"Logical View::wsdl::Import"
-		    quidu      	"3AD5E4F903DE")))
-	(object Association "$UNNAMED$53"
-	    quid       	"3B8BEA27029F"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$54"
-		    quid       	"3B8BEA290356"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "eTypes"
-		    quid       	"3B8BEA29036A"
-		    label      	"eTypes"
-		    supplier   	"Logical View::wsdl::Types"
-		    quidu      	"3B8BE9A603A8"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$55"
-	    quid       	"3C46829303E5"
-	    roles      	(list role_list
-		(object Role "eMessage"
-		    quid       	"3C468296010E"
-		    label      	"eMessage"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$56"
-		    quid       	"3C4682960118"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E")))
-	(object Association "$UNNAMED$57"
-	    quid       	"3C864DFF02EC"
-	    roles      	(list role_list
-		(object Role "eImports"
-		    quid       	"3C864DFF02ED"
-		    label      	"eImports"
-		    supplier   	"Logical View::wsdl::Import"
-		    quidu      	"3AD5E4F903DE"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"ordered"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$58"
-		    quid       	"3C864DFF02EE"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$59"
-	    quid       	"3CC3614500F2"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$60"
-		    quid       	"3CC36146023D"
-		    supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-		    quidu      	"3CC360D7039C"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "schema"
-		    quid       	"3CC36146023E"
-		    label      	"schema"
-		    supplier   	"Logical View::xsd::XSDSchema"
-		    quidu      	"374B182500BB"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$61"
-	    quid       	"3F74E78401B1"
-	    roles      	(list role_list
-		(object Role "eMessage"
-		    quid       	"3F74E786000F"
-		    label      	"eMessage"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$62"
-		    quid       	"3F74E7860023"
-		    supplier   	"Logical View::wsdl::MessageReference"
-		    quidu      	"3F6771DB02DC")))
-	(object Association "$UNNAMED$63"
-	    quid       	"3F7896A2026E"
-	    roles      	(list role_list
-		(object Role "parent"
-		    quid       	"3F7896A7012B"
-		    label      	"parent"
-		    supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-		    quidu      	"3CB24AC002AE"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "children"
-		    quid       	"3F7896A7012C"
-		    label      	"children"
-		    supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-		    quidu      	"3CB24AC002AE"
-		    client_cardinality 	(value cardinality "0..n")
-		    is_navigable 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "2.7 Services"
-	    quid       	"39AD3EF60127"
-	    title      	"2.7 Services"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IBinding" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1424, 800)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(1173, 660)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	502
-			justify    	0
-			label      	"IBinding")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@1
-			location   	(1173, 610)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	502
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84ABC60219"
-		    width      	520
-		    height     	404
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IPort" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(816, 528)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(686, 481)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"IPort")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@2
-			location   	(686, 431)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84AB800326"
-		    width      	278
-		    height     	218
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IService" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(240, 160)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(126, 90)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	228
-			justify    	0
-			label      	"IService")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@3
-			location   	(126, 40)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	228
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84AB490287"
-		    width      	246
-		    height     	264
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Service" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(240, 528)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(44, 389)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	392
-			justify    	0
-			label      	"Service")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D8F002F8"
-		    width      	410
-		    height     	302
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @5
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B85954E01B4"
-		    client     	@4
-		    supplier   	@3
-		    line_style 	3
-		    origin_attachment 	(240, 377)
-		    terminal_attachment 	(240, 292))
-		(object ClassView "Class" "Logical View::wsdl::Binding" @6
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1440, 1264)
-		    label      	(object ItemLabel
-			Parent_View 	@6
-			location   	(1244, 1125)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	392
-			justify    	0
-			label      	"Binding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D2860261"
-		    width      	410
-		    height     	302
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @7
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8595410129"
-		    client     	@6
-		    supplier   	@1
-		    line_style 	3
-		    origin_attachment 	(1430, 1113)
-		    terminal_attachment 	(1430, 1002))
-		(object ClassView "Class" "Logical View::wsdl::Port" @8
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(816, 912)
-		    label      	(object ItemLabel
-			Parent_View 	@8
-			location   	(675, 840)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	282
-			justify    	0
-			label      	"Port")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D9170286"
-		    width      	300
-		    height     	168
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @9
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B85954502C9"
-		    client     	@8
-		    supplier   	@2
-		    line_style 	3
-		    origin_attachment 	(809, 828)
-		    terminal_attachment 	(809, 637))
-		(object AssociationViewNew "$UNNAMED$9" @10
-		    location   	(343, 916)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D9400393"
-		    roleview_list 	(list RoleViews
-			(object RoleView "ePorts" @11
-			    Parent_View 	@10
-			    location   	(-121, 644)
-			    label      	(object SegLabel @12
-				Parent_View 	@11
-				location   	(413, 945)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	"+ePorts"
-				pctDist    	0.218978
-				height     	29
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D941031C"
-			    client     	@10
-			    supplier   	@8
-			    line_style 	3
-			    origin_attachment 	(343, 916)
-			    terminal_attachment 	(666, 916)
-			    label      	(object SegLabel @13
-				Parent_View 	@11
-				location   	(539, 880)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	160
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.608000
-				height     	37
-				orientation 	0)
-			    label      	(object SegLabel @14
-				Parent_View 	@11
-				location   	(448, 990)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	146
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.328467
-				height     	74
-				orientation 	1))
-			(object RoleView "$UNNAMED$10" @15
-			    Parent_View 	@10
-			    location   	(-121, 644)
-			    label      	(object SegLabel @16
-				Parent_View 	@15
-				location   	(216, 744)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D941031D"
-			    client     	@10
-			    supplier   	@4
-			    vertices   	(list Points
-				(343, 916)
-				(257, 916)
-				(257, 679))
-			    line_style 	3
-			    origin_attachment 	(343, 916)
-			    terminal_attachment 	(257, 679)
-			    label      	(object SegLabel @17
-				Parent_View 	@15
-				location   	(301, 796)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.637097
-				height     	44
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$11" @18
-		    location   	(886, 1270)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D9B8011F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eBinding" @19
-			    Parent_View 	@18
-			    location   	(38, 422)
-			    label      	(object SegLabel @20
-				Parent_View 	@19
-				location   	(1112, 1235)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	180
-				justify    	0
-				label      	"+eBinding"
-				pctDist    	0.648571
-				height     	36
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D9B9024D"
-			    client     	@18
-			    supplier   	@6
-			    line_style 	3
-			    origin_attachment 	(886, 1270)
-			    terminal_attachment 	(1235, 1270)
-			    label      	(object SegLabel @21
-				Parent_View 	@19
-				location   	(1170, 1313)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.814286
-				height     	43
-				orientation 	1))
-			(object RoleView "$UNNAMED$12" @22
-			    Parent_View 	@18
-			    location   	(38, 422)
-			    label      	(object SegLabel @23
-				Parent_View 	@22
-				location   	(852, 1106)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	156
-				justify    	0
-				label      	""
-				pctDist    	0.687943
-				height     	40
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D9B90261"
-			    client     	@18
-			    supplier   	@8
-			    vertices   	(list Points
-				(886, 1270)
-				(812, 1270)
-				(812, 996))
-			    line_style 	3
-			    origin_attachment 	(886, 1270)
-			    terminal_attachment 	(812, 996))))))
-	(object ClassDiagram "2.5 Bindings"
-	    quid       	"39AD51270252"
-	    title      	"2.5 Bindings"
-	    zoom       	85
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IBinding" @24
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 240)
-		    label      	(object ItemLabel
-			Parent_View 	@24
-			location   	(73, 114)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	462
-			justify    	0
-			label      	"IBinding")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@24
-			location   	(73, 64)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	462
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84ABC60219"
-		    width      	480
-		    height     	376
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IBindingOperation" @25
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(976, 352)
-		    label      	(object ItemLabel
-			Parent_View 	@25
-			location   	(780, 130)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	392
-			justify    	0
-			label      	"IBindingOperation")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@25
-			location   	(780, 80)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	392
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84ADC00072"
-		    width      	410
-		    height     	568
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IBindingInput" @26
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(192, 1360)
-		    label      	(object ItemLabel
-			Parent_View 	@26
-			location   	(62, 1334)
-			fill_color 	16777215
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"IBindingInput")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@26
-			location   	(62, 1284)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84ADEB0100"
-		    width      	278
-		    height     	176
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IBindingOutput" @27
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(208, 1664)
-		    label      	(object ItemLabel
-			Parent_View 	@27
-			location   	(61, 1638)
-			fill_color 	16777215
-			nlines     	1
-			max_width  	294
-			justify    	0
-			label      	"IBindingOutput")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@27
-			location   	(61, 1588)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	294
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84AE210111"
-		    width      	312
-		    height     	176
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IBindingFault" @28
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(208, 1984)
-		    label      	(object ItemLabel
-			Parent_View 	@28
-			location   	(72, 1958)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	272
-			justify    	0
-			label      	"IBindingFault")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@28
-			location   	(72, 1908)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	272
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84AE4F00BD"
-		    width      	290
-		    height     	176
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::PortType" @29
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1904, 624)
-		    label      	(object ItemLabel
-			Parent_View 	@29
-			location   	(1568, 486)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	673
-			justify    	0
-			label      	"PortType")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C7F001A5"
-		    width      	691
-		    height     	301
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Input" @30
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1904, 1360)
-		    label      	(object ItemLabel
-			Parent_View 	@30
-			location   	(1756, 1283)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"Input")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE0789F0059"
-		    width      	314
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Output" @31
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1904, 1664)
-		    label      	(object ItemLabel
-			Parent_View 	@31
-			location   	(1756, 1587)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"Output")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE078B60232"
-		    width      	314
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Binding" @32
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 688)
-		    label      	(object ItemLabel
-			Parent_View 	@32
-			location   	(97, 539)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	414
-			justify    	0
-			label      	"Binding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D2860261"
-		    width      	432
-		    height     	322
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @33
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8595410129"
-		    client     	@32
-		    supplier   	@24
-		    line_style 	3
-		    origin_attachment 	(279, 527)
-		    terminal_attachment 	(279, 428))
-		(object AssociationViewNew "$UNNAMED$3" @34
-		    location   	(1039, 742)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D352010F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "ePortType" @35
-			    Parent_View 	@34
-			    location   	(575, 598)
-			    label      	(object SegLabel @36
-				Parent_View 	@35
-				location   	(1449, 781)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	216
-				justify    	0
-				label      	"+ePortType"
-				pctDist    	0.789292
-				height     	39
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D3540176"
-			    client     	@34
-			    supplier   	@29
-			    line_style 	3
-			    origin_attachment 	(1039, 742)
-			    terminal_attachment 	(1559, 742)
-			    label      	(object SegLabel @37
-				Parent_View 	@35
-				location   	(1492, 716)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.872193
-				height     	27
-				orientation 	0))
-			(object RoleView "$UNNAMED$4" @38
-			    Parent_View 	@34
-			    location   	(575, 598)
-			    label      	(object SegLabel @39
-				Parent_View 	@38
-				location   	(776, 697)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	108
-				justify    	0
-				label      	""
-				pctDist    	0.509449
-				height     	46
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D3540180"
-			    client     	@34
-			    supplier   	@32
-			    line_style 	3
-			    origin_attachment 	(1039, 742)
-			    terminal_attachment 	(520, 742))))
-		(object ClassView "Class" "Logical View::wsdl::Operation" @40
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1888, 1024)
-		    label      	(object ItemLabel
-			Parent_View 	@40
-			location   	(1672, 851)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	432
-			justify    	0
-			label      	"Operation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C80D03CE"
-		    width      	450
-		    height     	370
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingInput" @41
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(624, 1408)
-		    label      	(object ItemLabel
-			Parent_View 	@41
-			location   	(476, 1283)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"BindingInput")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A8202D4"
-		    width      	314
-		    height     	274
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$43" @42
-		    location   	(1264, 1359)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84AD2400BD"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eInput" @43
-			    Parent_View 	@42
-			    location   	(96, 287)
-			    label      	(object SegLabel @44
-				Parent_View 	@43
-				location   	(1637, 1316)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	132
-				justify    	0
-				label      	"+eInput"
-				pctDist    	0.775148
-				height     	44
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B84AD250083"
-			    client     	@42
-			    supplier   	@30
-			    line_style 	3
-			    origin_attachment 	(1264, 1359)
-			    terminal_attachment 	(1747, 1359)
-			    label      	(object SegLabel @45
-				Parent_View 	@43
-				location   	(1694, 1398)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.889546
-				height     	39
-				orientation 	1))
-			(object RoleView "$UNNAMED$44" @46
-			    Parent_View 	@42
-			    location   	(96, 287)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B84AD250084"
-			    client     	@42
-			    supplier   	@41
-			    line_style 	3
-			    origin_attachment 	(1264, 1359)
-			    terminal_attachment 	(781, 1359))))
-		(object ClassView "Class" "Logical View::wsdl::BindingOutput" @47
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(960, 1664)
-		    label      	(object ItemLabel
-			Parent_View 	@47
-			location   	(812, 1539)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"BindingOutput")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A8F028C"
-		    width      	314
-		    height     	274
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$45" @48
-		    location   	(1432, 1654)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84AD7900F2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eOutput" @49
-			    Parent_View 	@48
-			    location   	(-120, 374)
-			    label      	(object SegLabel @50
-				Parent_View 	@49
-				location   	(1645, 1612)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	168
-				justify    	0
-				label      	"+eOutput"
-				pctDist    	0.674772
-				height     	43
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B84AD7A014D"
-			    client     	@48
-			    supplier   	@31
-			    line_style 	3
-			    origin_attachment 	(1432, 1654)
-			    terminal_attachment 	(1747, 1654)
-			    label      	(object SegLabel @51
-				Parent_View 	@49
-				location   	(1681, 1697)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.790274
-				height     	43
-				orientation 	1))
-			(object RoleView "$UNNAMED$46" @52
-			    Parent_View 	@48
-			    location   	(-120, 374)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B84AD7A014E"
-			    client     	@48
-			    supplier   	@47
-			    line_style 	3
-			    origin_attachment 	(1432, 1654)
-			    terminal_attachment 	(1117, 1654))))
-		(object ClassView "Class" "Logical View::wsdl::BindingOperation" @53
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(992, 1008)
-		    label      	(object ItemLabel
-			Parent_View 	@53
-			location   	(819, 931)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	346
-			justify    	0
-			label      	"BindingOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D3CB0145"
-		    width      	364
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @54
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84ADE401DC"
-		    client     	@53
-		    supplier   	@25
-		    line_style 	3
-		    origin_attachment 	(966, 919)
-		    terminal_attachment 	(966, 636))
-		(object AssociationViewNew "$UNNAMED$5" @55
-		    location   	(457, 1022)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D3E10179"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$6" @56
-			    Parent_View 	@55
-			    location   	(-1319, 494)
-			    label      	(object SegLabel @57
-				Parent_View 	@56
-				location   	(235, 920)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D3E20225"
-			    client     	@55
-			    supplier   	@32
-			    vertices   	(list Points
-				(457, 1022)
-				(276, 1022)
-				(276, 849))
-			    line_style 	3
-			    origin_attachment 	(457, 1022)
-			    terminal_attachment 	(276, 849)
-			    label      	(object SegLabel @58
-				Parent_View 	@56
-				location   	(330, 884)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "eBindingOperations" @59
-			    Parent_View 	@55
-			    location   	(-1319, 494)
-			    label      	(object SegLabel @60
-				Parent_View 	@59
-				location   	(531, 977)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	384
-				justify    	0
-				label      	"+eBindingOperations"
-				pctDist    	0.211699
-				height     	46
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D3E20239"
-			    client     	@55
-			    supplier   	@53
-			    line_style 	3
-			    origin_attachment 	(457, 1022)
-			    terminal_attachment 	(810, 1022)
-			    label      	(object SegLabel @61
-				Parent_View 	@59
-				location   	(769, 980)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.884956
-				height     	43
-				orientation 	0)
-			    label      	(object SegLabel @62
-				Parent_View 	@59
-				location   	(714, 1067)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	154
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.727564
-				height     	45
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$7" @63
-		    location   	(1418, 1040)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D425038A"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eOperation" @64
-			    Parent_View 	@63
-			    location   	(-358, 464)
-			    label      	(object SegLabel @65
-				Parent_View 	@64
-				location   	(1520, 1079)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	228
-				justify    	0
-				label      	"+eOperation"
-				pctDist    	0.420601
-				height     	39
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D42602F5"
-			    client     	@63
-			    supplier   	@40
-			    line_style 	3
-			    origin_attachment 	(1418, 1040)
-			    terminal_attachment 	(1663, 1040)
-			    label      	(object SegLabel @66
-				Parent_View 	@64
-				location   	(1589, 1005)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.696721
-				height     	36
-				orientation 	0))
-			(object RoleView "$UNNAMED$8" @67
-			    Parent_View 	@63
-			    location   	(-358, 464)
-			    label      	(object SegLabel @68
-				Parent_View 	@67
-				location   	(1273, 1070)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	""
-				pctDist    	0.595420
-				height     	30
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5D42602FF"
-			    client     	@63
-			    supplier   	@53
-			    line_style 	3
-			    origin_attachment 	(1418, 1040)
-			    terminal_attachment 	(1174, 1040))))
-		(object AssociationViewNew "$UNNAMED$23" @69
-		    location   	(787, 1190)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF2E6401F5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eBindingInput" @70
-			    Parent_View 	@69
-			    location   	(-381, 454)
-			    label      	(object SegLabel @71
-				Parent_View 	@70
-				location   	(669, 1152)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	276
-				justify    	0
-				label      	"+eBindingInput"
-				pctDist    	0.511905
-				height     	39
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2E650251"
-			    client     	@69
-			    supplier   	@41
-			    vertices   	(list Points
-				(787, 1190)
-				(636, 1190)
-				(636, 1271))
-			    line_style 	3
-			    origin_attachment 	(787, 1190)
-			    terminal_attachment 	(636, 1271)
-			    label      	(object SegLabel @72
-				Parent_View 	@70
-				location   	(685, 1222)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.440476
-				height     	32
-				orientation 	0))
-			(object RoleView "$UNNAMED$24" @73
-			    Parent_View 	@69
-			    location   	(-381, 454)
-			    label      	(object SegLabel @74
-				Parent_View 	@73
-				location   	(885, 1144)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2E650252"
-			    client     	@69
-			    supplier   	@53
-			    vertices   	(list Points
-				(787, 1190)
-				(926, 1190)
-				(926, 1097))
-			    line_style 	3
-			    origin_attachment 	(787, 1190)
-			    terminal_attachment 	(926, 1097)
-			    label      	(object SegLabel @75
-				Parent_View 	@73
-				location   	(871, 1136)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.837758
-				height     	56
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$25" @76
-		    location   	(1024, 1312)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF2EB30163"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eBindingOutput" @77
-			    Parent_View 	@76
-			    location   	(-150, 578)
-			    label      	(object SegLabel @78
-				Parent_View 	@77
-				location   	(1012, 1429)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	306
-				justify    	0
-				label      	"+eBindingOutput"
-				pctDist    	0.545082
-				height     	13
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2EB4013C"
-			    client     	@76
-			    supplier   	@47
-			    line_style 	3
-			    origin_attachment 	(1024, 1312)
-			    terminal_attachment 	(1024, 1527)
-			    label      	(object SegLabel @79
-				Parent_View 	@77
-				location   	(967, 1479)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.774590
-				height     	58
-				orientation 	1))
-			(object RoleView "$UNNAMED$26" @80
-			    Parent_View 	@76
-			    location   	(-150, 578)
-			    label      	(object SegLabel @81
-				Parent_View 	@80
-				location   	(983, 1140)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2EB4013D"
-			    client     	@76
-			    supplier   	@53
-			    line_style 	3
-			    origin_attachment 	(1024, 1312)
-			    terminal_attachment 	(1024, 1097)
-			    label      	(object SegLabel @82
-				Parent_View 	@80
-				location   	(1031, 1186)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.590164
-				height     	7
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::Fault" @83
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1920, 1984)
-		    label      	(object ItemLabel
-			Parent_View 	@83
-			location   	(1772, 1907)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"Fault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE078BE0108"
-		    width      	314
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingFault" @84
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1360, 1984)
-		    label      	(object ItemLabel
-			Parent_View 	@84
-			location   	(1212, 1859)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	296
-			justify    	0
-			label      	"BindingFault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A9E03A6"
-		    width      	314
-		    height     	274
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @85
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84AE710333"
-		    client     	@84
-		    supplier   	@28
-		    line_style 	3
-		    origin_attachment 	(1203, 2007)
-		    terminal_attachment 	(353, 2007))
-		(object AssociationViewNew "$UNNAMED$33" @86
-		    location   	(1356, 1352)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF340003E5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eBindingFaults" @87
-			    Parent_View 	@86
-			    location   	(188, 616)
-			    label      	(object SegLabel @88
-				Parent_View 	@87
-				location   	(1382, 1750)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	300
-				justify    	0
-				label      	"+eBindingFaults"
-				pctDist    	0.803150
-				height     	26
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF340103AA"
-			    client     	@86
-			    supplier   	@84
-			    line_style 	3
-			    origin_attachment 	(1356, 1352)
-			    terminal_attachment 	(1356, 1847)
-			    label      	(object SegLabel @89
-				Parent_View 	@87
-				location   	(1409, 1797)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.899194
-				height     	53
-				orientation 	0)
-			    label      	(object SegLabel @90
-				Parent_View 	@87
-				location   	(1256, 1806)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	154
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.919291
-				height     	101
-				orientation 	1))
-			(object RoleView "$UNNAMED$34" @91
-			    Parent_View 	@86
-			    location   	(188, 616)
-			    label      	(object SegLabel @92
-				Parent_View 	@91
-				location   	(1076, 1197)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF340103AB"
-			    client     	@86
-			    supplier   	@53
-			    vertices   	(list Points
-				(1356, 1352)
-				(1356, 1217)
-				(1117, 1217)
-				(1117, 1097))
-			    line_style 	3
-			    origin_attachment 	(1356, 1352)
-			    terminal_attachment 	(1117, 1097)
-			    label      	(object SegLabel @93
-				Parent_View 	@91
-				location   	(1152, 1164)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.687008
-				height     	54
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$35" @94
-		    location   	(1640, 1970)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE091F402F3"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eFault" @95
-			    Parent_View 	@94
-			    location   	(-344, 818)
-			    label      	(object SegLabel @96
-				Parent_View 	@95
-				location   	(1674, 1915)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	144
-				justify    	0
-				label      	"+eFault"
-				pctDist    	0.276423
-				height     	56
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE091F801FE"
-			    client     	@94
-			    supplier   	@83
-			    line_style 	3
-			    origin_attachment 	(1640, 1970)
-			    terminal_attachment 	(1763, 1970)
-			    label      	(object SegLabel @97
-				Parent_View 	@95
-				location   	(1718, 2012)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.642276
-				height     	42
-				orientation 	1))
-			(object RoleView "$UNNAMED$36" @98
-			    Parent_View 	@94
-			    location   	(-344, 818)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AE091F801FF"
-			    client     	@94
-			    supplier   	@84
-			    line_style 	3
-			    origin_attachment 	(1640, 1970)
-			    terminal_attachment 	(1517, 1970))))
-		(object InheritView "" @99
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84AE4302AB"
-		    client     	@47
-		    supplier   	@27
-		    line_style 	3
-		    origin_attachment 	(803, 1656)
-		    terminal_attachment 	(364, 1656))
-		(object InheritView "" @100
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84AE1B0113"
-		    client     	@41
-		    supplier   	@26
-		    line_style 	3
-		    origin_attachment 	(467, 1385)
-		    terminal_attachment 	(331, 1385))))
-	(object ClassDiagram "2.4 PortTypes"
-	    quid       	"3AD5D1C40366"
-	    title      	"2.4 PortTypes"
-	    documentation 	"This class represents the non-MOF java.util.Iterator interface."
-	    zoom       	80
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IPortType" @101
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(496, 208)
-		    label      	(object ItemLabel
-			Parent_View 	@101
-			location   	(146, 172)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	700
-			justify    	0
-			label      	"IPortType")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@101
-			location   	(146, 122)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	700
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A5BE0331"
-		    width      	718
-		    height     	196
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::IOperation" @102
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1552, 208)
-		    label      	(object ItemLabel
-			Parent_View 	@102
-			location   	(1116, 176)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	873
-			justify    	0
-			label      	"IOperation")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@102
-			location   	(1116, 126)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	873
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A77600D1"
-		    width      	891
-		    height     	188
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IInput" @103
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(368, 1472)
-		    label      	(object ItemLabel
-			Parent_View 	@103
-			location   	(55, 1437)
-			fill_color 	16777215
-			nlines     	1
-			max_width  	626
-			justify    	0
-			label      	"IInput")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@103
-			location   	(55, 1387)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	626
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A7EE0015"
-		    width      	644
-		    height     	194
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IOutput" @104
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(384, 1792)
-		    label      	(object ItemLabel
-			Parent_View 	@104
-			location   	(56, 1757)
-			fill_color 	16777215
-			nlines     	1
-			max_width  	656
-			justify    	0
-			label      	"IOutput")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@104
-			location   	(56, 1707)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	656
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A829027D"
-		    width      	674
-		    height     	194
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IFault" @105
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(368, 2112)
-		    label      	(object ItemLabel
-			Parent_View 	@105
-			location   	(55, 2076)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	626
-			justify    	0
-			label      	"IFault")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@105
-			location   	(55, 2026)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	626
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A861031D"
-		    width      	644
-		    height     	196
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::PortType" @106
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(496, 800)
-		    label      	(object ItemLabel
-			Parent_View 	@106
-			location   	(158, 672)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	677
-			justify    	0
-			label      	"PortType")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C7F001A5"
-		    width      	695
-		    height     	281
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::Part" @107
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2576, 800)
-		    label      	(object ItemLabel
-			Parent_View 	@107
-			location   	(2325, 692)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	502
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    width      	520
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Fault" @108
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1728, 2112)
-		    label      	(object ItemLabel
-			Parent_View 	@108
-			location   	(1647, 2060)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Fault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE078BE0108"
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Input" @109
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1056, 1472)
-		    label      	(object ItemLabel
-			Parent_View 	@109
-			location   	(870, 1422)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	372
-			justify    	0
-			label      	"Input")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE0789F0059"
-		    width      	390
-		    height     	125
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::Output" @110
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1360, 1792)
-		    label      	(object ItemLabel
-			Parent_View 	@110
-			location   	(1232, 1742)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	256
-			justify    	0
-			label      	"Output")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE078B60232"
-		    width      	274
-		    height     	125
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Operation" @111
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1552, 784)
-		    label      	(object ItemLabel
-			Parent_View 	@111
-			location   	(1214, 620)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	677
-			justify    	0
-			label      	"Operation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C80D03CE"
-		    width      	695
-		    height     	352
-		    annotation 	8)
-		(object AssociationViewNew "$UNNAMED$0" @112
-		    location   	(1024, 797)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5C824018C"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eOperations" @113
-			    Parent_View 	@112
-			    location   	(592, 269)
-			    label      	(object SegLabel @114
-				Parent_View 	@113
-				location   	(1088, 748)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	249
-				justify    	0
-				label      	"+eOperations"
-				pctDist    	0.359649
-				height     	50
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5C82701CD"
-			    client     	@112
-			    supplier   	@111
-			    line_style 	3
-			    origin_attachment 	(1024, 797)
-			    terminal_attachment 	(1205, 797)
-			    label      	(object SegLabel @115
-				Parent_View 	@113
-				location   	(1176, 861)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.840391
-				height     	64
-				orientation 	1)
-			    label      	(object SegLabel @116
-				Parent_View 	@113
-				location   	(1074, 923)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	164
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.276243
-				height     	126
-				orientation 	1))
-			(object RoleView "portType" @117
-			    Parent_View 	@112
-			    location   	(592, 269)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5C82701C3"
-			    client     	@112
-			    supplier   	@106
-			    line_style 	3
-			    origin_attachment 	(1024, 797)
-			    terminal_attachment 	(843, 797)
-			    label      	(object SegLabel @118
-				Parent_View 	@117
-				location   	(888, 757)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.753488
-				height     	41
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$41" @119
-		    location   	(2107, 773)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEA412F0035"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eParameterOrdering" @120
-			    Parent_View 	@119
-			    location   	(1819, 101)
-			    label      	(object SegLabel @121
-				Parent_View 	@120
-				location   	(2145, 647)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	396
-				justify    	0
-				label      	"+eParameterOrdering"
-				pctDist    	0.183333
-				height     	127
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA41310255"
-			    client     	@119
-			    supplier   	@107
-			    line_style 	3
-			    origin_attachment 	(2107, 773)
-			    terminal_attachment 	(2316, 773)
-			    label      	(object SegLabel @122
-				Parent_View 	@120
-				location   	(2272, 822)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.796610
-				height     	49
-				orientation 	1)
-			    label      	(object SegLabel @123
-				Parent_View 	@120
-				location   	(2171, 888)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	164
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.306220
-				height     	115
-				orientation 	1))
-			(object RoleView "$UNNAMED$42" @124
-			    Parent_View 	@119
-			    location   	(1819, 101)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA4131025F"
-			    client     	@119
-			    supplier   	@111
-			    line_style 	3
-			    origin_attachment 	(2107, 773)
-			    terminal_attachment 	(1899, 773))))
-		(object AssociationViewNew "$UNNAMED$31" @125
-		    location   	(1702, 1504)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF331601A4"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eFaults" @126
-			    Parent_View 	@125
-			    location   	(1414, 832)
-			    label      	(object SegLabel @127
-				Parent_View 	@126
-				location   	(1815, 1982)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	168
-				justify    	0
-				label      	"+eFaults"
-				pctDist    	0.878992
-				height     	113
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF33180387"
-			    client     	@125
-			    supplier   	@108
-			    line_style 	3
-			    origin_attachment 	(1702, 1504)
-			    terminal_attachment 	(1702, 2048)
-			    label      	(object SegLabel @128
-				Parent_View 	@126
-				location   	(1644, 2020)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.949580
-				height     	59
-				orientation 	1)
-			    label      	(object SegLabel @129
-				Parent_View 	@126
-				location   	(1593, 1963)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	164
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.845378
-				height     	110
-				orientation 	1))
-			(object RoleView "$UNNAMED$32" @130
-			    Parent_View 	@125
-			    location   	(1414, 832)
-			    label      	(object SegLabel @131
-				Parent_View 	@130
-				location   	(1661, 1069)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF33180388"
-			    client     	@125
-			    supplier   	@111
-			    line_style 	3
-			    origin_attachment 	(1702, 1504)
-			    terminal_attachment 	(1702, 960)
-			    label      	(object SegLabel @132
-				Parent_View 	@130
-				location   	(1821, 1039)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.857362
-				height     	119
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$27" @133
-		    location   	(1178, 1234)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF2F94024D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eInput" @134
-			    Parent_View 	@133
-			    location   	(890, 562)
-			    label      	(object SegLabel @135
-				Parent_View 	@134
-				location   	(878, 1343)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	132
-				justify    	0
-				label      	"+eInput"
-				pctDist    	0.819820
-				height     	103
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2F950190"
-			    client     	@133
-			    supplier   	@109
-			    vertices   	(list Points
-				(1178, 1234)
-				(980, 1234)
-				(980, 1410))
-			    line_style 	3
-			    origin_attachment 	(1178, 1234)
-			    terminal_attachment 	(980, 1410)
-			    label      	(object SegLabel @136
-				Parent_View 	@134
-				location   	(1046, 1364)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.877660
-				height     	66
-				orientation 	0))
-			(object RoleView "$UNNAMED$28" @137
-			    Parent_View 	@133
-			    location   	(890, 562)
-			    label      	(object SegLabel @138
-				Parent_View 	@137
-				location   	(1236, 1036)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2F95019A"
-			    client     	@133
-			    supplier   	@111
-			    vertices   	(list Points
-				(1178, 1234)
-				(1277, 1234)
-				(1277, 960))
-			    line_style 	3
-			    origin_attachment 	(1178, 1234)
-			    terminal_attachment 	(1277, 960)
-			    label      	(object SegLabel @139
-				Parent_View 	@137
-				location   	(1197, 1058)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.736413
-				height     	81
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$29" @140
-		    location   	(1468, 1345)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3ADF2FB802F9"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eOutput" @141
-			    Parent_View 	@140
-			    location   	(1180, 673)
-			    label      	(object SegLabel @142
-				Parent_View 	@141
-				location   	(1362, 1669)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	168
-				justify    	0
-				label      	"+eOutput"
-				pctDist    	0.840909
-				height     	107
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2FB9020A"
-			    client     	@140
-			    supplier   	@110
-			    line_style 	3
-			    origin_attachment 	(1468, 1345)
-			    terminal_attachment 	(1468, 1730)
-			    label      	(object SegLabel @143
-				Parent_View 	@141
-				location   	(1546, 1676)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.863636
-				height     	78
-				orientation 	0))
-			(object RoleView "$UNNAMED$30" @144
-			    Parent_View 	@140
-			    location   	(1180, 673)
-			    label      	(object SegLabel @145
-				Parent_View 	@144
-				location   	(1427, 1037)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3ADF2FB9020B"
-			    client     	@140
-			    supplier   	@111
-			    line_style 	3
-			    origin_attachment 	(1468, 1345)
-			    terminal_attachment 	(1468, 960)
-			    label      	(object SegLabel @146
-				Parent_View 	@144
-				location   	(1523, 1080)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.690341
-				height     	55
-				orientation 	1))))
-		(object InheritView "" @147
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F1FD8019F"
-		    client     	@106
-		    supplier   	@101
-		    line_style 	0)
-		(object InheritView "" @148
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F1FE20171"
-		    client     	@111
-		    supplier   	@102
-		    line_style 	0)
-		(object InheritView "" @149
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F1FEE031D"
-		    client     	@109
-		    supplier   	@103
-		    line_style 	0)
-		(object InheritView "" @150
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F1FF801CD"
-		    client     	@110
-		    supplier   	@104
-		    line_style 	0)
-		(object InheritView "" @151
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F2002002D"
-		    client     	@108
-		    supplier   	@105
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::wsdl::Message" @152
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2224, 1456)
-		    label      	(object ItemLabel
-			Parent_View 	@152
-			location   	(1937, 1312)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	575
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	593
-		    height     	312
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::MessageReference" @153
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1520, 2544)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@153
-			location   	(1193, 2466)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	654
-			justify    	0
-			label      	"MessageReference")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3F6771DB02DC"
-		    width      	672
-		    height     	180
-		    annotation 	8)
-		(object InheritTreeView "" @154
-		    location   	(1524, 2275)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@153
-		    vertices   	(list Points
-			(1524, 2275)
-			(1524, 2454)))
-		(object InheritView "" @155
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F67723D0319"
-		    client     	@108
-		    supplier   	@153
-		    line_style 	3
-		    origin_attachment 	(1776, 2176)
-		    terminal_attachment 	(1776, 2275)
-		    drawSupplier 	@154)
-		(object InheritView "" @156
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F67723500DD"
-		    client     	@110
-		    supplier   	@153
-		    line_style 	3
-		    origin_attachment 	(1371, 1854)
-		    terminal_attachment 	(1371, 2275)
-		    drawSupplier 	@154)
-		(object InheritView "" @157
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F67722802E7"
-		    client     	@109
-		    supplier   	@153
-		    line_style 	3
-		    origin_attachment 	(980, 1534)
-		    terminal_attachment 	(980, 2275)
-		    drawSupplier 	@154)
-		(object AssociationViewNew "$UNNAMED$61" @158
-		    location   	(2206, 2259)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F74E78401B1"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eMessage" @159
-			    Parent_View 	@158
-			    location   	(734, -285)
-			    label      	(object SegLabel @160
-				Parent_View 	@159
-				location   	(2068, 1670)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	216
-				justify    	0
-				label      	"+eMessage"
-				pctDist    	0.912230
-				height     	139
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F74E786000F"
-			    client     	@158
-			    supplier   	@152
-			    line_style 	3
-			    origin_attachment 	(2206, 2259)
-			    terminal_attachment 	(2206, 1612)
-			    label      	(object SegLabel @161
-				Parent_View 	@159
-				location   	(2260, 1678)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$62" @162
-			    Parent_View 	@158
-			    location   	(734, -285)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F74E7860023"
-			    client     	@158
-			    supplier   	@153
-			    vertices   	(list Points
-				(2206, 2259)
-				(2206, 2556)
-				(1856, 2556))
-			    line_style 	3
-			    origin_attachment 	(2206, 2259)
-			    terminal_attachment 	(1856, 2556))))))
-	(object ClassDiagram "2.1 Definitions"
-	    quid       	"3AD5E48A0262"
-	    title      	"2.1 Definitions"
-	    zoom       	83
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IDefinition" @163
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(432, 192)
-		    label      	(object ItemLabel
-			Parent_View 	@163
-			location   	(88, 161)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	688
-			justify    	0
-			label      	"IDefinition")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@163
-			location   	(88, 111)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	688
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84B1D90142"
-		    width      	706
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Types" @164
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1824, 944)
-		    label      	(object ItemLabel
-			Parent_View 	@164
-			location   	(1686, 896)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	276
-			justify    	0
-			label      	"Types")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B8BE9A603A8"
-		    width      	294
-		    height     	120
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Import" @165
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2144, 624)
-		    label      	(object ItemLabel
-			Parent_View 	@165
-			location   	(1910, 545)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	468
-			justify    	0
-			label      	"Import")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E4F903DE"
-		    width      	486
-		    height     	182
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Message" @166
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(2112, 1184)
-		    label      	(object ItemLabel
-			Parent_View 	@166
-			location   	(1900, 1056)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	424
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	442
-		    height     	280
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::PortType" @167
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1808, 1488)
-		    label      	(object ItemLabel
-			Parent_View 	@167
-			location   	(1596, 1360)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	424
-			justify    	0
-			label      	"PortType")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C7F001A5"
-		    width      	442
-		    height     	280
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Binding" @168
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(2336, 1728)
-		    label      	(object ItemLabel
-			Parent_View 	@168
-			location   	(2124, 1600)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	424
-			justify    	0
-			label      	"Binding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D2860261"
-		    width      	442
-		    height     	280
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Definition" @169
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1328, 240)
-		    label      	(object ItemLabel
-			Parent_View 	@169
-			location   	(1073, 39)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	510
-			justify    	0
-			label      	"Definition")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E43F008E"
-		    width      	528
-		    height     	426
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$53" @170
-		    location   	(1358, 860)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEA27029F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$54" @171
-			    Parent_View 	@170
-			    location   	(62, -36)
-			    label      	(object SegLabel @172
-				Parent_View 	@171
-				location   	(1317, 535)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8BEA290356"
-			    client     	@170
-			    supplier   	@169
-			    line_style 	3
-			    origin_attachment 	(1358, 860)
-			    terminal_attachment 	(1358, 453)
-			    label      	(object SegLabel @173
-				Parent_View 	@171
-				location   	(1403, 511)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.856649
-				height     	45
-				orientation 	1))
-			(object RoleView "eTypes" @174
-			    Parent_View 	@170
-			    location   	(62, -36)
-			    label      	(object SegLabel @175
-				Parent_View 	@174
-				location   	(1586, 909)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	156
-				justify    	0
-				label      	"+eTypes"
-				pctDist    	0.779097
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8BEA29036A"
-			    client     	@170
-			    supplier   	@164
-			    vertices   	(list Points
-				(1358, 860)
-				(1358, 948)
-				(1677, 948))
-			    line_style 	3
-			    origin_attachment 	(1358, 860)
-			    terminal_attachment 	(1677, 948)
-			    label      	(object SegLabel @176
-				Parent_View 	@174
-				location   	(1632, 987)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.892655
-				height     	39
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$57" @177
-		    location   	(1612, 595)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C864DFF02EC"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$58" @178
-			    Parent_View 	@177
-			    location   	(12, 227)
-			    label      	(object SegLabel @179
-				Parent_View 	@178
-				location   	(1423, 512)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C864DFF02EE"
-			    client     	@177
-			    supplier   	@169
-			    vertices   	(list Points
-				(1612, 595)
-				(1464, 595)
-				(1464, 453))
-			    line_style 	3
-			    origin_attachment 	(1612, 595)
-			    terminal_attachment 	(1464, 453)
-			    label      	(object SegLabel @180
-				Parent_View 	@178
-				location   	(1524, 495)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.858667
-				height     	60
-				orientation 	1))
-			(object RoleView "eImports" @181
-			    Parent_View 	@177
-			    location   	(12, 227)
-			    label      	(object SegLabel @182
-				Parent_View 	@181
-				location   	(1692, 557)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	204
-				justify    	0
-				label      	"+eImports"
-				pctDist    	0.280335
-				height     	39
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C864DFF02ED"
-			    client     	@177
-			    supplier   	@165
-			    line_style 	3
-			    origin_attachment 	(1612, 595)
-			    terminal_attachment 	(1901, 595)
-			    label      	(object SegLabel @183
-				Parent_View 	@181
-				location   	(1854, 652)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.841004
-				height     	57
-				orientation 	1)
-			    label      	(object SegLabel @184
-				Parent_View 	@181
-				location   	(1676, 646)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	158
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.225941
-				height     	51
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$13" @185
-		    location   	(1279, 1137)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E60301E2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$14" @186
-			    Parent_View 	@185
-			    location   	(271, 273)
-			    label      	(object SegLabel @187
-				Parent_View 	@186
-				location   	(1238, 591)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E60400B7"
-			    client     	@185
-			    supplier   	@169
-			    line_style 	3
-			    origin_attachment 	(1279, 1137)
-			    terminal_attachment 	(1279, 453)
-			    label      	(object SegLabel @188
-				Parent_View 	@186
-				location   	(1320, 586)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.804974
-				height     	41
-				orientation 	1))
-			(object RoleView "eMessages" @189
-			    Parent_View 	@185
-			    location   	(271, 273)
-			    label      	(object SegLabel @190
-				Parent_View 	@189
-				location   	(1647, 1171)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+eMessages"
-				pctDist    	0.643137
-				height     	38
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E60400C1"
-			    client     	@185
-			    supplier   	@166
-			    vertices   	(list Points
-				(1279, 1137)
-				(1279, 1208)
-				(1891, 1208))
-			    line_style 	3
-			    origin_attachment 	(1279, 1137)
-			    terminal_attachment 	(1891, 1208)
-			    label      	(object SegLabel @191
-				Parent_View 	@189
-				location   	(1821, 1171)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.899346
-				height     	38
-				orientation 	0)
-			    label      	(object SegLabel @192
-				Parent_View 	@189
-				location   	(1797, 1244)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	158
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.864407
-				height     	36
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$15" @193
-		    location   	(1212, 1159)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E6710104"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$16" @194
-			    Parent_View 	@193
-			    location   	(-324, 215)
-			    label      	(object SegLabel @195
-				Parent_View 	@194
-				location   	(1171, 594)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E672034A"
-			    client     	@193
-			    supplier   	@169
-			    line_style 	3
-			    origin_attachment 	(1212, 1159)
-			    terminal_attachment 	(1212, 453)
-			    label      	(object SegLabel @196
-				Parent_View 	@194
-				location   	(1251, 624)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.757962
-				height     	39
-				orientation 	1))
-			(object RoleView "ePortTypes" @197
-			    Parent_View 	@193
-			    location   	(-324, 215)
-			    label      	(object SegLabel @198
-				Parent_View 	@197
-				location   	(1391, 1451)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+ePortTypes"
-				pctDist    	0.723698
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E6720354"
-			    client     	@193
-			    supplier   	@167
-			    vertices   	(list Points
-				(1212, 1159)
-				(1212, 1490)
-				(1587, 1490))
-			    line_style 	3
-			    origin_attachment 	(1212, 1159)
-			    terminal_attachment 	(1587, 1490)
-			    label      	(object SegLabel @199
-				Parent_View 	@197
-				location   	(1533, 1451)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.925611
-				height     	40
-				orientation 	0)
-			    label      	(object SegLabel @200
-				Parent_View 	@197
-				location   	(1512, 1540)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	158
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.895855
-				height     	50
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$17" @201
-		    location   	(1114, 1585)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E6770095"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$18" @202
-			    Parent_View 	@201
-			    location   	(-406, 241)
-			    label      	(object SegLabel @203
-				Parent_View 	@202
-				location   	(1073, 680)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E6780371"
-			    client     	@201
-			    supplier   	@169
-			    line_style 	3
-			    origin_attachment 	(1114, 1585)
-			    terminal_attachment 	(1114, 453)
-			    label      	(object SegLabel @204
-				Parent_View 	@202
-				location   	(1155, 752)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.736704
-				height     	41
-				orientation 	1))
-			(object RoleView "eBindings" @205
-			    Parent_View 	@201
-			    location   	(-406, 241)
-			    label      	(object SegLabel @206
-				Parent_View 	@205
-				location   	(1851, 1674)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	204
-				justify    	0
-				label      	"+eBindings"
-				pctDist    	0.766347
-				height     	43
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E678037B"
-			    client     	@201
-			    supplier   	@168
-			    vertices   	(list Points
-				(1114, 1585)
-				(1114, 1716)
-				(2115, 1716))
-			    line_style 	3
-			    origin_attachment 	(1114, 1585)
-			    terminal_attachment 	(2115, 1716)
-			    label      	(object SegLabel @207
-				Parent_View 	@205
-				location   	(2053, 1677)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.945074
-				height     	40
-				orientation 	0)
-			    label      	(object SegLabel @208
-				Parent_View 	@205
-				location   	(2014, 1754)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	158
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.911072
-				height     	38
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::Service" @209
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1840, 2048)
-		    label      	(object ItemLabel
-			Parent_View 	@209
-			location   	(1628, 1920)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	424
-			justify    	0
-			label      	"Service")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D8F002F8"
-		    width      	442
-		    height     	280
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$19" @210
-		    location   	(1066, 1533)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E67B0311"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$20" @211
-			    Parent_View 	@210
-			    location   	(-521, -111)
-			    label      	(object SegLabel @212
-				Parent_View 	@211
-				location   	(1025, 669)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E67D007F"
-			    client     	@210
-			    supplier   	@169
-			    line_style 	3
-			    origin_attachment 	(1066, 1533)
-			    terminal_attachment 	(1066, 453)
-			    label      	(object SegLabel @213
-				Parent_View 	@211
-				location   	(1109, 756)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.719697
-				height     	43
-				orientation 	1))
-			(object RoleView "eServices" @214
-			    Parent_View 	@210
-			    location   	(-521, -111)
-			    label      	(object SegLabel @215
-				Parent_View 	@214
-				location   	(1393, 2028)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	204
-				justify    	0
-				label      	"+eServices"
-				pctDist    	0.791824
-				height     	32
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5E67D0089"
-			    client     	@210
-			    supplier   	@209
-			    vertices   	(list Points
-				(1066, 1533)
-				(1066, 2059)
-				(1619, 2059))
-			    line_style 	3
-			    origin_attachment 	(1066, 1533)
-			    terminal_attachment 	(1619, 2059)
-			    label      	(object SegLabel @216
-				Parent_View 	@214
-				location   	(1554, 2031)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.940197
-				height     	29
-				orientation 	0)
-			    label      	(object SegLabel @217
-				Parent_View 	@214
-				location   	(1532, 2113)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	158
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.920515
-				height     	54
-				orientation 	1))))
-		(object InheritView "" @218
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84B1F80382"
-		    client     	@169
-		    supplier   	@163
-		    line_style 	3
-		    origin_attachment 	(1064, 263)
-		    terminal_attachment 	(785, 263))))
-	(object ClassDiagram "2.1.3 Extensibility"
-	    quid       	"3AD60C510192"
-	    title      	"2.1.3 Extensibility"
-	    zoom       	80
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::Binding" @219
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(576, 1584)
-		    label      	(object ItemLabel
-			Parent_View 	@219
-			location   	(494, 1531)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	164
-			justify    	0
-			label      	"Binding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D2860261"
-		    width      	182
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Port" @220
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1568, 1888)
-		    label      	(object ItemLabel
-			Parent_View 	@220
-			location   	(1487, 1836)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Port")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D9170286"
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Service" @221
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1424, 1728)
-		    label      	(object ItemLabel
-			Parent_View 	@221
-			location   	(1342, 1675)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	164
-			justify    	0
-			label      	"Service")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D8F002F8"
-		    width      	182
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingFault" @222
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1216, 2336)
-		    label      	(object ItemLabel
-			Parent_View 	@222
-			location   	(1088, 2283)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	256
-			justify    	0
-			label      	"BindingFault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A9E03A6"
-		    width      	274
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingOperation" @223
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(736, 1760)
-		    label      	(object ItemLabel
-			Parent_View 	@223
-			location   	(563, 1707)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	346
-			justify    	0
-			label      	"BindingOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5D3CB0145"
-		    width      	364
-		    height     	130
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IExtensibilityElement" @224
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1888, 160)
-		    label      	(object ItemLabel
-			Parent_View 	@224
-			location   	(1495, 136)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	786
-			justify    	0
-			label      	"IExtensibilityElement")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@224
-			location   	(1495, 86)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	786
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84B12402AB"
-		    width      	804
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingInput" @225
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(928, 1952)
-		    label      	(object ItemLabel
-			Parent_View 	@225
-			location   	(800, 1899)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	256
-			justify    	0
-			label      	"BindingInput")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A8202D4"
-		    width      	274
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingOutput" @226
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1008, 2144)
-		    label      	(object ItemLabel
-			Parent_View 	@226
-			location   	(863, 2091)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	290
-			justify    	0
-			label      	"BindingOutput")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE08A8F028C"
-		    width      	308
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Definition" @227
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(176, 1296)
-		    label      	(object ItemLabel
-			Parent_View 	@227
-			location   	(74, 1235)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	204
-			justify    	0
-			label      	"Definition")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E43F008E"
-		    width      	222
-		    height     	146
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Types" @228
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(416, 1408)
-		    label      	(object ItemLabel
-			Parent_View 	@228
-			location   	(335, 1356)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Types")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B8BE9A603A8"
-		    height     	128
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @229
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(480, 688)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@229
-			location   	(209, 580)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	542
-			justify    	0
-			label      	"ExtensibleElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5FCFA033A"
-		    width      	560
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @230
-		    location   	(480, 1039)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@229
-		    vertices   	(list Points
-			(480, 1039)
-			(480, 808)))
-		(object InheritView "" @231
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD600CB00AA"
-		    client     	@220
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(1566, 1824)
-		    terminal_attachment 	(1566, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @232
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B85B5A4027E"
-		    client     	@226
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(1097, 2079)
-		    terminal_attachment 	(1097, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @233
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE0938602C9"
-		    client     	@222
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(1219, 2271)
-		    terminal_attachment 	(1219, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @234
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B85B59B0072"
-		    client     	@225
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(988, 1887)
-		    terminal_attachment 	(988, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @235
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD6009202F7"
-		    client     	@223
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(797, 1695)
-		    terminal_attachment 	(797, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @236
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FA0F02F0"
-		    client     	@219
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(601, 1519)
-		    terminal_attachment 	(601, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @237
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FDB803D4"
-		    client     	@227
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(211, 1223)
-		    terminal_attachment 	(211, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @238
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEB010311"
-		    client     	@228
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(414, 1344)
-		    terminal_attachment 	(414, 1039)
-		    drawSupplier 	@230)
-		(object InheritView "" @239
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FA20025E"
-		    client     	@221
-		    supplier   	@229
-		    line_style 	3
-		    origin_attachment 	(1429, 1663)
-		    terminal_attachment 	(1429, 1039)
-		    drawSupplier 	@230)
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @240
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1904, 688)
-		    label      	(object ItemLabel
-			Parent_View 	@240
-			location   	(1632, 583)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	545
-			justify    	0
-			label      	"ExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5DBB602A9"
-		    width      	563
-		    height     	234
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$21" @241
-		    location   	(1191, 672)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FD130079"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$22" @242
-			    Parent_View 	@241
-			    location   	(23, 560)
-			    label      	(object SegLabel @243
-				Parent_View 	@242
-				location   	(847, 631)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019E"
-			    client     	@241
-			    supplier   	@229
-			    line_style 	3
-			    origin_attachment 	(1191, 672)
-			    terminal_attachment 	(760, 672)
-			    label      	(object SegLabel @244
-				Parent_View 	@242
-				location   	(830, 628)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.839695
-				height     	45
-				orientation 	1))
-			(object RoleView "eExtensibilityElements" @245
-			    Parent_View 	@241
-			    location   	(23, 560)
-			    label      	(object SegLabel @246
-				Parent_View 	@245
-				location   	(1355, 522)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	"+eExtensibilityElements"
-				pctDist    	0.379070
-				height     	151
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019D"
-			    client     	@241
-			    supplier   	@240
-			    line_style 	3
-			    origin_attachment 	(1191, 672)
-			    terminal_attachment 	(1623, 672)
-			    label      	(object SegLabel @247
-				Parent_View 	@245
-				location   	(1496, 627)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.709402
-				height     	46
-				orientation 	0)
-			    label      	(object SegLabel @248
-				Parent_View 	@245
-				location   	(1463, 764)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	164
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.632479
-				height     	92
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::WSDLElement" @249
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1008, 192)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@249
-			location   	(630, 84)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	756
-			justify    	0
-			label      	"WSDLElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C6A302DD"
-		    width      	774
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @250
-		    location   	(1008, 402)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@249
-		    vertices   	(list Points
-			(1008, 402)
-			(1008, 312)))
-		(object InheritView "" @251
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FE3C03D4"
-		    client     	@229
-		    supplier   	@249
-		    line_style 	3
-		    origin_attachment 	(492, 568)
-		    terminal_attachment 	(492, 402)
-		    drawSupplier 	@250)
-		(object InheritView "" @252
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84B14903D0"
-		    client     	@240
-		    supplier   	@224
-		    line_style 	3
-		    origin_attachment 	(2015, 571)
-		    terminal_attachment 	(2015, 246))
-		(object InheritView "" @253
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3BDDF53502C3"
-		    client     	@240
-		    supplier   	@249
-		    line_style 	3
-		    origin_attachment 	(1762, 571)
-		    terminal_attachment 	(1762, 402)
-		    drawSupplier 	@250)
-		(object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @254
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2016, 1360)
-		    label      	(object ItemLabel
-			Parent_View 	@254
-			location   	(1731, 1307)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	570
-			justify    	0
-			label      	"UnknownExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3CB24AC002AE"
-		    width      	588
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @255
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CB24AEC01CB"
-		    client     	@254
-		    supplier   	@240
-		    line_style 	3
-		    origin_attachment 	(1796, 1295)
-		    terminal_attachment 	(1796, 805))
-		(object AssociationViewNew "$UNNAMED$63" @256
-		    location   	(2311, 1686)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F7896A2026E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "parent" @257
-			    Parent_View 	@256
-			    location   	(279, 294)
-			    label      	(object SegLabel @258
-				Parent_View 	@257
-				location   	(2422, 1333)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	144
-				justify    	0
-				label      	"+parent"
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F7896A7012B"
-			    client     	@256
-			    supplier   	@254
-			    vertices   	(list Points
-				(2311, 1686)
-				(2432, 1686)
-				(2432, 1374)
-				(2310, 1374))
-			    line_style 	3
-			    origin_attachment 	(2311, 1686)
-			    terminal_attachment 	(2310, 1374)
-			    label      	(object SegLabel @259
-				Parent_View 	@257
-				location   	(2366, 1428)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "children" @260
-			    Parent_View 	@256
-			    location   	(279, 294)
-			    label      	(object SegLabel @261
-				Parent_View 	@260
-				location   	(1899, 1537)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	168
-				justify    	0
-				label      	"+children"
-				pctDist    	0.798561
-				height     	118
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F7896A7012C"
-			    client     	@256
-			    supplier   	@254
-			    vertices   	(list Points
-				(2311, 1686)
-				(2016, 1686)
-				(2016, 1425))
-			    line_style 	3
-			    origin_attachment 	(2311, 1686)
-			    terminal_attachment 	(2016, 1425)
-			    label      	(object SegLabel @262
-				Parent_View 	@260
-				location   	(2070, 1481)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))))
-	(object ClassDiagram "2.1.1 Naming and Linking"
-	    quid       	"3AE8ED7201BD"
-	    title      	"2.1.1 Naming and Linking"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IImport" @263
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1712, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@263
-			location   	(1422, 177)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	580
-			justify    	0
-			label      	"IImport")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@263
-			location   	(1422, 127)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	580
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84B2020119"
-		    width      	598
-		    height     	218
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Namespace" @264
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(432, 1136)
-		    label      	(object ItemLabel
-			Parent_View 	@264
-			location   	(202, 1041)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	461
-			justify    	0
-			label      	"Namespace")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AEA3CD30030"
-		    width      	479
-		    height     	215
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::xsd::XSDSchema" @265
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1632, 1216)
-		    label      	(object ItemLabel
-			Parent_View 	@265
-			location   	(1294, 1142)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	676
-			justify    	0
-			label      	"XSDSchema")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"374B182500BB"
-		    width      	694
-		    height     	173
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Definition" @266
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(400, 384)
-		    label      	(object ItemLabel
-			Parent_View 	@266
-			location   	(164, 236)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	472
-			justify    	0
-			label      	"Definition")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E43F008E"
-		    width      	490
-		    height     	320
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$37" @267
-		    location   	(309, 786)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEA3D55002D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eNamespaces" @268
-			    Parent_View 	@267
-			    location   	(-91, 258)
-			    label      	(object SegLabel @269
-				Parent_View 	@268
-				location   	(461, 956)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	288
-				justify    	0
-				label      	"+eNamespaces"
-				pctDist    	0.698842
-				height     	152
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA3D560332"
-			    client     	@267
-			    supplier   	@264
-			    line_style 	3
-			    origin_attachment 	(309, 786)
-			    terminal_attachment 	(309, 1029)
-			    label      	(object SegLabel @270
-				Parent_View 	@268
-				location   	(248, 973)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.768707
-				height     	62
-				orientation 	1)
-			    label      	(object SegLabel @271
-				Parent_View 	@268
-				location   	(228, 913)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	146
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.525097
-				height     	82
-				orientation 	1))
-			(object RoleView "$UNNAMED$38" @272
-			    Parent_View 	@267
-			    location   	(-91, 258)
-			    label      	(object SegLabel @273
-				Parent_View 	@272
-				location   	(268, 592)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	192
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA3D560328"
-			    client     	@267
-			    supplier   	@266
-			    line_style 	3
-			    origin_attachment 	(309, 786)
-			    terminal_attachment 	(309, 544)
-			    label      	(object SegLabel @274
-				Parent_View 	@272
-				location   	(239, 583)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.844961
-				height     	71
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::wsdl::Import" @275
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1472, 720)
-		    label      	(object ItemLabel
-			Parent_View 	@275
-			location   	(1255, 580)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	434
-			justify    	0
-			label      	"Import")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E4F903DE"
-		    width      	452
-		    height     	304
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$51" @276
-		    location   	(1486, 1001)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8B1DCC02E5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eSchema" @277
-			    Parent_View 	@276
-			    location   	(510, -103)
-			    label      	(object SegLabel @278
-				Parent_View 	@277
-				location   	(1737, 1018)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	204
-				justify    	0
-				label      	"+eSchema"
-				pctDist    	0.592593
-				height     	105
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1DCE0270"
-			    client     	@276
-			    supplier   	@265
-			    vertices   	(list Points
-				(1486, 1001)
-				(1632, 1001)
-				(1632, 1130))
-			    line_style 	3
-			    origin_attachment 	(1486, 1001)
-			    terminal_attachment 	(1632, 1130)
-			    label      	(object SegLabel @279
-				Parent_View 	@277
-				location   	(1563, 1018)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.592593
-				height     	70
-				orientation 	1))
-			(object RoleView "$UNNAMED$52" @280
-			    Parent_View 	@276
-			    location   	(510, -103)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1DCE027A"
-			    client     	@276
-			    supplier   	@275
-			    line_style 	3
-			    origin_attachment 	(1486, 872)
-			    terminal_attachment 	(1486, 872))))
-		(object AssociationViewNew "$UNNAMED$39" @281
-		    location   	(1087, 403)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEA3E3A002D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$40" @282
-			    Parent_View 	@281
-			    location   	(687, -125)
-			    label      	(object SegLabel @283
-				Parent_View 	@282
-				location   	(1406, 480)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA3E3C01F2"
-			    client     	@281
-			    supplier   	@275
-			    vertices   	(list Points
-				(1087, 403)
-				(1364, 403)
-				(1364, 568))
-			    line_style 	3
-			    origin_attachment 	(1087, 403)
-			    terminal_attachment 	(1364, 568))
-			(object RoleView "eDefinition" @284
-			    Parent_View 	@281
-			    location   	(687, -125)
-			    label      	(object SegLabel @285
-				Parent_View 	@284
-				location   	(805, 363)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	216
-				justify    	0
-				label      	"+eDefinition"
-				pctDist    	0.637532
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AEA3E3C01E8"
-			    client     	@281
-			    supplier   	@266
-			    line_style 	3
-			    origin_attachment 	(1087, 403)
-			    terminal_attachment 	(645, 403)
-			    label      	(object SegLabel @286
-				Parent_View 	@284
-				location   	(727, 456)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.814910
-				height     	53
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$57" @287
-		    location   	(737, 826)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C864DFF02EC"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$58" @288
-			    Parent_View 	@287
-			    location   	(-671, 106)
-			    label      	(object SegLabel @289
-				Parent_View 	@288
-				location   	(552, 647)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C864DFF02EE"
-			    client     	@287
-			    supplier   	@266
-			    vertices   	(list Points
-				(737, 826)
-				(510, 826)
-				(510, 544))
-			    line_style 	3
-			    origin_attachment 	(737, 826)
-			    terminal_attachment 	(510, 544)
-			    label      	(object SegLabel @290
-				Parent_View 	@288
-				location   	(457, 595)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "eImports" @291
-			    Parent_View 	@287
-			    location   	(-671, 106)
-			    label      	(object SegLabel @292
-				Parent_View 	@291
-				location   	(1144, 773)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	180
-				justify    	0
-				label      	"+eImports"
-				pctDist    	0.799189
-				height     	54
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C864DFF02ED"
-			    client     	@287
-			    supplier   	@275
-			    line_style 	3
-			    origin_attachment 	(737, 826)
-			    terminal_attachment 	(1246, 826)
-			    label      	(object SegLabel @293
-				Parent_View 	@291
-				location   	(1180, 879)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.872211
-				height     	53
-				orientation 	1)
-			    label      	(object SegLabel @294
-				Parent_View 	@291
-				location   	(1162, 933)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	146
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.837728
-				height     	107
-				orientation 	1))))
-		(object InheritView "" @295
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F200D0340"
-		    client     	@275
-		    supplier   	@263
-		    line_style 	3
-		    origin_attachment 	(1555, 568)
-		    terminal_attachment 	(1555, 333))))
-	(object ClassDiagram "2.2 Types"
-	    quid       	"3B85AE59037E"
-	    title      	"2.2 Types"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	81
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::xsd::XSDTypeDefinition" @296
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1136, 1232)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@296
-			location   	(895, 1157)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	482
-			justify    	0
-			label      	"XSDTypeDefinition")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B66ECD302A9"
-		    width      	500
-		    height     	174
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::xsd::XSDElementDeclaration" @297
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1136, 1600)
-		    label      	(object ItemLabel
-			Parent_View 	@297
-			location   	(906, 1531)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	460
-			justify    	0
-			label      	"XSDElementDeclaration")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B66ED580214"
-		    width      	478
-		    height     	162
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Message" @298
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1280, 1968)
-		    label      	(object ItemLabel
-			Parent_View 	@298
-			location   	(1022, 1828)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	517
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	535
-		    height     	305
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Part" @299
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(352, 1184)
-		    label      	(object ItemLabel
-			Parent_View 	@299
-			location   	(128, 1067)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	448
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    width      	466
-		    height     	258
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$47" @300
-		    location   	(735, 1172)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8B1BE900C4"
-		    roleview_list 	(list RoleViews
-			(object RoleView "typeDefinition" @301
-			    Parent_View 	@300
-			    location   	(143, 676)
-			    label      	(object SegLabel @302
-				Parent_View 	@301
-				location   	(775, 1133)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	276
-				justify    	0
-				label      	"+typeDefinition"
-				pctDist    	0.269006
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1BE90327"
-			    client     	@300
-			    supplier   	@296
-			    line_style 	3
-			    origin_attachment 	(735, 1172)
-			    terminal_attachment 	(886, 1172)
-			    label      	(object SegLabel @303
-				Parent_View 	@301
-				location   	(839, 1207)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.688705
-				height     	35
-				orientation 	1))
-			(object RoleView "$UNNAMED$48" @304
-			    Parent_View 	@300
-			    location   	(143, 676)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1BE90331"
-			    client     	@300
-			    supplier   	@299
-			    line_style 	3
-			    origin_attachment 	(735, 1172)
-			    terminal_attachment 	(585, 1172))))
-		(object AssociationViewNew "$UNNAMED$49" @305
-		    location   	(527, 1592)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8B1C1203B2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "elementDeclaration" @306
-			    Parent_View 	@305
-			    location   	(-65, 1096)
-			    label      	(object SegLabel @307
-				Parent_View 	@306
-				location   	(666, 1554)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	372
-				justify    	0
-				label      	"+elementDeclaration"
-				pctDist    	0.375394
-				height     	39
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1C14001C"
-			    client     	@305
-			    supplier   	@297
-			    line_style 	3
-			    origin_attachment 	(527, 1592)
-			    terminal_attachment 	(897, 1592)
-			    label      	(object SegLabel @308
-				Parent_View 	@306
-				location   	(807, 1645)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.755877
-				height     	53
-				orientation 	1))
-			(object RoleView "$UNNAMED$50" @309
-			    Parent_View 	@305
-			    location   	(-65, 1096)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1C140026"
-			    client     	@305
-			    supplier   	@299
-			    vertices   	(list Points
-				(527, 1592)
-				(437, 1592)
-				(437, 1313))
-			    line_style 	3
-			    origin_attachment 	(527, 1592)
-			    terminal_attachment 	(437, 1313))))
-		(object AssociationViewNew "$UNNAMED$55" @310
-		    location   	(322, 1911)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C46829303E5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eMessage" @311
-			    Parent_View 	@310
-			    location   	(-14, 1191)
-			    label      	(object SegLabel @312
-				Parent_View 	@311
-				location   	(838, 1872)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	216
-				justify    	0
-				label      	"+eMessage"
-				pctDist    	0.748560
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C468296010E"
-			    client     	@310
-			    supplier   	@298
-			    line_style 	3
-			    origin_attachment 	(322, 1911)
-			    terminal_attachment 	(1013, 1911)
-			    label      	(object SegLabel @313
-				Parent_View 	@311
-				location   	(943, 1965)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$56" @314
-			    Parent_View 	@310
-			    location   	(-14, 1191)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C4682960118"
-			    client     	@310
-			    supplier   	@299
-			    vertices   	(list Points
-				(322, 1911)
-				(229, 1911)
-				(229, 1313))
-			    line_style 	3
-			    origin_attachment 	(322, 1911)
-			    terminal_attachment 	(229, 1313))))
-		(object ClassView "Class" "Logical View::wsdl::Types" @315
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(800, 608)
-		    label      	(object ItemLabel
-			Parent_View 	@315
-			location   	(615, 512)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	371
-			justify    	0
-			label      	"Types")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B8BE9A603A8"
-		    width      	389
-		    height     	216
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Definition" @316
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(176, 160)
-		    label      	(object ItemLabel
-			Parent_View 	@316
-			location   	(74, 107)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	204
-			justify    	0
-			label      	"Definition")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E43F008E"
-		    width      	222
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$53" @317
-		    location   	(234, 604)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEA27029F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eTypes" @318
-			    Parent_View 	@317
-			    location   	(-150, 396)
-			    label      	(object SegLabel @319
-				Parent_View 	@318
-				location   	(480, 640)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	207
-				justify    	0
-				label      	"+eTypes"
-				pctDist    	0.661017
-				height     	36
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8BEA29036A"
-			    client     	@317
-			    supplier   	@315
-			    line_style 	3
-			    origin_attachment 	(234, 604)
-			    terminal_attachment 	(606, 604)
-			    label      	(object SegLabel @320
-				Parent_View 	@318
-				location   	(526, 569)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.783883
-				height     	36
-				orientation 	0))
-			(object RoleView "$UNNAMED$54" @321
-			    Parent_View 	@317
-			    location   	(-150, 396)
-			    label      	(object SegLabel @322
-				Parent_View 	@321
-				location   	(133, 313)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8BEA290356"
-			    client     	@317
-			    supplier   	@316
-			    vertices   	(list Points
-				(234, 604)
-				(174, 604)
-				(174, 225))
-			    line_style 	3
-			    origin_attachment 	(234, 604)
-			    terminal_attachment 	(174, 225)
-			    label      	(object SegLabel @323
-				Parent_View 	@321
-				location   	(228, 271)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.897729
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::ITypes" @324
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(640, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@324
-			location   	(525, 203)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	230
-			justify    	0
-			label      	"ITypes")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@324
-			location   	(525, 153)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	230
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3CADCBB20050"
-		    width      	248
-		    height     	166
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::XSDSchemaExtensibilityElement" @325
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1728, 800)
-		    label      	(object ItemLabel
-			Parent_View 	@325
-			location   	(1359, 753)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	739
-			justify    	0
-			label      	"XSDSchemaExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3CC360D7039C"
-		    width      	757
-		    height     	118
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::xsd::XSDSchema" @326
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1856, 1216)
-		    label      	(object ItemLabel
-			Parent_View 	@326
-			location   	(1529, 1103)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	655
-			justify    	0
-			label      	"XSDSchema")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"374B182500BB"
-		    width      	673
-		    height     	250
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$59" @327
-		    location   	(1826, 975)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CC3614500F2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$60" @328
-			    Parent_View 	@327
-			    location   	(306, 447)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3CC36146023D"
-			    client     	@327
-			    supplier   	@325
-			    line_style 	3
-			    origin_attachment 	(1826, 975)
-			    terminal_attachment 	(1826, 859)
-			    label      	(object SegLabel @329
-				Parent_View 	@328
-				location   	(1774, 900)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.656489
-				height     	53
-				orientation 	0))
-			(object RoleView "schema" @330
-			    Parent_View 	@327
-			    location   	(306, 447)
-			    label      	(object SegLabel @331
-				Parent_View 	@330
-				location   	(2006, 1033)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	168
-				justify    	0
-				label      	"+schema"
-				pctDist    	0.507576
-				height     	180
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3CC36146023E"
-			    client     	@327
-			    supplier   	@326
-			    line_style 	3
-			    origin_attachment 	(1826, 975)
-			    terminal_attachment 	(1826, 1091)
-			    label      	(object SegLabel @332
-				Parent_View 	@330
-				location   	(1788, 1050)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.651515
-				height     	39
-				orientation 	1))))
-		(object InheritView "" @333
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CADCD3B0380"
-		    client     	@315
-		    supplier   	@324
-		    line_style 	3
-		    origin_attachment 	(705, 500)
-		    terminal_attachment 	(705, 307))
-		(object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @334
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1056, 224)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@334
-			location   	(815, 130)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	482
-			justify    	0
-			label      	"ExtensibleElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5FCFA033A"
-		    width      	500
-		    height     	212
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @335
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEB010311"
-		    client     	@315
-		    supplier   	@334
-		    line_style 	3
-		    origin_attachment 	(854, 500)
-		    terminal_attachment 	(854, 330))
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @336
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1824, 464)
-		    label      	(object ItemLabel
-			Parent_View 	@336
-			location   	(1490, 368)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	669
-			justify    	0
-			label      	"ExtensibilityElement")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5DBB602A9"
-		    width      	687
-		    height     	216
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$21" @337
-		    location   	(1206, 493)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FD130079"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$22" @338
-			    Parent_View 	@337
-			    location   	(-586, 237)
-			    label      	(object SegLabel @339
-				Parent_View 	@338
-				location   	(1136, 386)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019E"
-			    client     	@337
-			    supplier   	@334
-			    vertices   	(list Points
-				(1206, 493)
-				(1094, 493)
-				(1094, 330))
-			    line_style 	3
-			    origin_attachment 	(1206, 493)
-			    terminal_attachment 	(1094, 330)
-			    label      	(object SegLabel @340
-				Parent_View 	@338
-				location   	(1042, 377)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.828326
-				height     	53
-				orientation 	0))
-			(object RoleView "eExtensibilityElements" @341
-			    Parent_View 	@337
-			    location   	(-586, 237)
-			    label      	(object SegLabel @342
-				Parent_View 	@341
-				location   	(1196, 454)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	444
-				justify    	0
-				label      	"+eExtensibilityElements"
-				pctDist    	-0.039711
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5FD14019D"
-			    client     	@337
-			    supplier   	@336
-			    line_style 	3
-			    origin_attachment 	(1206, 493)
-			    terminal_attachment 	(1481, 493)
-			    label      	(object SegLabel @343
-				Parent_View 	@341
-				location   	(1415, 546)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.764957
-				height     	53
-				orientation 	1)
-			    label      	(object SegLabel @344
-				Parent_View 	@341
-				location   	(1396, 392)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	146
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.694915
-				height     	102
-				orientation 	0))))
-		(object InheritView "" @345
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CC3627F00B7"
-		    client     	@325
-		    supplier   	@336
-		    line_style 	3
-		    origin_attachment 	(1812, 741)
-		    terminal_attachment 	(1812, 572))))
-	(object ClassDiagram "2.3 Messages"
-	    quid       	"3BCE853D02C8"
-	    title      	"2.3 Messages"
-	    zoom       	85
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IMessage" @346
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(448, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@346
-			location   	(267, 122)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	362
-			justify    	0
-			label      	"IMessage")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@346
-			location   	(267, 72)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	362
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A8AF004F"
-		    width      	380
-		    height     	328
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IPart" @347
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1328, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@347
-			location   	(1029, 124)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	599
-			justify    	0
-			label      	"IPart")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@347
-			location   	(1029, 74)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	599
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84A93F01BE"
-		    width      	617
-		    height     	324
-		    annotation 	8)
-		(object ClassView "Class" "Logical View::wsdl::Part" @348
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1312, 816)
-		    label      	(object ItemLabel
-			Parent_View 	@348
-			location   	(1075, 690)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	474
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    width      	492
-		    height     	276
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @349
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84A96D02F1"
-		    client     	@348
-		    supplier   	@347
-		    line_style 	3
-		    origin_attachment 	(1304, 678)
-		    terminal_attachment 	(1304, 386))
-		(object ClassView "Class" "Logical View::wsdl::Message" @350
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(448, 656)
-		    label      	(object ItemLabel
-			Parent_View 	@350
-			location   	(241, 507)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	414
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	432
-		    height     	322
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @351
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84A8D102BA"
-		    client     	@350
-		    supplier   	@346
-		    line_style 	3
-		    origin_attachment 	(445, 495)
-		    terminal_attachment 	(445, 388))
-		(object AssociationViewNew "$UNNAMED$1" @352
-		    location   	(688, 952)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5CEBE00E2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eParts" @353
-			    Parent_View 	@352
-			    location   	(176, 328)
-			    label      	(object SegLabel @354
-				Parent_View 	@353
-				location   	(952, 897)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	144
-				justify    	0
-				label      	"+eParts"
-				pctDist    	0.697452
-				height     	56
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5CEBF0061"
-			    client     	@352
-			    supplier   	@348
-			    line_style 	3
-			    origin_attachment 	(688, 952)
-			    terminal_attachment 	(1066, 952)
-			    label      	(object SegLabel @355
-				Parent_View 	@353
-				location   	(987, 1005)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.789809
-				height     	53
-				orientation 	1)
-			    label      	(object SegLabel @356
-				Parent_View 	@353
-				location   	(967, 1061)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	154
-				justify    	0
-				label      	"{ordered}"
-				pctDist    	0.742038
-				height     	109
-				orientation 	1))
-			(object RoleView "$UNNAMED$2" @357
-			    Parent_View 	@352
-			    location   	(176, 328)
-			    label      	(object SegLabel @358
-				Parent_View 	@357
-				location   	(404, 893)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3AD5CEBF0057"
-			    client     	@352
-			    supplier   	@350
-			    vertices   	(list Points
-				(688, 952)
-				(445, 952)
-				(445, 817))
-			    line_style 	3
-			    origin_attachment 	(688, 952)
-			    terminal_attachment 	(445, 817)
-			    label      	(object SegLabel @359
-				Parent_View 	@357
-				location   	(393, 912)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..1"
-				pctDist    	0.747604
-				height     	53
-				orientation 	0))))))))

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore b/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore
deleted file mode 100644
index 317735f..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore
+++ /dev/null

@@ -1,606 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="wsdl"
-    nsURI="http://www.eclipse.org/wsdl/2003/WSDL" nsPrefix="wsdl">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="The WSDL model contains classes for the Web Services Description Language (WSDL).&#xD;&#xA;&#xD;&#xA;WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.&#xD;&#xA;&#xD;&#xA;WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.&#xD;&#xA;&#xD;&#xA;The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)&#xD;&#xA;- 2.1 Definition, shows the WSDL definition element and the WSDL document structure&#xD;&#xA;- 2.1.1 Naming and Linking, shows the namespace and import mechanism&#xD;&#xA;- 2.1.3 Extensibility, shows the WSDL extensibility mechanism&#xD;&#xA;- 2.2 Types, shows the use of XML Schema types in WSDL&#xD;&#xA;- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.&#xD;&#xA;&#xD;&#xA;The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces."/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDLElement" abstract="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL language element."/>
-    </eAnnotations>
-    <eOperations name="getEnclosingDefinition" eType="#//Definition"/>
-    <eOperations name="setEnclosingDefinition">
-      <eParameters name="definition" eType="#//Definition"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="documentationElement" eType="#//DOMElement"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="element" eType="#//DOMElement"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PortType" eSuperTypes="#//WSDLElement #//IPortType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="undefined" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eOperations" upperBound="-1"
-        eType="#//Operation" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Operation" eSuperTypes="#//WSDLElement #//IOperation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="#//OperationType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="undefined" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eInput" eType="#//Input"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eOutput" eType="#//Output"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eFaults" upperBound="-1"
-        eType="#//Fault" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eParameterOrdering" upperBound="-1"
-        eType="#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Message" eSuperTypes="#//WSDLElement #//IMessage">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="undefined" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eParts" upperBound="-1"
-        eType="#//Part" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Part" eSuperTypes="#//WSDLElement #//IPart">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typeDefinition" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDTypeDefinition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementDeclaration" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDElementDeclaration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eMessage" eType="#//Message"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Binding" eSuperTypes="#//ExtensibleElement #//IBinding">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="undefined" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePortType" lowerBound="1"
-        eType="#//PortType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBindingOperations" upperBound="-1"
-        eType="#//BindingOperation" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BindingOperation" eSuperTypes="#//ExtensibleElement #//IBindingOperation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. "/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eOperation" lowerBound="1"
-        eType="#//Operation"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBindingInput" eType="#//BindingInput"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBindingOutput" eType="#//BindingOutput"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBindingFaults" upperBound="-1"
-        eType="#//BindingFault" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Service" eSuperTypes="#//ExtensibleElement #//IService">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL service element. A service groups a set of related ports together."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="undefined" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePorts" upperBound="-1"
-        eType="#//Port" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Port" eSuperTypes="#//ExtensibleElement #//IPort">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBinding" lowerBound="1"
-        eType="#//Binding"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtensibilityElement" eSuperTypes="#//WSDLElement #//IExtensibilityElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementType" eType="#//QName"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Definition" eSuperTypes="#//ExtensibleElement #//IDefinition">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document."/>
-    </eAnnotations>
-    <eOperations name="getDocument" eType="#//DOMDocument"/>
-    <eOperations name="setDocument">
-      <eParameters name="document" eType="#//DOMDocument"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qName" eType="#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="encoding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eMessages" upperBound="-1"
-        eType="#//Message" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePortTypes" upperBound="-1"
-        eType="#//PortType" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eBindings" upperBound="-1"
-        eType="#//Binding" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eServices" upperBound="-1"
-        eType="#//Service" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eNamespaces" upperBound="-1"
-        eType="#//Namespace" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eTypes" eType="#//Types"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eImports" upperBound="-1"
-        eType="#//Import" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Import" eSuperTypes="#//WSDLElement #//IImport">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element."/>
-    </eAnnotations>
-    <eOperations name="getSchema" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDSchema"/>
-    <eOperations name="setSchema">
-      <eParameters name="schema" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDSchema"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eDefinition" eType="#//Definition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eSchema" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDSchema"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtensibleElement" abstract="true" eSuperTypes="#//WSDLElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value=" WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility."/>
-    </eAnnotations>
-    <eOperations name="getExtensibilityElements" eType="#//IList"/>
-    <eOperations name="addExtensibilityElement">
-      <eParameters name="extElement" eType="#//IExtensibilityElement"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eExtensibilityElements"
-        upperBound="-1" eType="#//ExtensibilityElement" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Input" eSuperTypes="#//MessageReference #//WSDLElement #//IInput">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Output" eSuperTypes="#//MessageReference #//WSDLElement #//IOutput">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Fault" eSuperTypes="#//MessageReference #//WSDLElement #//IFault">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation "/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BindingInput" eSuperTypes="#//ExtensibleElement #//IBindingInput">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. "/>
-    </eAnnotations>
-    <eOperations name="getInput" eType="#//IInput"/>
-    <eOperations name="setInput">
-      <eParameters name="input" eType="#//IInput"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eInput" lowerBound="1"
-        eType="#//Input"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BindingOutput" eSuperTypes="#//ExtensibleElement #//IBindingOutput">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. "/>
-    </eAnnotations>
-    <eOperations name="getOutput" eType="#//IOutput"/>
-    <eOperations name="setOutput">
-      <eParameters name="output" eType="#//IOutput"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eOutput" lowerBound="1"
-        eType="#//Output"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BindingFault" eSuperTypes="#//ExtensibleElement #//IBindingFault">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. "/>
-    </eAnnotations>
-    <eOperations name="getFault" eType="#//IFault"/>
-    <eOperations name="setFault">
-      <eParameters name="fault" eType="#//IFault"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eFault" lowerBound="1"
-        eType="#//Fault"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="QName" instanceClassName="javax.xml.namespace.QName">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.QName class. A QName is a fully qualified name."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Namespace">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a namespace and the corresponding namespace prefix used in a WSDL document."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="URI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="OperationType" instanceClassName="javax.wsdl.OperationType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="ONE_WAY=1&#xD;&#xA;REQUEST_RESPONSE=2&#xD;&#xA;SOLICIT_RESPONSE=3&#xD;&#xA;NOTIFICATION=4"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPortType" instanceClassName="javax.wsdl.PortType"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.PortType non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addOperation">
-      <eParameters name="operation" eType="#//IOperation"/>
-    </eOperations>
-    <eOperations name="getOperation" eType="#//IOperation">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="inputName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="outputName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getOperations" eType="#//IList"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IOperation" instanceClassName="javax.wsdl.Operation"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Operation non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addFault">
-      <eParameters name="fault" eType="#//IFault"/>
-    </eOperations>
-    <eOperations name="getFault" eType="#//IFault">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getFaults" eType="#//IMap"/>
-    <eOperations name="getParameterOrdering" eType="#//IList"/>
-    <eOperations name="setParameterOrdering">
-      <eParameters name="parameterOrder" eType="#//IList"/>
-    </eOperations>
-    <eOperations name="getInput" eType="#//IInput"/>
-    <eOperations name="setInput">
-      <eParameters name="input" eType="#//IInput"/>
-    </eOperations>
-    <eOperations name="getOutput" eType="#//IOutput"/>
-    <eOperations name="setOutput">
-      <eParameters name="output" eType="#//IOutput"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IInput" instanceClassName="javax.wsdl.Input"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Input non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="getMessage" eType="#//IMessage"/>
-    <eOperations name="setMessage">
-      <eParameters name="message" eType="#//IMessage"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IOutput" instanceClassName="javax.wsdl.Output"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Output non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="getMessage" eType="#//IMessage"/>
-    <eOperations name="setMessage">
-      <eParameters name="message" eType="#//IMessage"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IFault" instanceClassName="javax.wsdl.Fault"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Fault non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="getMessage" eType="#//IMessage"/>
-    <eOperations name="setMessage">
-      <eParameters name="message" eType="#//IMessage"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IMessage" instanceClassName="javax.wsdl.Message"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Message non-MOF interface"/>
-    </eAnnotations>
-    <eOperations name="addPart">
-      <eParameters name="part" eType="#//IPart"/>
-    </eOperations>
-    <eOperations name="getPart" eType="#//IPart">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getParts" eType="#//IMap"/>
-    <eOperations name="getOrderedParts" eType="#//IList">
-      <eParameters name="partOrder" eType="#//IList"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPart" instanceClassName="javax.wsdl.Part"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Part non-MOF interface"/>
-    </eAnnotations>
-    <eOperations name="setExtensionAttribute" eExceptions="#//WSDLException">
-      <eParameters name="name" eType="#//QName"/>
-      <eParameters name="value" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getExtensionAttributeNames" eType="#//IIterator"/>
-    <eOperations name="getExtensionAttribute" eType="#//QName">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IService" instanceClassName="javax.wsdl.Service"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Service non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addPort">
-      <eParameters name="port" eType="#//IPort"/>
-    </eOperations>
-    <eOperations name="getPorts" eType="#//IMap"/>
-    <eOperations name="getPort" eType="#//IPort">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPort" instanceClassName="javax.wsdl.Port"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Port non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="getBinding" eType="#//IBinding"/>
-    <eOperations name="setBinding">
-      <eParameters name="binding" eType="#//IBinding"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IBinding" instanceClassName="javax.wsdl.Binding"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Binding non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addBindingOperation">
-      <eParameters name="bindingOperation" eType="#//IBindingOperation"/>
-    </eOperations>
-    <eOperations name="getBindingOperation" eType="#//IBindingOperation">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="inputName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="outputName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getBindingOperations" eType="#//IList"/>
-    <eOperations name="getPortType" eType="#//IPortType"/>
-    <eOperations name="setPortType">
-      <eParameters name="portType" eType="#//IPortType"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IBindingOperation" instanceClassName="javax.wsdl.BindingOperation"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.BindingOperation non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addBindingFault">
-      <eParameters name="bindingFault" eType="#//IBindingFault"/>
-    </eOperations>
-    <eOperations name="getBindingFault" eType="#//IBindingFault">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getBindingFaults" eType="#//IMap"/>
-    <eOperations name="getOperation" eType="#//IOperation"/>
-    <eOperations name="setOperation">
-      <eParameters name="operation" eType="#//IOperation"/>
-    </eOperations>
-    <eOperations name="getBindingInput" eType="#//IBindingInput"/>
-    <eOperations name="setBindingInput">
-      <eParameters name="bindingInput" eType="#//IBindingInput"/>
-    </eOperations>
-    <eOperations name="getBindingOutput" eType="#//IBindingOutput"/>
-    <eOperations name="setBindingOutput">
-      <eParameters name="bindingOutput" eType="#//IBindingOutput"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IBindingInput" instanceClassName="javax.wsdl.BindingInput"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.BindingInput non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IBindingOutput" instanceClassName="javax.wsdl.BindingOutput"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.BindingOutput non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IBindingFault" instanceClassName="javax.wsdl.BindingFault"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.BindingFault non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DOMElement" instanceClassName="org.w3c.dom.Element">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the org.w3c.dom.Element non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IExtensibilityElement" instanceClassName="javax.wsdl.extensions.ExtensibilityElement"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.ExtensibilityElement non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IDefinition" instanceClassName="javax.wsdl.Definition"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Definition non-MOF interface."/>
-    </eAnnotations>
-    <eOperations name="addBinding">
-      <eParameters name="binding" eType="#//IBinding"/>
-    </eOperations>
-    <eOperations name="addImport">
-      <eParameters name="importDef" eType="#//IImport"/>
-    </eOperations>
-    <eOperations name="addMessage">
-      <eParameters name="message" eType="#//IMessage"/>
-    </eOperations>
-    <eOperations name="addNamespace">
-      <eParameters name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="addPortType">
-      <eParameters name="portType" eType="#//IPortType"/>
-    </eOperations>
-    <eOperations name="addService">
-      <eParameters name="service" eType="#//IService"/>
-    </eOperations>
-    <eOperations name="createBindingFault" eType="#//IBindingFault"/>
-    <eOperations name="createBindingInput" eType="#//IBindingInput"/>
-    <eOperations name="createBindingOutput" eType="#//IBindingOutput"/>
-    <eOperations name="createBindingOperation" eType="#//IBindingOperation"/>
-    <eOperations name="createBinding" eType="#//IBinding"/>
-    <eOperations name="createFault" eType="#//IFault"/>
-    <eOperations name="createImport" eType="#//IImport"/>
-    <eOperations name="createInput" eType="#//IInput"/>
-    <eOperations name="createMessage" eType="#//IMessage"/>
-    <eOperations name="createOperation" eType="#//IOperation"/>
-    <eOperations name="createOutput" eType="#//IOutput"/>
-    <eOperations name="createPart" eType="#//IPart"/>
-    <eOperations name="createPort" eType="#//IPort"/>
-    <eOperations name="createPortType" eType="#//IPortType"/>
-    <eOperations name="createService" eType="#//IService"/>
-    <eOperations name="getBinding" eType="#//IBinding">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getBindings" eType="#//IMap"/>
-    <eOperations name="getImports" eType="#//IMap"/>
-    <eOperations name="getImports" eType="#//IList">
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getMessage" eType="#//IMessage">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getMessages" eType="#//IMap"/>
-    <eOperations name="getNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eParameters name="prefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getNamespaces" eType="#//IMap"/>
-    <eOperations name="getPortType" eType="#//IPortType">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getPortTypes" eType="#//IMap"/>
-    <eOperations name="getPrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getService" eType="#//IService">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getServices" eType="#//IMap"/>
-    <eOperations name="getExtensionRegistry" eType="#//IExtensionRegistry"/>
-    <eOperations name="setExtensionRegistry">
-      <eParameters name="extensionRegistry" eType="#//IExtensionRegistry"/>
-    </eOperations>
-    <eOperations name="getDocumentBaseURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eOperations name="setDocumentBaseURI">
-      <eParameters name="documentBase" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="createTypes" eType="#//ITypes"/>
-    <eOperations name="removeService" eType="#//IService">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="removeBinding" eType="#//IBinding">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="removePortType" eType="#//IPortType">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="removeMessage" eType="#//IMessage">
-      <eParameters name="name" eType="#//QName"/>
-    </eOperations>
-    <eOperations name="getTypes" eType="#//ITypes"/>
-    <eOperations name="setTypes">
-      <eParameters name="types" eType="#//ITypes"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IImport" instanceClassName="javax.wsdl.Import"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Import non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IList" instanceClassName="java.util.List"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the non-MOF java.util.List interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IMap" instanceClassName="java.util.Map"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the non-MOF java.util.Map interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IURL" instanceClassName="java.net.URL"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the non-MOF java.net.URL interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IExtensionRegistry" instanceClassName="javax.wsdl.extensions.ExtensionRegistry"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the non-MOF javax.wsdl.extensions.ExtensionRegistry interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Types" eSuperTypes="#//ExtensibleElement #//ITypes">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages."/>
-    </eAnnotations>
-    <eOperations name="getSchemas" eType="#//IList"/>
-    <eOperations name="getSchemas" eType="#//IList">
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IIterator" instanceClassName="java.util.Iterator"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the non-MOF java.util.Iterator interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="WSDLException" instanceClassName="javax.wsdl.WSDLException">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Exception class."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ITypes" instanceClassName="javax.wsdl.Types"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the javax.wsdl.Types non-MOF interface"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UnknownExtensibilityElement" eSuperTypes="#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//UnknownExtensibilityElement" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XSDSchemaExtensibilityElement" eSuperTypes="#//ExtensibilityElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="schema" eType="ecore:EClass ../../../org.eclipse.xsd/src-xsd/model/XSD.ecore#//XSDSchema"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="DOMDocument" instanceClassName="org.w3c.dom.Document">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class represents the org.w3c.dom.Document non-MOF interface."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageReference" abstract="true" eSuperTypes="#//WSDLElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eMessage" lowerBound="1"
-        eType="#//Message"/>
-  </eClassifiers>
-</ecore:EPackage>

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.genmodel b/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.genmodel
deleted file mode 100644
index d3cc8d0..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.genmodel
+++ /dev/null

@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.wsdl/src"
-    editDirectory="/org.eclipse.wst.wsdl.edit/src" editorDirectory="org.eclipse.wst.wsdl.editor/src"
-    modelPluginID="org.eclipse.wst.wsdl" modelName="WSDL" editPluginClass="" editorPluginClass=""
-    usedGenPackages="../../../org.eclipse.xsd/src-xsd/model/XSD.genmodel#//xsd">
-  <foreignModel>..\rose\WSDL.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="WSDL" basePackage="org.eclipse.wst" disposableProviderFactory="true"
-      ecorePackage="wsdl.ecore#/">
-    <genDataTypes ecoreDataType="wsdl.ecore#//QName"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//OperationType"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMElement"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//WSDLException"/>
-    <genDataTypes ecoreDataType="wsdl.ecore#//DOMDocument"/>
-    <genClasses ecoreClass="wsdl.ecore#//WSDLElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/documentationElement"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//WSDLElement/element"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/getEnclosingDefinition"/>
-      <genOperations ecoreOperation="wsdl.ecore#//WSDLElement/setEnclosingDefinition">
-        <genParameters ecoreParameter="wsdl.ecore#//WSDLElement/setEnclosingDefinition/definition"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//PortType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//PortType/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//PortType/eOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Operation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/style"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Operation/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eFaults"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Operation/eParameterOrdering"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Message">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Message/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Message/eParts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Part">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/elementName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Part/typeName"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/typeDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/elementDeclaration"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Part/eMessage"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Binding">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Binding/resourceURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/ePortType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Binding/eBindingOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOperation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOperation/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eOperation"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingInput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingOutput"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOperation/eBindingFaults"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Service">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/undefined"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/proxy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Service/resourceURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Service/ePorts"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Port">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Port/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Port/eBinding"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibilityElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/required"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//ExtensibilityElement/elementType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Definition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/targetNamespace"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/location"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/qName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Definition/encoding"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eMessages"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/ePortTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eBindings"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eServices"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eNamespaces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eTypes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//Definition/eImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/getDocument"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Definition/setDocument">
-        <genParameters ecoreParameter="wsdl.ecore#//Definition/setDocument/document"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Import">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/namespaceURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Import/locationURI"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eDefinition"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//Import/eSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/getSchema"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Import/setSchema">
-        <genParameters ecoreParameter="wsdl.ecore#//Import/setSchema/schema"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//ExtensibleElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//ExtensibleElement/eExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/getExtensibilityElements"/>
-      <genOperations ecoreOperation="wsdl.ecore#//ExtensibleElement/addExtensibilityElement">
-        <genParameters ecoreParameter="wsdl.ecore#//ExtensibleElement/addExtensibilityElement/extElement"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Input"/>
-    <genClasses ecoreClass="wsdl.ecore#//Output"/>
-    <genClasses ecoreClass="wsdl.ecore#//Fault"/>
-    <genClasses ecoreClass="wsdl.ecore#//BindingInput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingInput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingInput/eInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingInput/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingInput/setInput/input"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingOutput">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingOutput/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingOutput/eOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingOutput/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingOutput/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//BindingFault">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//BindingFault/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//BindingFault/eFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/getFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//BindingFault/setFault">
-        <genParameters ecoreParameter="wsdl.ecore#//BindingFault/setFault/fault"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//Namespace">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/URI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//Namespace/prefix"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPortType">
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/addOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/addOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPortType/getOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPortType/getOperations"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/addFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/addFault/fault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/getFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getParameterOrdering"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setParameterOrdering">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setParameterOrdering/parameterOrder"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setInput/input"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/getOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOperation/setOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IOperation/setOutput/output"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IInput">
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IInput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IInput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IOutput">
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IOutput/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IOutput/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IFault">
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/getMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IFault/setMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IFault/setMessage/message"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IMessage">
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/addPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/addPart/part"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getPart">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getPart/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getParts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IMessage/getOrderedParts">
-        <genParameters ecoreParameter="wsdl.ecore#//IMessage/getOrderedParts/partOrder"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPart">
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/setExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/setExtensionAttribute/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttributeNames"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPart/getExtensionAttribute">
-        <genParameters ecoreParameter="wsdl.ecore#//IPart/getExtensionAttribute/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IService">
-      <genOperations ecoreOperation="wsdl.ecore#//IService/addPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/addPort/port"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPorts"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IService/getPort">
-        <genParameters ecoreParameter="wsdl.ecore#//IService/getPort/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IPort">
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/getBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IPort/setBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IPort/setBinding/binding"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBinding">
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/addBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/addBindingOperation/bindingOperation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/name"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/inputName"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/getBindingOperation/outputName"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getBindingOperations"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/getPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBinding/setPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IBinding/setPortType/portType"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOperation">
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/addBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/addBindingFault/bindingFault"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFault">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/getBindingFault/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingFaults"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setOperation">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setOperation/operation"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingInput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingInput/bindingInput"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/getBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IBindingOperation/setBindingOutput">
-        <genParameters ecoreParameter="wsdl.ecore#//IBindingOperation/setBindingOutput/bindingOutput"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingInput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingOutput"/>
-    <genClasses ecoreClass="wsdl.ecore#//IBindingFault"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensibilityElement"/>
-    <genClasses ecoreClass="wsdl.ecore#//IDefinition">
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addBinding/binding"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addImport">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addImport/importDef"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addMessage/message"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/prefix"/>
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addNamespace/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addPortType/portType"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/addService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/addService/service"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBindingOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createBinding"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createFault"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createImport"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createInput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createMessage"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOperation"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createOutput"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPart"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPort"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createPortType"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createService"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getBindings"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getImports.1">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getImports.1/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getMessages"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespace">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getNamespace/prefix"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getNamespaces"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPortTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getPrefix">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getPrefix/namespaceURI"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/getService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getServices"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getExtensionRegistry"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setExtensionRegistry">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setExtensionRegistry/extensionRegistry"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getDocumentBaseURI"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setDocumentBaseURI">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setDocumentBaseURI/documentBase"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/createTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeService">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeService/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeBinding">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeBinding/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removePortType">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removePortType/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/removeMessage">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/removeMessage/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/getTypes"/>
-      <genOperations ecoreOperation="wsdl.ecore#//IDefinition/setTypes">
-        <genParameters ecoreParameter="wsdl.ecore#//IDefinition/setTypes/types"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IImport"/>
-    <genClasses ecoreClass="wsdl.ecore#//IList"/>
-    <genClasses ecoreClass="wsdl.ecore#//IMap"/>
-    <genClasses ecoreClass="wsdl.ecore#//IURL"/>
-    <genClasses ecoreClass="wsdl.ecore#//IExtensionRegistry"/>
-    <genClasses ecoreClass="wsdl.ecore#//Types">
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas"/>
-      <genOperations ecoreOperation="wsdl.ecore#//Types/getSchemas.1">
-        <genParameters ecoreParameter="wsdl.ecore#//Types/getSchemas.1/namespaceURI"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//IIterator"/>
-    <genClasses ecoreClass="wsdl.ecore#//ITypes"/>
-    <genClasses ecoreClass="wsdl.ecore#//UnknownExtensibilityElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//UnknownExtensibilityElement/children"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//XSDSchemaExtensibilityElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdl.ecore#//XSDSchemaExtensibilityElement/schema"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdl.ecore#//MessageReference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdl.ecore#//MessageReference/name"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference wsdl.ecore#//MessageReference/eMessage"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Binding.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Binding.java
deleted file mode 100644
index 67c1687..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Binding.java
+++ /dev/null

@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL binding element. A binding defines message format and protocol details for operations and messages defined by a particular portType. There may be any number of bindings for a given portType.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Binding#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Binding#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Binding#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Binding#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Binding#getEPortType <em>EPort Type</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Binding#getEBindingOperations <em>EBinding Operations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getBinding()
- * @model 
- * @generated
- */
-public interface Binding extends ExtensibleElement, javax.wsdl.Binding{
-  /**
-   * Returns the value of the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>QName</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>QName</em>' attribute.
-   * @see #setQName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getBinding_QName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Binding#getQName <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>QName</em>' attribute.
-   * @see #getQName()
-   * @generated
-   */
-	void setQName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Undefined</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Undefined</em>' attribute.
-   * @see #setUndefined(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getBinding_Undefined()
-   * @model 
-   * @generated
-   */
-	boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Binding#isUndefined <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Undefined</em>' attribute.
-   * @see #isUndefined()
-   * @generated
-   */
-	void setUndefined(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>EPort Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EPort Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EPort Type</em>' reference.
-   * @see #setEPortType(PortType)
-   * @see org.eclipse.wsdl.WSDLPackage#getBinding_EPortType()
-   * @model required="true"
-   * @generated
-   */
-	PortType getEPortType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Binding#getEPortType <em>EPort Type</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EPort Type</em>' reference.
-   * @see #getEPortType()
-   * @generated
-   */
-	void setEPortType(PortType value);
-
-  /**
-   * Returns the value of the '<em><b>EBinding Operations</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.BindingOperation}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBinding Operations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBinding Operations</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getBinding_EBindingOperations()
-   * @model type="org.eclipse.wsdl.BindingOperation" containment="true"
-   * @generated
-   */
-	EList getEBindingOperations();
-
-} // Binding

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingFault.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingFault.java
deleted file mode 100644
index 74e955a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingFault.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding Fault</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL fault element within a operation within a binding. A fault element within an operation within a binding specifies binding information for the fault with the same name. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.BindingFault#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingFault#getEFault <em>EFault</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getBindingFault()
- * @model 
- * @generated
- */
-public interface BindingFault extends ExtensibleElement, javax.wsdl.BindingFault{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingFault_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingFault#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>EFault</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EFault</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EFault</em>' reference.
-   * @see #setEFault(Fault)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingFault_EFault()
-   * @model required="true"
-   * @generated
-   */
-	Fault getEFault();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingFault#getEFault <em>EFault</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EFault</em>' reference.
-   * @see #getEFault()
-   * @generated
-   */
-	void setEFault(Fault value);
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	javax.wsdl.Fault getFault();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	void setFault(javax.wsdl.Fault fault);
-
-} // BindingFault

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingInput.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingInput.java
deleted file mode 100644
index ff0f4ab..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingInput.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding Input</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL input element within a operation within a binding. An input element within an operation within a binding specifies binding information for the input of the operation. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.BindingInput#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingInput#getEInput <em>EInput</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getBindingInput()
- * @model 
- * @generated
- */
-public interface BindingInput extends ExtensibleElement, javax.wsdl.BindingInput{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingInput_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingInput#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>EInput</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EInput</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EInput</em>' reference.
-   * @see #setEInput(Input)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingInput_EInput()
-   * @model required="true"
-   * @generated
-   */
-	Input getEInput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingInput#getEInput <em>EInput</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EInput</em>' reference.
-   * @see #getEInput()
-   * @generated
-   */
-	void setEInput(Input value);
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	javax.wsdl.Input getInput();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	void setInput(javax.wsdl.Input input);
-
-} // BindingInput

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOperation.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOperation.java
deleted file mode 100644
index 084e3c9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOperation.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding Operation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL operation element within a binding. An operation element within a binding specifies binding information for the operation with the same name within the binding's portType. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.BindingOperation#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingOperation#getEOperation <em>EOperation</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingOperation#getEBindingInput <em>EBinding Input</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingOperation#getEBindingOutput <em>EBinding Output</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingOperation#getEBindingFaults <em>EBinding Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation()
- * @model 
- * @generated
- */
-public interface BindingOperation extends ExtensibleElement, javax.wsdl.BindingOperation{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingOperation#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>EOperation</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EOperation</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EOperation</em>' reference.
-   * @see #setEOperation(Operation)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation_EOperation()
-   * @model required="true"
-   * @generated
-   */
-	Operation getEOperation();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingOperation#getEOperation <em>EOperation</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EOperation</em>' reference.
-   * @see #getEOperation()
-   * @generated
-   */
-	void setEOperation(Operation value);
-
-  /**
-   * Returns the value of the '<em><b>EBinding Input</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBinding Input</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBinding Input</em>' containment reference.
-   * @see #setEBindingInput(BindingInput)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation_EBindingInput()
-   * @model containment="true"
-   * @generated
-   */
-	BindingInput getEBindingInput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingOperation#getEBindingInput <em>EBinding Input</em>}' containment reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EBinding Input</em>' containment reference.
-   * @see #getEBindingInput()
-   * @generated
-   */
-	void setEBindingInput(BindingInput value);
-
-  /**
-   * Returns the value of the '<em><b>EBinding Output</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBinding Output</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBinding Output</em>' containment reference.
-   * @see #setEBindingOutput(BindingOutput)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation_EBindingOutput()
-   * @model containment="true"
-   * @generated
-   */
-	BindingOutput getEBindingOutput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingOperation#getEBindingOutput <em>EBinding Output</em>}' containment reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EBinding Output</em>' containment reference.
-   * @see #getEBindingOutput()
-   * @generated
-   */
-	void setEBindingOutput(BindingOutput value);
-
-  /**
-   * Returns the value of the '<em><b>EBinding Faults</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.BindingFault}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBinding Faults</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBinding Faults</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOperation_EBindingFaults()
-   * @model type="org.eclipse.wsdl.BindingFault" containment="true"
-   * @generated
-   */
-	EList getEBindingFaults();
-
-} // BindingOperation

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOutput.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOutput.java
deleted file mode 100644
index 974df56..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOutput.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding Output</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL output element within a operation within a binding. An output element within an operation within a binding specifies binding information for the output of the operation. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.BindingOutput#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.BindingOutput#getEOutput <em>EOutput</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getBindingOutput()
- * @model 
- * @generated
- */
-public interface BindingOutput extends ExtensibleElement, javax.wsdl.BindingOutput{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOutput_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingOutput#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>EOutput</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EOutput</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EOutput</em>' reference.
-   * @see #setEOutput(Output)
-   * @see org.eclipse.wsdl.WSDLPackage#getBindingOutput_EOutput()
-   * @model required="true"
-   * @generated
-   */
-	Output getEOutput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.BindingOutput#getEOutput <em>EOutput</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EOutput</em>' reference.
-   * @see #getEOutput()
-   * @generated
-   */
-	void setEOutput(Output value);
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	javax.wsdl.Output getOutput();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	void setOutput(javax.wsdl.Output output);
-
-} // BindingOutput

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Definition.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Definition.java
deleted file mode 100644
index adcf7c4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Definition.java
+++ /dev/null

@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.util.EList;
-import org.w3c.dom.Document;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL definitions element. The WSDL definitions element is the root element of a WSDL document.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Definition#getTargetNamespace <em>Target Namespace</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Definition#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Definition#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Definition#getEncoding <em>Encoding</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Definition#getEMessages <em>EMessages</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Definition#getEPortTypes <em>EPort Types</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Definition#getEBindings <em>EBindings</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Definition#getEServices <em>EServices</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Definition#getENamespaces <em>ENamespaces</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Definition#getETypes <em>ETypes</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Definition#getEImports <em>EImports</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getDefinition()
- * @model 
- * @generated
- */
-public interface Definition extends ExtensibleElement, javax.wsdl.Definition{
-  /**
-   * Returns the value of the '<em><b>Target Namespace</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target Namespace</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Target Namespace</em>' attribute.
-   * @see #setTargetNamespace(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_TargetNamespace()
-   * @model 
-   * @generated
-   */
-	String getTargetNamespace();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Definition#getTargetNamespace <em>Target Namespace</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Target Namespace</em>' attribute.
-   * @see #getTargetNamespace()
-   * @generated
-   */
-	void setTargetNamespace(String value);
-
-  /**
-   * Returns the value of the '<em><b>Location</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Location</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Location</em>' attribute.
-   * @see #setLocation(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_Location()
-   * @model 
-   * @generated
-   */
-  String getLocation();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Definition#getLocation <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Location</em>' attribute.
-   * @see #getLocation()
-   * @generated
-   */
-  void setLocation(String value);
-
-  /**
-   * Returns the value of the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>QName</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>QName</em>' attribute.
-   * @see #setQName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_QName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Definition#getQName <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>QName</em>' attribute.
-   * @see #getQName()
-   * @generated
-   */
-	void setQName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Encoding</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Encoding</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Encoding</em>' attribute.
-   * @see #setEncoding(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_Encoding()
-   * @model 
-   * @generated
-   */
-	String getEncoding();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Definition#getEncoding <em>Encoding</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Encoding</em>' attribute.
-   * @see #getEncoding()
-   * @generated
-   */
-	void setEncoding(String value);
-
-  /**
-   * Returns the value of the '<em><b>EMessages</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Message}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EMessages</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EMessages</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_EMessages()
-   * @model type="org.eclipse.wsdl.Message" containment="true"
-   * @generated
-   */
-	EList getEMessages();
-
-  /**
-   * Returns the value of the '<em><b>EPort Types</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.PortType}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EPort Types</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EPort Types</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_EPortTypes()
-   * @model type="org.eclipse.wsdl.PortType" containment="true"
-   * @generated
-   */
-	EList getEPortTypes();
-
-  /**
-   * Returns the value of the '<em><b>EBindings</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Binding}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBindings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBindings</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_EBindings()
-   * @model type="org.eclipse.wsdl.Binding" containment="true"
-   * @generated
-   */
-	EList getEBindings();
-
-  /**
-   * Returns the value of the '<em><b>EServices</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Service}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EServices</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EServices</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_EServices()
-   * @model type="org.eclipse.wsdl.Service" containment="true"
-   * @generated
-   */
-	EList getEServices();
-
-  /**
-   * Returns the value of the '<em><b>ENamespaces</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Namespace}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>ENamespaces</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>ENamespaces</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_ENamespaces()
-   * @model type="org.eclipse.wsdl.Namespace" containment="true"
-   * @generated
-   */
-	EList getENamespaces();
-
-  /**
-   * Returns the value of the '<em><b>ETypes</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>ETypes</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>ETypes</em>' containment reference.
-   * @see #setETypes(Types)
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_ETypes()
-   * @model containment="true"
-   * @generated
-   */
-	Types getETypes();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Definition#getETypes <em>ETypes</em>}' containment reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>ETypes</em>' containment reference.
-   * @see #getETypes()
-   * @generated
-   */
-	void setETypes(Types value);
-
-  /**
-   * Returns the value of the '<em><b>EImports</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Import}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EImports</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EImports</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getDefinition_EImports()
-   * @model type="org.eclipse.wsdl.Import" containment="true"
-   * @generated
-   */
-	EList getEImports();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model dataType="org.eclipse.wsdl.DOMDocument" parameters=""
-   * @generated
-   */
-	Document getDocument();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model parameters="org.eclipse.wsdl.DOMDocument"
-   * @generated
-   */
-	void setDocument(Document document);
-
-} // Definition

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibilityElement.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibilityElement.java
deleted file mode 100644
index ee78ce2..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibilityElement.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.xml.namespace.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extensibility Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL extensibility element. WSDL allows extensibility elements representing a specific technology under various elements defined by WSDL.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.ExtensibilityElement#isRequired <em>Required</em>}</li>
- *   <li>{@link org.eclipse.wsdl.ExtensibilityElement#getElementType <em>Element Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getExtensibilityElement()
- * @model 
- * @generated
- */
-public interface ExtensibilityElement extends WSDLElement, javax.wsdl.extensions.ExtensibilityElement{
-  /**
-   * Returns the value of the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Required</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Required</em>' attribute.
-   * @see #setRequired(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getExtensibilityElement_Required()
-   * @model 
-   * @generated
-   */
-	boolean isRequired();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.ExtensibilityElement#isRequired <em>Required</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Required</em>' attribute.
-   * @see #isRequired()
-   * @generated
-   */
-	void setRequired(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Element Type</em>' attribute.
-   * @see #setElementType(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getExtensibilityElement_ElementType()
-   * @model dataType="org.eclipse.wsdl.QName" transient="true"
-   * @generated
-   */
-	QName getElementType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.ExtensibilityElement#getElementType <em>Element Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element Type</em>' attribute.
-   * @see #getElementType()
-   * @generated
-   */
-	void setElementType(QName value);
-
-} // ExtensibilityElement

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibleElement.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibleElement.java
deleted file mode 100644
index b53af3d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibleElement.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import java.util.List;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extensible Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *  WSDL allows elements representing a specific technology (referred to here as extensibility elements) under various elements defined by WSDL. This class represents a WSDL point of extensibility.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.ExtensibleElement#getEExtensibilityElements <em>EExtensibility Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getExtensibleElement()
- * @model abstract="true"
- * @generated
- */
-public interface ExtensibleElement extends WSDLElement{
-  /**
-   * Returns the value of the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.ExtensibilityElement}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EExtensibility Elements</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EExtensibility Elements</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getExtensibleElement_EExtensibilityElements()
-   * @model type="org.eclipse.wsdl.ExtensibilityElement" containment="true"
-   * @generated
-   */
-	EList getEExtensibilityElements();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	List getExtensibilityElements();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	void addExtensibilityElement(ExtensibilityElement extElement);
-
-} // ExtensibleElement

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Fault.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Fault.java
deleted file mode 100644
index 9878665..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Fault.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Fault</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL fault element. Fault elements specify the abstract message format for any error messages that may be output as the result of the operation 
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.wsdl.WSDLPackage#getFault()
- * @model 
- * @generated
- */
-public interface Fault extends MessageReference, WSDLElement, javax.wsdl.Fault{
-} // Fault

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Import.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Import.java
deleted file mode 100644
index 5c14597..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Import.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.xsd.XSDSchema;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Import</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents WSDL import element. WSDL allows associating a namespace with a document location using an import element.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Import#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Import#getLocationURI <em>Location URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Import#getEDefinition <em>EDefinition</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Import#getESchema <em>ESchema</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getImport()
- * @model 
- * @generated
- */
-public interface Import extends WSDLElement, javax.wsdl.Import{
-  /**
-   * Returns the value of the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Namespace URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Namespace URI</em>' attribute.
-   * @see #setNamespaceURI(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getImport_NamespaceURI()
-   * @model 
-   * @generated
-   */
-	String getNamespaceURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Import#getNamespaceURI <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Namespace URI</em>' attribute.
-   * @see #getNamespaceURI()
-   * @generated
-   */
-	void setNamespaceURI(String value);
-
-  /**
-   * Returns the value of the '<em><b>Location URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Location URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Location URI</em>' attribute.
-   * @see #setLocationURI(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getImport_LocationURI()
-   * @model 
-   * @generated
-   */
-	String getLocationURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Import#getLocationURI <em>Location URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Location URI</em>' attribute.
-   * @see #getLocationURI()
-   * @generated
-   */
-	void setLocationURI(String value);
-
-  /**
-   * Returns the value of the '<em><b>EDefinition</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EDefinition</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EDefinition</em>' reference.
-   * @see #setEDefinition(Definition)
-   * @see org.eclipse.wsdl.WSDLPackage#getImport_EDefinition()
-   * @model 
-   * @generated
-   */
-	Definition getEDefinition();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Import#getEDefinition <em>EDefinition</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EDefinition</em>' reference.
-   * @see #getEDefinition()
-   * @generated
-   */
-	void setEDefinition(Definition value);
-
-  /**
-   * Returns the value of the '<em><b>ESchema</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>ESchema</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>ESchema</em>' reference.
-   * @see #setESchema(XSDSchema)
-   * @see org.eclipse.wsdl.WSDLPackage#getImport_ESchema()
-   * @model 
-   * @generated
-   */
-	XSDSchema getESchema();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Import#getESchema <em>ESchema</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>ESchema</em>' reference.
-   * @see #getESchema()
-   * @generated
-   */
-	void setESchema(XSDSchema value);
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	XSDSchema getSchema();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	void setSchema(XSDSchema schema);
-
-} // Import

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Input.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Input.java
deleted file mode 100644
index 77281e6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Input.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Input</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL input element. An input element specifies the abstract message format for the input of the operation.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.wsdl.WSDLPackage#getInput()
- * @model 
- * @generated
- */
-public interface Input extends MessageReference, WSDLElement, javax.wsdl.Input{
-} // Input

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Message.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Message.java
deleted file mode 100644
index fb94d51..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Message.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL message element. A WSDL message is an abstract, typed definition of the data being communicated.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Message#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Message#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Message#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Message#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Message#getEParts <em>EParts</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getMessage()
- * @model 
- * @generated
- */
-public interface Message extends WSDLElement, javax.wsdl.Message{
-  /**
-   * Returns the value of the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>QName</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>QName</em>' attribute.
-   * @see #setQName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getMessage_QName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Message#getQName <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>QName</em>' attribute.
-   * @see #getQName()
-   * @generated
-   */
-	void setQName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Undefined</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Undefined</em>' attribute.
-   * @see #setUndefined(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getMessage_Undefined()
-   * @model 
-   * @generated
-   */
-	boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Message#isUndefined <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Undefined</em>' attribute.
-   * @see #isUndefined()
-   * @generated
-   */
-	void setUndefined(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>EParts</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Part}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EParts</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EParts</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getMessage_EParts()
-   * @model type="org.eclipse.wsdl.Part" containment="true"
-   * @generated
-   */
-	EList getEParts();
-
-} // Message

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/MessageReference.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/MessageReference.java
deleted file mode 100644
index 95c41e4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/MessageReference.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Reference</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.MessageReference#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.MessageReference#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getMessageReference()
- * @model abstract="true"
- * @generated
- */
-public interface MessageReference extends WSDLElement{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getMessageReference_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.MessageReference#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>EMessage</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>EMessage</em>' reference.
-   * @see #setEMessage(Message)
-   * @see org.eclipse.wsdl.WSDLPackage#getMessageReference_EMessage()
-   * @model required="true"
-   * @generated
-   */
-  Message getEMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.MessageReference#getEMessage <em>EMessage</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EMessage</em>' reference.
-   * @see #getEMessage()
-   * @generated
-   */
-  void setEMessage(Message value);
-
-} // MessageReference

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Namespace.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Namespace.java
deleted file mode 100644
index 4a30050..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Namespace.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Namespace</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a namespace and the corresponding namespace prefix used in a WSDL document.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Namespace#getURI <em>URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Namespace#getPrefix <em>Prefix</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getNamespace()
- * @model 
- * @generated
- */
-public interface Namespace extends EObject{
-  /**
-   * Returns the value of the '<em><b>URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>URI</em>' attribute.
-   * @see #setURI(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getNamespace_URI()
-   * @model 
-   * @generated
-   */
-	String getURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Namespace#getURI <em>URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>URI</em>' attribute.
-   * @see #getURI()
-   * @generated
-   */
-	void setURI(String value);
-
-  /**
-   * Returns the value of the '<em><b>Prefix</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Prefix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Prefix</em>' attribute.
-   * @see #setPrefix(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getNamespace_Prefix()
-   * @model 
-   * @generated
-   */
-	String getPrefix();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Namespace#getPrefix <em>Prefix</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Prefix</em>' attribute.
-   * @see #getPrefix()
-   * @generated
-   */
-	void setPrefix(String value);
-
-} // Namespace

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Operation.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Operation.java
deleted file mode 100644
index 773e0b7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Operation.java
+++ /dev/null

@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.wsdl.OperationType;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL operation element. A WSDL operation is an abstract description of an action supported by a service.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Operation#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getEInput <em>EInput</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getEOutput <em>EOutput</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getEFaults <em>EFaults</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Operation#getEParameterOrdering <em>EParameter Ordering</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getOperation()
- * @model 
- * @generated
- */
-public interface Operation extends WSDLElement, javax.wsdl.Operation{
-  /**
-   * Returns the value of the '<em><b>Style</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Style</em>' attribute.
-   * @see #setStyle(OperationType)
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_Style()
-   * @model dataType="org.eclipse.wsdl.OperationType"
-   * @generated
-   */
-	OperationType getStyle();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Operation#getStyle <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Style</em>' attribute.
-   * @see #getStyle()
-   * @generated
-   */
-	void setStyle(OperationType value);
-
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Operation#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Undefined</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Undefined</em>' attribute.
-   * @see #setUndefined(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_Undefined()
-   * @model 
-   * @generated
-   */
-	boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Operation#isUndefined <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Undefined</em>' attribute.
-   * @see #isUndefined()
-   * @generated
-   */
-	void setUndefined(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>EInput</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EInput</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EInput</em>' containment reference.
-   * @see #setEInput(Input)
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_EInput()
-   * @model containment="true"
-   * @generated
-   */
-	Input getEInput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Operation#getEInput <em>EInput</em>}' containment reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EInput</em>' containment reference.
-   * @see #getEInput()
-   * @generated
-   */
-	void setEInput(Input value);
-
-  /**
-   * Returns the value of the '<em><b>EOutput</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EOutput</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EOutput</em>' containment reference.
-   * @see #setEOutput(Output)
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_EOutput()
-   * @model containment="true"
-   * @generated
-   */
-	Output getEOutput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Operation#getEOutput <em>EOutput</em>}' containment reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EOutput</em>' containment reference.
-   * @see #getEOutput()
-   * @generated
-   */
-	void setEOutput(Output value);
-
-  /**
-   * Returns the value of the '<em><b>EFaults</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Fault}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EFaults</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EFaults</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_EFaults()
-   * @model type="org.eclipse.wsdl.Fault" containment="true"
-   * @generated
-   */
-	EList getEFaults();
-
-  /**
-   * Returns the value of the '<em><b>EParameter Ordering</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Part}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EParameter Ordering</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EParameter Ordering</em>' reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getOperation_EParameterOrdering()
-   * @model type="org.eclipse.wsdl.Part"
-   * @generated
-   */
-	EList getEParameterOrdering();
-
-} // Operation

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Output.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Output.java
deleted file mode 100644
index 1009ddb..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Output.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Output</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL output element. An output element specifies the abstract message format for the output of the operation.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.wsdl.WSDLPackage#getOutput()
- * @model 
- * @generated
- */
-public interface Output extends MessageReference, WSDLElement, javax.wsdl.Output{
-} // Output

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Part.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Part.java
deleted file mode 100644
index 265b092..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Part.java
+++ /dev/null

@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Part</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL part element. Parts describe the logical abstract content of a message. Each part is associated with a type from some type system. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Part#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Part#getElementName <em>Element Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Part#getTypeName <em>Type Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Part#getTypeDefinition <em>Type Definition</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Part#getElementDeclaration <em>Element Declaration</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Part#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getPart()
- * @model 
- * @generated
- */
-public interface Part extends WSDLElement, javax.wsdl.Part{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Element Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element 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>Element Name</em>' attribute.
-   * @see #setElementName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_ElementName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getElementName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getElementName <em>Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element Name</em>' attribute.
-   * @see #getElementName()
-   * @generated
-   */
-	void setElementName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Type Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type 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>Type Name</em>' attribute.
-   * @see #setTypeName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_TypeName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getTypeName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getTypeName <em>Type Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type Name</em>' attribute.
-   * @see #getTypeName()
-   * @generated
-   */
-	void setTypeName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Type Definition</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type Definition</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type Definition</em>' reference.
-   * @see #setTypeDefinition(XSDTypeDefinition)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_TypeDefinition()
-   * @model 
-   * @generated
-   */
-  XSDTypeDefinition getTypeDefinition();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getTypeDefinition <em>Type Definition</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type Definition</em>' reference.
-   * @see #getTypeDefinition()
-   * @generated
-   */
-  void setTypeDefinition(XSDTypeDefinition value);
-
-  /**
-   * Returns the value of the '<em><b>Element Declaration</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Element Declaration</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Element Declaration</em>' reference.
-   * @see #setElementDeclaration(XSDElementDeclaration)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_ElementDeclaration()
-   * @model 
-   * @generated
-   */
-  XSDElementDeclaration getElementDeclaration();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getElementDeclaration <em>Element Declaration</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element Declaration</em>' reference.
-   * @see #getElementDeclaration()
-   * @generated
-   */
-  void setElementDeclaration(XSDElementDeclaration value);
-
-  /**
-   * Returns the value of the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EMessage</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EMessage</em>' reference.
-   * @see #setEMessage(Message)
-   * @see org.eclipse.wsdl.WSDLPackage#getPart_EMessage()
-   * @model 
-   * @generated
-   */
-	Message getEMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Part#getEMessage <em>EMessage</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EMessage</em>' reference.
-   * @see #getEMessage()
-   * @generated
-   */
-	void setEMessage(Message value);
-
-} // Part

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Port.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Port.java
deleted file mode 100644
index fea61fc..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Port.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL port element. A port defines an individual endpoint by specifying a single address for a binding
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Port#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Port#getEBinding <em>EBinding</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getPort()
- * @model 
- * @generated
- */
-public interface Port extends ExtensibleElement, javax.wsdl.Port{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.wsdl.WSDLPackage#getPort_Name()
-   * @model 
-   * @generated
-   */
-	String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Port#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-	void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>EBinding</b></em>' reference.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EBinding</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EBinding</em>' reference.
-   * @see #setEBinding(Binding)
-   * @see org.eclipse.wsdl.WSDLPackage#getPort_EBinding()
-   * @model required="true"
-   * @generated
-   */
-	Binding getEBinding();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Port#getEBinding <em>EBinding</em>}' reference.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EBinding</em>' reference.
-   * @see #getEBinding()
-   * @generated
-   */
-	void setEBinding(Binding value);
-
-} // Port

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/PortType.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/PortType.java
deleted file mode 100644
index 6637cf8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/PortType.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL portType element of the WSDL specification version 1.1 and an Interface component of the WSDL specification version 1.2. A port type or Interface is a named set of abstract operations and the abstract messages involved.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.PortType#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.PortType#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.PortType#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.PortType#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.PortType#getEOperations <em>EOperations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getPortType()
- * @model 
- * @generated
- */
-public interface PortType extends WSDLElement, javax.wsdl.PortType{
-  /**
-   * Returns the value of the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>QName</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>QName</em>' attribute.
-   * @see #setQName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getPortType_QName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.PortType#getQName <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>QName</em>' attribute.
-   * @see #getQName()
-   * @generated
-   */
-	void setQName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Undefined</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Undefined</em>' attribute.
-   * @see #setUndefined(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getPortType_Undefined()
-   * @model 
-   * @generated
-   */
-	boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.PortType#isUndefined <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Undefined</em>' attribute.
-   * @see #isUndefined()
-   * @generated
-   */
-	void setUndefined(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>EOperations</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Operation}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EOperations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EOperations</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getPortType_EOperations()
-   * @model type="org.eclipse.wsdl.Operation" containment="true"
-   * @generated
-   */
-	EList getEOperations();
-
-} // PortType

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Service.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Service.java
deleted file mode 100644
index c214c7b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Service.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL service element. A service groups a set of related ports together.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.Service#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Service#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Service#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Service#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.Service#getEPorts <em>EPorts</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getService()
- * @model 
- * @generated
- */
-public interface Service extends ExtensibleElement, javax.wsdl.Service{
-  /**
-   * Returns the value of the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>QName</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>QName</em>' attribute.
-   * @see #setQName(QName)
-   * @see org.eclipse.wsdl.WSDLPackage#getService_QName()
-   * @model dataType="org.eclipse.wsdl.QName"
-   * @generated
-   */
-	QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Service#getQName <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>QName</em>' attribute.
-   * @see #getQName()
-   * @generated
-   */
-	void setQName(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Undefined</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Undefined</em>' attribute.
-   * @see #setUndefined(boolean)
-   * @see org.eclipse.wsdl.WSDLPackage#getService_Undefined()
-   * @model 
-   * @generated
-   */
-	boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.Service#isUndefined <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Undefined</em>' attribute.
-   * @see #isUndefined()
-   * @generated
-   */
-	void setUndefined(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>EPorts</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.Port}.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EPorts</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>EPorts</em>' containment reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getService_EPorts()
-   * @model type="org.eclipse.wsdl.Port" containment="true"
-   * @generated
-   */
-	EList getEPorts();
-
-} // Service

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Types.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Types.java
deleted file mode 100644
index 8191062..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Types.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Types</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL types element. The types element encloses data type definitions that are relevant for the exchanged messages.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.wsdl.WSDLPackage#getTypes()
- * @model 
- * @generated
- */
-public interface Types extends ExtensibleElement, javax.wsdl.Types{
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	List getSchemas();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	List getSchemas(String namespaceURI);
-
-} // Types

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java
deleted file mode 100644
index 7d6f9cb..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Unknown Extensibility Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.UnknownExtensibilityElement#getParent <em>Parent</em>}</li>
- *   <li>{@link org.eclipse.wsdl.UnknownExtensibilityElement#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getUnknownExtensibilityElement()
- * @model 
- * @generated
- */
-public interface UnknownExtensibilityElement extends ExtensibilityElement{
-  /**
-   * Returns the value of the '<em><b>Children</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.wsdl.UnknownExtensibilityElement}.
-   * It is bidirectional and its opposite is '{@link org.eclipse.wsdl.UnknownExtensibilityElement#getParent <em>Parent</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Children</em>' reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Children</em>' reference list.
-   * @see org.eclipse.wsdl.WSDLPackage#getUnknownExtensibilityElement_Children()
-   * @see org.eclipse.wsdl.UnknownExtensibilityElement#getParent
-   * @model type="org.eclipse.wsdl.UnknownExtensibilityElement" opposite="parent"
-   * @generated
-   */
-  EList getChildren();
-
-} // UnknownExtensibilityElement

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLElement.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLElement.java
deleted file mode 100644
index ec45ba7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLElement.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.emf.ecore.EObject;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class represents a WSDL language element.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.WSDLElement#getDocumentationElement <em>Documentation Element</em>}</li>
- *   <li>{@link org.eclipse.wsdl.WSDLElement#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getWSDLElement()
- * @model abstract="true"
- * @generated
- */
-public interface WSDLElement extends EObject{
-  /**
-   * Returns the value of the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Documentation Element</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-   * @return the value of the '<em>Documentation Element</em>' attribute.
-   * @see #setDocumentationElement(Element)
-   * @see org.eclipse.wsdl.WSDLPackage#getWSDLElement_DocumentationElement()
-   * @model dataType="org.eclipse.wsdl.DOMElement"
-   * @generated
-   */
-	Element getDocumentationElement();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.WSDLElement#getDocumentationElement <em>Documentation Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Documentation Element</em>' attribute.
-   * @see #getDocumentationElement()
-   * @generated
-   */
-	void setDocumentationElement(Element value);
-
-  /**
-   * Returns the value of the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * This is the underlying DOM element associated with this component, 
-   * i.e., the {@link #updateElement() serialization} of this component.
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Element</em>' attribute.
-   * @see #setElement(Element)
-   * @see org.eclipse.wsdl.WSDLPackage#getWSDLElement_Element()
-   * @model dataType="org.eclipse.wsdl.DOMElement"
-   * @generated
-   */
-  Element getElement();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.WSDLElement#getElement <em>Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element</em>' attribute.
-   * @see #getElement()
-   * @generated
-   */
-  void setElement(Element value);
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model parameters=""
-   * @generated
-   */
-	Definition getEnclosingDefinition();
-
-  /**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @model 
-   * @generated
-   */
-	void setEnclosingDefinition(Definition definition);
-
-  /**
-   * Ensures that the underlying DOM {@link #getElement element} both exists and is up-to-date with respect to the model,
-   * i.e., it serializes the component and maintains an association with that serialization.
-   * @see #updateElement(boolean)
-   * @see #getElement
-   */
-  void updateElement();
-
-  /**
-   * Ensures that the underlying DOM {@link #getElement element} both exists and is up-to-date with respect to the model,
-   * i.e., it serializes the component and maintains an association with that serialization.
-   * For <code>deep == true</code>, 
-   * or when <code>{@link #getElement getElement()} == null</code>, 
-   * this does the same thing as {@link #updateElement()};
-   * otherwise, it updates just the DOM element associated with this component to reflect the current state.
-   * @see #updateElement()
-   * @see #getElement
-   */
-  void updateElement(boolean deep);
-  
-  /**
-   * Returns the value of the '<em><b>Container</b></em>' reference.
-   * This represents the concrete container of this component, 
-   * i.e., the inverse of the black diamond relations in the UML model.
-   * @return the value of the '<em>Container</em>' reference.
-   */
-  WSDLElement getContainer();
-  
-  /**
-   * Called to indicate that the given element has changed;
-   * the element should typically be the same as the one returned {@link #getElement}.
-   * It is expected that clients will not call this themselves 
-   * since the DOM event listeners attached to the underlying DOM will invoke these automatically.
-   */
-  void elementChanged(Element changedElement);
-
-} // WSDLElement

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLFactory.java
deleted file mode 100644
index 28fea88..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLFactory.java
+++ /dev/null

@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- 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 -->
- * @see org.eclipse.wsdl.WSDLPackage
- * @generated
- */
-public interface WSDLFactory extends EFactory{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	WSDLFactory eINSTANCE = new org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl();
-
-  /**
-   * Returns a new object of class '<em>Port Type</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Port Type</em>'.
-   * @generated
-   */
-	PortType createPortType();
-
-  /**
-   * Returns a new object of class '<em>Operation</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Operation</em>'.
-   * @generated
-   */
-	Operation createOperation();
-
-  /**
-   * Returns a new object of class '<em>Message</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Message</em>'.
-   * @generated
-   */
-	Message createMessage();
-
-  /**
-   * Returns a new object of class '<em>Part</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Part</em>'.
-   * @generated
-   */
-	Part createPart();
-
-  /**
-   * Returns a new object of class '<em>Binding</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding</em>'.
-   * @generated
-   */
-	Binding createBinding();
-
-  /**
-   * Returns a new object of class '<em>Binding Operation</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Operation</em>'.
-   * @generated
-   */
-	BindingOperation createBindingOperation();
-
-  /**
-   * Returns a new object of class '<em>Service</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Service</em>'.
-   * @generated
-   */
-	Service createService();
-
-  /**
-   * Returns a new object of class '<em>Port</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Port</em>'.
-   * @generated
-   */
-	Port createPort();
-
-  /**
-   * Returns a new object of class '<em>Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Extensibility Element</em>'.
-   * @generated
-   */
-  ExtensibilityElement createExtensibilityElement();
-
-  /**
-   * Returns a new object of class '<em>Definition</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Definition</em>'.
-   * @generated
-   */
-	Definition createDefinition();
-
-  /**
-   * Returns a new object of class '<em>Import</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Import</em>'.
-   * @generated
-   */
-	Import createImport();
-
-  /**
-   * Returns a new object of class '<em>Input</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Input</em>'.
-   * @generated
-   */
-	Input createInput();
-
-  /**
-   * Returns a new object of class '<em>Output</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Output</em>'.
-   * @generated
-   */
-	Output createOutput();
-
-  /**
-   * Returns a new object of class '<em>Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Fault</em>'.
-   * @generated
-   */
-	Fault createFault();
-
-  /**
-   * Returns a new object of class '<em>Binding Input</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Input</em>'.
-   * @generated
-   */
-	BindingInput createBindingInput();
-
-  /**
-   * Returns a new object of class '<em>Binding Output</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Output</em>'.
-   * @generated
-   */
-	BindingOutput createBindingOutput();
-
-  /**
-   * Returns a new object of class '<em>Binding Fault</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Fault</em>'.
-   * @generated
-   */
-	BindingFault createBindingFault();
-
-  /**
-   * Returns a new object of class '<em>Namespace</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Namespace</em>'.
-   * @generated
-   */
-	Namespace createNamespace();
-
-  /**
-   * Returns a new object of class '<em>Types</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Types</em>'.
-   * @generated
-   */
-	Types createTypes();
-
-  /**
-   * Returns a new object of class '<em>Unknown Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>Unknown Extensibility Element</em>'.
-   * @generated
-   */
-	UnknownExtensibilityElement createUnknownExtensibilityElement();
-
-  /**
-   * Returns a new object of class '<em>XSD Schema Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return a new object of class '<em>XSD Schema Extensibility Element</em>'.
-   * @generated
-   */
-	XSDSchemaExtensibilityElement createXSDSchemaExtensibilityElement();
-
-  /*
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated NOT
-   */
-	//WSDLPackage getWSDLPackage();
-
-} //WSDLFactory

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java
deleted file mode 100644
index 03f68cc..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java
+++ /dev/null

@@ -1,3650 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- 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 -->
- * <!-- begin-model-doc -->
- * The WSDL model contains classes for the Web Services Description Language (WSDL).
- * 
- * WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
- * 
- * WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
- * 
- * The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
- * - 2.1 Definition, shows the WSDL definition element and the WSDL document structure
- * - 2.1.1 Naming and Linking, shows the namespace and import mechanism
- * - 2.1.3 Extensibility, shows the WSDL extensibility mechanism
- * - 2.2 Types, shows the use of XML Schema types in WSDL
- * - 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
- * 
- * The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
- * <!-- end-model-doc -->
- * @see org.eclipse.wsdl.WSDLFactory
- * @generated
- */
-public interface WSDLPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "wsdl";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.ibm.com/wsdl/2003/WSDL";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "wsdl";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  WSDLPackage eINSTANCE = org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wsdl.impl.WSDLElementImpl <em>Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.WSDLElementImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getWSDLElement()
-   * @generated
-   */
-  int WSDL_ELEMENT = 0;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_ELEMENT__DOCUMENTATION_ELEMENT = 0;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_ELEMENT__ELEMENT = 1;
-
-  /**
-   * The number of structural features of the the '<em>Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_ELEMENT_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.PortTypeImpl <em>Port Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.PortTypeImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getPortType()
-   * @generated
-   */
-  int PORT_TYPE = 1;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__QNAME = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__UNDEFINED = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Proxy</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__PROXY = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__RESOURCE_URI = WSDL_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EOperations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE__EOPERATIONS = WSDL_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Port Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.OperationImpl <em>Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.OperationImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getOperation()
-   * @generated
-   */
-  int OPERATION = 2;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Style</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__STYLE = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__NAME = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__UNDEFINED = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Proxy</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__PROXY = WSDL_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__RESOURCE_URI = WSDL_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The feature id for the '<em><b>EInput</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EINPUT = WSDL_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The feature id for the '<em><b>EOutput</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EOUTPUT = WSDL_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The feature id for the '<em><b>EFaults</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EFAULTS = WSDL_ELEMENT_FEATURE_COUNT + 7;
-
-  /**
-   * The feature id for the '<em><b>EParameter Ordering</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EPARAMETER_ORDERING = WSDL_ELEMENT_FEATURE_COUNT + 8;
-
-  /**
-   * The number of structural features of the the '<em>Operation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 9;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.MessageImpl <em>Message</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.MessageImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getMessage()
-   * @generated
-   */
-  int MESSAGE = 3;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__QNAME = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__UNDEFINED = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Proxy</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__PROXY = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__RESOURCE_URI = WSDL_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EParts</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__EPARTS = WSDL_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Message</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.PartImpl <em>Part</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.PartImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getPart()
-   * @generated
-   */
-  int PART = 4;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__NAME = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Element Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__ELEMENT_NAME = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Type Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__TYPE_NAME = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Type Definition</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__TYPE_DEFINITION = WSDL_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Element Declaration</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__ELEMENT_DECLARATION = WSDL_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART__EMESSAGE = WSDL_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The number of structural features of the the '<em>Part</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.ExtensibleElementImpl <em>Extensible Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.ExtensibleElementImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getExtensibleElement()
-   * @generated
-   */
-  int EXTENSIBLE_ELEMENT = 12;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBLE_ELEMENT__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the the '<em>Extensible Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBLE_ELEMENT_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.BindingImpl <em>Binding</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.BindingImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getBinding()
-   * @generated
-   */
-  int BINDING = 5;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__QNAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__UNDEFINED = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Proxy</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__PROXY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__RESOURCE_URI = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EPort Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__EPORT_TYPE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The feature id for the '<em><b>EBinding Operations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__EBINDING_OPERATIONS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The number of structural features of the the '<em>Binding</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.BindingOperationImpl <em>Binding Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.BindingOperationImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getBindingOperation()
-   * @generated
-   */
-  int BINDING_OPERATION = 6;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EOperation</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__EOPERATION = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>EBinding Input</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__EBINDING_INPUT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>EBinding Output</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__EBINDING_OUTPUT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EBinding Faults</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION__EBINDING_FAULTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Binding Operation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OPERATION_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.ServiceImpl <em>Service</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.ServiceImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getService()
-   * @generated
-   */
-  int SERVICE = 7;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__QNAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Undefined</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__UNDEFINED = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Proxy</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__PROXY = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__RESOURCE_URI = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EPorts</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__EPORTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Service</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.PortImpl <em>Port</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.PortImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getPort()
-   * @generated
-   */
-  int PORT = 8;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EBinding</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT__EBINDING = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Port</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.ExtensibilityElementImpl <em>Extensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.ExtensibilityElementImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getExtensibilityElement()
-   * @generated
-   */
-  int EXTENSIBILITY_ELEMENT = 9;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBILITY_ELEMENT__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBILITY_ELEMENT__REQUIRED = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBILITY_ELEMENT__ELEMENT_TYPE = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Extensibility Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBILITY_ELEMENT_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.DefinitionImpl <em>Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.DefinitionImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getDefinition()
-   * @generated
-   */
-  int DEFINITION = 10;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__TARGET_NAMESPACE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Location</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__LOCATION = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__QNAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Encoding</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ENCODING = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EMessages</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EMESSAGES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The feature id for the '<em><b>EPort Types</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EPORT_TYPES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The feature id for the '<em><b>EBindings</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EBINDINGS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The feature id for the '<em><b>EServices</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ESERVICES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 7;
-
-  /**
-   * The feature id for the '<em><b>ENamespaces</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ENAMESPACES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 8;
-
-  /**
-   * The feature id for the '<em><b>ETypes</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ETYPES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 9;
-
-  /**
-   * The feature id for the '<em><b>EImports</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EIMPORTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 10;
-
-  /**
-   * The number of structural features of the the '<em>Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 11;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.ImportImpl <em>Import</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.ImportImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getImport()
-   * @generated
-   */
-  int IMPORT = 11;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__NAMESPACE_URI = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Location URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__LOCATION_URI = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>EDefinition</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__EDEFINITION = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>ESchema</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__ESCHEMA = WSDL_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of the the '<em>Import</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.MessageReferenceImpl <em>Message Reference</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.MessageReferenceImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getMessageReference()
-   * @generated
-   */
-  int MESSAGE_REFERENCE = 46;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT = WSDL_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE__ELEMENT = WSDL_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE__NAME = WSDL_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE__EMESSAGE = WSDL_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Message Reference</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE_FEATURE_COUNT = WSDL_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.InputImpl <em>Input</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.InputImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getInput()
-   * @generated
-   */
-  int INPUT = 13;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT__DOCUMENTATION_ELEMENT = MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT__ELEMENT = MESSAGE_REFERENCE__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT__NAME = MESSAGE_REFERENCE__NAME;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT__EMESSAGE = MESSAGE_REFERENCE__EMESSAGE;
-
-  /**
-   * The number of structural features of the the '<em>Input</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT_FEATURE_COUNT = MESSAGE_REFERENCE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.OutputImpl <em>Output</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.OutputImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getOutput()
-   * @generated
-   */
-  int OUTPUT = 14;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT__DOCUMENTATION_ELEMENT = MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT__ELEMENT = MESSAGE_REFERENCE__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT__NAME = MESSAGE_REFERENCE__NAME;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT__EMESSAGE = MESSAGE_REFERENCE__EMESSAGE;
-
-  /**
-   * The number of structural features of the the '<em>Output</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT_FEATURE_COUNT = MESSAGE_REFERENCE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.FaultImpl <em>Fault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.FaultImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getFault()
-   * @generated
-   */
-  int FAULT = 15;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT__DOCUMENTATION_ELEMENT = MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT__ELEMENT = MESSAGE_REFERENCE__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT__NAME = MESSAGE_REFERENCE__NAME;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT__EMESSAGE = MESSAGE_REFERENCE__EMESSAGE;
-
-  /**
-   * The number of structural features of the the '<em>Fault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT_FEATURE_COUNT = MESSAGE_REFERENCE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.BindingInputImpl <em>Binding Input</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.BindingInputImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getBindingInput()
-   * @generated
-   */
-  int BINDING_INPUT = 16;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EInput</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT__EINPUT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Binding Input</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_INPUT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.BindingOutputImpl <em>Binding Output</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.BindingOutputImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getBindingOutput()
-   * @generated
-   */
-  int BINDING_OUTPUT = 17;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EOutput</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT__EOUTPUT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Binding Output</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_OUTPUT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.BindingFaultImpl <em>Binding Fault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.BindingFaultImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getBindingFault()
-   * @generated
-   */
-  int BINDING_FAULT = 18;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT__NAME = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>EFault</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT__EFAULT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the the '<em>Binding Fault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FAULT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.NamespaceImpl <em>Namespace</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.NamespaceImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getNamespace()
-   * @generated
-   */
-  int NAMESPACE = 19;
-
-  /**
-   * The feature id for the '<em><b>URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NAMESPACE__URI = 0;
-
-  /**
-   * The feature id for the '<em><b>Prefix</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NAMESPACE__PREFIX = 1;
-
-  /**
-   * The number of structural features of the the '<em>Namespace</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NAMESPACE_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.PortType <em>IPort Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.PortType
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIPortType()
-   * @generated
-   */
-  int IPORT_TYPE = 20;
-
-  /**
-   * The number of structural features of the the '<em>IPort Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IPORT_TYPE_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Operation <em>IOperation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Operation
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIOperation()
-   * @generated
-   */
-  int IOPERATION = 21;
-
-  /**
-   * The number of structural features of the the '<em>IOperation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IOPERATION_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Input <em>IInput</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Input
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIInput()
-   * @generated
-   */
-  int IINPUT = 22;
-
-  /**
-   * The number of structural features of the the '<em>IInput</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IINPUT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Output <em>IOutput</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Output
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIOutput()
-   * @generated
-   */
-  int IOUTPUT = 23;
-
-  /**
-   * The number of structural features of the the '<em>IOutput</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IOUTPUT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Fault <em>IFault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Fault
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIFault()
-   * @generated
-   */
-  int IFAULT = 24;
-
-  /**
-   * The number of structural features of the the '<em>IFault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IFAULT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Message <em>IMessage</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Message
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIMessage()
-   * @generated
-   */
-  int IMESSAGE = 25;
-
-  /**
-   * The number of structural features of the the '<em>IMessage</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMESSAGE_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Part <em>IPart</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Part
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIPart()
-   * @generated
-   */
-  int IPART = 26;
-
-  /**
-   * The number of structural features of the the '<em>IPart</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IPART_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Service <em>IService</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Service
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIService()
-   * @generated
-   */
-  int ISERVICE = 27;
-
-  /**
-   * The number of structural features of the the '<em>IService</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ISERVICE_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Port <em>IPort</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Port
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIPort()
-   * @generated
-   */
-  int IPORT = 28;
-
-  /**
-   * The number of structural features of the the '<em>IPort</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IPORT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Binding <em>IBinding</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Binding
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIBinding()
-   * @generated
-   */
-  int IBINDING = 29;
-
-  /**
-   * The number of structural features of the the '<em>IBinding</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IBINDING_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.BindingOperation <em>IBinding Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.BindingOperation
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIBindingOperation()
-   * @generated
-   */
-  int IBINDING_OPERATION = 30;
-
-  /**
-   * The number of structural features of the the '<em>IBinding Operation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IBINDING_OPERATION_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.BindingInput <em>IBinding Input</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.BindingInput
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIBindingInput()
-   * @generated
-   */
-  int IBINDING_INPUT = 31;
-
-  /**
-   * The number of structural features of the the '<em>IBinding Input</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IBINDING_INPUT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.BindingOutput <em>IBinding Output</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.BindingOutput
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIBindingOutput()
-   * @generated
-   */
-  int IBINDING_OUTPUT = 32;
-
-  /**
-   * The number of structural features of the the '<em>IBinding Output</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IBINDING_OUTPUT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.BindingFault <em>IBinding Fault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.BindingFault
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIBindingFault()
-   * @generated
-   */
-  int IBINDING_FAULT = 33;
-
-  /**
-   * The number of structural features of the the '<em>IBinding Fault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IBINDING_FAULT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.ExtensibilityElement
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIExtensibilityElement()
-   * @generated
-   */
-  int IEXTENSIBILITY_ELEMENT = 34;
-
-  /**
-   * The number of structural features of the the '<em>IExtensibility Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IEXTENSIBILITY_ELEMENT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Definition <em>IDefinition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Definition
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIDefinition()
-   * @generated
-   */
-  int IDEFINITION = 35;
-
-  /**
-   * The number of structural features of the the '<em>IDefinition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IDEFINITION_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Import <em>IImport</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Import
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIImport()
-   * @generated
-   */
-  int IIMPORT = 36;
-
-  /**
-   * The number of structural features of the the '<em>IImport</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IIMPORT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link java.util.List <em>IList</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see java.util.List
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIList()
-   * @generated
-   */
-  int ILIST = 37;
-
-  /**
-   * The number of structural features of the the '<em>IList</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ILIST_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link java.util.Map <em>IMap</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see java.util.Map
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIMap()
-   * @generated
-   */
-  int IMAP = 38;
-
-  /**
-   * The number of structural features of the the '<em>IMap</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMAP_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link java.net.URL <em>IURL</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see java.net.URL
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIURL()
-   * @generated
-   */
-  int IURL = 39;
-
-  /**
-   * The number of structural features of the the '<em>IURL</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IURL_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.extensions.ExtensionRegistry <em>IExtension Registry</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.ExtensionRegistry
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIExtensionRegistry()
-   * @generated
-   */
-  int IEXTENSION_REGISTRY = 40;
-
-  /**
-   * The number of structural features of the the '<em>IExtension Registry</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IEXTENSION_REGISTRY_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.TypesImpl <em>Types</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.TypesImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getTypes()
-   * @generated
-   */
-  int TYPES = 41;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPES__DOCUMENTATION_ELEMENT = EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPES__ELEMENT = EXTENSIBLE_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPES__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The number of structural features of the the '<em>Types</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPES_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link java.util.Iterator <em>IIterator</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see java.util.Iterator
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getIIterator()
-   * @generated
-   */
-  int IITERATOR = 42;
-
-  /**
-   * The number of structural features of the the '<em>IIterator</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IITERATOR_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.Types <em>ITypes</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.Types
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getITypes()
-   * @generated
-   */
-  int ITYPES = 43;
-
-  /**
-   * The number of structural features of the the '<em>ITypes</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ITYPES_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.UnknownExtensibilityElementImpl <em>Unknown Extensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.UnknownExtensibilityElementImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getUnknownExtensibilityElement()
-   * @generated
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT = 44;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT = EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT = EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT__REQUIRED = EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE = EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Children</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN = EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the the '<em>Unknown Extensibility Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UNKNOWN_EXTENSIBILITY_ELEMENT_FEATURE_COUNT = EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.impl.XSDSchemaExtensibilityElementImpl <em>XSD Schema Extensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.impl.XSDSchemaExtensibilityElementImpl
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getXSDSchemaExtensibilityElement()
-   * @generated
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT = 45;
-
-  /**
-   * The feature id for the '<em><b>Documentation Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT = EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT = EXTENSIBILITY_ELEMENT__ELEMENT;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT__REQUIRED = EXTENSIBILITY_ELEMENT__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>Element Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE = EXTENSIBILITY_ELEMENT__ELEMENT_TYPE;
-
-  /**
-   * The feature id for the '<em><b>Schema</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA = EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the the '<em>XSD Schema Extensibility Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XSD_SCHEMA_EXTENSIBILITY_ELEMENT_FEATURE_COUNT = EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '<em>QName</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.xml.namespace.QName
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getQName()
-   * @generated
-   */
-  int QNAME = 47;
-
-  /**
-   * The meta object id for the '<em>Operation Type</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.OperationType
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getOperationType()
-   * @generated
-   */
-  int OPERATION_TYPE = 48;
-
-  /**
-   * The meta object id for the '<em>DOM Element</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.w3c.dom.Element
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getDOMElement()
-   * @generated
-   */
-  int DOM_ELEMENT = 49;
-
-  /**
-   * The meta object id for the '<em>Exception</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.WSDLException
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getWSDLException()
-   * @generated
-   */
-  int WSDL_EXCEPTION = 50;
-
-  /**
-   * The meta object id for the '<em>DOM Document</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.w3c.dom.Document
-   * @see org.eclipse.wst.wsdl.impl.WSDLPackageImpl#getDOMDocument()
-   * @generated
-   */
-  int DOM_DOCUMENT = 51;
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.WSDLElement <em>Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Element</em>'.
-   * @see org.eclipse.wst.wsdl.WSDLElement
-   * @generated
-   */
-  EClass getWSDLElement();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.WSDLElement#getDocumentationElement <em>Documentation Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Documentation Element</em>'.
-   * @see org.eclipse.wst.wsdl.WSDLElement#getDocumentationElement()
-   * @see #getWSDLElement()
-   * @generated
-   */
-  EAttribute getWSDLElement_DocumentationElement();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.WSDLElement#getElement <em>Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Element</em>'.
-   * @see org.eclipse.wst.wsdl.WSDLElement#getElement()
-   * @see #getWSDLElement()
-   * @generated
-   */
-  EAttribute getWSDLElement_Element();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.PortType <em>Port Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Port Type</em>'.
-   * @see org.eclipse.wst.wsdl.PortType
-   * @generated
-   */
-  EClass getPortType();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.PortType#getQName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>QName</em>'.
-   * @see org.eclipse.wst.wsdl.PortType#getQName()
-   * @see #getPortType()
-   * @generated
-   */
-  EAttribute getPortType_QName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.PortType#isUndefined <em>Undefined</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Undefined</em>'.
-   * @see org.eclipse.wst.wsdl.PortType#isUndefined()
-   * @see #getPortType()
-   * @generated
-   */
-  EAttribute getPortType_Undefined();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.PortType#isProxy <em>Proxy</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Proxy</em>'.
-   * @see org.eclipse.wst.wsdl.PortType#isProxy()
-   * @see #getPortType()
-   * @generated
-   */
-  EAttribute getPortType_Proxy();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.PortType#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource URI</em>'.
-   * @see org.eclipse.wst.wsdl.PortType#getResourceURI()
-   * @see #getPortType()
-   * @generated
-   */
-  EAttribute getPortType_ResourceURI();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.PortType#getEOperations <em>EOperations</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EOperations</em>'.
-   * @see org.eclipse.wst.wsdl.PortType#getEOperations()
-   * @see #getPortType()
-   * @generated
-   */
-  EReference getPortType_EOperations();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Operation <em>Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Operation</em>'.
-   * @see org.eclipse.wst.wsdl.Operation
-   * @generated
-   */
-  EClass getOperation();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Operation#getStyle <em>Style</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Style</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getStyle()
-   * @see #getOperation()
-   * @generated
-   */
-  EAttribute getOperation_Style();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Operation#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getName()
-   * @see #getOperation()
-   * @generated
-   */
-  EAttribute getOperation_Name();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Operation#isUndefined <em>Undefined</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Undefined</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#isUndefined()
-   * @see #getOperation()
-   * @generated
-   */
-  EAttribute getOperation_Undefined();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Operation#isProxy <em>Proxy</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Proxy</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#isProxy()
-   * @see #getOperation()
-   * @generated
-   */
-  EAttribute getOperation_Proxy();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Operation#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource URI</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getResourceURI()
-   * @see #getOperation()
-   * @generated
-   */
-  EAttribute getOperation_ResourceURI();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.Operation#getEInput <em>EInput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>EInput</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getEInput()
-   * @see #getOperation()
-   * @generated
-   */
-  EReference getOperation_EInput();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.Operation#getEOutput <em>EOutput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>EOutput</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getEOutput()
-   * @see #getOperation()
-   * @generated
-   */
-  EReference getOperation_EOutput();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Operation#getEFaults <em>EFaults</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EFaults</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getEFaults()
-   * @see #getOperation()
-   * @generated
-   */
-  EReference getOperation_EFaults();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.wst.wsdl.Operation#getEParameterOrdering <em>EParameter Ordering</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>EParameter Ordering</em>'.
-   * @see org.eclipse.wst.wsdl.Operation#getEParameterOrdering()
-   * @see #getOperation()
-   * @generated
-   */
-  EReference getOperation_EParameterOrdering();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Message <em>Message</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Message</em>'.
-   * @see org.eclipse.wst.wsdl.Message
-   * @generated
-   */
-  EClass getMessage();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Message#getQName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>QName</em>'.
-   * @see org.eclipse.wst.wsdl.Message#getQName()
-   * @see #getMessage()
-   * @generated
-   */
-  EAttribute getMessage_QName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Message#isUndefined <em>Undefined</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Undefined</em>'.
-   * @see org.eclipse.wst.wsdl.Message#isUndefined()
-   * @see #getMessage()
-   * @generated
-   */
-  EAttribute getMessage_Undefined();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Message#isProxy <em>Proxy</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Proxy</em>'.
-   * @see org.eclipse.wst.wsdl.Message#isProxy()
-   * @see #getMessage()
-   * @generated
-   */
-  EAttribute getMessage_Proxy();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Message#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource URI</em>'.
-   * @see org.eclipse.wst.wsdl.Message#getResourceURI()
-   * @see #getMessage()
-   * @generated
-   */
-  EAttribute getMessage_ResourceURI();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Message#getEParts <em>EParts</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EParts</em>'.
-   * @see org.eclipse.wst.wsdl.Message#getEParts()
-   * @see #getMessage()
-   * @generated
-   */
-  EReference getMessage_EParts();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Part <em>Part</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Part</em>'.
-   * @see org.eclipse.wst.wsdl.Part
-   * @generated
-   */
-  EClass getPart();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Part#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getName()
-   * @see #getPart()
-   * @generated
-   */
-  EAttribute getPart_Name();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Part#getElementName <em>Element Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Element Name</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getElementName()
-   * @see #getPart()
-   * @generated
-   */
-  EAttribute getPart_ElementName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Part#getTypeName <em>Type Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Type Name</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getTypeName()
-   * @see #getPart()
-   * @generated
-   */
-  EAttribute getPart_TypeName();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Part#getTypeDefinition <em>Type Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Type Definition</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getTypeDefinition()
-   * @see #getPart()
-   * @generated
-   */
-  EReference getPart_TypeDefinition();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Part#getElementDeclaration <em>Element Declaration</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Element Declaration</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getElementDeclaration()
-   * @see #getPart()
-   * @generated
-   */
-  EReference getPart_ElementDeclaration();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Part#getEMessage <em>EMessage</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EMessage</em>'.
-   * @see org.eclipse.wst.wsdl.Part#getEMessage()
-   * @see #getPart()
-   * @generated
-   */
-  EReference getPart_EMessage();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Binding <em>Binding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding</em>'.
-   * @see org.eclipse.wst.wsdl.Binding
-   * @generated
-   */
-  EClass getBinding();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Binding#getQName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>QName</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#getQName()
-   * @see #getBinding()
-   * @generated
-   */
-  EAttribute getBinding_QName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Binding#isUndefined <em>Undefined</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Undefined</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#isUndefined()
-   * @see #getBinding()
-   * @generated
-   */
-  EAttribute getBinding_Undefined();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Binding#isProxy <em>Proxy</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Proxy</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#isProxy()
-   * @see #getBinding()
-   * @generated
-   */
-  EAttribute getBinding_Proxy();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Binding#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource URI</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#getResourceURI()
-   * @see #getBinding()
-   * @generated
-   */
-  EAttribute getBinding_ResourceURI();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Binding#getEPortType <em>EPort Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EPort Type</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#getEPortType()
-   * @see #getBinding()
-   * @generated
-   */
-  EReference getBinding_EPortType();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Binding#getEBindingOperations <em>EBinding Operations</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EBinding Operations</em>'.
-   * @see org.eclipse.wst.wsdl.Binding#getEBindingOperations()
-   * @see #getBinding()
-   * @generated
-   */
-  EReference getBinding_EBindingOperations();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.BindingOperation <em>Binding Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding Operation</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation
-   * @generated
-   */
-  EClass getBindingOperation();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.BindingOperation#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation#getName()
-   * @see #getBindingOperation()
-   * @generated
-   */
-  EAttribute getBindingOperation_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.BindingOperation#getEOperation <em>EOperation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EOperation</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation#getEOperation()
-   * @see #getBindingOperation()
-   * @generated
-   */
-  EReference getBindingOperation_EOperation();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.BindingOperation#getEBindingInput <em>EBinding Input</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>EBinding Input</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation#getEBindingInput()
-   * @see #getBindingOperation()
-   * @generated
-   */
-  EReference getBindingOperation_EBindingInput();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.BindingOperation#getEBindingOutput <em>EBinding Output</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>EBinding Output</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation#getEBindingOutput()
-   * @see #getBindingOperation()
-   * @generated
-   */
-  EReference getBindingOperation_EBindingOutput();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.BindingOperation#getEBindingFaults <em>EBinding Faults</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EBinding Faults</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOperation#getEBindingFaults()
-   * @see #getBindingOperation()
-   * @generated
-   */
-  EReference getBindingOperation_EBindingFaults();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Service <em>Service</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Service</em>'.
-   * @see org.eclipse.wst.wsdl.Service
-   * @generated
-   */
-  EClass getService();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Service#getQName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>QName</em>'.
-   * @see org.eclipse.wst.wsdl.Service#getQName()
-   * @see #getService()
-   * @generated
-   */
-  EAttribute getService_QName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Service#isUndefined <em>Undefined</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Undefined</em>'.
-   * @see org.eclipse.wst.wsdl.Service#isUndefined()
-   * @see #getService()
-   * @generated
-   */
-  EAttribute getService_Undefined();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Service#isProxy <em>Proxy</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Proxy</em>'.
-   * @see org.eclipse.wst.wsdl.Service#isProxy()
-   * @see #getService()
-   * @generated
-   */
-  EAttribute getService_Proxy();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Service#getResourceURI <em>Resource URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource URI</em>'.
-   * @see org.eclipse.wst.wsdl.Service#getResourceURI()
-   * @see #getService()
-   * @generated
-   */
-  EAttribute getService_ResourceURI();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Service#getEPorts <em>EPorts</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EPorts</em>'.
-   * @see org.eclipse.wst.wsdl.Service#getEPorts()
-   * @see #getService()
-   * @generated
-   */
-  EReference getService_EPorts();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Port <em>Port</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Port</em>'.
-   * @see org.eclipse.wst.wsdl.Port
-   * @generated
-   */
-  EClass getPort();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Port#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.Port#getName()
-   * @see #getPort()
-   * @generated
-   */
-  EAttribute getPort_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Port#getEBinding <em>EBinding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EBinding</em>'.
-   * @see org.eclipse.wst.wsdl.Port#getEBinding()
-   * @see #getPort()
-   * @generated
-   */
-  EReference getPort_EBinding();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.ExtensibilityElement <em>Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Extensibility Element</em>'.
-   * @see org.eclipse.wst.wsdl.ExtensibilityElement
-   * @generated
-   */
-  EClass getExtensibilityElement();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.ExtensibilityElement#isRequired <em>Required</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Required</em>'.
-   * @see org.eclipse.wst.wsdl.ExtensibilityElement#isRequired()
-   * @see #getExtensibilityElement()
-   * @generated
-   */
-  EAttribute getExtensibilityElement_Required();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.ExtensibilityElement#getElementType <em>Element Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Element Type</em>'.
-   * @see org.eclipse.wst.wsdl.ExtensibilityElement#getElementType()
-   * @see #getExtensibilityElement()
-   * @generated
-   */
-  EAttribute getExtensibilityElement_ElementType();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Definition <em>Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Definition</em>'.
-   * @see org.eclipse.wst.wsdl.Definition
-   * @generated
-   */
-  EClass getDefinition();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Definition#getTargetNamespace <em>Target Namespace</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Target Namespace</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getTargetNamespace()
-   * @see #getDefinition()
-   * @generated
-   */
-  EAttribute getDefinition_TargetNamespace();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Definition#getLocation <em>Location</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Location</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getLocation()
-   * @see #getDefinition()
-   * @generated
-   */
-  EAttribute getDefinition_Location();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Definition#getQName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>QName</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getQName()
-   * @see #getDefinition()
-   * @generated
-   */
-  EAttribute getDefinition_QName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Definition#getEncoding <em>Encoding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Encoding</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEncoding()
-   * @see #getDefinition()
-   * @generated
-   */
-  EAttribute getDefinition_Encoding();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getEMessages <em>EMessages</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EMessages</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEMessages()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_EMessages();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getEPortTypes <em>EPort Types</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EPort Types</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEPortTypes()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_EPortTypes();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getEBindings <em>EBindings</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EBindings</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEBindings()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_EBindings();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getEServices <em>EServices</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EServices</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEServices()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_EServices();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getENamespaces <em>ENamespaces</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>ENamespaces</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getENamespaces()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_ENamespaces();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.Definition#getETypes <em>ETypes</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>ETypes</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getETypes()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_ETypes();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.Definition#getEImports <em>EImports</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EImports</em>'.
-   * @see org.eclipse.wst.wsdl.Definition#getEImports()
-   * @see #getDefinition()
-   * @generated
-   */
-  EReference getDefinition_EImports();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Import <em>Import</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Import</em>'.
-   * @see org.eclipse.wst.wsdl.Import
-   * @generated
-   */
-  EClass getImport();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Import#getNamespaceURI <em>Namespace URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Namespace URI</em>'.
-   * @see org.eclipse.wst.wsdl.Import#getNamespaceURI()
-   * @see #getImport()
-   * @generated
-   */
-  EAttribute getImport_NamespaceURI();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Import#getLocationURI <em>Location URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Location URI</em>'.
-   * @see org.eclipse.wst.wsdl.Import#getLocationURI()
-   * @see #getImport()
-   * @generated
-   */
-  EAttribute getImport_LocationURI();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Import#getEDefinition <em>EDefinition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EDefinition</em>'.
-   * @see org.eclipse.wst.wsdl.Import#getEDefinition()
-   * @see #getImport()
-   * @generated
-   */
-  EReference getImport_EDefinition();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.Import#getESchema <em>ESchema</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>ESchema</em>'.
-   * @see org.eclipse.wst.wsdl.Import#getESchema()
-   * @see #getImport()
-   * @generated
-   */
-  EReference getImport_ESchema();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.ExtensibleElement <em>Extensible Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Extensible Element</em>'.
-   * @see org.eclipse.wst.wsdl.ExtensibleElement
-   * @generated
-   */
-  EClass getExtensibleElement();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.ExtensibleElement#getEExtensibilityElements <em>EExtensibility Elements</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>EExtensibility Elements</em>'.
-   * @see org.eclipse.wst.wsdl.ExtensibleElement#getEExtensibilityElements()
-   * @see #getExtensibleElement()
-   * @generated
-   */
-  EReference getExtensibleElement_EExtensibilityElements();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Input <em>Input</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Input</em>'.
-   * @see org.eclipse.wst.wsdl.Input
-   * @generated
-   */
-  EClass getInput();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Output <em>Output</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Output</em>'.
-   * @see org.eclipse.wst.wsdl.Output
-   * @generated
-   */
-  EClass getOutput();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Fault <em>Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Fault</em>'.
-   * @see org.eclipse.wst.wsdl.Fault
-   * @generated
-   */
-  EClass getFault();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.BindingInput <em>Binding Input</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding Input</em>'.
-   * @see org.eclipse.wst.wsdl.BindingInput
-   * @generated
-   */
-  EClass getBindingInput();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.BindingInput#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.BindingInput#getName()
-   * @see #getBindingInput()
-   * @generated
-   */
-  EAttribute getBindingInput_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.BindingInput#getEInput <em>EInput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EInput</em>'.
-   * @see org.eclipse.wst.wsdl.BindingInput#getEInput()
-   * @see #getBindingInput()
-   * @generated
-   */
-  EReference getBindingInput_EInput();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.BindingOutput <em>Binding Output</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding Output</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOutput
-   * @generated
-   */
-  EClass getBindingOutput();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.BindingOutput#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOutput#getName()
-   * @see #getBindingOutput()
-   * @generated
-   */
-  EAttribute getBindingOutput_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.BindingOutput#getEOutput <em>EOutput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EOutput</em>'.
-   * @see org.eclipse.wst.wsdl.BindingOutput#getEOutput()
-   * @see #getBindingOutput()
-   * @generated
-   */
-  EReference getBindingOutput_EOutput();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.BindingFault <em>Binding Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Binding Fault</em>'.
-   * @see org.eclipse.wst.wsdl.BindingFault
-   * @generated
-   */
-  EClass getBindingFault();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.BindingFault#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.BindingFault#getName()
-   * @see #getBindingFault()
-   * @generated
-   */
-  EAttribute getBindingFault_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.BindingFault#getEFault <em>EFault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EFault</em>'.
-   * @see org.eclipse.wst.wsdl.BindingFault#getEFault()
-   * @see #getBindingFault()
-   * @generated
-   */
-  EReference getBindingFault_EFault();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Namespace <em>Namespace</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Namespace</em>'.
-   * @see org.eclipse.wst.wsdl.Namespace
-   * @generated
-   */
-  EClass getNamespace();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Namespace#getURI <em>URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>URI</em>'.
-   * @see org.eclipse.wst.wsdl.Namespace#getURI()
-   * @see #getNamespace()
-   * @generated
-   */
-  EAttribute getNamespace_URI();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.Namespace#getPrefix <em>Prefix</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Prefix</em>'.
-   * @see org.eclipse.wst.wsdl.Namespace#getPrefix()
-   * @see #getNamespace()
-   * @generated
-   */
-  EAttribute getNamespace_Prefix();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.PortType <em>IPort Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IPort Type</em>'.
-   * @see javax.wsdl.PortType
-   * @model instanceClass="javax.wsdl.PortType" 
-   * @generated
-   */
-  EClass getIPortType();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Operation <em>IOperation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IOperation</em>'.
-   * @see javax.wsdl.Operation
-   * @model instanceClass="javax.wsdl.Operation" 
-   * @generated
-   */
-  EClass getIOperation();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Input <em>IInput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IInput</em>'.
-   * @see javax.wsdl.Input
-   * @model instanceClass="javax.wsdl.Input" 
-   * @generated
-   */
-  EClass getIInput();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Output <em>IOutput</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IOutput</em>'.
-   * @see javax.wsdl.Output
-   * @model instanceClass="javax.wsdl.Output" 
-   * @generated
-   */
-  EClass getIOutput();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Fault <em>IFault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IFault</em>'.
-   * @see javax.wsdl.Fault
-   * @model instanceClass="javax.wsdl.Fault" 
-   * @generated
-   */
-  EClass getIFault();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Message <em>IMessage</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IMessage</em>'.
-   * @see javax.wsdl.Message
-   * @model instanceClass="javax.wsdl.Message" 
-   * @generated
-   */
-  EClass getIMessage();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Part <em>IPart</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IPart</em>'.
-   * @see javax.wsdl.Part
-   * @model instanceClass="javax.wsdl.Part" 
-   * @generated
-   */
-  EClass getIPart();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Service <em>IService</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IService</em>'.
-   * @see javax.wsdl.Service
-   * @model instanceClass="javax.wsdl.Service" 
-   * @generated
-   */
-  EClass getIService();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Port <em>IPort</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IPort</em>'.
-   * @see javax.wsdl.Port
-   * @model instanceClass="javax.wsdl.Port" 
-   * @generated
-   */
-  EClass getIPort();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Binding <em>IBinding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IBinding</em>'.
-   * @see javax.wsdl.Binding
-   * @model instanceClass="javax.wsdl.Binding" 
-   * @generated
-   */
-  EClass getIBinding();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.BindingOperation <em>IBinding Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IBinding Operation</em>'.
-   * @see javax.wsdl.BindingOperation
-   * @model instanceClass="javax.wsdl.BindingOperation" 
-   * @generated
-   */
-  EClass getIBindingOperation();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.BindingInput <em>IBinding Input</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IBinding Input</em>'.
-   * @see javax.wsdl.BindingInput
-   * @model instanceClass="javax.wsdl.BindingInput" 
-   * @generated
-   */
-  EClass getIBindingInput();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.BindingOutput <em>IBinding Output</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IBinding Output</em>'.
-   * @see javax.wsdl.BindingOutput
-   * @model instanceClass="javax.wsdl.BindingOutput" 
-   * @generated
-   */
-  EClass getIBindingOutput();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.BindingFault <em>IBinding Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IBinding Fault</em>'.
-   * @see javax.wsdl.BindingFault
-   * @model instanceClass="javax.wsdl.BindingFault" 
-   * @generated
-   */
-  EClass getIBindingFault();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IExtensibility Element</em>'.
-   * @see javax.wsdl.extensions.ExtensibilityElement
-   * @model instanceClass="javax.wsdl.extensions.ExtensibilityElement" 
-   * @generated
-   */
-  EClass getIExtensibilityElement();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Definition <em>IDefinition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IDefinition</em>'.
-   * @see javax.wsdl.Definition
-   * @model instanceClass="javax.wsdl.Definition" 
-   * @generated
-   */
-  EClass getIDefinition();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Import <em>IImport</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IImport</em>'.
-   * @see javax.wsdl.Import
-   * @model instanceClass="javax.wsdl.Import" 
-   * @generated
-   */
-  EClass getIImport();
-
-  /**
-   * Returns the meta object for class '{@link java.util.List <em>IList</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IList</em>'.
-   * @see java.util.List
-   * @model instanceClass="java.util.List" 
-   * @generated
-   */
-  EClass getIList();
-
-  /**
-   * Returns the meta object for class '{@link java.util.Map <em>IMap</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IMap</em>'.
-   * @see java.util.Map
-   * @model instanceClass="java.util.Map" 
-   * @generated
-   */
-  EClass getIMap();
-
-  /**
-   * Returns the meta object for class '{@link java.net.URL <em>IURL</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IURL</em>'.
-   * @see java.net.URL
-   * @model instanceClass="java.net.URL" 
-   * @generated
-   */
-  EClass getIURL();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.extensions.ExtensionRegistry <em>IExtension Registry</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IExtension Registry</em>'.
-   * @see javax.wsdl.extensions.ExtensionRegistry
-   * @model instanceClass="javax.wsdl.extensions.ExtensionRegistry" 
-   * @generated
-   */
-  EClass getIExtensionRegistry();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.Types <em>Types</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Types</em>'.
-   * @see org.eclipse.wst.wsdl.Types
-   * @generated
-   */
-  EClass getTypes();
-
-  /**
-   * Returns the meta object for class '{@link java.util.Iterator <em>IIterator</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>IIterator</em>'.
-   * @see java.util.Iterator
-   * @model instanceClass="java.util.Iterator" 
-   * @generated
-   */
-  EClass getIIterator();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.Types <em>ITypes</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ITypes</em>'.
-   * @see javax.wsdl.Types
-   * @model instanceClass="javax.wsdl.Types" 
-   * @generated
-   */
-  EClass getITypes();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.UnknownExtensibilityElement <em>Unknown Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Unknown Extensibility Element</em>'.
-   * @see org.eclipse.wst.wsdl.UnknownExtensibilityElement
-   * @generated
-   */
-  EClass getUnknownExtensibilityElement();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.wst.wsdl.UnknownExtensibilityElement#getChildren <em>Children</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Children</em>'.
-   * @see org.eclipse.wst.wsdl.UnknownExtensibilityElement#getChildren()
-   * @see #getUnknownExtensibilityElement()
-   * @generated
-   */
-  EReference getUnknownExtensibilityElement_Children();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement <em>XSD Schema Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>XSD Schema Extensibility Element</em>'.
-   * @see org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement
-   * @generated
-   */
-  EClass getXSDSchemaExtensibilityElement();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement#getSchema <em>Schema</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Schema</em>'.
-   * @see org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement#getSchema()
-   * @see #getXSDSchemaExtensibilityElement()
-   * @generated
-   */
-  EReference getXSDSchemaExtensibilityElement_Schema();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.wst.wsdl.MessageReference <em>Message Reference</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Message Reference</em>'.
-   * @see org.eclipse.wst.wsdl.MessageReference
-   * @generated
-   */
-  EClass getMessageReference();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.MessageReference#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.wst.wsdl.MessageReference#getName()
-   * @see #getMessageReference()
-   * @generated
-   */
-  EAttribute getMessageReference_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.MessageReference#getEMessage <em>EMessage</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EMessage</em>'.
-   * @see org.eclipse.wst.wsdl.MessageReference#getEMessage()
-   * @see #getMessageReference()
-   * @generated
-   */
-  EReference getMessageReference_EMessage();
-
-  /**
-   * Returns the meta object for data type '{@link javax.xml.namespace.QName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>QName</em>'.
-   * @see javax.xml.namespace.QName
-   * @model instanceClass="javax.xml.namespace.QName"
-   * @generated
-   */
-  EDataType getQName();
-
-  /**
-   * Returns the meta object for data type '{@link javax.wsdl.OperationType <em>Operation Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>Operation Type</em>'.
-   * @see javax.wsdl.OperationType
-   * @model instanceClass="javax.wsdl.OperationType"
-   * @generated
-   */
-  EDataType getOperationType();
-
-  /**
-   * Returns the meta object for data type '{@link org.w3c.dom.Element <em>DOM Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>DOM Element</em>'.
-   * @see org.w3c.dom.Element
-   * @model instanceClass="org.w3c.dom.Element"
-   * @generated
-   */
-  EDataType getDOMElement();
-
-  /**
-   * Returns the meta object for data type '{@link javax.wsdl.WSDLException <em>Exception</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>Exception</em>'.
-   * @see javax.wsdl.WSDLException
-   * @model instanceClass="javax.wsdl.WSDLException"
-   * @generated
-   */
-  EDataType getWSDLException();
-
-  /**
-   * Returns the meta object for data type '{@link org.w3c.dom.Document <em>DOM Document</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>DOM Document</em>'.
-   * @see org.w3c.dom.Document
-   * @model instanceClass="org.w3c.dom.Document"
-   * @generated
-   */
-  EDataType getDOMDocument();
-
-  /**
-   * 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
-   */
-  WSDLFactory getWSDLFactory();
-
-} //WSDLPackage

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPlugin.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPlugin.java
deleted file mode 100644
index f9588fc..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPlugin.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import javax.wsdl.factory.WSDLFactory;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.wst.wsdl.internal.extensibility.ExtensibilityElementFactoryRegistryImpl;
-import org.eclipse.wst.wsdl.internal.extensibility.ExtensibilityElementFactoryRegistryReader;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactoryRegistry;
-
-
-/**
- * The <b>Plugin</b> for the model.
- * The WSDL model needs to be able to run within an Eclipse workbench,
- * within a headless Eclipse workspace, or just stand-alone as part 
- * of some other application.
- * To support this, all access is directed to the static methods,
- * which can redirect the service as appopriate to the runtime.
- * During stand-alone invocation no plugin initialization takes place.
- * In this case you will need the resources jar on the class path.
- * @see #getBaseURL
- */
-public final class WSDLPlugin extends EMFPlugin 
-{
-  /**
-   * The singleton instance of the plugin.
-   */
-  public static final WSDLPlugin INSTANCE = new WSDLPlugin();
-
-  /**
-   * The one instance of this class.
-   */
-  static WSDLPluginImplementation plugin;
-  
-  private ExtensibilityElementFactoryRegistryImpl extensibilityElementFactoryRegistry;
-
-  /**
-   * Creates the singleton instance.
-   */
-  private WSDLPlugin()
-  {
-    super(new ResourceLocator[] {});
-  }
-
-  /*
-   * Javadoc copied from base class.
-   */
-  public ResourceLocator getPluginResourceLocator()
-  {
-    return plugin;
-  }
-
-  /**
-   * Returns the singleton instance of the Eclipse plugin.
-   * @return the singleton instance.
-   */
-  public static WSDLPluginImplementation getPlugin()
-  {
-    return plugin;
-  }
-
-  private ExtensibilityElementFactoryRegistryImpl internalGetExtensibilityElementFactoryRegistry()
-  {
-    if (extensibilityElementFactoryRegistry == null)
-    {
-      extensibilityElementFactoryRegistry = new ExtensibilityElementFactoryRegistryImpl();
-      if (plugin != null)
-      {  
-        new ExtensibilityElementFactoryRegistryReader(extensibilityElementFactoryRegistry).readRegistry();
-      }  
-    }
-    return extensibilityElementFactoryRegistry;
-  }
-  
-  public ExtensibilityElementFactory getExtensibilityElementFactory(String namespace)
-  {
-    return internalGetExtensibilityElementFactoryRegistry().getExtensibilityElementFactory(namespace);
-  }
-  
-  public ExtensibilityElementFactoryRegistry getExtensibilityElementFactoryRegistry()
-  {   
-    return internalGetExtensibilityElementFactoryRegistry();
-  }
-  
-  public WSDLFactory createWSDL4JFactory()
-  {
-    return new WSDLFactoryImpl();   	
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPluginImplementation.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPluginImplementation.java
deleted file mode 100644
index cc429af..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPluginImplementation.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.emf.common.EMFPlugin.EclipsePlugin;
-
-/**
-   * The actual implementation of the Eclipse <b>Plugin</b>.
-   */
-  public class WSDLPluginImplementation extends EclipsePlugin
-  {
-    /**
-     * Creates an instance.
-     * @param descriptor the description of the plugin.
-     */
-    public WSDLPluginImplementation(IPluginDescriptor descriptor)
-    {
-      super(descriptor);
-
-      // Remember the static instance.
-      //
-      WSDLPlugin.plugin = this;
-    }
-  }
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java
deleted file mode 100644
index 00bb66d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-import org.eclipse.xsd.XSDSchema;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XSD Schema Extensibility Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.XSDSchemaExtensibilityElement#getSchema <em>Schema</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wsdl.WSDLPackage#getXSDSchemaExtensibilityElement()
- * @model 
- * @generated
- */
-public interface XSDSchemaExtensibilityElement extends ExtensibilityElement{
-  /**
-   * Returns the value of the '<em><b>Schema</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Schema</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Schema</em>' containment reference.
-   * @see #setSchema(XSDSchema)
-   * @see org.eclipse.wsdl.WSDLPackage#getXSDSchemaExtensibilityElement_Schema()
-   * @model containment="true"
-   * @generated
-   */
-  XSDSchema getSchema();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wsdl.XSDSchemaExtensibilityElement#getSchema <em>Schema</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Schema</em>' containment reference.
-   * @see #getSchema()
-   * @generated
-   */
-  void setSchema(XSDSchema value);
-
-} // XSDSchemaExtensibilityElement

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java
deleted file mode 100644
index 040b799..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.extensibility;
-
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-
-public class ExtensibilityElementFactoryDescriptor
-{
-  private final static String CLASS_LOADING_ERROR = "CLASS_LOADING_ERROR";
-  
-  protected ClassLoader classLoader;
-  protected String namespace;
-  protected String className;  
-  protected Object factory;
-
-  public ExtensibilityElementFactoryDescriptor(String className, String namespace, ClassLoader classLoader)
-  {
-    this.classLoader = classLoader;
-    this.className = className;
-    this.namespace = namespace;
-  }
-
-  public ExtensibilityElementFactory getExtensiblityElementFactory()
-  {
-    if (factory == null)
-    {
-      try
-      {
-        Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-        factory = (ExtensibilityElementFactory)theClass.newInstance();
-      }
-      catch (Exception e)
-      {
-        factory = CLASS_LOADING_ERROR;
-        e.printStackTrace();
-      }
-    }
-    return factory != CLASS_LOADING_ERROR ? (ExtensibilityElementFactory)factory : null;
-  }
-  
-  public void setExtensiblityElementFactory(ExtensibilityElementFactory factory)
-  {
-    this.factory = factory;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java
deleted file mode 100644
index fbbc014..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.extensibility;
-
-import java.util.HashMap;
-
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactoryRegistry;
-
-
-public class ExtensibilityElementFactoryRegistryImpl implements ExtensibilityElementFactoryRegistry
-{
-  protected HashMap map = new HashMap();
-  
-  public void put(String namespace, ExtensibilityElementFactoryDescriptor descriptor)
-  {
-    map.put(namespace, descriptor);
-  }
-  
-  public ExtensibilityElementFactory getExtensibilityElementFactory(String namespace)
-  {
-    ExtensibilityElementFactory result = null;
-    ExtensibilityElementFactoryDescriptor descriptor = (ExtensibilityElementFactoryDescriptor)map.get(namespace);
-    if (descriptor != null)
-    {
-      result = descriptor.getExtensiblityElementFactory();
-    }
-    return result;
-  }
-  
-  public void registerFactory(String namespace, ExtensibilityElementFactory factory)
-  {
-    ExtensibilityElementFactoryDescriptor descriptor = new ExtensibilityElementFactoryDescriptor(null,namespace,null);
-    descriptor.setExtensiblityElementFactory(factory);
-    map.put(namespace,descriptor);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java
deleted file mode 100644
index ddc5407..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.extensibility;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-
-
-public class ExtensibilityElementFactoryRegistryReader
-{
-  protected static final String PLUGIN_ID = WSDLPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-  protected static final String EXTENSION_POINT_ID = "extensibilityElementFactories";
-  protected static final String ELEMENT_NAME = "extensibilityElementFactory";
-  protected static final String ATT_NAMESPACE = "namespace";
-  protected static final String ATT_CLASS = "class";
-  protected ExtensibilityElementFactoryRegistryImpl extensibilityElementFactoryRegistry;
-
-  public ExtensibilityElementFactoryRegistryReader(ExtensibilityElementFactoryRegistryImpl extensibilityElementFactoryRegistry)
-  {
-    this.extensibilityElementFactoryRegistry = extensibilityElementFactoryRegistry;
-  }
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  public String resolve(URL platformURL, String relativePath) throws Exception
-  {
-    URL resolvedURL = Platform.resolve(platformURL);
-    return resolvedURL.toString() + relativePath;
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(ELEMENT_NAME))
-    {
-      try
-      {
-        IConfigurationElement childElement = (IConfigurationElement) element;
-        String namespace = childElement.getAttribute(ATT_NAMESPACE);
-        if (namespace != null)
-        {
-          ClassLoader pluginClasssLoader = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-          String className = childElement.getAttribute(ATT_CLASS);
-          ExtensibilityElementFactoryDescriptor descriptor = new ExtensibilityElementFactoryDescriptor(className,namespace,pluginClasssLoader);
-          extensibilityElementFactoryRegistry.put(namespace, descriptor);
-        }
-      }
-      catch (Exception e)
-      {
-      }
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BaseGenerator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BaseGenerator.java
deleted file mode 100644
index 3b477ec..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BaseGenerator.java
+++ /dev/null

@@ -1,56 +0,0 @@
-package org.eclipse.wst.wsdl.internal.generator;
-
-import org.eclipse.wst.wsdl.Definition;
-
-public abstract class BaseGenerator {
-	private String name;
-	private String refName;
-	private boolean overwrite;
-	protected Definition definition;
-	protected ContentGenerator contentGenerator;
-	
-	
-	public void setContentGenerator(ContentGenerator generator) {
-		contentGenerator = generator;
-	}
-	
-	public ContentGenerator getContentGenerator() {
-		return contentGenerator;
-	}
-
-	public void setOverwrite(boolean overwrite) {
-		this.overwrite = overwrite;
-	}
-	
-	public boolean getOverwrite() {
-		return overwrite;
-	}
-	
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	public void setRefName(String refName) {
-		this.refName = refName;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public String getRefName() {
-		return refName;
-	}
-	
-	public Definition getDefinition() {
-		return definition;
-	}
-	
-	public String getProtocol() {
-		if (contentGenerator != null) {
-			return contentGenerator.getProtocol();
-		}
-		
-		return null;
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java
deleted file mode 100644
index c3cf150..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java
+++ /dev/null

@@ -1,611 +0,0 @@
-package org.eclipse.wst.wsdl.internal.generator;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.internal.generator.extension.ContentGeneratorExtensionFactoryRegistry;
-
-/*
- * Class used to generate the Binding and it's content.  We look in the registry for
- * appropriate ContentGenerator classes based on the existing Binding Content's namespace.
- * Alternatively, users can pass in a namespace through the constructor to specify which
- * namespace to use when searching the registry.
- * 
- * The ContentGenerator may also be set manually by calling
- * setContentGenerator(ContentGenerator).
- */
-public class BindingGenerator extends BaseGenerator {
-	private WSDLFactory factory = WSDLFactory.eINSTANCE;
-	private Binding binding;
-
-	/*
-	 * When the constructor is used, automatically attempt to retrieve a proper
-	 * ContentGenerator based on the Binding given.  The ContentGenerator may
-	 * be replaced by calling setContentGenerator(ContentGenerator).
-	 */
-	public BindingGenerator(Definition definition, Binding binding) {	
-		this.definition = definition;
-		this.binding = binding;
-		contentGenerator = getContentGenerator(binding);
-	}
-
-	/*
-	 * When the constructor is used, automatically attempt to retrieve a proper
-	 * ContentGenerator based on the namespace given.  The ContentGenerator may
-	 * be replaced by calling setContentGenerator(ContentGenerator).
-	 */
-	public BindingGenerator(Definition definition, Binding binding, String namespace) {
-		this.definition = definition;
-		this.binding = binding;
-		contentGenerator = getContentGenerator(namespace);
-	}
-
-	public static ContentGenerator getContentGenerator(Binding binding) {
-		if (binding == null) {
-			return null;
-		}
-		/******************************************************
-		 * Find the regeistered Content Generator for the Binding
-		 ******************************************************/
-		// Get BindingContent namespace
-		String namespace = null;
-		List eeList = binding.getEExtensibilityElements();
-		if (eeList.size() > 0) {
-	        ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);			
-			// TODO: QName qName = ee.getElementType(); go get the namespace instead?
-	        namespace = ee.getElement().getNamespaceURI();
-			return getContentGenerator(namespace);
-		}
-	
-		return null;
-	}
-	
-	public static ContentGenerator getContentGenerator(String namespace) {
-		ContentGenerator contentGen = null;
-		if (namespace != null) {
-			ContentGeneratorExtensionFactoryRegistry factoryRegistry = ContentGeneratorExtensionFactoryRegistry.getInstance(); 
-			contentGen = factoryRegistry.getGeneratorClassFromNamespace(namespace);
-		}
-		
-		return contentGen;		
-	}
-	
-	private Binding createEmptyBinding(String localName) {
-		String name = localName;
-		if (localName == null) {
-			name = "";
-		}
-	    Binding newBinding = WSDLFactory.eINSTANCE.createBinding();
-		newBinding.setQName(new QName(definition.getTargetNamespace(),localName));
-		newBinding.setEnclosingDefinition(definition);
-	    definition.addBinding(newBinding);
-		
-		return newBinding;
-	}
-
-	/*
-	 * TODO: Scenario:
-	 * 1)overwrite == false
-	 * 2)BindingOperation with 1 input
-	 * 3)Corresponding Operation (with same name) with 1 input and 1 output
-	 * If we generate with overwrite == false, nothing is done.  Thus,  an
-	 * output is not generated on the BindingOperation.  This is because we
-	 * search for existing Elements only at the level of BindingOperations.
-	 * For example, if there is a corresponding BindingOperation with the same
-	 * name as our Operation, leave it alone.... but since there is already
-	 * a BindingOperation with the same name, we don't create a new BindingOperation.
-	 * 
-	 * The correct implementation is reduce this granularity to the MessageReference
-	 * level.  The code is almost there except for how we generate the Binding element
-	 * content.  Look at BindingGenrator.generateBindingOperation() and
-	 * SOAPContentGenerator.java and it's content generation method
-	 * for a good place to start.
-	 * 
-	 * For wtp RC1, We shall only look at the Operation level (as we do in the previous
-	 * version).
-	 */
-	public Binding generateBinding() {
-		try {
-		// If Binding is null (No Binding was passed into the constructor), we create an empty Binding first.
-		if (binding == null) {
-			binding = createEmptyBinding(getName());
-		}
-		if (getName() != null && !binding.getQName().getLocalPart().equals(getName())) {
-			binding.setQName(new QName(binding.getQName().getNamespaceURI(), getName()));
-		}
-		if (getRefName() != null) {
-			PortType portType = getPortType();
-			binding.setEPortType(portType);
-			if (portType == null) {
-				//The model doesn't reconile with it's Element properly when we're setting a null for it's PortType
-				binding.getElement().setAttribute("type", "");
-			}
-		}
-
-		List bindingOperations = binding.getEBindingOperations();		
-		PortType portType = binding.getEPortType();
-		
-		if (!getOverwrite()) {
-			// Don't Overwrite
-			if (portType == null) {
-				return binding;
-			}
-			else {
-				addRequiredNamespaces(binding);				
-				List operations = portType.getOperations();
-				
-				/*******************************************************************************
-				 * Determine which Operations require new a new corresponding BindingOperations
-				 *******************************************************************************/
-				List newBindingOpsNeeded = new ArrayList();
-				for (int index = 0; index < operations.size(); index++) {
-					Operation operation = (Operation) operations.get(index);
-					
-					boolean foundMatch = false;
-					Iterator bindingOperationsIt = bindingOperations.iterator();
-					while (bindingOperationsIt.hasNext()) {
-						BindingOperation bindingOperation = (BindingOperation) bindingOperationsIt.next();
-						
-						if (namesEqual(bindingOperation.getName(), operation.getName())) {
-							foundMatch = true;
-							break;
-						}
-					}
-					
-					if (!foundMatch){
-						newBindingOpsNeeded.add(operation);
-					}
-				}
-				// newBindingOpsNeeded is the List of Operations needing new corresponding
-				// BindingOperation's
-				List newBindingOps = createNewBindingOperations(newBindingOpsNeeded);
-				
-				// Generate the contents of the new BindingOperation's
-				Iterator newBindingOpsIt = newBindingOps.iterator();
-				while (newBindingOpsIt.hasNext()) {
-					BindingOperation newBindingOp = (BindingOperation) newBindingOpsIt.next();
-					generateBindingOperation(newBindingOp);
-					generateBindingOperationContent(newBindingOp);
-				}
-			}
-			
-			generateBindingContent(binding);	
-		}
-		else {
-			// Overwrite
-			if (portType == null) {
-				// We need to blow away everything under the Binding.  No PortType associated with this Binding
-				bindingOperations.clear();
-				return binding;
-			}
-			else {
-				addRequiredNamespaces(binding);				
-				List operations = portType.getOperations();
-				
-				/******************************************************
-				 * Compare the Operations
-				 ******************************************************/
-				// Remove any BindingOperations which are no longer used
-				for (int index = 0; index < bindingOperations.size(); index++) {
-					BindingOperation bindingOperation = (BindingOperation) bindingOperations.get(index);
-					
-					boolean foundMatch = false;
-					Iterator operationsIt = operations.iterator();
-					while (operationsIt.hasNext()) {
-						Operation operation = (Operation) operationsIt.next();
-						
-						if (namesEqual(bindingOperation.getName(), operation.getName())) {
-							foundMatch = true;
-							break;
-						}
-					}
-					
-					if (!foundMatch){
-						// We need to remove this BindingFault from the bindingFaults List
-						bindingOperations.remove(index);
-						index--;
-					}			
-				}
-				
-				// Remove any Operations which already exists in bindingOperations.  What we
-				// have left are the Operations which needs newly created BindingOperations
-				List bindingOperationsNeeded = new ArrayList();
-				for (int index = 0; index < operations.size(); index++) {
-					Operation operation = (Operation) operations.get(index);
-					
-					boolean foundMatch = false;
-					Iterator bindingOperationsIt = bindingOperations.iterator();
-					while (bindingOperationsIt.hasNext()) {
-						BindingOperation bindingOperation = (BindingOperation) bindingOperationsIt.next();
-						
-						if (namesEqual(bindingOperation.getName(), operation.getName())) {
-							foundMatch = true;
-							break;
-						}
-					}
-					
-					if (!foundMatch){
-						// We need to remove this BindingFault from the bindingFaults List
-						bindingOperationsNeeded.add(operation); // Store the actual Operation
-					}			
-				}		
-				
-				// Create required BindingOperations
-				createNewBindingOperations(bindingOperationsNeeded);
-
-				/******************************************************
-				 * Process the contents of the Operations
-				 ******************************************************/
-				Iterator bindingOperationsIt = binding.getEBindingOperations().iterator();
-				while (bindingOperationsIt.hasNext()) {
-					generateBindingOperation((BindingOperation) bindingOperationsIt.next());
-				}
-				
-				generateBindingContent(binding);
-				
-				return binding;
-			}			
-		}
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	private List createNewBindingOperations(List operations) {
-		List newBindingOps = new ArrayList();
-		
-		Iterator neededBindingOperationsIt = operations.iterator();
-		while (neededBindingOperationsIt.hasNext()) {
-			Operation operation = (Operation) neededBindingOperationsIt.next();
-			BindingOperation newBindingOperation = factory.createBindingOperation();
-			newBindingOperation.setEOperation(operation);
-			newBindingOperation.setName(operation.getName());
-			binding.addBindingOperation(newBindingOperation);
-			
-			newBindingOps.add(newBindingOperation);
-		}
-		
-		return newBindingOps;
-	}
-	
-	private void generateBindingOperation(BindingOperation bindingOperation) {
-		BindingInput bindingInput = bindingOperation.getEBindingInput();
-		BindingOutput bindingOutput = bindingOperation.getEBindingOutput();
-		List bindingFaults = bindingOperation.getEBindingFaults();
-		
-		Operation operation = bindingOperation.getEOperation();
-		Input input = operation.getEInput();
-		Output output = operation.getEOutput();
-		List faults = operation.getEFaults();
-
-		/******************************************************
-		 * Compare the Operation names
-		 ******************************************************/		
-		if (!namesEqual(bindingOperation.getName(), operation.getName())) {
-			bindingOperation.setName(operation.getName());
-		}
-		
-		
-		/******************************************************
-		 * Compare the Output
-		 ******************************************************/
-		if (output == null) {
-			bindingOperation.setBindingOutput(null);			
-		}
-		else {
-			// Create BindingOutput if necessary
-			if (bindingOutput == null) {
-				BindingOutput newBindingOutput = factory.createBindingOutput();
-				newBindingOutput.setEOutput(output);
-				newBindingOutput.setName(output.getName());
-				bindingOperation.setBindingOutput(newBindingOutput);				
-			}
-			else {
-				// Compare the Output names
-				if (!namesEqual(bindingOutput.getName(), output.getName())) {
-					bindingOutput.setName(output.getName());
-				}				
-			}
-		}
-		generateBindingOutputContent(bindingOperation.getEBindingOutput());
-		
-		/******************************************************
-		 * Compare the Input
-		 ******************************************************/
-		if (input == null) {
-			bindingOperation.setBindingInput(null);			
-		}
-		else {
-			// Create BindingInput if necessary
-			if (bindingInput == null) {
-				BindingInput newBindingInput = factory.createBindingInput();
-				newBindingInput.setEInput(input);
-				newBindingInput.setName(input.getName());
-				bindingOperation.setBindingInput(newBindingInput);
-			}
-			else {
-				// Compare the Input names
-				if (!namesEqual(bindingInput.getName(), input.getName())) {
-					bindingInput.setName(input.getName());
-				}
-			}
-		}
-		generateBindingInputContent(bindingOperation.getEBindingInput());
-		
-		
-		/******************************************************
-		 * Compare the Faults
-		 ******************************************************/
-		// Remove any BindingFaults which are no longer used
-		for (int index = 0; index < bindingFaults.size(); index++) {
-			BindingFault bindingFault = (BindingFault) bindingFaults.get(index);
-			
-			boolean foundMatch = false;
-			Iterator faultsIt = faults.iterator();
-			while (faultsIt.hasNext()) {
-				Fault fault = (Fault) faultsIt.next();
-				if (namesEqual(bindingFault.getName(), fault.getName())) {
-					foundMatch = true;
-					break;
-				}
-			}
-			
-			if (!foundMatch){
-				// We need to remove this BindingFault from the bindingFaults List
-				bindingFaults.remove(index);
-				index--;
-			}			
-		}
-		
-		// Remove any Faults which already exists in bindingFaults.  What we
-		// have left are the Faults which needs newly created BindingFaults
-		List bindingFaultsNeeded = new ArrayList();
-		for (int index = 0; index < faults.size(); index++) {
-			Fault fault = (Fault) faults.get(index);
-			
-			boolean foundMatch = false;
-			Iterator bindingFaultsIt = bindingFaults.iterator();
-			while (bindingFaultsIt.hasNext()) {
-				BindingFault bindingFault = (BindingFault) bindingFaultsIt.next();
-				if (namesEqual(bindingFault.getName(), fault.getName())) {
-					foundMatch = true;
-					break;
-				}
-			}
-			
-			if (!foundMatch){
-				// We need to remove this BindingFault from the bindingFaults List
-				bindingFaultsNeeded.add(fault);
-			}			
-		}		
-		
-		// bindingFaultsNeeded contains the needed BindingFault's we need to create
-		Iterator neededBindingFaultsIt = bindingFaultsNeeded.iterator();
-		while (neededBindingFaultsIt.hasNext()) {
-			Fault fault = (Fault) neededBindingFaultsIt.next();
-			BindingFault newBindingFault = factory.createBindingFault();
-			newBindingFault.setEFault(fault);
-			newBindingFault.setName(fault.getName());
-			bindingOperation.addBindingFault(newBindingFault);
-		}
-		
-		// Create the contents for each BindingFault
-		Iterator faultContentIt = bindingOperation.getEBindingFaults().iterator();
-		while (faultContentIt.hasNext()) {
-			BindingFault bindingFault = (BindingFault) faultContentIt.next();
-			generateBindingFaultContent(bindingFault);
-		}
-		
-		generateBindingOperationContent(bindingOperation);
-	}
-	
-	private boolean namesEqual(String name1, String name2) {
-		boolean match = false;
-		
-		if (name1 != null ^ name2 != null) {
-			// one is null
-			match = false;
-		}
-		else if (name1 != null && name2 != null) {
-			// neither is null
-			match = name1.equals(name2);
-		}
-		else {
-			// both are null
-			match = true;
-		}		
-		
-		return match;
-	}
-
-	protected void generateBindingContent(Binding binding) {
-		if (contentGenerator != null) {
-			if (binding.getEExtensibilityElements().size() == 0) {
-				contentGenerator.generateBindingContent(binding, (PortType) binding.getEPortType());
-			}
-		}
-		else {
-			removeExtensibilityElements(binding);
-		}
-	}
-
-	protected void generateBindingOperationContent(BindingOperation bindingOperation) {
-		if (bindingOperation != null && contentGenerator != null) {
-			contentGenerator.generateBindingOperationContent(bindingOperation, bindingOperation.getEOperation());
-		}
-		else {
-			removeExtensibilityElements(bindingOperation);
-		}
-	}
-	
-	protected void generateBindingInputContent(BindingInput bindingInput) {
-		if (bindingInput != null && contentGenerator != null) {
-			contentGenerator.generateBindingInputContent(bindingInput, bindingInput.getEInput());
-		}
-		else {
-			removeExtensibilityElements(bindingInput);
-		}
-	}
-	
-	protected void generateBindingOutputContent(BindingOutput bindingOutput) {
-		if (bindingOutput != null && contentGenerator != null) {
-			contentGenerator.generateBindingOutputContent(bindingOutput, bindingOutput.getEOutput());
-		}
-		else {
-			removeExtensibilityElements(bindingOutput);
-		}
-	}
-
-	protected void generateBindingFaultContent(BindingFault bindingFault) {
-		if (bindingFault != null && contentGenerator != null) {
-			contentGenerator.generateBindingFaultContent(bindingFault, bindingFault.getEFault());
-		}
-		else {
-			removeExtensibilityElements(bindingFault);
-		}
-	}
-	
-	private void removeExtensibilityElements(ExtensibleElement ee) {
-		if (ee != null) {
-			ee.getEExtensibilityElements().clear();
-		}
-	}
-	
-	/*
-	 * Generate Port Content for all Ports with a reference to the Binding
-	 * which was passed in through the constructor (or a reference to the
-	 * newly created Binding).
-	 */
-	public void generatePortContent() {
-		if (binding != null && contentGenerator != null) {
-			List portsToUpdate = new ArrayList();
-			
-			Iterator servicesIt = binding.getEnclosingDefinition().getEServices().iterator();
-			while (servicesIt.hasNext()) {
-				Service service = (Service) servicesIt.next();
-				Iterator portsIt = service.getEPorts().iterator();
-				while (portsIt.hasNext()) {
-					Port port = (Port) portsIt.next();
-					if (binding.equals(port.getEBinding())) {
-						// Found a match
-						portsToUpdate.add(port);
-					}
-				}
-			}
-			
-			Iterator portsToUpdateIt = portsToUpdate.iterator();
-			while (portsToUpdateIt.hasNext()) {
-				contentGenerator.generatePortContent((Port) portsToUpdateIt.next());
-			}
-		}	
-	}
-	
-	/*
-	 * methods addRequiredNamespaces() and computeUniquePrefix() are used to add necessary
-	 * namespaces 
-	 * 
-	 * TODO:
-	 * Does this belong here?  This is copied from wsdl.ui.  Can we sync up in some way?
-	 */
-	protected void addRequiredNamespaces(Binding binding) {
-		if (contentGenerator != null) {
-			String[] namespaceNames = contentGenerator.getRequiredNamespaces();
-			String[] preferredPrefixes = new String[namespaceNames.length];
-			for (int index = 0; index < namespaceNames.length; index++) {
-				preferredPrefixes[index] = contentGenerator.getPreferredNamespacePrefix(namespaceNames[index]);				
-			}
-	
-			Map map = binding.getEnclosingDefinition().getNamespaces();
-			
-		      for (int i = 0; i < namespaceNames.length; i++) {
-		        String namespace = namespaceNames[i];
-		        if (!map.containsValue(namespace)) {
-		          String prefix = (i < preferredPrefixes.length) ? preferredPrefixes[i] : "p0";
-		          if (map.containsKey(prefix)) {
-		            prefix = computeUniquePrefix("p", map);
-		          }
-				  binding.getEnclosingDefinition().addNamespace(prefix, namespace);
-		        }
-		      }
-		}
-	}
-	
-	private String computeUniquePrefix(String base, Map table){
-	    int i = 0;
-	    String prefix = base;
-	    while (true) {
-	      if (!table.containsKey(prefix)) {
-	        break;
-	      }
-	      else {
-	        prefix = base + i;
-	        i++;
-	      }
-	    }
-	    return prefix;
-	}
-	
-	private PortType getPortType() {
-		if (getRefName().equals("")) {
-			// Means we should set the PortType to Unspecified
-			return null;
-		}
-		
-		if (getRefName() != null) {
-			Iterator portTypeIt = definition.getEPortTypes().iterator();			
-
-			while (portTypeIt.hasNext()) {
-				PortType pt = (PortType) portTypeIt.next();
-				List prefixedNames = getPrefixedNames(pt);
-				if (prefixedNames.contains(getRefName())) {
-					return pt;
-				}
-			}
-		}
-		
-		return binding.getEPortType();
-	}
-	
-	private List getPrefixedNames(PortType portType) {
-		List prefixedNames = new ArrayList();
-		String currentPortTypeName = portType.getQName().getLocalPart();
-		String currentNamespace = portType.getQName().getNamespaceURI();
-
-		Map namespaceMap = definition.getNamespaces();
-		Iterator keys = namespaceMap.keySet().iterator();
-		while (keys.hasNext()) {
-			Object key = keys.next();
-			Object value = namespaceMap.get(key);
-
-			if (currentNamespace.equals(value)) {
-				// Found a match.  Add to our list
-				prefixedNames.add(key + ":" + currentPortTypeName);
-			}
-		}
-		
-		return prefixedNames;
-		
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/ContentGenerator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/ContentGenerator.java
deleted file mode 100644
index 62ede67..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/ContentGenerator.java
+++ /dev/null

@@ -1,32 +0,0 @@
-package org.eclipse.wst.wsdl.internal.generator;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-
-public interface ContentGenerator
-{	
-  public static String ADDRESS_LOCATION = "http://www.example.org/"; 
-
-  public String[] getRequiredNamespaces();
-  public String getPreferredNamespacePrefix(String namespace);
-
-  // generates the 'address' extensiblity element for a port
-  public void generatePortContent(Port port);
- 
-  public void generateBindingContent(Binding binding, PortType portType);
-  public void generateBindingOperationContent(BindingOperation bindingOperation, Operation operation); 
-  public void generateBindingInputContent(BindingInput bindingInput, Input input);    
-  public void generateBindingOutputContent(BindingOutput bindingOutput, Output output);
-  public void generateBindingFaultContent(BindingFault bindingFault, Fault fault);
-  
-  public String getProtocol();
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/PortGenerator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/PortGenerator.java
deleted file mode 100644
index 40f62d6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/PortGenerator.java
+++ /dev/null

@@ -1,78 +0,0 @@
-package org.eclipse.wst.wsdl.internal.generator;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public class PortGenerator extends BaseGenerator {
-	private Service service;
-	
-	public PortGenerator(Service service) {
-		this.service = service;
-		definition = service.getEnclosingDefinition();
-	}
-	
-	public Port generatePort() {
-		String name = getName();
-		String bindingName = getRefName();		
-		
-	    Port port = WSDLFactory.eINSTANCE.createPort();
-	    port.setName(getName());
-	    port.setEnclosingDefinition(service.getEnclosingDefinition());
-		port.setBinding(getBinding(getRefName()));
-	    service.addPort(port);
-		
-		if (this.getContentGenerator() != null) {
-			this.getContentGenerator().generatePortContent(port);
-		}
-		
-		return port;
-	}
-	
-	private Binding getBinding(String bindingName) {
-		Iterator bindingIt = definition.getEBindings().iterator();
-		while (bindingIt.hasNext()) {
-			Binding binding = (Binding) bindingIt.next();
-			String currentBindingName = binding.getQName().getLocalPart();
-			String currentNamespace = binding.getQName().getNamespaceURI();
-			
-			List prefixedNames = getPrefixedNames(binding);
-			
-			if (prefixedNames.contains(bindingName)) {
-				return binding;
-			}
-		}
-		
-		return null;
-	}
-	
-	private List getPrefixedNames(Binding binding) {
-		List prefixedNames = new ArrayList();
-		String currentBindingName = binding.getQName().getLocalPart();
-		String currentNamespace = binding.getQName().getNamespaceURI();
-
-		Map namespaceMap = definition.getNamespaces();
-		Iterator keys = namespaceMap.keySet().iterator();
-		while (keys.hasNext()) {
-			Object key = keys.next();
-			Object value = namespaceMap.get(key);
-			
-			if (currentNamespace.equals(value)) {
-				// Found a match.  Add to our list
-				prefixedNames.add(key + ":" + currentBindingName);
-			}
-		}
-		
-		return prefixedNames;
-	}
-	
-	public Service getService() {
-		return service;
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionDescriptor.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionDescriptor.java
deleted file mode 100644
index c75b5ad..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionDescriptor.java
+++ /dev/null

@@ -1,42 +0,0 @@
-package org.eclipse.wst.wsdl.internal.generator.extension;
-
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-
-/*
- * Class which acts as a container to hold information about the extension.
- */
-public class ContentGeneratorExtensionDescriptor {
-	protected ClassLoader classLoader;
-	protected ContentGenerator contentGenerator;
-	protected String namespace;
-	protected String name;
-	protected String className;
-	
-	public ContentGeneratorExtensionDescriptor(ClassLoader classLoader, String classString, String namespace, String name) {
-		this.classLoader = classLoader;
-		this.namespace = namespace;
-		this.name = name;
-		this.className = classString;
-	}
-	
-	
-	public Object getContentGenerator() {
-		try {
-	        Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-	        contentGenerator = (ContentGenerator) theClass.newInstance();
-	      }
-	      catch (Exception e) {
-	        e.printStackTrace();
-	      }
-		
-		return contentGenerator;
-	}
-	
-	public String getNamespace() {
-		return namespace;
-	}
-	
-	public String getName() {
-		return name;
-	}
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionFactoryRegistry.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionFactoryRegistry.java
deleted file mode 100644
index 33ab5b9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionFactoryRegistry.java
+++ /dev/null

@@ -1,158 +0,0 @@
-package org.eclipse.wst.wsdl.internal.generator.extension;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.wsdl.internal.generator.ContentGenerator;
-
-
-
-public class ContentGeneratorExtensionFactoryRegistry {
-	protected Map map;
-	protected static ContentGeneratorExtensionFactoryRegistry instance;
-	
-	public static ContentGeneratorExtensionFactoryRegistry getInstance() {
-		if (instance == null) {
-			instance = new ContentGeneratorExtensionFactoryRegistry();
-			
-			// TODO... don't read the registry until an 'get'occurs
-			//
-			ContentGeneratorExtensionRegistryReader reader = new ContentGeneratorExtensionRegistryReader(instance); 
-			reader.readRegistry();
-		}
-		
-		return instance;
-	}
-	
-	protected ContentGeneratorExtensionFactoryRegistry() {
-		map = new HashMap();
-	}
-	
-	public void put(String namespace, String name, ContentGeneratorExtensionDescriptor descriptor) {
-		// Check if this namespace/name key is already in the Map
-		List foundKey = findExistingKey(namespace, name);
-		
-		// Did we find an existing key with the same namespace/key pairing?
-		if (foundKey != null) {
-			// Simply add the descriptor to the list of descriptors associated
-			// with this namespace/name key
-			List descriptorList = (List) map.get(foundKey);
-			descriptorList.add(descriptor);
-		}
-		else {
-			// We need to create a new entry in the Map for this namespace/name key
-			List newKey = new ArrayList(2);
-			newKey.add(namespace);
-			newKey.add(name);
-			
-			List newDescriptorList = new ArrayList();
-			newDescriptorList.add(descriptor);
-			
-			map.put(newKey, newDescriptorList);
-		}		
-	}
-	
-	/*
-	 * Returns the 'name' attribute for this extension.
-	 */
-	public List getBindingExtensionNames() {
-		List list = new ArrayList();
-		
-		Iterator keyIt = map.keySet().iterator();
-		List key = null;
-		while (keyIt.hasNext()) {
-			key = (List) keyIt.next();
-			list.add(key.get(1));
-		}
-		
-		return list;
-	}
-	
-	/*
-	 * Return the class specified for this extension based on the namespace
-	 * attribute.
-	 */
-	public ContentGenerator getGeneratorClassFromNamespace(String namespace) {
-		ContentGenerator generatorClass = null;
-		List key = findExistingKeyFromNamespace(namespace);
-		
-		if (key != null) {
-			List descriptors = (List) map.get(key);
-			
-			// Grab the first descriptor available
-			if (descriptors.size() > 0) {
-				ContentGeneratorExtensionDescriptor extensionDescriptor = (ContentGeneratorExtensionDescriptor) descriptors.get(0);
-				generatorClass = (ContentGenerator) extensionDescriptor.getContentGenerator();
-			}
-		}
-		
-		return generatorClass;
-	}
-
-	/*
-	 * Return the class specified for this extension based on the name
-	 * attribute.
-	 */
-	public ContentGenerator getGeneratorClassFromName(String name) {
-		ContentGenerator generatorClass = null;
-		List key = findExistingKeyFromName(name);
-		
-		if (key != null) {
-			List descriptors = (List) map.get(key);
-			
-			// Grab the first descriptor available
-			if (descriptors.size() > 0) {
-				ContentGeneratorExtensionDescriptor extensionDescriptor = (ContentGeneratorExtensionDescriptor) descriptors.get(0);
-				generatorClass = (ContentGenerator) extensionDescriptor.getContentGenerator();
-			}
-		}
-		
-		return generatorClass;
-	}
-	
-	// TODO: We need to common the following three methods up.......
-	private List findExistingKeyFromNamespace(String namespace) {
-		Iterator keyIt = map.keySet().iterator();
-		List foundKey = null;
-		while (keyIt.hasNext()) {
-			foundKey = (List) keyIt.next();
-			if (namespace.equals(foundKey.get(0))) {
-				break;
-			}
-			foundKey = null;
-		}
-
-		return foundKey;
-	}
-	
-	private List findExistingKeyFromName(String name) {
-		Iterator keyIt = map.keySet().iterator();
-		List foundKey = null;
-		while (keyIt.hasNext()) {
-			foundKey = (List) keyIt.next();
-			if (name.equals(foundKey.get(1))) {
-				break;
-			}
-			foundKey = null;
-		}
-
-		return foundKey;
-	}
-	
-	private List findExistingKey(String namespace, String name) {
-		Iterator keyIt = map.keySet().iterator();
-		List foundKey = null;
-		while (keyIt.hasNext()) {
-			foundKey = (List) keyIt.next();
-			if (namespace.equals(foundKey.get(0)) && name.equals(foundKey.get(1))) {
-				break;
-			}
-			foundKey = null;
-		}
-
-		return foundKey;
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionRegistryReader.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionRegistryReader.java
deleted file mode 100644
index 9554762..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionRegistryReader.java
+++ /dev/null

@@ -1,63 +0,0 @@
-package org.eclipse.wst.wsdl.internal.generator.extension;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-
-public class ContentGeneratorExtensionRegistryReader {
-	  protected static final String PLUGIN_ID = WSDLPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-	  protected static final String EXTENSION_POINT_ID = "contentGenerators";
-	  protected static final String ELEMENT_NAME = "contentGenerator";
-	  protected static final String ATT_NAMESPACE = "namespace";
-	  protected static final String ATT_NAME = "name";
-	  protected static final String ATT_CLASS = "class";
-	  protected ContentGeneratorExtensionFactoryRegistry contentGeneratorExtensionFactoryRegistry;
-
-	  public ContentGeneratorExtensionRegistryReader(ContentGeneratorExtensionFactoryRegistry generatorExtensionFactoryRegistry) {
-	    this.contentGeneratorExtensionFactoryRegistry = generatorExtensionFactoryRegistry;
-	  }
-	
-	
-	  /**
-	   * read from plugin registry and parse it.
-	   */
-	  public void readRegistry() {
-	    IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-	    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-	    if (point != null) {
-	      IConfigurationElement[] elements = point.getConfigurationElements();
-	      for (int i = 0; i < elements.length; i++) {
-	        readElement(elements[i]);
-	      }
-	    }
-	  }
-
-	  public String resolve(URL platformURL, String relativePath) throws Exception {
-	    URL resolvedURL = Platform.resolve(platformURL);
-	    return resolvedURL.toString() + relativePath;
-	  }
-
-	  protected void readElement(IConfigurationElement element) {
-	    if (element.getName().equals(ELEMENT_NAME)) {
-	      try {
-	        IConfigurationElement childElement = (IConfigurationElement) element;
-			String name = childElement.getAttribute(ATT_NAME);
-	        String namespace = childElement.getAttribute(ATT_NAMESPACE);
-			
-	        if (namespace != null) {
-	          ClassLoader pluginClasssLoader = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPluginClassLoader();
-	          String className = childElement.getAttribute(ATT_CLASS);
-	          ContentGeneratorExtensionDescriptor descriptor = new ContentGeneratorExtensionDescriptor(pluginClasssLoader, className, namespace, name);
-	          contentGeneratorExtensionFactoryRegistry.put(namespace, name, descriptor);
-	        }
-	      }
-	      catch (Exception e) {
-			  e.printStackTrace();
-	      }
-	    }
-	  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java
deleted file mode 100644
index ce72c47..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java
+++ /dev/null

@@ -1,419 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding Fault</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.BindingFaultImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingFaultImpl#getEFault <em>EFault</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BindingFaultImpl extends ExtensibleElementImpl implements BindingFault
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEFault() <em>EFault</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEFault()
-   * @generated
-   * @ordered
-   */
-  protected Fault eFault = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingFaultImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getBindingFault();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_FAULT__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Fault getEFault()
-  {
-    if (eFault != null && eFault.eIsProxy())
-    {
-      Fault oldEFault = eFault;
-      eFault = (Fault)eResolveProxy((InternalEObject)eFault);
-      if (eFault != oldEFault)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.BINDING_FAULT__EFAULT, oldEFault, eFault));
-      }
-    }
-    return eFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Fault basicGetEFault()
-  {
-    return eFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEFault(Fault newEFault)
-  {
-    Fault oldEFault = eFault;
-    eFault = newEFault;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_FAULT__EFAULT, oldEFault, eFault));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Fault getFault()
-  {
-    return getEFault();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setFault(javax.wsdl.Fault fault)
-  {
-    setEFault((Fault) fault);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.BINDING_FAULT__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_FAULT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.BINDING_FAULT__ELEMENT:
-        return getElement();
-      case WSDLPackage.BINDING_FAULT__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.BINDING_FAULT__NAME:
-        return getName();
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-        if (resolve) return getEFault();
-        return basicGetEFault();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_FAULT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_FAULT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.BINDING_FAULT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-        setEFault((Fault)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_FAULT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_FAULT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.BINDING_FAULT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-        setEFault((Fault)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_FAULT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.BINDING_FAULT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.BINDING_FAULT__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.BINDING_FAULT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-        return eFault != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    String name = changedElement.getAttribute("name");
-    if (name != null)
-    {
-      setName(name);
-    }
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child,remainingModelObjects);
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      getEExtensibilityElements().remove(i.next());
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    BindingFault bindingFault = (BindingFault) component;
-    List list = new ArrayList();
-    list.addAll(bindingFault.getEExtensibilityElements());
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getBindingFault_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.FAULT);
-    setElement(newElement);
-
-    Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-  
-  // Resolve the reference to Fault
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      BindingOperation bop = (BindingOperation)getContainer();
-      Operation op = bop.getEOperation();
-      if (op != null)
-      {
-      	// TBD - Revisit API. Get the first Fault.
-        setFault((Fault)op.getEFaults().get(0));
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //BindingFaultImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
deleted file mode 100644
index 1b46347..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
+++ /dev/null

@@ -1,786 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#getEPortType <em>EPort Type</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingImpl#getEBindingOperations <em>EBinding Operations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BindingImpl extends ExtensibleElementImpl implements Binding
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected QName qName = QNAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNDEFINED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected boolean undefined = UNDEFINED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PROXY_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected boolean proxy = PROXY_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String RESOURCE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected String resourceURI = RESOURCE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEPortType() <em>EPort Type</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEPortType()
-   * @generated
-   * @ordered
-   */
-  protected PortType ePortType = null;
-
-  /**
-   * The cached value of the '{@link #getEBindingOperations() <em>EBinding Operations</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBindingOperations()
-   * @generated
-   * @ordered
-   */
-  protected EList eBindingOperations = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getBinding();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getQName()
-  {
-    return qName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQName(QName newQName)
-  {
-    QName oldQName = qName;
-    qName = newQName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING__QNAME, oldQName, qName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUndefined()
-  {
-    return undefined;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUndefined(boolean newUndefined)
-  {
-    boolean oldUndefined = undefined;
-    undefined = newUndefined;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING__UNDEFINED, oldUndefined, undefined));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isProxy()
-  {
-    return proxy;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setProxy(boolean newProxy)
-  {
-    boolean oldProxy = proxy;
-    proxy = newProxy;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING__PROXY, oldProxy, proxy));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getResourceURI()
-  {
-    return resourceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceURI(String newResourceURI)
-  {
-    String oldResourceURI = resourceURI;
-    resourceURI = newResourceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING__RESOURCE_URI, oldResourceURI, resourceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public PortType getEPortType()
-  {
-    if (ePortType != null && ePortType.eIsProxy())
-    {
-      PortType oldEPortType = ePortType;
-      ePortType = (PortType)eResolveProxy((InternalEObject)ePortType);
-      if (ePortType != oldEPortType)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.BINDING__EPORT_TYPE, oldEPortType, ePortType));
-      }
-    }
-    return ePortType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public PortType basicGetEPortType()
-  {
-    return ePortType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEPortType(PortType newEPortType)
-  {
-    PortType oldEPortType = ePortType;
-    ePortType = newEPortType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING__EPORT_TYPE, oldEPortType, ePortType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEBindingOperations()
-  {
-    if (eBindingOperations == null)
-    {
-      eBindingOperations = new EObjectContainmentEList(BindingOperation.class, this, WSDLPackage.BINDING__EBINDING_OPERATIONS);
-    }
-    return eBindingOperations;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add an operation binding to binding.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addBindingOperation(javax.wsdl.BindingOperation bindingOperation)
-  {
-    getBindingOperations().add(bindingOperation);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified operation binding. Note that operation names can
-   * be overloaded within a PortType. In case of overloading, the
-   * names of the input and output messages can be used to further
-   * refine the search.
-   * @param name the name of the desired operation binding.
-   * @param inputName the name of the input message; if this is null
-   * it will be ignored.
-   * @param outputName the name of the output message; if this is null
-   * it will be ignored.
-   * @return the corresponding operation binding, or null if there wasn't
-   * any matching operation binding
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.BindingOperation getBindingOperation(String name, String inputName, String outputName)
-  {
-    Iterator opBindingIterator = getBindingOperations().iterator();
-    while (opBindingIterator.hasNext())
-    {
-      javax.wsdl.BindingOperation op = (javax.wsdl.BindingOperation) opBindingIterator.next();
-      if (op == null)
-        continue;
-
-      String opName = op.getName();
-      if (name != null && opName != null)
-      {
-        if (!name.equals(opName))
-          op = null;
-      }
-      else if (name != null || opName != null)
-      {
-        op = null;
-      }
-
-      if (op != null && inputName != null)
-      {
-        javax.wsdl.BindingInput input = op.getBindingInput();
-        if (input != null)
-        {
-          String opInputName = input.getName();
-          if (opInputName == null || !opInputName.equals(inputName))
-            op = null;
-        }
-        else
-          op = null;
-      }
-
-      if (op != null && outputName != null)
-      {
-        javax.wsdl.BindingOutput output = op.getBindingOutput();
-        if (output != null)
-        {
-          String opOutputName = output.getName();
-          if (opOutputName == null || !opOutputName.equals(outputName))
-            op = null;
-        }
-        else
-          op = null;
-      }
-
-      if (op != null)
-        return op;
-    } // end while
-    return null; // binding operation not found
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the operation bindings defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getBindingOperations()
-  {
-    return getEBindingOperations();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.PortType getPortType()
-  {
-    return getEPortType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setPortType(javax.wsdl.PortType portType)
-  {
-    setEPortType((PortType) portType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.BINDING__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-          return ((InternalEList)getEBindingOperations()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.BINDING__ELEMENT:
-        return getElement();
-      case WSDLPackage.BINDING__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.BINDING__QNAME:
-        return getQName();
-      case WSDLPackage.BINDING__UNDEFINED:
-        return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.BINDING__PROXY:
-        return isProxy() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.BINDING__RESOURCE_URI:
-        return getResourceURI();
-      case WSDLPackage.BINDING__EPORT_TYPE:
-        if (resolve) return getEPortType();
-        return basicGetEPortType();
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-        return getEBindingOperations();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.BINDING__QNAME:
-        setQName((QName)newValue);
-        return;
-      case WSDLPackage.BINDING__UNDEFINED:
-        setUndefined(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.BINDING__PROXY:
-        setProxy(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.BINDING__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
-      case WSDLPackage.BINDING__EPORT_TYPE:
-        setEPortType((PortType)newValue);
-        return;
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-        getEBindingOperations().clear();
-        getEBindingOperations().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.BINDING__QNAME:
-        setQName(QNAME_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__UNDEFINED:
-        setUndefined(UNDEFINED_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__PROXY:
-        setProxy(PROXY_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING__EPORT_TYPE:
-        setEPortType((PortType)null);
-        return;
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-        getEBindingOperations().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.BINDING__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.BINDING__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.BINDING__QNAME:
-        return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
-      case WSDLPackage.BINDING__UNDEFINED:
-        return undefined != UNDEFINED_EDEFAULT;
-      case WSDLPackage.BINDING__PROXY:
-        return proxy != PROXY_EDEFAULT;
-      case WSDLPackage.BINDING__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-      case WSDLPackage.BINDING__EPORT_TYPE:
-        return ePortType != null;
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-        return eBindingOperations != null && !eBindingOperations.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
-    result.append(qName);
-    result.append(", undefined: ");
-    result.append(undefined);
-    result.append(", proxy: ");
-    result.append(proxy);
-    result.append(", resourceURI: ");
-    result.append(resourceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-
-    QName qname = new QName(definition.getTargetNamespace(), changedElement.getAttribute("name"));
-    setQName(qname);
-    reconcileReferences(false);
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    Binding binding = (Binding) component;
-
-    List list = new ArrayList();
-    list.addAll(binding.getEBindingOperations());
-    list.addAll(binding.getEExtensibilityElements());
-    return list;
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.OPERATION :
-        BindingOperation operation = WSDLFactory.eINSTANCE.createBindingOperation();
-        operation.setEnclosingDefinition(getEnclosingDefinition());
-        operation.setElement(child);
-        addBindingOperation(operation);
-        break;
-      default :
-        super.handleUnreconciledElement(child,remainingModelObjects);
-        break;
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    List list = getList(component, modelObject);
-    if (list != null)
-    {
-      list.remove(modelObject);
-    }
-  }
-
-  private List getList(Object component, Object modelObject)
-  {
-    List result = null;
-    Binding binding = (Binding) component;
-    if (modelObject instanceof BindingOperation)
-    {
-      result = binding.getEBindingOperations();
-    }
-    else if (modelObject instanceof ExtensibilityElement)
-    {
-      result = binding.getEExtensibilityElements();
-    }
-    return result;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getBinding_QName())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getBinding_EPortType())
-      {
-        PortType portType = getEPortType();
-        if (portType != null)
-        {
-          QName qName = portType.getQName();
-          niceSetAttributeURIValue(theElement, WSDLConstants.TYPE_ATTRIBUTE, qName.getNamespaceURI() + "#" + qName.getLocalPart());
-        }
-      }
-    }
-  }
-
-  protected Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.BINDING);
-    setElement(newElement);
-	
-	Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-	
-    iterator = getEBindingOperations().iterator();
-    while (iterator.hasNext())
-    {
-      BindingOperation operation = (BindingOperation) iterator.next();
-      Element child = ((BindingOperationImpl) operation).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      Definition definition = (Definition) getEnclosingDefinition();
-      QName portTypeQName = createQName(definition, element.getAttribute("type"));
-      PortType newPortType = portTypeQName != null ? (PortType) definition.getPortType(portTypeQName) : null;
-      if (newPortType != getEPortType())
-      {
-        setEPortType(newPortType);
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //BindingImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
deleted file mode 100644
index 31ea522..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
+++ /dev/null

@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding Input</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.BindingInputImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingInputImpl#getEInput <em>EInput</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BindingInputImpl extends ExtensibleElementImpl implements BindingInput
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEInput() <em>EInput</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEInput()
-   * @generated
-   * @ordered
-   */
-  protected Input eInput = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingInputImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getBindingInput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_INPUT__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Input getEInput()
-  {
-    if (eInput != null && eInput.eIsProxy())
-    {
-      Input oldEInput = eInput;
-      eInput = (Input)eResolveProxy((InternalEObject)eInput);
-      if (eInput != oldEInput)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.BINDING_INPUT__EINPUT, oldEInput, eInput));
-      }
-    }
-    return eInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Input basicGetEInput()
-  {
-    return eInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEInput(Input newEInput)
-  {
-    Input oldEInput = eInput;
-    eInput = newEInput;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_INPUT__EINPUT, oldEInput, eInput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Input getInput()
-  {
-    return getEInput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setInput(javax.wsdl.Input input)
-  {
-    setEInput((Input) input);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.BINDING_INPUT__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_INPUT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.BINDING_INPUT__ELEMENT:
-        return getElement();
-      case WSDLPackage.BINDING_INPUT__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.BINDING_INPUT__NAME:
-        return getName();
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-        if (resolve) return getEInput();
-        return basicGetEInput();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_INPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_INPUT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_INPUT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.BINDING_INPUT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-        setEInput((Input)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_INPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_INPUT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_INPUT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.BINDING_INPUT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-        setEInput((Input)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_INPUT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.BINDING_INPUT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.BINDING_INPUT__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.BINDING_INPUT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-        return eInput != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconciliation methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-	if (changedElement.hasAttribute("name"))
-	{
-      String name = changedElement.getAttribute("name");
-      if (name != null)
-      {
-        setName(name);
-      }
-	}
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child,remainingModelObjects);
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      getEExtensibilityElements().remove(i.next());
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    BindingInput bindingInput = (BindingInput) component;
-    List list = new ArrayList();
-    list.addAll(bindingInput.getEExtensibilityElements());
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getBindingInput_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.INPUT);
-    setElement(newElement);
-
-    Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-  
-  // Resolve the reference to Input
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      BindingOperation bop = (BindingOperation)getContainer();
-      Operation op = bop.getEOperation();
-      if (op != null)
-      {
-        setInput(op.getEInput());
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //BindingInputImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
deleted file mode 100644
index b63c8c6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
+++ /dev/null

@@ -1,797 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOperationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOperationImpl#getEOperation <em>EOperation</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOperationImpl#getEBindingInput <em>EBinding Input</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOperationImpl#getEBindingOutput <em>EBinding Output</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOperationImpl#getEBindingFaults <em>EBinding Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BindingOperationImpl extends ExtensibleElementImpl implements BindingOperation
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEOperation() <em>EOperation</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEOperation()
-   * @generated
-   * @ordered
-   */
-  protected Operation eOperation = null;
-
-  /**
-   * The cached value of the '{@link #getEBindingInput() <em>EBinding Input</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBindingInput()
-   * @generated
-   * @ordered
-   */
-  protected BindingInput eBindingInput = null;
-
-  /**
-   * The cached value of the '{@link #getEBindingOutput() <em>EBinding Output</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBindingOutput()
-   * @generated
-   * @ordered
-   */
-  protected BindingOutput eBindingOutput = null;
-
-  /**
-   * The cached value of the '{@link #getEBindingFaults() <em>EBinding Faults</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBindingFaults()
-   * @generated
-   * @ordered
-   */
-  protected EList eBindingFaults = null;
-
-  private Map bindingFaults;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingOperationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getBindingOperation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Operation getEOperation()
-  {
-    if (eOperation != null && eOperation.eIsProxy())
-    {
-      Operation oldEOperation = eOperation;
-      eOperation = (Operation)eResolveProxy((InternalEObject)eOperation);
-      if (eOperation != oldEOperation)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.BINDING_OPERATION__EOPERATION, oldEOperation, eOperation));
-      }
-    }
-    return eOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Operation basicGetEOperation()
-  {
-    return eOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEOperation(Operation newEOperation)
-  {
-    Operation oldEOperation = eOperation;
-    eOperation = newEOperation;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__EOPERATION, oldEOperation, eOperation));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingInput getEBindingInput()
-  {
-    return eBindingInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetEBindingInput(BindingInput newEBindingInput, NotificationChain msgs)
-  {
-    BindingInput oldEBindingInput = eBindingInput;
-    eBindingInput = newEBindingInput;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__EBINDING_INPUT, oldEBindingInput, newEBindingInput);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEBindingInput(BindingInput newEBindingInput)
-  {
-    if (newEBindingInput != eBindingInput)
-    {
-      NotificationChain msgs = null;
-      if (eBindingInput != null)
-        msgs = ((InternalEObject)eBindingInput).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.BINDING_OPERATION__EBINDING_INPUT, null, msgs);
-      if (newEBindingInput != null)
-        msgs = ((InternalEObject)newEBindingInput).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.BINDING_OPERATION__EBINDING_INPUT, null, msgs);
-      msgs = basicSetEBindingInput(newEBindingInput, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__EBINDING_INPUT, newEBindingInput, newEBindingInput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingOutput getEBindingOutput()
-  {
-    return eBindingOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetEBindingOutput(BindingOutput newEBindingOutput, NotificationChain msgs)
-  {
-    BindingOutput oldEBindingOutput = eBindingOutput;
-    eBindingOutput = newEBindingOutput;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT, oldEBindingOutput, newEBindingOutput);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEBindingOutput(BindingOutput newEBindingOutput)
-  {
-    if (newEBindingOutput != eBindingOutput)
-    {
-      NotificationChain msgs = null;
-      if (eBindingOutput != null)
-        msgs = ((InternalEObject)eBindingOutput).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT, null, msgs);
-      if (newEBindingOutput != null)
-        msgs = ((InternalEObject)newEBindingOutput).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT, null, msgs);
-      msgs = basicSetEBindingOutput(newEBindingOutput, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT, newEBindingOutput, newEBindingOutput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEBindingFaults()
-  {
-    if (eBindingFaults == null)
-    {
-      eBindingFaults = new EObjectContainmentEList(BindingFault.class, this, WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS);
-    }
-    return eBindingFaults;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a fault binding.
-   * @param fault the new fault binding
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addBindingFault(javax.wsdl.BindingFault bindingFault)
-  {
-    getEBindingFaults().add((BindingFault)bindingFault);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified fault binding.
-   * @param name the name of the desired fault binding.
-   * @return the corresponding fault binding, or null if there wasn't
-   * any matching fault binding
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.BindingFault getBindingFault(String name)
-  {
-    BindingFault result = null;
-    for (Iterator i = getEBindingFaults().iterator(); i.hasNext();)
-    {
-      BindingFault fault = (BindingFault) i.next();
-      if (name.equals(fault.getName()))
-      {
-        result = fault;
-        break;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the fault bindings associated with this operation binding.
-   * @return names of fault bindings
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getBindingFaults()
-  {
-    HashMap hashMap = new HashMap();
-    for (Iterator i = getEBindingFaults().iterator(); i.hasNext();)
-    {
-      BindingFault bindingFault = (BindingFault) i.next();
-      hashMap.put(bindingFault.getName(), bindingFault);
-    }
-    return hashMap;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Operation getOperation()
-  {
-    return getEOperation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setOperation(javax.wsdl.Operation operation)
-  {
-    setEOperation((Operation) operation);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.BindingInput getBindingInput()
-  {
-    return getEBindingInput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Set the input of this operation binding.
-   * @param input the desired input
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBindingInput(javax.wsdl.BindingInput bindingInput)
-  {
-    setEBindingInput((BindingInput) bindingInput);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.BindingOutput getBindingOutput()
-  {
-    return getEBindingOutput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Set the output of this operation binding.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBindingOutput(javax.wsdl.BindingOutput bindingOutput)
-  {
-    setEBindingOutput((BindingOutput) bindingOutput);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.BINDING_OPERATION__EBINDING_INPUT:
-          return basicSetEBindingInput(null, msgs);
-        case WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT:
-          return basicSetEBindingOutput(null, msgs);
-        case WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS:
-          return ((InternalEList)getEBindingFaults()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OPERATION__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.BINDING_OPERATION__ELEMENT:
-        return getElement();
-      case WSDLPackage.BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.BINDING_OPERATION__NAME:
-        return getName();
-      case WSDLPackage.BINDING_OPERATION__EOPERATION:
-        if (resolve) return getEOperation();
-        return basicGetEOperation();
-      case WSDLPackage.BINDING_OPERATION__EBINDING_INPUT:
-        return getEBindingInput();
-      case WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT:
-        return getEBindingOutput();
-      case WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS:
-        return getEBindingFaults();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EOPERATION:
-        setEOperation((Operation)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_INPUT:
-        setEBindingInput((BindingInput)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT:
-        setEBindingOutput((BindingOutput)newValue);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS:
-        getEBindingFaults().clear();
-        getEBindingFaults().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OPERATION__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.BINDING_OPERATION__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EOPERATION:
-        setEOperation((Operation)null);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_INPUT:
-        setEBindingInput((BindingInput)null);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT:
-        setEBindingOutput((BindingOutput)null);
-        return;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS:
-        getEBindingFaults().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OPERATION__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.BINDING_OPERATION__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.BINDING_OPERATION__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.BINDING_OPERATION__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_OPERATION__EOPERATION:
-        return eOperation != null;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_INPUT:
-        return eBindingInput != null;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_OUTPUT:
-        return eBindingOutput != null;
-      case WSDLPackage.BINDING_OPERATION__EBINDING_FAULTS:
-        return eBindingFaults != null && !eBindingFaults.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    String name = changedElement.getAttribute("name");
-    if (name != null)
-    {
-      setName(name);
-    }
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    Definition definition = getEnclosingDefinition();
-
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.INPUT :
-      {
-        BindingInput input = WSDLFactory.eINSTANCE.createBindingInput();
-        input.setEnclosingDefinition(definition);
-        input.setElement(child);
-        setBindingInput(input);
-        break;
-      }
-      case WSDLConstants.OUTPUT :
-      {
-        BindingOutput output = WSDLFactory.eINSTANCE.createBindingOutput();
-        output.setEnclosingDefinition(definition);
-        output.setElement(child);
-        setBindingOutput(output);
-        break;
-      }
-      case WSDLConstants.FAULT :
-      {
-        BindingFault fault = WSDLFactory.eINSTANCE.createBindingFault();
-        fault.setEnclosingDefinition(definition);
-        fault.setElement(child);
-        addBindingFault(fault);
-        break;
-      }
-      default :
-      {
-        super.handleUnreconciledElement(child,remainingModelObjects);
-        break;
-      }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    BindingOperation bindingOperation = (BindingOperation) component;
-    if (modelObject instanceof BindingInput)
-    {
-      bindingOperation.setEBindingInput(null);
-    }
-    else if (modelObject instanceof BindingOutput)
-    {
-      bindingOperation.setEBindingOutput(null);
-    }
-    else if (modelObject instanceof BindingFault)
-    {
-      bindingOperation.getEBindingFaults().remove(modelObject);
-    }
-    else
-    {
-      bindingOperation.getEExtensibilityElements().remove(modelObject);
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    BindingOperation bindingOperation = (BindingOperation) component;
-
-    List list = new ArrayList();
-
-    if (bindingOperation.getEBindingInput() != null)
-    {
-      list.add(bindingOperation.getEBindingInput());
-    }
-
-    if (bindingOperation.getEBindingOutput() != null)
-    {
-      list.add(bindingOperation.getEBindingOutput());
-    }
-
-    list.addAll(bindingOperation.getEBindingFaults());
-    list.addAll(bindingOperation.getEExtensibilityElements());
-
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getBindingOperation_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.OPERATION);
-    setElement(newElement);
-
-	Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-	
-    BindingInput input = getEBindingInput();
-    if (input != null)
-    {
-      Element child = ((BindingInputImpl) input).createElement();
-      newElement.appendChild(child);
-    }
-
-    BindingOutput output = getEBindingOutput();
-    if (output != null)
-    {
-      Element child = ((BindingOutputImpl) output).createElement();
-      newElement.appendChild(child);
-    }
-
-    iterator = getEBindingFaults().iterator();
-    while (iterator.hasNext())
-    {
-      BindingFault fault = (BindingFault) iterator.next();
-      Element child = ((BindingFaultImpl) fault).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-  
-  // Resolve the reference to Operation
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      Binding binding = (Binding)getContainer();
-      PortType portType = binding.getEPortType();
-      if (portType != null)
-      {
-        setOperation(portType.getOperation(getName(),null,null));
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //BindingOperationImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
deleted file mode 100644
index d350d91..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
+++ /dev/null

@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Binding Output</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOutputImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.BindingOutputImpl#getEOutput <em>EOutput</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BindingOutputImpl extends ExtensibleElementImpl implements BindingOutput
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEOutput() <em>EOutput</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEOutput()
-   * @generated
-   * @ordered
-   */
-  protected Output eOutput = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingOutputImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getBindingOutput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OUTPUT__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Output getEOutput()
-  {
-    if (eOutput != null && eOutput.eIsProxy())
-    {
-      Output oldEOutput = eOutput;
-      eOutput = (Output)eResolveProxy((InternalEObject)eOutput);
-      if (eOutput != oldEOutput)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.BINDING_OUTPUT__EOUTPUT, oldEOutput, eOutput));
-      }
-    }
-    return eOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Output basicGetEOutput()
-  {
-    return eOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEOutput(Output newEOutput)
-  {
-    Output oldEOutput = eOutput;
-    eOutput = newEOutput;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.BINDING_OUTPUT__EOUTPUT, oldEOutput, eOutput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Output getOutput()
-  {
-    return getEOutput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setOutput(javax.wsdl.Output output)
-  {
-    setEOutput((Output) output);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OUTPUT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.BINDING_OUTPUT__ELEMENT:
-        return getElement();
-      case WSDLPackage.BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-        return getName();
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-        if (resolve) return getEOutput();
-        return basicGetEOutput();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OUTPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-        setEOutput((Output)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OUTPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-        setEOutput((Output)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.BINDING_OUTPUT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.BINDING_OUTPUT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.BINDING_OUTPUT__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-        return eOutput != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-	if (changedElement.hasAttribute("name"))
-	{
-      String name = changedElement.getAttribute("name");
-      if (name != null)
-      {
-        setName(name);
-      }
-	}
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child,remainingModelObjects);
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      getEExtensibilityElements().remove(i.next());
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    BindingOutput bindingOutput = (BindingOutput) component;
-    List list = new ArrayList();
-    list.addAll(bindingOutput.getEExtensibilityElements());
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getBindingOutput_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.OUTPUT);
-    setElement(newElement);
-
-    Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-  
-  // Resolve the reference to Output
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      BindingOperation bop = (BindingOperation)getContainer();
-      Operation op = bop.getEOperation();
-      if (op != null)
-      {
-        setOutput(op.getEOutput());
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //BindingOutputImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
deleted file mode 100644
index e4604c4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
+++ /dev/null

@@ -1,2291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.impl.XSDImportImpl;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.events.Event;
-import org.w3c.dom.events.EventListener;
-import org.w3c.dom.events.EventTarget;
-import org.w3c.dom.events.MutationEvent;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getTargetNamespace <em>Target Namespace</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEncoding <em>Encoding</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEMessages <em>EMessages</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEPortTypes <em>EPort Types</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEBindings <em>EBindings</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEServices <em>EServices</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getENamespaces <em>ENamespaces</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getETypes <em>ETypes</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.DefinitionImpl#getEImports <em>EImports</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DefinitionImpl extends ExtensibleElementImpl implements Definition
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTargetNamespace()
-   * @generated
-   * @ordered
-   */
-  protected static final String TARGET_NAMESPACE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTargetNamespace()
-   * @generated
-   * @ordered
-   */
-  protected String targetNamespace = TARGET_NAMESPACE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocation()
-   * @generated
-   * @ordered
-   */
-  protected static final String LOCATION_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocation()
-   * @generated
-   * @ordered
-   */
-  protected String location = LOCATION_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected QName qName = QNAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getEncoding() <em>Encoding</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEncoding()
-   * @generated
-   * @ordered
-   */
-  protected static final String ENCODING_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getEncoding() <em>Encoding</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEncoding()
-   * @generated
-   * @ordered
-   */
-  protected String encoding = ENCODING_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEMessages() <em>EMessages</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEMessages()
-   * @generated
-   * @ordered
-   */
-  protected EList eMessages = null;
-
-  /**
-   * The cached value of the '{@link #getEPortTypes() <em>EPort Types</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEPortTypes()
-   * @generated
-   * @ordered
-   */
-  protected EList ePortTypes = null;
-
-  /**
-   * The cached value of the '{@link #getEBindings() <em>EBindings</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBindings()
-   * @generated
-   * @ordered
-   */
-  protected EList eBindings = null;
-
-  /**
-   * The cached value of the '{@link #getEServices() <em>EServices</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEServices()
-   * @generated
-   * @ordered
-   */
-  protected EList eServices = null;
-
-  /**
-   * The cached value of the '{@link #getENamespaces() <em>ENamespaces</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getENamespaces()
-   * @generated
-   * @ordered
-   */
-  protected EList eNamespaces = null;
-
-  /**
-   * The cached value of the '{@link #getETypes() <em>ETypes</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getETypes()
-   * @generated
-   * @ordered
-   */
-  protected Types eTypes = null;
-
-  /**
-   * The cached value of the '{@link #getEImports() <em>EImports</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEImports()
-   * @generated
-   * @ordered
-   */
-  protected EList eImports = null;
-
-  private ExtensionRegistry extensionRegistry;
-  private Document document;
-  private HashMap namespaces = new HashMap();
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getDefinition();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getTargetNamespace()
-  {
-    return targetNamespace;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTargetNamespace(String newTargetNamespace)
-  {
-    String oldTargetNamespace = targetNamespace;
-    targetNamespace = newTargetNamespace;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__TARGET_NAMESPACE, oldTargetNamespace, targetNamespace));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLocation()
-  {
-    return location;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLocation(String newLocation)
-  {
-    String oldLocation = location;
-    location = newLocation;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__LOCATION, oldLocation, location));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getQName()
-  {
-    return qName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQName(QName newQName)
-  {
-    QName oldQName = qName;
-    qName = newQName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__QNAME, oldQName, qName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getEncoding()
-  {
-    return encoding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEncoding(String newEncoding)
-  {
-    String oldEncoding = encoding;
-    encoding = newEncoding;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__ENCODING, oldEncoding, encoding));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEMessages()
-  {
-    if (eMessages == null)
-    {
-      eMessages = new EObjectContainmentEList(Message.class, this, WSDLPackage.DEFINITION__EMESSAGES);
-    }
-    return eMessages;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEPortTypes()
-  {
-    if (ePortTypes == null)
-    {
-      ePortTypes = new EObjectContainmentEList(PortType.class, this, WSDLPackage.DEFINITION__EPORT_TYPES);
-    }
-    return ePortTypes;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEBindings()
-  {
-    if (eBindings == null)
-    {
-      eBindings = new EObjectContainmentEList(Binding.class, this, WSDLPackage.DEFINITION__EBINDINGS);
-    }
-    return eBindings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEServices()
-  {
-    if (eServices == null)
-    {
-      eServices = new EObjectContainmentEList(Service.class, this, WSDLPackage.DEFINITION__ESERVICES);
-    }
-    return eServices;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * @deprecated
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getENamespaces()
-  {
-    if (eNamespaces == null)
-    {
-      eNamespaces = new EObjectContainmentEList(Namespace.class, this, WSDLPackage.DEFINITION__ENAMESPACES);
-    }
-    return eNamespaces;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Types getETypes()
-  {
-    return eTypes;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetETypes(Types newETypes, NotificationChain msgs)
-  {
-    Types oldETypes = eTypes;
-    eTypes = newETypes;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__ETYPES, oldETypes, newETypes);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setETypes(Types newETypes)
-  {
-    if (newETypes != eTypes)
-    {
-      NotificationChain msgs = null;
-      if (eTypes != null)
-        msgs = ((InternalEObject)eTypes).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.DEFINITION__ETYPES, null, msgs);
-      if (newETypes != null)
-        msgs = ((InternalEObject)newETypes).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.DEFINITION__ETYPES, null, msgs);
-      msgs = basicSetETypes(newETypes, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.DEFINITION__ETYPES, newETypes, newETypes));
-  }
-  
-  public void eNotify(Notification msg)
-  {
-    super.eNotify(msg);
-    
-    // cs.. if we've added a Types element, and this definition is already attached to a resource
-    // we need to set the schemaLocations for any inline schemaLocations.
-    // If not yet attached to a resource, the schemaLocation's will be set via WSDLResourceImpl.attached(EObject o)
-    //
-    if (msg.getFeature() == WSDLPackage.eINSTANCE.getDefinition_ETypes() &&
-        msg.getEventType() == Notification.SET)
-    {
-      if (eResource() instanceof WSDLResourceImpl && getEnclosingDefinition() != null)
-      {
-        setInlineSchemaLocations(eResource());
-      }    
-    }        
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEImports()
-  {
-    if (eImports == null)
-    {
-      eImports = new EObjectContainmentEList(Import.class, this, WSDLPackage.DEFINITION__EIMPORTS);
-    }
-    return eImports;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a binding to this WSDL description.
-   * @param binding the binding to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addBinding(javax.wsdl.Binding binding)
-  {
-    getEBindings().add((Binding) binding);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add an import to this WSDL description.
-   * @param importDef the import to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addImport(javax.wsdl.Import importDef)
-  {
-    getEImports().add((Import) importDef);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a message to this WSDL description.
-   * @param message the message to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addMessage(javax.wsdl.Message message)
-  {
-    getEMessages().add((Message)message);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * This is a way to add a namespace association to a definition.
-   * It is similar to adding a namespace prefix declaration to the
-   * top of a &lt;wsdl:definition&gt; element. This has nothing to do
-   * with the &lt;wsdl:import&gt; element; there are separate methods for
-   * dealing with information described by &lt;wsdl:import&gt; elements.
-   * There is a default namespace association (which can be
-   * overridden) between the null prefix and
-   * http://schemas.xmlsoap.org/wsdl/.
-   * @param prefix the prefix to use for this namespace (when
-   * rendering this information as XML). Use null or an empty string
-   * to describe the default namespace (i.e. xmlns="...").
-   * @param namespaceURI the namespace URI to associate the prefix
-   * with. If you use null, the namespace association will be removed.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addNamespace(String prefix, String namespaceURI)
-  {
-    if (prefix == null)
-      prefix = "";
-
-    if (namespaceURI != null)
-    {
-      // First, check if there is this namespace already.
-      String existingPrefix = getPrefix(namespaceURI);
-      if (existingPrefix != null)
-        return;
-
-      // Make sure the prefix is not already used for a different namespace
-      Map namespaces = getNamespaces();
-      String existingNamespace = (String) namespaces.get(prefix);
-      if (existingNamespace == null)
-      {
-        namespaces.put(prefix, namespaceURI);
-        
-        // Support for Namespace
-        Namespace ens = WSDLFactory.eINSTANCE.createNamespace();
-        ens.setPrefix(prefix);
-        ens.setURI(namespaceURI);
-        getENamespaces().add(ens);
-        
-        return;
-      }
-      
-      // The prefix is taken already. Make a unique prefix
-      if (prefix.endsWith("1"))
-        prefix = prefix.substring(0, prefix.length() - 1);
-
-      for (int i = 2;; i++)
-      {
-        String newPrefix = prefix + i;
-        if (!namespaces.containsKey(newPrefix))
-        {
-          namespaces.put(newPrefix, namespaceURI);
-          
-          // Support for Namespace
-          Namespace ens = WSDLFactory.eINSTANCE.createNamespace();
-          ens.setPrefix(prefix);
-          ens.setURI(namespaceURI);
-          getENamespaces().add(ens);
-          
-          return;
-        }
-      }
-    } // end if (namespaceURI != null)
-    else
-    {
-      getNamespaces().remove(prefix);
-      
-      // Support for Namespace
-      getENamespaces().remove(prefix);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a portType to this WSDL description.
-   * @param portType the portType to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addPortType(javax.wsdl.PortType portType)
-  {
-    getEPortTypes().add((PortType)portType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a service to this WSDL description.
-   * @param service the service to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addService(javax.wsdl.Service service)
-  {
-    getEServices().add((Service)service);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new binding fault.
-   * @return the newly created binding fault
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BindingFault createBindingFault()
-  {
-    javax.wsdl.BindingFault bindingFault = WSDLFactoryImpl.eINSTANCE.createBindingFault();
-    return bindingFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new binding input.
-   * @return the newly created binding input
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BindingInput createBindingInput()
-  {
-    javax.wsdl.BindingInput bindingInput = WSDLFactoryImpl.eINSTANCE.createBindingInput();
-    return bindingInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new binding output.
-   * @return the newly created binding output
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BindingOutput createBindingOutput()
-  {
-    javax.wsdl.BindingOutput bindingOutput = WSDLFactoryImpl.eINSTANCE.createBindingOutput();
-    return bindingOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new binding operation.
-   * @return the newly created binding operation
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BindingOperation createBindingOperation()
-  {
-    javax.wsdl.BindingOperation bindingOperation = WSDLFactoryImpl.eINSTANCE.createBindingOperation();
-    return bindingOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new binding.
-   * @return the newly created binding
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Binding createBinding()
-  {
-    javax.wsdl.Binding binding = WSDLFactoryImpl.eINSTANCE.createBinding();
-    binding.setUndefined(true);
-    return binding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new fault.
-   * @return the newly created fault
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Fault createFault()
-  {
-    javax.wsdl.Fault fault = WSDLFactoryImpl.eINSTANCE.createFault();
-    return fault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new import.
-   * @return the newly created import
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Import createImport()
-  {
-    javax.wsdl.Import importDef = WSDLFactoryImpl.eINSTANCE.createImport();
-    return importDef;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new input.
-   * @return the newly created input
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Input createInput()
-  {
-    javax.wsdl.Input input = WSDLFactoryImpl.eINSTANCE.createInput();
-    return input;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new message.
-   * @return the newly created message
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message createMessage()
-  {
-    javax.wsdl.Message message = WSDLFactoryImpl.eINSTANCE.createMessage();
-    message.setUndefined(true);
-    return message;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new operation.
-   * @return the newly created operation
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Operation createOperation()
-  {
-    javax.wsdl.Operation operation = WSDLFactoryImpl.eINSTANCE.createOperation();
-    operation.setUndefined(true);
-    return operation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new output.
-   * @return the newly created output
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Output createOutput()
-  {
-    javax.wsdl.Output output = WSDLFactoryImpl.eINSTANCE.createOutput();
-    return output;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new part.
-   * @return the newly created part
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Part createPart()
-  {
-    javax.wsdl.Part part = WSDLFactoryImpl.eINSTANCE.createPart();
-    return part;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new port.
-   * @return the newly created port
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Port createPort()
-  {
-    javax.wsdl.Port port = WSDLFactoryImpl.eINSTANCE.createPort();
-    return port;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new port type.
-   * @return the newly created port type
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.PortType createPortType()
-  {
-    javax.wsdl.PortType portType = WSDLFactoryImpl.eINSTANCE.createPortType();
-    portType.setUndefined(true);
-    return portType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Create a new service.
-   * @return the newly created service
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Service createService()
-  {
-    javax.wsdl.Service service = WSDLFactoryImpl.eINSTANCE.createService();
-    return service;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified binding. Also checks imported documents.
-   * @param name the name of the desired binding.
-   * @return the corresponding binding, or null if there wasn't
-   * any matching binding
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Binding getBinding(QName name)
-  {
-    return (javax.wsdl.Binding) resolveWSDLElement(WSDLConstants.BINDING, name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the bindings defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getBindings()
-  {
-    return createMap(WSDLConstants.BINDING, getEBindings());
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-    * Get a map of lists containing all the imports defined here.
-    * The map's keys are the namespaceURIs, and the map's values
-    * are lists. There is one list for each namespaceURI for which
-    * imports have been defined.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getImports()
-  {
-    HashMap map = new HashMap();
-    for (Iterator i = getEImports().iterator(); i.hasNext();)
-    {
-      Import theImport = (Import) i.next();
-      String key = theImport.getNamespaceURI();
-      if (key == null)
-      {
-        key = "";
-      }
-      
-      List list = null;
-      if (map.containsKey(key))
-      {
-        list = (List)map.get(key);
-        list.add(theImport); 
-      }
-      else
-      {
-        list = new ArrayList();
-        list.add(theImport);       
-      }
-      map.put(key,list);      
-    }
-    return map;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the list of imports for the specified namespaceURI.
-   * @param namespaceURI the namespaceURI associated with the
-   * desired imports.
-   * @return a list of the corresponding imports
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getImports(String namespaceURI)
-  {
-    List list = new ArrayList();
-    for (Iterator i = getEImports().iterator(); i.hasNext();)
-    {
-      Import theImport = (Import) i.next();
-      if (WSDLConstants.isMatchingNamespace(namespaceURI, theImport.getNamespaceURI()))
-      {
-        list.add(theImport);
-      }
-    }
-    return list;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified message. Also checks imported documents.
-   * @param name the name of the desired message.
-   * @return the corresponding message, or null if there wasn't
-   * any matching message
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message getMessage(QName name)
-  {
-    return (javax.wsdl.Message) resolveWSDLElement(WSDLConstants.MESSAGE, name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the messages defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getMessages()
-  {
-    return createMap(WSDLConstants.MESSAGE, getEMessages());
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the namespace URI associated with this prefix. Or null if
-   * there is no namespace URI associated with this prefix. This is
-   * unrelated to the &lt;wsdl:import&gt; element.
-   * @see #addNamespace(String, String)
-   * @see #getPrefix(String)
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getNamespace(String prefix)
-  {
-    return (String) getNamespaces().get(prefix);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all namespace associations in this definition. The keys are
-   * the prefixes, and the namespace URIs are the values. This is
-   * unrelated to the &lt;wsdl:import&gt; element.
-   * @see #addNamespace(String, String)
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getNamespaces()
-  {    
-    return namespaces;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified portType. Also checks imported documents.
-   * @param name the name of the desired portType.
-   * @return the corresponding portType, or null if there wasn't
-   * any matching portType
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.PortType getPortType(QName name)
-  {
-    return (javax.wsdl.PortType) resolveWSDLElement(WSDLConstants.PORT_TYPE, name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the portTypes defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getPortTypes()
-  {
-    return createMap(WSDLConstants.PORT_TYPE, getEPortTypes());
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get a prefix associated with this namespace URI. Or null if
-   * there are no prefixes associated with this namespace URI. This is
-   * unrelated to the &lt;wsdl:import&gt; element.
-   * @see #addNamespace(String, String)
-   * @see #getNamespace(String)
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getPrefix(String namespaceURI)
-  {
-    if (namespaceURI == null)
-      return null;
-
-    Iterator entryIterator = getNamespaces().entrySet().iterator();
-    while (entryIterator.hasNext())
-    {
-      Map.Entry entry = (Map.Entry) entryIterator.next();
-      String prefix = (String) entry.getKey();
-      String assocNamespaceURI = (String) entry.getValue();
-
-      if (namespaceURI.equals(assocNamespaceURI) && prefix != "") // default namespace
-        return prefix;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified service. Also checks imported documents.
-   * @param name the name of the desired service.
-   * @return the corresponding service, or null if there wasn't
-   * any matching service
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Service getService(QName name)
-  {
-    return (javax.wsdl.Service) resolveWSDLElement(WSDLConstants.SERVICE, name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the services defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getServices()
-  {
-    return createMap(WSDLConstants.SERVICE, getEServices());
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get a reference to the ExtensionRegistry for this Definition.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public ExtensionRegistry getExtensionRegistry()
-  {
-    return extensionRegistry;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Set the ExtensionRegistry for this Definition.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setExtensionRegistry(ExtensionRegistry extensionRegistry)
-  {
-    this.extensionRegistry = extensionRegistry;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getDocumentBaseURI()
-  {
-    return getLocation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDocumentBaseURI(String documentBase)
-  {
-    setLocation(documentBase);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Types createTypes()
-  {
-    javax.wsdl.Types types = WSDLFactoryImpl.eINSTANCE.createTypes();
-    return types;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Service removeService(QName name)
-  {
-    return (javax.wsdl.Service) getServices().remove(name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Binding removeBinding(QName name)
-  {
-    return (javax.wsdl.Binding) getBindings().remove(name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.PortType removePortType(QName name)
-  {
-    return (javax.wsdl.PortType) getPortTypes().remove(name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message removeMessage(QName name)
-  {
-    return (javax.wsdl.Message) getMessages().remove(name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Types getTypes()
-  {
-    return getETypes();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setTypes(javax.wsdl.Types types)
-  {
-    setETypes((Types) types);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Document getDocument()
-  {
-    return document;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Sets the owner document.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDocument(Document document)
-  {
-    this.document = document;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.DEFINITION__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__EMESSAGES:
-          return ((InternalEList)getEMessages()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__EPORT_TYPES:
-          return ((InternalEList)getEPortTypes()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__EBINDINGS:
-          return ((InternalEList)getEBindings()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__ESERVICES:
-          return ((InternalEList)getEServices()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__ENAMESPACES:
-          return ((InternalEList)getENamespaces()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.DEFINITION__ETYPES:
-          return basicSetETypes(null, msgs);
-        case WSDLPackage.DEFINITION__EIMPORTS:
-          return ((InternalEList)getEImports()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.DEFINITION__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.DEFINITION__ELEMENT:
-        return getElement();
-      case WSDLPackage.DEFINITION__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.DEFINITION__TARGET_NAMESPACE:
-        return getTargetNamespace();
-      case WSDLPackage.DEFINITION__LOCATION:
-        return getLocation();
-      case WSDLPackage.DEFINITION__QNAME:
-        return getQName();
-      case WSDLPackage.DEFINITION__ENCODING:
-        return getEncoding();
-      case WSDLPackage.DEFINITION__EMESSAGES:
-        return getEMessages();
-      case WSDLPackage.DEFINITION__EPORT_TYPES:
-        return getEPortTypes();
-      case WSDLPackage.DEFINITION__EBINDINGS:
-        return getEBindings();
-      case WSDLPackage.DEFINITION__ESERVICES:
-        return getEServices();
-      case WSDLPackage.DEFINITION__ENAMESPACES:
-        return getENamespaces();
-      case WSDLPackage.DEFINITION__ETYPES:
-        return getETypes();
-      case WSDLPackage.DEFINITION__EIMPORTS:
-        return getEImports();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.DEFINITION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.DEFINITION__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.DEFINITION__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__TARGET_NAMESPACE:
-        setTargetNamespace((String)newValue);
-        return;
-      case WSDLPackage.DEFINITION__LOCATION:
-        setLocation((String)newValue);
-        return;
-      case WSDLPackage.DEFINITION__QNAME:
-        setQName((QName)newValue);
-        return;
-      case WSDLPackage.DEFINITION__ENCODING:
-        setEncoding((String)newValue);
-        return;
-      case WSDLPackage.DEFINITION__EMESSAGES:
-        getEMessages().clear();
-        getEMessages().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__EPORT_TYPES:
-        getEPortTypes().clear();
-        getEPortTypes().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__EBINDINGS:
-        getEBindings().clear();
-        getEBindings().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__ESERVICES:
-        getEServices().clear();
-        getEServices().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__ENAMESPACES:
-        getENamespaces().clear();
-        getENamespaces().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.DEFINITION__ETYPES:
-        setETypes((Types)newValue);
-        return;
-      case WSDLPackage.DEFINITION__EIMPORTS:
-        getEImports().clear();
-        getEImports().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.DEFINITION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.DEFINITION__TARGET_NAMESPACE:
-        setTargetNamespace(TARGET_NAMESPACE_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__LOCATION:
-        setLocation(LOCATION_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__QNAME:
-        setQName(QNAME_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__ENCODING:
-        setEncoding(ENCODING_EDEFAULT);
-        return;
-      case WSDLPackage.DEFINITION__EMESSAGES:
-        getEMessages().clear();
-        return;
-      case WSDLPackage.DEFINITION__EPORT_TYPES:
-        getEPortTypes().clear();
-        return;
-      case WSDLPackage.DEFINITION__EBINDINGS:
-        getEBindings().clear();
-        return;
-      case WSDLPackage.DEFINITION__ESERVICES:
-        getEServices().clear();
-        return;
-      case WSDLPackage.DEFINITION__ENAMESPACES:
-        getENamespaces().clear();
-        return;
-      case WSDLPackage.DEFINITION__ETYPES:
-        setETypes((Types)null);
-        return;
-      case WSDLPackage.DEFINITION__EIMPORTS:
-        getEImports().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.DEFINITION__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.DEFINITION__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.DEFINITION__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.DEFINITION__TARGET_NAMESPACE:
-        return TARGET_NAMESPACE_EDEFAULT == null ? targetNamespace != null : !TARGET_NAMESPACE_EDEFAULT.equals(targetNamespace);
-      case WSDLPackage.DEFINITION__LOCATION:
-        return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-      case WSDLPackage.DEFINITION__QNAME:
-        return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
-      case WSDLPackage.DEFINITION__ENCODING:
-        return ENCODING_EDEFAULT == null ? encoding != null : !ENCODING_EDEFAULT.equals(encoding);
-      case WSDLPackage.DEFINITION__EMESSAGES:
-        return eMessages != null && !eMessages.isEmpty();
-      case WSDLPackage.DEFINITION__EPORT_TYPES:
-        return ePortTypes != null && !ePortTypes.isEmpty();
-      case WSDLPackage.DEFINITION__EBINDINGS:
-        return eBindings != null && !eBindings.isEmpty();
-      case WSDLPackage.DEFINITION__ESERVICES:
-        return eServices != null && !eServices.isEmpty();
-      case WSDLPackage.DEFINITION__ENAMESPACES:
-        return eNamespaces != null && !eNamespaces.isEmpty();
-      case WSDLPackage.DEFINITION__ETYPES:
-        return eTypes != null;
-      case WSDLPackage.DEFINITION__EIMPORTS:
-        return eImports != null && !eImports.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (targetNamespace: ");
-    result.append(targetNamespace);
-    result.append(", location: ");
-    result.append(location);
-    result.append(", qName: ");
-    result.append(qName);
-    result.append(", encoding: ");
-    result.append(encoding);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Hand-coded methods
-  //
-
-  protected static ResourceSet globalResourceSet;
-
-  public static synchronized ResourceSet getGlobalResourceSet()
-  {
-    if (globalResourceSet == null)
-    {
-      globalResourceSet = createResourceSet();
-      //String baseURL = WSDLPlugin.INSTANCE.getBaseURL().toString();
-      //System.out.println("Base URL is: " + baseURL);
-    }
-
-    return globalResourceSet;
-  }
-
-  public static ResourceSet createResourceSet()
-  {
-    ResourceSet result = new ResourceSetImpl();
-    result.getResourceFactoryRegistry().getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    return result;
-  }
-
-  public static Definition createDefinition(Node node)
-  {
-    return createDefinition(node, null);
-  }
-
-  public static Definition createDefinition(Node node, String location)
-  {
-    return createDefinition(node,location,true);
-  }
-  
-  public static Definition createDefinition(Node node, String location, boolean useExtensionFactories)
-  {
-    Definition definition = WSDLFactory.eINSTANCE.createDefinition();
-    ((DefinitionImpl)definition).setUseExtensionFactories(useExtensionFactories);
-    definition.setElement((Element) node);
-    definition.setDocumentBaseURI(location);
-    return definition;
-  }
-  
-  private WSDLElement resolveWSDLElement(int type, List list, javax.xml.namespace.QName qname)
-  {
-    WSDLElement result = null;
-    if (qname != null)
-    {
-      for (Iterator i = list.iterator(); i.hasNext();)
-      {
-        WSDLElement wsdlElement = (WSDLElement) i.next();
-        QName theQName = getQNameForWSDLElement(type, wsdlElement);
-        if (qname.equals(theQName))
-        {
-          result = wsdlElement;
-          break;
-        }
-      }
-    }
-    return result;
-  }
-
-  private HashMap createMap(int type, List list)
-  {
-    HashMap map = new HashMap();
-    for (Iterator i = list.iterator(); i.hasNext();)
-    {
-      WSDLElement wsdlElement = (WSDLElement) i.next();
-      QName theQName = getQNameForWSDLElement(type, wsdlElement);
-      if (theQName != null)
-      {
-        map.put(theQName, wsdlElement);
-      }
-    }
-    return map;
-  }
-
-  private QName getQNameForWSDLElement(int type, WSDLElement wsdlElement)
-  {
-    QName result = null;
-    switch (type)
-    {
-      case WSDLConstants.MESSAGE :
-        result = ((Message) wsdlElement).getQName();
-        break;
-      case WSDLConstants.PORT_TYPE :
-        result = ((PortType) wsdlElement).getQName();
-        break;
-      case WSDLConstants.BINDING :
-        result = ((Binding) wsdlElement).getQName();
-        break;
-      case WSDLConstants.SERVICE :
-        result = ((Service) wsdlElement).getQName();
-        break;
-    }
-    return result;
-  }
-
-  /*
-   * TBD - Revisit
-   * Look for an object in the imported definitions.
-   */
-  private WSDLElement resolveWSDLElement(int type, javax.xml.namespace.QName qname)
-  {
-    WSDLElement result = null;
-    if (qname.getNamespaceURI() != null)
-    {
-      for (Iterator i = getDefinitions(qname.getNamespaceURI()).iterator(); i.hasNext();)
-      {
-        Definition definition = (Definition) i.next();
-        switch (type)
-        {
-          case WSDLConstants.MESSAGE :
-            result = resolveWSDLElement(type, definition.getEMessages(), qname);
-            break;
-          case WSDLConstants.PORT_TYPE :
-            result = resolveWSDLElement(type, definition.getEPortTypes(), qname);
-            break;
-          case WSDLConstants.BINDING :
-            result = resolveWSDLElement(type, definition.getEBindings(), qname);
-            break;
-          case WSDLConstants.SERVICE :
-            result = resolveWSDLElement(type, definition.getEServices(), qname);
-            break;
-        }
-        if (result != null)
-        {
-          break;
-        }
-      }
-    }
-    return result;
-  }  
-
-  //
-  // Reconciliation methods
-  //
-
-  public void setElement(Element element)
-  {
-    Element oldElement = getElement();
-    if (oldElement instanceof EventTarget)
-    {
-      EventTarget oldEventTarget = ((EventTarget)oldElement);
-      oldEventTarget.removeEventListener("DOMNodeInserted", getEventListener(), true);
-      oldEventTarget.removeEventListener("DOMNodeRemoved", getEventListener(), true);
-      oldEventTarget.removeEventListener("DOMAttrModified", getEventListener(), true);
-    }
-    super.setElement(element);
-    if (element instanceof EventTarget)
-    {
-      EventTarget eventTarget = ((EventTarget)element);
-      eventTarget.addEventListener("DOMNodeInserted", getEventListener(), true);
-      eventTarget.addEventListener("DOMNodeRemoved", getEventListener(), true);
-      eventTarget.addEventListener("DOMAttrModified", getEventListener(), true);
-    }
-    if (element != null)
-    {
-      document = element.getOwnerDocument();
-    }
-  }
-
-  protected void reconcileAttributes(Element changedElement)
-  {
-    super.reconcileAttributes(changedElement);
-
-    if (changedElement == getElement())
-    { 
-      if (changedElement.hasAttribute("targetNamespace"))
-        setTargetNamespace(changedElement.getAttribute("targetNamespace"));
-	  if (changedElement.hasAttribute("name"))
-        setQName(new QName(WSDLConstants.WSDL_NAMESPACE_URI, changedElement.getAttribute("name")));
-      getENamespaces().clear();
-      getNamespaces().clear();
-      //getNamespaces().put("", null);
-
-      NamedNodeMap map = changedElement.getAttributes();
-      int mapLength = map.getLength();
-      for (int i = 0; i < mapLength; i++)
-      {
-        Attr attr = (Attr) map.item(i);
-        String nsPrefix = null;
-        if ("xmlns".equals(attr.getPrefix()))
-        {
-          nsPrefix = attr.getLocalName();
-        }
-        else if ("xmlns".equals(attr.getNodeName()))
-        {
-          nsPrefix = "";
-        }
-
-        if (nsPrefix != null)
-        {
-          getNamespaces().put(nsPrefix, attr.getValue());
-        }
-      }
-    }
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.BINDING :
-        {
-          Binding binding = WSDLFactory.eINSTANCE.createBinding();
-          binding.setEnclosingDefinition(this);
-          binding.setElement(child);
-          addBinding(binding);
-          break;
-        }
-      case WSDLConstants.DOCUMENTATION :
-        {
-          // CS: we need to figure out how to unset this element when its removed
-          //definition.setDocumentationElement(child);  
-          break;
-        }
-      case WSDLConstants.IMPORT :
-        {
-          Import i = WSDLFactory.eINSTANCE.createImport();
-          i.setEnclosingDefinition(this);
-          i.setElement(child);
-          addImport(i);
-          break;
-        }
-      case WSDLConstants.MESSAGE :
-        {
-          Message message = WSDLFactory.eINSTANCE.createMessage();
-          message.setEnclosingDefinition(this);
-          message.setElement(child);
-          addMessage(message);
-          break;
-        }
-      case WSDLConstants.PORT_TYPE :
-        {
-          PortType portType = WSDLFactory.eINSTANCE.createPortType();
-          portType.setEnclosingDefinition(this);
-          portType.setElement(child);
-          addPortType(portType);
-          break;
-        }
-      case WSDLConstants.SERVICE :
-        {
-          Service service = WSDLFactoryImpl.eINSTANCE.createService();
-          service.setEnclosingDefinition(this);
-          service.setElement(child);
-          addService(service);
-          break;
-        }
-      case WSDLConstants.TYPES :
-        {
-          if (getETypes() == null)
-          {
-            Types types = WSDLFactoryImpl.eINSTANCE.createTypes();
-            types.setEnclosingDefinition(this);
-            types.setElement(child);
-            setETypes(types);
-          }
-          break;
-        }
-      default :
-      {
-        ExtensibilityElement extensibilityElement = getUseExtensionFactories() ? 
-          ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createExtensibilityElement(getNamespace(child),getLocalName(child)) :
-          ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createUnknownExtensibilityElement();
-        	   		                                              
-        extensibilityElement.setEnclosingDefinition(this);
-        extensibilityElement.setElement(child);
-        getEExtensibilityElements().add(extensibilityElement);
-        break;
-      }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-    reconcileReferences(true);
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    if (modelObject instanceof Types)
-    {
-      Definition definition = (Definition) component;
-      if (definition.getETypes() == modelObject)
-      {
-        definition.setETypes(null);
-      }
-    }
-    else
-    {
-      List list = getList(component, modelObject);
-      if (list != null)
-      {
-        list.remove(modelObject);
-      }
-    }
-  }
-
-  private List getList(Object component, Object modelObject)
-  {
-    List result = null;
-    Definition definition = (Definition) component;
-
-    // todo... use WSDLSwitch
-    //
-    if (modelObject instanceof Binding)
-    {
-      result = definition.getEBindings();
-    }
-    else if (modelObject instanceof Import)
-    {
-      result = definition.getEImports();
-    }
-    else if (modelObject instanceof Message)
-    {
-      result = definition.getEMessages();
-    }
-    else if (modelObject instanceof PortType)
-    {
-      result = definition.getEPortTypes();
-    }
-    else if (modelObject instanceof Service)
-    {
-      result = definition.getEServices();
-    }
-    else if (modelObject instanceof ExtensibilityElement)
-    {
-      result = definition.getEExtensibilityElements();
-    }
-    return result;
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    List list = new ArrayList();
-    Definition definition = (Definition) component;
-    list.addAll(definition.getEImports());
-    list.add(definition.getETypes());
-    list.addAll(definition.getEMessages());
-    list.addAll(definition.getEPortTypes());
-    list.addAll(definition.getEBindings());
-    list.addAll(definition.getEServices());
-    list.addAll(definition.getEExtensibilityElements());
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  public Document updateDocument()
-  {
-    document = createDocument();
-    return document;
-  }
-
-  private Document createDocument()
-  {
-    try
-    {
-      DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-      documentBuilderFactory.setNamespaceAware(true);
-      documentBuilderFactory.setValidating(false);
-      DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
-      return documentBuilder.newDocument();
-    }
-    catch (ParserConfigurationException exception)
-    {
-      WSDLPlugin.INSTANCE.log(exception);
-      return null;
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.DEFINITION);
-    setElement(newElement);
-    addChildElements(newElement, getEExtensibilityElements());
-
-    Types types = getETypes();
-    if (types != null)
-    {
-      Element child = ((TypesImpl) types).createElement();
-      newElement.appendChild(child);
-    }
-
-    addChildElements(newElement, getEImports());
-    addChildElements(newElement, getEMessages());
-    addChildElements(newElement, getEPortTypes());
-    addChildElements(newElement, getEBindings());
-    addChildElements(newElement, getEServices());
-
-    return newElement;
-  }
-
-  protected void addChildElements(Element parent, List c)
-  {
-    for (Iterator iterator = c.iterator(); iterator.hasNext();)
-    {
-      WSDLElementImpl wsdlElement = (WSDLElementImpl) iterator.next();
-      Element child = wsdlElement.createElement();
-      parent.appendChild(child);
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-    // Add namespace prefix info
-    // TBD - Need to revisit.
-    Element theElement = getElement();
-    if (eReference == null && theElement != null) 
-    // We are updating the Definition element.
-    {
-      Iterator iterator = getNamespaces().entrySet().iterator();
-      String prefix = null;
-      String uri = null;
-      while (iterator.hasNext())
-      {
-        Map.Entry entry = (Map.Entry) iterator.next();
-        prefix = (String) entry.getKey();
-        uri = (String) entry.getValue();
-        if (prefix != "")
-          theElement.setAttributeNS(XSDConstants.XMLNS_URI_2000, "xmlns:" + prefix, uri);
-        else if (uri != null)
-          // Handle default namespace, e.g. xmlns="http://schemas.xmlsoap.org/wsdl/"
-          theElement.setAttributeNS(XSDConstants.XMLNS_URI_2000, "xmlns", uri);
-      }
-    }
-  }
-  
-  protected void changeAttribute(EAttribute eAttribute)
-  {    
-    if (isReconciling)
-      return; 
-    
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      //if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getDefinition_Encoding())
-      //  niceSetAttribute(theElement, WSDLConstants.ENCODING_ATTRIBUTE, getEncoding());
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getDefinition_QName())
-        if (getQName() != null)
-          niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getDefinition_TargetNamespace())
-        if (getTargetNamespace() != null)
-          niceSetAttribute(theElement, WSDLConstants.TARGETNAMESPACE_ATTRIBUTE, getTargetNamespace());
-    }
-  }
-
-  protected List getDefinitions(String namespace)
-  {
-    List list = new ArrayList();
-    if (WSDLConstants.isMatchingNamespace(namespace, getTargetNamespace()))
-    {
-      list.add(this);
-    }
-    for (Iterator i = getImports(namespace).iterator(); i.hasNext();)
-    {
-      Import theImport = (Import) i.next();
-      ((ImportImpl) theImport).importDefinitionOrSchema();
-      Definition importedDefinition = theImport.getEDefinition();
-      if (importedDefinition != null && WSDLConstants.isMatchingNamespace(namespace, importedDefinition.getTargetNamespace()))
-      {
-        list.add(importedDefinition);
-      }
-    }
-    return list;
-  }
-
-  public XSDElementDeclaration resolveElementDeclarationURI(String uri)
-  {
-    XSDElementDeclaration result = null;
-    int index = uri.lastIndexOf("#");
-    if (index != -1)
-    {
-      result = resolveElementDeclaration(uri.substring(0, index), uri.substring(index + 1));
-    }
-    return result;
-  }
-
-  public XSDElementDeclaration resolveElementDeclaration(String namespace, String localName)
-  {
-    XSDElementDeclaration result = null;
-    for (Iterator i = resolveSchema(namespace).iterator(); i.hasNext();)
-    {
-      XSDSchema schema = (XSDSchema) i.next();
-      result = schema.resolveElementDeclaration(namespace, localName);
-      if (result != null)
-        return result;
-    }
-    
-    // Could not resolve. Try against all <import>ed and inlined schemas.
-    for (Iterator i = getImportedOrInlinedSchemas().iterator(); i.hasNext();)
-    {
-      XSDSchema schema = (XSDSchema)i.next();
-      result = schema.resolveElementDeclaration(namespace, localName);
-      if (result != null)
-        return result;
-    }
-    
-    return result;
-  }
-
-  public XSDTypeDefinition resolveTypeDefinitionURI(String uri)
-  {
-    XSDTypeDefinition result = null;
-    int index = uri.lastIndexOf("#");
-    if (index != -1)
-    {
-      result = resolveTypeDefinition(uri.substring(0, index), uri.substring(index + 1));
-    }
-    return result;
-  }
-
-  public XSDTypeDefinition resolveTypeDefinition(String namespace, String localName)
-  {
-    XSDTypeDefinition result = null;
-    for (Iterator i = resolveSchema(namespace).iterator(); i.hasNext();)
-    {
-      XSDSchema schema = (XSDSchema)i.next();
-      result = schema.resolveTypeDefinition(namespace, localName);
-      if (result != null)
-        return result;
-    }
-    
-    // Could not resolve. Try against all <import>ed and inlined schemas.
-    for (Iterator i = getImportedOrInlinedSchemas().iterator(); i.hasNext();)
-    {
-      XSDSchema schema = (XSDSchema)i.next();
-      result = schema.resolveTypeDefinition(namespace, localName);
-      if (result != null)
-        return result;
-    }
-    
-    return result; // Failed to resolve.
-  }
-
-  /**
-  	* This returns set of schemas with the given namespace as it's target namespace.
-  	*/
-  public Collection resolveSchema(String namespace)
-  {
-    if ("".equals(namespace))
-    {
-      namespace = null;
-    }
-
-    if (XSDConstants.isSchemaForSchemaNamespace(namespace))
-    {
-      return Collections.singleton(XSDSchemaImpl.getSchemaForSchema(namespace));
-    }
-    else if (XSDConstants.isSchemaInstanceNamespace(namespace))
-    {
-      return Collections.singleton(XSDSchemaImpl.getSchemaInstance(namespace));
-    }
-    else
-    {
-      return getImportedOrInlinedSchemas(namespace);
-    }
-  }
-  
-  protected List getImportedOrInlinedSchemas(String namespace)
-  {
-    if (namespace == null)
-    {
-      namespace = "";
-    }
-
-    List list = new ArrayList();
-    for (Iterator i = getEImports().iterator(); i.hasNext();)
-    {
-      Import theImport = (Import) i.next();
-      if (WSDLConstants.isMatchingNamespace(theImport.getNamespaceURI(), namespace))
-      {
-        ((ImportImpl) theImport).importDefinitionOrSchema();
-        XSDSchema schema = theImport.getESchema();
-        if (schema != null && WSDLConstants.isMatchingNamespace(schema.getTargetNamespace(), namespace))
-        {
-          list.add(schema);
-        }
-      }
-    }
-    if (getETypes() != null)
-    {
-      for (Iterator i = getETypes().getSchemas().iterator(); i.hasNext();)
-      {
-        XSDSchema schema = (XSDSchema) i.next();
-        String targetNamespace = schema.getTargetNamespace();
-        if (namespace.equals(targetNamespace))
-        {  
-          list.add(schema);
-        }
-        
-        for (Iterator j = schema.getContents().iterator(); j.hasNext(); )
-        {
-          Object component = j.next();
-          if (component instanceof XSDImport)
-          {
-            XSDImport theImport = (XSDImport)component;
-            if (namespace.equals(theImport.getNamespace()))
-            {
-              ((XSDImportImpl)theImport).importSchema();
-              XSDSchema importedSchema = theImport.getResolvedSchema();             
-              if (importedSchema != null)
-              {  
-                list.add(importedSchema);
-              }  
-            }  
-          }  
-        }  
-        
-      }     
-    }
-    return list;
-  }
-  
-  private List getImportedOrInlinedSchemas()
-  {
-    List list = new ArrayList();
-    for (Iterator i = getEImports().iterator(); i.hasNext();)
-    {
-      Import theImport = (Import) i.next();
-      ((ImportImpl) theImport).importDefinitionOrSchema();
-      XSDSchema schema = theImport.getESchema();
-      if (schema != null)
-        list.add(schema);
-    }
-    
-    if (getETypes() != null)
-    {
-      list.addAll(getETypes().getSchemas());
-    }
-    return list;
-  }
-  
-  protected EventListener eventListener;
-  protected Node deletionNode;
-
-  public Node getDeletionNode()
-  {
-    return deletionNode;
-  }
-
-  protected EventListener getEventListener()
-  {
-    if (eventListener == null)
-    {
-      eventListener = 
-        new EventListener()
-        {
-          public void handleEvent(Event event) 
-          {
-            if (event instanceof MutationEvent)
-            {
-              MutationEvent mutationEvent = (MutationEvent)event;
-              if (mutationEvent.getTarget() instanceof Node)
-              {
-                Node node = (Node)mutationEvent.getTarget();
-                while (node.getNodeType() != Node.ELEMENT_NODE)
-                {
-                  node = node.getParentNode();
-                }
-                if (mutationEvent.getAttrChange() == 0)
-                {
-                  WSDLElementImpl listener = (WSDLElementImpl)getCorrespondingComponent(node.getParentNode());
-                  if (listener != null)
-                  {
-                    if (event.getType().equals("DOMNodeRemoved"))
-                    {
-                      deletionNode = (Node)event.getTarget();
-                    }
-                    listener.elementContentsChanged((Element)node.getParentNode());
-                    deletionNode = null;
-                  }
-                }
-                else
-                {
-                  WSDLElementImpl listener = (WSDLElementImpl)getCorrespondingComponent(node);
-                  if (listener != null)
-                  {
-                    listener.elementAttributesChanged((Element)node);
-                  }
-                }
-              }
-            }
-          }
-        };
-    }
-    return eventListener;
-  }
-  
-  public WSDLElement getCorrespondingComponent(Node node)
-  {
-    // We consider all parents so that they can handle other contained nodes that otherwise don't correspond to a component.
-    //
-    List parents = new ArrayList();
-  
-    if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-    {
-      node = ((Attr)node).getOwnerElement();
-    }
-    else
-    {
-      // Skip ahead to an element.
-      //
-      for (Node scanNode = node; scanNode != null; scanNode = scanNode.getNextSibling())
-      {
-        if (scanNode.getNodeType() == Node.ELEMENT_NODE)
-        {
-          node = scanNode;
-          break;
-        }
-      }
-  
-      // Skip back to an element.
-      //
-      for (Node scanNode = node; scanNode != null; scanNode = scanNode.getPreviousSibling())
-      {
-        if (scanNode.getNodeType() == Node.ELEMENT_NODE)
-        {
-          node = scanNode;
-          break;
-        }
-      }
-    }
-  
-    // Navigate out through the elements.
-    //
-    for (Node parent = node; parent != null; parent = parent.getParentNode())
-    {
-      if (parent.getNodeType() == Node.ELEMENT_NODE)
-      {
-        parents.add(parent);
-      }
-    }
-
-    WSDLElement bestWSDLElement = getBestWSDLElement(parents);
-    return bestWSDLElement;
-  }
-  
-  //
-  //
-  //
-  private boolean useExtensionFactories = true; 
-  
-  public void setUseExtensionFactories(boolean value)
-  {
-  	useExtensionFactories = value;
-  }
-  
-  public boolean getUseExtensionFactories()
-  {
-  	return useExtensionFactories;
-  }
-  
-  // See Bug 5366
-  public void removeAll()
-  {
-    try
-    {
-     isReconciling = true;
-     document = null;
-     element = null;
-     getEServices().clear();
-     getEBindings().clear();
-     getEPortTypes().clear();
-     getEMessages().clear();
-     setETypes(null);
-     getEImports().clear();
-     getEExtensibilityElements().clear();     
-    }
-    catch (Exception e)
-    {
-      
-    }
-    finally
-    {
-     isReconciling = false;
-    } 
-  }
-  
-  public void setInlineSchemaLocations(Resource resource)
-  {
-    // Initialize the inline schemas location 
-    Types types = this.getETypes();
-    if (types != null)
-    {
-      for (Iterator j = types.getEExtensibilityElements().iterator(); j.hasNext();)
-      {
-        XSDSchemaExtensibilityElement el = (XSDSchemaExtensibilityElement) j.next();
-        XSDSchema schema = el.getSchema();
-        if (schema != null)
-        {  
-        	// We need this try-catch block in case we encounter an exception while attempting
-        	// to resolve the schema.  In the case of the WSDL Editor, we get a
-        	// 'cannot create part exception'......See eclipse bugzilla bug 89855
-        	try
-        	{
-        		schema.setSchemaLocation(resource.getURI().toString());
-        	}
-        	catch (Exception e) {
-
-        	}
-        }  
-      }        
-    }      
-  }  
-  
-} //DefinitionImpl
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java
deleted file mode 100644
index bb84247..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java
+++ /dev/null

@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extensibility Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.ExtensibilityElementImpl#isRequired <em>Required</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ExtensibilityElementImpl#getElementType <em>Element Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExtensibilityElementImpl extends WSDLElementImpl implements ExtensibilityElement
-{
-  /**
-   * The default value of the '{@link #isRequired() <em>Required</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isRequired()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean REQUIRED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isRequired() <em>Required</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isRequired()
-   * @generated
-   * @ordered
-   */
-  protected boolean required = REQUIRED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getElementType() <em>Element Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementType()
-   * @generated
-   * @ordered
-   */
-  protected static final QName ELEMENT_TYPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getElementType() <em>Element Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementType()
-   * @generated
-   * @ordered
-   */
-  protected QName elementType = ELEMENT_TYPE_EDEFAULT;
-
-  private HashMap beanPropertyDescriptors;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ExtensibilityElementImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getExtensibilityElement();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isRequired()
-  {
-    return required;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setRequired(boolean newRequired)
-  {
-    boolean oldRequired = required;
-    required = newRequired;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED, oldRequired, required));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(eClass().getEPackage().getNsURI(), eClass().getName());
-
-    return elementType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setElementType(QName newElementType)
-  {
-    QName oldElementType = elementType;
-    elementType = newElementType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE, oldElementType, elementType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT:
-        return getElement();
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        return getElementType();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (required: ");
-    result.append(required);
-    result.append(", elementType: ");
-    result.append(elementType);
-    result.append(')');
-    return result.toString();
-  }
-
-  /**
-   * @see javax.wsdl.extensions.ExtensibilityElement#getRequired()
-   */
-  public Boolean getRequired()
-  {
-    return new Boolean(isRequired());
-  }
-
-  /**
-   * @see javax.wsdl.extensions.ExtensibilityElement#setRequired(Boolean)
-   */
-  public void setRequired(Boolean required)
-  {
-    setRequired(required.booleanValue());
-  }
-
-  /**
-   * Returns the property descriptors for a given class.
-   */
-  public java.util.Map getPropertyDescriptors(java.lang.Class clazz)
-  {
-    // Lookup properties cache
-    Map properties = null;
-    if (beanPropertyDescriptors == null)
-      beanPropertyDescriptors = new HashMap();
-    else
-      properties = (Map) beanPropertyDescriptors.get(clazz);
-
-    if (properties == null)
-    {
-      // Introspect the bean
-      ArrayList binfos = new ArrayList();
-      try
-      {
-        BeanInfo binfo = Introspector.getBeanInfo(clazz);
-        if (binfo != null)
-        {
-          binfos.add(binfo);
-          BeanInfo[] abinfo = binfo.getAdditionalBeanInfo();
-          if (abinfo != null)
-          {
-            for (int b = 0; b < abinfo.length; b++)
-              binfos.add(abinfo[b]);
-          }
-        }
-      }
-      catch (IntrospectionException e)
-      {
-        // TBD - handle exception
-      }
-
-      properties = new HashMap();
-      for (Iterator b = binfos.iterator(); b.hasNext();)
-      {
-        BeanInfo binfo = (BeanInfo) b.next();
-        PropertyDescriptor[] pdesc = binfo.getPropertyDescriptors();
-        if (pdesc == null)
-          continue;
-        for (int p = 0; p < pdesc.length; p++)
-          properties.put(pdesc[p].getName(), pdesc[p]);
-      }
-      beanPropertyDescriptors.put(clazz, properties);
-    }
-    return properties;
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void setElement(Element element)
-  {
-    if (element == null && !isReconciling)
-    {
-      //System.out.println("ExtensibilityElement.setElement(): Preserving old element");
-    }
-    else
-    {
-      setElementGen(element);
-    }
-  }
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    super.reconcileAttributes(changedElement);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child,remainingModelObjects);
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    super.handleReconciliation(remainingModelObjects);
-  }
-
-  //
-  // For reconciliation: EMF -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-  }
-
-  public Element createElement()
-  {
-    Definition definition = getEnclosingDefinition();
-    if (definition == null)
-      return null;
-
-    Document document = definition.getDocument();
-    if (document == null)
-      document = ((DefinitionImpl) definition).updateDocument();
-
-    Element newElement = null;
-    if (element != null) // This is an old element.
-    {
-      newElement = (Element) document.importNode(element, true); 
-      element = newElement;
-    }
-    else
-    {
-      String namespace = getElementType().getNamespaceURI();
-      String qualifier = definition.getPrefix(namespace);
-      newElement = document.createElementNS(namespace, (qualifier == null ? "" : qualifier + ":") + getElementType().getLocalPart());
-      element = newElement;
-    }
-
-    return newElement;
-  }
-} //ExtensibilityElementImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java
deleted file mode 100644
index d3ce61d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java
+++ /dev/null

@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extensible Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.ExtensibleElementImpl#getEExtensibilityElements <em>EExtensibility Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ExtensibleElementImpl extends WSDLElementImpl implements ExtensibleElement
-{
-  /**
-   * The cached value of the '{@link #getEExtensibilityElements() <em>EExtensibility Elements</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEExtensibilityElements()
-   * @generated
-   * @ordered
-   */
-  protected EList eExtensibilityElements = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ExtensibleElementImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getExtensibleElement();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEExtensibilityElements()
-  {
-    if (eExtensibilityElements == null)
-    {
-      eExtensibilityElements = new EObjectContainmentEList(ExtensibilityElement.class, this, WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS);
-    }
-    return eExtensibilityElements;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getExtensibilityElements()
-  {
-    return getEExtensibilityElements();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extElement)
-  {
-    getExtensibilityElements().add(extElement);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-        return getElement();
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.EXTENSIBLE_ELEMENT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  //
-  //
-  //
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    if (!WSDLConstants.isMatchingNamespace(child.getNamespaceURI(), WSDLConstants.WSDL_NAMESPACE_URI))
-    {  
-      ExtensibilityElement extensibilityElement = useExtensionFactories() ? 
-          ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createExtensibilityElement(getNamespace(child),getLocalName(child)) :
-            ((WSDLFactoryImpl)WSDLFactory.eINSTANCE).createUnknownExtensibilityElement();
-          
-          extensibilityElement.setEnclosingDefinition(getEnclosingDefinition());
-          extensibilityElement.setElement(child);
-          getEExtensibilityElements().add(extensibilityElement);
-    }
-  }
-  
-  private boolean useExtensionFactories()
-  {
-  	// Use extension factories by default.
-    return getEnclosingDefinition() == null ? 
-      true : 
-      ((DefinitionImpl)getEnclosingDefinition()).getUseExtensionFactories();
-  }
-  
-} //ExtensibleElementImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java
deleted file mode 100644
index 3fb4604..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Fault</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class FaultImpl extends MessageReferenceImpl implements Fault
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected FaultImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getFault();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message getMessage()
-  {
-    return getEMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setMessage(javax.wsdl.Message message)
-  {
-    setEMessage((Message) message);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.FAULT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.FAULT__ELEMENT:
-        return getElement();
-      case WSDLPackage.FAULT__NAME:
-        return getName();
-      case WSDLPackage.FAULT__EMESSAGE:
-        if (resolve) return getEMessage();
-        return basicGetEMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.FAULT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.FAULT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.FAULT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.FAULT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.FAULT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.FAULT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.FAULT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.FAULT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.FAULT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.FAULT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.FAULT__EMESSAGE:
-        return eMessage != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.FAULT);
-    setElement(newElement);
-    return newElement;
-  }
-} //FaultImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
deleted file mode 100644
index 72ad9eb..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
+++ /dev/null

@@ -1,592 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Import</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.ImportImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ImportImpl#getLocationURI <em>Location URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ImportImpl#getEDefinition <em>EDefinition</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ImportImpl#getESchema <em>ESchema</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ImportImpl extends WSDLElementImpl implements Import
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  protected boolean resolved;
-
-  /**
-   * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-  protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocationURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String LOCATION_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getLocationURI() <em>Location URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocationURI()
-   * @generated
-   * @ordered
-   */
-  protected String locationURI = LOCATION_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEDefinition() <em>EDefinition</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEDefinition()
-   * @generated
-   * @ordered
-   */
-  protected Definition eDefinition = null;
-
-  /**
-   * The cached value of the '{@link #getESchema() <em>ESchema</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getESchema()
-   * @generated
-   * @ordered
-   */
-  protected XSDSchema eSchema = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ImportImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getImport();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setNamespaceURI(String newNamespaceURI)
-  {
-    String oldNamespaceURI = namespaceURI;
-    namespaceURI = newNamespaceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.IMPORT__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLocationURI()
-  {
-    return locationURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLocationURI(String newLocationURI)
-  {
-    String oldLocationURI = locationURI;
-    locationURI = newLocationURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.IMPORT__LOCATION_URI, oldLocationURI, locationURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Definition getEDefinition()
-  {
-    if (eDefinition != null && eDefinition.eIsProxy())
-    {
-      Definition oldEDefinition = eDefinition;
-      eDefinition = (Definition)eResolveProxy((InternalEObject)eDefinition);
-      if (eDefinition != oldEDefinition)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.IMPORT__EDEFINITION, oldEDefinition, eDefinition));
-      }
-    }
-    return eDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Definition basicGetEDefinition()
-  {
-    return eDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEDefinition(Definition newEDefinition)
-  {
-    Definition oldEDefinition = eDefinition;
-    eDefinition = newEDefinition;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.IMPORT__EDEFINITION, oldEDefinition, eDefinition));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDSchema getESchema()
-  {
-    if (eSchema != null && eSchema.eIsProxy())
-    {
-      XSDSchema oldESchema = eSchema;
-      eSchema = (XSDSchema)eResolveProxy((InternalEObject)eSchema);
-      if (eSchema != oldESchema)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.IMPORT__ESCHEMA, oldESchema, eSchema));
-      }
-    }
-    return eSchema;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDSchema basicGetESchema()
-  {
-    return eSchema;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setESchema(XSDSchema newESchema)
-  {
-    XSDSchema oldESchema = eSchema;
-    eSchema = newESchema;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.IMPORT__ESCHEMA, oldESchema, eSchema));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public XSDSchema getSchema()
-  {
-    return getESchema();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setSchema(XSDSchema schema)
-  {
-    setESchema(schema);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.IMPORT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.IMPORT__ELEMENT:
-        return getElement();
-      case WSDLPackage.IMPORT__NAMESPACE_URI:
-        return getNamespaceURI();
-      case WSDLPackage.IMPORT__LOCATION_URI:
-        return getLocationURI();
-      case WSDLPackage.IMPORT__EDEFINITION:
-        if (resolve) return getEDefinition();
-        return basicGetEDefinition();
-      case WSDLPackage.IMPORT__ESCHEMA:
-        if (resolve) return getESchema();
-        return basicGetESchema();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.IMPORT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.IMPORT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.IMPORT__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case WSDLPackage.IMPORT__LOCATION_URI:
-        setLocationURI((String)newValue);
-        return;
-      case WSDLPackage.IMPORT__EDEFINITION:
-        setEDefinition((Definition)newValue);
-        return;
-      case WSDLPackage.IMPORT__ESCHEMA:
-        setESchema((XSDSchema)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.IMPORT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.IMPORT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.IMPORT__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.IMPORT__LOCATION_URI:
-        setLocationURI(LOCATION_URI_EDEFAULT);
-        return;
-      case WSDLPackage.IMPORT__EDEFINITION:
-        setEDefinition((Definition)null);
-        return;
-      case WSDLPackage.IMPORT__ESCHEMA:
-        setESchema((XSDSchema)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.IMPORT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.IMPORT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.IMPORT__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case WSDLPackage.IMPORT__LOCATION_URI:
-        return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-      case WSDLPackage.IMPORT__EDEFINITION:
-        return eDefinition != null;
-      case WSDLPackage.IMPORT__ESCHEMA:
-        return eSchema != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (namespaceURI: ");
-    result.append(namespaceURI);
-    result.append(", locationURI: ");
-    result.append(locationURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  /**
-   * @see Import#getDefinition()
-   */
-  public javax.wsdl.Definition getDefinition()
-  {
-    return getEDefinition();
-  }
-
-  /**
-   * @see Import#setDefinition(Definition)
-   */
-  public void setDefinition(javax.wsdl.Definition definition)
-  {
-    setEDefinition((org.eclipse.wst.wsdl.Definition) definition);
-  }
-
-  //
-  // Reconcile methods
-  //
-  public void reconcileAttributes(Element changedElement)
-  {
-    setNamespaceURI(WSDLConstants.getAttribute(changedElement, WSDLConstants.NAMESPACE_ATTRIBUTE));
-    setLocationURI(WSDLConstants.getAttribute(changedElement, WSDLConstants.LOCATION_ATTRIBUTE));
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    // We need to set this boolean to false because the Import may point to a different location.
-    // So we need we should view this import as unresolved.
-    resolved = false;
-    
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getImport_NamespaceURI())
-        niceSetAttribute(theElement, WSDLConstants.NAMESPACE_ATTRIBUTE, getNamespaceURI());
-
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getImport_LocationURI())
-        niceSetAttribute(theElement, WSDLConstants.LOCATION_ATTRIBUTE, getLocationURI());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.IMPORT);
-    setElement(newElement);
-    return newElement;
-  }
-
-  public void importDefinitionOrSchema()
-  {
-    resolve(getNamespaceURI(), getLocationURI());
-  }
-
-  protected void resolve(String namespace, String location)
-  {
-    if (!resolved)
-    {
-      Definition definition = getEnclosingDefinition();
-      if (definition != null && definition.getDocumentBaseURI() != null)
-      {
-        Resource resource = definition.eResource();
-        if (resource != null)
-        {
-          ResourceSet resourceSet = resource.getResourceSet();
-          if (resourceSet != null)
-          {
-            if (namespace == null)
-            {
-              namespace = definition.getTargetNamespace();
-            }
-
-            String resolvedLocation = resolveLocation(definition, namespace, location);
-
-            URI uri = URI.createURI(resolvedLocation);
-            Resource resolvedResource = resourceSet.getResource(uri, false);
-            if (resolvedResource == null)
-            {
-              try
-              {
-                InputStream inputStream = resourceSet.getURIConverter().createInputStream(uri);
-                resolvedResource = resourceSet.createResource(uri);
-                resolvedResource.load(inputStream, resourceSet.getLoadOptions());
-              }
-              catch (IOException exception)
-              {
-                // It is generally not an error to fail to resolve.
-                // If a resource is actually created, 
-                // which happens only when we can create an input stream,
-                // then it's an error if it's not a good wsdl or schema
-              }
-            }
-
-            if (resolvedResource != null)
-            {
-              if (resolvedResource instanceof WSDLResourceImpl)
-              {
-                eDefinition = ((WSDLResourceImpl) resolvedResource).getDefinition();
-              }
-              else if (resolvedResource instanceof XSDResourceImpl)
-              {
-                eSchema = ((XSDResourceImpl) resolvedResource).getSchema();
-              }
-              else
-              {
-                eDefinition = WSDLFactory.eINSTANCE.createDefinition();
-              }
-            }
-            resolved = true;
-          }
-        }
-      }
-    }
-  }
-
-  protected String resolveLocation(Definition definition, String namespace, String schemaLocation)
-  {
-    String result = null;
-    WSDLModelLocator locator = (WSDLModelLocator)EcoreUtil.getRegisteredAdapter(definition.eResource(), WSDLModelLocator.class);
-    if (locator != null)
-    {
-      result = locator.resolveURI(definition.getDocumentBaseURI(), namespace, schemaLocation);
-    }
-    else
-    {
-      // TODO... there's some default resolving we'll need to do here
-      // see XSDSchemaDirective
-      URI baseLocationURI = createURI(definition.getDocumentBaseURI());
-      URI locationURI = URI.createURI(schemaLocation);
-      return locationURI.resolve(baseLocationURI).toString();
-    }  
-    return result;
-  }
-  
-  //TODO... push down to EMF
-  private static URI createURI(String uriString)
-  {
-    if (hasProtocol(uriString))
-       return URI.createURI(uriString);
-    else
-       return URI.createFileURI(uriString);
-  }
-
-  //TODO... push down to EMF  
-  private static boolean hasProtocol(String uri)
-  {
-    boolean result = false;     
-    if (uri != null)
-    {
-      int index = uri.indexOf(":");
-      if (index != -1 && index > 2) // assume protocol with be length 3 so that the'C' in 'C:/' is not interpreted as a protocol
-      {
-        result = true;
-      }
-    }
-    return result;
-  }    
-} //ImportImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java
deleted file mode 100644
index d5aaa7c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Input</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class InputImpl extends MessageReferenceImpl implements Input
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected InputImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getInput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message getMessage()
-  {
-    return getEMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setMessage(javax.wsdl.Message message)
-  {
-    setEMessage((Message) message);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.INPUT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.INPUT__ELEMENT:
-        return getElement();
-      case WSDLPackage.INPUT__NAME:
-        return getName();
-      case WSDLPackage.INPUT__EMESSAGE:
-        if (resolve) return getEMessage();
-        return basicGetEMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.INPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.INPUT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.INPUT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.INPUT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.INPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.INPUT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.INPUT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.INPUT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.INPUT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.INPUT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.INPUT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.INPUT__EMESSAGE:
-        return eMessage != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.INPUT);
-    setElement(newElement);
-    return newElement;
-  }
-} //InputImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
deleted file mode 100644
index ed6a0cf..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
+++ /dev/null

@@ -1,617 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.MessageImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.MessageImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.MessageImpl#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.MessageImpl#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.MessageImpl#getEParts <em>EParts</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageImpl extends WSDLElementImpl implements Message
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected QName qName = QNAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNDEFINED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected boolean undefined = UNDEFINED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PROXY_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected boolean proxy = PROXY_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String RESOURCE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected String resourceURI = RESOURCE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEParts() <em>EParts</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEParts()
-   * @generated
-   * @ordered
-   */
-  protected EList eParts = null;
-
-  private Map parts;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected MessageImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getQName()
-  {
-    return qName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQName(QName newQName)
-  {
-    QName oldQName = qName;
-    qName = newQName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE__QNAME, oldQName, qName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUndefined()
-  {
-    return undefined;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUndefined(boolean newUndefined)
-  {
-    boolean oldUndefined = undefined;
-    undefined = newUndefined;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE__UNDEFINED, oldUndefined, undefined));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isProxy()
-  {
-    return proxy;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setProxy(boolean newProxy)
-  {
-    boolean oldProxy = proxy;
-    proxy = newProxy;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE__PROXY, oldProxy, proxy));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getResourceURI()
-  {
-    return resourceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceURI(String newResourceURI)
-  {
-    String oldResourceURI = resourceURI;
-    resourceURI = newResourceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE__RESOURCE_URI, oldResourceURI, resourceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEParts()
-  {
-    if (eParts == null)
-    {
-      eParts = new EObjectContainmentEList(Part.class, this, WSDLPackage.MESSAGE__EPARTS);
-    }
-    return eParts;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a part to this message.
-   * @param part the part to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addPart(javax.wsdl.Part part)
-  {
-    getEParts().add((Part)part);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified part.
-   * @param name the name of the desired part.
-   * @return the corresponding part, or null if there wasn't
-   * any matching part
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Part getPart(String name)
-  {
-    Part result = null;
-    for (Iterator i = getEParts().iterator(); i.hasNext();)
-    {
-      Part part = (Part) i.next();
-      if (name.equals(part.getName()))
-      {
-        result = part;
-        break;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the parts defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getParts()
-  {
-    HashMap hashMap = new HashMap();
-    for (Iterator i = getEParts().iterator(); i.hasNext();)
-    {
-      Part part = (Part) i.next();
-      hashMap.put(part.getName(), part);
-    }
-    return hashMap;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getOrderedParts(List partOrder)
-  {
-    List orderedParts = new Vector();
-    if (partOrder == null)
-    {
-      orderedParts.addAll(getEParts());
-      return orderedParts;
-    }
-
-    Iterator partNameIterator = partOrder.iterator();
-    while (partNameIterator.hasNext())
-    {
-      String partName = (String) partNameIterator.next();
-      javax.wsdl.Part part = getPart(partName);
-      if (part != null)
-        orderedParts.add(part);
-    }
-
-    return orderedParts;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.MESSAGE__EPARTS:
-          return ((InternalEList)getEParts()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.MESSAGE__ELEMENT:
-        return getElement();
-      case WSDLPackage.MESSAGE__QNAME:
-        return getQName();
-      case WSDLPackage.MESSAGE__UNDEFINED:
-        return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.MESSAGE__PROXY:
-        return isProxy() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.MESSAGE__RESOURCE_URI:
-        return getResourceURI();
-      case WSDLPackage.MESSAGE__EPARTS:
-        return getEParts();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.MESSAGE__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.MESSAGE__QNAME:
-        setQName((QName)newValue);
-        return;
-      case WSDLPackage.MESSAGE__UNDEFINED:
-        setUndefined(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.MESSAGE__PROXY:
-        setProxy(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.MESSAGE__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
-      case WSDLPackage.MESSAGE__EPARTS:
-        getEParts().clear();
-        getEParts().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__QNAME:
-        setQName(QNAME_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__UNDEFINED:
-        setUndefined(UNDEFINED_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__PROXY:
-        setProxy(PROXY_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE__EPARTS:
-        getEParts().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.MESSAGE__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.MESSAGE__QNAME:
-        return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
-      case WSDLPackage.MESSAGE__UNDEFINED:
-        return undefined != UNDEFINED_EDEFAULT;
-      case WSDLPackage.MESSAGE__PROXY:
-        return proxy != PROXY_EDEFAULT;
-      case WSDLPackage.MESSAGE__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-      case WSDLPackage.MESSAGE__EPARTS:
-        return eParts != null && !eParts.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
-    result.append(qName);
-    result.append(", undefined: ");
-    result.append(undefined);
-    result.append(", proxy: ");
-    result.append(proxy);
-    result.append(", resourceURI: ");
-    result.append(resourceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-    String newName = null;
-    if (changedElement.hasAttribute("name"))
-    {
-      newName = changedElement.getAttribute("name");
-    }
-    if (newName != null)
-    {
-      QName qname = new QName(definition.getTargetNamespace(), newName);
-      setQName(qname);
-    }
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.PART :
-        {
-          Part part = ((WSDLPackage) EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI)).getWSDLFactory().createPart();
-          part.setEnclosingDefinition(getEnclosingDefinition());
-          part.setElement(child);
-          getEParts().add(part);
-          break;
-        }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-  
-  protected void remove(Object component, Object modelObject)
-  {
-    Message message = (Message) component;
-    if (modelObject instanceof Part)
-    {
-      message.getEParts().clear();
-    }
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getMessage_QName())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.MESSAGE);
-    setElement(newElement);
-
-    Iterator iterator = getEParts().iterator();
-    while (iterator.hasNext())
-    {
-      Object obj = iterator.next();
-      if (obj instanceof Part)
-      {
-        Part part = (Part) obj;
-        Element child = ((PartImpl) part).createElement();
-        newElement.appendChild(child);
-      }
-    }
-    return newElement;
-  }
-} //MessageImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java
deleted file mode 100644
index 96a7b90..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java
+++ /dev/null

@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.Collection;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.MessageReferenceImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.MessageReferenceImpl#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class MessageReferenceImpl extends WSDLElementImpl implements MessageReference
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEMessage() <em>EMessage</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEMessage()
-   * @generated
-   * @ordered
-   */
-  protected Message eMessage = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected MessageReferenceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getMessageReference();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE_REFERENCE__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message getEMessage()
-  {
-    if (eMessage != null && eMessage.eIsProxy())
-    {
-      Message oldEMessage = eMessage;
-      eMessage = (Message)eResolveProxy((InternalEObject)eMessage);
-      if (eMessage != oldEMessage)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.MESSAGE_REFERENCE__EMESSAGE, oldEMessage, eMessage));
-      }
-    }
-    return eMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message basicGetEMessage()
-  {
-    return eMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEMessage(Message newEMessage)
-  {
-    Message oldEMessage = eMessage;
-    eMessage = newEMessage;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.MESSAGE_REFERENCE__EMESSAGE, oldEMessage, eMessage));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.MESSAGE_REFERENCE__ELEMENT:
-        return getElement();
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-        return getName();
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-        if (resolve) return getEMessage();
-        return basicGetEMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-        setEMessage((Message)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-        setEMessage((Message)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.MESSAGE_REFERENCE__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-        return eMessage != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconciliation methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setName(WSDLConstants.getAttribute(changedElement, "name"));
-    reconcileReferences(false);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getMessageReference_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getMessageReference_EMessage())
-      {
-        Message message = getEMessage();
-        if (message != null)
-        {
-          QName qName = message.getQName();
-          niceSetAttributeURIValue(theElement, WSDLConstants.MESSAGE_ATTRIBUTE, qName.getNamespaceURI() + "#" + qName.getLocalPart());
-        }
-      }
-    }
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      Definition definition = getEnclosingDefinition();      
-      QName messageQName = createQName(definition, element.getAttribute("message"));
-      Message newMessage = messageQName != null ? (Message) definition.getMessage(messageQName) : null;
-      if (newMessage != getEMessage())
-      {
-        setEMessage(newMessage);
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-} //MessageReferenceImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java
deleted file mode 100644
index e0c28a9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.WSDLPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Namespace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.NamespaceImpl#getURI <em>URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.NamespaceImpl#getPrefix <em>Prefix</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NamespaceImpl extends EObjectImpl implements Namespace
-{
-  /**
-   * The default value of the '{@link #getURI() <em>URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getURI() <em>URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getURI()
-   * @generated
-   * @ordered
-   */
-  protected String uri = URI_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPrefix()
-   * @generated
-   * @ordered
-   */
-  protected static final String PREFIX_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getPrefix() <em>Prefix</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPrefix()
-   * @generated
-   * @ordered
-   */
-  protected String prefix = PREFIX_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected NamespaceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getNamespace();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getURI()
-  {
-    return uri;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setURI(String newURI)
-  {
-    String oldURI = uri;
-    uri = newURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.NAMESPACE__URI, oldURI, uri));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getPrefix()
-  {
-    return prefix;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPrefix(String newPrefix)
-  {
-    String oldPrefix = prefix;
-    prefix = newPrefix;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.NAMESPACE__PREFIX, oldPrefix, prefix));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.NAMESPACE__URI:
-        return getURI();
-      case WSDLPackage.NAMESPACE__PREFIX:
-        return getPrefix();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.NAMESPACE__URI:
-        setURI((String)newValue);
-        return;
-      case WSDLPackage.NAMESPACE__PREFIX:
-        setPrefix((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.NAMESPACE__URI:
-        setURI(URI_EDEFAULT);
-        return;
-      case WSDLPackage.NAMESPACE__PREFIX:
-        setPrefix(PREFIX_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.NAMESPACE__URI:
-        return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-      case WSDLPackage.NAMESPACE__PREFIX:
-        return PREFIX_EDEFAULT == null ? prefix != null : !PREFIX_EDEFAULT.equals(prefix);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (URI: ");
-    result.append(uri);
-    result.append(", prefix: ");
-    result.append(prefix);
-    result.append(')');
-    return result.toString();
-  }
-
-} //NamespaceImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
deleted file mode 100644
index 309a16f..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
+++ /dev/null

@@ -1,1201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.OperationType;
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getEInput <em>EInput</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getEOutput <em>EOutput</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getEFaults <em>EFaults</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.OperationImpl#getEParameterOrdering <em>EParameter Ordering</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OperationImpl extends WSDLElementImpl implements Operation
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-  protected static final OperationType STYLE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getStyle()
-   * @generated
-   * @ordered
-   */
-  protected OperationType style = STYLE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNDEFINED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected boolean undefined = UNDEFINED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PROXY_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected boolean proxy = PROXY_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String RESOURCE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected String resourceURI = RESOURCE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEInput() <em>EInput</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEInput()
-   * @generated
-   * @ordered
-   */
-  protected Input eInput = null;
-
-  /**
-   * The cached value of the '{@link #getEOutput() <em>EOutput</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEOutput()
-   * @generated
-   * @ordered
-   */
-  protected Output eOutput = null;
-
-  /**
-   * The cached value of the '{@link #getEFaults() <em>EFaults</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEFaults()
-   * @generated
-   * @ordered
-   */
-  protected EList eFaults = null;
-
-  /**
-   * The cached value of the '{@link #getEParameterOrdering() <em>EParameter Ordering</em>}' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEParameterOrdering()
-   * @generated
-   * @ordered
-   */
-  protected EList eParameterOrdering = null; // a list of parts (EMF)
-  
-  private List parameterOrdering = null; // a list of part names (WSDL4J)
-
-  private Map faults;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected OperationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getOperation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public OperationType getStyle()
-  {
-    if (style == null)
-      style = deduceOperationType(getElement());
-    
-    // The value of style is updated when
-    // 1) the WSDL is loaded for the first time,
-    // 2) the setStyle() method is called, and
-    // 3) the children of the Operation (DOM) element are manipulated.
-    return style;
-  }
-
-  private OperationType deduceOperationType(Element operation)
-  {
-    if (operation == null)
-      return null;
-       
-  	int state = 0;
-  	int messageRefType = -1;
-  	Node child = null;
-  	NodeList children = operation.getChildNodes();
-  	
-    for (int i=0; i<children.getLength(); i++)
-    {
-      child = children.item(i);
-      if (child.getNodeType() != Node.ELEMENT_NODE)
-        continue;
-      
-      messageRefType = WSDLUtil.getInstance().getWSDLType((Element)child);
-      switch (state)
-	  {
-        case 0: // initial state     
-          if (WSDLConstants.INPUT == messageRefType)
-            state = 1; 
-          else if (WSDLConstants.OUTPUT == messageRefType)
-            state = 2; 
-          else if (WSDLConstants.DOCUMENTATION == messageRefType)
-          	state = 0;
-          else
-            state = -1; // cannot happen
-          break;
-        case 1: // one-way or request-response
-          if (WSDLConstants.FAULT == messageRefType)
-            state = 11; // one-way
-          else if (WSDLConstants.OUTPUT == messageRefType)
-            state = 3; // request-response
-          else
-            state = -1; // cannot happen
-          break;
-        case 11: // one-way
-          if (WSDLConstants.FAULT == messageRefType)
-            state = 11; // one-way
-          else
-            state = -1; // cannot happen
-          break;
-        case 2: // solicit-response or notification
-          if (WSDLConstants.INPUT == messageRefType)
-            state = 4; // solicit-response
-          else if (WSDLConstants.FAULT == messageRefType)
-            state = 21; // notification
-          else
-            state = -1; // cannot happen
-          break;
-        case 21: // notification
-          if (WSDLConstants.FAULT == messageRefType)
-            state = 21; // notification
-          else
-            state = -1; // cannot happen
-          break;
-        case 3: // request-response 
-          if (WSDLConstants.FAULT == messageRefType)
-            state = 3;
-          else
-            state = -1; // cannot happen
-          break;
-        case 4: // solicit-response
-          if (WSDLConstants.FAULT == messageRefType)
-            state = 4;
-          else
-            state = -1; // cannot happen
-          break;
-        default: // cannot happen (-1)
-          break;
-	  }
-    }
-    
-    OperationType opType = null;
-    switch (state)
-	{
-      case 1:
-      case 11:
-      	opType = OperationType.ONE_WAY;
-        break;
-      case 2:
-      case 21:
-      	opType = OperationType.NOTIFICATION;
-        break;
-      case 3:
-      	opType = OperationType.REQUEST_RESPONSE;
-        break;
-      case 4:
-      	opType = OperationType.SOLICIT_RESPONSE;
-        break;
-      default: // invalid
-        break;
-	}
-    return opType;    
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setStyle(OperationType newStyle)
-  {
-    OperationType oldStyle = style;
-    style = newStyle;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__STYLE, oldStyle, style));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUndefined()
-  {
-    return undefined;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUndefined(boolean newUndefined)
-  {
-    boolean oldUndefined = undefined;
-    undefined = newUndefined;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__UNDEFINED, oldUndefined, undefined));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isProxy()
-  {
-    return proxy;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setProxy(boolean newProxy)
-  {
-    boolean oldProxy = proxy;
-    proxy = newProxy;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__PROXY, oldProxy, proxy));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getResourceURI()
-  {
-    return resourceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceURI(String newResourceURI)
-  {
-    String oldResourceURI = resourceURI;
-    resourceURI = newResourceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__RESOURCE_URI, oldResourceURI, resourceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Input getEInput()
-  {
-    return eInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetEInput(Input newEInput, NotificationChain msgs)
-  {
-    Input oldEInput = eInput;
-    eInput = newEInput;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__EINPUT, oldEInput, newEInput);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEInput(Input newEInput)
-  {
-    if (newEInput != eInput)
-    {
-      NotificationChain msgs = null;
-      if (eInput != null)
-        msgs = ((InternalEObject)eInput).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.OPERATION__EINPUT, null, msgs);
-      if (newEInput != null)
-        msgs = ((InternalEObject)newEInput).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.OPERATION__EINPUT, null, msgs);
-      msgs = basicSetEInput(newEInput, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__EINPUT, newEInput, newEInput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Output getEOutput()
-  {
-    return eOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetEOutput(Output newEOutput, NotificationChain msgs)
-  {
-    Output oldEOutput = eOutput;
-    eOutput = newEOutput;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__EOUTPUT, oldEOutput, newEOutput);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEOutput(Output newEOutput)
-  {
-    if (newEOutput != eOutput)
-    {
-      NotificationChain msgs = null;
-      if (eOutput != null)
-        msgs = ((InternalEObject)eOutput).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.OPERATION__EOUTPUT, null, msgs);
-      if (newEOutput != null)
-        msgs = ((InternalEObject)newEOutput).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.OPERATION__EOUTPUT, null, msgs);
-      msgs = basicSetEOutput(newEOutput, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.OPERATION__EOUTPUT, newEOutput, newEOutput));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEFaults()
-  {
-    if (eFaults == null)
-    {
-      eFaults = new EObjectContainmentEList(Fault.class, this, WSDLPackage.OPERATION__EFAULTS);
-    }
-    return eFaults;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEParameterOrdering()
-  {
-    if (eParameterOrdering == null)
-    {
-      eParameterOrdering = new EObjectResolvingEList(Part.class, this, WSDLPackage.OPERATION__EPARAMETER_ORDERING);
-    }
-    return eParameterOrdering;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a fault message that must be associated with this
-   * operation.
-   * @param fault the new fault message
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addFault(javax.wsdl.Fault fault)
-  {
-    getEFaults().add((Fault)fault);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified fault message.
-   * @param name the name of the desired fault message.
-   * @return the corresponding fault message, or null if there wasn't
-   * any matching message
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Fault getFault(String name)
-  {
-    Fault result = null;
-    for (Iterator i = getEFaults().iterator(); i.hasNext();)
-    {
-      Fault fault = (Fault) i.next();
-      if (name.equals(fault.getName()))
-      {
-        result = fault;
-        break;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the fault messages associated with this operation.
-   * @return names of fault messages
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getFaults()
-  {
-    HashMap hashMap = new HashMap();
-    for (Iterator i = getEFaults().iterator(); i.hasNext();)
-    {
-      Fault fault = (Fault) i.next();
-      hashMap.put(fault.getName(), fault);
-    }
-    return hashMap;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Returns a collection of Part names. Note that 
-   * getParameterEOrdering() returns a collection of Parts.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getParameterOrdering()
-  {
-    parameterOrdering = new ArrayList();
-    for (Iterator i = getEParameterOrdering().iterator(); i.hasNext();)
-    {
-      try
-      {
-        Part part = (Part) i.next();
-		parameterOrdering.add(part.getName());
-      }
-      catch (Exception e)
-      {
-        // TBD - handle exception
-      }
-    }
-    return parameterOrdering.isEmpty() ? null : parameterOrdering;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setParameterOrdering(List parameterOrder)
-  {
-    parameterOrdering = parameterOrder;
-    getEParameterOrdering().clear();
-    if (parameterOrder != null)
-    {
-      for (Iterator i = parameterOrder.iterator(); i.hasNext();)
-      {
-        // KB: We should be resolving parts based on the part names in parameterOrder.
-        Part part = WSDLFactory.eINSTANCE.createPart();
-        part.setName((String) i.next());
-        getEParameterOrdering().add(part);
-      }
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Input getInput()
-  {
-    return getEInput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setInput(javax.wsdl.Input input)
-  {
-    setEInput((Input) input);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Output getOutput()
-  {
-    return getEOutput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setOutput(javax.wsdl.Output output)
-  {
-    setEOutput((Output) output);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.OPERATION__EINPUT:
-          return basicSetEInput(null, msgs);
-        case WSDLPackage.OPERATION__EOUTPUT:
-          return basicSetEOutput(null, msgs);
-        case WSDLPackage.OPERATION__EFAULTS:
-          return ((InternalEList)getEFaults()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OPERATION__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.OPERATION__ELEMENT:
-        return getElement();
-      case WSDLPackage.OPERATION__STYLE:
-        return getStyle();
-      case WSDLPackage.OPERATION__NAME:
-        return getName();
-      case WSDLPackage.OPERATION__UNDEFINED:
-        return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.OPERATION__PROXY:
-        return isProxy() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.OPERATION__RESOURCE_URI:
-        return getResourceURI();
-      case WSDLPackage.OPERATION__EINPUT:
-        return getEInput();
-      case WSDLPackage.OPERATION__EOUTPUT:
-        return getEOutput();
-      case WSDLPackage.OPERATION__EFAULTS:
-        return getEFaults();
-      case WSDLPackage.OPERATION__EPARAMETER_ORDERING:
-        return getEParameterOrdering();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.OPERATION__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.OPERATION__STYLE:
-        setStyle((OperationType)newValue);
-        return;
-      case WSDLPackage.OPERATION__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.OPERATION__UNDEFINED:
-        setUndefined(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.OPERATION__PROXY:
-        setProxy(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.OPERATION__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
-      case WSDLPackage.OPERATION__EINPUT:
-        setEInput((Input)newValue);
-        return;
-      case WSDLPackage.OPERATION__EOUTPUT:
-        setEOutput((Output)newValue);
-        return;
-      case WSDLPackage.OPERATION__EFAULTS:
-        getEFaults().clear();
-        getEFaults().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.OPERATION__EPARAMETER_ORDERING:
-        getEParameterOrdering().clear();
-        getEParameterOrdering().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OPERATION__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__STYLE:
-        setStyle(STYLE_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__UNDEFINED:
-        setUndefined(UNDEFINED_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__PROXY:
-        setProxy(PROXY_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.OPERATION__EINPUT:
-        setEInput((Input)null);
-        return;
-      case WSDLPackage.OPERATION__EOUTPUT:
-        setEOutput((Output)null);
-        return;
-      case WSDLPackage.OPERATION__EFAULTS:
-        getEFaults().clear();
-        return;
-      case WSDLPackage.OPERATION__EPARAMETER_ORDERING:
-        getEParameterOrdering().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OPERATION__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.OPERATION__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.OPERATION__STYLE:
-        return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-      case WSDLPackage.OPERATION__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.OPERATION__UNDEFINED:
-        return undefined != UNDEFINED_EDEFAULT;
-      case WSDLPackage.OPERATION__PROXY:
-        return proxy != PROXY_EDEFAULT;
-      case WSDLPackage.OPERATION__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-      case WSDLPackage.OPERATION__EINPUT:
-        return eInput != null;
-      case WSDLPackage.OPERATION__EOUTPUT:
-        return eOutput != null;
-      case WSDLPackage.OPERATION__EFAULTS:
-        return eFaults != null && !eFaults.isEmpty();
-      case WSDLPackage.OPERATION__EPARAMETER_ORDERING:
-        return eParameterOrdering != null && !eParameterOrdering.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (style: ");
-    result.append(style);
-    result.append(", name: ");
-    result.append(name);
-    result.append(", undefined: ");
-    result.append(undefined);
-    result.append(", proxy: ");
-    result.append(proxy);
-    result.append(", resourceURI: ");
-    result.append(resourceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  // 
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-	if (changedElement.hasAttribute("name"))
-	{
-      String name = changedElement.getAttribute("name");
-      if (name != null)
-      {
-        setName(name);
-      }
-    }  
-    
-    if (changedElement.hasAttribute("parameterOrder"))
-    {
-      String parameterOrder = changedElement.getAttribute("parameterOrder");
-      if (parameterOrder != null)
-      {
-        String[] array = parameterOrder.split(" ");
-        List l = Arrays.asList(array);
-        setParameterOrdering(l);
-      }
-    }
-
-  }
-
-  public void elementChanged(Element changedElement)
-  {
-    style = deduceOperationType(changedElement);
-    super.elementChanged(changedElement);
-  }
-  
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    Definition definition = getEnclosingDefinition();
-
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.INPUT :
-        {
-          Input input = WSDLFactory.eINSTANCE.createInput();
-          input.setEnclosingDefinition(definition);
-          input.setElement(child);
-          setInput(input);
-          break;
-        }
-      case WSDLConstants.OUTPUT :
-        {
-          Output output = WSDLFactory.eINSTANCE.createOutput();
-          output.setEnclosingDefinition(definition);
-          output.setElement(child);
-          setOutput(output);
-          break;
-        }
-      case WSDLConstants.FAULT :
-        {
-          Fault fault = WSDLFactory.eINSTANCE.createFault();
-          fault.setEnclosingDefinition(definition);
-          fault.setElement(child);
-          addFault(fault);
-          break;
-        }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    Operation operation = (Operation) component;
-    if (modelObject instanceof Input)
-    {
-      operation.setEInput(null);
-    }
-    else if (modelObject instanceof Output)
-    {
-      operation.setEOutput(null);
-    }
-    else if (modelObject instanceof Fault)
-    {
-      operation.getEFaults().remove(modelObject);
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    Operation operation = (Operation) component;
-
-    List list = new ArrayList();
-
-    if (operation.getEInput() != null)
-    {
-      list.add(operation.getEInput());
-    }
-
-    if (operation.getEOutput() != null)
-    {
-      list.add(operation.getEOutput());
-    }
-
-    list.addAll(operation.getEFaults());
-
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getOperation_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-      if (eAttribute == WSDLPackage.eINSTANCE.getOperation_Style())
-      {
-        OperationType targetType = getStyle();
-        OperationType currentType = deduceOperationType(theElement);
-        if (targetType.equals(currentType))
-          return;
-        else if ((targetType.equals(OperationType.REQUEST_RESPONSE) || targetType.equals(OperationType.SOLICIT_RESPONSE))
-                  && (currentType.equals(OperationType.REQUEST_RESPONSE) || currentType.equals(OperationType.SOLICIT_RESPONSE)))
-        	reorderChildren();
-        else
-          style = deduceOperationType(theElement); // switch back. no support for the other types
-      }
-    }
-  }
-  
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getOperation_EParameterOrdering())
-      {
-        // Build up a string of concatenated part names (parameterOrder) from eParameterOrdering.
-		  
-        Iterator parts = getEParameterOrdering().iterator();
-		Part part = null;
-		String partNames = "";
-        while (parts.hasNext())
-		{
-          part = (Part)parts.next();
-		  partNames = partNames + part.getName() + " ";
-		}
-		
-		if ((partNames = partNames.trim()).length() != 0)		
-		  // Update the element's attrubute
-		  niceSetAttribute(theElement, "parameterOrder", partNames);
-      }
-    }
-    //
-  }
-  
-  // Switch <input> and <output>
-  private void reorderChildren()
-  {
-    // Find out the positions of <input> and <output>
-    Node input = null;
-    Node output = null;
-    Node reference = null;
-    for (Node current=getElement().getFirstChild(); current!= null;current=current.getNextSibling())
-    {
-      if (current.getNodeType() == Node.ELEMENT_NODE)
-      {
-      	if (WSDLConstants.INPUT == WSDLUtil.getInstance().getWSDLType((Element)current))
-        {
-          input = current;
-          if (output != null)
-          { 
-            // cs.. for safety use current.getNextSibling() instead of nodeList.item(i+1)            
-            reference = current.getNextSibling();
-          }  
-        }
-        else if (WSDLConstants.OUTPUT == WSDLUtil.getInstance().getWSDLType((Element)current))
-        {
-          output = current;
-          if (input != null)
-          {
-            // cs.. for safety use current.getNextSibling() instead of nodeList.item(i+1)            
-            reference = current.getNextSibling();
-          }  
-        }
-      }
-    } // end for
-    
-    if (input != null && output != null)
-    {
-      Element parent = getElement();
-      if (getStyle().equals(OperationType.REQUEST_RESPONSE))
-      {
-      	// current order: <output> <input>
-        switchChildren(parent,output,input,reference);
-      }
-      else if (getStyle().equals(OperationType.SOLICIT_RESPONSE))
-      {
-        // current order: <input> <output>
-        switchChildren(parent,input,output,reference);
-      }
-    }
-  }
-  
-  private void switchChildren(Node parent, Node child1, Node child2, Node nextOfChild2)
-  {
-    // current node sequence: <child1> <child2> <nextOfChild2>
-    niceRemoveChild(parent,child2);
-    niceInsertBefore(parent,child2,child1);
-    niceRemoveChild(parent,child1);
-    niceInsertBefore(parent,child1,nextOfChild2);
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.OPERATION);
-    setElement(newElement);
-
-    Input input = getEInput();
-    if (input != null)
-    {
-      Element child = ((InputImpl) input).createElement();
-      newElement.appendChild(child);
-    }
-
-    Output output = getEOutput();
-    if (output != null)
-    {
-      Element child = ((OutputImpl) output).createElement();
-      newElement.appendChild(child);
-    }
-
-    Iterator iterator = getEFaults().iterator();
-    while (iterator.hasNext())
-    {
-      Fault fault = (Fault) iterator.next();
-      Element child = ((FaultImpl) fault).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  } 
-  
-} //OperationImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java
deleted file mode 100644
index ea7e7a5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Output</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class OutputImpl extends MessageReferenceImpl implements Output
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected OutputImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getOutput();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message getMessage()
-  {
-    return getEMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setMessage(javax.wsdl.Message message)
-  {
-    setEMessage((Message) message);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OUTPUT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.OUTPUT__ELEMENT:
-        return getElement();
-      case WSDLPackage.OUTPUT__NAME:
-        return getName();
-      case WSDLPackage.OUTPUT__EMESSAGE:
-        if (resolve) return getEMessage();
-        return basicGetEMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OUTPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.OUTPUT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.OUTPUT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.OUTPUT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OUTPUT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.OUTPUT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.OUTPUT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.OUTPUT__EMESSAGE:
-        setEMessage((org.eclipse.wst.wsdl.Message)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.OUTPUT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.OUTPUT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.OUTPUT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.OUTPUT__EMESSAGE:
-        return eMessage != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.OUTPUT);
-    setElement(newElement);
-    return newElement;
-  }
-} //OutputImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
deleted file mode 100644
index 670da20..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
+++ /dev/null

@@ -1,765 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Part</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getElementName <em>Element Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getTypeName <em>Type Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getTypeDefinition <em>Type Definition</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getElementDeclaration <em>Element Declaration</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PartImpl#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PartImpl extends WSDLElementImpl implements Part
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getElementName() <em>Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName ELEMENT_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getElementName() <em>Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementName()
-   * @generated
-   * @ordered
-   */
-  protected QName elementName = ELEMENT_NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getTypeName() <em>Type Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTypeName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName TYPE_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getTypeName() <em>Type Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTypeName()
-   * @generated
-   * @ordered
-   */
-  protected QName typeName = TYPE_NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getTypeDefinition() <em>Type Definition</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTypeDefinition()
-   * @generated
-   * @ordered
-   */
-  protected XSDTypeDefinition typeDefinition = null;
-
-  /**
-   * The cached value of the '{@link #getElementDeclaration() <em>Element Declaration</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementDeclaration()
-   * @generated
-   * @ordered
-   */
-  protected XSDElementDeclaration elementDeclaration = null;
-
-  /**
-   * The cached value of the '{@link #getEMessage() <em>EMessage</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEMessage()
-   * @generated
-   * @ordered
-   */
-  protected Message eMessage = null;
-
-  public static final String NS_URI_PART_EXTENSIONS = "http://schemas.xmlsoap.org/wsdl/part-extensions/";
-  public static final String ATTR_MESSAGE = "message";
-  private Map extensionAttributes = new ExtensionAttributeMap();
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PartImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getPart();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getElementName()
-  {
-    return elementName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setElementName(QName newElementName)
-  {
-    QName oldElementName = elementName;
-    elementName = newElementName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__ELEMENT_NAME, oldElementName, elementName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getTypeName()
-  {
-    return typeName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTypeName(QName newTypeName)
-  {
-    QName oldTypeName = typeName;
-    typeName = newTypeName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__TYPE_NAME, oldTypeName, typeName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDTypeDefinition getTypeDefinition()
-  {
-    if (typeDefinition != null && typeDefinition.eIsProxy())
-    {
-      XSDTypeDefinition oldTypeDefinition = typeDefinition;
-      typeDefinition = (XSDTypeDefinition)eResolveProxy((InternalEObject)typeDefinition);
-      if (typeDefinition != oldTypeDefinition)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.PART__TYPE_DEFINITION, oldTypeDefinition, typeDefinition));
-      }
-    }
-    return typeDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDTypeDefinition basicGetTypeDefinition()
-  {
-    return typeDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTypeDefinition(XSDTypeDefinition newTypeDefinition)
-  {
-    XSDTypeDefinition oldTypeDefinition = typeDefinition;
-    typeDefinition = newTypeDefinition;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__TYPE_DEFINITION, oldTypeDefinition, typeDefinition));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDElementDeclaration getElementDeclaration()
-  {
-    if (elementDeclaration != null && elementDeclaration.eIsProxy())
-    {
-      XSDElementDeclaration oldElementDeclaration = elementDeclaration;
-      elementDeclaration = (XSDElementDeclaration)eResolveProxy((InternalEObject)elementDeclaration);
-      if (elementDeclaration != oldElementDeclaration)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.PART__ELEMENT_DECLARATION, oldElementDeclaration, elementDeclaration));
-      }
-    }
-    return elementDeclaration;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDElementDeclaration basicGetElementDeclaration()
-  {
-    return elementDeclaration;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setElementDeclaration(XSDElementDeclaration newElementDeclaration)
-  {
-    XSDElementDeclaration oldElementDeclaration = elementDeclaration;
-    elementDeclaration = newElementDeclaration;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__ELEMENT_DECLARATION, oldElementDeclaration, elementDeclaration));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message getEMessage()
-  {
-    if (eMessage != null && eMessage.eIsProxy())
-    {
-      Message oldEMessage = eMessage;
-      eMessage = (Message)eResolveProxy((InternalEObject)eMessage);
-      if (eMessage != oldEMessage)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.PART__EMESSAGE, oldEMessage, eMessage));
-      }
-    }
-    return eMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message basicGetEMessage()
-  {
-    return eMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEMessage(Message newEMessage)
-  {
-    Message oldEMessage = eMessage;
-    eMessage = newEMessage;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PART__EMESSAGE, oldEMessage, eMessage));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setExtensionAttribute(QName name, QName value)
-  {
-    String localName = name.getLocalPart();
-    String nsURI = name.getNamespaceURI();
-    if (localName == null)
-      return;
-
-    if (value == null)
-      extensionAttributes.remove(name);
-    else
-      extensionAttributes.put(name, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Iterator getExtensionAttributeNames()
-  {
-    Map map = new HashMap(extensionAttributes);
-
-    // Adjust messageName attribute
-    QName messageName = getMessage() != null ? getMessage().getQName() : null;
-    if (messageName != null)
-      map.put(new QName(NS_URI_PART_EXTENSIONS, ATTR_MESSAGE), messageName);
-    else
-      map.remove(new QName(NS_URI_PART_EXTENSIONS, ATTR_MESSAGE));
-
-    return map.keySet().iterator();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public QName getExtensionAttribute(QName name)
-  {
-    if (name.equals(new QName(NS_URI_PART_EXTENSIONS, ATTR_MESSAGE)))
-      return getMessage() != null ? getMessage().getQName() : null;
-    else
-      return (QName) extensionAttributes.get(name);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setMessage(javax.wsdl.Message message)
-  {
-    setEMessage((Message) message);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message getMessage()
-  {
-    return getEMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PART__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.PART__ELEMENT:
-        return getElement();
-      case WSDLPackage.PART__NAME:
-        return getName();
-      case WSDLPackage.PART__ELEMENT_NAME:
-        return getElementName();
-      case WSDLPackage.PART__TYPE_NAME:
-        return getTypeName();
-      case WSDLPackage.PART__TYPE_DEFINITION:
-        if (resolve) return getTypeDefinition();
-        return basicGetTypeDefinition();
-      case WSDLPackage.PART__ELEMENT_DECLARATION:
-        if (resolve) return getElementDeclaration();
-        return basicGetElementDeclaration();
-      case WSDLPackage.PART__EMESSAGE:
-        if (resolve) return getEMessage();
-        return basicGetEMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PART__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.PART__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.PART__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.PART__ELEMENT_NAME:
-        setElementName((QName)newValue);
-        return;
-      case WSDLPackage.PART__TYPE_NAME:
-        setTypeName((QName)newValue);
-        return;
-      case WSDLPackage.PART__TYPE_DEFINITION:
-        setTypeDefinition((XSDTypeDefinition)newValue);
-        return;
-      case WSDLPackage.PART__ELEMENT_DECLARATION:
-        setElementDeclaration((XSDElementDeclaration)newValue);
-        return;
-      case WSDLPackage.PART__EMESSAGE:
-        setEMessage((Message)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PART__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PART__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PART__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.PART__ELEMENT_NAME:
-        setElementName(ELEMENT_NAME_EDEFAULT);
-        return;
-      case WSDLPackage.PART__TYPE_NAME:
-        setTypeName(TYPE_NAME_EDEFAULT);
-        return;
-      case WSDLPackage.PART__TYPE_DEFINITION:
-        setTypeDefinition((XSDTypeDefinition)null);
-        return;
-      case WSDLPackage.PART__ELEMENT_DECLARATION:
-        setElementDeclaration((XSDElementDeclaration)null);
-        return;
-      case WSDLPackage.PART__EMESSAGE:
-        setEMessage((Message)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PART__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.PART__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.PART__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.PART__ELEMENT_NAME:
-        return ELEMENT_NAME_EDEFAULT == null ? elementName != null : !ELEMENT_NAME_EDEFAULT.equals(elementName);
-      case WSDLPackage.PART__TYPE_NAME:
-        return TYPE_NAME_EDEFAULT == null ? typeName != null : !TYPE_NAME_EDEFAULT.equals(typeName);
-      case WSDLPackage.PART__TYPE_DEFINITION:
-        return typeDefinition != null;
-      case WSDLPackage.PART__ELEMENT_DECLARATION:
-        return elementDeclaration != null;
-      case WSDLPackage.PART__EMESSAGE:
-        return eMessage != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(", elementName: ");
-    result.append(elementName);
-    result.append(", typeName: ");
-    result.append(typeName);
-    result.append(')');
-    return result.toString();
-  }
-
-  public Map getExtensionAttributes()
-  {
-    return extensionAttributes;
-  }
-
-  class ExtensionAttributeMap extends HashMap
-  {
-    /**
-     * This class is not intended to be serialized.
-     * serialVersionUID is assigned with 1L to avoid
-     * compiler warning messages.
-     */
-    private static final long serialVersionUID = 1L;
-
-    ExtensionAttributeMap()
-    {
-      super();
-    }
-
-    public Object put(Object key, Object val)
-    {
-      QName name = (QName) key;
-      QName value = (QName) val;
-      String lName = name.getLocalPart();
-      String nSpace = name.getNamespaceURI();
-
-      if (NS_URI_PART_EXTENSIONS.equals(nSpace) && ATTR_MESSAGE.equals(lName))
-      {
-        javax.wsdl.Message messageProxy = new MessageImpl();
-        messageProxy.setQName(value);
-        setEMessage((Message) messageProxy);
-      }
-      return super.put(key, value);
-    }
-  }
-
-  //
-  // Reconcile methods
-  //
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-
-    String name = changedElement.getAttributeNS(null, "name");
-    if (name != null)
-    {
-      setName(name);
-    }
-
-    String elementAttr = WSDLConstants.getAttribute(changedElement, WSDLConstants.ELEMENT_ATTRIBUTE);
-    setElementName(elementAttr != null ? createQName(definition, elementAttr) : null);
-		    
-    String typeAttr = WSDLConstants.getAttribute(changedElement, WSDLConstants.TYPE_ATTRIBUTE);
-    setTypeName(typeAttr != null ? createQName(definition, typeAttr) : null);
-
-    reconcileReferences(false);
-  }
-
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    //super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getPart_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getPart_TypeName())
-        if (getTypeName() != null)
-          niceSetAttributeURIValue(theElement, WSDLConstants.TYPE_ATTRIBUTE, getTypeName().getNamespaceURI() + "#" + getTypeName().getLocalPart());
-        
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getPart_ElementName())
-        if (getElementName() != null)
-          niceSetAttributeURIValue(theElement, WSDLConstants.ELEMENT_ATTRIBUTE, getElementName().getNamespaceURI() + "#" + getElementName().getLocalPart());
-        
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getPart_TypeDefinition())
-      {
-        XSDTypeDefinition typeDefinition = getTypeDefinition();
-        if (typeDefinition != null)
-        {
-          niceSetAttributeURIValue(theElement, WSDLConstants.TYPE_ATTRIBUTE, typeDefinition.getURI());
-        }
-      }
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getPart_ElementDeclaration())
-      {
-        XSDElementDeclaration elementDecl = getElementDeclaration();
-        if (elementDecl != null)
-        {
-          niceSetAttributeURIValue(theElement, WSDLConstants.ELEMENT_ATTRIBUTE, elementDecl.getURI());
-        }
-      }      
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.PART);
-    setElement(newElement);
-    return newElement;
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    XSDElementDeclaration newElementDeclaration = resolveElementDeclaration(elementName);
-    if (newElementDeclaration != elementDeclaration)
-    {
-      setElementDeclaration(newElementDeclaration);
-    }
-
-    XSDTypeDefinition newTypeDefinition = resolveTypeDefinition(typeName);
-    if (newTypeDefinition != typeDefinition)
-    {
-      setTypeDefinition(newTypeDefinition);
-    }
-
-    super.reconcileReferences(deep);
-  }
-
-  private XSDElementDeclaration resolveElementDeclaration(QName qname)
-  {
-    XSDElementDeclaration result = null;
-    if (qname != null)
-    {
-      DefinitionImpl definition = (DefinitionImpl) getEnclosingDefinition();
-      if (definition != null)
-      {
-        result = definition.resolveElementDeclaration(qname.getNamespaceURI(), qname.getLocalPart());
-      }
-    }
-    return result;
-  }
-
-  private XSDTypeDefinition resolveTypeDefinition(QName qname)
-  {
-    XSDTypeDefinition result = null;
-    if (qname != null)
-    {
-      DefinitionImpl definition = (DefinitionImpl) getEnclosingDefinition();
-      if (definition != null)
-      {
-        result = definition.resolveTypeDefinition(qname.getNamespaceURI(), qname.getLocalPart());
-      }
-    }
-    return result;
-  }
-} //PartImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
deleted file mode 100644
index d1f9403..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
+++ /dev/null

@@ -1,438 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.PortImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PortImpl#getEBinding <em>EBinding</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortImpl extends ExtensibleElementImpl implements Port
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEBinding() <em>EBinding</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEBinding()
-   * @generated
-   * @ordered
-   */
-  protected Binding eBinding = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PortImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getPort();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Binding getEBinding()
-  {
-    if (eBinding != null && eBinding.eIsProxy())
-    {
-      Binding oldEBinding = eBinding;
-      eBinding = (Binding)eResolveProxy((InternalEObject)eBinding);
-      if (eBinding != oldEBinding)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, WSDLPackage.PORT__EBINDING, oldEBinding, eBinding));
-      }
-    }
-    return eBinding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Binding basicGetEBinding()
-  {
-    return eBinding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEBinding(Binding newEBinding)
-  {
-    Binding oldEBinding = eBinding;
-    eBinding = newEBinding;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT__EBINDING, oldEBinding, eBinding));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Binding getBinding()
-  {
-    return getEBinding();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBinding(javax.wsdl.Binding binding)
-  {
-    setEBinding((Binding) binding);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.PORT__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.PORT__ELEMENT:
-        return getElement();
-      case WSDLPackage.PORT__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.PORT__NAME:
-        return getName();
-      case WSDLPackage.PORT__EBINDING:
-        if (resolve) return getEBinding();
-        return basicGetEBinding();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.PORT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.PORT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.PORT__NAME:
-        setName((String)newValue);
-        return;
-      case WSDLPackage.PORT__EBINDING:
-        setEBinding((Binding)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PORT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PORT__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.PORT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case WSDLPackage.PORT__EBINDING:
-        setEBinding((Binding)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.PORT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.PORT__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.PORT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.PORT__EBINDING:
-        return eBinding != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-    setName(changedElement.getAttribute("name"));
-    reconcileReferences(false);
-  }
-  
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child,remainingModelObjects);
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      getEExtensibilityElements().remove(i.next());
-    }
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    Port port = (Port) component;
-    List list = new ArrayList();
-    list.addAll(port.getEExtensibilityElements());
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getPort_Name())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeReference(eReference);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eReference == null || eReference == WSDLPackage.eINSTANCE.getPort_EBinding())
-      {
-        Binding binding = getEBinding();
-        if (binding != null)
-        {
-          QName qName = binding.getQName();
-          niceSetAttributeURIValue(theElement, WSDLConstants.BINDING_ATTRIBUTE, qName.getNamespaceURI() + "#" + qName.getLocalPart());
-        }
-      }
-    }
-  }
-
-  protected Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.PORT);
-    setElement(newElement);
-
-    Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-    return newElement;
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      Definition definition = getEnclosingDefinition();
-      QName bindingQName = createQName(definition, element.getAttribute("binding"));
-      Binding newBinding = (bindingQName != null) ? (Binding) definition.getBinding(bindingQName) : null;
-      if (newBinding != getEBinding())
-      {
-        setEBinding(newBinding);
-      }
-    }
-    super.reconcileReferences(deep);
-  }
-
-} //PortImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
deleted file mode 100644
index e37cfd8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
+++ /dev/null

@@ -1,635 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.PortTypeImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PortTypeImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PortTypeImpl#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PortTypeImpl#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.PortTypeImpl#getEOperations <em>EOperations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortTypeImpl extends WSDLElementImpl implements PortType
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected QName qName = QNAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNDEFINED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected boolean undefined = UNDEFINED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PROXY_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected boolean proxy = PROXY_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String RESOURCE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected String resourceURI = RESOURCE_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getEOperations() <em>EOperations</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEOperations()
-   * @generated
-   * @ordered
-   */
-  protected EList eOperations = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PortTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getPortType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getQName()
-  {
-    return qName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQName(QName newQName)
-  {
-    QName oldQName = qName;
-    qName = newQName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT_TYPE__QNAME, oldQName, qName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUndefined()
-  {
-    return undefined;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUndefined(boolean newUndefined)
-  {
-    boolean oldUndefined = undefined;
-    undefined = newUndefined;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT_TYPE__UNDEFINED, oldUndefined, undefined));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isProxy()
-  {
-    return proxy;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setProxy(boolean newProxy)
-  {
-    boolean oldProxy = proxy;
-    proxy = newProxy;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT_TYPE__PROXY, oldProxy, proxy));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getResourceURI()
-  {
-    return resourceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceURI(String newResourceURI)
-  {
-    String oldResourceURI = resourceURI;
-    resourceURI = newResourceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.PORT_TYPE__RESOURCE_URI, oldResourceURI, resourceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEOperations()
-  {
-    if (eOperations == null)
-    {
-      eOperations = new EObjectContainmentEList(Operation.class, this, WSDLPackage.PORT_TYPE__EOPERATIONS);
-    }
-    return eOperations;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add an operation to this port type.
-   * @param operation the operation to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addOperation(javax.wsdl.Operation operation)
-  {
-    if (!operation.isUndefined())
-      getEOperations().add(operation);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified operation. Note that operation names can
-   * be overloaded within a PortType. In case of overloading, the
-   * names of the input and output messages can be used to further
-   * refine the search.
-   * @param name the name of the desired operation.
-   * @param inputName the name of the input message; if this is null
-   *        it will be ignored.
-   * @param outputName the name of the output message; if this is null
-   *        it will be ignored.
-   * @return the corresponding operation, or null if there wasn't
-   *         any matching operation
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Operation getOperation(String name, String inputName, String outputName)
-  {
-    Iterator opIterator = getOperations().iterator();
-    while (opIterator.hasNext())
-    {
-      javax.wsdl.Operation op = (javax.wsdl.Operation) opIterator.next();
-      if (op == null)
-        continue;
-
-      String opName = op.getName();
-      if (name != null && opName != null)
-      {
-        if (!name.equals(opName))
-          op = null;
-      }
-      else if (name != null || opName != null)
-        op = null;
-
-      if (op != null && inputName != null)
-      {
-        javax.wsdl.Input input = op.getInput();
-        if (input != null)
-        {
-          String opInputName = input.getName();
-          if (opInputName == null || !opInputName.equals(inputName))
-            op = null;
-        }
-        else
-          op = null;
-      }
-
-      if (op != null && outputName != null)
-      {
-        javax.wsdl.Output output = op.getOutput();
-        if (output != null)
-        {
-          String opOutputName = output.getName();
-          if (opOutputName == null || !opOutputName.equals(outputName))
-            op = null;
-        }
-        else
-          op = null;
-      }
-
-      if (op != null)
-        return op;
-    } // end while
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the operations defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getOperations()
-  {
-    if (!isUndefined())
-      return getEOperations();
-    else
-      return new ArrayList();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.PORT_TYPE__EOPERATIONS:
-          return ((InternalEList)getEOperations()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT_TYPE__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.PORT_TYPE__ELEMENT:
-        return getElement();
-      case WSDLPackage.PORT_TYPE__QNAME:
-        return getQName();
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-        return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.PORT_TYPE__PROXY:
-        return isProxy() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.PORT_TYPE__RESOURCE_URI:
-        return getResourceURI();
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-        return getEOperations();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT_TYPE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.PORT_TYPE__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.PORT_TYPE__QNAME:
-        setQName((QName)newValue);
-        return;
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-        setUndefined(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.PORT_TYPE__PROXY:
-        setProxy(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.PORT_TYPE__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-        getEOperations().clear();
-        getEOperations().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT_TYPE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__QNAME:
-        setQName(QNAME_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-        setUndefined(UNDEFINED_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__PROXY:
-        setProxy(PROXY_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-        getEOperations().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.PORT_TYPE__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.PORT_TYPE__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.PORT_TYPE__QNAME:
-        return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-        return undefined != UNDEFINED_EDEFAULT;
-      case WSDLPackage.PORT_TYPE__PROXY:
-        return proxy != PROXY_EDEFAULT;
-      case WSDLPackage.PORT_TYPE__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-        return eOperations != null && !eOperations.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
-    result.append(qName);
-    result.append(", undefined: ");
-    result.append(undefined);
-    result.append(", proxy: ");
-    result.append(proxy);
-    result.append(", resourceURI: ");
-    result.append(resourceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-    QName qname = new QName(definition.getTargetNamespace(), changedElement.getAttribute("name"));
-    setQName(qname);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.OPERATION :
-        {
-          Operation operation = WSDLFactory.eINSTANCE.createOperation();
-          operation.setEnclosingDefinition(getEnclosingDefinition());
-          operation.setElement(child);
-          getEOperations().add(operation);
-          break;
-        }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    List list = getList(component, modelObject);
-    if (list != null)
-    {
-      list.remove(modelObject);
-    }
-  }
-
-  private List getList(Object component, Object modelObject)
-  {
-    List result = null;
-    PortType portType = (PortType) component;
-    if (modelObject instanceof Operation)
-    {
-      result = portType.getEOperations();
-    }
-    return result;
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    PortType portType = (PortType) component;
-
-    List list = portType.getEOperations();
-    return list;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getPortType_QName())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.PORT_TYPE);
-    setElement(newElement);
-
-    Iterator iterator = getEOperations().iterator();
-    while (iterator.hasNext())
-    {
-      Operation operation = (Operation) iterator.next();
-      Element child = ((OperationImpl) operation).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-} //PortTypeImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
deleted file mode 100644
index bf38f3c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
+++ /dev/null

@@ -1,628 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.ServiceImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ServiceImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ServiceImpl#isProxy <em>Proxy</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ServiceImpl#getResourceURI <em>Resource URI</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.ServiceImpl#getEPorts <em>EPorts</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceImpl extends ExtensibleElementImpl implements Service
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The default value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected static final QName QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQName() <em>QName</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQName()
-   * @generated
-   * @ordered
-   */
-  protected QName qName = QNAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNDEFINED_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isUndefined() <em>Undefined</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUndefined()
-   * @generated
-   * @ordered
-   */
-  protected boolean undefined = UNDEFINED_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PROXY_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isProxy() <em>Proxy</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isProxy()
-   * @generated
-   * @ordered
-   */
-  protected boolean proxy = PROXY_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String RESOURCE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceURI()
-   * @generated
-   * @ordered
-   */
-  protected String resourceURI = RESOURCE_URI_EDEFAULT;
-
-  private Map ports;
-
-  /**
-   * The cached value of the '{@link #getEPorts() <em>EPorts</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEPorts()
-   * @generated
-   * @ordered
-   */
-  protected EList ePorts = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ServiceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getService();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getQName()
-  {
-    return qName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQName(QName newQName)
-  {
-    QName oldQName = qName;
-    qName = newQName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.SERVICE__QNAME, oldQName, qName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isUndefined()
-  {
-    return undefined;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUndefined(boolean newUndefined)
-  {
-    boolean oldUndefined = undefined;
-    undefined = newUndefined;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.SERVICE__UNDEFINED, oldUndefined, undefined));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isProxy()
-  {
-    return proxy;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setProxy(boolean newProxy)
-  {
-    boolean oldProxy = proxy;
-    proxy = newProxy;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.SERVICE__PROXY, oldProxy, proxy));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getResourceURI()
-  {
-    return resourceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceURI(String newResourceURI)
-  {
-    String oldResourceURI = resourceURI;
-    resourceURI = newResourceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.SERVICE__RESOURCE_URI, oldResourceURI, resourceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEPorts()
-  {
-    if (ePorts == null)
-    {
-      ePorts = new EObjectContainmentEList(Port.class, this, WSDLPackage.SERVICE__EPORTS);
-    }
-    return ePorts;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Add a port to this service.
-   * @param port the port to be added
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addPort(javax.wsdl.Port port)
-  {
-    getEPorts().add((Port)port);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get all the ports defined here.
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Map getPorts()
-  {
-    HashMap hashMap = new HashMap();
-    for (Iterator i = getEPorts().iterator(); i.hasNext();)
-    {
-      Port port = (Port) i.next();
-      hashMap.put(port.getName(), port);
-    }
-    return hashMap;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Get the specified port.
-   *
-   * @param name the name of the desired port.
-   * @return the corresponding port, or null if there wasn't
-   * any matching port
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Port getPort(String name)
-  {
-    Port result = null;
-    for (Iterator i = getEPorts().iterator(); i.hasNext();)
-    {
-      Port port = (Port) i.next();
-      if (name.equals(port.getName()))
-      {
-        result = port;
-        break;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.SERVICE__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        case WSDLPackage.SERVICE__EPORTS:
-          return ((InternalEList)getEPorts()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.SERVICE__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.SERVICE__ELEMENT:
-        return getElement();
-      case WSDLPackage.SERVICE__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-      case WSDLPackage.SERVICE__QNAME:
-        return getQName();
-      case WSDLPackage.SERVICE__UNDEFINED:
-        return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.SERVICE__PROXY:
-        return isProxy() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.SERVICE__RESOURCE_URI:
-        return getResourceURI();
-      case WSDLPackage.SERVICE__EPORTS:
-        return getEPorts();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.SERVICE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.SERVICE__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.SERVICE__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-      case WSDLPackage.SERVICE__QNAME:
-        setQName((QName)newValue);
-        return;
-      case WSDLPackage.SERVICE__UNDEFINED:
-        setUndefined(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.SERVICE__PROXY:
-        setProxy(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.SERVICE__RESOURCE_URI:
-        setResourceURI((String)newValue);
-        return;
-      case WSDLPackage.SERVICE__EPORTS:
-        getEPorts().clear();
-        getEPorts().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.SERVICE__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-      case WSDLPackage.SERVICE__QNAME:
-        setQName(QNAME_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__UNDEFINED:
-        setUndefined(UNDEFINED_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__PROXY:
-        setProxy(PROXY_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__RESOURCE_URI:
-        setResourceURI(RESOURCE_URI_EDEFAULT);
-        return;
-      case WSDLPackage.SERVICE__EPORTS:
-        getEPorts().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.SERVICE__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.SERVICE__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.SERVICE__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-      case WSDLPackage.SERVICE__QNAME:
-        return QNAME_EDEFAULT == null ? qName != null : !QNAME_EDEFAULT.equals(qName);
-      case WSDLPackage.SERVICE__UNDEFINED:
-        return undefined != UNDEFINED_EDEFAULT;
-      case WSDLPackage.SERVICE__PROXY:
-        return proxy != PROXY_EDEFAULT;
-      case WSDLPackage.SERVICE__RESOURCE_URI:
-        return RESOURCE_URI_EDEFAULT == null ? resourceURI != null : !RESOURCE_URI_EDEFAULT.equals(resourceURI);
-      case WSDLPackage.SERVICE__EPORTS:
-        return ePorts != null && !ePorts.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
-    result.append(qName);
-    result.append(", undefined: ");
-    result.append(undefined);
-    result.append(", proxy: ");
-    result.append(proxy);
-    result.append(", resourceURI: ");
-    result.append(resourceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-
-    QName qname = new QName(definition.getTargetNamespace(), changedElement.getAttribute("name"));
-    setQName(qname);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    switch (WSDLUtil.getInstance().getWSDLType(child))
-    {
-      case WSDLConstants.PORT :
-        {
-          Port port = (Port) ((WSDLPackage) EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI)).getWSDLFactory().createPort();
-          port.setEnclosingDefinition(getEnclosingDefinition());
-          getEPorts().add(port);
-          port.setElement(child);
-          break;
-        }
-      case WSDLConstants.DOCUMENTATION :
-        {
-          setDocumentationElement(child);
-          break;
-        }
-      default :
-      {
-        super.handleUnreconciledElement(child,remainingModelObjects);
-        break;
-      }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(i.next());
-    }
-  }
-
-  private void remove(Object modelObject)
-  {
-    List list = getList(modelObject);
-    if (list != null)
-    {
-      list.remove(modelObject);
-    }
-  }
-
-  private List getList(Object modelObject)
-  {
-    List result = null;
-    if (modelObject instanceof Port)
-    {
-      result = getEPorts();
-    }
-    else if (modelObject instanceof ExtensibilityElement)
-    {
-      result = getExtensibilityElements();
-    }
-    return result;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (isReconciling)
-      return;
-
-    super.changeAttribute(eAttribute);
-    Element theElement = getElement();
-    if (theElement != null)
-    {
-      if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getService_QName())
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-    }
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.SERVICE);
-    setElement(newElement);
-
-	Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) iterator.next();
-      Element child = ((ExtensibilityElementImpl) extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-	
-    iterator = getEPorts().iterator();
-    while (iterator.hasNext())
-    {
-      Port port = (Port) iterator.next();
-      Element child = ((PortImpl) port).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-
-} //ServiceImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java
deleted file mode 100644
index 363ddf7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java
+++ /dev/null

@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-//import com.ibm.wsdl.factory.WSDLFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Types</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class TypesImpl extends ExtensibleElementImpl implements Types
-{
-  /**
-   * This class is not intended to be serialized.
-   * serialVersionUID is assigned with 1L to avoid
-   * compiler warning messages.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected TypesImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getTypes();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getSchemas()
-  {
-    List arrayList = new ArrayList();
-    for (Iterator i = getEExtensibilityElements().iterator(); i.hasNext();)
-    {
-      XSDSchemaExtensibilityElement xsdee = (XSDSchemaExtensibilityElement) i.next();
-      if (xsdee.getSchema() != null)
-      {
-        arrayList.add(xsdee.getSchema());
-      }
-    }
-    return arrayList;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getSchemas(String namespaceURI)
-  {
-    List schemas = new ArrayList();
-    for (Iterator i = getSchemas().iterator(); i.hasNext();)
-    {
-      XSDSchema schema = (XSDSchema) i.next();
-      if (namespaceURI == null && schema.getTargetNamespace() == null) {
-    	  schemas.add(schema);
-      }
-      else if (namespaceURI != null && namespaceURI.equals(schema.getTargetNamespace())) {
-        schemas.add(schema);
-      }
-    }
-    return schemas;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.TYPES__EEXTENSIBILITY_ELEMENTS:
-          return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.TYPES__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.TYPES__ELEMENT:
-        return getElement();
-      case WSDLPackage.TYPES__EEXTENSIBILITY_ELEMENTS:
-        return getEExtensibilityElements();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.TYPES__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.TYPES__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.TYPES__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        getEExtensibilityElements().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.TYPES__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.TYPES__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.TYPES__EEXTENSIBILITY_ELEMENTS:
-        getEExtensibilityElements().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.TYPES__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.TYPES__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.TYPES__EEXTENSIBILITY_ELEMENTS:
-        return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-    }
-    return eDynamicIsSet(eFeature);
-  }
-  
-  public void eNotify(Notification msg)
-  {
-    super.eNotify(msg);
-    
-    // cs.. if we've added an XSDSchemaExtensibilityElementImpl and the Types object is already attached 
-    // to a resource we need to set the schemaLocation for the inline schema.
-    // If not yet attached to a resource, the schemaLocation's will be set via WSDLResourceImpl.attached(EObject o)
-    //     
-    if (msg.getFeature() == WSDLPackage.eINSTANCE.getExtensibleElement_EExtensibilityElements() &&
-        msg.getEventType() == Notification.ADD)
-    {
-      if (msg.getNewValue() instanceof XSDSchemaExtensibilityElementImpl)
-      {
-        XSDSchemaExtensibilityElementImpl ee = (XSDSchemaExtensibilityElementImpl)msg.getNewValue();
-        if (ee.getSchema() != null && ee.getSchema().eResource() != null)
-        {
-           ee.getSchema().setSchemaLocation(ee.getSchema().eResource().getURI().toString());
-        }  
-      }  
-    }  
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    if ("schema".equals(child.getLocalName()))
-    {
-      try
-      {
-        XSDSchemaExtensibilityElement xsdee = WSDLFactory.eINSTANCE.createXSDSchemaExtensibilityElement();
-        xsdee.setEnclosingDefinition(getEnclosingDefinition());
-        xsdee.setElement(child); // cs : this has the side effect of creating the inline schema               
-        addExtensibilityElement(xsdee);       
-      }
-      catch (Exception e)
-      {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-    for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-    {
-      remove(this, i.next());
-    }
-    ((DefinitionImpl)getEnclosingDefinition()).reconcileReferences(true);
-  }
-
-  protected void remove(Object component, Object modelObject)
-  {
-    Types types = (Types) component;
-    List list = types.getEExtensibilityElements();
-    list.remove(modelObject);
-  }
-
-  public Collection getModelObjects(Object component)
-  {
-    Types types = (Types) component;
-    List list = new ArrayList();
-    list.addAll(types.getEExtensibilityElements());
-    return list;
-  }
-
-  public Element createElement()
-  {
-    Element newElement = createElement(WSDLConstants.TYPES);
-    setElement(newElement);
-
-    // Add children
-    Definition definition = getEnclosingDefinition();
-    if (definition == null)
-      return newElement;
-
-    Document document = definition.getDocument();
-    if (document == null)
-      document = ((DefinitionImpl) definition).updateDocument();
-
-    Iterator iter = getEExtensibilityElements().iterator();
-    Element el = null;
-    while (iter.hasNext())
-    {
-      ExtensibilityElement extensibility = (ExtensibilityElement) iter.next();
-      el = extensibility.getElement();
-      if (el != null)
-      {
-        try
-        {
-          Element reParented = (Element) document.importNode(el, true);
-          extensibility.setElement(reParented); // replace with the new one
-          newElement.appendChild(reParented);
-        }
-        catch (DOMException e)
-        {
-          e.printStackTrace();
-          return newElement;
-        }
-      }
-      else
-      {
-      	Element child = ((ExtensibilityElementImpl)extensibility).createElement();
-      	newElement.appendChild(child);
-      }
-    }
-
-    return newElement;
-  }
-} //TypesImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java
deleted file mode 100644
index b2ddd0c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java
+++ /dev/null

@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Unknown Extensibility Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.impl.UnknownExtensibilityElementImpl#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class UnknownExtensibilityElementImpl extends ExtensibilityElementImpl implements UnknownExtensibilityElement
-{
-    /**
-     * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getChildren()
-     * @generated
-     * @ordered
-     */
-    protected EList children = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected UnknownExtensibilityElementImpl()
-    {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass()
-    {
-        return WSDLPackage.eINSTANCE.getUnknownExtensibilityElement();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EList getChildren()
-    {
-        if (children == null)
-        {
-            children = new EObjectContainmentEList(UnknownExtensibilityElement.class, this, WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN);
-        }
-        return children;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-    {
-        if (featureID >= 0)
-        {
-            switch (eDerivedStructuralFeatureID(featureID, baseClass))
-            {
-            case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-                return ((InternalEList) getChildren()).basicRemove(otherEnd, msgs);
-            default:
-                return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-            }
-        }
-        return eBasicSetContainer(null, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(EStructuralFeature eFeature, boolean resolve)
-    {
-        switch (eDerivedStructuralFeatureID(eFeature))
-        {
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-            return getDocumentationElement();
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT:
-            return getElement();
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__REQUIRED:
-            return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-            return getElementType();
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-            return getChildren();
-        }
-        return eDynamicGet(eFeature, resolve);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(EStructuralFeature eFeature, Object newValue)
-    {
-        switch (eDerivedStructuralFeatureID(eFeature))
-        {
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-            setDocumentationElement((Element) newValue);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT:
-            setElement((Element) newValue);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__REQUIRED:
-            setRequired(((Boolean) newValue).booleanValue());
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-            setElementType((QName) newValue);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-            getChildren().clear();
-            getChildren().addAll((Collection) newValue);
-            return;
-        }
-        eDynamicSet(eFeature, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(EStructuralFeature eFeature)
-    {
-        switch (eDerivedStructuralFeatureID(eFeature))
-        {
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-            setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT:
-            setElement(ELEMENT_EDEFAULT);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__REQUIRED:
-            setRequired(REQUIRED_EDEFAULT);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-            setElementType(ELEMENT_TYPE_EDEFAULT);
-            return;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-            getChildren().clear();
-            return;
-        }
-        eDynamicUnset(eFeature);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(EStructuralFeature eFeature)
-    {
-        switch (eDerivedStructuralFeatureID(eFeature))
-        {
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-            return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT:
-            return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__REQUIRED:
-            return required != REQUIRED_EDEFAULT;
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-            return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-            return children != null && !children.isEmpty();
-        }
-        return eDynamicIsSet(eFeature);
-    }
-
-    // 
-    // Reconcile methods
-    //
-
-    public void setElement(Element element)
-    {
-        if (element == null && !isReconciling)
-        {
-            //System.out.println("ExtensibilityElement.setElement(): Preserving old element");
-        } 
-        else
-        {
-            setElementGen(element);
-        }
-    }
-
-    public void reconcileAttributes(Element changedElement)
-    {
-        //System.out.println("UnknownExtensibilityElementImpl.reconcileAttributes()");
-    }
-
-    public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-    {
-        //System.out.println("UnknownExtensibilityElementImpl.handleUnreconciledElement()");
-        UnknownExtensibilityElement extensibilityElement = WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-        extensibilityElement.setEnclosingDefinition(getEnclosingDefinition());
-        extensibilityElement.setElement(child);
-        
-        // TODO..  we need to figure out where the child should go in the in current list
-        // so that it doesn't always end up going to the end of the list 
-        // (since a new element might be added at the start)
-        getChildren().add(extensibilityElement);         
-    }
-
-    protected void handleReconciliation(Collection remainingModelObjects)
-    {
-        for (Iterator i = remainingModelObjects.iterator(); i.hasNext();)
-        {
-            remove(this, i.next());
-        }
-    }
-
-    protected void remove(Object component, Object modelObject)
-    {
-        UnknownExtensibilityElement uee = (UnknownExtensibilityElement) component;
-        if (modelObject instanceof UnknownExtensibilityElement)
-        {
-            uee.getChildren().remove(modelObject);
-        }
-    }
-
-    public Element createElement()
-    {
-        Definition definition = getEnclosingDefinition();
-        if (definition == null)
-            return null;
-
-        Document document = definition.getDocument();
-        if (document == null)
-            document = ((DefinitionImpl) definition).updateDocument();
-
-        Element newElement = null;
-        if (element != null) // This is an old element.
-        {
-            newElement = (Element) document.importNode(element, true);
-            element = newElement;
-        } 
-        else
-        {
-            String namespace = getElementType().getNamespaceURI();
-            String qualifier = definition.getPrefix(namespace);
-            newElement = document.createElementNS(namespace, (qualifier == null ? "" : qualifier + ":") + getElementType().getLocalPart());
-            element = newElement;
-        }
-
-        return newElement;
-    }
-
-    private java.util.Map properties = new java.util.HashMap();
-
-    public void setAttribute(String key, String value)
-    {
-        properties.put(key, value);
-    }
-
-    protected void changeAttribute(EAttribute eAttribute)
-    {
-        if (isReconciling)
-            return;
-
-        super.changeAttribute(eAttribute);
-        Element theElement = getElement();
-        if (theElement != null)
-        {
-            Iterator iterator = properties.entrySet().iterator();
-            java.util.Map.Entry entry = null;
-            while (iterator.hasNext())
-            {
-                entry = (java.util.Map.Entry) iterator.next();
-                String attribute = (String) entry.getKey();
-                String value = (String) entry.getValue();
-                niceSetAttribute(theElement, attribute, value);
-            }
-        }
-    }
-} //UnknownExtensibilityElementImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
deleted file mode 100644
index d0522ad..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
+++ /dev/null

@@ -1,1487 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.WSDLElementImpl#getDocumentationElement <em>Documentation Element</em>}</li>
- *   <li>{@link org.eclipse.wsdl.impl.WSDLElementImpl#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class WSDLElementImpl extends EObjectImpl implements WSDLElement
-{
-  /**
-   * The default value of the '{@link #getDocumentationElement() <em>Documentation Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDocumentationElement()
-   * @generated
-   * @ordered
-   */
-  protected static final Element DOCUMENTATION_ELEMENT_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getDocumentationElement() <em>Documentation Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDocumentationElement()
-   * @generated
-   * @ordered
-   */
-  protected Element documentationElement = DOCUMENTATION_ELEMENT_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getElement() <em>Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElement()
-   * @generated
-   * @ordered
-   */
-  protected static final Element ELEMENT_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElement()
-   * @generated
-   * @ordered
-   */
-  protected Element element = ELEMENT_EDEFAULT;
-
-  protected boolean isReconciling = false;
-  protected boolean updatingDOM = false;
-  protected EList wsdlContents;
-
-  private Definition enclosingDefinition;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLElementImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getWSDLElement();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Element getDocumentationElement()
-  {
-    return documentationElement;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setDocumentationElement(Element newDocumentationElement)
-  {
-    Element oldDocumentationElement = documentationElement;
-    documentationElement = newDocumentationElement;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT, oldDocumentationElement, documentationElement));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Element getElement()
-  {
-    return element;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setElementGen(Element newElement)
-  {
-    Element oldElement = element;
-    element = newElement;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.WSDL_ELEMENT__ELEMENT, oldElement, element));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setEnclosingDefinition(Definition definition)
-  {
-    enclosingDefinition = definition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-        return getElement();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (documentationElement: ");
-    result.append(documentationElement);
-    result.append(", element: ");
-    result.append(element);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcilation methods: DOM -> Model
-  //
-
-  public static class WSDLContentsEList extends EContentsEList
-  {
-    WSDLContentsEList(EObject eObject, EStructuralFeature[] eStructuralFeatures)
-    {
-      super(eObject, eStructuralFeatures);
-    }
-
-    protected ListIterator newListIterator()
-    {
-      return new FeatureIteratorImpl(eObject, eStructuralFeatures);
-    }
-
-    protected boolean isIncluded(EStructuralFeature eStructuralFeature)
-    {
-      EReference eReference = (EReference) eStructuralFeature;
-      return !eReference.isTransient();
-    }
-
-    public List basicList()
-    {
-      return new WSDLContentsEList(eObject, eStructuralFeatures);
-    }
-
-    public Iterator basicIterator()
-    {
-      return new FeatureIteratorImpl(eObject, eStructuralFeatures);
-    }
-
-    public static class FeatureIteratorImpl extends EContentsEList.FeatureIteratorImpl
-    {
-      public FeatureIteratorImpl(EObject eObject)
-      {
-        super(eObject, (EStructuralFeature[]) ((BasicEList) eObject.eClass().getEAllReferences()).data());
-      }
-
-      public FeatureIteratorImpl(EObject eObject, EStructuralFeature[] eStructuralFeatures)
-      {
-        super(eObject, eStructuralFeatures);
-      }
-
-      protected boolean isIncluded(EStructuralFeature eStructuralFeature)
-      {
-        EReference eReference = (EReference) eStructuralFeature;
-        return !eReference.isTransient();
-      }
-    }
-  }
-
-  public EList getWSDLContents()
-  {
-    if (wsdlContents == null)
-    {
-      wsdlContents = new WSDLContentsEList(this, (EStructuralFeature[]) ((BasicEList) eClass().getEAllContainments()).data());
-    }
-
-    return wsdlContents;
-  }
-
-  public void setElement(Element element)
-  {
-    if (element == null)
-    {
-      isReconciling = true;
-      setElementGen(null);
-      for (Iterator contents = getWSDLContents().iterator(); contents.hasNext();)
-      {
-        Object obj = contents.next();
-        if (obj instanceof WSDLElementImpl)
-        {
-          WSDLElementImpl content = (WSDLElementImpl) obj;
-          content.setElement(null);
-        }
-      }
-      isReconciling = false;
-    }
-    else
-    {
-      setElementGen(element);
-    }
-  }
-
-  public boolean eNotificationRequired()
-  {
-    return true;
-  }
-
-  public void eNotify(Notification msg)
-  {
-    int eventType = msg.getEventType();
-    Object feature = msg.getFeature();
-    Object oldValue = msg.getOldValue();
-    Object newValue = msg.getNewValue();
-
-    if (eClass().getEAllReferences().contains(feature))
-    {
-      EReference eReference = (EReference) feature;
-      if (eReference.isContainment() && !eReference.isTransient())
-      {
-        switch (eventType)
-        {
-          case Notification.ADD :
-          {
-              adoptContent(eReference,newValue);
-            break;
-          }
-          case Notification.ADD_MANY :
-          {
-            for (Iterator newValues = ((Collection) newValue).iterator(); newValues.hasNext();)
-            {
-              WSDLElement wsdlElement = (WSDLElement) newValues.next();
-              adoptContent(eReference, wsdlElement);
-            }
-            break;
-          }
-          case Notification.REMOVE :
-          {
-            if (oldValue != null)
-            {
-              orphanContent(eReference, (WSDLElement) oldValue);
-            }
-            break;
-          }
-          case Notification.REMOVE_MANY :
-          {
-            for (Iterator oldValues = ((Collection) oldValue).iterator(); oldValues.hasNext();)
-            {
-              EObject object = (EObject) oldValues.next();
-              orphanContent(eReference, object);
-            }
-            break;
-          }
-          case Notification.MOVE :
-          {
-            moveContent(eReference, (WSDLElement) newValue);
-            break;
-          }
-          case Notification.SET :
-          case Notification.UNSET :
-          {
-            if (oldValue != null)
-            {
-              orphanContent(eReference, oldValue);
-            }
-            if (newValue != null)
-            {
-              adoptContent(eReference, newValue);
-            }
-            break;
-          }
-        }
-      }
-      else
-      {
-        switch (eventType)
-        {
-          case Notification.ADD :
-          case Notification.ADD_MANY :
-          case Notification.REMOVE :
-          case Notification.REMOVE_MANY :
-          case Notification.MOVE :
-          case Notification.SET :
-          case Notification.UNSET :
-          {
-            changeReference(eReference);
-            break;
-          }
-        }
-      }
-    }
-    else if (eClass().getEAllAttributes().contains(feature))
-    {
-      EAttribute eAttribute = (EAttribute) feature;
-      switch (eventType)
-      {
-        case Notification.ADD :
-        case Notification.ADD_MANY :
-        case Notification.REMOVE :
-        case Notification.REMOVE_MANY :
-        case Notification.MOVE :
-        case Notification.SET :
-        case Notification.UNSET :
-        {
-          changeAttribute(eAttribute);
-          break;
-        }
-      }
-    }
-    super.eNotify(msg);
-  }
-
-  protected void orphanContent(EReference eReference, Object obj)
-  {
-    if (!isReconciling)
-    {
-      Element parent = getElement();
-      if (parent != null && obj != null && obj instanceof WSDLElement)
-      {
-      	WSDLElement wsdlElement = (WSDLElement)obj;
-        Element contentElement = wsdlElement.getElement();
-        if (contentElement != null)
-          niceRemoveChild(contentElement.getParentNode(), contentElement);
-      }
-      else
-      	;//System.out.println("WSDLElement.orphanContent(), Object is: " + obj);
-    }
-  }
-  
-  protected void niceRemoveChild(Node parent, Node child)
-  {
-    if (isReconciling)
-    {
-      // System.out.println("**** cyclic dom writeback avoided " + eClass().getName());
-      return;
-    }
-    forceNiceRemoveChild(parent, child);
-  }
-  
-  public void forceNiceRemoveChild(Node parent, Node child)
-  {
-    updatingDOM = true;
-
-    boolean done = false;
-
-// System.out.println("?*");
-    Node previous = child.getPreviousSibling();
-    if (previous != null && previous.getNodeType() == Node.TEXT_NODE)
-    {
-      Text text = (Text)previous;
-      String data = text.getData();
-      int index = data.lastIndexOf('\n');
-      if (index != -1)
-      {
-        if (index - 1 > 0 && data.charAt(index - 1) == '\r')
-        {
-//System.out.println("1*");
-          text.deleteData(index - 1, data.length() - index + 1);
-        }
-        else
-        {
-//System.out.println("2*");
-          text.deleteData(index, data.length() - index);
-        }
-        done = true;
-      }
-      else
-      {
-        //System.out.println("No return before!");
-      }
-    }
-    else
-    {
-      // System.out.println("No text node before!");
-    }
-
-
-    if (!done)
-    {
-      for (Node next = child.getNextSibling(); next != null; next = next.getNextSibling())
-      {
-        if (next.getNodeType() == Node.TEXT_NODE)
-        {
-          Text text = (Text)next;
-          String data = text.getData();
-/*
-           System.out.print("xx " + data.length() + ":: ");
-          for (int i = 0; i < data.length(); ++i)
-          {
-             System.out.print(" " + Integer.toHexString((int)data.charAt(i)));
-          }
-          System.out.println();
-*/
-
-          int index = data.indexOf('\n');
-          if (index != -1)
-          {
-            if (index + 1 < data.length() && data.charAt(index + 1) == '\r')
-            {
-    // System.out.println("3*");
-              text.deleteData(0, index + 2);
-            }
-            else
-            {
-    //System.out.println("4*");
-              text.deleteData(0, index + 1);
-            }
-            break;
-          }
-          else
-          {
-            // System.out.println("No return after!");
-          }
-        }
-        else if (next.getNodeType() == Node.ELEMENT_NODE)
-        {
-          break;
-        }
-      }
-    }
-
-// System.out.println("Removing from--------\n     " + parent);
-// System.out.println("Removing--------\n     " + child);
-    if (parent != null)
-    	parent.removeChild(child);
-
-    updatingDOM=false;
-  }
- 
-  protected void moveContent(EReference eReference, WSDLElement wsdlElement)
-  {
-    if (isReconciling)
-    {
-      // System.out.println("**** cyclic dom writeback avoided " + eClass().getName());
-      return;
-    }
-    //System.out.println("moving " + xsdConcreteComponent);
-    Node parent = getAdoptionParentNode(eReference);
-    if (parent != null)
-    {
-      Element child = wsdlElement.getElement();
-      if (child != null)
-      {
-        List contents = getWSDLContents();
-        int index = contents.indexOf(wsdlElement);
-        niceRemoveChild(parent, child);
-        niceInsertBefore
-          (parent, 
-            child, 
-            ++index == contents.size() ?  
-              null : 
-              ((WSDLElement)contents.get(index)).getElement());
-      }
-    }
-    //System.out.println("moved " + xsdConcreteComponent);
-
-  }
-
-  protected void adoptContent(EReference eReference, Object object)
-  {
-    if (object instanceof WSDLElement)
-    {
-      WSDLElement wsdlElement = (WSDLElement) object;
-      if (isReconciling)
-      {
-        if (wsdlElement.getElement() != null)
-        {
-          ((WSDLElementImpl) wsdlElement).elementChanged(wsdlElement.getElement());
-        }
-      }
-      else
-      {
-        Element childElement = wsdlElement.getElement();
-        if (getElement() != null && (childElement == null || childElement.getParentNode() == null))
-        {
-          if (childElement != null && childElement.getOwnerDocument() != getElement().getOwnerDocument())
-          {
-            wsdlElement.setElement(null);
-            childElement = null;
-          }
-
-          handleElementForAdopt(eReference, wsdlElement);
-          ((WSDLElementImpl) wsdlElement).updateElement();
-        }
-      }
-
-      Definition definition = getEnclosingDefinition();
-      if (definition != null)
-      {
-        ((WSDLElementImpl) wsdlElement).adoptBy(definition);
-      }
-    }
-    else if (object instanceof Namespace)
-    {
-      // Add a namespace attribute to the Definitions element.
-      Namespace ns = (Namespace)object;
-      Node adoptionParent = getAdoptionParentNode(eReference); // Definitions node
-      // KB: Assumption - The prefix is unique if we are here (by the Definitions model). 
-	  if (adoptionParent != null) {
-		  ((Element)adoptionParent).setAttribute("xmlns:"+ns.getPrefix(),ns.getURI());
-	  }
-    }
-  }
-
-  protected Node getAdoptionParentNode(EReference eReference)
-  {
-    return getElement();
-  }
-  
-  protected void handleElementForAdopt(EReference eReference, WSDLElement wsdlElement)
-  { 
-    // Establish DOM parent-child relationship
-    
-    Node adoptionParent = getAdoptionParentNode(eReference);
-    Element childElement = wsdlElement.getElement();
-    Element referencedElement = null;
-    
-    for (Iterator contents = getWSDLContents().iterator(); contents.hasNext(); )
-    {
-      if (contents.next() == wsdlElement)
-      {
-        if (contents.hasNext())
-        {
-          Object next = contents.next();
-          if (next instanceof WSDLElement)
-          {
-            referencedElement = ((WSDLElement)next).getElement();
-            while (referencedElement != null)
-            {
-              Node parent = referencedElement.getParentNode(); 
-              if (parent == null )
-              {
-                referencedElement = null;
-                break;
-              }
-              else if (parent == adoptionParent)
-              {
-                break;
-              }
-              else if (parent.getNodeType() == Node.ELEMENT_NODE)
-              {
-                referencedElement = (Element)parent;
-              }
-              else
-              {
-                break;
-              }
-            }
-          }
-        }
-        break;
-      }
-    }
-   
-    boolean isNew = false;
-    if (childElement == null)
-    {
-      ((WSDLElementImpl)wsdlElement).isReconciling = true;
-      childElement = ((WSDLElementImpl)wsdlElement).createElement();
-      ((WSDLElementImpl)wsdlElement).isReconciling = false;
-      isNew = true;
-      if (childElement == null)
-      {
-         //System.out.println("not created! " + wsdlElement);
-         return;
-      }
-    }
-
-    boolean isAttached = false;
-    for (Node rootDocument = childElement; rootDocument != null; rootDocument = rootDocument.getParentNode())
-    {
-      if (WSDLConstants.nodeType(rootDocument) == WSDLConstants.DEFINITION)
-      {
-        isAttached = true;
-        break;
-      }
-    }
-    
-    if (!isAttached)
-    {
-      if (referencedElement == null && 
-          !eReference.isMany())
-    {
-      for (Node child = adoptionParent.getFirstChild(); child != null; child = child.getNextSibling())
-      {
-        if (child.getNodeType() == Node.ELEMENT_NODE)
-        {
-          referencedElement = (Element)child;
-          break;
-        }
-      }
-    }
-      //referencedElement = computeTopLevelRefChild(adoptionParent,childElement);     
-      niceInsertBefore(adoptionParent, childElement, referencedElement);
-    }
-  }
-
-  public void niceInsertBefore(Node parent, Node newChild, Node referenceChild)
-  {
-    if (isReconciling)
-    {
-      // System.out.println("**** cyclic dom writeback avoided " + eClass().getName());
-      return;
-    }
-
-    forceNiceInsertBefore(parent, newChild, referenceChild);
-  }
-
-  public void forceNiceInsertBefore(Node parent, Node newChild, Node referenceChild)
-  {
-    updatingDOM = true;
-
-    LOOP:
-    for (Node child = referenceChild == null ? parent.getLastChild() : referenceChild.getPreviousSibling(); 
-         child != null; 
-         child = child.getPreviousSibling())
-    {
-      switch (child.getNodeType())
-      {
-        case Node.TEXT_NODE:
-        {
-          Text text = (Text)child;
-          String data = text.getData();
-
-/*
-          System.out.print("xx " + data.length() + ":: ");
-          for (int i = 0; i < data.length(); ++i)
-          {
-            System.out.print(" " + Integer.toHexString((int)data.charAt(i)));
-          }
-          System.out.println();
-*/
-
-          int index = data.lastIndexOf('\n');
-          if (index != -1)
-          {
-// System.out.println("In here");
-
-            StringBuffer indent = new StringBuffer();
-            for (Node ancestor = parent.getParentNode(); 
-                 ancestor != null && ancestor.getNodeType() != Node.DOCUMENT_NODE; 
-                 ancestor = ancestor.getParentNode())
-            {
-              indent.append("    ");
-            }
-
-            if (index + 1 < data.length() && data.charAt(index + 1) == '\r')
-            {
-              ++index;
-            }
-            text.replaceData(index + 1, data.length() - index - 1, indent + "    ");
-
-            // setCorrectIndentation(indent, newText);
-            if (referenceChild != null)
-            {
-              indent.append("    ");
-            }
-            Text newText = parent.getOwnerDocument().createTextNode("\n" + indent);
-// System.out.println("Inserted..." + newText);
-            parent.insertBefore(newText, referenceChild);
-            referenceChild = newText;
-            break LOOP;
-          }
-
-          break;
-        } 
-        case Node.ELEMENT_NODE:
-        {
-          break LOOP;
-        }
-      }
-    }
-
-// System.out.println("Inserted..." + newChild);
-    parent.insertBefore(newChild, referenceChild);
-
-    updatingDOM = false;
-  }
-
-  protected Element computeTopLevelRefChild(Node parentNode, Node nodeToAdd)
-  {
-  	Element result = null;
-    int a = getPrecedence(nodeToAdd);
-      	
-    for (Node node = parentNode.getFirstChild(); node != null; node = node.getNextSibling())
-    {
-      if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-		    int b = getPrecedence(node);
-		    if (b >= a)
-		    {
-		      result = (Element)node;	
-	        break;	    
-		    }        
-      } 
-    }
-    return result;
-  }
-  
-  private HashMap precedenceMap = createPrecedenceMap();
-
-  private int getPrecedence(Node node)
-  {
-  	int result = 2;
-  	String localName = node.getLocalName();
-  	if (localName != null)
-  	{  	
-      Integer integer = (Integer)precedenceMap.get(localName);
-      if (integer != null)
-      {      
-        result = integer.intValue();
-      }
-  	}
-  	return result;
-  }
-    
-  private HashMap createPrecedenceMap()
-	{
-		HashMap hashMap = new HashMap();
-		hashMap.put(WSDLConstants.DOCUMENTATION_ELEMENT_TAG, new Integer(1));
-		hashMap.put(WSDLConstants.IMPORT_ELEMENT_TAG, new Integer(3));
-		hashMap.put(WSDLConstants.TYPES_ELEMENT_TAG, new Integer(4));
-		hashMap.put(WSDLConstants.MESSAGE_ELEMENT_TAG, new Integer(5));
-		hashMap.put(WSDLConstants.PORT_TYPE_ELEMENT_TAG, new Integer(6));
-		hashMap.put(WSDLConstants.BINDING_ELEMENT_TAG, new Integer(7));
-		hashMap.put(WSDLConstants.SERVICE_ELEMENT_TAG, new Integer(8));
-		return hashMap;
-	}
-
-  protected void adoptBy(Definition definition)
-  {
-    for (Iterator components = getWSDLContents().iterator(); components.hasNext();)
-    {
-      Object child = components.next();
-      if (child instanceof WSDLElementImpl)
-      {
-        ((WSDLElementImpl) child).adoptBy(definition);
-      }
-    }
-  }
-
-  protected boolean isUpdatingDOM()
-  {
-    return updatingDOM;
-  }
-
-  public void elementChanged(Element changedElement)
-  {
-    if (!isUpdatingDOM())
-    {
-      if (!isReconciling)
-      {
-        //System.out.println("**** changeFor " + eClass().getName());
-        isReconciling = true;
-        reconcile(changedElement);
-
-        WSDLElement theContainer = getContainer();
-        if (theContainer != null && theContainer.getElement() == changedElement)
-        {
-          ((WSDLElementImpl) theContainer).elementChanged(changedElement);
-        }
-
-        isReconciling = false;
-        traverseToRootForPatching();
-      }
-      else
-      {
-        ; //System.out.println("**** cyclic internal reconcile avoided " + eClass().getName());
-      }
-    }
-    else
-    {
-      ; //System.out.println("**** cyclic DOM reconcile avoided " + eClass().getName());
-    }
-  }
-
-  protected void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-  }
-
-  protected void handleReconciliation(Collection remainingModelObjects)
-  {
-  }
-
-  /**
-   * @deprecated
-   * TODO... remove this method!
-   */
-  public Collection getModelObjects(Object component)
-  {
-    return getWSDLContents();
-  }
-
-  /*
-  protected Element getElementForModelObject(Object modelObject)
-  {
-    Element result = null;
-    if (modelObject instanceof Element)
-    {
-      result = (Element) modelObject;
-    }
-    else if (modelObject instanceof WSDLElement)
-    {
-      result = ((WSDLElement) modelObject).getElement();
-    }
-    return result;
-  }
-  */
-
-  private Collection getContentNodes(Element changedElement)
-  {
-    Collection result = new ArrayList();
-    for (Node child = changedElement.getFirstChild(); child != null; child = child.getNextSibling())
-    {
-      if (child.getNodeType() == Node.ELEMENT_NODE)
-      {
-        result.add(child);
-      }
-    }
-    return result;
-  }
-
-  // Some subclasses use this method
-  protected QName createQName(Definition definition, String prefixedName)
-  {
-    QName qname = null;
-    if (prefixedName != null)
-    {
-      int index = prefixedName.indexOf(":");
-      String prefix = (index == -1) ? "" : prefixedName.substring(0, index);
-      String namespace = definition.getNamespace(prefix);
-      if (namespace != null)
-      {
-        String localPart = prefixedName.substring(index + 1);
-        qname = new QName(namespace, localPart);       
-      }
-    }
-    return qname;
-  }
-
-  //
-  // For reconciliation: Model -> DOM
-  //
-
-  public void updateElement(boolean deep)
-  {
-    if (deep || getElement() == null)
-    {
-      updateElement();
-    }
-    else
-    {
-      changeAttribute(null);
-      changeReference(null);
-    }
-  }
-
-  public void updateElement()
-  {
-    if (getElement() == null)
-    {
-      isReconciling = true;
-      createElement();
-      isReconciling = false;
-    }
-
-    changeAttribute(null);
-    changeReference(null);
-
-    Object obj = null;
-    for (Iterator containments = eClass().getEAllContainments().iterator(); containments.hasNext();)
-    {
-      EReference eReference = (EReference) containments.next();
-      if (eReference == WSDLPackage.eINSTANCE.getXSDSchemaExtensibilityElement_Schema())
-      {
-        // TBD - This is an instance of XSDSchemaExtensibilityElement and
-        // eRefernce is XSDSchema. What do we want to do for update?
-      }
-      else if (!eReference.isTransient())
-      {
-        if (eReference.isMany())
-        {
-          for (Iterator objects = ((Collection) eGet(eReference)).iterator(); objects.hasNext();)
-          {
-            obj = objects.next();
-            if (!(obj instanceof WSDLElement) || obj == null)
-            {
-              // Skip it. Probably this is Namespace.
-            }
-            else
-            {
-              WSDLElement wsdlElement = (WSDLElement) obj;
-              //handleElementForAdopt(eReference, wsdlElement);
-               ((WSDLElementImpl) wsdlElement).updateElement();
-            }
-          }
-        }
-        else
-        {
-          WSDLElement wsdlElement = (WSDLElement) eGet(eReference);
-          if (wsdlElement != null)
-          {
-            //handleElementForAdopt(eReference,  wsdlElement);
-             ((WSDLElementImpl) wsdlElement).updateElement();
-          }
-        }
-      } // end else if
-    } // end for
-  }
-
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-    if (eAttribute == WSDLPackage.eINSTANCE.getWSDLElement_Element())
-    {
-      Element theElement = getElement();
-      if (theElement != null && !isReconciling)
-      {
-        for (Node rootDocument = theElement.getParentNode(); rootDocument != null; rootDocument = rootDocument.getParentNode())
-        {
-          if (rootDocument.getNodeType() == Node.DOCUMENT_NODE)
-          {
-            isReconciling = true;
-            if (getEnclosingDefinition() == null)
-            {
-              reconcileAttributes(getElement());
-              isReconciling = false;
-            }
-            else
-            {
-              reconcile(getElement());
-              isReconciling = false;
-              traverseToRootForPatching();
-            }
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  protected void traverseToRootForPatching()
-  {
-    if (!isReconciling)
-    {
-      WSDLElementImpl container = (WSDLElementImpl)getContainer();
-      if (container != null)
-      {
-        container.traverseToRootForPatching();
-      }
-    }
-  }
-
-  protected void reconcile(Element changedElement)
-  {
-    reconcileAttributes(changedElement);
-    reconcileContents(changedElement);
-  }
-
-  protected void reconcileAttributes(Element changedElement)
-  {
-  }
-
-  protected void reconcileContents(Element changedElement)
-  {
-    List remainingModelObjects = new ArrayList(getWSDLContents());
-
-    Collection contentNodes = getContentNodes(changedElement);
-
-    Element theDocumentationElement = null;
-    
-    // for each applicable child node of changedElement
-    LOOP : for (Iterator i = contentNodes.iterator(); i.hasNext();)
-    {
-      Element child = (Element) i.next();
-      // Set Documentation element if exists
-      if (WSDLConstants.DOCUMENTATION_ELEMENT_TAG.equals(child.getLocalName()) &&
-          WSDLConstants.isMatchingNamespace(child.getNamespaceURI(), WSDLConstants.WSDL_NAMESPACE_URI))
-      {
-        // assume the first 'documentation' element is 'the' documentation element
-        // 'there can be only one!'
-        if (theDocumentationElement == null)
-        {  
-          theDocumentationElement = child;
-        }   
-      } 
-      // go thru the model objects to collect matching object for reuse
-      for (Iterator contents = remainingModelObjects.iterator(); contents.hasNext();)
-      {
-        Object modelObject = (Object) contents.next();
-        if (((WSDLElement) modelObject).getElement() == child)
-        {
-          contents.remove(); // removes the 'child' Node from the remainingModelObjects list
-          continue LOOP;
-        }
-      }
-
-      // if the documentation element has changed... update it
-      //
-      if (theDocumentationElement != getDocumentationElement())
-      {
-        setDocumentationElement(theDocumentationElement);  
-      }  
-      
-      // we haven't found a matching model object for the Node, se we may need to
-      // create a new model object
-      handleUnreconciledElement(child, remainingModelObjects);
-    }
-
-    // now we can remove the remaining model objects
-    handleReconciliation(remainingModelObjects);
-
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Definition getEnclosingDefinition()
-  {
-    if (enclosingDefinition != null)
-      return enclosingDefinition;
-
-    // TBD - Revisit
-    //EObject c = eContaier(); c != null; c = c.eContainter())
-    //{
-
-    for (WSDLElement container = this; container != null; container = ((WSDLElementImpl) container).getContainer())
-    {
-      if (container instanceof Definition)
-      {
-        enclosingDefinition = (Definition) container;
-        return enclosingDefinition;
-      }
-    }
-
-    return null;
-  }
-
-  /*
-  public Definition getRootEnclosingDefinition()
-  {
-    if (enclosingDefinition == null)
-     {
-      Resource resource = eResource();
-      List contents = resource.getContents();
-      if (contents.size() == 1 
-          && contents.get(0) instanceof Definition)
-        enclosingDefinition = (Definition)contents.get(0);
-    } 
-    return enclosingDefinition;
-  }
-  */
-
-  public WSDLElement getContainer()
-  {
-    return eContainer() instanceof WSDLElement ? (WSDLElement) eContainer() : null;
-  }
-
-  protected void niceSetAttribute(Element element, String attribute, String value)
-  {
-    if (isReconciling)
-    {
-      //System.out.println("**** cyclic dom attribute writeback avoided " + eClass().getName());
-      return;
-    }
-
-    if (value == null)
-    {
-      if (element.hasAttributeNS(null, attribute))
-      {
-        updatingDOM = true;
-        element.removeAttribute(attribute);
-        updatingDOM = false;
-      }
-    }
-    else if (!element.hasAttributeNS(null, attribute) || !element.getAttributeNS(null, attribute).equals(value))
-    {
-      updatingDOM = true;
-      element.setAttributeNS(null, attribute, value);
-      updatingDOM = false;
-    }
-  }
-
-  protected String niceCreateNamespaceAttribute(String namespace)
-  {
-    // Create and return a unique prefix for "namespace."
-    return null;
-  }
-
-  protected void niceSetAttributeURIValue(Element element, String attribute, String uriList)
-  {
-    if (isReconciling)
-    {
-      // System.out.println("**** cyclic dom attribute writeback avoided " + eClass().getName());
-      return;
-    }
-
-    if (uriList == null)
-    {
-      updatingDOM = true;
-      element.removeAttribute(attribute);
-      updatingDOM = false;
-    }
-    else
-    {
-      StringBuffer value = new StringBuffer();
-      for (StringTokenizer stringTokenizer = new StringTokenizer(uriList, " "); stringTokenizer.hasMoreElements();)
-      {
-        String uri = stringTokenizer.nextToken();
-        String namespace = null;
-        String localName = uri;
-        int index = uri.lastIndexOf("#");
-        if (index != -1)
-        {
-          if (index > 0)
-          {
-            namespace = uri.substring(0, index);
-          }
-          localName = uri.substring(index + 1);
-        }
-        String qualifier = XSDConstants.lookupQualifier(element, namespace);
-        if (qualifier == null)
-        {
-          qualifier = niceCreateNamespaceAttribute(namespace);
-        }
-
-        String qName = qualifier == null || qualifier.length() == 0 ? localName : qualifier + ":" + localName;
-
-        if (value.length() != 0)
-        {
-          value.append(' ');
-        }
-        value.append(qName);
-      }
-
-      if (!element.hasAttributeNS(null, attribute) || !element.getAttributeNS(null, attribute).equals(value.toString()))
-      {
-        updatingDOM = true;
-        element.setAttributeNS(null, attribute, value.toString());
-        updatingDOM = false;
-      }
-    }
-  }
-
-  protected void changeReference(EReference eReference)
-  {
-  }
-
-  protected Element createElement() // Should I make this abstract?
-  {
-    return null;
-  }
-
-  protected final Element createElement(int nodeType)
-  {
-    Definition definition = null;
-    if (this instanceof Definition)
-      definition = (Definition) this;
-    else
-      definition = getEnclosingDefinition();
-
-    if (definition == null)
-      return null;
-
-    Document document = definition.getDocument();
-    if (document == null)
-      document = ((DefinitionImpl) definition).updateDocument();
-
-    // Retrieve the namespace prefix for the WSDL namespace
-    String wsdlNamespace = WSDLConstants.WSDL_NAMESPACE_URI;
-    String qualifier = definition.getPrefix(wsdlNamespace);
-
-    Element newElement = document.createElementNS(wsdlNamespace, (qualifier == null ? "" : qualifier + ":") + WSDLConstants.ELEMENT_TAGS[nodeType]);
-
-    if (document.getDocumentElement() == null)
-      document.appendChild(newElement);
-
-    if (getDocumentationElement() != null)
-      newElement.appendChild(document.importNode(getDocumentationElement(), true));
-
-    return newElement;
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    if (deep)
-    {
-      for (Iterator contents = getWSDLContents().iterator(); contents.hasNext();)
-      {
-        Object content = contents.next();
-        if (content instanceof WSDLElementImpl)
-        {
-          WSDLElementImpl element = (WSDLElementImpl) content;
-          element.isReconciling = true;
-          element.reconcileReferences(true);
-          element.isReconciling = false;
-        }
-      }
-    }
-  }
-  
-  public WSDLElement getBestWSDLElement(List elementPath)
-  {
-    WSDLElement result = this;
-    for (Iterator components = getWSDLContents().iterator(); components.hasNext(); )
-    {
-      WSDLElementImpl childWSDLElement = (WSDLElementImpl)components.next();
-      if (elementPath.contains(childWSDLElement.getElement()))
-      {
-        result = childWSDLElement;
-        WSDLElement betterWSDLElement = childWSDLElement.getBestWSDLElement(elementPath);
-        if (betterWSDLElement != null)
-        {
-          result = betterWSDLElement;
-        }
-
-        if (!considerAllContainsForBestWSDLElement())
-        {
-          break;
-        }
-      }
-    }
-
-    return result;
-  }
-
-  protected boolean considerAllContainsForBestWSDLElement()
-  {
-    return false;
-  }
-  
-    public void elementAttributesChanged(Element changedElement)
-  {
-    if (!isUpdatingDOM())
-    {
-      if (!isReconciling)
-      {
-        // System.out.println("**** changeFor " + eClass().getName());
-    
-        isReconciling = true;
-        reconcileAttributes(changedElement);
-
-        WSDLElementImpl theContainer = (WSDLElementImpl)getContainer();
-        if (theContainer != null && theContainer.getElement() == changedElement)
-        {
-          theContainer.elementAttributesChanged(changedElement);
-        }
-
-        isReconciling = false;
-        traverseToRootForPatching();
-      }
-      else
-      {
-        // System.out.println("**** cyclic internal reconcile avoided " + eClass().getName());
-      }
-    }
-    else
-    {
-      // System.out.println("**** cyclic DOM reconcile avoided " + eClass().getName());
-    }
-  }
-
-  public void elementContentsChanged(Element changedElement)
-  {
-    if (!isUpdatingDOM())
-    {
-      if (!isReconciling)
-      {
-        // System.out.println("**** changeFor " + eClass().getName());
-    
-        isReconciling = true;
-        reconcileContents(changedElement);
-
-        WSDLElementImpl theContainer = (WSDLElementImpl)getContainer();
-        if (theContainer != null && theContainer.getElement() == changedElement)
-        {
-          theContainer.elementContentsChanged(changedElement);
-        }
-
-        isReconciling = false;
-        traverseToRootForPatching();
-      }
-      else
-      {
-        // System.out.println("**** cyclic internal reconcile avoided " + eClass().getName());
-      }
-    }
-    else
-    {
-      // System.out.println("**** cyclic DOM reconcile avoided " + eClass().getName());
-    }
-  }
-  
-  protected void updatePrefix(Node node, String namespace, String oldPrefix, String newPrefix)
-  {
-    if ((namespace == null ? node.getNamespaceURI() == null : namespace.equals(node.getNamespaceURI())) &&
-          (oldPrefix == null ? node.getPrefix() == null : oldPrefix.equals(node.getPrefix())))
-    {
-      node.setPrefix(newPrefix);
-    }
-
-    for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling())
-    {
-      updatePrefix(child, namespace, oldPrefix, newPrefix);
-    }
-  } 
-
-  protected String getNamespace(Element element)
-  {
-    String name = element.getTagName();
-    int index = name.indexOf(":");
-    if (index == -1)
-      return null;
-    else if (getEnclosingDefinition() != null)
-      return getEnclosingDefinition().getNamespace(name.substring(0,index));
-    else
-      return null;
-  }
-  
-  protected String getLocalName(Element element)
-  {
-    String name = element.getTagName();
-    int index = name.indexOf(":");
-    if ( index == -1)
-      return name;
-    else
-      return name.substring(index+1);
-  }
-
-} //WSDLElementImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java
deleted file mode 100644
index c6cdfd3..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java
+++ /dev/null

@@ -1,523 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import javax.wsdl.OperationType;
-import javax.wsdl.WSDLException;
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WSDLFactoryImpl extends EFactoryImpl implements WSDLFactory
-{
-  /**
-   * Creates and instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case WSDLPackage.PORT_TYPE: return createPortType();
-      case WSDLPackage.OPERATION: return createOperation();
-      case WSDLPackage.MESSAGE: return createMessage();
-      case WSDLPackage.PART: return createPart();
-      case WSDLPackage.BINDING: return createBinding();
-      case WSDLPackage.BINDING_OPERATION: return createBindingOperation();
-      case WSDLPackage.SERVICE: return createService();
-      case WSDLPackage.PORT: return createPort();
-      case WSDLPackage.EXTENSIBILITY_ELEMENT: return createExtensibilityElement();
-      case WSDLPackage.DEFINITION: return createDefinition();
-      case WSDLPackage.IMPORT: return createImport();
-      case WSDLPackage.INPUT: return createInput();
-      case WSDLPackage.OUTPUT: return createOutput();
-      case WSDLPackage.FAULT: return createFault();
-      case WSDLPackage.BINDING_INPUT: return createBindingInput();
-      case WSDLPackage.BINDING_OUTPUT: return createBindingOutput();
-      case WSDLPackage.BINDING_FAULT: return createBindingFault();
-      case WSDLPackage.NAMESPACE: return createNamespace();
-      case WSDLPackage.TYPES: return createTypes();
-      case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT: return createUnknownExtensibilityElement();
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT: return createXSDSchemaExtensibilityElement();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object createFromString(EDataType eDataType, String initialValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      case WSDLPackage.QNAME:
-        return createQNameFromString(eDataType, initialValue);
-      case WSDLPackage.OPERATION_TYPE:
-        return createOperationTypeFromString(eDataType, initialValue);
-      case WSDLPackage.DOM_ELEMENT:
-        return createDOMElementFromString(eDataType, initialValue);
-      case WSDLPackage.WSDL_EXCEPTION:
-        return createWSDLExceptionFromString(eDataType, initialValue);
-      case WSDLPackage.DOM_DOCUMENT:
-        return createDOMDocumentFromString(eDataType, initialValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertToString(EDataType eDataType, Object instanceValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      case WSDLPackage.QNAME:
-        return convertQNameToString(eDataType, instanceValue);
-      case WSDLPackage.OPERATION_TYPE:
-        return convertOperationTypeToString(eDataType, instanceValue);
-      case WSDLPackage.DOM_ELEMENT:
-        return convertDOMElementToString(eDataType, instanceValue);
-      case WSDLPackage.WSDL_EXCEPTION:
-        return convertWSDLExceptionToString(eDataType, instanceValue);
-      case WSDLPackage.DOM_DOCUMENT:
-        return convertDOMDocumentToString(eDataType, instanceValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public PortType createPortType()
-  {
-    PortTypeImpl portType = new PortTypeImpl();
-    return portType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Operation createOperation()
-  {
-    OperationImpl operation = new OperationImpl();
-    return operation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message createMessage()
-  {
-    MessageImpl message = new MessageImpl();
-    return message;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Part createPart()
-  {
-    PartImpl part = new PartImpl();
-    return part;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Binding createBinding()
-  {
-    BindingImpl binding = new BindingImpl();
-    return binding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingOperation createBindingOperation()
-  {
-    BindingOperationImpl bindingOperation = new BindingOperationImpl();
-    return bindingOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Service createService()
-  {
-    ServiceImpl service = new ServiceImpl();
-    return service;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Port createPort()
-  {
-    PortImpl port = new PortImpl();
-    return port;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ExtensibilityElement createExtensibilityElement()
-  {
-    ExtensibilityElementImpl extensibilityElement = new ExtensibilityElementImpl();
-    return extensibilityElement;
-  }   
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Definition createDefinition()
-  {
-    DefinitionImpl definition = new DefinitionImpl();
-    return definition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Import createImport()
-  {
-    ImportImpl import_ = new ImportImpl();
-    return import_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Input createInput()
-  {
-    InputImpl input = new InputImpl();
-    return input;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Output createOutput()
-  {
-    OutputImpl output = new OutputImpl();
-    return output;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Fault createFault()
-  {
-    FaultImpl fault = new FaultImpl();
-    return fault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingInput createBindingInput()
-  {
-    BindingInputImpl bindingInput = new BindingInputImpl();
-    return bindingInput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingOutput createBindingOutput()
-  {
-    BindingOutputImpl bindingOutput = new BindingOutputImpl();
-    return bindingOutput;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BindingFault createBindingFault()
-  {
-    BindingFaultImpl bindingFault = new BindingFaultImpl();
-    return bindingFault;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Namespace createNamespace()
-  {
-    NamespaceImpl namespace = new NamespaceImpl();
-    return namespace;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Types createTypes()
-  {
-    TypesImpl types = new TypesImpl();
-    return types;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public UnknownExtensibilityElement createUnknownExtensibilityElement()
-  {
-    UnknownExtensibilityElementImpl unknownExtensibilityElement = new UnknownExtensibilityElementImpl();
-    return unknownExtensibilityElement;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDSchemaExtensibilityElement createXSDSchemaExtensibilityElement()
-  {
-    XSDSchemaExtensibilityElementImpl xsdSchemaExtensibilityElement = new XSDSchemaExtensibilityElementImpl();
-    return xsdSchemaExtensibilityElement;
-  }
-  
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName createQNameFromString(EDataType eDataType, String initialValue)
-  {
-    return (QName)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertQNameToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public OperationType createOperationTypeFromString(EDataType eDataType, String initialValue)
-  {
-    return (OperationType)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertOperationTypeToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Element createDOMElementFromString(EDataType eDataType, String initialValue)
-  {
-    return (Element)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertDOMElementToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLException createWSDLExceptionFromString(EDataType eDataType, String initialValue)
-  {
-    return (WSDLException)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertWSDLExceptionToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Document createDOMDocumentFromString(EDataType eDataType, String initialValue)
-  {
-    return (Document)super.createFromString(eDataType, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertDOMDocumentToString(EDataType eDataType, Object instanceValue)
-  {
-    return super.convertToString(eDataType, instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLPackage getWSDLPackage()
-  {
-    return (WSDLPackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  public static WSDLPackage getPackage()
-  {
-    return WSDLPackage.eINSTANCE;
-  }
-  
-  //
-  //
-  //
-  public ExtensibilityElement createExtensibilityElement(String namespace, String localName)
-  {
-    ExtensibilityElementFactory factory = WSDLPlugin.INSTANCE.getExtensibilityElementFactory(namespace);
-    if (factory != null)
-      return factory.createExtensibilityElement(namespace, localName);
-    else
-      return createUnknownExtensibilityElement();
-  }
-  
-  /*
-  public void setAlwaysUseUnknownExtensibilityElement(boolean value)
-  {
-    System.out.println("Deprecated: WSDLFactoryImpl.setUseExtensionFactories");
-  }
-  */
-} //WSDLFactoryImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java
deleted file mode 100644
index 2b3111b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java
+++ /dev/null

@@ -1,2506 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.OperationType;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WSDLPackageImpl extends EPackageImpl implements WSDLPackage
-{
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass wsdlElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass portTypeEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass operationEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass messageEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass partEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass bindingEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass bindingOperationEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass serviceEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass portEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass extensibilityElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass definitionEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass importEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass extensibleElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass inputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass outputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass faultEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass bindingInputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass bindingOutputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass bindingFaultEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass namespaceEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iPortTypeEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iOperationEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iInputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iOutputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iFaultEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iMessageEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iPartEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iServiceEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iPortEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iBindingEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iBindingOperationEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iBindingInputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iBindingOutputEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iBindingFaultEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iExtensibilityElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iDefinitionEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iImportEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iListEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iMapEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iurlEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iExtensionRegistryEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass typesEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iIteratorEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass iTypesEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass unknownExtensibilityElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass xsdSchemaExtensibilityElementEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass messageReferenceEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType qNameEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType operationTypeEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType domElementEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType wsdlExceptionEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType domDocumentEDataType = 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.eclipse.wst.wsdl.WSDLPackage#eNS_URI
-     * @see #init()
-     * @generated
-     */
-    private WSDLPackageImpl()
-    {
-        super(eNS_URI, WSDLFactory.eINSTANCE);
-    }
-
-    /**
-     * <!-- 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 WSDLPackage init()
-    {
-        if (isInited) return (WSDLPackage)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-
-        // Obtain or create and register package
-        WSDLPackageImpl theWSDLPackage = (WSDLPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof WSDLPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new WSDLPackageImpl());
-
-        isInited = true;
-
-        // Initialize simple dependencies
-        XSDPackageImpl.init();
-
-        // Create package meta-data objects
-        theWSDLPackage.createPackageContents();
-
-        theWSDLPackage.initializePackageContents();
-
-        // Mark meta-data to indicate it can't be changed
-        theWSDLPackage.freeze();
-
-        return theWSDLPackage;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getWSDLElement()
-    {
-        return wsdlElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDLElement_DocumentationElement()
-    {
-        return (EAttribute) wsdlElementEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDLElement_Element()
-    {
-        return (EAttribute) wsdlElementEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getPortType()
-    {
-        return portTypeEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPortType_QName()
-    {
-        return (EAttribute) portTypeEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPortType_Undefined()
-    {
-        return (EAttribute) portTypeEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPortType_Proxy()
-    {
-        return (EAttribute) portTypeEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPortType_ResourceURI()
-    {
-        return (EAttribute) portTypeEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getPortType_EOperations()
-    {
-        return (EReference) portTypeEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getOperation()
-    {
-        return operationEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getOperation_Style()
-    {
-        return (EAttribute) operationEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getOperation_Name()
-    {
-        return (EAttribute) operationEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getOperation_Undefined()
-    {
-        return (EAttribute) operationEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getOperation_Proxy()
-    {
-        return (EAttribute) operationEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getOperation_ResourceURI()
-    {
-        return (EAttribute) operationEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getOperation_EInput()
-    {
-        return (EReference) operationEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getOperation_EOutput()
-    {
-        return (EReference) operationEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getOperation_EFaults()
-    {
-        return (EReference) operationEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getOperation_EParameterOrdering()
-    {
-        return (EReference) operationEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getMessage()
-    {
-        return messageEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getMessage_QName()
-    {
-        return (EAttribute) messageEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getMessage_Undefined()
-    {
-        return (EAttribute) messageEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getMessage_Proxy()
-    {
-        return (EAttribute) messageEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getMessage_ResourceURI()
-    {
-        return (EAttribute) messageEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getMessage_EParts()
-    {
-        return (EReference) messageEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getPart()
-    {
-        return partEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPart_Name()
-    {
-        return (EAttribute) partEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPart_ElementName()
-    {
-        return (EAttribute) partEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPart_TypeName()
-    {
-        return (EAttribute) partEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getPart_TypeDefinition()
-    {
-        return (EReference) partEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getPart_ElementDeclaration()
-    {
-        return (EReference) partEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getPart_EMessage()
-    {
-        return (EReference) partEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getBinding()
-    {
-        return bindingEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBinding_QName()
-    {
-        return (EAttribute) bindingEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBinding_Undefined()
-    {
-        return (EAttribute) bindingEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBinding_Proxy()
-    {
-        return (EAttribute) bindingEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBinding_ResourceURI()
-    {
-        return (EAttribute) bindingEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBinding_EPortType()
-    {
-        return (EReference) bindingEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBinding_EBindingOperations()
-    {
-        return (EReference) bindingEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getBindingOperation()
-    {
-        return bindingOperationEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBindingOperation_Name()
-    {
-        return (EAttribute) bindingOperationEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingOperation_EOperation()
-    {
-        return (EReference) bindingOperationEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingOperation_EBindingInput()
-    {
-        return (EReference) bindingOperationEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingOperation_EBindingOutput()
-    {
-        return (EReference) bindingOperationEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingOperation_EBindingFaults()
-    {
-        return (EReference) bindingOperationEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getService()
-    {
-        return serviceEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getService_QName()
-    {
-        return (EAttribute) serviceEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getService_Undefined()
-    {
-        return (EAttribute) serviceEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getService_Proxy()
-    {
-        return (EAttribute) serviceEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getService_ResourceURI()
-    {
-        return (EAttribute) serviceEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getService_EPorts()
-    {
-        return (EReference) serviceEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getPort()
-    {
-        return portEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getPort_Name()
-    {
-        return (EAttribute) portEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getPort_EBinding()
-    {
-        return (EReference) portEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getExtensibilityElement()
-    {
-        return extensibilityElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getExtensibilityElement_Required()
-    {
-        return (EAttribute) extensibilityElementEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getExtensibilityElement_ElementType()
-    {
-        return (EAttribute) extensibilityElementEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getDefinition()
-    {
-        return definitionEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getDefinition_TargetNamespace()
-    {
-        return (EAttribute) definitionEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getDefinition_Location()
-    {
-        return (EAttribute) definitionEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getDefinition_QName()
-    {
-        return (EAttribute) definitionEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getDefinition_Encoding()
-    {
-        return (EAttribute) definitionEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_EMessages()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_EPortTypes()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_EBindings()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_EServices()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_ENamespaces()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_ETypes()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(9);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getDefinition_EImports()
-    {
-        return (EReference) definitionEClass.getEStructuralFeatures().get(10);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getImport()
-    {
-        return importEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getImport_NamespaceURI()
-    {
-        return (EAttribute) importEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getImport_LocationURI()
-    {
-        return (EAttribute) importEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getImport_EDefinition()
-    {
-        return (EReference) importEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getImport_ESchema()
-    {
-        return (EReference) importEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getExtensibleElement()
-    {
-        return extensibleElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getExtensibleElement_EExtensibilityElements()
-    {
-        return (EReference) extensibleElementEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getInput()
-    {
-        return inputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getOutput()
-    {
-        return outputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getFault()
-    {
-        return faultEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getBindingInput()
-    {
-        return bindingInputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBindingInput_Name()
-    {
-        return (EAttribute) bindingInputEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingInput_EInput()
-    {
-        return (EReference) bindingInputEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getBindingOutput()
-    {
-        return bindingOutputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBindingOutput_Name()
-    {
-        return (EAttribute) bindingOutputEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingOutput_EOutput()
-    {
-        return (EReference) bindingOutputEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getBindingFault()
-    {
-        return bindingFaultEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getBindingFault_Name()
-    {
-        return (EAttribute) bindingFaultEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getBindingFault_EFault()
-    {
-        return (EReference) bindingFaultEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getNamespace()
-    {
-        return namespaceEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getNamespace_URI()
-    {
-        return (EAttribute) namespaceEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getNamespace_Prefix()
-    {
-        return (EAttribute) namespaceEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIPortType()
-    {
-        return iPortTypeEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIOperation()
-    {
-        return iOperationEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIInput()
-    {
-        return iInputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIOutput()
-    {
-        return iOutputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIFault()
-    {
-        return iFaultEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIMessage()
-    {
-        return iMessageEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIPart()
-    {
-        return iPartEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIService()
-    {
-        return iServiceEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIPort()
-    {
-        return iPortEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIBinding()
-    {
-        return iBindingEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIBindingOperation()
-    {
-        return iBindingOperationEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIBindingInput()
-    {
-        return iBindingInputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIBindingOutput()
-    {
-        return iBindingOutputEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIBindingFault()
-    {
-        return iBindingFaultEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIExtensibilityElement()
-    {
-        return iExtensibilityElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIDefinition()
-    {
-        return iDefinitionEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIImport()
-    {
-        return iImportEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIList()
-    {
-        return iListEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIMap()
-    {
-        return iMapEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIURL()
-    {
-        return iurlEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIExtensionRegistry()
-    {
-        return iExtensionRegistryEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getTypes()
-    {
-        return typesEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getIIterator()
-    {
-        return iIteratorEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getITypes()
-    {
-        return iTypesEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getUnknownExtensibilityElement()
-    {
-        return unknownExtensibilityElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getUnknownExtensibilityElement_Children()
-    {
-        return (EReference) unknownExtensibilityElementEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getXSDSchemaExtensibilityElement()
-    {
-        return xsdSchemaExtensibilityElementEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getXSDSchemaExtensibilityElement_Schema()
-    {
-        return (EReference) xsdSchemaExtensibilityElementEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getMessageReference()
-    {
-        return messageReferenceEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getMessageReference_Name()
-    {
-        return (EAttribute) messageReferenceEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EReference getMessageReference_EMessage()
-    {
-        return (EReference) messageReferenceEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getQName()
-    {
-        return qNameEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getOperationType()
-    {
-        return operationTypeEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getDOMElement()
-    {
-        return domElementEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getWSDLException()
-    {
-        return wsdlExceptionEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getDOMDocument()
-    {
-        return domDocumentEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public WSDLFactory getWSDLFactory()
-    {
-        return (WSDLFactory) 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
-        wsdlElementEClass = createEClass(WSDL_ELEMENT);
-        createEAttribute(wsdlElementEClass, WSDL_ELEMENT__DOCUMENTATION_ELEMENT);
-        createEAttribute(wsdlElementEClass, WSDL_ELEMENT__ELEMENT);
-
-        portTypeEClass = createEClass(PORT_TYPE);
-        createEAttribute(portTypeEClass, PORT_TYPE__QNAME);
-        createEAttribute(portTypeEClass, PORT_TYPE__UNDEFINED);
-        createEAttribute(portTypeEClass, PORT_TYPE__PROXY);
-        createEAttribute(portTypeEClass, PORT_TYPE__RESOURCE_URI);
-        createEReference(portTypeEClass, PORT_TYPE__EOPERATIONS);
-
-        operationEClass = createEClass(OPERATION);
-        createEAttribute(operationEClass, OPERATION__STYLE);
-        createEAttribute(operationEClass, OPERATION__NAME);
-        createEAttribute(operationEClass, OPERATION__UNDEFINED);
-        createEAttribute(operationEClass, OPERATION__PROXY);
-        createEAttribute(operationEClass, OPERATION__RESOURCE_URI);
-        createEReference(operationEClass, OPERATION__EINPUT);
-        createEReference(operationEClass, OPERATION__EOUTPUT);
-        createEReference(operationEClass, OPERATION__EFAULTS);
-        createEReference(operationEClass, OPERATION__EPARAMETER_ORDERING);
-
-        messageEClass = createEClass(MESSAGE);
-        createEAttribute(messageEClass, MESSAGE__QNAME);
-        createEAttribute(messageEClass, MESSAGE__UNDEFINED);
-        createEAttribute(messageEClass, MESSAGE__PROXY);
-        createEAttribute(messageEClass, MESSAGE__RESOURCE_URI);
-        createEReference(messageEClass, MESSAGE__EPARTS);
-
-        partEClass = createEClass(PART);
-        createEAttribute(partEClass, PART__NAME);
-        createEAttribute(partEClass, PART__ELEMENT_NAME);
-        createEAttribute(partEClass, PART__TYPE_NAME);
-        createEReference(partEClass, PART__TYPE_DEFINITION);
-        createEReference(partEClass, PART__ELEMENT_DECLARATION);
-        createEReference(partEClass, PART__EMESSAGE);
-
-        bindingEClass = createEClass(BINDING);
-        createEAttribute(bindingEClass, BINDING__QNAME);
-        createEAttribute(bindingEClass, BINDING__UNDEFINED);
-        createEAttribute(bindingEClass, BINDING__PROXY);
-        createEAttribute(bindingEClass, BINDING__RESOURCE_URI);
-        createEReference(bindingEClass, BINDING__EPORT_TYPE);
-        createEReference(bindingEClass, BINDING__EBINDING_OPERATIONS);
-
-        bindingOperationEClass = createEClass(BINDING_OPERATION);
-        createEAttribute(bindingOperationEClass, BINDING_OPERATION__NAME);
-        createEReference(bindingOperationEClass, BINDING_OPERATION__EOPERATION);
-        createEReference(bindingOperationEClass, BINDING_OPERATION__EBINDING_INPUT);
-        createEReference(bindingOperationEClass, BINDING_OPERATION__EBINDING_OUTPUT);
-        createEReference(bindingOperationEClass, BINDING_OPERATION__EBINDING_FAULTS);
-
-        serviceEClass = createEClass(SERVICE);
-        createEAttribute(serviceEClass, SERVICE__QNAME);
-        createEAttribute(serviceEClass, SERVICE__UNDEFINED);
-        createEAttribute(serviceEClass, SERVICE__PROXY);
-        createEAttribute(serviceEClass, SERVICE__RESOURCE_URI);
-        createEReference(serviceEClass, SERVICE__EPORTS);
-
-        portEClass = createEClass(PORT);
-        createEAttribute(portEClass, PORT__NAME);
-        createEReference(portEClass, PORT__EBINDING);
-
-        extensibilityElementEClass = createEClass(EXTENSIBILITY_ELEMENT);
-        createEAttribute(extensibilityElementEClass, EXTENSIBILITY_ELEMENT__REQUIRED);
-        createEAttribute(extensibilityElementEClass, EXTENSIBILITY_ELEMENT__ELEMENT_TYPE);
-
-        definitionEClass = createEClass(DEFINITION);
-        createEAttribute(definitionEClass, DEFINITION__TARGET_NAMESPACE);
-        createEAttribute(definitionEClass, DEFINITION__LOCATION);
-        createEAttribute(definitionEClass, DEFINITION__QNAME);
-        createEAttribute(definitionEClass, DEFINITION__ENCODING);
-        createEReference(definitionEClass, DEFINITION__EMESSAGES);
-        createEReference(definitionEClass, DEFINITION__EPORT_TYPES);
-        createEReference(definitionEClass, DEFINITION__EBINDINGS);
-        createEReference(definitionEClass, DEFINITION__ESERVICES);
-        createEReference(definitionEClass, DEFINITION__ENAMESPACES);
-        createEReference(definitionEClass, DEFINITION__ETYPES);
-        createEReference(definitionEClass, DEFINITION__EIMPORTS);
-
-        importEClass = createEClass(IMPORT);
-        createEAttribute(importEClass, IMPORT__NAMESPACE_URI);
-        createEAttribute(importEClass, IMPORT__LOCATION_URI);
-        createEReference(importEClass, IMPORT__EDEFINITION);
-        createEReference(importEClass, IMPORT__ESCHEMA);
-
-        extensibleElementEClass = createEClass(EXTENSIBLE_ELEMENT);
-        createEReference(extensibleElementEClass, EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS);
-
-        inputEClass = createEClass(INPUT);
-
-        outputEClass = createEClass(OUTPUT);
-
-        faultEClass = createEClass(FAULT);
-
-        bindingInputEClass = createEClass(BINDING_INPUT);
-        createEAttribute(bindingInputEClass, BINDING_INPUT__NAME);
-        createEReference(bindingInputEClass, BINDING_INPUT__EINPUT);
-
-        bindingOutputEClass = createEClass(BINDING_OUTPUT);
-        createEAttribute(bindingOutputEClass, BINDING_OUTPUT__NAME);
-        createEReference(bindingOutputEClass, BINDING_OUTPUT__EOUTPUT);
-
-        bindingFaultEClass = createEClass(BINDING_FAULT);
-        createEAttribute(bindingFaultEClass, BINDING_FAULT__NAME);
-        createEReference(bindingFaultEClass, BINDING_FAULT__EFAULT);
-
-        namespaceEClass = createEClass(NAMESPACE);
-        createEAttribute(namespaceEClass, NAMESPACE__URI);
-        createEAttribute(namespaceEClass, NAMESPACE__PREFIX);
-
-        iPortTypeEClass = createEClass(IPORT_TYPE);
-
-        iOperationEClass = createEClass(IOPERATION);
-
-        iInputEClass = createEClass(IINPUT);
-
-        iOutputEClass = createEClass(IOUTPUT);
-
-        iFaultEClass = createEClass(IFAULT);
-
-        iMessageEClass = createEClass(IMESSAGE);
-
-        iPartEClass = createEClass(IPART);
-
-        iServiceEClass = createEClass(ISERVICE);
-
-        iPortEClass = createEClass(IPORT);
-
-        iBindingEClass = createEClass(IBINDING);
-
-        iBindingOperationEClass = createEClass(IBINDING_OPERATION);
-
-        iBindingInputEClass = createEClass(IBINDING_INPUT);
-
-        iBindingOutputEClass = createEClass(IBINDING_OUTPUT);
-
-        iBindingFaultEClass = createEClass(IBINDING_FAULT);
-
-        iExtensibilityElementEClass = createEClass(IEXTENSIBILITY_ELEMENT);
-
-        iDefinitionEClass = createEClass(IDEFINITION);
-
-        iImportEClass = createEClass(IIMPORT);
-
-        iListEClass = createEClass(ILIST);
-
-        iMapEClass = createEClass(IMAP);
-
-        iurlEClass = createEClass(IURL);
-
-        iExtensionRegistryEClass = createEClass(IEXTENSION_REGISTRY);
-
-        typesEClass = createEClass(TYPES);
-
-        iIteratorEClass = createEClass(IITERATOR);
-
-        iTypesEClass = createEClass(ITYPES);
-
-        unknownExtensibilityElementEClass = createEClass(UNKNOWN_EXTENSIBILITY_ELEMENT);
-        createEReference(unknownExtensibilityElementEClass, UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN);
-
-        xsdSchemaExtensibilityElementEClass = createEClass(XSD_SCHEMA_EXTENSIBILITY_ELEMENT);
-        createEReference(xsdSchemaExtensibilityElementEClass, XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA);
-
-        messageReferenceEClass = createEClass(MESSAGE_REFERENCE);
-        createEAttribute(messageReferenceEClass, MESSAGE_REFERENCE__NAME);
-        createEReference(messageReferenceEClass, MESSAGE_REFERENCE__EMESSAGE);
-
-        // Create data types
-        qNameEDataType = createEDataType(QNAME);
-        operationTypeEDataType = createEDataType(OPERATION_TYPE);
-        domElementEDataType = createEDataType(DOM_ELEMENT);
-        wsdlExceptionEDataType = createEDataType(WSDL_EXCEPTION);
-        domDocumentEDataType = createEDataType(DOM_DOCUMENT);
-    }
-
-    /**
-     * <!-- 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
-        XSDPackageImpl theXSDPackage = (XSDPackageImpl) EPackage.Registry.INSTANCE.getEPackage(XSDPackage.eNS_URI);
-
-        // Add supertypes to classes
-        portTypeEClass.getESuperTypes().add(this.getWSDLElement());
-        portTypeEClass.getESuperTypes().add(this.getIPortType());
-        operationEClass.getESuperTypes().add(this.getWSDLElement());
-        operationEClass.getESuperTypes().add(this.getIOperation());
-        messageEClass.getESuperTypes().add(this.getWSDLElement());
-        messageEClass.getESuperTypes().add(this.getIMessage());
-        partEClass.getESuperTypes().add(this.getWSDLElement());
-        partEClass.getESuperTypes().add(this.getIPart());
-        bindingEClass.getESuperTypes().add(this.getExtensibleElement());
-        bindingEClass.getESuperTypes().add(this.getIBinding());
-        bindingOperationEClass.getESuperTypes().add(this.getExtensibleElement());
-        bindingOperationEClass.getESuperTypes().add(this.getIBindingOperation());
-        serviceEClass.getESuperTypes().add(this.getExtensibleElement());
-        serviceEClass.getESuperTypes().add(this.getIService());
-        portEClass.getESuperTypes().add(this.getExtensibleElement());
-        portEClass.getESuperTypes().add(this.getIPort());
-        extensibilityElementEClass.getESuperTypes().add(this.getWSDLElement());
-        extensibilityElementEClass.getESuperTypes().add(this.getIExtensibilityElement());
-        definitionEClass.getESuperTypes().add(this.getExtensibleElement());
-        definitionEClass.getESuperTypes().add(this.getIDefinition());
-        importEClass.getESuperTypes().add(this.getWSDLElement());
-        importEClass.getESuperTypes().add(this.getIImport());
-        extensibleElementEClass.getESuperTypes().add(this.getWSDLElement());
-        inputEClass.getESuperTypes().add(this.getMessageReference());
-        inputEClass.getESuperTypes().add(this.getWSDLElement());
-        inputEClass.getESuperTypes().add(this.getIInput());
-        outputEClass.getESuperTypes().add(this.getMessageReference());
-        outputEClass.getESuperTypes().add(this.getWSDLElement());
-        outputEClass.getESuperTypes().add(this.getIOutput());
-        faultEClass.getESuperTypes().add(this.getMessageReference());
-        faultEClass.getESuperTypes().add(this.getWSDLElement());
-        faultEClass.getESuperTypes().add(this.getIFault());
-        bindingInputEClass.getESuperTypes().add(this.getExtensibleElement());
-        bindingInputEClass.getESuperTypes().add(this.getIBindingInput());
-        bindingOutputEClass.getESuperTypes().add(this.getExtensibleElement());
-        bindingOutputEClass.getESuperTypes().add(this.getIBindingOutput());
-        bindingFaultEClass.getESuperTypes().add(this.getExtensibleElement());
-        bindingFaultEClass.getESuperTypes().add(this.getIBindingFault());
-        typesEClass.getESuperTypes().add(this.getExtensibleElement());
-        typesEClass.getESuperTypes().add(this.getITypes());
-        unknownExtensibilityElementEClass.getESuperTypes().add(this.getExtensibilityElement());
-        xsdSchemaExtensibilityElementEClass.getESuperTypes().add(this.getExtensibilityElement());
-        messageReferenceEClass.getESuperTypes().add(this.getWSDLElement());
-
-        // Initialize classes and features; add operations and parameters
-        initEClass(wsdlElementEClass, WSDLElement.class, "WSDLElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getWSDLElement_DocumentationElement(), this.getDOMElement(), "documentationElement", null, 0, 1, WSDLElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDLElement_Element(), this.getDOMElement(), "element", null, 0, 1, WSDLElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(wsdlElementEClass, this.getDefinition(), "getEnclosingDefinition");
-
-        EOperation op = addEOperation(wsdlElementEClass, null, "setEnclosingDefinition");
-        addEParameter(op, this.getDefinition(), "definition");
-
-        initEClass(portTypeEClass, PortType.class, "PortType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getPortType_QName(), this.getQName(), "qName", null, 0, 1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPortType_Undefined(), ecorePackage.getEBoolean(), "undefined", null, 0, 1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPortType_Proxy(), ecorePackage.getEBoolean(), "proxy", null, 0, 1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPortType_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 0, 1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPortType_EOperations(), this.getOperation(), null, "eOperations", null, 0, -1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(operationEClass, Operation.class, "Operation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getOperation_Style(), this.getOperationType(), "style", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_Name(), ecorePackage.getEString(), "name", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_Undefined(), ecorePackage.getEBoolean(), "undefined", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_Proxy(), ecorePackage.getEBoolean(), "proxy", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getOperation_EInput(), this.getInput(), null, "eInput", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getOperation_EOutput(), this.getOutput(), null, "eOutput", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getOperation_EFaults(), this.getFault(), null, "eFaults", null, 0, -1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getOperation_EParameterOrdering(), this.getPart(), null, "eParameterOrdering", null, 0, -1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(messageEClass, Message.class, "Message", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getMessage_QName(), this.getQName(), "qName", null, 0, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getMessage_Undefined(), ecorePackage.getEBoolean(), "undefined", null, 0, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getMessage_Proxy(), ecorePackage.getEBoolean(), "proxy", null, 0, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getMessage_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 0, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getMessage_EParts(), this.getPart(), null, "eParts", null, 0, -1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(partEClass, Part.class, "Part", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getPart_Name(), ecorePackage.getEString(), "name", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPart_ElementName(), this.getQName(), "elementName", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPart_TypeName(), this.getQName(), "typeName", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPart_TypeDefinition(), theXSDPackage.getXSDTypeDefinition(), null, "typeDefinition", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPart_ElementDeclaration(), theXSDPackage.getXSDElementDeclaration(), null, "elementDeclaration", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPart_EMessage(), this.getMessage(), null, "eMessage", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(bindingEClass, Binding.class, "Binding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBinding_QName(), this.getQName(), "qName", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getBinding_Undefined(), ecorePackage.getEBoolean(), "undefined", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getBinding_Proxy(), ecorePackage.getEBoolean(), "proxy", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getBinding_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBinding_EPortType(), this.getPortType(), null, "ePortType", null, 1, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBinding_EBindingOperations(), this.getBindingOperation(), null, "eBindingOperations", null, 0, -1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(bindingOperationEClass, BindingOperation.class, "BindingOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBindingOperation_Name(), ecorePackage.getEString(), "name", null, 0, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingOperation_EOperation(), this.getOperation(), null, "eOperation", null, 1, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingOperation_EBindingInput(), this.getBindingInput(), null, "eBindingInput", null, 0, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingOperation_EBindingOutput(), this.getBindingOutput(), null, "eBindingOutput", null, 0, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingOperation_EBindingFaults(), this.getBindingFault(), null, "eBindingFaults", null, 0, -1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getService_QName(), this.getQName(), "qName", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getService_Undefined(), ecorePackage.getEBoolean(), "undefined", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getService_Proxy(), ecorePackage.getEBoolean(), "proxy", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getService_ResourceURI(), ecorePackage.getEString(), "resourceURI", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getService_EPorts(), this.getPort(), null, "ePorts", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(portEClass, Port.class, "Port", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getPort_Name(), ecorePackage.getEString(), "name", null, 0, 1, Port.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPort_EBinding(), this.getBinding(), null, "eBinding", null, 1, 1, Port.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(extensibilityElementEClass, ExtensibilityElement.class, "ExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getExtensibilityElement_Required(), ecorePackage.getEBoolean(), "required", null, 0, 1, ExtensibilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getExtensibilityElement_ElementType(), this.getQName(), "elementType", null, 0, 1, ExtensibilityElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(definitionEClass, Definition.class, "Definition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDefinition_TargetNamespace(), ecorePackage.getEString(), "targetNamespace", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getDefinition_Location(), ecorePackage.getEString(), "location", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getDefinition_QName(), this.getQName(), "qName", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getDefinition_Encoding(), ecorePackage.getEString(), "encoding", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_EMessages(), this.getMessage(), null, "eMessages", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_EPortTypes(), this.getPortType(), null, "ePortTypes", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_EBindings(), this.getBinding(), null, "eBindings", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_EServices(), this.getService(), null, "eServices", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_ENamespaces(), this.getNamespace(), null, "eNamespaces", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_ETypes(), this.getTypes(), null, "eTypes", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDefinition_EImports(), this.getImport(), null, "eImports", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(definitionEClass, this.getDOMDocument(), "getDocument");
-
-        op = addEOperation(definitionEClass, null, "setDocument");
-        addEParameter(op, this.getDOMDocument(), "document");
-
-        initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getImport_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getImport_LocationURI(), ecorePackage.getEString(), "locationURI", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getImport_EDefinition(), this.getDefinition(), null, "eDefinition", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getImport_ESchema(), theXSDPackage.getXSDSchema(), null, "eSchema", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(importEClass, theXSDPackage.getXSDSchema(), "getSchema");
-
-        op = addEOperation(importEClass, null, "setSchema");
-        addEParameter(op, theXSDPackage.getXSDSchema(), "schema");
-
-        initEClass(extensibleElementEClass, ExtensibleElement.class, "ExtensibleElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getExtensibleElement_EExtensibilityElements(), this.getExtensibilityElement(), null, "eExtensibilityElements", null, 0, -1, ExtensibleElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(extensibleElementEClass, this.getIList(), "getExtensibilityElements");
-
-        op = addEOperation(extensibleElementEClass, null, "addExtensibilityElement");
-        addEParameter(op, this.getIExtensibilityElement(), "extElement");
-
-        initEClass(inputEClass, Input.class, "Input", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(outputEClass, Output.class, "Output", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(faultEClass, Fault.class, "Fault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(bindingInputEClass, BindingInput.class, "BindingInput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBindingInput_Name(), ecorePackage.getEString(), "name", null, 0, 1, BindingInput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingInput_EInput(), this.getInput(), null, "eInput", null, 1, 1, BindingInput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(bindingInputEClass, this.getIInput(), "getInput");
-
-        op = addEOperation(bindingInputEClass, null, "setInput");
-        addEParameter(op, this.getIInput(), "input");
-
-        initEClass(bindingOutputEClass, BindingOutput.class, "BindingOutput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBindingOutput_Name(), ecorePackage.getEString(), "name", null, 0, 1, BindingOutput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingOutput_EOutput(), this.getOutput(), null, "eOutput", null, 1, 1, BindingOutput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(bindingOutputEClass, this.getIOutput(), "getOutput");
-
-        op = addEOperation(bindingOutputEClass, null, "setOutput");
-        addEParameter(op, this.getIOutput(), "output");
-
-        initEClass(bindingFaultEClass, BindingFault.class, "BindingFault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getBindingFault_Name(), ecorePackage.getEString(), "name", null, 0, 1, BindingFault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getBindingFault_EFault(), this.getFault(), null, "eFault", null, 1, 1, BindingFault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        addEOperation(bindingFaultEClass, this.getIFault(), "getFault");
-
-        op = addEOperation(bindingFaultEClass, null, "setFault");
-        addEParameter(op, this.getIFault(), "fault");
-
-        initEClass(namespaceEClass, Namespace.class, "Namespace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getNamespace_URI(), ecorePackage.getEString(), "URI", null, 0, 1, Namespace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getNamespace_Prefix(), ecorePackage.getEString(), "prefix", null, 0, 1, Namespace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(iPortTypeEClass, javax.wsdl.PortType.class, "IPortType", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iPortTypeEClass, null, "addOperation");
-        addEParameter(op, this.getIOperation(), "operation");
-
-        op = addEOperation(iPortTypeEClass, this.getIOperation(), "getOperation");
-        addEParameter(op, ecorePackage.getEString(), "name");
-        addEParameter(op, ecorePackage.getEString(), "inputName");
-        addEParameter(op, ecorePackage.getEString(), "outputName");
-
-        addEOperation(iPortTypeEClass, this.getIList(), "getOperations");
-
-        initEClass(iOperationEClass, javax.wsdl.Operation.class, "IOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iOperationEClass, null, "addFault");
-        addEParameter(op, this.getIFault(), "fault");
-
-        op = addEOperation(iOperationEClass, this.getIFault(), "getFault");
-        addEParameter(op, ecorePackage.getEString(), "name");
-
-        addEOperation(iOperationEClass, this.getIMap(), "getFaults");
-
-        addEOperation(iOperationEClass, this.getIList(), "getParameterOrdering");
-
-        op = addEOperation(iOperationEClass, null, "setParameterOrdering");
-        addEParameter(op, this.getIList(), "parameterOrder");
-
-        addEOperation(iOperationEClass, this.getIInput(), "getInput");
-
-        op = addEOperation(iOperationEClass, null, "setInput");
-        addEParameter(op, this.getIInput(), "input");
-
-        addEOperation(iOperationEClass, this.getIOutput(), "getOutput");
-
-        op = addEOperation(iOperationEClass, null, "setOutput");
-        addEParameter(op, this.getIOutput(), "output");
-
-        initEClass(iInputEClass, javax.wsdl.Input.class, "IInput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(iInputEClass, this.getIMessage(), "getMessage");
-
-        op = addEOperation(iInputEClass, null, "setMessage");
-        addEParameter(op, this.getIMessage(), "message");
-
-        initEClass(iOutputEClass, javax.wsdl.Output.class, "IOutput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(iOutputEClass, this.getIMessage(), "getMessage");
-
-        op = addEOperation(iOutputEClass, null, "setMessage");
-        addEParameter(op, this.getIMessage(), "message");
-
-        initEClass(iFaultEClass, javax.wsdl.Fault.class, "IFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(iFaultEClass, this.getIMessage(), "getMessage");
-
-        op = addEOperation(iFaultEClass, null, "setMessage");
-        addEParameter(op, this.getIMessage(), "message");
-
-        initEClass(iMessageEClass, javax.wsdl.Message.class, "IMessage", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iMessageEClass, null, "addPart");
-        addEParameter(op, this.getIPart(), "part");
-
-        op = addEOperation(iMessageEClass, this.getIPart(), "getPart");
-        addEParameter(op, ecorePackage.getEString(), "name");
-
-        addEOperation(iMessageEClass, this.getIMap(), "getParts");
-
-        op = addEOperation(iMessageEClass, this.getIList(), "getOrderedParts");
-        addEParameter(op, this.getIList(), "partOrder");
-
-        initEClass(iPartEClass, javax.wsdl.Part.class, "IPart", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iPartEClass, null, "setExtensionAttribute");
-        addEParameter(op, this.getQName(), "name");
-        addEParameter(op, this.getQName(), "value");
-        addEException(op, this.getWSDLException());
-
-        addEOperation(iPartEClass, this.getIIterator(), "getExtensionAttributeNames");
-
-        op = addEOperation(iPartEClass, this.getQName(), "getExtensionAttribute");
-        addEParameter(op, this.getQName(), "name");
-
-        initEClass(iServiceEClass, javax.wsdl.Service.class, "IService", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iServiceEClass, null, "addPort");
-        addEParameter(op, this.getIPort(), "port");
-
-        addEOperation(iServiceEClass, this.getIMap(), "getPorts");
-
-        op = addEOperation(iServiceEClass, this.getIPort(), "getPort");
-        addEParameter(op, ecorePackage.getEString(), "name");
-
-        initEClass(iPortEClass, javax.wsdl.Port.class, "IPort", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(iPortEClass, this.getIBinding(), "getBinding");
-
-        op = addEOperation(iPortEClass, null, "setBinding");
-        addEParameter(op, this.getIBinding(), "binding");
-
-        initEClass(iBindingEClass, javax.wsdl.Binding.class, "IBinding", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iBindingEClass, null, "addBindingOperation");
-        addEParameter(op, this.getIBindingOperation(), "bindingOperation");
-
-        op = addEOperation(iBindingEClass, this.getIBindingOperation(), "getBindingOperation");
-        addEParameter(op, ecorePackage.getEString(), "name");
-        addEParameter(op, ecorePackage.getEString(), "inputName");
-        addEParameter(op, ecorePackage.getEString(), "outputName");
-
-        addEOperation(iBindingEClass, this.getIList(), "getBindingOperations");
-
-        addEOperation(iBindingEClass, this.getIPortType(), "getPortType");
-
-        op = addEOperation(iBindingEClass, null, "setPortType");
-        addEParameter(op, this.getIPortType(), "portType");
-
-        initEClass(iBindingOperationEClass, javax.wsdl.BindingOperation.class, "IBindingOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iBindingOperationEClass, null, "addBindingFault");
-        addEParameter(op, this.getIBindingFault(), "bindingFault");
-
-        op = addEOperation(iBindingOperationEClass, this.getIBindingFault(), "getBindingFault");
-        addEParameter(op, ecorePackage.getEString(), "name");
-
-        addEOperation(iBindingOperationEClass, this.getIMap(), "getBindingFaults");
-
-        addEOperation(iBindingOperationEClass, this.getIOperation(), "getOperation");
-
-        op = addEOperation(iBindingOperationEClass, null, "setOperation");
-        addEParameter(op, this.getIOperation(), "operation");
-
-        addEOperation(iBindingOperationEClass, this.getIBindingInput(), "getBindingInput");
-
-        op = addEOperation(iBindingOperationEClass, null, "setBindingInput");
-        addEParameter(op, this.getIBindingInput(), "bindingInput");
-
-        addEOperation(iBindingOperationEClass, this.getIBindingOutput(), "getBindingOutput");
-
-        op = addEOperation(iBindingOperationEClass, null, "setBindingOutput");
-        addEParameter(op, this.getIBindingOutput(), "bindingOutput");
-
-        initEClass(iBindingInputEClass, javax.wsdl.BindingInput.class, "IBindingInput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iBindingOutputEClass, javax.wsdl.BindingOutput.class, "IBindingOutput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iBindingFaultEClass, javax.wsdl.BindingFault.class, "IBindingFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iExtensibilityElementEClass, javax.wsdl.extensions.ExtensibilityElement.class, "IExtensibilityElement", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iDefinitionEClass, javax.wsdl.Definition.class, "IDefinition", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        op = addEOperation(iDefinitionEClass, null, "addBinding");
-        addEParameter(op, this.getIBinding(), "binding");
-
-        op = addEOperation(iDefinitionEClass, null, "addImport");
-        addEParameter(op, this.getIImport(), "importDef");
-
-        op = addEOperation(iDefinitionEClass, null, "addMessage");
-        addEParameter(op, this.getIMessage(), "message");
-
-        op = addEOperation(iDefinitionEClass, null, "addNamespace");
-        addEParameter(op, ecorePackage.getEString(), "prefix");
-        addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-
-        op = addEOperation(iDefinitionEClass, null, "addPortType");
-        addEParameter(op, this.getIPortType(), "portType");
-
-        op = addEOperation(iDefinitionEClass, null, "addService");
-        addEParameter(op, this.getIService(), "service");
-
-        addEOperation(iDefinitionEClass, this.getIBindingFault(), "createBindingFault");
-
-        addEOperation(iDefinitionEClass, this.getIBindingInput(), "createBindingInput");
-
-        addEOperation(iDefinitionEClass, this.getIBindingOutput(), "createBindingOutput");
-
-        addEOperation(iDefinitionEClass, this.getIBindingOperation(), "createBindingOperation");
-
-        addEOperation(iDefinitionEClass, this.getIBinding(), "createBinding");
-
-        addEOperation(iDefinitionEClass, this.getIFault(), "createFault");
-
-        addEOperation(iDefinitionEClass, this.getIImport(), "createImport");
-
-        addEOperation(iDefinitionEClass, this.getIInput(), "createInput");
-
-        addEOperation(iDefinitionEClass, this.getIMessage(), "createMessage");
-
-        addEOperation(iDefinitionEClass, this.getIOperation(), "createOperation");
-
-        addEOperation(iDefinitionEClass, this.getIOutput(), "createOutput");
-
-        addEOperation(iDefinitionEClass, this.getIPart(), "createPart");
-
-        addEOperation(iDefinitionEClass, this.getIPort(), "createPort");
-
-        addEOperation(iDefinitionEClass, this.getIPortType(), "createPortType");
-
-        addEOperation(iDefinitionEClass, this.getIService(), "createService");
-
-        op = addEOperation(iDefinitionEClass, this.getIBinding(), "getBinding");
-        addEParameter(op, this.getQName(), "name");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getBindings");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getImports");
-
-        op = addEOperation(iDefinitionEClass, this.getIList(), "getImports");
-        addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-
-        op = addEOperation(iDefinitionEClass, this.getIMessage(), "getMessage");
-        addEParameter(op, this.getQName(), "name");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getMessages");
-
-        op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getNamespace");
-        addEParameter(op, ecorePackage.getEString(), "prefix");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getNamespaces");
-
-        op = addEOperation(iDefinitionEClass, this.getIPortType(), "getPortType");
-        addEParameter(op, this.getQName(), "name");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getPortTypes");
-
-        op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getPrefix");
-        addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-
-        op = addEOperation(iDefinitionEClass, this.getIService(), "getService");
-        addEParameter(op, this.getQName(), "name");
-
-        addEOperation(iDefinitionEClass, this.getIMap(), "getServices");
-
-        addEOperation(iDefinitionEClass, this.getIExtensionRegistry(), "getExtensionRegistry");
-
-        op = addEOperation(iDefinitionEClass, null, "setExtensionRegistry");
-        addEParameter(op, this.getIExtensionRegistry(), "extensionRegistry");
-
-        addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getDocumentBaseURI");
-
-        op = addEOperation(iDefinitionEClass, null, "setDocumentBaseURI");
-        addEParameter(op, ecorePackage.getEString(), "documentBase");
-
-        addEOperation(iDefinitionEClass, this.getITypes(), "createTypes");
-
-        op = addEOperation(iDefinitionEClass, this.getIService(), "removeService");
-        addEParameter(op, this.getQName(), "name");
-
-        op = addEOperation(iDefinitionEClass, this.getIBinding(), "removeBinding");
-        addEParameter(op, this.getQName(), "name");
-
-        op = addEOperation(iDefinitionEClass, this.getIPortType(), "removePortType");
-        addEParameter(op, this.getQName(), "name");
-
-        op = addEOperation(iDefinitionEClass, this.getIMessage(), "removeMessage");
-        addEParameter(op, this.getQName(), "name");
-
-        addEOperation(iDefinitionEClass, this.getITypes(), "getTypes");
-
-        op = addEOperation(iDefinitionEClass, null, "setTypes");
-        addEParameter(op, this.getITypes(), "types");
-
-        initEClass(iImportEClass, javax.wsdl.Import.class, "IImport", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iListEClass, List.class, "IList", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iMapEClass, Map.class, "IMap", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iurlEClass, URL.class, "IURL", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iExtensionRegistryEClass, ExtensionRegistry.class, "IExtensionRegistry", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(typesEClass, Types.class, "Types", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        addEOperation(typesEClass, this.getIList(), "getSchemas");
-
-        op = addEOperation(typesEClass, this.getIList(), "getSchemas");
-        addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-
-        initEClass(iIteratorEClass, Iterator.class, "IIterator", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(iTypesEClass, javax.wsdl.Types.class, "ITypes", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(unknownExtensibilityElementEClass, UnknownExtensibilityElement.class, "UnknownExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getUnknownExtensibilityElement_Children(), this.getUnknownExtensibilityElement(), null, "children", null, 0, -1, UnknownExtensibilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(xsdSchemaExtensibilityElementEClass, XSDSchemaExtensibilityElement.class, "XSDSchemaExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getXSDSchemaExtensibilityElement_Schema(), theXSDPackage.getXSDSchema(), null, "schema", null, 0, 1, XSDSchemaExtensibilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(messageReferenceEClass, MessageReference.class, "MessageReference", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getMessageReference_Name(), ecorePackage.getEString(), "name", null, 0, 1, MessageReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getMessageReference_EMessage(), this.getMessage(), null, "eMessage", null, 1, 1, MessageReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        // Initialize data types
-        initEDataType(qNameEDataType, QName.class, "QName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(operationTypeEDataType, OperationType.class, "OperationType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(domElementEDataType, Element.class, "DOMElement", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(wsdlExceptionEDataType, WSDLException.class, "WSDLException", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(domDocumentEDataType, Document.class, "DOMDocument", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-        // Create resource
-        createResource(eNS_URI);
-    }
-
-} //WSDLPackageImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java
deleted file mode 100644
index bef7215..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java
+++ /dev/null

@@ -1,414 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>XSD Schema Extensibility Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wsdl.impl.XSDSchemaExtensibilityElementImpl#getSchema <em>Schema</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class XSDSchemaExtensibilityElementImpl extends ExtensibilityElementImpl implements XSDSchemaExtensibilityElement
-{
-  /**
-   * The cached value of the '{@link #getSchema() <em>Schema</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSchema()
-   * @generated
-   * @ordered
-   */
-  protected XSDSchema schema = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected XSDSchemaExtensibilityElementImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.eINSTANCE.getXSDSchemaExtensibilityElement();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDSchema getSchema()
-  {
-    return schema;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSchema(XSDSchema newSchema, NotificationChain msgs)
-  {
-    XSDSchema oldSchema = schema;
-    schema = newSchema;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA, oldSchema, newSchema);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSchema(XSDSchema newSchema)
-  {
-    if (newSchema != schema)
-    {
-      NotificationChain msgs = null;
-      if (schema != null)
-        msgs = ((InternalEObject)schema).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA, null, msgs);
-      if (newSchema != null)
-        msgs = ((InternalEObject)newSchema).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA, null, msgs);
-      msgs = basicSetSchema(newSchema, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA, newSchema, newSchema));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-          return basicSetSchema(null, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        return getDocumentationElement();
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT:
-        return getElement();
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__REQUIRED:
-        return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        return getElementType();
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-        return getSchema();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement((Element)newValue);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT:
-        setElement((Element)newValue);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__REQUIRED:
-        setRequired(((Boolean)newValue).booleanValue());
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        setElementType((QName)newValue);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-        setSchema((XSDSchema)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT:
-        setElement(ELEMENT_EDEFAULT);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__REQUIRED:
-        setRequired(REQUIRED_EDEFAULT);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        setElementType(ELEMENT_TYPE_EDEFAULT);
-        return;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-        setSchema((XSDSchema)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__DOCUMENTATION_ELEMENT:
-        return DOCUMENTATION_ELEMENT_EDEFAULT == null ? documentationElement != null : !DOCUMENTATION_ELEMENT_EDEFAULT.equals(documentationElement);
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT:
-        return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__REQUIRED:
-        return required != REQUIRED_EDEFAULT;
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-        return ELEMENT_TYPE_EDEFAULT == null ? elementType != null : !ELEMENT_TYPE_EDEFAULT.equals(elementType);
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-        return schema != null;
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.impl.WSDLElementImpl#reconcile(org.w3c.dom.Element)
-   */
-  protected void reconcile(Element changedElement)
-  {
-    element = changedElement; // This line may not needed.    
-    if (schema == null)
-    {
-      XSDSchema newSchema = XSDSchemaImpl.createSchema(changedElement);
-      setSchema(newSchema);
-    }
-  }
-
-  public XSDSchema createSchema(Element element)
-  {
-    if (element.getLocalName().equals("schema") && XSDConstants.isSchemaForSchemaNamespace(element.getNamespaceURI()))
-    {     
-      XSDSchema xsdSchema = XSDFactory.eINSTANCE.createXSDSchema(); 
-      xsdSchema.setElement(element);
-      return xsdSchema;      
-    }
-    else
-    {
-      return null;
-    }
-  }
-
-  public Element getElement()
-  {
-    if (element != null)
-      return element;
-    else if (getSchema() != null)
-      element = getSchema().getElement();
-
-    return element;
-  }
-  
-  public void setElement(Element newElement)
-  {
-    if (newElement == null && !isReconciling)
-    {
-      element = null;
-    }
-    else
-    {
-      setElementGen(newElement);
-    }
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001,XSDConstants.SCHEMA_ELEMENT_TAG);
-
-    return elementType;
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setElementType(QName newElementType)
-  {
-    // Should not do anything.
-  }  
-  
-  public void reconcileAttributes(Element changedElement)
-  {
-    super.reconcileAttributes(changedElement);
-  }
-  
-  public Element createElement()
-  {
-  	if (schema == null) // kb Note: This case is not supposed to happen.
-  	{     
-  	  // cs ... why do we do this if its not supposed to happen?
-  	  // Is there a scenario where this is a usefull fallback?
-  	  // Under what conditions does this code get executed (i.e. why would schema == null)?
-      schema = XSDFactory.eINSTANCE.createXSDSchema();
-      schema.setSchemaForSchemaQNamePrefix("xsd");
-      schema.setTargetNamespace("http://tempuri.org/");
-      java.util.Map qNamePrefixToNamespaceMap = schema.getQNamePrefixToNamespaceMap();
-      qNamePrefixToNamespaceMap.put("", schema.getTargetNamespace());
-      qNamePrefixToNamespaceMap.put
-        (schema.getSchemaForSchemaQNamePrefix(),org.eclipse.xsd.util.XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-      adopt(schema);
-      schema.updateElement(true);
-      return schema.getElement();
-    }
-    else
-    {
-      element = schema.getElement();
-      if (element == null)
-      {
-      	adopt(schema);
-        schema.updateElement(true);
-      }
-      element = schema.getElement();
-      return element;
-    }
-  }
- 
-  private void adopt(XSDSchema xsdSchema)
-  {
-    Definition definition = getEnclosingDefinition();
-    if (definition == null)
-      return;
-
-    Document document = definition.getDocument();
-    if (document == null)
-      document = ((DefinitionImpl) definition).updateDocument();
-    
-    if (xsdSchema.getDocument() != null)
-    	xsdSchema.setDocument(null);
-    
-    xsdSchema.setDocument(document);
-  }
-  
-  /*
-  private Element adopt(Element element)
-  {
-    Definition definition = getEnclosingDefinition();
-    if (definition == null)
-      return element;
-
-    Document document = definition.getDocument();
-    if (document == null)
-      document = ((DefinitionImpl) definition).updateDocument();
-    
-    return (Element)document.importNode(element,true);
-  }
-  */
-  
-  protected void changeAttribute(EAttribute eAttribute)
-  {
-	  if (isReconciling)
-		  return;
-	  
-	  // TODO... revist this block of code
-	  //
-	  if (eAttribute == null || eAttribute == WSDLPackage.eINSTANCE.getXSDSchemaExtensibilityElement_Schema())
-	  {
-		  // We got a new schema so re-parent it.
-		  // cs... are we really doing the right thing here?  this seems strange
-		  if (schema != null)
-		  {
-			  if ((schema.getElement() == null && getElement() == null) ||
-					  (schema.getElement() != getElement()))
-			  {	
-				  schema.setDocument(null);
-				  schema.setElement(null);
-				  adopt(schema);
-				  schema.updateElement();
-			  }  
-		  }
-	  }    
-	  else if (eAttribute == WSDLPackage.eINSTANCE.getWSDLElement_Element())
-	  {
-		  setSchema(createSchema(element)); // element is not null
-	  }    
-  }
-} //XSDSchemaExtensibilityElementImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java
deleted file mode 100644
index b1bb180..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl.wsdl4j;
-
-import javax.wsdl.Definition;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.wsdl.xml.WSDLWriter;
-
-public final class WSDLFactoryImpl extends WSDLFactory
-{
-  
-  //public static WSDLFactory newInstance() throws WSDLException
-  //{
-  //  return new WSDLFactoryImpl();
-  //}
-  
-  public WSDLFactoryImpl()
-  {
-  }
-  
-  public Definition newDefinition()
-  {
-    return org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl.eINSTANCE.createDefinition();
-  }
-  
-  public ExtensionRegistry newPopulatedExtensionRegistry()
-  {
-    return null;
-  }
-  
-  public WSDLReader newWSDLReader()
-  {
-    WSDLReader reader = new WSDLReaderImpl();
-    reader.setFactoryImplName(getClass().getName());
-    return reader;
-  }
-  
-  public WSDLWriter newWSDLWriter()
-  {
-    return new WSDLWriterImpl();
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java
deleted file mode 100644
index 3838d79..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java
+++ /dev/null

@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl.wsdl4j;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.wsdl.xml.WSDLLocator;
-import javax.wsdl.xml.WSDLReader;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-
-public final class WSDLReaderImpl implements WSDLReader
-{
-  private String factoryImplName;
-  private ExtensionRegistry extReg;
-  
-  public ExtensionRegistry getExtensionRegistry()
-  {
-    return extReg;
-  }
-  
-  public void setExtensionRegistry(ExtensionRegistry extReg)
-  {
-    this.extReg = extReg;
-  }
-  
-  public String getFactoryImplName()
-  {
-    return factoryImplName;
-  }
-  
-  public void setFactoryImplName(String factoryImplName) throws UnsupportedOperationException
-  {
-    this.factoryImplName = factoryImplName;
-  }
-
-  
-  public boolean getFeature(String name) throws IllegalArgumentException
-  { 
-    return false;
-  }
-  
-  public void setFeature(String name, boolean value) throws IllegalArgumentException
-  {
-    throw new IllegalArgumentException("Not Implemented");
-  }
-  
-  /**
-   * Read the WSDL document accessible via the specified
-   * URI into a WSDL definition.
-   *
-   * @param wsdlURI a URI (can be a filename or URL) pointing to a
-   * WSDL XML definition.
-   * @return the definition.
-   */
-  public Definition readWSDL(String wsdlURI) throws WSDLException
-  {
-    URI uri;    
-    if (hasProtocol(wsdlURI))
-       uri = URI.createURI(wsdlURI);
-    else
-       uri = URI.createFileURI(wsdlURI);
-  
-    // Create a resource set, create a wsdl resource, and load the main wsdl file into it.
-    
-  	ResourceSet resourceSet = new ResourceSetImpl();  	
-  	resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-
-  	WSDLResourceImpl wsdlMainResource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl"));
-  	wsdlMainResource.setURI(uri);
-  	
-    try
-    {
-      InputStream inputStream = resourceSet.getURIConverter().createInputStream(uri);
-      wsdlMainResource.load(inputStream, resourceSet.getLoadOptions());
-      //wsdlMainResource.load(resourceSet.getLoadOptions());
-    }
-    catch (IOException e)
-    {
-      throw new WSDLException(WSDLException.INVALID_WSDL,"WSDL URI: "+wsdlURI,e);
-    }
-    
-    // Return the definitions of the main resource.
-    return wsdlMainResource.getDefinition();
-  }
-
-  private boolean hasProtocol(String uri)
-  {
-		boolean result = false;     
-		if (uri != null)
-		{
-		  int index = uri.indexOf(":");
-		  if (index != -1 && index > 2) // assume protocol with be length 3 so that the'C' in 'C:/' is not interpreted as a protocol
-		  {
-				result = true;
-		  }
-		}
-		return result;
-  } 
-  
-  /**
-   * Read the WSDL document accessible via the specified
-   * URI into a WSDL definition.
-   *
-   * @param contextURI the context in which to resolve the
-   * wsdlURI, if the wsdlURI is relative. Can be null, in which
-   * case it will be ignored.
-   * @param wsdlURI a URI (can be a filename or URL) pointing to a
-   * WSDL XML definition.
-   * @return the definition.
-   */
-  public Definition readWSDL(String contextURI, String wsdlURI) throws WSDLException
-  {
-    throw new WSDLException(WSDLException.OTHER_ERROR,"Not Implemented");
-  }
-
-  /**
-   * Read the specified &lt;wsdl:definitions&gt; element into a WSDL
-   * definition.
-   *
-   * @param documentBaseURI the document base URI of the WSDL definition
-   * described by the element. Will be set as the documentBaseURI
-   * of the returned Definition. Can be null, in which case it
-   * will be ignored.
-   * @param definitionsElement the &lt;wsdl:definitions&gt; element
-   * @return the definition described by the element.
-   */
-  public Definition readWSDL(String documentBaseURI, Element definitionsElement)
-    throws WSDLException
-  {
-    throw new WSDLException(WSDLException.OTHER_ERROR,"Not Implemented");
-  }
-
-  /**
-   * Read the specified WSDL document into a WSDL definition.
-   *
-   * @param documentBaseURI the document base URI of the WSDL definition
-   * described by the document. Will be set as the documentBaseURI
-   * of the returned Definition. Can be null, in which case it
-   * will be ignored.
-   * @param wsdlDocument the WSDL document, an XML 
-   * document obeying the WSDL schema.
-   * @return the definition described in the document.
-   */
-  public Definition readWSDL(String documentBaseURI, Document wsdlDocument)
-    throws WSDLException
-  {
-    throw new WSDLException(WSDLException.OTHER_ERROR,"Not Implemented");
-  }
-
-  /**
-   * Read a WSDL document into a WSDL definition.
-   *
-   * @param documentBaseURI the document base URI of the WSDL definition
-   * described by the document. Will be set as the documentBaseURI
-   * of the returned Definition. Can be null, in which case it
-   * will be ignored.
-   * @param inputSource an InputSource pointing to the
-   * WSDL document, an XML document obeying the WSDL schema.
-   * @return the definition described in the document pointed to
-   * by the InputSource.
-   */
-  public Definition readWSDL(String documentBaseURI, InputSource inputSource)
-    throws WSDLException
-  {
-  	ResourceSet resourceSet = new ResourceSetImpl();
-  	resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLResourceImpl wsdlMainResource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl"));
-
-  	try
-    {
-      if (documentBaseURI != null)
-        wsdlMainResource.setURI(createURI(documentBaseURI));
-      resourceSet.getLoadOptions().put(WSDLResourceImpl.CONTINUE_ON_LOAD_ERROR,new Boolean(false));
-      wsdlMainResource.load(inputSource.getByteStream(), resourceSet.getLoadOptions());
-    }
-    catch (IOException ioe)
-    {
-      throw new WSDLException(WSDLException.INVALID_WSDL, "", ioe);
-    }
-    
-    Definition definition = wsdlMainResource.getDefinition();
-    if (definition != null)
-      definition.setDocumentBaseURI(documentBaseURI);
-    
-    return definition;
-  }
-
-  /**
-   * Read a WSDL document into a WSDL definition.
-   *
-   * @param locator A WSDLLocator object used to provide InputSources
-   * pointing to the wsdl file.
-   * @return the definition described in the document
-   */
-  public Definition readWSDL(WSDLLocator locator) throws WSDLException
-  {
-    throw new WSDLException(WSDLException.OTHER_ERROR,"Not Implemented");
-  }
-
-  private URI createURI(String uriString)
-  {
-    if (hasProtocol(uriString))
-       return URI.createURI(uriString);
-    else
-       return URI.createFileURI(uriString);
-  } 
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java
deleted file mode 100644
index 9baf152..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.impl.wsdl4j;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.w3c.dom.Document;
-
-
-public final class WSDLWriterImpl implements WSDLWriter
-{
-  /**
-   * Sets the specified feature to the specified value.
-   * <p>
-   * There are no minimum features that must be supported.
-   * <p>
-   * All feature names must be fully-qualified, Java package style. All
-   * names starting with javax.wsdl. are reserved for features defined
-   * by the JWSDL specification. It is recommended that implementation-
-   * specific features be fully-qualified to match the package name
-   * of that implementation. For example: com.abc.featureName
-   *
-   * @param name the name of the feature to be set.
-   * @param value the value to set the feature to.
-   * @throws IllegalArgumentException if the feature name is not recognized.
-   * @see #getFeature(String)
-   */
-  public void setFeature(String name, boolean value) throws IllegalArgumentException
-  {
-    throw new IllegalArgumentException("Not Implemented");
-  }
-
-  /**
-   * Gets the value of the specified feature.
-   *
-   * @param name the name of the feature to get the value of.
-   * @throws IllegalArgumentException if the feature name is not recognized.
-   * @see #setFeature(String, boolean)
-   */
-  public boolean getFeature(String name) throws IllegalArgumentException
-  {
-    throw new IllegalArgumentException("Not Implemented");
-  }
-
-  /**
-   * Return a document generated from the specified WSDL model.
-   */
-  public Document getDocument(Definition wsdlDef) throws WSDLException
-  {
-    return ((DefinitionImpl)wsdlDef).getDocument();
-  }
-
-  /**
-   * Write the specified WSDL definition to the specified Writer.
-   *
-   * @param wsdlDef the WSDL definition to be written.
-   * @param sink the Writer to write the xml to.
-   */
-  public void writeWSDL(Definition wsdlDef, Writer sink) throws WSDLException
-  {
-    String encoding = null;
-    try
-    {
-      TransformerFactory transformerFactory = TransformerFactory.newInstance();
-      Transformer transformer = transformerFactory.newTransformer();
-
-      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-      transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-      
-      // Unless a width is set, there will be only line breaks but no indentation.
-      // The IBM JDK and the Sun JDK don't agree on the property name,
-      // so we set them both.
-      //
-      transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "2");
-      transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-      if (encoding != null)
-      {
-        transformer.setOutputProperty(OutputKeys.ENCODING, encoding);
-      }
-      
-      Document document = ((DefinitionImpl)wsdlDef).getDocument();
-      if (document == null)
-      {
-        ((DefinitionImpl)wsdlDef).updateElement(true);
-        document = ((DefinitionImpl)wsdlDef).getDocument();
-      }
-      
-      transformer.transform(new DOMSource(document), new StreamResult(sink));
-    }
-    catch (TransformerException exception)
-    {
-      throw new WSDLException(WSDLException.OTHER_ERROR,"Failed to save Definitions.",exception);
-    }
-
-  }
-
-  /**
-   * Write the specified WSDL definition to the specified OutputStream.
-   *
-   * @param wsdlDef the WSDL definition to be written.
-   * @param sink the OutputStream to write the xml to.
-   */
-  public void writeWSDL(Definition wsdlDef, OutputStream sink) throws WSDLException
-  {
-
-    Resource resource = ((DefinitionImpl)wsdlDef).eResource();
-    try
-    {
-      resource.save(sink,null);
-    }
-    catch (IOException e)
-    {
-      throw new WSDLException(WSDLException.OTHER_ERROR,"Failed to save Definitions.",e);
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/Reconcilable.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/Reconcilable.java
deleted file mode 100644
index b9d2a90..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/Reconcilable.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import org.w3c.dom.Element;
-
-// TODO... why do we need this?
-// 
-public interface Reconcilable 
-{
-  public void setElement(Element element);
-  public Element getElement();
-  public void reconcileAttributes(Element changedElement);
-  public void reconcileReferences(boolean deep);
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java
deleted file mode 100644
index e7c620a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java
+++ /dev/null

@@ -1,1039 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.extensions.ExtensionRegistry;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.wsdl.WSDLPackage
- * @generated
- */
-public class WSDLAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static WSDLPackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = WSDLPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch the delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLSwitch modelSwitch =
-    new WSDLSwitch()
-    {
-      public Object caseWSDLElement(WSDLElement object)
-      {
-        return createWSDLElementAdapter();
-      }
-      public Object casePortType(PortType object)
-      {
-        return createPortTypeAdapter();
-      }
-      public Object caseOperation(Operation object)
-      {
-        return createOperationAdapter();
-      }
-      public Object caseMessage(Message object)
-      {
-        return createMessageAdapter();
-      }
-      public Object casePart(Part object)
-      {
-        return createPartAdapter();
-      }
-      public Object caseBinding(Binding object)
-      {
-        return createBindingAdapter();
-      }
-      public Object caseBindingOperation(BindingOperation object)
-      {
-        return createBindingOperationAdapter();
-      }
-      public Object caseService(Service object)
-      {
-        return createServiceAdapter();
-      }
-      public Object casePort(Port object)
-      {
-        return createPortAdapter();
-      }
-      public Object caseExtensibilityElement(ExtensibilityElement object)
-      {
-        return createExtensibilityElementAdapter();
-      }
-      public Object caseDefinition(Definition object)
-      {
-        return createDefinitionAdapter();
-      }
-      public Object caseImport(Import object)
-      {
-        return createImportAdapter();
-      }
-      public Object caseExtensibleElement(ExtensibleElement object)
-      {
-        return createExtensibleElementAdapter();
-      }
-      public Object caseInput(Input object)
-      {
-        return createInputAdapter();
-      }
-      public Object caseOutput(Output object)
-      {
-        return createOutputAdapter();
-      }
-      public Object caseFault(Fault object)
-      {
-        return createFaultAdapter();
-      }
-      public Object caseBindingInput(BindingInput object)
-      {
-        return createBindingInputAdapter();
-      }
-      public Object caseBindingOutput(BindingOutput object)
-      {
-        return createBindingOutputAdapter();
-      }
-      public Object caseBindingFault(BindingFault object)
-      {
-        return createBindingFaultAdapter();
-      }
-      public Object caseNamespace(Namespace object)
-      {
-        return createNamespaceAdapter();
-      }
-      public Object caseIPortType(javax.wsdl.PortType object)
-      {
-        return createIPortTypeAdapter();
-      }
-      public Object caseIOperation(javax.wsdl.Operation object)
-      {
-        return createIOperationAdapter();
-      }
-      public Object caseIInput(javax.wsdl.Input object)
-      {
-        return createIInputAdapter();
-      }
-      public Object caseIOutput(javax.wsdl.Output object)
-      {
-        return createIOutputAdapter();
-      }
-      public Object caseIFault(javax.wsdl.Fault object)
-      {
-        return createIFaultAdapter();
-      }
-      public Object caseIMessage(javax.wsdl.Message object)
-      {
-        return createIMessageAdapter();
-      }
-      public Object caseIPart(javax.wsdl.Part object)
-      {
-        return createIPartAdapter();
-      }
-      public Object caseIService(javax.wsdl.Service object)
-      {
-        return createIServiceAdapter();
-      }
-      public Object caseIPort(javax.wsdl.Port object)
-      {
-        return createIPortAdapter();
-      }
-      public Object caseIBinding(javax.wsdl.Binding object)
-      {
-        return createIBindingAdapter();
-      }
-      public Object caseIBindingOperation(javax.wsdl.BindingOperation object)
-      {
-        return createIBindingOperationAdapter();
-      }
-      public Object caseIBindingInput(javax.wsdl.BindingInput object)
-      {
-        return createIBindingInputAdapter();
-      }
-      public Object caseIBindingOutput(javax.wsdl.BindingOutput object)
-      {
-        return createIBindingOutputAdapter();
-      }
-      public Object caseIBindingFault(javax.wsdl.BindingFault object)
-      {
-        return createIBindingFaultAdapter();
-      }
-      public Object caseIExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement object)
-      {
-        return createIExtensibilityElementAdapter();
-      }
-      public Object caseIDefinition(javax.wsdl.Definition object)
-      {
-        return createIDefinitionAdapter();
-      }
-      public Object caseIImport(javax.wsdl.Import object)
-      {
-        return createIImportAdapter();
-      }
-      public Object caseIList(List object)
-      {
-        return createIListAdapter();
-      }
-      public Object caseIMap(Map object)
-      {
-        return createIMapAdapter();
-      }
-      public Object caseIURL(URL object)
-      {
-        return createIURLAdapter();
-      }
-      public Object caseIExtensionRegistry(ExtensionRegistry object)
-      {
-        return createIExtensionRegistryAdapter();
-      }
-      public Object caseTypes(Types object)
-      {
-        return createTypesAdapter();
-      }
-      public Object caseIIterator(Iterator object)
-      {
-        return createIIteratorAdapter();
-      }
-      public Object caseITypes(javax.wsdl.Types object)
-      {
-        return createITypesAdapter();
-      }
-      public Object caseUnknownExtensibilityElement(UnknownExtensibilityElement object)
-      {
-        return createUnknownExtensibilityElementAdapter();
-      }
-      public Object caseXSDSchemaExtensibilityElement(XSDSchemaExtensibilityElement object)
-      {
-        return createXSDSchemaExtensibilityElementAdapter();
-      }
-      public Object caseMessageReference(MessageReference object)
-      {
-        return createMessageReferenceAdapter();
-      }
-      public Object defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-  public Adapter createAdapter(Notifier target)
-  {
-    return (Adapter)modelSwitch.doSwitch((EObject)target);
-  }
-
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.WSDLElement <em>Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.WSDLElement
-   * @generated
-   */
-  public Adapter createWSDLElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.PortType <em>Port Type</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.PortType
-   * @generated
-   */
-  public Adapter createPortTypeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Operation <em>Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Operation
-   * @generated
-   */
-  public Adapter createOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Message <em>Message</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Message
-   * @generated
-   */
-  public Adapter createMessageAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Part <em>Part</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Part
-   * @generated
-   */
-  public Adapter createPartAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Binding <em>Binding</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Binding
-   * @generated
-   */
-  public Adapter createBindingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.BindingOperation <em>Binding Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.BindingOperation
-   * @generated
-   */
-  public Adapter createBindingOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Service <em>Service</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Service
-   * @generated
-   */
-  public Adapter createServiceAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Port <em>Port</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Port
-   * @generated
-   */
-  public Adapter createPortAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.ExtensibilityElement <em>Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.ExtensibilityElement
-   * @generated
-   */
-  public Adapter createExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Definition <em>Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Definition
-   * @generated
-   */
-  public Adapter createDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Import <em>Import</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Import
-   * @generated
-   */
-  public Adapter createImportAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.ExtensibleElement <em>Extensible Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.ExtensibleElement
-   * @generated
-   */
-  public Adapter createExtensibleElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Input <em>Input</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Input
-   * @generated
-   */
-  public Adapter createInputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Output <em>Output</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Output
-   * @generated
-   */
-  public Adapter createOutputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Fault <em>Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Fault
-   * @generated
-   */
-  public Adapter createFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.BindingInput <em>Binding Input</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.BindingInput
-   * @generated
-   */
-  public Adapter createBindingInputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.BindingOutput <em>Binding Output</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.BindingOutput
-   * @generated
-   */
-  public Adapter createBindingOutputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.BindingFault <em>Binding Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.BindingFault
-   * @generated
-   */
-  public Adapter createBindingFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Namespace <em>Namespace</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Namespace
-   * @generated
-   */
-  public Adapter createNamespaceAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.PortType <em>IPort Type</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.PortType
-   * @generated
-   */
-  public Adapter createIPortTypeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Operation <em>IOperation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Operation
-   * @generated
-   */
-  public Adapter createIOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Input <em>IInput</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Input
-   * @generated
-   */
-  public Adapter createIInputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Output <em>IOutput</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Output
-   * @generated
-   */
-  public Adapter createIOutputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Fault <em>IFault</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Fault
-   * @generated
-   */
-  public Adapter createIFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Message <em>IMessage</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Message
-   * @generated
-   */
-  public Adapter createIMessageAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Part <em>IPart</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Part
-   * @generated
-   */
-  public Adapter createIPartAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Service <em>IService</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Service
-   * @generated
-   */
-  public Adapter createIServiceAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Port <em>IPort</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Port
-   * @generated
-   */
-  public Adapter createIPortAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Binding <em>IBinding</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Binding
-   * @generated
-   */
-  public Adapter createIBindingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.BindingOperation <em>IBinding Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.BindingOperation
-   * @generated
-   */
-  public Adapter createIBindingOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.BindingInput <em>IBinding Input</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.BindingInput
-   * @generated
-   */
-  public Adapter createIBindingInputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.BindingOutput <em>IBinding Output</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.BindingOutput
-   * @generated
-   */
-  public Adapter createIBindingOutputAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.BindingFault <em>IBinding Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.BindingFault
-   * @generated
-   */
-  public Adapter createIBindingFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.ExtensibilityElement <em>IExtensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.extensions.ExtensibilityElement
-   * @generated
-   */
-  public Adapter createIExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Definition <em>IDefinition</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Definition
-   * @generated
-   */
-  public Adapter createIDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Import <em>IImport</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Import
-   * @generated
-   */
-  public Adapter createIImportAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.List <em>IList</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see java.util.List
-   * @generated
-   */
-  public Adapter createIListAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map <em>IMap</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see java.util.Map
-   * @generated
-   */
-  public Adapter createIMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.net.URL <em>IURL</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see java.net.URL
-   * @generated
-   */
-  public Adapter createIURLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.ExtensionRegistry <em>IExtension Registry</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.extensions.ExtensionRegistry
-   * @generated
-   */
-  public Adapter createIExtensionRegistryAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.Types <em>Types</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.Types
-   * @generated
-   */
-  public Adapter createTypesAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Iterator <em>IIterator</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see java.util.Iterator
-   * @generated
-   */
-  public Adapter createIIteratorAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.Types <em>ITypes</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see javax.wsdl.Types
-   * @generated
-   */
-  public Adapter createITypesAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.UnknownExtensibilityElement <em>Unknown Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.UnknownExtensibilityElement
-   * @generated
-   */
-  public Adapter createUnknownExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.XSDSchemaExtensibilityElement <em>XSD Schema Extensibility Element</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement
-   * @generated
-   */
-  public Adapter createXSDSchemaExtensibilityElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.wsdl.MessageReference <em>Message Reference</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.wst.wsdl.MessageReference
-   * @generated
-   */
-  public Adapter createMessageReferenceAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-  public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} //WSDLAdapterFactory

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java
deleted file mode 100644
index 09ef532..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import javax.wsdl.WSDLException;
-import javax.wsdl.xml.WSDLReader;
-
-import org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl;
-
-import com.ibm.wsdl.xml.WSDLReaderImpl;
-
-public class WSDLDefinitionFactory extends com.ibm.wsdl.factory.WSDLFactoryImpl
-{
-
-  private static WSDLDefinitionFactory instance = null;
-
-  public WSDLDefinitionFactory()
-  {
-    // Make sure the WSDL package is initialized.
-    WSDLPackageImpl.init();
-  }
-
-  /**
-   * Create a new instance of Definition.
-   */
-  public javax.wsdl.Definition newDefinition()
-  {
-    javax.wsdl.Definition definition = WSDLFactoryImpl.eINSTANCE.createDefinition();
-    return definition;
-  }
-
-  /**
-   * Returns a singleton instance of this factory
-   */
-  public static javax.wsdl.factory.WSDLFactory getInstance() throws WSDLException
-  {
-    if (instance == null)
-      instance = new WSDLDefinitionFactory();
-    return instance;
-  }
-
-  /**
-   * Creates a WSDLReader.
-   */
-  public WSDLReader newWSDLReader()
-  {
-    WSDLReader reader = new WSDLReaderImpl();
-    reader.setFactoryImplName(getClass().getName());
-    return reader;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java
deleted file mode 100644
index c19b0c4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-/**
- * An adapter interface used by {@link org.eclipse.wst.wsdl.ImportImpl to find referenced resources.
- * When the resource referenced by a wsdl import needs to be determined, 
- * the containing {@link org.eclipse.emf.ecore.resource.Resource}
- * will be {@link org.eclipse.emf.ecore.util.EcoreUtil#getRegisteredAdapter(org.eclipse.emf.ecore.resource.Resource,Object) inspected} 
- * for an adapter that implements this interface.
- * As such, you can register an adapter factory like this to tailor the algorithm used to locate the resource :
- *<pre>
- *  ResourceSet resourceSet = new ResourceSetImpl();
- *  resourceSet.getAdapterFactories().add
- *    (new AdapterFactoryImpl()
- *     {
- *       class CustomURIResolver extends AdapterImpl implements WSDLModelLocator
- *       {
- *         public String resolveURI(String baseLocation, String namespace, String location);
- *         {
- *           return null;  // Additional logic...
- *         }
- *
- *         public boolean isAdatperForType(Object type)
- *         {
- *           return type == WSDLModelLocator.class;
- *         }
- *       }
- *
- *       protected CustomURIResolver customURIResolver = new CustomURIResolver();
- *
- *       public boolean isFactoryForType(Object type)
- *       {
- *         return type == WSDLModelLocator.class;
- *       }
- *
- *       public Adapter adaptNew(Notifier target, Object type)
- *       {
- *         return customURIResolver;
- *       }
- *     });
- *</pre>
- * @see org.eclipse.emf.ecore.util.EcoreUtil#getRegisteredAdapter(org.eclipse.emf.ecore.resource.Resource,Object)
- */
-public interface WSDLModelLocator
-{
-	public String resolveURI(String baseLocation, String namespace, String location);
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java
deleted file mode 100644
index c3986a6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.util.WSDLResourceImpl
- * @generated
- */
-public class WSDLResourceFactoryImpl extends ResourceFactoryImpl
-{
-  /**
-   * Creates an instance of the resource factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLResourceFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * Creates an instance of the resource.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Resource createResource(URI uri)
-  {
-    Resource result = new WSDLResourceImpl(uri);
-    return result;
-  }
-} //WSDLResourceFactoryImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java
deleted file mode 100644
index f860668..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java
+++ /dev/null

@@ -1,1074 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.extensions.ExtensionRegistry;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.wsdl.WSDLPackage
- * @generated
- */
-public class WSDLSwitch {
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static WSDLPackage modelPackage;
-
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = WSDLPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  public Object doSwitch(EObject theEObject)
-  {
-    EClass theEClass = theEObject.eClass();
-    if (theEClass.eContainer() == modelPackage)
-    {
-      switch (theEClass.getClassifierID())
-      {
-        case WSDLPackage.PORT_TYPE:
-        {
-          PortType portType = (PortType)theEObject;
-          Object result = casePortType(portType);
-          if (result == null) result = caseWSDLElement(portType);
-          if (result == null) result = caseIPortType(portType);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.OPERATION:
-        {
-          Operation operation = (Operation)theEObject;
-          Object result = caseOperation(operation);
-          if (result == null) result = caseWSDLElement(operation);
-          if (result == null) result = caseIOperation(operation);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.MESSAGE:
-        {
-          Message message = (Message)theEObject;
-          Object result = caseMessage(message);
-          if (result == null) result = caseWSDLElement(message);
-          if (result == null) result = caseIMessage(message);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.PART:
-        {
-          Part part = (Part)theEObject;
-          Object result = casePart(part);
-          if (result == null) result = caseWSDLElement(part);
-          if (result == null) result = caseIPart(part);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.BINDING:
-        {
-          Binding binding = (Binding)theEObject;
-          Object result = caseBinding(binding);
-          if (result == null) result = caseExtensibleElement(binding);
-          if (result == null) result = caseIBinding(binding);
-          if (result == null) result = caseWSDLElement(binding);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.BINDING_OPERATION:
-        {
-          BindingOperation bindingOperation = (BindingOperation)theEObject;
-          Object result = caseBindingOperation(bindingOperation);
-          if (result == null) result = caseExtensibleElement(bindingOperation);
-          if (result == null) result = caseIBindingOperation(bindingOperation);
-          if (result == null) result = caseWSDLElement(bindingOperation);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.SERVICE:
-        {
-          Service service = (Service)theEObject;
-          Object result = caseService(service);
-          if (result == null) result = caseExtensibleElement(service);
-          if (result == null) result = caseIService(service);
-          if (result == null) result = caseWSDLElement(service);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.PORT:
-        {
-          Port port = (Port)theEObject;
-          Object result = casePort(port);
-          if (result == null) result = caseExtensibleElement(port);
-          if (result == null) result = caseIPort(port);
-          if (result == null) result = caseWSDLElement(port);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.EXTENSIBILITY_ELEMENT:
-        {
-          ExtensibilityElement extensibilityElement = (ExtensibilityElement)theEObject;
-          Object result = caseExtensibilityElement(extensibilityElement);
-          if (result == null) result = caseWSDLElement(extensibilityElement);
-          if (result == null) result = caseIExtensibilityElement(extensibilityElement);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.DEFINITION:
-        {
-          Definition definition = (Definition)theEObject;
-          Object result = caseDefinition(definition);
-          if (result == null) result = caseExtensibleElement(definition);
-          if (result == null) result = caseIDefinition(definition);
-          if (result == null) result = caseWSDLElement(definition);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.IMPORT:
-        {
-          Import import_ = (Import)theEObject;
-          Object result = caseImport(import_);
-          if (result == null) result = caseWSDLElement(import_);
-          if (result == null) result = caseIImport(import_);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.INPUT:
-        {
-          Input input = (Input)theEObject;
-          Object result = caseInput(input);
-          if (result == null) result = caseMessageReference(input);
-          if (result == null) result = caseWSDLElement(input);
-          if (result == null) result = caseIInput(input);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.OUTPUT:
-        {
-          Output output = (Output)theEObject;
-          Object result = caseOutput(output);
-          if (result == null) result = caseMessageReference(output);
-          if (result == null) result = caseWSDLElement(output);
-          if (result == null) result = caseIOutput(output);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.FAULT:
-        {
-          Fault fault = (Fault)theEObject;
-          Object result = caseFault(fault);
-          if (result == null) result = caseMessageReference(fault);
-          if (result == null) result = caseWSDLElement(fault);
-          if (result == null) result = caseIFault(fault);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.BINDING_INPUT:
-        {
-          BindingInput bindingInput = (BindingInput)theEObject;
-          Object result = caseBindingInput(bindingInput);
-          if (result == null) result = caseExtensibleElement(bindingInput);
-          if (result == null) result = caseIBindingInput(bindingInput);
-          if (result == null) result = caseWSDLElement(bindingInput);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.BINDING_OUTPUT:
-        {
-          BindingOutput bindingOutput = (BindingOutput)theEObject;
-          Object result = caseBindingOutput(bindingOutput);
-          if (result == null) result = caseExtensibleElement(bindingOutput);
-          if (result == null) result = caseIBindingOutput(bindingOutput);
-          if (result == null) result = caseWSDLElement(bindingOutput);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.BINDING_FAULT:
-        {
-          BindingFault bindingFault = (BindingFault)theEObject;
-          Object result = caseBindingFault(bindingFault);
-          if (result == null) result = caseExtensibleElement(bindingFault);
-          if (result == null) result = caseIBindingFault(bindingFault);
-          if (result == null) result = caseWSDLElement(bindingFault);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.NAMESPACE:
-        {
-          Namespace namespace = (Namespace)theEObject;
-          Object result = caseNamespace(namespace);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.TYPES:
-        {
-          Types types = (Types)theEObject;
-          Object result = caseTypes(types);
-          if (result == null) result = caseExtensibleElement(types);
-          if (result == null) result = caseITypes(types);
-          if (result == null) result = caseWSDLElement(types);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT:
-        {
-          UnknownExtensibilityElement unknownExtensibilityElement = (UnknownExtensibilityElement)theEObject;
-          Object result = caseUnknownExtensibilityElement(unknownExtensibilityElement);
-          if (result == null) result = caseExtensibilityElement(unknownExtensibilityElement);
-          if (result == null) result = caseWSDLElement(unknownExtensibilityElement);
-          if (result == null) result = caseIExtensibilityElement(unknownExtensibilityElement);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT:
-        {
-          XSDSchemaExtensibilityElement xsdSchemaExtensibilityElement = (XSDSchemaExtensibilityElement)theEObject;
-          Object result = caseXSDSchemaExtensibilityElement(xsdSchemaExtensibilityElement);
-          if (result == null) result = caseExtensibilityElement(xsdSchemaExtensibilityElement);
-          if (result == null) result = caseWSDLElement(xsdSchemaExtensibilityElement);
-          if (result == null) result = caseIExtensibilityElement(xsdSchemaExtensibilityElement);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        default: return defaultCase(theEObject);
-      }
-    }
-    return defaultCase(theEObject);
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLElement(WSDLElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Port Type</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Port Type</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object casePortType(PortType object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Operation</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Operation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseOperation(Operation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Message</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Message</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseMessage(Message object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Part</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Part</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object casePart(Part object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseBinding(Binding object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding Operation</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding Operation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseBindingOperation(BindingOperation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Service</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Service</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseService(Service object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Port</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Port</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object casePort(Port object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseExtensibilityElement(ExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Definition</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseDefinition(Definition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Import</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Import</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseImport(Import object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Extensible Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Extensible Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseExtensibleElement(ExtensibleElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Input</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Input</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseInput(Input object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Output</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Output</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseOutput(Output object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Fault</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseFault(Fault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding Input</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding Input</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseBindingInput(BindingInput object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding Output</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding Output</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseBindingOutput(BindingOutput object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Binding Fault</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Binding Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseBindingFault(BindingFault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Namespace</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Namespace</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseNamespace(Namespace object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IPort Type</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IPort Type</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIPortType(javax.wsdl.PortType object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IOperation</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IOperation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIOperation(javax.wsdl.Operation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IInput</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IInput</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIInput(javax.wsdl.Input object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IOutput</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IOutput</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIOutput(javax.wsdl.Output object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IFault</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IFault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIFault(javax.wsdl.Fault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IMessage</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IMessage</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIMessage(javax.wsdl.Message object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IPart</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IPart</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIPart(javax.wsdl.Part object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IService</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IService</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIService(javax.wsdl.Service object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IPort</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IPort</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIPort(javax.wsdl.Port object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IBinding</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IBinding</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIBinding(javax.wsdl.Binding object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IBinding Operation</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IBinding Operation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIBindingOperation(javax.wsdl.BindingOperation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IBinding Input</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IBinding Input</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIBindingInput(javax.wsdl.BindingInput object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IBinding Output</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IBinding Output</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIBindingOutput(javax.wsdl.BindingOutput object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IBinding Fault</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IBinding Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIBindingFault(javax.wsdl.BindingFault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IDefinition</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IDefinition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIDefinition(javax.wsdl.Definition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IImport</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IImport</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIImport(javax.wsdl.Import object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IList</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IList</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIList(List object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IMap</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IMap</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIMap(Map object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IURL</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IURL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIURL(URL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IExtension Registry</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IExtension Registry</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIExtensionRegistry(ExtensionRegistry object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Types</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Types</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseTypes(Types object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IIterator</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IIterator</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIIterator(Iterator object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>ITypes</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>ITypes</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseITypes(javax.wsdl.Types object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Unknown Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Unknown Extensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseUnknownExtensibilityElement(UnknownExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>XSD Schema Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>XSD Schema Extensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseXSDSchemaExtensibilityElement(XSDSchemaExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Message Reference</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Message Reference</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseMessageReference(MessageReference object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  public Object defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //WSDLSwitch

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java
deleted file mode 100644
index da79b04..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class WSDLUtil extends WSDLConstants
-{
-  protected static WSDLUtil instance;
-  //  protected NodeAssociationManager nodeAssociationManager = new NodeAssociationManager();
-
-  protected HashMap elementNameToTypeMap = new HashMap();
-
-  public static WSDLUtil getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new WSDLUtil();
-    }
-    return instance;
-  }
-
-  public WSDLUtil()
-  {
-    elementNameToTypeMap.put(BINDING_ELEMENT_TAG, new Integer(BINDING));
-    elementNameToTypeMap.put(DEFINITION_ELEMENT_TAG, new Integer(DEFINITION));
-    elementNameToTypeMap.put(DOCUMENTATION_ELEMENT_TAG, new Integer(DOCUMENTATION));
-    elementNameToTypeMap.put(FAULT_ELEMENT_TAG, new Integer(FAULT));
-    elementNameToTypeMap.put(IMPORT_ELEMENT_TAG, new Integer(IMPORT));
-    elementNameToTypeMap.put(INPUT_ELEMENT_TAG, new Integer(INPUT));
-    elementNameToTypeMap.put(MESSAGE_ELEMENT_TAG, new Integer(MESSAGE));
-    elementNameToTypeMap.put(OPERATION_ELEMENT_TAG, new Integer(OPERATION));
-    elementNameToTypeMap.put(OUTPUT_ELEMENT_TAG, new Integer(OUTPUT));
-    elementNameToTypeMap.put(PART_ELEMENT_TAG, new Integer(PART));
-    elementNameToTypeMap.put(PORT_ELEMENT_TAG, new Integer(PORT));
-    elementNameToTypeMap.put(PORT_TYPE_ELEMENT_TAG, new Integer(PORT_TYPE));
-    elementNameToTypeMap.put(SERVICE_ELEMENT_TAG, new Integer(SERVICE));
-    elementNameToTypeMap.put(TYPES_ELEMENT_TAG, new Integer(TYPES));
-  }
-
-  public int getWSDLType(Element element)
-  {
-    int result = -1;
-
-    Integer integer = (Integer) elementNameToTypeMap.get(element.getLocalName());
-    if (integer != null)
-    {
-      result = integer.intValue();
-    }
-    return result;
-  }
-
-  protected List getParentElementChain(Element element)
-  {
-    List list = new ArrayList();
-    while (element != null)
-    {
-      list.add(0, element);
-      Node node = element.getParentNode();
-      element = (node != null && node.getNodeType() == Node.ELEMENT_NODE) ? (Element) node : null;
-    }
-    return list;
-  }
-
-  /*
-    public Object findModelObjectForElement(Definition definition, Element targetElement)
-    {   
-      Object o = nodeAssociationManager.getModelObjectForNode(definition, targetElement);
-      return o;
-    }
-  
-              
-    public Element getElementForObject(Object o)
-    {      
-      Node node = nodeAssociationManager.getNode(o);  
-      return (node != null && node.getNodeType() == Node.ELEMENT_NODE) ? (Element)node : null;                  
-    }
-    
-    public Node getNodeForObject(Object o)
-    {      
-      return nodeAssociationManager.getNode(o);                      
-    }
-  
-    public ITypeSystemProvider getTypeSystemProvider(Definition definition)
-    {      
-      return WSDLToDOMElementUtil.getTypeSystemProvider(definition);                    
-    }
-  
-  
-    public void setTypeSystemProvider(Definition definition, ITypeSystemProvider typeSystemProvider)
-    {      
-      WSDLToDOMElementUtil.setTypeSystemProvider(definition, typeSystemProvider);                      
-    }   
-  */
-
-  public static QName createQName(Definition definition, String prefixedName)
-  {
-    QName qname = null;
-    if (prefixedName != null)
-    {
-      int index = prefixedName.indexOf(":");
-      String prefix = (index == -1) ? null : prefixedName.substring(0, index);
-      if (prefix != null)
-      {
-        String namespace = definition.getNamespace(prefix);
-        if (namespace != null)
-        {
-          String localPart = prefixedName.substring(index + 1);
-          qname = new QName(namespace, localPart);
-        }
-      }
-    }
-    return qname;
-  }
-
-  public List getExtensibilityElementNodes(ExtensibleElement extensibleElement)
-  {
-    List childList = new ArrayList();
-    for (Iterator i = extensibleElement.getEExtensibilityElements().iterator(); i.hasNext();)
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement) i.next();
-      if (extensibilityElement != null)
-      {
-        Element element = extensibilityElement.getElement();
-        if (element != null)
-        {
-          childList.add(element);
-        }
-      }
-    }
-    return childList;
-    //return extensibleElement.getEExtensibilityElements();
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java
deleted file mode 100644
index 8e4ee81..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocatorAdapterFactory extends AdapterFactoryImpl
-{
-    protected XSDSchemaLocatorImpl schemaLocator = new XSDSchemaLocatorImpl();
-
-    public boolean isFactoryForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }
-
-    public Adapter adaptNew(Notifier target, Object type)
-    {
-      return schemaLocator;
-    }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java
deleted file mode 100644
index 1833595..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.internal.util;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocatorImpl extends AdapterImpl implements XSDSchemaLocator
-{
-    /**
-     * @see org.eclipse.xsd.util.XSDSchemaLocator#locateSchema(org.eclipse.xsd.XSDSchema,
-     *      java.lang.String, java.lang.String, java.lang.String)
-     */
-    public XSDSchema locateSchema(XSDSchema xsdSchema, String namespaceURI, String rawSchemaLocationURI, String resolvedSchemaLocationURI)
-    {
-      XSDSchema resolvedSchema = null;
-
-      if (namespaceURI != null)
-      {
-        Definition definition = null;
-
-        for (EObject parent = xsdSchema.eContainer(); parent != null; parent = parent.eContainer())
-        {
-          if (parent instanceof Definition)
-          {
-            definition = (Definition) parent;
-            break;
-          }
-        }
-
-        if (definition != null && definition.getETypes() != null)
-        {
-          for (Iterator i = definition.getETypes().getEExtensibilityElements().iterator(); i.hasNext();)
-          {
-            Object o = i.next();
-            if (o instanceof XSDSchemaExtensibilityElement)
-            {
-              XSDSchema schema = ((XSDSchemaExtensibilityElement) o).getSchema();
-              if (schema != null && namespaceURI.equals(schema.getTargetNamespace()))
-              {
-                resolvedSchema = schema;
-                break;
-              }
-            }
-          }
-        }
-      }
-      return resolvedSchema;      
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }  
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.html b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.html
deleted file mode 100644
index 8522de0..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.html
+++ /dev/null

@@ -1,21 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>WSDL Model API Overview</title>
-</head>
-<body>
-<p>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</p>
-<table width="500">
-<tr>
-<td>
-<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p>
-</td>
-</tr>
-</table>
-</body>
-</html>

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml
deleted file mode 100644
index 6ba5ba9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml
+++ /dev/null

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>WSDL Model API Overview</title>
-	</head>
-
-	<body>
-		<abstract>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</abstract>
-		<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p> 
-	</body>
-</html>

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java
deleted file mode 100644
index f17c690..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.util;
-
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-
-public interface ExtensibilityElementFactory
-{
-  ExtensibilityElement createExtensibilityElement(String namespace, String localName);
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java
deleted file mode 100644
index d8528ca..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.util;
-
-public interface ExtensibilityElementFactoryRegistry
-{
-  public void registerFactory(String namespace, ExtensibilityElementFactory factory);
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java
deleted file mode 100644
index 3fb94d5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.util;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class WSDLConstants
-{
-  public static final int BINDING = 0;
-  public static final int DEFINITION = 1;
-  public static final int DOCUMENTATION = 2;
-  public static final int FAULT = 3;
-  public static final int IMPORT = 4;
-  public static final int INPUT = 5;
-  public static final int MESSAGE = 6;
-  public static final int OPERATION = 7;
-  public static final int OUTPUT = 8;
-  public static final int PART = 9;
-  public static final int PORT = 10;
-  public static final int PORT_TYPE = 11;
-  public static final int SERVICE = 12;
-  public static final int TYPES = 13;
-  public static final int ELEMENT = 14;
-  public static final int TYPE = 15;
-
-  public static final int EXTENSIBILITY_ELEMENT = 24;
-
-  public static final String BINDING_ELEMENT_TAG = "binding";
-  public static final String DEFINITION_ELEMENT_TAG = "definitions";
-  public static final String DOCUMENTATION_ELEMENT_TAG = "documentation";
-  public static final String FAULT_ELEMENT_TAG = "fault";
-  public static final String IMPORT_ELEMENT_TAG = "import";
-  public static final String INPUT_ELEMENT_TAG = "input";
-  public static final String MESSAGE_ELEMENT_TAG = "message";
-  public static final String OPERATION_ELEMENT_TAG = "operation";
-  public static final String OUTPUT_ELEMENT_TAG = "output";
-  public static final String PART_ELEMENT_TAG = "part";
-  public static final String PORT_ELEMENT_TAG = "port";
-  public static final String PORT_TYPE_ELEMENT_TAG = "portType";
-  public static final String SERVICE_ELEMENT_TAG = "service";
-  public static final String TYPES_ELEMENT_TAG = "types";
-
-  // common
-  public static final String NAME_ATTRIBUTE = "name";
-  public static final String MESSAGE_ATTRIBUTE = "message";
-  public static final String BINDING_ATTRIBUTE = "binding";
-  public static final String TYPE_ATTRIBUTE = "type";
-
-  // definitions
-  public final static String ENCODING_ATTRIBUTE = "encoding";
-  public final static String TARGETNAMESPACE_ATTRIBUTE = "targetNamespace";
-
-  // binding
-  public final static String RESOURCE_URI_ATTRIBUTE = "resourceURI";
-
-  // part
-  public final static String ELEMENT_ATTRIBUTE = "element";
-  
-  // import
-  public final static String LOCATION_ATTRIBUTE = "location"; 
-  public static final String NAMESPACE_ATTRIBUTE = "namespace";  
-
-  public static final String WSDL_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/";
-  public static final String XSD_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema";
-
-  /**
-   * The value <code>http://www.w3.org/1999/XMLSchema"</code>.
-   */
-  public static final String SCHEMA_FOR_SCHEMA_URI_1999 = "http://www.w3.org/1999/XMLSchema";
-
-  /**
-   * The value <code>"http://www.w3.org/2000/10/XMLSchema"</code>.
-   */
-  public static final String SCHEMA_FOR_SCHEMA_URI_2000_10 = "http://www.w3.org/2000/10/XMLSchema";
-
-  /**
-   * The value <code>"http://www.w3.org/2001/XMLSchema"</code>.
-   */
-  public static final String SCHEMA_FOR_SCHEMA_URI_2001 = "http://www.w3.org/2001/XMLSchema";
-
-  public static final String[] ELEMENT_TAGS =
-    new String[] {
-      BINDING_ELEMENT_TAG,
-      DEFINITION_ELEMENT_TAG,
-      DOCUMENTATION_ELEMENT_TAG,
-      FAULT_ELEMENT_TAG,
-      IMPORT_ELEMENT_TAG,
-      INPUT_ELEMENT_TAG,
-      MESSAGE_ELEMENT_TAG,
-      OPERATION_ELEMENT_TAG,
-      OUTPUT_ELEMENT_TAG,
-      PART_ELEMENT_TAG,
-      PORT_ELEMENT_TAG,
-      PORT_TYPE_ELEMENT_TAG,
-      SERVICE_ELEMENT_TAG,
-      TYPES_ELEMENT_TAG };
-
-  public static final int nodeType(String localName)
-  {
-    for (int i = 0; i < ELEMENT_TAGS.length; ++i)
-    {
-      if (localName.equals(ELEMENT_TAGS[i]))
-      {
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  public static final int nodeType(Node node)
-  {
-    return isWSDLNamespace(node.getNamespaceURI()) ? nodeType(node.getLocalName()) : -1;
-  }
-
-  /**
-   * Returns whether the given namespace is the WSDL namespace or not.
-   * @param namespace a namespace.
-   * @return whether the given namespace is the WSDL namespace or not.
-   */
-  public static boolean isWSDLNamespace(String namespace)
-  {
-    return WSDL_NAMESPACE_URI.equals(namespace);
-  }
-
-  public static boolean isMatchingNamespace(String namespace1, String namespace2)
-  {
-    return (namespace1 == null ? namespace2 == null : namespace1.equals(namespace2));
-  }
-
-  public static String getAttribute(Element element, String attributeName)
-  {
-    return element.hasAttribute(attributeName) ? element.getAttribute(attributeName) : null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceFactoryRegistry.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceFactoryRegistry.java
deleted file mode 100644
index d38dda9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceFactoryRegistry.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.Resource.Factory;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * This class provides support for the loading of WSDL or XSD resource from
- * URI's that don't end with .xsd or .wsdl extensions.
- * 
- * These URI's foil EMF's standard resource loading mechanism wich assumes that
- * a resource type can always be deduced from the file extension.
- * 
- *  Code Example:
- *    ResourceSet resourceSet = new ResourceSetImpl();
- *    WSDLResourceFactoryRegistry registry = new WSDLResourceFactoryRegistry(Resource.Factory.Registry.INSTANCE);
- *    resourceSet.setResourceFactoryRegistry(registry);
- */
-public class WSDLResourceFactoryRegistry implements Resource.Factory.Registry
-{
-  protected Resource.Factory.Registry parent;
-
-  public WSDLResourceFactoryRegistry(Resource.Factory.Registry parent)
-  {
-    this.parent = parent;
-  }
-
-  public Map getExtensionToFactoryMap()
-  {
-    return parent.getExtensionToFactoryMap();
-  }
-
-  public Map getProtocolToFactoryMap()
-  {
-    return parent.getProtocolToFactoryMap();
-  }
-
-  public Factory getFactory(URI uri)
-  {
-    String uriString = uri.toString();
-
-    Factory factory = parent.getFactory(uri);
-    Factory defaultFactory = (Factory) INSTANCE.getFactory(URI.createURI(DEFAULT_EXTENSION));
-
-    // give the parent the first crack at getting the factory
-    // if the factory is null or the known 'default' factory then we'll
-    // try to compute the factory ourselves
-    if (factory == null || factory == defaultFactory)
-    {
-      if (uriString.endsWith("wsdl") || uriString.endsWith("WSDL"))
-      {
-        // handle cases like "http://xxx/Distance.jws?wsdl"
-        //          	
-        factory = parent.getFactory(URI.createURI("*.wsdl"));
-      }
-      else if (uriString.endsWith("xsd") || uriString.endsWith("XSD"))
-      {
-        // handle cases like "http://xxx/Distance.jws?xsd"
-        //        	
-        factory = parent.getFactory(URI.createURI("*.xsd"));
-      }
-      else //if (uri.fileExtension() == null)
-        {
-        // handle cases like "http://xxx/example?getQuote"
-        //              	
-        // finally we must resort to opening the uri's stream and
-        // peeking at the content to determine if its an xsd or wsdl
-        //         	
-        String rootElementName = getRootElementName(uriString);
-        if (rootElementName != null)
-        {
-          if (rootElementName.equals("schema"))
-          {
-            factory = parent.getFactory(URI.createURI("*.xsd"));
-          }
-          else if (rootElementName.equals("definitions"))
-          {
-            factory = parent.getFactory(URI.createURI("*.wsdl"));
-          }
-        }
-      }
-    }
-    return factory;
-  }
-
-  // this method uses a SAX Parser to parser a stream and determine the root element name
-  // of any xml content
-  private String getRootElementName(String uri)
-  {
-    RootElementNameContentHandler handler = new RootElementNameContentHandler();
-    try
-    {
-      XMLReader reader = XMLReaderFactory.createXMLReader();
-      reader.setContentHandler(handler);
-      reader.parse(uri);
-    }
-    catch (Exception e)
-    {
-    }
-
-    return handler.rootElementName;
-  }
-
-  protected static class RootElementNameContentHandler extends DefaultHandler
-  {
-    public String rootElementName;
-
-    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
-    {
-      rootElementName = localName;
-
-      // here I throw an exception to make the SAX Parser to stop parsing
-      throw new SAXException("SAXParser intentonally stopped");
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java
deleted file mode 100644
index 85d8555..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java
+++ /dev/null

@@ -1,428 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.internal.util.XSDSchemaLocatorAdapterFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource</b> implementation for the model.
- * This specialized resource implementation supports it's own way of making keys and 
- * hrefs, and it's own serialization. This class is not intended for subclassing 
- * outside of the model implementation; it is intended to be used as is with the 
- * Resource framework.
- * <!-- end-user-doc -->
- * @see org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl
- * @generated
- */
-public class WSDLResourceImpl extends ResourceImpl 
-{
-
-  private boolean useExtensionFactories = true;
-  private boolean continueOnLoadError = true;
-
-  public static String USE_EXTENSION_FACTORIES = "USE_EXTENSION_FACTORIES";
-  public static String CONTINUE_ON_LOAD_ERROR = "CONTINUE_ON_LOAD_ERROR";
-  public static String WSDL_ENCODING = "WSDL_ENCODING";
-
-  /**
-   * Creates an instance of the resource. 
-   * <!-- begin-user-doc --> 
-   * <!-- end-user-doc -->
-   * 
-   * @param uri the URI of the new resource. 
-   * @generated
-   */
-  public WSDLResourceImpl(URI uri)
-  {
-    super(uri);
-  }
-
-  protected void doSave(OutputStream os, Map options) throws IOException
-  {
-    Definition definition = getDefinition();
-    if (definition != null)
-    {
-      Document document = definition.getDocument();
-      if (document == null)
-      {
-        ((DefinitionImpl) definition).updateDocument();
-        document = definition.getDocument();
-      }
-
-      if (definition.getElement() == null)
-      {
-        ((DefinitionImpl) definition).updateElement();
-      }
-
-      doSerialize(os, document, options == null ? null : (String) options.get(WSDL_ENCODING));
-    }
-  }
-
-  /**
-   * Returns the resource's Definition.
-   */
-  public Definition getDefinition()
-  {
-    return getContents().size() == 1 && getContents().get(0) instanceof Definition ? (Definition) getContents().get(0) : null;
-  }
-
-  private static void doSerialize(OutputStream outputStream, Document document) throws IOException
-  {
-    doSerialize(outputStream, document, null);
-  }
-
-  private static void doSerialize(OutputStream outputStream, Document document, String encoding)
-  {
-    try
-    {
-      TransformerFactory transformerFactory = TransformerFactory.newInstance();
-      Transformer transformer = transformerFactory.newTransformer();
-
-      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-      transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-      
-      // Unless a width is set, there will be only line breaks but no indentation.
-      // The IBM JDK and the Sun JDK don't agree on the property name,
-      // so we set them both.
-      //
-      transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "2");
-      transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-      if (encoding != null)
-      {
-        transformer.setOutputProperty(OutputKeys.ENCODING, encoding);
-      }
-
-      transformer.transform(new DOMSource(document), new StreamResult(outputStream));
-    }
-    catch (TransformerException exception)
-    {
-      WSDLPlugin.INSTANCE.log(exception);
-    }
-  }
-
-  /**
-   * Loads a new {@link WSDLResourceImpl} into the resource set.
-   * @param resourceSet the resource set to hold the new resource.
-   * @param uri the URI of the new resource.
-   * @param inputStream the contents of the new resource.
-   * @param options any options to influence loading behavior.
-   * @return a new WSDLResourceImpl.
-   */
-  protected void doLoad(InputStream inputStream, Map options) throws IOException
-  {
-    // This pattern avoids loading the IProgressMonitor class when there is no progress monitor.
-    // This is important for stand-alone execution to work correctly.
-    //
-    IProgressMonitor progressMonitor = null;
-    Object monitor = options == null ? null : options.get("WSDL_PROGRESS_MONITOR");
-    if (monitor != null)
-    {
-      progressMonitor = (IProgressMonitor) monitor;
-      progressMonitor.setTaskName(WSDLPlugin.INSTANCE.getString("_UI_ResourceLoad_progress"));
-      progressMonitor.subTask(getURI().toString());
-    }
-
-    Object bindings = options == null ? null : options.get(USE_EXTENSION_FACTORIES);
-    if (bindings != null && bindings instanceof Boolean) 
-      // true by default
-      useExtensionFactories = ((Boolean)bindings).booleanValue();
- 
-    Object continueOnError = options == null ? null : options.get(CONTINUE_ON_LOAD_ERROR);
-    if (continueOnError != null && continueOnError instanceof Boolean) 
-      // true by default
-    	continueOnLoadError = ((Boolean)continueOnError).booleanValue();
-    
-    Document doc = null;
-    try
-    {
-      // Create a DOM document
-      doc = getDocument(inputStream, new InternalErrorHandler());
-
-      if (doc != null && doc.getDocumentElement() != null)
-      {
-        if (!findDefinition(doc.getDocumentElement()))
-        {
-          if (continueOnLoadError)
-            handleDefinitionElement(doc.getDocumentElement());
-          else
-            throw new IOException(WSDLPlugin.getPlugin().getString("_ERROR_INVALID_WSDL"));
-        }
-      }
-      else
-      {
-        handleDefinitionElement(null);
-      }
-    }
-    catch (IOException exception)
-    {
-      if (continueOnLoadError)
-      {
-        WSDLPlugin.INSTANCE.log(exception);
-        handleDefinitionElement(null);
-      }
-      else
-      	throw exception;
-    }
-
-    Definition definition = null;
-
-    for (Iterator i = getContents().iterator(); i.hasNext();)
-    {
-      definition = (Definition) i.next();
-
-      // Initialize the inline schemas location 
-      Types types = definition.getETypes();
-      if (types != null)
-      {
-        XSDSchemaExtensibilityElement el = null;
-        for (Iterator j = types.getEExtensibilityElements().iterator(); j.hasNext();)
-        {
-          el = (XSDSchemaExtensibilityElement) j.next();
-          XSDSchema schema = el.getSchema();
-          if (schema != null)
-            schema.setSchemaLocation(getURI().toString());
-        }
-      }
-    }
-
-    if (progressMonitor != null)
-    {
-      progressMonitor.worked(1);
-    }
-  }
-
-  /**
-   * Builds a document using Xerces.
-   * @param inputStream the contents to parse.
-   * @param errorHandler the handled used by the parser.
-   * @return a document.
-   */
-  private static Document getDocument(InputStream inputStream, ErrorHandler errorHandler) throws IOException
-  {
-    ClassLoader previousClassLoader = Thread.currentThread().getContextClassLoader();
-    try
-    {
-      Thread.currentThread().setContextClassLoader(WSDLResourceFactoryImpl.class.getClassLoader());
-
-      DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-      documentBuilderFactory.setNamespaceAware(true);
-      documentBuilderFactory.setValidating(false);
-
-      DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
-
-      // TBD - Revisit
-      //EntityResolver entityResolver = createEntityResolver();
-      //documentBuilder.setEntityResolver(entityResolver);
-
-      documentBuilder.setErrorHandler(errorHandler);
-
-      Document document = documentBuilder.parse(inputStream);
-      return document;
-    }
-    catch (ParserConfigurationException exception)
-    {
-      throw new IOWrappedException(exception);
-    }
-    catch (SAXException exception)
-    {
-      throw new IOWrappedException(exception);
-    }
-    finally
-    {
-      Thread.currentThread().setContextClassLoader(previousClassLoader);
-    }
-  }
-
-  private boolean findDefinition(Element element)
-  {
-    if (WSDLConstants.nodeType(element) == WSDLConstants.DEFINITION)
-    {
-      handleDefinitionElement(element);
-      return true;
-    }
-    else
-    {
-      boolean result = false;
-      /*
-      for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling())
-      {
-        if (child instanceof Element)
-        {
-          if (findDefinition((Element) child))
-          {
-            result = true;
-          }
-        }
-      }
-      */
-      return result;
-    }
-  }
-
-  private void handleDefinitionElement(Element element)
-  {
-    Definition definition = null;
-    if (element == null)
-    {
-      definition = WSDLFactory.eINSTANCE.createDefinition();
-      ((DefinitionImpl)definition).setUseExtensionFactories(useExtensionFactories);
-    }
-    else
-    {
-      definition = DefinitionImpl.createDefinition
-	    (element,getURI().toString(),useExtensionFactories);
-    }
-    getContents().add(definition);
-    // Do we need the next line?
-    ((DefinitionImpl) definition).reconcileReferences(true);
-  }
-
-  public static void serialize(OutputStream outputStream, Document document)
-  {
-    serialize(outputStream, document, null);
-  }
-
-  public static void serialize(OutputStream outputStream, Document document, String encoding)
-  {
-    doSerialize(outputStream, document, encoding);
-  }
-
-  public static void serialize(OutputStream outputStream, Element element)
-  {
-    serialize(outputStream, element, null);
-  }
-
-  public static void serialize(OutputStream outputStream, Element element, String encoding)
-  {
-    try
-    {
-      doSerialize(outputStream, element, encoding);
-    }
-    catch (Exception exception)
-    {
-      exception.printStackTrace();
-    }
-  }
-
-  private static void doSerialize(OutputStream outputStream, Element element, String encoding) throws IOException
-  {
-    try
-    {
-      TransformerFactory transformerFactory = TransformerFactory.newInstance();
-      Transformer transformer = transformerFactory.newTransformer();
-
-      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-      transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-      if (encoding != null)
-      {
-        transformer.setOutputProperty(OutputKeys.ENCODING, encoding);
-      }
-
-      transformer.transform(new DOMSource(element), new StreamResult(outputStream));
-    }
-    catch (TransformerException exception)
-    {
-      WSDLPlugin.INSTANCE.log(exception);
-    }
-  }
- 
-  private class InternalErrorHandler implements ErrorHandler
-  {
-    public void error(SAXParseException e)
-    {
-      System.out.println("WSDL PARSE ERROR: " + e);
-    }
-    
-    public void fatalError(SAXParseException e)
-    {
-      System.out.println("WSDL PARSE FATAL ERROR: " + e);
-    }
-    
-    public void warning(SAXParseException e)
-    {
-      System.out.println("WSDL PARSE WARNING: " + e);
-    }
-  } 
-  
-  
-  public void attached(EObject eObject)
-  {
-    super.attached(eObject);
-     
-    // we need to attach a XSDSchemaLocator in order to resolve inline schema locations
-    // if there's not already one attached
-    XSDSchemaLocator xsdSchemaLocator = (XSDSchemaLocator)EcoreUtil.getRegisteredAdapter(this, XSDSchemaLocator.class);
-    if (xsdSchemaLocator == null)
-    {
-      getResourceSet().getAdapterFactories().add(new XSDSchemaLocatorAdapterFactory());  
-    } 
-    
-    if (eObject instanceof DefinitionImpl)
-    {
-      DefinitionImpl definition = (DefinitionImpl) eObject;
-      definition.setInlineSchemaLocations(this);    
-    }
-  }
-  /*
-  public void setInlineSchemaLocations(Definition definition)
-  {
-    // Initialize the inline schemas location 
-    Types types = definition.getETypes();
-    if (types != null)
-    {
-      for (Iterator j = types.getEExtensibilityElements().iterator(); j.hasNext();)
-      {
-        XSDSchemaExtensibilityElement el = (XSDSchemaExtensibilityElement) j.next();
-        XSDSchema schema = el.getSchema();
-        if (schema != null)
-        {  
-          schema.setSchemaLocation(getURI().toString());
-        }  
-      }        
-    }      
-  }*/
-} //WSDLResourceFactoryImpl

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html
deleted file mode 100644
index 344eb76..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>WSDL Model API Overview</title>
-</head>
-<body>
-<p>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</p>
-<table width="500">
-<tr>
-<td>
-<p>
-		The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p>
-</td>
-</tr>
-</table>
-</body>
-</html>

diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml
deleted file mode 100644
index f25a0e9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>WSDL Model API Overview</title>
-	</head>
-
-	<body>
-		<abstract>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</abstract>
-		<p>
-		The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p> 
-	</body>
-</html>

diff --git a/bundles/org.eclipse.wst.wsi.ui/.classpath b/bundles/org.eclipse.wst.wsi.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.wst.wsi.ui/.cvsignore b/bundles/org.eclipse.wst.wsi.ui/.cvsignore
deleted file mode 100644
index 8192f28..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-temp.folder
-wsiui.jar
-build.xml
-@dot

diff --git a/bundles/org.eclipse.wst.wsi.ui/.project b/bundles/org.eclipse.wst.wsi.ui/.project
deleted file mode 100644
index ce11104..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsi.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9ddca0d..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,41 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.wsi.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %_PROVIDER_NAME
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.wsi.ui.internal,
- org.eclipse.wst.wsi.ui.internal.actions,
- org.eclipse.wst.wsi.ui.internal.actions.actionDelegates,
- org.eclipse.wst.wsi.ui.internal.actions.icons,
- org.eclipse.wst.wsi.ui.internal.wizards
-Require-Bundle: org.eclipse.jface.text,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.ide;resolution:=optional,
- org.eclipse.ui.views;resolution:=optional,
- org.eclipse.ui.editors;resolution:=optional,
- org.eclipse.jface.text;resolution:=optional,
- org.eclipse.ui.workbench.texteditor;resolution:=optional,
- org.eclipse.jface,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.wst.common.ui,
- org.eclipse.wst.validation,
- org.eclipse.wst.wsdl.validation,
- org.eclipse.wst.wsi,
- org.eclipse.wst.internet.monitor.core,
- org.eclipse.wst.internet.monitor.ui,
- org.eclipse.core.runtime.compatibility,
- org.wsdl4j,
- org.eclipse.core.runtime;bundle-version="2.1.0",
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.xml.core
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.wst.wsi.ui.internal.WSIUIPlugin

diff --git a/bundles/org.eclipse.wst.wsi.ui/about.html b/bundles/org.eclipse.wst.wsi.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi.ui/build.properties b/bundles/org.eclipse.wst.wsi.ui/build.properties
deleted file mode 100644
index c8570f2..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/build.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               icons/,\
-               META-INF/,\
-               about.html
-source.. = src/
-jars.compile.order = .
-output.. = bin/
-src.includes = build.properties

diff --git a/bundles/org.eclipse.wst.wsi.ui/icons/full/obj16/validate.gif b/bundles/org.eclipse.wst.wsi.ui/icons/full/obj16/validate.gif
deleted file mode 100644
index 90eb115..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/icons/full/obj16/validate.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsi.ui/icons/wsi_logfile_obj.gif b/bundles/org.eclipse.wst.wsi.ui/icons/wsi_logfile_obj.gif
deleted file mode 100644
index e8b1110..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/icons/wsi_logfile_obj.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsi.ui/plugin.properties b/bundles/org.eclipse.wst.wsi.ui/plugin.properties
deleted file mode 100644
index bbc65bb..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/plugin.properties
+++ /dev/null

@@ -1,74 +0,0 @@
-# /*******************************************************************************
-#  * Copyright (c) 2002-2005 IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM - Initial API and implementation
-#  *******************************************************************************/
-!-- Constants for strings  
-
-_PLUGIN_NAME                  = Soap Monitor
-_PROVIDER_NAME                = Eclipse.org
-_UI_XML_EDITOR                = XML Editor
-_UI_WSI_VALIDATOR             = WS-I Message Validator
-_UI_ACTION_VALIDATE           = Validate WS-I Log File
-_UI_WIZARD_VALIDATE_LOG_TITLE = Validate WS-I Message Log File
-
-
-_UI_VIEW_SS_FILE_IMPORT_BUTTON = Import Files...
-_UI_VIEW_SS_FILE_SOURCE_FILES = Workbench Files
-
-_UI_DIALOG_SS_FILE_SHELL_TEXT  = Select File
-_UI_DIALOG_SS_FILE_TITLE       = Select a File
-_UI_DIALOG_SS_FILE_DESCRIPTION = Select a file from the workbench.
-
-_UI_WIZARD_V_SELECT_LOG_FILENAME_HEADING   = Specify the WS-I Message Log File Name
-_UI_WIZARD_V_SELECT_LOG_FILENAME_EXPL      = Select a folder and specify a message log file name
-_UI_WIZARD_V_SELECT_WSDL_FILENAME_HEADING  = Include WSDL File
-_UI_WIZARD_V_SELECT_WSDL_FILENAME_EXPL     = Optionally select a WSDL file for the Web service
-_UI_WIZARD_V_SELECT_WSDL_ELEMENT_HEADING   = Specify the WSDL element to be Analyzed
-_UI_WIZARD_V_SELECT_WSDL_ELEMENT_EXPL      = Indicate the name, type, and namespace of the WSDL element to be analyzed
-
-_UI_WIZARD_V_INCLUDE_WSDL_BUTTON           = Include WSDL document for Web service
-_UI_WIZARD_V_INCLUDE_WSDL_LABEL            = Enter the location of the WSDL document for the Web service
-_UI_WIZARD_V_VALID_WSDL_LABEL              = *Note: You can only select the Next button if the WSDL document is valid.
-_UI_WIZARD_V_WORKBENCH_BUTTON              = Workbench...
-_UI_WIZARD_V_BROWSE_BUTTON                 = Browse...
-_UI_WIZARD_V_SEARCH_UDDI_BUTTON            = Search UDDI...
-
-_UI_WIZARD_V_GROUP_TEXT_ELEMENT            = The WSDL element
-_UI_WIZARD_V_GROUP_TEXT_TYPE               = type
-_UI_WIZARD_V_RADIO_PORT                    = port
-_UI_WIZARD_V_RADIO_BINDING                 = binding
-_UI_WIZARD_V_RADIO_PORT_TYPE               = portType
-_UI_WIZARD_V_RADIO_OPERATION               = operation
-_UI_WIZARD_V_RADIO_MESSAGE                 = message
-_UI_WIZARD_V_LABEL_NAME                    = name:
-_UI_WIZARD_V_LABEL_NAMESPACE               = namespace:
-_UI_WIZARD_V_LABEL_PARENT                  = parent:
-
-_UI_LOG_EDITOR                    = Text Editor
-_UI_WSI_VALIDATOR                 = WS-I Message Validator
-_UI_ACTION_VALIDATE               = Validate WS-I Log File
-_UI_WIZARD_VALIDATE_LOG_TITLE           = Validate WS-I Message Log File
-_UI_WIZARD_SELECT_LOG_FILENAME_HEADING  = Specify the WS-I Message Log File Name
-_UI_WIZARD_SELECT_LOG_FILENAME_EXPL     = Select a folder and specify a message log file name
-
-_UI_VALIDATION_FAILED             = Validation Failed
-_UI_UNABLE_TO_VALIDATE            = Unable to Validate
-_UI_NO_MESSAGES_TO_VALIDATE       = No Messages to Validate
-_UI_THE_WSIMSG_FILE_IS_NOT_VALID  = The WS-I Message Log file is not valid.  See the Problems view for a list of the validation errors.
-_UI_PROBLEMS_READING_WSIMSG_FILE  = Problems reading the WS-I Message Log file.  See the Problems view for a list of errors.
-_UI_VALIDATION_SUCEEDED           = Validation Succeeded
-_UI_VALIDATION_WARNINGS_DETECTED  = However warnings have been issued. See the Problems view for a list of the validation warnings.
-_UI_THE_WSIMSG_FILE_IS_VALID      = The WS-I Message Log file is valid.
-_UI_VALIDATION_FAILED             = Validation Failed
-_UI_MESSAGE_LIMITE_EXCEEDED       = The WS-I Message Log file is not valid.  The message limit for the Problems view has been exceeded.  Please increase the limit and try again.
-
-_ERROR_INVALID_LOG_FILE_EXTENSION = The file name extension can only be ".wsimsg".
-_WARNING_FILE_ALREADY_EXISTS      = Warning: The file already exists and will be overwritten. 
-_ERROR_INVALID_LOG_FILE_EXTENSION = The file name extension can only be ".wsimsg".
-_WARNING_FILE_ALREADY_EXISTS      = Warning: The file already exists and will be overwritten. 
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi.ui/plugin.xml b/bundles/org.eclipse.wst.wsi.ui/plugin.xml
deleted file mode 100644
index 441b92e..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/plugin.xml
+++ /dev/null

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
---> 
-
-<plugin>
-
-    
-<!-- ======================================================= -->
-<!-- Purpose: Add validator action to TCPIP monitor.         -->
-<!-- Extension point: org.eclipse.ui.viewActions             -->
-<!-- ======================================================= -->
-   <extension
-         point="org.eclipse.ui.viewActions">
-      <viewContribution
-            targetID="org.eclipse.wst.internet.monitor.view"
-            id="org.eclipse.ui.articles.action.contribution.view">
-         <action
-               label="WS-I Profile Validator"
-               icon="icons/full/obj16/validate.gif"
-               tooltip="%_UI_WIZARD_VALIDATE_LOG_TITLE"
-               class="org.eclipse.wst.wsi.ui.internal.actions.actionDelegates.ValidateWSIProfileActionDelegate"
-               toolbarPath="group1"
-               id="org.eclipse.wst.wsi.ui.internal.actions.actionDelegates.ValidateWSIProfileActionDelegate">
-         </action>
-      </viewContribution>
-   </extension>
-
-<!-- ======================================================= -->
-<!-- Purpose: To register WS-I message validator.            -->
-<!-- Extension point: org.eclipse.ui.viewActions             -->
-<!-- ======================================================= -->
-  <extension
-         id="wsiValidator"
-         name="%_UI_WSI_VALIDATOR"
-         point="org.eclipse.wst.validation.validator">
-      <validator>
-         <filter
-               objectClass="org.eclipse.core.resources.IFile"
-               caseSensitive="false"
-               nameFilter="*.wsimsg">
-         </filter>
-         <helper      
-               class="org.eclipse.wst.xml.core.internal.validation.core.Helper">
-         </helper>
-         <run
-               class="org.eclipse.wst.wsi.ui.internal.WSIMessageValidator">
-         </run>
-      </validator>
-   </extension>
-   
-<!-- ======================================================= -->
-<!-- Extension point: org.eclipse.ui.editors                 -->
-<!-- Purpose: Specify editor for file with extension wsimsg. -->
-<!-- ======================================================= -->
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            default="true"
-            name="%_UI_LOG_EDITOR"
-            extensions="wsimsg"
-            icon="icons/wsi_logfile_obj.gif"
-            class="org.eclipse.ui.editors.text.TextEditor"
-            id="org.eclipse.wst.wsi.ui.internal.WSILogEditor">
-      </editor>
-   </extension>
-<!-- ====================================================== -->
-<!-- Add validate action  to .wsimsg file                   -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsimsg"
-            id="org.eclipse.soap.validate.wsi.action">
-         <action
-               label="%_UI_ACTION_VALIDATE"
-               class="org.eclipse.wst.wsi.ui.internal.actions.actionDelegates.ValidateWSILogFileActionDelegate"
-               enablesFor="1"
-               id="org.eclipse.wst.wsi.ui.internal.actions.actionDelegates.ValidateWSILogFileActionDelegate">
-         </action>
-      </objectContribution>
-   </extension>
-   
- </plugin>

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/LogBuilder.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/LogBuilder.java
deleted file mode 100644
index 2538a7a..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/LogBuilder.java
+++ /dev/null

@@ -1,434 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal;
-
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.Request;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.LogWriter;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.log.impl.LogImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.LogWriterImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.MessageEntryImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.impl.CommentImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.impl.ManInTheMiddleImpl;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * Given a list of RequestResponses from a TCPIP Monitor, 
- * this class builds a WS-I compliant Message Log file.
- * 
- * @author David Lauzon, IBM
- */
-public class LogBuilder
-{
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-   * IDs to identify requests and corresponding responses.
-   */
-  protected int conversationId = 1;
-
-  /**
-   * IDs to uniquely identify each and every message within the log file.
-   */
-  protected int id = 1;
-
-  /**
-   * The list of RequestResponces from a TCPIP Monitor used to generate the log file.
-   */
-  protected Request[] requestResponses;
-
-  /**
-   * The actual log object.
-   */
-  protected Log log = null;
-
-  /**
-   * The log file.
-   */
-  protected IFile ifile;
-
-  /**
-   * Tool information property values.
-   */
-  private static final String TOOL_NAME = "Monitor";
-  private static final String TOOL_VERSION = "1.0";
-  private static final String TOOL_RELEASE_DATE = "2003-03-20";
-  private static final String TOOL_IMPLEMENTER = "IBM";
-  private static final String TOOL_LOCATION = "";
-
-  /**
-   * Common timestamp format.
-   */
-  public static final SimpleDateFormat timestampFormat = new SimpleDateFormat ("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-
-  /**
-   * Constructor.
-   * @param ifile: the file handler for the log.
-   */
-  public LogBuilder(IFile ifile)
-  {
-    this.ifile = ifile;
-  }
-
-  /**
-   * This builds and then returns a log based on the list of request-response pairs.
-   * @param requestResponses: a list of messages in the form of request-response pairs.
-   * @return a log based on a list of request-response pairs.
-   */
-  public Log buildLog(Request[] requestResponses)
-  {
-    this.requestResponses = requestResponses;
-
-    log = new LogImpl();
-    logMonitorInformation();
-
-    // log the messages
-    for (int i=0; i<requestResponses.length; i++)
-    {
-      Request rr = requestResponses[i];
-      if ((rr != null) && (!omitRequestResponse(rr)))
-      {
-        logRequestResponse(rr);
-      }
-    }
-    return log;
-  }
-
-  /**
-   * Currently a no-op.
-   */
-  public void logMonitorInformation()
-  {
-  }
-
-  /**
-   * Log the request-response pair.
-   *@param rr: a request-response pair.
-   */
-  protected void logRequestResponse(Request rr)
-  {
-    if (rr != null)
-    {
-      String requestHeader = new String(rr.getRequest(Request.TRANSPORT));
-      String responseHeader = new String(rr.getResponse(Request.TRANSPORT));
-      
-      byte[] unchunkedRequestBody = rr.getRequest(Request.CONTENT);
-      byte[] unchunkedResponseBody = rr.getResponse(Request.CONTENT);
- 
-      long timestamp = rr.getDate().getTime();
-      String localHostAndPort = "localhost:" + rr.getLocalPort();
-      String remoteHostAndPort = rr.getRemoteHost() + ":" + rr.getRemotePort();
-
-      int requestId  = getNextAvailableId();
-      int responseId = getNextAvailableId();
-      int conversationId = getNextAvailableConversationId();
-
-      MessageEntry messageEntryRequest = createMessageEntry(requestId, conversationId, 
-                MessageEntry.TYPE_REQUEST, timestamp, localHostAndPort,
-                remoteHostAndPort, unchunkedRequestBody, requestHeader);
-
-      MessageEntry messageEntryResponse = createMessageEntry(responseId, conversationId, 
-                MessageEntry.TYPE_RESPONSE, timestamp + rr.getResponseTime(), remoteHostAndPort,
-                localHostAndPort, unchunkedResponseBody, responseHeader);
-      try
-      {
-        if ((messageEntryRequest != null) &&
-            (messageEntryResponse != null) &&
-            ((messageEntryRequest.isMimeContent()) ||
-			 (isMessageWithBrackets(messageEntryRequest.getMessage()))))
-        {
-                log.addLogEntry(messageEntryRequest);
-               log.addLogEntry(messageEntryResponse);
-        }
-      }
-      catch (Exception e)
-      {
-        // ignore the request response pair
-      }
-    }
-  }
-
-  /**
-   * Returns true if the content of the message has at least
-   * one left and one right bracket.
-   * @param message: a message content.
-   * @return true if the content of the message has at least
-   *         one left and one right bracket.
-   */
-  public boolean isMessageWithBrackets(String message)
-  {
-    return ((message != null) && 
-            (message.indexOf("<")!= -1) && 
-            (message.indexOf(">") != -1));
-  }
-  /**
-   * Returns the header of a message.
-   * @param requestOrResponse: a message.
-   * @param headerLength: the length of the header in the message.
-   * @return the header of a message.
-   */ 
-  protected String getHeader(byte[] requestOrResponse,  int headerLength)
-  {
-    String result = null;
-    
-    if ((requestOrResponse != null) && 
-        (headerLength > 0) && 
-        (requestOrResponse.length >= headerLength))
-    {
-      byte[] header = new byte[headerLength];
-      System.arraycopy(requestOrResponse, 0, header, 0, headerLength);
-      result = new String(header);
-    }
-    return result;
-  }
-
-  /**
-   * Returns the body of a message.
-   * @param requestOrResponse: a message.
-   * @param headerLength: the length of the header in the message.
-   * @return the body of a message.
-   */ 
-  protected String getBody(byte[] requestOrResponse,  int headerLength)
-  {
-    String result = null;
-    
-    if ((requestOrResponse != null) && 
-        (headerLength > 0) && 
-        (requestOrResponse.length > headerLength))
-    {
-      int bodyLength = requestOrResponse.length - headerLength;
-      byte[] body = new byte[bodyLength];
-      System.arraycopy(requestOrResponse, headerLength, body, 0, bodyLength);
-      result = new String(body);
-    }
-    return result;
-  }
-      
-  /**
-   * Create a log entry.
-   * @param id: unique message id within the log.
-   * @param conversationId: conversation id to identify request-response pairs.
-   * @param type: type indicating a request or response.
-   * @param timestamp: the date and time of the message.
-   * @param senderHostAndPort: the host and port of the sender.
-   * @param receiverHostAndPort: the host and port of the receiver.
-   * @param messageContent: the content or body of the message.
-   * @param header: the header of the message.
-   * @return a log entry.
-   */
-  protected MessageEntry createMessageEntry(int id, int conversationId, String type, long timestamp, 
-        String senderHostAndPort, String receiverHostAndPort, byte[] messageContent, String header) 
-  {
- 	// Create log entry
-    MessageEntry messageEntry = new MessageEntryImpl();
-    messageEntry.setId(String.valueOf(id));
-    messageEntry.setConversationId(String.valueOf(conversationId));
-    messageEntry.setType(type);
-    messageEntry.setTimestamp(getTimestamp(new Date(timestamp)));
-    messageEntry.setSenderHostAndPort(senderHostAndPort);
-    messageEntry.setReceiverHostAndPort(receiverHostAndPort);
-    messageEntry.setEncoding(WSIConstants.DEFAULT_XML_ENCODING);
-    
-    messageEntry.setHTTPHeaders(header);
-
-    if (Utils.isMultipartRelatedMessage(header))
-    {
-    	MimeParts mimeParts = Utils.parseMultipartRelatedMessage(messageContent, header, WSIConstants.DEFAULT_XML_ENCODING);
-    	if (mimeParts == null)
-    	{
-    	  // problem creating Mimeparts -- treat it as simple SOAP message
-    	  messageEntry.setMessage(new String(messageContent));
-    	  messageEntry.setMimeContent(false);
-    	}
-    	else
-    	{
-          messageEntry.setMimeParts(mimeParts);
-          messageEntry.setMimeContent(true);
-    	}
-    }
-    else
-    {
-      // Get the message content
-      messageEntry.setMessage(new String(messageContent));
-      messageEntry.setMimeContent(false);
-    }
-    return messageEntry;
-  }
-
-  /**
-   * Returns the next available id, then increments the id value.
-   * @return the next available id.
-   */
-  protected int getNextAvailableId()
-  {
-    return id++;
-  }
-
-  /**
-   * Returns the next available conversation id, then increments the conversation id value.
-   * A conversation id identfies a request and its corresponding response.
-   * @return the next available converasationid.
-   */
-  protected int getNextAvailableConversationId()
-  {
-    return conversationId++;
-  }
-
-  public int getHeaderLength(Integer obj)
-  {
-    int result = 0;
-    if (obj != null)
-    {
-      result = obj.intValue();
-    }
-    return result;
-  }
-
-  /**
-   * Check for HTTP messages that should not be logged.
-   * @param rr: a request-response pair.
-   * @return true if the request-response pair should be omitted from the log.
-   */
-  private boolean omitRequestResponse(Request rr) 
-  {
-    boolean omit = false;
-    if (rr != null)
-    {
-      String request = rr.getRequest(Request.TRANSPORT).toString();
-      if ((request != null) &&
-          ((request.startsWith("CONNECT")) ||
-           (request.startsWith("TRACE")) || 
-           (request.startsWith("DELETE")) || 
-           (request.startsWith("OPTIONS")) || 
-           (request.startsWith("HEAD"))))
-      { 
-        omit = true;
-      }
-    }
-    return omit;
-  }
-
-  /**
-   * Write log out to file.
-   * @param log: log to be written to file.
-   */
-
-  public void writeLog(Log log)
-  {
-    try
-    {
-      // Get log writer
-      LogWriter logWriter = new LogWriterImpl();
-    
-      logWriter.setWriter(ifile.getLocation().toString());
-      
-      // Write start of log file
-      logWriter.write(new StringReader(log.getStartXMLString("")));
-    
-      // Write monitor tool information
-      String monitorInfo = generateMonitorToolInfo();
-      logWriter.write(new StringReader(monitorInfo));
-
-      for (int i=0; i<log.getEntryCount(); i++)
-      {
-        MessageEntry me = log.getLogEntry(i);
-        logWriter.write(new StringReader(me.toXMLString("")));
-      }
-      logWriter.write(new StringReader(log.getEndXMLString("")));
-      logWriter.close();
-    }
-    catch (Exception e)
-    {
-      System.out.println("Exception thrown when printing log file.");
-    }
-  }
-
-
-  /**
-   * Returns XML string representation of the Monitor tool.
-   * @return XML string representation of the Monitor tool.
-   */
-  protected String generateMonitorToolInfo()
-  {
-
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw); 
-
-    try
-    {
-      // Tool information
-      ToolInfo toolInfo = new ToolInfo(TOOL_NAME, TOOL_VERSION, TOOL_RELEASE_DATE, TOOL_IMPLEMENTER, TOOL_LOCATION);
-
-      DocumentFactory documentFactory = DocumentFactory.newInstance();
-      MonitorConfig monitorConfig = documentFactory.newMonitorConfig();
-    
-      Comment comment = new CommentImpl();
-      comment.setText("Comment");
-      monitorConfig.setComment(comment);
-      monitorConfig.setLogLocation("URL");
-      monitorConfig.setReplaceLog(true);
-
-      AddStyleSheet addStyleSheet = new AddStyleSheetImpl();
-      monitorConfig.setAddStyleSheet(addStyleSheet);
-
-      monitorConfig.setLogDuration(600);
-      monitorConfig.setTimeout(3);
-     
-      ManInTheMiddle manInTheMiddle = new ManInTheMiddleImpl();
-      monitorConfig.setManInTheMiddle(manInTheMiddle);
-
-      monitorConfig.setLocation("documentURI");
-      monitorConfig.setVerboseOption(false);
-
-      // Start     
-      pw.print(toolInfo.getStartXMLString(""));
-    
-      // Config
-      pw.print(monitorConfig.toXMLString(WSIConstants.NS_NAME_WSI_MONITOR_CONFIG));
-
-      // End
-      pw.println(toolInfo.getEndXMLString(""));
-    }
-    catch (Exception e)
-    {
-    }
-    return sw.toString();
-  }
-
-  /**
-   * Get the given date and time as a timestamp.
-   * @param date: a date object.
-   * @return the given date and time as a timestamp.
-   */
-  public static String getTimestamp(Date date)
-  {
-    timestampFormat.setTimeZone(TimeZone.getDefault());
-    return timestampFormat.format(date);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Resource.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Resource.java
deleted file mode 100644
index 04b20ca..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Resource.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal;
-
-/**
- * GIF constants
- * 
- * @author David Lauzon, IBM
- */
-public interface Resource
-{
-  public static final String VALIDATE_WSI_LOGFILE_WIZ = "actions/icons/wsi_logfile_wiz.gif";
-}

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/ResourceFilter.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/ResourceFilter.java
deleted file mode 100644
index be02256..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/ResourceFilter.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-import java.util.Collection;
-
-public class ResourceFilter extends ViewerFilter 
-{
-  protected String[] fExtensions;
-  protected IFile[] fExcludedFiles;
-  protected Collection fExcludes;
-	
-  public ResourceFilter(String[] extensions, Collection exclude) 
-  {
-    fExtensions= extensions;
-    fExcludes= exclude;
-    fExcludedFiles = null;
-  }
-
-  public ResourceFilter(String[] extensions, IFile[] excludedFiles, Collection exclude) 
-  {
-    fExtensions= extensions;
-    fExcludes= exclude;
-    fExcludedFiles = excludedFiles;
-  }
-	
-  public boolean isFilterProperty(Object element, Object property) 
-  {
-    return false;
-  }
-	
-  public boolean select(Viewer viewer, Object parent, Object element) 
-  {
-    if (element instanceof IFile) 
-    {
-      if (fExcludes != null && fExcludes.contains(element)) 
-      {
-	return false;
-      }
-      String name= ((IFile)element).getName();
-      if (fExcludedFiles != null) 
-      {
-        for (int j= 0; j < fExcludedFiles.length; j++) 
-        {
-          if ( ((IFile)element).getLocation().
-               toString().compareTo(((IFile)fExcludedFiles[j]).getLocation().toString()) == 0 )
-           return false;             
-        }            
-      }
-      if (fExtensions.length == 0) 
-      {
-        // assume that we don't want to filter any files based on 
-        // extension
-        return true;
-      }
-      for (int i= 0; i < fExtensions.length; i++) 
-      {
-        if (name.endsWith(fExtensions[i]))
-        {
-          return true;
-        }
-      } 
-      return false;
-    } 
-    else if (element instanceof IContainer) 
-    { // IProject, IFolder
-      try 
-      {
-      	IResource[] resources= ((IContainer)element).members();
-	for (int i= 0; i < resources.length; i++) 
-        {
-	  // recursive!
-	  if (select(viewer, parent, resources[i])) 
-          {
-	    return true;
-	  }
-	}
-      } 
-      catch (CoreException e) 
-      {
-      }				
-    }
-    return false;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java
deleted file mode 100644
index c5ea44c..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.wsi.ui.internal.actions.WSIValidateAction;
-//import org.eclipse.wst.wsi.internal.core.report.impl.DefaultReporter;
-
-/**
- * A Validator that performs validation on a WS-I Message Log file. 
- * 
- * @author David Lauzon, IBM
- */
-public class WSIMessageValidator implements IValidator
-{
-  protected IReporter reporter;
-  public static final String WSI_MESSAGE_VALIDATOR_ID = "wsimessagevalidator".intern();
-
-  /* (non-Javadoc)
-   * @see org.eclipse.validate.IValidator#validate(org.eclipse.core.resources.IFile)
-   */
-  public void validate(IFile file)
-  {  
-    WSIValidateAction validateAction = new WSIValidateAction(file, false);
-    validateAction.setValidator(this);
-    //validateAction.setReporter(getReporter());
-    validateAction.run();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.validate.IValidator#setReporter(org.eclipse.validate.IReporter)
-   */
-  public void setReporter(IReporter reporter)
-  {
-  	this.reporter = reporter;
-  }
-
-public void cleanup(IReporter reporter) {
-	// TODO Auto-generated method stub
-	
-}
-
-public void validate(IValidationContext helper, IReporter reporter) throws ValidationException
- {
-	// TODO Auto-generated method stub
- }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.java
deleted file mode 100644
index 0c42721..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * WSIValidatePlugin is a plugin that integrates with the Eclipse platform UI. 
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-
-public class WSIUIPlugin extends AbstractUIPlugin
-{
-	private ResourceBundle pluginRB = null;
-  /**
-   * The singleton.
-   */
-  protected static WSIUIPlugin instance;                
-
-  /**
-   * Constructor.
-   */
-  public WSIUIPlugin(IPluginDescriptor descriptor)
-  {
-    super(descriptor);
-    instance = this;
-    pluginRB = descriptor.getResourceBundle();
-  }    
-
-  /**
-   * Returns the singleton. (Based on the Singleton Pattern).
-   */
-  public static WSIUIPlugin getInstance()
-  {
-    return instance;
-  }
-
-  protected ImageRegistry createImageRegistry() 
-  {
-		ImageRegistry registry = super.createImageRegistry();
-		registerImage(registry, Resource.VALIDATE_WSI_LOGFILE_WIZ);
-		return registry;
-  }
-
-	/**
-	 * Register an image with the registry.
-	 * 
-	 * @param key the key
-	 */
-	private void registerImage(ImageRegistry registry, String key)
-	{
-  	  try 
-  	  {
-		ImageDescriptor id = ImageDescriptor.createFromFile(WSIUIPlugin.class, key);
-		registry.put(key, id);
-	  } catch (Exception e) 
-	  {
-      }
-	}
-
-  /**
-   * Convience API.  
-   * Finds the specified image stored in this plug-in's image registry.
-   * @param iconName: the name of the image.
-   * @return the image associated with the given name.
-   */
-  public static Image getResourceImage(String iconName)
-  {
-    return instance.getImageRegistry().get(iconName);
-  }
-
-  /**
-   * Convience API.     
-   * This gets the string resource based on the key.
-   * @param key: key associated witha string resource.
-   * @return the string resource associated with the given key.
-   */
-  public static String getResourceString(String key)
-  {
-  	
-    return instance.pluginRB.getString(key);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIValidator.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIValidator.java
deleted file mode 100644
index 0db6445..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIValidator.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.wsi.ui.internal.actions.WSIValidateAction;
-
-/**
- * A simple interface to the WS-I message log validator.
- * 
- * @author Lawrence Mandel, IBM
- */
-public class WSIValidator {
-
-	/**
-	 * Constructor.
-	 */
-	public WSIValidator()
-	{
-	}
-	
-	/**
-	 * Validate the given log file.
-	 * 
-	 * @param file The log file to validate.
-	 */
-	public void validate(IFile file)
-	{
-		WSIMessageValidator messageValidator = new WSIMessageValidator();
-		WSIValidateAction validateAction = new WSIValidateAction(file, true);
-		validateAction.setValidator(messageValidator);
-		validateAction.run();
-	}
-	
-	/**
-	 * Validate the given log file with a WSDL document specified.
-	 * 
-	 * @param file The log file to validate.
-	 * @param wsdlfile The WSDL file to use for validation.
-	 * @param elementname The WSDL element to validate.
-	 * @param namespace The namespace of the WSDL element to validate.
-	 * @param parentname The name of the parent element of the element to validate.
-	 * @param type The type of the element to validate.
-	 */
-	/**
-	 * Validate the given log file.
-	 * 
-	 * @param file The log file to validate.
-	 */
-	public void validate(IFile file, String wsdlfile, String elementname, String namespace, String parentname, String type)
-	{
-		WSIMessageValidator messageValidator = new WSIMessageValidator();
-		WSIValidateAction validateAction = new WSIValidateAction(file, true, wsdlfile, elementname, namespace, parentname, type);
-		validateAction.setValidator(messageValidator);
-		validateAction.run();
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.java
deleted file mode 100644
index 9b6fd5f..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.validation.internal.core.IMessageAccess;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.MessageLimitException;
-import org.eclipse.wst.wsi.internal.analyzer.MessageAnalyzer;
-import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.ui.internal.validation.ValidateAction;
-import org.xml.sax.SAXParseException;
-
-/**
- * Action for running the validator.
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-public class WSIValidateAction extends ValidateAction
-{
-  protected IValidator validator;
-  
-  protected String wsdlfile = null;
-  protected String elementname = null;
-  protected String namespace = null;
-  protected String parentname = null;
-  protected String type = null;
-  protected boolean wsdlspecified = false;
-  protected boolean exceptionCaught = false;
-
-  /**
-   * Constructor.
-   * 
-   * @param f The file to validate
-   * @param showDialog Whether or not to show a status dialog after validation.
-   */
-  public WSIValidateAction(IFile f, boolean showDialog)
-  {
-  	super(f, showDialog);
-  }
-  
-  /**
-   * Constructor with WSDL element specified.
-   * 
-   * @param f The file to validate.
-   * @param showDialog Whether or not to show a status dialog after validation.
-   * @param file The WSDL file to use for validation.
-   * @param elementname The name of the WSDL element to validate.
-   * @param namespace The namespace of the WSDL element to validate
-   * @param parentname The parent name of the WSDL element to validate.
-   * @param type The type of element to validate.
-   */
-  public WSIValidateAction(IFile f, boolean showDialog, String file, String elementname, String namespace, String parentname, String type)
-  {
-  	this(f, showDialog);
-  	if (file != null)
-  	{
-  	  wsdlfile = file.replace('\\', '/');
-  	  if ((!wsdlfile.startsWith(WSIConstants.FILE_PREFIX)) && 
-  		  (!wsdlfile.startsWith(WSIConstants.HTTP_PREFIX)))
-      {
-  	    wsdlfile = WSIConstants.FILE_PROTOCOL + wsdlfile;  
-  	  }
-  	}
-  	this.elementname = elementname;
-  	this.namespace = namespace;
-  	this.parentname = parentname;
-  	this.type = type;
-  	this.wsdlspecified = true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.validate.ValidateAction#validate(org.eclipse.core.resources.IFile)
-   */
-  protected void validate(final IFile file1)
-  {
-  	final MessageAnalyzer messageanalyzer;
-  	
-  	if(wsdlspecified)
-  	{
-  	  messageanalyzer = new MessageAnalyzer(WSIConstants.FILE_PROTOCOL + file1.getLocation().toString(), wsdlfile, elementname, namespace, parentname, type);	
-  	}
-  	else
-  	{	
-  	  messageanalyzer = new MessageAnalyzer(WSIConstants.FILE_PROTOCOL + file1.getLocation().toString());
-  	}
-  	
-  	IWorkspaceRunnable op = new IWorkspaceRunnable() 
-    {
-      public void run(IProgressMonitor progressMonitor) throws CoreException 
-      {        
-        clearMarkers(file1);
-        try
-        {
-          messageanalyzer.validateConformance();
-        }
-        catch (WSIAnalyzerException ae)
-        {
-        	exceptionCaught = true;
-        	if (ae.getTargetException() instanceof SAXParseException)
-        	{
-        	  createMarkers(file1, new ValidationMessage[]{createValidationMessageForException((SAXParseException)ae.getTargetException(), ValidationMessage.SEV_NORMAL)});
-        	}
-        	else
-        	{
-         	  createMarkers(file1, new ValidationMessage[]{createValidationMessageForException(ae, ValidationMessage.SEV_NORMAL)});
-        	}
-        }
-        catch (Exception e)
-        {
-        }
-
-        createMarkers(file1, convertValidationMessages(messageanalyzer.getAssertionWarnings(), ValidationMessage.SEV_LOW));
-        createMarkers(file1, convertValidationMessages(messageanalyzer.getAssertionErrors(), ValidationMessage.SEV_NORMAL));
-        file.setSessionProperty(ValidationMessage.ERROR_MESSAGE_MAP_QUALIFIED_NAME, getOrCreateReporter().getMessages());
-		}
-    };
-   
-    
-     try
-    {
-      ResourcesPlugin.getWorkspace().run(op, null);
-     if (showDialog)
-      {
-        if (exceptionCaught)
-        {
-          MessageDialog.openError(Display.getDefault().getActiveShell(), 
-          		WSIUIPlugin.getResourceString("_UI_UNABLE_TO_VALIDATE"), 
-          		WSIUIPlugin.getResourceString("_UI_PROBLEMS_READING_WSIMSG_FILE"));
-        }
-        else if (messageanalyzer.getAssertionErrors().size() != 0)
-        {
-          MessageDialog.openError(Display.getDefault().getActiveShell(), 
-          		WSIUIPlugin.getResourceString("_UI_VALIDATION_FAILED"), 
-          		WSIUIPlugin.getResourceString("_UI_THE_WSIMSG_FILE_IS_NOT_VALID"));
-        }
-        else if (messageanalyzer.getAssertionWarnings().size() != 0)
-        {                                                           
-          String title = WSIUIPlugin.getResourceString("_UI_VALIDATION_SUCEEDED");
-          String message = WSIUIPlugin.getResourceString("_UI_VALIDATION_WARNINGS_DETECTED");
-          MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message);
-        }
-        else
-        {
-          String title = WSIUIPlugin.getResourceString("_UI_VALIDATION_SUCEEDED");
-          String message = WSIUIPlugin.getResourceString("_UI_THE_WSIMSG_FILE_IS_VALID");
-          MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message);
-        }
-      }
-    }
-    catch(Exception e){}
-  }
-  
-  /**
-   * Create a validation message from the exception and severity.
-   * 
-   * @param error The error.
-   * @param severity The severity.
-   * @return An error message.
-   */
-  protected ValidationMessage createValidationMessageForException(SAXParseException error, int severity)
-  {
-    String uri = error.getSystemId();
-    if(uri == null)
-    {
-      uri = error.getPublicId();
-    }
-    ValidationMessage validationMessage = new ValidationMessage(error.getMessage(), error.getLineNumber(), error.getColumnNumber(), uri);
-    validationMessage.setSeverity(severity);
-    return validationMessage;
-  }
-
-
-  /**
-   * Create a validation message from the exception and severity.
-   * 
-   * @param error The error.
-   * @param severity The severity.
-   * @return An error message.
-   */
-  protected ValidationMessage createValidationMessageForException(WSIAnalyzerException error, int severity)
-  {
-    ValidationMessage validationMessage = new ValidationMessage(error.getMessage(), 0, 0);
-    validationMessage.setSeverity(severity);
-    return validationMessage;
-  }
- 
-  public ValidationMessage[]  convertValidationMessages(List list, int marker)
-  {
-	if (list != null)
-	{
-	  int size = list.size();
-	  ValidationMessage[] messages = new ValidationMessage[size];
-	 
-      for (int i = 0; i < size; i++)
-      {
-        AssertionError assertionError = (AssertionError) list.get(i);
-
-        int n = assertionError.getLine();
-        int c = assertionError.getColumn();
-        String m = WSIConstants.WSI_PREFIX + "(" + assertionError.getAssertionID()+ ") " + assertionError.getErrorMessage();
-      
-        ValidationMessage message = new ValidationMessage(m,n, c);
-        message.setSeverity(marker);
-        messages[i] = message;
-      }
-      return messages;
-    }
-	return new ValidationMessage[0];
-  }
-
- /**
-  protected IReporter getOrCreateReporter()
-  {
-    if (reporter == null)
-    { 
-      reporter = new Reporter();
-    }
-    return reporter;
-  }
-  */
-  // My Implementation of IReporter
-  class Reporter implements IReporter 
-  {
-	List list = new ArrayList();
-
-	public Reporter() {
-		super();
-	}
-
-	public IMessageAccess getMessageAccess() {
-		return null; // do not need to implement
-	}
-
-	public boolean isCancelled() {
-		return false; // do not need to implement
-	}
-
-	public void removeAllMessages(IValidator origin, Object object) { // do
-																		// not
-																		// need
-																		// to
-																		// implement
-	}
-
-	public void removeAllMessages(IValidator origin) {// do not need to
-														// implement
-	}
-
-	public void removeMessageSubset(IValidator validator, Object obj, String groupName) {// do
-																							// not
-																							// need
-																							// to
-																							// implement
-	}
-
-	public List getMessages() {
-		return list;
-	}
-
-	public void addMessage(IValidator origin, IMessage message) throws MessageLimitException 
-	{
-		list.add(message);
-	}
-
-	public void displaySubtask(IValidator validator, IMessage message) 
-	{
-		// TODO Auto-generated method stub
-		
-	}
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSILogFileActionDelegate.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSILogFileActionDelegate.java
deleted file mode 100644
index 3c410e8..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSILogFileActionDelegate.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal.actions.actionDelegates;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-
-import org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
-import org.eclipse.wst.wsi.ui.internal.actions.WSIValidateAction;
-
-
-/**
- * Action delegate for validating a WS-I log file.
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-public class ValidateWSILogFileActionDelegate implements IActionDelegate
-{
-  /**
-   * The current selection, or null if there is no selection.
-   */
-  ISelection selection;
-
-  /**
-   * Constructor.
-   */
-  public ValidateWSILogFileActionDelegate()
-  {
-  }
-
-  /**
-   * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-   */
-  public void run(IAction action)
-  {
-    try
-    {
-      if (selection instanceof IStructuredSelection)
-      {
-        Object  obj = ((IStructuredSelection)selection).getFirstElement();
-        if (obj instanceof IFile)
-        {
-          IFile file = (IFile)obj;
-          WSIMessageValidator messageValidator = new WSIMessageValidator();
-          WSIValidateAction validateAction = new WSIValidateAction(file, true);
-          validateAction.setValidator(messageValidator);
-          validateAction.run();
-        }
-      }
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-
-  /**
-   * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-   */
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-    this.selection = selection;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.java
deleted file mode 100644
index 237fe49..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.java
+++ /dev/null

@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal.actions.actionDelegates;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.Request;
-import org.eclipse.wst.internet.monitor.ui.internal.provisional.MonitorUICore;
-import org.eclipse.wst.wsi.ui.internal.LogBuilder;
-import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin;
-import org.eclipse.wst.wsi.ui.internal.wizards.ValidationWizard;
-import org.eclipse.wst.wsi.ui.internal.WSIValidator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.ContainerGenerator;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-
-/**
- * Action delegate for the WS-I validator.
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-public class ValidateWSIProfileActionDelegate implements IViewActionDelegate
-{
-  /**
-   * The default WS-I Message Log filename.
-   */
-  public static final String DEFAULT_LOG_FILENAME = "log.wsimsg";
-
-  /**
-   * The HTTP protocol.
-   */
-  private final String HTTP = "http://";
-  
-  
-  /**
-   * The default tag for WSDL locations.
-   */
-  private final String WSDL = "?WSDL";
-  
-  /**
-   * The current selection, or null if there is no selection.
-   */
-  ISelection selection;
-
-  /**
-   * The list of messages in the form of request-response pairs.
-   */
-  Request[] requestResponses;
-
-  /**
-   * The view that provides the context for this delegate.
-   */
-  IViewPart view;
-
-  /**
-   * Constructor.
-   */
-  public ValidateWSIProfileActionDelegate()
-  {
-  }
-
-  /**
-   * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-   */
-  public void init(IViewPart view)
-  {
-    this.view = view;
-  }
-
-  /** 
-   * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-   */
-  public void run(IAction action)
-  {
-    WorkspaceModifyOperation operation = new WorkspaceModifyOperation()
-    {
-      protected void execute(IProgressMonitor progressMonitor)
-      throws CoreException
-      {
-        validate(progressMonitor);
-      }
-    };
-    
-    try
-    {
-      operation.run(null);
-    }
-    catch (Exception ex)
-    {
-      ex.printStackTrace();
-    }
-  }
-
-  /**
-   * The validate action.
-   * 
-   * @param progressMonitor
-   */
-  public void validate(IProgressMonitor progressMonitor)
-  {
-    try
-    {
-      requestResponses = MonitorUICore.getRequests();
-      Shell shell = Display.getCurrent().getActiveShell();
-      if ((requestResponses != null) && (requestResponses.length > 0))
-      {
-        ValidationWizard validateWizard = new ValidationWizard(DEFAULT_LOG_FILENAME);
-        List wsdllocs = new Vector();
-
-       	for (int i=0; i<requestResponses.length; i++)
-      	{
-      	  Request reqresp = requestResponses[i];
-      	  String remotehost = reqresp.getRemoteHost();
-      	  int remoteport = reqresp.getRemotePort();
-      	  String remotelabel = reqresp.getName();
-      	  String location = HTTP + remotehost + ":" + remoteport + remotelabel + WSDL;
-      	  if(!wsdllocs.contains(location))
-      	  {
-      	    wsdllocs.add(location);
-      	  }
-      	}
-      
-        validateWizard.setWSDLLocations((String[])wsdllocs.toArray(new String[wsdllocs.size()]));
-        WizardDialog wizardDialog = new WizardDialog(shell, validateWizard);
-        wizardDialog.create();
-
-        int result = wizardDialog.open();
-
-        if (validateWizard.isValid() && (result != org.eclipse.jface.window.Window.CANCEL))
-        {
-          // If the container doesn't exist, create it now
-          checkAndCreateContainer(validateWizard.getContainerFullPath());
-
-          IFile file = validateWizard.getFile();
-          LogBuilder builder = new LogBuilder(file);
-          Log log = builder.buildLog(requestResponses);
-
-          builder.writeLog(log);
-          file.refreshLocal(1, progressMonitor);
-        
-          WSIValidator messageValidator = new WSIValidator();
-          if(validateWizard.includeWSDLFile())
-          {	
-        	String wsdlfile = validateWizard.getWSDLFile();
-        	String name = validateWizard.getElementName();
-        	String namespace = validateWizard.getNamespace();
-        	String parentname = validateWizard.getParentName();
-        	String type = validateWizard.getType();
-        	messageValidator.validate(file, wsdlfile, name, namespace, parentname, type);
-          }
-          else
-          {	
-        	messageValidator.validate(file);
-          }
-        }
-      }
-      else
-      {
-        // no available messages to validate
-    	  String title = WSIUIPlugin.getResourceString("_UI_WSI_VALIDATOR");
-          String message = WSIUIPlugin.getResourceString("_UI_NO_MESSAGES_TO_VALIDATE");
-    	MessageDialog.openInformation(shell, title, message);
-      }
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-
-  /**
-   * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-   */
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-    this.selection = selection;
-  }
- 
-  /**
-   * If the container doesn't exist for the selected IFile, create it now.
-   * 
-   * @param containerPath The container for the selected IFile.
-   */
-  public static void checkAndCreateContainer(IPath containerPath)
-  {
-    IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(containerPath);
-    
-    // If the container doesn't exist in the workspace, create it.
-    if (resource == null) 
-    {
-      try
-      {
-        ContainerGenerator generator = new ContainerGenerator(containerPath);
-        generator.generateContainer(null);
-      }
-      catch (CoreException e)
-      {
-      }
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/icons/wsi_logfile_wiz.gif b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/icons/wsi_logfile_wiz.gif
deleted file mode 100644
index 0cc8d3f..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/icons/wsi_logfile_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizard.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizard.java
deleted file mode 100644
index 02baf17..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizard.java
+++ /dev/null

@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal.wizards;
-
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.wst.wsi.ui.internal.Resource;
-import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.navigator.ResourceNavigator;
-
-/**
- * This wizard allows the user to specify the location of the 
- * WS-I Message Log file for purposes of validation.
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-
-public class ValidationWizard extends Wizard
-{
-  /**
-   * Wizard page to specify the location of the 
-   * WS-I Message Log file for purposes of validation.
-   */
-  protected ValidationWizardLogPage logPage;
-
-  /**
-   * Wizard page to optionally specify the location
-   * of the WSDL document for the Web service.
-   */
-  protected ValidationWizardWSDLPage wsdlPage;
-
-  /**
-   * Wizard page to specify the name, type and namespace
-   * for the WSDL element to analyze.
-   */
-  protected ValidationWizardWSDLContentPage wsdlContentPage;
-
-  /**
-   * Default WS-I Message filename passed in the Constructor.
-   */
-  protected String filename;
-
-  /**
-   * The selected WS-I Message Log file.
-   */
-  protected IFile file;
-
-  /**
-   * The container holding the selected WS-I Message Log file.
-   */
-  protected IPath containerFullPath;
-
-  /**
-   * Flag indicating whether selected file is valid.
-   */
-  protected boolean isValid;
-
-  /**
-   * The name of the element to validate.
-   */
-  protected String elementname;
-
-  /**
-   * The namespace of the element to validate.
-   */
-  protected String namespace;
-
-  /**
-   * The name of the parent of the element to validate.
-   */
-  protected String parentname;
-
-  /**
-   * The type of the element to validate.
-   */
-  protected String type;
-
-  /**
-   * The WSDL file to use for validation;
-   */
-  protected String wsdlfile;
-
-  /**
-   * True if a WSDL file is included, false otherwise.
-   */
-  protected boolean includewsdlfile;
-
-  
-  /**
-   * This list of WSDL locations the user can choose from.
-   */
-  protected String[] wsdllocations = null;
-  
-  /**
-   * Constructor.
-   * @param filename Default message log file name.
-   */
-  public ValidationWizard(String filename)
-  {
-    this.filename = filename;
-    this.setWindowTitle(WSIUIPlugin.getResourceString("_UI_WIZARD_VALIDATE_LOG_TITLE"));
-    setDefaultPageImageDescriptor(
-      ImageDescriptor.createFromFile(WSIUIPlugin.class, Resource.VALIDATE_WSI_LOGFILE_WIZ));
-    setNeedsProgressMonitor(true);
-  }
-
-  /**
-   * @see org.eclipse.jface.wizard.IWizard#addPages()
-   */
-  public void addPages()
-  {
-    logPage = new ValidationWizardLogPage((IStructuredSelection) getResourceNavigatorSelection(), filename);
-    wsdlPage = new ValidationWizardWSDLPage((IStructuredSelection) getResourceNavigatorSelection());
-    wsdlContentPage = new ValidationWizardWSDLContentPage((IStructuredSelection) getResourceNavigatorSelection());
-    addPage(logPage);
-    addPage(wsdlPage);
-    addPage(wsdlContentPage);
-
-  }
-
-  /**
-   * @return True if a WSDL file is included, false otherwise.
-   */
-  public boolean includeWSDLFile()
-  {
-    if (!isValid)
-    {
-      return wsdlPage.includeWSDLFile();
-    }
-    return includewsdlfile;
-  }
-
-  /**
-   * Get the element name to validate.
-   * 
-   * @return The element name to validate.
-   */
-  public String getElementName()
-  {
-    return elementname;
-  }
-
-  /**
-   * Get the namespace for the element.
-   * 
-   * @return The namespace for the element.
-   */
-  public String getNamespace()
-  {
-    return namespace;
-  }
-
-  /**
-   * Get the name of the parent of the element.
-   * 
-   * @return The name of the parent of the element.
-   */
-  public String getParentName()
-  {
-    return parentname;
-  }
-
-  /**
-   * Get the type of the element.
-   * 
-   * @return The type of the element.
-   */
-  public String getType()
-  {
-    return type;
-  }
-
-  public String getWSDLFile()
-  {
-    if (!isValid)
-    {
-      return wsdlPage.getWSDLFile();
-    }
-    return wsdlfile;
-  }
-
-  /**
-   * @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
-   */
-  public IWizardPage getNextPage(IWizardPage currentPage)
-  {
-    if (currentPage == wsdlPage)
-    {
-      if (!wsdlPage.includeWSDLFile())
-      {
-        return null;
-      }
-      else
-      {
-        try
-        {
-          WSDLFactory factory = WSDLFactory.newInstance();
-          WSDLReader reader = factory.newWSDLReader();
-          reader.readWSDL(getWSDLFile());
-        }
-        catch (Exception e)
-        {
-          // If there is a problem with the WSDL file there is no next page.
-          return null;
-        }
-      }
-    }
-    return super.getNextPage(currentPage);
-  }
-
-  /**
-   * Returns true if the selected file is a valid WS-I Message Log filename.
-   * 
-   * @return True if the selected file is a valid WS-I Message Log filename.
-   */
-  public boolean isValid()
-  {
-    return isValid;
-  }
-
-  /**
-   * @see org.eclipse.jface.wizard.IWizard#performFinish()
-   */
-  public boolean performFinish()
-  {
-    file = logPage.getFile();
-    containerFullPath = logPage.getContainerFullPath();
-    includewsdlfile = wsdlPage.includeWSDLFile();
-    wsdlfile = wsdlPage.getWSDLFile();
-    elementname = wsdlContentPage.getElementName();
-    namespace = wsdlContentPage.getNamespace();
-    parentname = wsdlContentPage.getParentName();
-    type = wsdlContentPage.getType();
-    isValid = true;
-    return true;
-  }
-
-  /**
-   * Returns the file selected by the user in the choose page.
-   * 
-   * @return the file selectedby the user in the choose page.
-   */
-  public IFile getFile()
-  {
-    return file;
-  }
-
-  /**
-   * Returns the IPath containing the selected IFile.
-   * 
-   * @return the IPath containing the selected IFile.
-   */
-  public IPath getContainerFullPath()
-  {
-    return containerFullPath;
-  }
-
-  /**
-   * Returns the selection in the Resource Navigator view.
-   * 
-   * @return the selection in the Resource Navigator view.
-   */
-  public ISelection getResourceNavigatorSelection()
-  {
-    IViewReference viewParts[] =
-      PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getViewReferences();
-
-    for (int i = 0; i < viewParts.length; i++)
-    {
-      if (viewParts[i] instanceof ResourceNavigator)
-      {
-        return ((ResourceNavigator) viewParts[i]).getViewSite().getSelectionProvider().getSelection();
-      }
-    }
-    return StructuredSelection.EMPTY;
-  }
-
-  /**
-   * Set the list of WSDL locations to let the user choose from.
-   * 
-   * @param wsdllocations A list of WSDL document locations.
-   */
-  public void setWSDLLocations(String[] wsdllocations) 
-  {
-	this.wsdllocations = wsdllocations;
-	
-  }
-  
-  /**
-   * Get the list of WSDL locations the user can choose from.
-   * 
-   * @return The list of WSDL locations.
-   */
-  public String[] getWSDLLocations()
-  {
-  	return wsdllocations;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java
deleted file mode 100644
index e92c4f3..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal.wizards;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin;
-
-/**
- * Wizard page that allows the user to specify the location of the 
- * WS-I Message Log file for purposes of validation.
- * 
- * @author David Lauzon, IBM
- */
-
-public class ValidationWizardLogPage extends WizardNewFileCreationPage
-{
-  /**
-   * Recommended extension for a WS-I Message Log file.
-   */
-  public static final String WSI_LOG_EXTENSION = "wsimsg";
- 
-  /**
-   * Default WS-I Message filename passed in the Constructor.
-   */
-  protected String filename;
-  
-  /**
-   * Constructor.
-   * 
-   * @param selection: selection in the Resource Navigator view.
-   * @param filename: default message log file name.
-   */
-  public ValidationWizardLogPage(IStructuredSelection selection, String filename)
-  {
-    super("ValidationWizardLogPage", selection);
-    this.filename = filename;
-    this.setTitle(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_LOG_FILENAME_HEADING"));
-    this.setDescription(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_LOG_FILENAME_EXPL"));
-  }
-
-
-  /** 
-   * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-   */
-  public void createControl(Composite parent) 
-  {
-    super.createControl(parent);
-    super.setFileName(filename);
-    setPageComplete(validatePage());
-  }
-
-  /**
-   * Returns the current selected file.
-   * 
-   * @return the selected IFile.  
-   */
-  public IFile getFile()
-  {
-    String fileName = getFileName();
-    String fileExtension = (new Path(fileName)).getFileExtension();
-    
-    if (fileExtension == null)
-      fileName = fileName.concat("." + WSI_LOG_EXTENSION);
-      
-    return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(fileName));
-  }
-
-  /**
-   * Returns true if selected file is a valid WS-I Message Log filename.
-   * 
-   * Since the WizardNewFileCreationPage does not provide an interface to
-   * allow the file specified to already exist (it gives an error that the
-   * the file already exists, an no way of allowing it to pass), and we want
-   * to allow the file to exist, so that we can overwrite it, we have to
-   * override this method, and do some magic to allow this case to pass.
-   *
-   * @return true if selected file is a valid WS-I Message Log filename.
-   * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validatePage()
-   */
-  protected boolean validatePage() 
-  {
-    String fileExtension = (new Path(getFileName())).getFileExtension();
-    if (fileExtension != null) 
-    {
-      if (fileExtension.compareTo(WSI_LOG_EXTENSION) != 0)
-      {        
-        setErrorMessage(WSIUIPlugin.getResourceString("_ERROR_INVALID_LOG_FILE_EXTENSION"));
-        return false;
-      }
-    }
-    
-    // Essentially, we take the container and concat the file to it, and
-    // check if its in the workspace, if it is, then it exists and we can 
-    // proceed. Otherwise, continue with the default validating.
-    if ( (getContainerFullPath() != null) && (getContainerFullPath().isEmpty() == false)
-           && (getFileName().compareTo("") != 0))
-    {
-      Path fullPath;
-            
-      if (fileExtension != null)
-        fullPath = new Path(getContainerFullPath().toString() + '/' + getFileName());
-      else
-        fullPath = new Path(getContainerFullPath().toString() + '/' + getFileName() + "." + WSI_LOG_EXTENSION);
-      
-      IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(fullPath);
-      
-      setErrorMessage(null);
-      if (resource != null)
-        setMessage(WSIUIPlugin.getResourceString("_WARNING_FILE_ALREADY_EXISTS"));
-      else
-        setMessage(null);
-
-      return true;
-    }
-    return super.validatePage();
-  }
-}
-

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLContentPage.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLContentPage.java
deleted file mode 100644
index 9f57a42..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLContentPage.java
+++ /dev/null

@@ -1,908 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal.wizards;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-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 org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Wizard page that allows the user to specify the location of the 
- * WSDL document for the Web service.
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-
-public class ValidationWizardWSDLContentPage extends WizardPage implements SelectionListener
-{
-  IStructuredSelection selection;
-
-  public static final String PORT = "port";
-  public static final String OPERATION = "operation";
-  public static final String BINDING = "binding";
-  public static final String PORTTYPE = "porttype";
-  public static final String MESSAGE = "message";
-  /**
-   * Access to the includeWSDL flag.  
-   */
-  protected Button wsdlPortButton;
-  protected Button wsdlBindingButton;
-  protected Button wsdlPortTypeButton;
-  protected Button wsdlOperationButton;
-  protected Button wsdlMessageButton;
-
-  protected Combo nameCombo;
-  protected Text namespaceText;
-  //protected Combo parentCombo;
-  //protected Text nameText;
-  protected Text parentnameText;
-
-  protected List ports = null;
-  protected List operations = null;
-  protected List bindings = null;
-  protected List porttypes = null;
-  protected List messages = null;
-
-  /**
-   * Constructor.
-   * 
-   * @param selection: selection in the Resource Navigator view.
-   */
-  public ValidationWizardWSDLContentPage(IStructuredSelection selection)
-  {
-    super("ValidationWizardWSDLContentPage");
-    this.selection = selection;
-    this.setTitle(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_ELEMENT_HEADING"));
-    this.setDescription(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_ELEMENT_EXPL"));
-  }
-
-  /**
-   * Always returns true.
-   */
-  public boolean isPageComplete()
-  {
-    if (((ValidationWizard) getWizard()).includeWSDLFile())
-    {
-      int selection = nameCombo.getSelectionIndex();
-      if (selection != -1 && !nameCombo.getItem(selection).equals(""))
-      {
-        return true;
-      }
-      return false;
-    }
-    return true;
-  }
-
-  /*
-   * Creates the top level control for this page under the given 
-   * parent composite. Implementors are responsible for ensuring
-   * that the created control can be accessed via getControl 
-   *
-   * @param parent - the parent composite
-   */
-  public void createControl(Composite parent)
-  {
-    Composite base = new Composite(parent, SWT.NONE);
-    base.setLayout(new GridLayout());
-    GridData data;
-
-    // create a group
-    Group wsdlElementGroup = new Group(base, SWT.SHADOW_ETCHED_IN);
-    wsdlElementGroup.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_GROUP_TEXT_ELEMENT"));
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    wsdlElementGroup.setLayoutData(data);
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    wsdlElementGroup.setLayout(layout);
-
-    // create a base panel with 2 columns
-    Composite basePanel = new Composite(wsdlElementGroup, SWT.NONE);
-    layout = new GridLayout();
-    layout.numColumns = 2;
-    layout.makeColumnsEqualWidth = false;
-    basePanel.setLayout(layout);
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    basePanel.setLayoutData(data);
-
-    // content for first column
-    createWSDLElementTypeContent(basePanel);
-
-    // content for second column
-    createWSDLElementContent(basePanel);
-
-    setControl(base);
-  }
-
-  /**
-   * Create a group of radio buttons indicating the type of WSDL element.
-   * The five tpes are: port, binding, portType, operation and message.
-   * @param parent the parent container. 
-   */
-  protected void createWSDLElementTypeContent(Composite parent)
-  {
-    // create a group
-    Group wsdlTypeGroup = new Group(parent, SWT.SHADOW_ETCHED_IN);
-    wsdlTypeGroup.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_GROUP_TEXT_TYPE"));
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = false;
-    wsdlTypeGroup.setLayoutData(data);
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    wsdlTypeGroup.setLayout(layout);
-
-    wsdlPortButton = new Button(wsdlTypeGroup, SWT.RADIO);
-    wsdlPortButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_RADIO_PORT"));
-    wsdlPortButton.setData("wsdlPortButton");
-    wsdlPortButton.setSelection(true);
-    wsdlPortButton.addSelectionListener(new PortButtonSelectionListener());
-
-    wsdlBindingButton = new Button(wsdlTypeGroup, SWT.RADIO);
-    wsdlBindingButton.setData("wsdlBindingButton");
-    wsdlBindingButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_RADIO_BINDING"));
-    wsdlBindingButton.setSelection(false);
-    wsdlBindingButton.addSelectionListener(new BindingButtonSelectionListener());
-
-    wsdlPortTypeButton = new Button(wsdlTypeGroup, SWT.RADIO);
-    wsdlPortTypeButton.setData("wsdlPortTypeButton");
-    wsdlPortTypeButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_RADIO_PORT_TYPE"));
-    wsdlPortTypeButton.setSelection(false);
-    wsdlPortTypeButton.addSelectionListener(new PortTypeButtonSelectionListener());
-
-    wsdlOperationButton = new Button(wsdlTypeGroup, SWT.RADIO);
-    wsdlOperationButton.setData("wsdlOperationButton");
-    wsdlOperationButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_RADIO_OPERATION"));
-    wsdlOperationButton.setSelection(false);
-    wsdlOperationButton.addSelectionListener(new OperationButtonSelectionListener());
-
-    wsdlMessageButton = new Button(wsdlTypeGroup, SWT.RADIO);
-    wsdlMessageButton.setData("wsdlMessageButton");
-    wsdlMessageButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_RADIO_MESSAGE"));
-    wsdlMessageButton.setSelection(false);
-    wsdlMessageButton.addSelectionListener(new MessageButtonSelectionListener());
-  }
-
-  /**
-   * Create a panel to capture the name, namespace and parent of an
-   * WSDL element.
-   * @param parent the parent container. 
-   */
-  protected void createWSDLElementContent(Composite parent)
-  {
-    // create a grouping with 2 columns, one for labels and theother for fields
-    Composite fieldColumn = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    layout.makeColumnsEqualWidth = false;
-    fieldColumn.setLayout(layout);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    fieldColumn.setLayoutData(data);
-
-    // The WSDL element name label
-    Label label = new Label(fieldColumn, SWT.LEFT);
-    label.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_LABEL_NAME"));
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(data);
-
-    // The WSDL element name field
-    nameCombo = new Combo(fieldColumn, SWT.READ_ONLY);
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    nameCombo.setLayoutData(data);
-    nameCombo.addSelectionListener(new NameSelectionListener());
-    //nameText = new Text(fieldColumn, SWT.SINGLE | SWT.BORDER);
-    //data = new GridData();
-    //data.horizontalAlignment = GridData.FILL;
-    //data.grabExcessHorizontalSpace = true;
-    //data.widthHint = 50;
-    //nameText.setLayoutData(data);
-    //nameText.addModifyListener(new TextBoxListener());
-
-    // The WSDL element namespace label
-    label = new Label(fieldColumn, SWT.LEFT);
-    label.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_LABEL_NAMESPACE"));
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(data);
-
-    // The WSDL element namespace field
-    namespaceText = new Text(fieldColumn, SWT.SINGLE | SWT.BORDER);
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.widthHint = 50;
-    namespaceText.setLayoutData(data);
-    namespaceText.addModifyListener(new TextBoxListener());
-    namespaceText.setEditable(false);
-
-    // The WSDL element parent label
-    label = new Label(fieldColumn, SWT.LEFT);
-    label.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_LABEL_PARENT"));
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(data);
-
-    // The WSDL element parent field
-    //    parentCombo = new Combo(fieldColumn, SWT.READ_ONLY);
-    //    data = new GridData();
-    //    data.horizontalAlignment = GridData.FILL;
-    //    data.grabExcessHorizontalSpace = true;
-    //    parentCombo.setLayoutData(data);
-    parentnameText = new Text(fieldColumn, SWT.SINGLE | SWT.BORDER);
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.widthHint = 50;
-    parentnameText.setLayoutData(data);
-    parentnameText.addModifyListener(new TextBoxListener());
-    parentnameText.setEditable(false);
-  }
-
-  /**
-   * Always return true.
-   */
-  public boolean performFinish()
-  {
-    return true;
-  }
-
-  /**
-   * Sent when default selection occurs in the control.
-   * @param e - an event containing information about the selection
-   */
-  public void widgetDefaultSelected(SelectionEvent e)
-  {}
-
-  /**
-   * Handles the includeWSDL checkbox.
-   * Sent when selection occurs in the control. 
-   * @param e - an event containing information about the selection
-   */
-  public void widgetSelected(SelectionEvent e)
-  {}
-
-  /**
-   * Get the element name.
-   * 
-   * @return The element name.
-   */
-  public String getElementName()
-  {
-    int selection = nameCombo.getSelectionIndex();
-    if(selection != -1)
-    {  
-      return nameCombo.getItem(selection);
-    }
-    return "";
-  }
-
-  /**
-   * Get the namespace.
-   * 
-   * @return The namespace.
-   */
-  public String getNamespace()
-  {
-    return namespaceText.getText();
-  }
-
-  /**
-   * Get the name of the parent of the element.
-   * 
-   * @return The name of the parent of the element.
-   */
-  public String getParentName()
-  {
-    //return parentCombo.getItem(parentCombo.getSelectionIndex());
-    return parentnameText.getText();
-  }
-
-  /**
-   * Return the type of the element.
-   * 
-   * @return the type of the element.
-   */
-  public String getType()
-  {
-    if (wsdlBindingButton.getSelection())
-    {
-      return BINDING;
-    }
-    else if (wsdlMessageButton.getSelection())
-    {
-      return MESSAGE;
-    }
-    else if (wsdlOperationButton.getSelection())
-    {
-      return OPERATION;
-    }
-    else if (wsdlPortButton.getSelection())
-    {
-      return PORT;
-    }
-    else if (wsdlPortTypeButton.getSelection())
-    {
-      return PORTTYPE;
-    }
-    return null;
-
-  }
-
-  public void addElement(String type, String name, String namespace, String parent)
-  {
-    if (ports == null)
-    {
-      resetElements();
-    }
-    if (type.equals(PORT))
-    {
-      ports.add(new WSDLElement(name, namespace, parent));
-    }
-    else if (type.equalsIgnoreCase(OPERATION))
-    {
-      operations.add(new WSDLElement(name, namespace, parent));
-    }
-    else if (type.equalsIgnoreCase(BINDING))
-    {
-      bindings.add(new WSDLElement(name, namespace, parent));
-    }
-    else if (type.equalsIgnoreCase(PORTTYPE))
-    {
-      porttypes.add(new WSDLElement(name, namespace, parent));
-    }
-    else if (type.equalsIgnoreCase(MESSAGE))
-    {
-      messages.add(new WSDLElement(name, namespace, parent));
-    }
-  }
-
-  public void resetElements()
-  {
-    ports = new Vector();
-    operations = new Vector();
-    bindings = new Vector();
-    porttypes = new Vector();
-    messages = new Vector();
-    nameCombo.clearSelection();
-    nameCombo.removeAll();
-  }
-
-  /**
-   * Add value to the list box
-   */
-  class WorkspaceButtonListener implements SelectionListener
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {}
-
-    public void widgetSelected(SelectionEvent e)
-    {}
-  }
-
-  /**
-   * Add value to the list box
-   */
-  class BrowseButtonListener implements SelectionListener
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {}
-
-    public void widgetSelected(SelectionEvent e)
-    {}
-  }
-
-  /**
-   * Add value to the list box
-   */
-  class SearchUDDIButtonListener implements SelectionListener
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {}
-
-    public void widgetSelected(SelectionEvent e)
-    {}
-  }
-  /**
-   * Add value to the file field.
-   */
-  class TextBoxListener implements ModifyListener
-  {
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-	 */
-    public void modifyText(ModifyEvent e)
-    {
-      getContainer().updateButtons();
-
-    }
-
-  }
-  private class WSDLElement
-  {
-    private String name;
-    private String namespace;
-    private String parent;
-
-    public WSDLElement(String name, String namespace, String parent)
-    {
-      this.name = name;
-      this.namespace = namespace;
-      this.parent = parent;
-    }
-
-    public String getName()
-    {
-      return name;
-    }
-
-    public String getNamespace()
-    {
-      return namespace;
-    }
-
-    public String getParentName()
-    {
-      return parent;
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
-   */
-  public void setVisible(boolean visible)
-  {
-    resetElements();
-    super.setVisible(visible);
-    if (visible)
-    {
-      try
-      {
-        WSDLFactory factory = WSDLFactory.newInstance();
-        WSDLReader reader = factory.newWSDLReader();
-        Definition defElem = reader.readWSDL(((ValidationWizard) getWizard()).getWSDLFile());
-        QName defQName = defElem.getQName();
-        String defname = "";
-        if (defQName != null)
-        {
-          defname = defQName.getLocalPart();
-        }
-        String namespace = defElem.getTargetNamespace();
-
-        // register the ports
-        Map servmap = defElem.getServices();
-        if (servmap != null)
-        {
-          Collection servs = servmap.values();
-          if (servs != null)
-          {
-            Iterator servIter = servs.iterator();
-            while (servIter.hasNext())
-            {
-              Service service = (Service) servIter.next();
-              String servname = service.getQName().getLocalPart();
-
-              Map portmap = service.getPorts();
-              if (portmap != null)
-              {
-                Collection ports = portmap.values();
-                if (ports != null)
-                {
-                  Iterator portIter = ports.iterator();
-                  while (portIter.hasNext())
-                  {
-                    Port port = (Port) portIter.next();
-                    String name = port.getName();
-                    addElement(ValidationWizardWSDLContentPage.PORT, name, namespace, servname);
-                  }
-                }
-              }
-            }
-          }
-        }
-
-        // Register the Bindings
-        Map bindingmap = defElem.getBindings();
-        if (bindingmap != null)
-        {
-          Collection bindings = bindingmap.values();
-          if (bindings != null)
-          {
-            Iterator bindIter = bindings.iterator();
-            while (bindIter.hasNext())
-            {
-              Binding binding = (Binding) bindIter.next();
-              String name = binding.getQName().getLocalPart();
-              addElement(ValidationWizardWSDLContentPage.BINDING, name, namespace, defname);
-            }
-          }
-        }
-
-        // Register the PortTypes and Operations
-        Map porttypemap = defElem.getPortTypes();
-        if (porttypemap != null)
-        {
-          Collection porttypes = porttypemap.values();
-          if (porttypes != null)
-          {
-            Iterator porttypeIter = porttypes.iterator();
-            while (porttypeIter.hasNext())
-            {
-              PortType porttype = (PortType) porttypeIter.next();
-              String porttypename = porttype.getQName().getLocalPart();
-              addElement(ValidationWizardWSDLContentPage.PORTTYPE, porttypename, namespace, defname);
-
-              // Register the Operations
-              List operations = porttype.getOperations();
-              if (operations != null)
-              {
-                Iterator operIter = operations.iterator();
-                while (operIter.hasNext())
-                {
-                  Operation operation = (Operation) operIter.next();
-                  String name = operation.getName();
-                  addElement(ValidationWizardWSDLContentPage.OPERATION, name, namespace, porttypename);
-                }
-              }
-            }
-          }
-        }
-        Map messagemap = defElem.getMessages();
-        if (messagemap != null)
-        {
-          Collection messages = messagemap.values();
-          if (messages != null)
-          {
-            Iterator messIter = messages.iterator();
-            while (messIter.hasNext())
-            {
-              Message message = (Message) messIter.next();
-              String name = message.getQName().getLocalPart();
-              addElement(ValidationWizardWSDLContentPage.MESSAGE, name, namespace, defname);
-            }
-          }
-        }
-        nameCombo.removeAll();
-        namespaceText.setText("");
-        parentnameText.setText("");
-        int numElems = ports.size();
-        WSDLElement[] elems = (WSDLElement[]) ports.toArray(new WSDLElement[numElems]);
-        for (int i = 0; i < numElems; i++)
-        {
-          nameCombo.add(elems[i].getName(), i);
-          if (i == 0)
-          {
-            nameCombo.select(0);
-            namespaceText.setText(elems[i].getNamespace());
-            parentnameText.setText(elems[i].getParentName());
-
-          }
-        }
-        wsdlPortButton.setSelection(true);
-        wsdlBindingButton.setSelection(false);
-        wsdlMessageButton.setSelection(false);
-        wsdlOperationButton.setSelection(false);
-        wsdlPortTypeButton.setSelection(false);
-
-      }
-      catch (WSDLException e)
-      {
-        // The WSDL file is not valid.
-      }
-    }
-    else
-    {
-      resetElements();
-    }
-
-  }
-
-  class PortButtonSelectionListener implements SelectionListener
-  {
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-      widgetSelected(e);
-
-    }
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetSelected(SelectionEvent e)
-    {
-      nameCombo.removeAll();
-      namespaceText.setText("");
-      parentnameText.setText("");
-      int numElems = ports.size();
-      WSDLElement[] elems = (WSDLElement[]) ports.toArray(new WSDLElement[numElems]);
-      for (int i = 0; i < numElems; i++)
-      {
-        nameCombo.add(elems[i].getName(), i);
-        if (i == 0)
-        {
-          nameCombo.select(0);
-          namespaceText.setText(elems[i].getNamespace());
-          parentnameText.setText(elems[i].getParentName());
-
-        }
-      }
-    }
-
-  }
-  class BindingButtonSelectionListener implements SelectionListener
-  {
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-      widgetSelected(e);
-
-    }
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetSelected(SelectionEvent e)
-    {
-      nameCombo.removeAll();
-      namespaceText.setText("");
-      parentnameText.setText("");
-      int numElems = bindings.size();
-      WSDLElement[] elems = (WSDLElement[]) bindings.toArray(new WSDLElement[numElems]);
-      for (int i = 0; i < numElems; i++)
-      {
-        nameCombo.add(elems[i].getName(), i);
-        if (i == 0)
-        {
-          nameCombo.select(0);
-          namespaceText.setText(elems[i].getNamespace());
-          parentnameText.setText(elems[i].getParentName());
-        }
-      }
-
-    }
-
-  }
-  class PortTypeButtonSelectionListener implements SelectionListener
-  {
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-      widgetSelected(e);
-
-    }
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetSelected(SelectionEvent e)
-    {
-      nameCombo.removeAll();
-      namespaceText.setText("");
-      parentnameText.setText("");
-      int numElems = porttypes.size();
-      WSDLElement[] elems = (WSDLElement[]) porttypes.toArray(new WSDLElement[numElems]);
-      for (int i = 0; i < numElems; i++)
-      {
-        nameCombo.add(elems[i].getName(), i);
-        if (i == 0)
-        {
-          nameCombo.select(0);
-          namespaceText.setText(elems[i].getNamespace());
-          parentnameText.setText(elems[i].getParentName());
-        }
-      }
-
-    }
-
-  }
-  class OperationButtonSelectionListener implements SelectionListener
-  {
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-      widgetSelected(e);
-
-    }
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetSelected(SelectionEvent e)
-    {
-      nameCombo.removeAll();
-      namespaceText.setText("");
-      parentnameText.setText("");
-      int numElems = operations.size();
-      WSDLElement[] elems = (WSDLElement[]) operations.toArray(new WSDLElement[numElems]);
-      for (int i = 0; i < numElems; i++)
-      {
-        nameCombo.add(elems[i].getName(), i);
-        if (i == 0)
-        {
-          nameCombo.select(0);
-          namespaceText.setText(elems[i].getNamespace());
-          parentnameText.setText(elems[i].getParentName());
-        }
-      }
-
-    }
-
-  }
-  class MessageButtonSelectionListener implements SelectionListener
-  {
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-      widgetSelected(e);
-
-    }
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetSelected(SelectionEvent e)
-    {
-      nameCombo.removeAll();
-      namespaceText.setText("");
-      parentnameText.setText("");
-      int numElems = messages.size();
-      WSDLElement[] elems = (WSDLElement[]) messages.toArray(new WSDLElement[numElems]);
-      for (int i = 0; i < numElems; i++)
-      {
-        nameCombo.add(elems[i].getName(), i);
-        if (i == 0)
-        {
-          nameCombo.select(0);
-          namespaceText.setText(elems[i].getNamespace());
-          parentnameText.setText(elems[i].getParentName());
-        }
-      }
-
-    }
-
-  }
-
-  class NameSelectionListener implements SelectionListener
-  {
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-      widgetSelected(e);
-
-    }
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-    public void widgetSelected(SelectionEvent e)
-    {
-      int selection = ((Combo) e.getSource()).getSelectionIndex();
-      String type = getType();
-      WSDLElement elem = null;
-      if (type.equals(PORT))
-      {
-        elem = (WSDLElement) ports.get(selection);
-      }
-      else if (type.equals(BINDING))
-      {
-        elem = (WSDLElement) bindings.get(selection);
-      }
-      else if (type.equals(PORTTYPE))
-      {
-        elem = (WSDLElement) porttypes.get(selection);
-      }
-      else if (type.equals(OPERATION))
-      {
-        elem = (WSDLElement) operations.get(selection);
-      }
-      else if (type.equals(MESSAGE))
-      {
-        elem = (WSDLElement) messages.get(selection);
-      }
-
-      if (elem != null)
-      {
-        namespaceText.setText(elem.getNamespace());
-        parentnameText.setText(elem.getParentName());
-      }
-    }
-
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java b/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java
deleted file mode 100644
index 0618ad2..0000000
--- a/bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java
+++ /dev/null

@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.ui.internal.wizards;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.wsi.ui.internal.Resource;
-import org.eclipse.wst.wsi.ui.internal.WSIUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Wizard page that allows the user to specify the location of the 
- * WSDL document for the Web service.
- * 
- * @author David Lauzon, IBM
- * @author Lawrence Mandel, IBM
- */
-
-public class ValidationWizardWSDLPage extends WizardPage implements SelectionListener
-{
-
-  IStructuredSelection selection;
-
-  protected boolean wsdlinvalid = false;
-  /**
-   * Access to the includeWSDL flag.  
-   */
-  protected Button includeWSDLButton;
-
-  /**
-   * Access to the wsdl document group.
-   */
-  protected Group documentGroup;
-  protected Text documentLocationText;
-  protected Combo fileField;
-  /**
-   * Constructor.
-   * 
-   * @param selection: selection in the Resource Navigator view.
-   */
-  public ValidationWizardWSDLPage(IStructuredSelection selection)
-  {
-    super("ValidationWizardWSDLPage");
-    this.selection = selection;
-    this.setTitle(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_FILENAME_HEADING"));
-    this.setDescription(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SELECT_WSDL_FILENAME_EXPL"));
-  }
-
-  /**
-   * Always returns true.
-   */
-  public boolean isPageComplete()
-  {
-    if (includeWSDLFile())
-    {
-
-      if (fileField.getText() == null || fileField.getText().equals("") || wsdlinvalid)
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /*
-   * Creates the top level control for this page under the given parent
-   * composite. Implementors are responsible for ensuring that the created
-   * control can be accessed via getControl
-   * 
-   * @param parent - the parent composite
-   */
-  public void createControl(Composite parent)
-  {
-    Composite base = new Composite(parent, SWT.NONE);
-    base.setLayout(new GridLayout());
-    GridData data;
-
-    // add includeWSDL flag
-    includeWSDLButton = new Button(base, SWT.CHECK);
-    includeWSDLButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_INCLUDE_WSDL_BUTTON"));
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    includeWSDLButton.setLayoutData(data);
-    includeWSDLButton.addSelectionListener(this);
-    includeWSDLButton.setSelection(false);
-
-    // create a WSDL document group
-    documentGroup = new Group(base, SWT.SHADOW_ETCHED_IN);
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    documentGroup.setLayoutData(data);
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    documentGroup.setLayout(layout);
-    documentGroup.setVisible(false);
-
-    createDocumentGroupContents(documentGroup);
-
-    setControl(base);
-  }
-
-  protected Control createDocumentGroupContents(Composite documentGroup)
-  {
-    //radio buttons' container
-    Composite basePanel = new Composite(documentGroup, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    layout.makeColumnsEqualWidth = false;
-    layout.marginWidth = 0;
-    basePanel.setLayout(layout);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    basePanel.setLayoutData(data);
-
-    Composite group1 = new Composite(basePanel, SWT.NONE);
-    group1.setFont(getFont());
-    layout = new GridLayout();
-    layout.numColumns = 1;
-    group1.setLayout(layout);
-    data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    group1.setLayoutData(data);
-
-    Label documentLabel = new Label(group1, SWT.LEFT);
-    documentLabel.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_INCLUDE_WSDL_LABEL"));
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    documentLabel.setLayoutData(data);
-    /**
-	 * Label label = new Label(basePanel, SWT.LEFT); data = new GridData();
-	 * data.horizontalAlignment = GridData.FILL; data.horizontalSpan = 1;
-	 * label.setLayoutData(data);
-	 */
-    fileField = new Combo(group1, SWT.DROP_DOWN);
-    String[] wsdllocations = ((ValidationWizard) getWizard()).getWSDLLocations();
-    if(wsdllocations != null)
-    {
-      int numlocs = wsdllocations.length;
-      for(int i = 0; i < numlocs; i++)
-      {
-      	fileField.add(wsdllocations[i]);
-      }
-    }
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessVerticalSpace = true;
-    data.widthHint = 30;
-    fileField.setLayoutData(data);
-    fileField.addModifyListener(new FileFieldListener());
-
-    Label wsdlLabel = new Label(group1, SWT.LEFT);
-    wsdlLabel.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_VALID_WSDL_LABEL"));
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    documentLabel.setLayoutData(data);
-
-    // documentLocationText = new Text(documentGroup, SWT.SINGLE | SWT.BORDER);
-    // data = new GridData();
-    // data.horizontalAlignment = GridData.FILL;
-    // data.grabExcessHorizontalSpace = true;
-    // data.widthHint = 30;
-    // documentLocationText.setLayoutData(data);
-
-    Composite group = new Composite(basePanel, SWT.NONE);
-    group.setFont(getFont());
-    layout = new GridLayout();
-    layout.numColumns = 1;
-    group.setLayout(layout);
-    data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    group.setLayoutData(data);
-
-    Button workspaceButton = new Button(group, SWT.PUSH);
-    workspaceButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_WORKBENCH_BUTTON"));
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    workspaceButton.setLayoutData(data);
-    workspaceButton.addSelectionListener(new WorkspaceButtonListener());
-
-    Button browseButton = new Button(group, SWT.PUSH);
-    browseButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_BROWSE_BUTTON"));
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    browseButton.setLayoutData(data);
-    browseButton.addSelectionListener(new BrowseButtonListener());
-
-    // Button searchUDDIButton = new Button(group, SWT.PUSH);
-    // searchUDDIButton.setText(WSIUIPlugin.getResourceString("_UI_WIZARD_V_SEARCH_UDDI_BUTTON"));
-    // data = new GridData();
-    // data.horizontalAlignment = GridData.FILL;
-    // searchUDDIButton.setLayoutData(data);
-    // searchUDDIButton.addSelectionListener(new SearchUDDIButtonListener());
-
-    return documentGroup;
-  }
-
-  public boolean includeWSDLFile()
-  {
-    return includeWSDLButton.getSelection();
-  }
-
-  public String getWSDLFile()
-  {
-    return fileField.getText();
-  }
-
-  /**
-   * Always return true.
-   */
-  public boolean performFinish()
-  {
-    return true;
-  }
-
-  /**
-   * Sent when default selection occurs in the control.
-   * 
-   * @param e -
-   *            an event containing information about the selection
-   */
-  public void widgetDefaultSelected(SelectionEvent e)
-  {}
-
-  /**
-   * Handles the includeWSDL checkbox. Sent when selection occurs in the
-   * control.
-   * 
-   * @param e -
-   *            an event containing information about the selection
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == includeWSDLButton)
-    {
-      if (includeWSDLButton.getSelection())
-      {
-        documentGroup.setVisible(true);
-      }
-      else
-      {
-        documentGroup.setVisible(false);
-      }
-      getContainer().updateButtons();
-    }
-  }
-
-  public void setWSDLInvalid()
-  {
-    wsdlinvalid = true;
-  }
-
-  /**
-   * Add value to the list box
-   */
-  class WorkspaceButtonListener implements SelectionListener
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {}
-
-    public void widgetSelected(SelectionEvent e)
-    {
-      SelectSingleFileDialog dialog = new SelectSingleFileDialog(getShell(), selection, false);
-      dialog.addFilterExtensions(new String[] { ".wsdl" });
-      dialog.create();
-      dialog.getShell().setText(WSIUIPlugin.getResourceString("_UI_DIALOG_SS_FILE_SHELL_TEXT"));
-      dialog.setTitle(WSIUIPlugin.getResourceString("_UI_DIALOG_SS_FILE_TITLE"));
-      dialog.setMessage(WSIUIPlugin.getResourceString("_UI_DIALOG_SS_FILE_DESCRIPTION"));
-      dialog.setTitleImage(WSIUIPlugin.getResourceImage(Resource.VALIDATE_WSI_LOGFILE_WIZ));
-      
-      int result = dialog.open();
-
-      if (result == Window.OK)
-      {
-        IFile currentIFile = dialog.getFile();
-        if (currentIFile != null)
-        {
-          fileField.add(currentIFile.getLocation().toString(), 0);
-          fileField.select(0);
-        }
-      }
-    }
-  }
-
-  /**
-   * Add value to the list box
-   */
-  class BrowseButtonListener implements SelectionListener
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {}
-
-    public void widgetSelected(SelectionEvent e)
-    {
-      FileDialog dialog = new FileDialog(getShell());
-      dialog.setFilterExtensions(new String[] { "*.wsdl" });
-      String selection = dialog.open();
-      if (selection != null)
-      {
-        fileField.add(selection, 0);
-        fileField.select(0);
-      }
-    }
-  }
-
-  /**
-   * Add value to the list box
-   */
-  // class SearchUDDIButtonListener implements SelectionListener
-  // {
-  //  public void widgetDefaultSelected(SelectionEvent e)
-  //  {}
-  //
-  //  public void widgetSelected(SelectionEvent e)
-  //  {
-  //    String title = "Information";
-  //    String message = "The chosen operation is not currently available.";
-  //    MessageDialog.openInformation(Display.getDefault().getActiveShell(), title, message);
-  //  }
-  //}
-
-  /**
-   * Add value to the file field.
-   */
-  class FileFieldListener implements ModifyListener
-  {
-
-    /*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-	 */
-    public void modifyText(ModifyEvent e)
-    {
-      wsdlinvalid = false;
-      getContainer().updateButtons();
-
-    }
-
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/.classpath b/bundles/org.eclipse.wst.wsi/.classpath
deleted file mode 100644
index 7d64eda..0000000
--- a/bundles/org.eclipse.wst.wsi/.classpath
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="wsicore"/>
-	<classpathentry kind="src" path="wsivalidate"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/bundles/org.eclipse.wst.wsi/.cvsignore b/bundles/org.eclipse.wst.wsi/.cvsignore
deleted file mode 100644
index d3c32c5..0000000
--- a/bundles/org.eclipse.wst.wsi/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-temp.folder
-build.xml
-wsicore.jar
-wsivalidate.jar

diff --git a/bundles/org.eclipse.wst.wsi/.project b/bundles/org.eclipse.wst.wsi/.project
deleted file mode 100644
index cc60c1f..0000000
--- a/bundles/org.eclipse.wst.wsi/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsi</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
deleted file mode 100644
index 71d84e6..0000000
--- a/bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,62 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.wsi; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsicore.jar,
- wsivalidate.jar
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %_PROVIDER_NAME
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.wst.wsi.internal,
- org.eclipse.wst.wsi.internal.analyzer,
- org.eclipse.wst.wsi.internal.core,
- org.eclipse.wst.wsi.internal.core.analyzer,
- org.eclipse.wst.wsi.internal.core.analyzer.config,
- org.eclipse.wst.wsi.internal.core.analyzer.config.impl,
- org.eclipse.wst.wsi.internal.core.common,
- org.eclipse.wst.wsi.internal.core.common.impl,
- org.eclipse.wst.wsi.internal.core.document,
- org.eclipse.wst.wsi.internal.core.document.impl,
- org.eclipse.wst.wsi.internal.core.log,
- org.eclipse.wst.wsi.internal.core.log.impl,
- org.eclipse.wst.wsi.internal.core.monitor,
- org.eclipse.wst.wsi.internal.core.monitor.config,
- org.eclipse.wst.wsi.internal.core.monitor.config.impl,
- org.eclipse.wst.wsi.internal.core.profile,
- org.eclipse.wst.wsi.internal.core.profile.impl,
- org.eclipse.wst.wsi.internal.core.profile.validator,
- org.eclipse.wst.wsi.internal.core.profile.validator.impl,
- org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope,
- org.eclipse.wst.wsi.internal.core.profile.validator.impl.message,
- org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi,
- org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl,
- org.eclipse.wst.wsi.internal.core.report,
- org.eclipse.wst.wsi.internal.core.report.impl,
- org.eclipse.wst.wsi.internal.core.util,
- org.eclipse.wst.wsi.internal.core.wsdl,
- org.eclipse.wst.wsi.internal.core.wsdl.traversal,
- org.eclipse.wst.wsi.internal.core.wsdl.xsd,
- org.eclipse.wst.wsi.internal.core.xml,
- org.eclipse.wst.wsi.internal.core.xml.dom,
- org.eclipse.wst.wsi.internal.core.xml.jaxp,
- org.eclipse.wst.wsi.internal.core.xml.schema,
- org.eclipse.wst.wsi.internal.document,
- org.eclipse.wst.wsi.internal.report,
- org.eclipse.wst.wsi.internal.validate.wsdl
-Require-Bundle: org.eclipse.core.runtime.compatibility,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.core.resources,
- org.eclipse.wst.wsdl.validation,
- org.eclipse.wst.ws.ui,
- org.eclipse.ui,
- org.wsdl4j,
- org.uddi4j,
- org.eclipse.core.runtime;bundle-version="2.1.0",
- org.apache.axis
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.wst.wsi.internal.WSITestToolsPlugin

diff --git a/bundles/org.eclipse.wst.wsi/about.html b/bundles/org.eclipse.wst.wsi/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.wst.wsi/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/build.properties b/bundles/org.eclipse.wst.wsi/build.properties
deleted file mode 100644
index 8085ad3..0000000
--- a/bundles/org.eclipse.wst.wsi/build.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-source.wsicore.jar = wsicore/
-bin.includes = wsicore.jar,\
-               wsivalidate.jar,\
-               plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               about.html
-jars.compile.order = wsicore.jar,\
-                     wsivalidate.jar
-source.wsivalidate.jar = wsivalidate/
-output.wsicore.jar = bin/
-output.wsivalidate.jar = bin/
-src.includes = component.xml,\
-               build.properties

diff --git a/bundles/org.eclipse.wst.wsi/component.xml b/bundles/org.eclipse.wst.wsi/component.xml
deleted file mode 100644
index 48a2caf..0000000
--- a/bundles/org.eclipse.wst.wsi/component.xml
+++ /dev/null

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.wsi"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.wsi" fragment="false"/><plugin id="org.eclipse.wst.wsi.ui" fragment="false"/></component>
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/plugin.properties b/bundles/org.eclipse.wst.wsi/plugin.properties
deleted file mode 100644
index 2c65e29..0000000
--- a/bundles/org.eclipse.wst.wsi/plugin.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-# /*******************************************************************************
-#  * Copyright (c) 2002-2005 IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM - Initial API and implementation
-#  *******************************************************************************/
-_PLUGIN_NAME   = WSI Conformance Tools
-_UI_WSDL_WSI_VALIDATOR = WSDL WS-I Validator
-_PROVIDER_NAME = Eclipse.org

diff --git a/bundles/org.eclipse.wst.wsi/plugin.xml b/bundles/org.eclipse.wst.wsi/plugin.xml
deleted file mode 100644
index 84a3928..0000000
--- a/bundles/org.eclipse.wst.wsi/plugin.xml
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
---> 
-
-<plugin>
-
-     <extension
-         id="wsdlWSIValidator"
-         name="%_UI_WSDL_WSI_VALIDATOR"
-         point="org.eclipse.wst.wsdl.validation.extvalidator">
-      <extvalidator
-            namespace="http://schemas.xmlsoap.org/wsdl/"
-            class="org.eclipse.wst.wsi.internal.validate.wsdl.WSDLValidator"
-            resourcebundle="wsivalidate">
-      </extvalidator>
-   </extension>
-  
-</plugin>

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/ToolEnvironment.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/ToolEnvironment.java
deleted file mode 100644
index 88bee3f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/ToolEnvironment.java
+++ /dev/null

@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.util.XMLInfo;
-
-/**
- * This class contains Tool environment information.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class ToolEnvironment
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_ENVIRONMENT;
-
-  /**
-   * QName.
-   */
-  //public static final QName QNAME = new QName(WSIConstants.NS_URI_WSI_COMMON, ELEM_NAME);
-
-  /**
-   * Tool environment information.
-   */
-  protected String runtimeName = System.getProperty("java.runtime.name");
-  protected String runtimeVersion = System.getProperty("java.runtime.version");
-
-  protected String osName = System.getProperty("os.name");
-  protected String osVersion = System.getProperty("os.version");
-
-  protected String xmlParserName = "?";
-  protected String xmlParserVersion = "?";
-
-  /**
-   * Additional tool environment information.
-   */
-  protected XMLInfo xmlInfo = null;
-
-  /**
-   * Create object that represents tool runtime environment.
-   */
-  public ToolEnvironment()
-  {
-    try
-    {
-
-      // FUTURE: made compatible with later versions of Xerces where getVersion
-      // is no longer statically available.
-      // xmlParserVersion = new org.apache.xerces.impl.Version().getVersion();
-      xmlParserVersion = org.apache.xerces.impl.Version.getVersion();
-
-      xmlParserName = "Apache Xerces";
-    }
-
-    catch (Exception e)
-    {
-      // ADD: How else can we get the name version number
-    }
-
-    catch (Error err)
-    {
-      // ADD: How else can we get the name version number
-    }
-  }
-
-  /**
-   * Create object that represents tool runtime environment.
-   * @param xmlInfo additional tool environment information.
-   */
-  public ToolEnvironment(XMLInfo xmlInfo)
-  {
-    this.xmlInfo = xmlInfo;
-  }
-
-  /**
-   * Returns the osName.
-   * @return the osName.
-   * @see #setOSName
-   */
-  public String getOSName()
-  {
-    return osName;
-  }
-
-  /**
-   * Returns the osVersion.
-   * @return the osVersion.
-   * @see #setOSVersion
-   */
-  public String getOSVersion()
-  {
-    return osVersion;
-  }
-
-  /**
-   * Returns the parserName.
-   * @return the parserName.
-   * @see #setXMLParserName
-   */
-  public String getXMLParserName()
-  {
-    return xmlParserName;
-  }
-
-  /**
-   * Returns the parserVersion.
-   * @return the parserVersion.
-   * @see #setXMLParserVersion
-   */
-  public String getXMLParserVersion()
-  {
-    return xmlParserVersion;
-  }
-
-  /**
-   * Returns the runtimeName.
-   * @return the runtimeName.
-   * @see #setRuntimeName
-   */
-  public String getRuntimeName()
-  {
-    return runtimeName;
-  }
-
-  /**
-   * Returns the runtimeVersion.
-   * @return the runtimeVersion.
-   * @see #setRuntimeVersion
-   */
-  public String getRuntimeVersion()
-  {
-    return runtimeVersion;
-  }
-
-  /**
-   * Sets the osName.
-   * @param osName the osName to set.
-   * @see #getOSName
-   */
-  public void setOSName(String osName)
-  {
-    this.osName = osName;
-  }
-
-  /**
-   * Sets the osVersion.
-   * @param osVersion the osVersion to set.
-   * @see #getOSVersion
-   */
-  public void setOSVersion(String osVersion)
-  {
-    this.osVersion = osVersion;
-  }
-
-  /**
-   * Sets the parserName.
-   * @param xmlParserName the parserName to set.
-   * @see #getXMLParserName
-   */
-  public void setXMLParserName(String xmlParserName)
-  {
-    this.xmlParserName = xmlParserName;
-  }
-
-  /**
-   * Sets the parserVersion.
-   * @param xmlParserVersion the parserVersion to set.
-   * @see #getXMLParserVersion
-   */
-  public void setXMLParserVersion(String xmlParserVersion)
-  {
-    this.xmlParserVersion = xmlParserVersion;
-  }
-
-  /**
-   * Sets the runtimeName.
-   * @param runtimeName the runtimeName to set.
-   * @see #getRuntimeName
-   */
-  public void setRuntimeName(String runtimeName)
-  {
-    this.runtimeName = runtimeName;
-  }
-
-  /**
-   * Sets the runtimeVersion.
-   * @param runtimeVersion the runtimeVersion to set.
-   * @see #getRuntimeVersion
-   */
-  public void setRuntimeVersion(String runtimeVersion)
-  {
-    this.runtimeVersion = runtimeVersion;
-  }
-
-  /**
-   * Sets the additional environment information.
-   * @param xmlInfo additional tool environment information.
-   */
-  public void setAdditionalToolEnvironment(XMLInfo xmlInfo)
-  {
-    this.xmlInfo = xmlInfo;
-  }
-
-  /**
-   * Return XML string representation of this object. 
-   * @param namespaceName  the namespace prefix.
-   * @return the XML string representation of this object. 
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if (!nsName.equals(""))
-      nsName += ":";
-
-    // Start element
-    pw.println("    <" + nsName + ELEM_NAME + ">");
-
-    pw.print("      <" + nsName + WSIConstants.ELEM_RUNTIME + " ");
-    pw.print(WSIConstants.ATTR_NAME + "=\"" + runtimeName + "\" ");
-    pw.println(WSIConstants.ATTR_VERSION + "=\"" + runtimeVersion + "\"/>");
-    pw.print("      <" + nsName + WSIConstants.ELEM_OPERATING_SYSTEM + " ");
-    pw.print(WSIConstants.ATTR_NAME + "=\"" + osName + "\" ");
-    pw.println(WSIConstants.ATTR_VERSION + "=\"" + osVersion + "\"/>");
-    pw.print("      <" + nsName + WSIConstants.ELEM_XML_PARSER + " ");
-    pw.print(WSIConstants.ATTR_NAME + "=\"" + xmlParserName + "\" ");
-    pw.println(WSIConstants.ATTR_VERSION + "=\"" + xmlParserVersion + "\"/>");
-
-    // If addtional info, then get it
-    if (xmlInfo != null)
-      pw.print(xmlInfo.toXMLString(nsName));
-
-    // End element
-    pw.println("    </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/ToolInfo.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/ToolInfo.java
deleted file mode 100644
index eb97ef4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/ToolInfo.java
+++ /dev/null

@@ -1,447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.util.XMLInfo;
-
-/**
- * Information that describes a conformance tool.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class ToolInfo
-{
-  /**
-   * Tool information property names.
-   */
-  public static final String PROP_TOOL_VERSION = "wsi.tool.version";
-  public static final String PROP_TOOL_RELEASE_DATE = "wsi.tool.release.date";
-  public static final String PROP_TOOL_IMPLEMENTER = "wsi.tool.implementer";
-  public static final String PROP_TOOL_LOCATION = "wsi.tool.location";
-
-  /**
-   * Default tool information property values.
-   */
-  private static final String DEF_TOOL_VERSION = "1.0.1";
-  private static final String DEF_TOOL_RELEASE_DATE = "2004-01-22";
-  private static final String DEF_TOOL_IMPLEMENTER = "Eclipse.org Organization";
-  private static final String DEF_TOOL_LOCATION = "http://www.eclipse.org/wsvt";
-
-  /**
-   * Tool information.
-   */
-  protected String name;
-  protected String version;
-  protected String releaseDate;
-  protected String implementer;
-  protected String location;
-
-  /**
-   * Tool environment.
-   */
-  protected ToolEnvironment toolEnvironment = null;
-
-  /**
-   * Tool info properties filename.
-   */
-  public static final String PROP_FILENAME = "org.wsi.test.toolinfo";
-
-  /**
-   * Create tool information.
-   */
-  public ToolInfo()
-  {
-    this.toolEnvironment = new ToolEnvironment();
-  }
-
-  /**
-   * Create tool information from information in the toolinfo.properties file.
-   * @param name  the tool name.
-   */
-  public ToolInfo(String name)
-  {
-    this.name = name;
-
-    getProperties();
-
-    this.toolEnvironment = new ToolEnvironment();
-  }
-
-  /**
-   * Create tool information.
-   * @param name         the tool name.
-   * @param version      the version of the tool.
-   * @param releaseDate  the release date of the tool.
-   * @param implementer  the implementer of the tool.
-   * @param location     the implementer location.
-   */
-  public ToolInfo(
-    String name,
-    String version,
-    String releaseDate,
-    String implementer,
-    String location)
-  {
-    this.name = name;
-    this.version = version;
-    this.releaseDate = releaseDate;
-    this.implementer = implementer;
-    this.location = location;
-
-    this.toolEnvironment = new ToolEnvironment();
-  }
-
-  /**
-   * Create tool information with tool unique environment information.
-   * @param name         the tool name.
-   * @param version      the version of the tool.
-   * @param releaseDate  the release date of the tool.
-   * @param implementer  the implementer of the tool.
-   * @param location     the implementer location.
-   * @param xmlInfo      additional tool environment information.
-   */
-  public ToolInfo(
-    String name,
-    String version,
-    String releaseDate,
-    String implementer,
-    String location,
-    XMLInfo xmlInfo)
-  {
-    this.name = name;
-    this.version = version;
-    this.releaseDate = releaseDate;
-    this.implementer = implementer;
-    this.location = location;
-
-    this.toolEnvironment = new ToolEnvironment(xmlInfo);
-  }
-
-  /**
-   * Get name.
-   * @return name.
-   * @see #setName
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * Get version.
-   * @return version.
-   * @see #setVersion
-   */
-  public String getVersion()
-  {
-    return version;
-  }
-
-  /**
-   * Get release date.
-   * @return release date.
-   * @see #setReleaseDate
-   */
-  public String getReleaseDate()
-  {
-    return releaseDate;
-  }
-
-  /**
-   * Get implementer.
-   * @return implementer.
-   * @see #setImplementer
-   */
-  public String getImplementer()
-  {
-    return implementer;
-  }
-
-  /**
-   * Get implementer location.
-   * @return implementer location.
-   * @see #setLocation
-   */
-  public String getLocation()
-  {
-    return location;
-  }
-
-  /**
-   * Returns the toolEnvironment.
-   * @return ToolEnvironment
-   * @see #setToolEnvironment
-   */
-  public ToolEnvironment getToolEnvironment()
-  {
-    return toolEnvironment;
-  }
-
-  /**
-   * Sets the implementer.
-   * @param implementer the implementer to set.
-   * @see #getImplementer
-   */
-  public void setImplementer(String implementer)
-  {
-    this.implementer = implementer;
-  }
-
-  /**
-   * Sets the location.
-   * @param location the location to set.
-   * @see #getLocation
-   */
-  public void setLocation(String location)
-  {
-    this.location = location;
-  }
-
-  /**
-   * Sets the name.
-   * @param name the name to set.
-   * @see #getName
-   */
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  /**
-   * Sets the releaseDate.
-   * @param releaseDate the releaseDate to set.
-   * @see #getReleaseDate
-   */
-  public void setReleaseDate(String releaseDate)
-  {
-    this.releaseDate = releaseDate;
-  }
-
-  /**
-   * Sets the toolEnvironment.
-   * @param toolEnvironment the toolEnvironment to set.
-   * @see #getToolEnvironment
-   */
-  public void setToolEnvironment(ToolEnvironment toolEnvironment)
-  {
-    this.toolEnvironment = toolEnvironment;
-  }
-
-  /**
-   * Sets the toolEnvironment.
-   * @param xmlInfo additional tool environment information.
-   */
-  public void setAdditionalToolEnvironment(XMLInfo xmlInfo)
-  {
-    this.toolEnvironment.setAdditionalToolEnvironment(xmlInfo);
-  }
-
-  /**
-   * Sets the version.
-   * @param version the version to set.
-   * @see #getVersion
-   */
-  public void setVersion(String version)
-  {
-    this.version = version;
-  }
-
-  /**
-   * Return start XML string representation of this object.
-   * @param namespaceName  the namespace prefix.
-   * @return the start XML string representation of this object. 
-   */
-  public String getStartXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if (!nsName.equals(""))
-      nsName += ":";
-
-    pw.print("  <" + nsName + getName().toLowerCase() + " ");
-    pw.print(WSIConstants.ATTR_VERSION + "=\"" + getVersion() + "\" ");
-    pw.println(
-      WSIConstants.ATTR_RELEASE_DATE + "=\"" + getReleaseDate() + "\">");
-
-    pw.print("    <" + nsName + WSIConstants.ELEM_IMPLEMENTER + " ");
-    pw.print(WSIConstants.ATTR_NAME + "=\"" + getImplementer() + "\" ");
-    pw.println(WSIConstants.ATTR_LOCATION + "=\"" + getLocation() + "\"/>");
-
-    // Environment
-    pw.print(toolEnvironment.toXMLString(namespaceName));
-
-    return sw.toString();
-  }
-
-  /**
-   * Return the end XML string representation of this object.
-   * @param namespaceName  the namespace prefix.
-   * @return the end XML string representation of this object. 
-   */
-  public String getEndXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if (!nsName.equals(""))
-      nsName += ":";
-
-    pw.println("  </" + nsName + getName().toLowerCase() + ">");
-
-    return sw.toString();
-  }
-
-  /**
-   * Get values from the tools.properties file.
-   */
-  protected void getProperties()
-  {
-    //Properties props = new Properties();
-    ResourceBundle resourceBundle;
-
-    try
-    {
-      // Try to load properties from wsi.properties
-      //InputStream is = Utils.getInputStream(PROP_FILENAME);
-
-      // Load properties from file
-      //props.load(is);
-
-      // Get resource
-      resourceBundle = ResourceBundle.getBundle(PROP_FILENAME);
-
-      // Get property values
-      this.version =
-        getProperty(resourceBundle, PROP_TOOL_VERSION, DEF_TOOL_VERSION);
-      this.releaseDate =
-        getProperty(
-          resourceBundle,
-          PROP_TOOL_RELEASE_DATE,
-          DEF_TOOL_RELEASE_DATE);
-      this.implementer =
-        getProperty(
-          resourceBundle,
-          PROP_TOOL_IMPLEMENTER,
-          DEF_TOOL_IMPLEMENTER);
-      this.location =
-        getProperty(resourceBundle, PROP_TOOL_LOCATION, DEF_TOOL_LOCATION);
-    }
-
-    catch (MissingResourceException mre)
-    {
-      // DEBUG:
-      //System.out.println("Exception loading properties:  " + e.toString());
-
-      // Set default property values
-      this.version = DEF_TOOL_VERSION;
-      this.releaseDate = DEF_TOOL_RELEASE_DATE;
-      this.implementer = DEF_TOOL_IMPLEMENTER;
-      this.location = DEF_TOOL_LOCATION;
-    }
-  }
-
-  /**
-   * Get property.
-   * @param resourceBundle  a resource bundle.
-   * @param key             a key.
-   * @param defaultValue    a default value.
-   * @return property. If not found return default value.
-   */
-  protected String getProperty(
-    ResourceBundle resourceBundle,
-    String key,
-    String defaultValue)
-  {
-    String value;
-
-    if ((value = resourceBundle.getString(key)) == null)
-      value = defaultValue;
-
-    return value;
-  }
-
-  /**
-   * Create the tools.properties file from the command line.
-   * The input arguements are:
-   * <ol>
-   * <li>Filename for the properties file to create
-   * <li>Version number
-   * <li>
-   * </ol>
-   * @param args  the arguments for main.
-   */
-  public static void main(String[] args)
-  {
-    int statusCode = 0;
-    String filename = PROP_FILENAME;
-    String version = DEF_TOOL_VERSION;
-    String implementer = DEF_TOOL_IMPLEMENTER;
-    String location = DEF_TOOL_LOCATION;
-
-    // Set the file name
-    if (args.length >= 1)
-      filename = args[0];
-
-    if (args.length >= 2)
-      version = args[1];
-
-    if (args.length >= 3)
-      implementer = args[2];
-
-    if (args.length >= 4)
-      location = args[3];
-
-    try
-    {
-      // Create file writer
-      FileWriter fileWriter = new FileWriter(filename);
-
-      // Create print writer
-      PrintWriter printWriter = new PrintWriter(fileWriter);
-
-      // Write out contents of properties file
-      printWriter.println(COMMENTS);
-      printWriter.println(PROP_TOOL_VERSION + "=" + version);
-      printWriter.println(PROP_TOOL_RELEASE_DATE + "=" + Utils.getDate());
-      printWriter.println(PROP_TOOL_IMPLEMENTER + "=" + implementer);
-      printWriter.println(PROP_TOOL_LOCATION + "=" + location);
-
-      // Close file writer
-      fileWriter.close();
-
-      // Done
-      System.out.println("File [" + filename + "] created.");
-    }
-
-    catch (java.io.IOException ioe)
-    {
-      statusCode = 1;
-      System.out.println("EXCEPTION: " + ioe.toString());
-      ioe.printStackTrace();
-    }
-
-    // Exit
-    System.exit(statusCode);
-  }
-
-  private static final String COMMENTS = "";
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIConstants.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIConstants.java
deleted file mode 100644
index 6db52db..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIConstants.java
+++ /dev/null

@@ -1,488 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-/**
- * WS-I constants.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Jim Clune
- * @author Graham Turrell (gturrell@uk.ibm.com)
- */
-public interface WSIConstants {
-	/**
-	 * Copyright notice.
-	 */
-	public static final String COPYRIGHT = "Copyright (C) 2002-2003 by The Web Services-Interoperability Organization and Certain "
-			+ "of its Members. All Rights Reserved.\nUse of this Material is governed by WS-I licenses included within the documentation.";
-
-	/**
-	 * XML declaration statement.
-	 */
-	public static final String XML_DECL = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-
-	/**
-	 * XML namespace URI.
-	 */
-	public static final String NS_URI_XMLNS = "http://www.w3.org/2000/xmlns/";
-	public static final String NS_URI_XML =  "http://www.w3.org/XML/1998/namespace";
-	/**
-	 * XML schema namespace URI.
-	 */
-	public static final String NS_URI_XSD = "http://www.w3.org/2001/XMLSchema";
-
-	/**
-	 * XML schema location.
-	 */
-	public static final String XSD_SCHEMA_LOCATION = "http://www.w3.org/2001/XMLSchema.xsd";
-
-	/**
-	 * XML schema namespace name.
-	 */
-	public static final String NS_NAME_XSD = "xsd";
-
-	/**
-	 * XML schema instance namespace URI.
-	 */
-	public static final String NS_URI_XSI = "http://www.w3.org/2001/XMLSchema-instance";
-
-	/**
-	 * XML schema namespace name.
-	 */
-	public static final String NS_NAME_XSI = "xsi";
-
-
-	/**
-	 * WS-I message log namespace URI.
-	 */
-	public static final String NS_URI_WSI_LOG = "http://www.ws-i.org/testing/2004/07/log/";
-
-	public static final String NS_NAME_WSI_LOG = "wsi-log";
-
-	/**
-	 * WS-I conformance report namespace URI.
-	 */
-	public static final String NS_URI_WSI_REPORT = "http://www.ws-i.org/testing/2004/07/report/";
-	public static final String NS_NAME_WSI_REPORT = "wsi-report";
-
-	/**
-	 * WS-I profile test assertions namespace URI.
-	 */
-	public static final String NS_URI_WSI_ASSERTIONS_2003 = "http://www.ws-i.org/testing/2003/03/assertions/";
-	public static final String NS_URI_WSI_ASSERTIONS = "http://www.ws-i.org/testing/2004/07/assertions/";
-
-	public static final String NS_NAME_WSI_ASSERTIONS = "wsi-assertions";
-
-	/**
-	 * WS-I monitor configuration file namesapce URI.
-	 */
-	public static final String NS_URI_WSI_MONITOR_CONFIG_2003 = "http://www.ws-i.org/testing/2003/03/monitorConfig/";
-	public static final String NS_URI_WSI_MONITOR_CONFIG = "http://www.ws-i.org/testing/2004/07/monitorConfig/";
-	
-
-	public static final String NS_NAME_WSI_MONITOR_CONFIG = "wsi-monConfig";
-
-	/**
-	 * WS-I analyzer configuration file namesapce URI.
-	 */
-	public static final String NS_URI_WSI_ANALYZER_CONFIG_2003 = "http://www.ws-i.org/testing/2003/03/analyzerConfig/";
-	public static final String NS_URI_WSI_ANALYZER_CONFIG = "http://www.ws-i.org/testing/2004/07/analyzerConfig/";
-	
-	public static final String NS_NAME_WSI_ANALYZER_CONFIG = "wsi-analyzerConfig";
-
-	/**
-	 * WS-I common namesapce URI.
-	 */
-	public static final String NS_URI_WSI_COMMON_2003 = "http://www.ws-i.org/testing/2003/03/common/";
-	public static final String NS_URI_WSI_COMMON = "http://www.ws-i.org/testing/2004/07/common/";
-	public static final String NS_NAME_WSI_COMMON = "wsi-common";
-
-	/**
-	 * SOAP V1.1 namespace.
-	 */
-	public final static String NS_URI_SOAP = "http://schemas.xmlsoap.org/soap/envelope/";
-
-	/**
-	 * SOAP/1.1 encoding.
-	 */
-	public final static String NS_URI_SOAP_ENCODING = "http://schemas.xmlsoap.org/soap/encoding/";
-
-	public static final String NS_URI_SOAP_NEXT_ACTOR = "http://schemas.xmlsoap.org/soap/actor/next" ;
-	/**
-	 * HTTP transport.
-	 */
-	public final static String NS_URI_SOAP_HTTP = "http://schemas.xmlsoap.org/soap/http";
-
-	/**
-	 * WSDL V1.1 namespace.
-	 */
-	public final static String NS_URI_WSDL = "http://schemas.xmlsoap.org/wsdl/";
-
-	/**
-	 * WSDL SOAP binding namespace.
-	 */
-	public final static String NS_URI_WSDL_SOAP = "http://schemas.xmlsoap.org/wsdl/soap/";
-
-	public final static String NS_NAME_WSDL_SOAP = "soap";
-
-	/**
-	 * WSDL MIME binding namespace.
-	 */
-	public final static String NS_NAME_WSDL_MIME = "http://schemas.xmlsoap.org/wsdl/mime/";
-
-	/**
-	 * WSDL HTTP GET & POST binding namespace.
-	 */
-	public final static String NS_NAME_WSDL_HTTP = "http://schemas.xmlsoap.org/wsdl/http/";
-
-	/**
-	 * WSDL DIME binding namespace.
-	 */
-	public final static String NS_NAME_WSDL_DIME = "http://schemas.xmlsoap.org/ws/2002/04/dime/wsdl/";
-
-	/**
-	 * Conformance Claim namespace.
-	 */
-	public final static String NS_URI_CLAIM = "http://ws-i.org/schemas/conformanceClaim/";
-
-	/**
-	 * UDDI V2 namespace.
-	 */
-	public final static String NS_URI_UDDI_V2 = "urn:uddi-org:api_v2";
-
-	/**
-	 * The XML Schema for the type used to refer to attachments from the SOAP
-	 * envelope.
-	 */
-	public final static String NS_URI_SWA_REF = "http://ws-i.org/profiles/basic/1.1/xsd";
-
-	public final static String SCHEMA_TYPE_SWA_REF = "swaRef";
-
-	/**
-	 * Element names.
-	 */
-	public static final String ELEM_ADD_STYLE_SHEET = "addStyleSheet";
-
-	public static final String ELEM_ADDITIONAL_ENTRY_TYPE_LIST = "additionalEntryTypeList";
-
-	public static final String ELEM_ANALYZER_FAILURE = "analyzerFailure";
-
-	public static final String ELEM_ARTIFACT = "artifact";
-
-	public static final String ELEM_ARTIFACT_REFERENCE = "artifactReference";
-
-	public static final String ELEM_ASSERTION_COVERAGE = "assertionCoverage";
-
-	public static final String ELEM_ASSERTION_DESCRIPTION = "assertionDescription";
-
-	public static final String ELEM_ASSERTION_RESULT = "assertionResult";
-
-	public static final String ELEM_ASSERTION_RESULT_SUMMARY = "assertionResultSummary";
-
-	public static final String ELEM_ASSERTION_RESULTS = "assertionResults";
-
-	public static final String ELEM_CLEANUP_TIMEOUT_SECONDS = "cleanupTimeoutSeconds";
-
-	public static final String ELEM_CONFIG = "configuration";
-
-	public static final String ELEM_COMMENT = "comment";
-
-	public static final String ELEM_CONTEXT = "context";
-
-	public static final String ELEM_DETAIL = "detail";
-
-	public static final String ELEM_DETAIL_DESCRIPTION = "detailDescription";
-
-	public static final String ELEM_DESCRIPTION = "description";
-
-	public static final String ELEM_ENVIRONMENT = "environment";
-
-	public static final String ELEM_ENTRY = "entry";
-
-	public static final String ELEM_FAILURE_DETAIL = "failureDetail";
-
-	public static final String ELEM_FAILURE_DETAIL_DESCRIPTION = "failureDetailDescription";
-
-	public static final String ELEM_FAILURE_MESSAGE = "failureMessage";
-
-	public static final String ELEM_HTTP_HEADERS = "httpHeaders";
-
-	public static final String ELEM_IMPLEMENTER = "implementer";
-
-	public static final String ELEM_INQUIRY_URL = "inquiryURL";
-
-	public static final String ELEM_LISTEN_PORT = "listenPort";
-
-	public static final String ELEM_LOG = "log";
-
-	public static final String ELEM_LOG_DURATION = "logDuration";
-
-	public static final String ELEM_LOG_FILE = "logFile";
-
-	public static final String ELEM_MAN_IN_THE_MIDDLE = "manInTheMiddle";
-
-	public static final String ELEM_MAX_CONNECTIONS = "maxConnections";
-
-	public static final String ELEM_MESSAGE_CONTENT = "messageContent";
-	
-	public static final String ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS = "messageContentWithAttachments";
-	
-	public static final String ELEM_MESSAGE_ENTRY = "messageEntry";
-
-	public static final String ELEM_MESSAGE_INPUT = "messageInput";
-
-	public static final String ELEM_MONITOR = "monitor";
-
-	public static final String ELEM_OPERATING_SYSTEM = "operatingSystem";
-
-	public static final String ELEM_PREREQ_FAILED_LIST = "prereqFailedList";
-
-	public static final String ELEM_PREREQ_LIST = "prereqList";
-
-	public static final String ELEM_PROFILE = "profile";
-
-	public static final String ELEM_PROFILE_ASSERTIONS = "profileAssertions";
-
-	public static final String ELEM_READ_TIMEOUT_SECONDS = "readTimeoutSeconds";
-
-	public static final String ELEM_RECEIVER_HOST_AND_PORT = "receiverHostAndPort";
-
-	public static final String ELEM_REDIRECT = "redirect";
-
-	public static final String ELEM_REPORT = "report";
-
-	public static final String ELEM_REPORT_FILE = "reportFile";
-
-	public static final String ELEM_RUNTIME = "runtime";
-
-	public static final String ELEM_SCHEME_AND_HOSTPORT = "schemeAndHostPort";
-
-	public static final String ELEM_SENDER_HOST_AND_PORT = "senderHostAndPort";
-
-	public static final String ELEM_SERVICE_LOCATION = "serviceLocation";
-
-	public static final String ELEM_SUMMARY = "summary";
-
-	public static final String ELEM_TEST_ASSERTION = "testAssertion";
-
-	public static final String ELEM_TEST_ASSERTIONS_FILE = "testAssertionsFile";
-
-	public static final String ELEM_TEST_ASSERTION_ID = "testAssertionID";
-
-	public static final String ELEM_TEST_COVERAGE = "testCoverage";
-
-	public static final String ELEM_UDDI_ENTRY = "uddiEntry";
-
-	public static final String ELEM_UDDI_KEY = "uddiKey";
-
-	public static final String ELEM_UDDI_REFERENCE = "uddiReference";
-
-	public static final String ELEM_VERBOSE = "verbose";
-
-	public static final String ELEM_WSDL_ELEMENT = "wsdlElement";
-
-	public static final String ELEM_WSDL_INPUT = "wsdlInput";
-
-	public static final String ELEM_WSDL_REFERENCE = "wsdlReference";
-
-	public static final String ELEM_WSDL_URI = "wsdlURI";
-
-	public static final String ELEM_XML_PARSER = "xmlParser";
-	
-	public static final String ELEM_MIME_PART = "mimePart";
-
-	public static final String ELEM_MIME_HEADERS = "mimeHeaders";
-	
-	public static final String ELEM_MIME_CONTENT = "mimeContent";
-
-	public static final String ELEM_BOUNDARY_STRING = "boundaryString";
-
-	/**
-	 * Attribute names.
-	 */
-	public static final String ATTR_ALTERNATE = "alternate";
-
-	public static final String ATTR_ARRAY_TYPE = "arrayType";
-
-	public static final String ATTR_ASSERTION_DESCRIPTION = "assertionDescription";
-
-	public static final String ATTR_BOM = "BOM";
-
-	public static final String ATTR_CHARSET = "charset";
-
-	public static final String ATTR_CODE = "code";
-
-	public static final String ATTR_COLUMN_NUMBER = "columnNumber";
-
-	public static final String ATTR_CONVERSATION_ID = "conversationID";
-
-	public static final String ATTR_CORRELATION_TYPE = "correlationType";
-
-	public static final String ATTR_DATE = "date";
-
-	public static final String ATTR_ENABLED = "enabled";
-
-	public static final String ATTR_ENTRY_TYPE = "entryType";
-
-	public static final String ATTR_FAILURE_MESSAGE = "failureMessage";
-
-	public static final String ATTR_FAILURE_DETAIL = "failureDetail";
-
-	public static final String ATTR_HREF = "href";
-
-	public static final String ATTR_ID = "id";
-
-	public static final String ATTR_ID_UC = "ID";
-
-	public static final String ATTR_IMPLEMENTER = "implementer";
-
-	public static final String ATTR_LINE_NUMBER = "lineNumber";
-
-	public static final String ATTR_LOCATION = "location";
-
-	public static final String ATTR_MEDIA = "media";
-
-	public static final String ATTR_MESSAGE_ENTRY = "messageEntry";
-
-	public static final String ATTR_MESSAGES = "messages";
-
-	public static final String ATTR_NAME = "name";
-
-	public static final String ATTR_NAMESPACE = "namespace";
-
-	public static final String ATTR_PARENT_ELEMENT_NAME = "parentElementName";
-
-	public static final String ATTR_REFERENCE_ID = "referenceID";
-
-	public static final String ATTR_REFERENCE_TYPE = "referenceType";
-
-	public static final String ATTR_RELEASE_DATE = "releaseDate";
-
-	public static final String ATTR_REPLACE = "replace";
-
-	public static final String ATTR_RESULT = "result";
-
-	public static final String ATTR_SERVICE_NAME = "serviceName";
-
-	public static final String ATTR_SPECIFICATION = "specification";
-
-	public static final String ATTR_TIMESTAMP = "timestamp";
-
-	public static final String ATTR_TITLE = "title";
-
-	public static final String ATTR_TYPE = "type";
-
-	public static final String ATTR_VERSION = "version";
-
-	/**
-	 * Default values.
-	 */
-	public static final String DEFAULT_REPORT_URI = "report.xml";
-
-	// TEMP: Use the following report title for the draft release only.
-	//public static final String DEFAULT_REPORT_TITLE = "WS-I Profile
-	// Conformance Report";
-	public static final String DEFAULT_REPORT_TITLE = "WS-I Basic Profile Conformance Report.";
-
-	public static final String DEFAULT_TEST_ASSERTIONS_DOCUMENT_URI = "http://www.ws-i.org/Testing/Tools/2004/12/AP10_BP11_SSBP10_TAD.xml";
-
-	public static final String DEFAULT_LOG_XSL = "../common/xsl/log.xsl";
-
-	public static final String DEFAULT_REPORT_XSL = "../common/xsl/report.xsl";
-
-	public static final String DEFAULT_XSL_TYPE = "text/xsl";
-
-	public static final String DEFAULT_XML_ENCODING = "UTF-8";
-
-	/**
-	 * BOM constants.
-	 *  
-	 */
-	public static int BOM_UTF16 = 0xFFFE;
-
-	public static int BOM_UTF16_BIG_ENDIAN = 0xFEFF;
-
-	public static int BOM_UTF8 = 0xEFBBBF;
-
-	/**
-	 * Validation constants.
-	 *  
-	 */
-	public static final String ATTRVAL_SOAP_BODY_USE_LIT = "literal";
-
-	public static final String ATTRVAL_SOAP_BODY_USE_ENC = "encoded";
-
-	public static final String ATTRVAL_SOAP_BIND_STYLE_DOC = "document";
-
-	public static final String ATTRVAL_SOAP_BIND_STYLE_RPC = "rpc";
-
-	public static final String ATTRVAL_CORRELATION_TYPE_ENDPOINT = "endpoint";
-
-	public static final String ATTRVAL_CORRELATION_TYPE_NAMESPACE = "namespace";
-
-	public static final String ATTRVAL_CORRELATION_TYPE_OPERATION = "operation";
-
-	/**
-	 * WS-I constants - attributes for conformance claims (discovery).
-	 *  
-	 */
-
-	public static final String ATTRVAL_UDDI_CLAIM_KEYVALUE = "http://ws-i.org/profiles/basic/1.0";
-
-	public static final String ATTRVAL_UDDI_CLAIM_TMODELKEY = "uuid:65719168-72c6-3f29-8c20-62defb0961c0";
-
-	/**
-	 * WS-I names and versions of the profile test assertion document supported
-	 * in the current version of the test tools.
-	 */
-	public static final String BASIC_PROFILE_TAD_NAME = "Basic Profile Test Assertions";
-
-	public static final String BASIC_PROFILE_1_1_TAD_NAME = "Basic Profile 1.1 Test Assertions";
-
-	public static final String SIMPLE_SOAP_BINDINGS_PROFILE_TAD_NAME = "Simple Soap Binding Profile [1.0] (with Basic Profile [1.1]) Test Assertions";
-
-	public static final String ATTACHMENTS_PROFILE_TAD_NAME = "Attachments Profile [1.0] (with Basic Profile [1.1] and Simple Soap Binding Profile [1.0]) Test Assertions";
-
-	public static final String BASIC_PROFILE_TAD_VERSION = "1.1.0";
-
-	public static final String BASIC_PROFILE_1_1_TAD_VERSION = "1.1.0";
-
-	public static final String SIMPLE_SOAP_BINDINGS_PROFILE_TAD_VERSION = "1.0.0";
-
-	public static final String ATTACHMENTS_PROFILE_TAD_VERSION = "1.0.0";
-
-	/**
-	 * System dependent line separator character.
-	 */
-	public static final String LINE_SEPARATOR = System
-			.getProperty("line.separator");
-
-	/**
-	 * System dependent path separator character.
-	 */
-	public static final String PATH_SEPARATOR = System
-			.getProperty("path.separator");
-
-	/**
-	 * File which contains the copyright, license and feedback comments.
-	 */
-	public static final String COMMENTS_FILE = "comments.xml";
-	public static final String CONTENT_TYPE_TEXT_XML = "text/xml";
-	public static final String CONTENT_TYPE_MULTIPART = "multipart/related";
-
-	public static final String FILE_PREFIX = "file:";
-	public static final String HTTP_PREFIX = "http:";
-	public static final String FILE_PROTOCOL = "file:///";
-	public static final String WSI_PREFIX = "WS-I: ";
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIException.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIException.java
deleted file mode 100644
index e6e8db4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIException.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.MissingResourceException;
-
-/**
- * Primary WS-I exception.
- *
- * @version 1.0.1
- * @author Peter Brittenham
- */
-public class WSIException extends Exception
-{
-
-  /**
-   * Static needed for serializable class
-   */
-  private static final long serialVersionUID = 5446823222767299308L;
-
-  /**
-   * Throwable.
-   */
-  protected Throwable throwable = null;
-
-  /**
-   * Create an exception without a message.
-   */
-  public WSIException()
-  {
-    // Exception
-    super();
-  }
-
-  /**
-   * Create an exception with a message.
-   * 
-   * @param msg the exception message
-   */
-  public WSIException(String msg)
-  {
-    // Exception
-    super(msg);
-  }
-
-  /**
-   * Create an exception with a message and related exception.
-   * 
-   * @param msg        the exception message
-   * @param throwable  throwable that is related to this exception
-   */
-  public WSIException(String msg, Throwable throwable)
-  {
-    // Exception
-    super(msg);
-
-    // Save input reference
-    this.throwable = throwable;
-  }
-
-  /**
-   * Returns the String representation of this object's values.
-   *
-   * @return Returns the detail message of this throwable object.
-   */
-  public String getMessage()
-  {
-    return super.getMessage();
-  }
-
-  /**
-   * Returns the String representation of this object's values.
-   *
-   * @return Returns the detail message of this throwable object.
-   */
-  public String toString()
-  {
-    //StringWriter sw;
-    //PrintWriter pw;
-
-    // Always get message from super class
-    String msg = super.getMessage();
-
-    // If this exception contains a reference to another exception,
-    // then add it to the message
-    if (throwable != null)
-    {
-      msg += "\n"
-        + "------------------------------------------------------------------------------\n"
-        + "  Nested exception is: \n\n  "
-        + throwable.toString()
-        + "\n";
-
-      // If throwable is MissingResourceException, 
-      // then add class name and key to output
-      if (throwable instanceof MissingResourceException)
-      {
-        MissingResourceException mre = (MissingResourceException) throwable;
-
-        // Get class name and key
-        msg += " - "
-          + mre.getKey()
-          + "\n\t"
-          + "[Class Name: "
-          + mre.getClassName()
-          + "]";
-      }
-
-      // If throwable is InvocationTargetException, 
-      // then target of exception
-      else if (throwable instanceof InvocationTargetException)
-      {
-        InvocationTargetException ite = (InvocationTargetException) throwable;
-
-        // Get target
-        msg += " - " + ite.getTargetException().toString();
-      }
-
-      // ADD: Print stack trace
-      //sw = new StringWriter();
-      //pw = new PrintWriter(sw);
-      //throwable.printStackTrace(pw);
-
-      // Add it to the message
-      //msg += sw.toString();
-    }
-
-    // Return message
-    return msg;
-  }
-
-  /**
-   * Returns the exception that caused this exception to be created.
-   * 
-   * @return Returns the encapsulated throwable object.
-   */
-  public Throwable getTargetException()
-  {
-    // Return throwable
-    return throwable;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIFileNotFoundException.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIFileNotFoundException.java
deleted file mode 100644
index 5abf5db..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIFileNotFoundException.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-/**
- * Signals that an attempt to open the file denoted by a specified 
- * pathname has failed.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class WSIFileNotFoundException extends WSIException
-{
-
-  /**
-   * Static needed for serializable class
-   */
-  private static final long serialVersionUID = -1916010444601666401L;
-
-/**
-   * Constructor for WSIFileNotFoundException.
-   */
-  public WSIFileNotFoundException()
-  {
-    super();
-  }
-
-  /**
-   * Constructor for WSIFileNotFoundException.
-   * @param msg  the detail message.
-  
-   */
-  public WSIFileNotFoundException(String msg)
-  {
-    super(msg);
-  }
-
-  /**
-   * Constructor for WSIFileNotFoundException.
-   * @param msg        the detail message.
-   * @param throwable  initial exception thrown.
-   */
-  public WSIFileNotFoundException(String msg, Throwable throwable)
-  {
-    super(msg, throwable);
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIRuntimeException.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIRuntimeException.java
deleted file mode 100644
index 6ae30b6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSIRuntimeException.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-/**
- * This class represents runtime exceptions that occur after processing the configuration files.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class WSIRuntimeException extends WSIException
-{
-
-  /**
-   * Static needed for serializable class
-   */
-  private static final long serialVersionUID = 4309320981515513171L;
-
-  /**
-   * Constructor for WSIRuntimeException.
-   */
-  public WSIRuntimeException()
-  {
-    super();
-  }
-
-  /**
-   * Constructor for WSIRuntimeException.
-   * @param msg  the detail message.
-   */
-  public WSIRuntimeException(String msg)
-  {
-    super(msg);
-  }
-
-  /**
-   * Constructor for WSIRuntimeException.
-   * @param msg        the detail message.
-   * @param throwable  the initial exception thrown.
-  
-   */
-  public WSIRuntimeException(String msg, Throwable throwable)
-  {
-    super(msg, throwable);
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java
deleted file mode 100644
index 1fb3433..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.xml.XMLTags;
-
-/**
- * WS-I constants.  
- *  
- * @author Kulik
- */
-public interface WSITag extends XMLTags
-{
-  /**
-   * Qualified names of WSDL elements.
-   */
-  public final static QName WSDL_IMPORT =
-    new QName(WSIConstants.NS_URI_WSDL, "import");
-  public final static QName WSDL_TYPES =
-    new QName(WSIConstants.NS_URI_WSDL, "types");
-  public final static QName WSDL_MESSAGE =
-    new QName(WSIConstants.NS_URI_WSDL, "message");
-  public final static QName WSDL_DOCUMENTATION =
-    new QName(WSIConstants.NS_URI_WSDL, "documentation");
-  public final static QName WSDL_DEFINITIONS =
-    new QName(WSIConstants.NS_URI_WSDL, "definitions");
-  public final static QName WSDL_BINDING =
-    new QName(WSIConstants.NS_URI_WSDL, "binding");
-  public final static QName WSDL_OPERATION =
-    new QName(WSIConstants.NS_URI_WSDL, "operation");
-  public final static QName WSDL_PART =
-    new QName(WSIConstants.NS_URI_WSDL, "part");
-  public final static QName WSDL_INPUT =
-    new QName(WSIConstants.NS_URI_WSDL, "input");
-  public final static QName WSDL_OUTPUT =
-    new QName(WSIConstants.NS_URI_WSDL, "output");
-  public final static QName WSDL_FAULT =
-    new QName(WSIConstants.NS_URI_WSDL, "fault");
-  public final static QName WSDL_SERVICE =
-    new QName(WSIConstants.NS_URI_WSDL, "service");
-  public final static QName WSDL_PORT =
-    new QName(WSIConstants.NS_URI_WSDL, "port");
-  public final static QName WSDL_PORTTYPE =
-    new QName(WSIConstants.NS_URI_WSDL, "portType");
-
-  public static final QName WSDL_SOAP_BINDING =
-    new QName(WSIConstants.NS_URI_WSDL_SOAP, "binding");
-  public static final QName WSDL_SOAP_BODY =
-    new QName(WSIConstants.NS_URI_WSDL_SOAP, "body");
-  public static final QName WSDL_SOAP_HEADER =
-    new QName(WSIConstants.NS_URI_WSDL_SOAP, "header");
-  public static final QName WSDL_SOAP_HEADERFAULT =
-    new QName(WSIConstants.NS_URI_WSDL_SOAP, "headerfault");
-  public static final QName WSDL_SOAP_FAULT =
-    new QName(WSIConstants.NS_URI_WSDL_SOAP, "fault");
-
-  public static final QName WSDL_MIME_CONTENT =
-    new QName(WSIConstants.NS_NAME_WSDL_MIME, "content");
-  public static final QName WSDL_MIME_XML =
-    new QName(WSIConstants.NS_NAME_WSDL_MIME, "mimeXml");
-  public static final QName WSDL_MIME_PART =
-    new QName(WSIConstants.NS_NAME_WSDL_MIME, "part");
-  public static final QName WSDL_MIME_MULTIPART =
-    new QName(WSIConstants.NS_NAME_WSDL_MIME, "multipartRelated");
-
-  public final static QName ATTR_WSDL_ARRAYTYPE =
-    new QName(WSIConstants.NS_URI_WSDL, "arrayType");
-  public final static QName ATTR_WSDL_NAMESPACE =
-    new QName(WSIConstants.NS_URI_WSDL, "namespace");
-  public final static QName ATTR_WSDL_LOCATION =
-    new QName(WSIConstants.NS_URI_WSDL, "location");
-
-  /**
-   * Namespaces.
-   */
-  public final static String NS_URI_CLAIM =
-    "http://ws-i.org/schemas/conformanceClaim/";
-  public final static String NS_URI_SOAP =
-    "http://schemas.xmlsoap.org/soap/envelope/";
-  public final static String NS_URI_SOAPENC =
-    "http://schemas.xmlsoap.org/soap/encoding/";
-  public final static String NS_URI_BASIC_PROFILE10 =
-    "http://wsi.org/profiles/basic1.0/";
-
-  public final static QName SOAPENC_ARRAY = new QName(NS_URI_SOAPENC, "Array");
-
-  /**
-   * Qualified names of WS-I claim elements.
-   */
-  public final static QName WSI_CLAIM = new QName(NS_URI_CLAIM, "Claim");
-  public final static QName ATTR_CLAIM_CONFORMSTO =
-    new QName(NS_URI_CLAIM, "conformsTo");
-  public final static QName ATTR_SOAP_MUSTUNDERSTAND =
-    new QName(NS_URI_SOAP, "mustUnderstand");
-
-  /**
-   * Qualified names of SOAP elements.
-   */
-  public final static QName ELEM_SOAP_ENVELOPE = new QName(NS_URI_SOAP, "Envelope");
-  public final static QName ELEM_SOAP_BODY = new QName(NS_URI_SOAP, "Body");
-  public final static QName ELEM_SOAP_FAULT = new QName(NS_URI_SOAP, "Fault");
-  public final static QName ELEM_SOAP_HEADER = new QName(NS_URI_SOAP, "Header");
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java
deleted file mode 100644
index ebe0bb3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java
+++ /dev/null

@@ -1,313 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2002-2003 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *
- * </copyright>
- */
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.profile.validator.ProfileValidatorFactory;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-
-/**
- * The Analyzer will process all Profile conformance functions.
- * This class should be sub-classed for each profile.
- *
- * @version 1.0.1
- * @author Jim Clune
- * @author Peter Brittenham
- */
-public abstract class Analyzer
-{
-  /**
-   * Message list.
-   */
-  protected MessageList messageList = null;
-
-  protected final static String RESOURCE_BUNDLE_NAME =
-    "org.eclipse.wst.wsi.internal.core.analyzer.Analyzer";
-
-  public final static String USAGE_MESSAGE =
-    "Usage: Analyzer -config <configFilename>";
-
-  protected Reporter reporter = null;
-  protected AnalyzerContext analyzerContext = null;
-  protected CandidateInfo candidateInfo = null;
-
-  /**
-   * Analyzer tool information.
-   */
-  protected ToolInfo toolInfo = null;
-
-  /**
-   * Profile validator factory.
-   */
-  protected ProfileValidatorFactory factory = null;
-
-  /**
-   * Profile validator factory.
-   */
-  protected DocumentFactory documentFactory = null;
-
-  /**
-   * Analyzer config file list.
-   */
-  protected List analyzerConfigList = new Vector();
-  protected int analyzerConfigIndex = 0;
-
-  /**
-   * Profile assertions.
-   */
-  protected ProfileAssertions profileAssertions = null;
-
-  /**
-   * Log file.
-   */
-  protected Log log = null;
-
-  /**
-   * Create an instance of the analyzer tool.
-   * @param args      command line arguments.
-   * @param toolInfo  analyzer tool information.
-   * @throws WSIException if problems creating the instance of the analyzer tool.
-   */
-  public Analyzer(String[] args, ToolInfo toolInfo) throws WSIException
-  {
-    init(toolInfo);
-
-    // Get new config object   
-    this.analyzerConfigList.add(
-      analyzerConfigIndex,
-      documentFactory.newAnalyzerConfig());
-    getAnalyzerConfig().init(messageList);
-
-    // Parse command line arguments
-    getAnalyzerConfig().parseArgs(args, true);
-
-    // Display copyright and options that were specified
-    TestUtils.printToolInfo(toolInfo);
-    System.out.println(getAnalyzerConfig().toString());
-
-    // Display message
-    printMessage(
-      "progress01",
-      null,
-      "Please wait while the specified artifacts are analyzed...");
-  }
-
-  /**
-   * Create an instance of the analyzer tool.
-   * @param args      command line arguments.
-   * @param toolInfo  analyzer tool information.
-   * @param validate  flag for config options validation. 
-   * @throws WSIException if problems creating the instance of the analyzer tool.
-   */
-  public Analyzer(String[] args, ToolInfo toolInfo, boolean validate) throws WSIException
-  {
-    init(toolInfo);
-
-    // Get new config object   
-    this.analyzerConfigList.add(
-        analyzerConfigIndex,
-        documentFactory.newAnalyzerConfig());
-    getAnalyzerConfig().init(messageList);
-
-    // Parse command line arguments
-    getAnalyzerConfig().parseArgs(args, validate);
-
-    // Display copyright and options that were specified
-    TestUtils.printToolInfo(toolInfo);
-    System.out.println(getAnalyzerConfig().toString());
-
-    // Display message
-    printMessage(
-        "progress01",
-        null,
-    "Please wait while the specified artifacts are analyzed...");
-  }
-
-  /**
-   * Create an instance of the analyzer tool.
-   * @param analyzerConfigList  analyzer config file list.
-   * @param toolInfo            analyzer tool information.
-   * @throws WSIException if problems creating the instance of the analyzer tool.
-   */
-  public Analyzer(List analyzerConfigList, ToolInfo toolInfo)
-    throws WSIException
-  {
-    init(toolInfo);
-
-    this.analyzerConfigList = analyzerConfigList;
-  }
-
-  /**
-   * Common initialization.
-   * @param toolInfo  analyzer tool information.
-   * @throws WSIException if problems occur during common initialization.
-   */
-  protected void init(ToolInfo info) throws WSIException
-  {
-    this.toolInfo = info;
-
-    // Create message list
-    messageList = new MessageList(RESOURCE_BUNDLE_NAME);
-
-    // Create profile validator factory
-    factory = ProfileValidatorFactory.newInstance();
-
-    // Create document factory
-    documentFactory = DocumentFactory.newInstance();
-  }
-
-  /**
-   * Process all conformance validation functions.
-   * @return status code.
-   * @throws WSIException if problems occur during validation.
-   */
-  public int validateAll() throws WSIException
-  {
-    int statusCode = 0;
-    int tempStatusCode;
-
-    for (int index = 0; index < analyzerConfigList.size(); index++)
-    {
-      // DEBUG:
-      //System.out.println("index: " + index);
-
-      // Set current analyzer config index 
-      setAnalyzerConfig(index);
-
-      if ((tempStatusCode = validateConformance()) > statusCode)
-        statusCode = tempStatusCode;
-    }
-
-    return statusCode;
-  }
-
-  /**
-   * Process all conformance validation functions.
-   * @return status code.
-   * @throws WSIException if problems occur during conformance validation.
-   */
-  public abstract int validateConformance() throws WSIException;
-
-  /**
-   * Get tool information.
-   * @return the tool information.
-   */
-  public ToolInfo getToolInfo()
-  
-  {
-    return this.toolInfo;
-  }
-
-  /**
-   * Set current analyzer configuration.
-   * @param index  urrent analyzer configuration.
-   * @see #getAnalyzerConfig
-   */
-  protected void setAnalyzerConfig(int index)
-  {
-    this.analyzerConfigIndex = index;
-  }
-
-  /**
-   * Get analyzer configuration information.
-   * @return analyzer configuration information.
-   * @see #setAnalyzerConfig
-   */
-  public AnalyzerConfig getAnalyzerConfig()
-  {
-    return (AnalyzerConfig) this.analyzerConfigList.get(analyzerConfigIndex);
-  }
-
-  /**
-   * Print a message from the resource bundle.
-   * @param key             a key.
-   * @param messageData     message data.
-   * @param defaultMessage  a default message.
-   */
-  public void printMessage(
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    messageList.printMessage(key, messageData, defaultMessage);
-  }
-
-  /**
-   * Print message.
-   * @param key             a key.
-   * @param messageData     message data.
-   * @param defaultMessage  a default message.
-   */
-  public static void staticPrintMessage(
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    MessageList.printMessage(
-      RESOURCE_BUNDLE_NAME,
-      key,
-      messageData,
-      defaultMessage);
-  }
-
-  /**
-   * Return XML string representation of this object.
-   * @param namespaceName  a namespace prefix.
-   * @return XML string representation of this object.
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    // Start     
-    pw.print(toolInfo.getStartXMLString(namespaceName));
-
-    // Config
-    pw.print(
-      getAnalyzerConfig().toXMLString(
-        WSIConstants.NS_NAME_WSI_ANALYZER_CONFIG));
-
-    // End
-    pw.println(toolInfo.getEndXMLString(namespaceName));
-
-    return sw.toString();
-  }
-
-  /**
-   * Print a message.
-   * @param message a message.
-   */
-  public void printMessage(String message)
-  {
-    if (getAnalyzerConfig().getVerboseOption())
-    {
-      System.err.println(message);
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.properties b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.properties
deleted file mode 100644
index d66cb75..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.properties
+++ /dev/null

@@ -1,44 +0,0 @@
-# /**
-#  * <copyright>
-#  *
-#  * Copyright (c) 2002-2005 IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM - Initial API and implementation
-#  *
-#  * </copyright>
-#  */
-
-#
-# Analyzer resource bundle.
-#
-usage01=Usage: Analyzer -config <configFilename>
-created01=Conformance report has been created.
-progress01=Please wait while the specified artifacts are analyzed...
-error01=Analyzer Error:
-error02=Analyzer Stopped By Exception:
-error03=The conformance validation process failed.
-exception01=Exception:
-config01=Analyzer configuration file was not found.  Specified file location:
-config02=Could not find log file.  Specified file location:
-config03=Could not find WSDL file.  Specified file location:
-config04=Can not specify both the WSDL reference and UDDI reference options.
-config05=WSDL document was either not found or could not be processed.
-config06=Invalid analyzer configuration element:
-config07=Both the <wsdlElement> and <wsdlURI> elements must be specified.
-config08=Could not read analyzer configuration file.  Specified file location:
-config09=The parentElementName attribute must be specified with a WSDL type of port or operation.
-config10=The -wsdlElement option must appear after the -wsdlURI or -uddiKey options.
-config11=The -serviceLocation option must appear after the -wsdlURI or -uddiKey options.
-config12=The specified option is not supported:
-config13=Option did not contain a value.  Specified option:
-config14=Could not find test assertion document.  Specified file location:
-config15=Report file already exists and replace option was not specified.
-config16=Test assertion document location must be specified.
-config17=Could not get report file location.
-config18=Invalid correlation type specified.
-config19=The WSDL element name must be specified.

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AnalyzerContext.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AnalyzerContext.java
deleted file mode 100644
index d2f53a6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AnalyzerContext.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-/**
- * This class contains contextual information which is required by test assertions across all artifacts.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class AnalyzerContext
-{
-  protected ServiceReference serviceReference = null;
-  protected CandidateInfo candidateInfo = null;
-
-  /**
-   * Do not allow the usage of the null constructor.
-   */
-  private AnalyzerContext()
-  {
-  }
-
-  /**
-   * Create analyzer context with service reference.
-   * @param serviceReference a service reference.
-   */
-  public AnalyzerContext(ServiceReference serviceReference)
-  {
-    this.serviceReference = serviceReference;
-  }
-
-  /**
-   * Get service reference.
-   * @return service reference.
-   * @see #setServiceReference
-   */
-  public ServiceReference getServiceReference()
-  {
-    return this.serviceReference;
-  }
-
-  /**
-   * Set service reference.
-   * @param serviceReference a service reference.
-   * @see #getServiceReference
-   */
-  public void setServiceReference(ServiceReference serviceReference)
-  {
-    this.serviceReference = serviceReference;
-  }
-
-  /**
-   * Returns the candidateInfo.
-   * @return CandidateInfo.
-   * @see #setCandidateInfo
-   */
-  public CandidateInfo getCandidateInfo()
-  {
-    return candidateInfo;
-  }
-
-  /**
-   * Sets the candidateInfo.
-   * @param candidateInfo the candidateInfo to set.
-   * @see #getCandidateInfo
-   */
-  public void setCandidateInfo(CandidateInfo candidateInfo)
-  {
-    this.candidateInfo = candidateInfo;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionFailException.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionFailException.java
deleted file mode 100644
index 8df5a2b..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionFailException.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-/**
- * Base Exception for Assertion Fail.
- * 
- * @author gturrell
- * */
-public class AssertionFailException extends Exception
-{
-
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3257007635743258933L;
-
-	/**
-   * Constructor for AssertionException.
-   */
-  public AssertionFailException()
-  {
-    super();
-  }
-
-  /**
-   * Constructor for AssertionException.
-   * @param arg0 the detail message.
-   */
-  public AssertionFailException(String arg0)
-  {
-    super(arg0);
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionNotApplicableException.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionNotApplicableException.java
deleted file mode 100644
index 6434a50..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionNotApplicableException.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-/**
- * Exception for Assertion Not Applicable.
- * 
- * @author gturrell
- */
-public class AssertionNotApplicableException extends Exception
-{
-
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3905523782994112564L;
-
-	/**
-   * Constructor for AssertionNotApplicableException.
-   */
-  public AssertionNotApplicableException()
-  {
-    super();
-  }
-
-  /**
-   * Constructor for AssertionNotApplicableException.
-   * @param arg0 the detail message.
-   */
-  public AssertionNotApplicableException(String arg0)
-  {
-    super(arg0);
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionPassException.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionPassException.java
deleted file mode 100644
index 4957d66..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionPassException.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-/**
- * Exception for Assertion Pass.
- * 
- * @author gturrell
- */
-public class AssertionPassException extends Exception
-{
-
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3257285842283541810L;
-
-	/**
-   * Constructor for AssertionPAssException.
-   */
-  public AssertionPassException()
-  {
-    super();
-  }
-
-  /**
-   * Constructor for AssertionPAssException.
-   * @param arg0 the detail message.
-   */
-  public AssertionPassException(String arg0)
-  {
-    super(arg0);
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionResultException.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionResultException.java
deleted file mode 100644
index 4e05aec..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/AssertionResultException.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-/**
- * Exception for Assertion Result.
- * 
- * @author gturrell
- */
-public class AssertionResultException extends Exception
-{
-
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3256720684700152632L;
-	private String detailMessage;
-  /**
-   * Constructor for AssertionresultException.
-   */
-  public AssertionResultException()
-  {
-    super();
-    detailMessage = null;
-  }
-
-  /**
-   * Constructor for AssertionResultException.
-   * @param arg0 the detail message.
-   */
-  public AssertionResultException(String arg0)
-  {
-    super(arg0);
-    detailMessage = null;
-  }
-
-  /**
-   * Constructor for AssertionResultException.
-   * @param arg0 the detail message.
-   * @param arg1  further detailed message.
-   */
-  public AssertionResultException(String arg0, String arg1)
-  {
-    super(arg0);
-    detailMessage = arg1;
-  }
-
-  /**
-   * Returns the detailMessage.
-   * @return the detailMessage.
-   */
-  public String getDetailMessage()
-  {
-    return detailMessage;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java
deleted file mode 100644
index d1a936a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java
+++ /dev/null

@@ -1,659 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft, Beacon Information Technology Inc. and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *   BeaconIT - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-
-import javax.wsdl.WSDLException;
-
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException;
-import org.eclipse.wst.wsi.internal.core.log.LogReader;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntryHandler;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertionsReader;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EnvelopeValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.UDDIValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.WSDLValidator;
-import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.ReportContext;
-import org.eclipse.wst.wsi.internal.core.report.ReportWriter;
-import org.eclipse.wst.wsi.internal.core.report.impl.DefaultReporter;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-import org.eclipse.wst.wsi.internal.core.util.WSIProperties;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCache;
-import org.uddi4j.transport.TransportFactory;
-
-
-/**
- * Analyzes log files to confirm conformance to a profile.
- *
- * @version 1.0.1
- * @author Jim Clune
- * @author Peter Brittenham
- * @author Graham Turrell
- */
-public class BasicProfileAnalyzer extends Analyzer
-{
-  /**
-   * Tool information.
-   */
-  public static final String TOOL_NAME = "Analyzer";
-
-  /**
-   * WSDL document to analyze.
-   */
-  protected WSDLDocument wsdlDocument = null;
-
-  /**
-   * Basic profile analyzer.
-   * @param args command line arguments.
-   * @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public BasicProfileAnalyzer(String[] args) throws WSIException
-  {
-    super(args, new ToolInfo(TOOL_NAME));
-    new XMLDocumentCache();
-  }
-
-  /**
-   * Basic profile analyzer.
-   * @param args command line arguments.
-   * @param validate flag for command line argument validation.
-   * @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public BasicProfileAnalyzer(String[] args, boolean validate) throws WSIException
-  {
-    super(args, new ToolInfo(TOOL_NAME), validate);
-    new XMLDocumentCache();
-  }
-
-  /**
-   * Basic profile analyzer.
-   * @param analyzerConfigList a list of configurations for the analyzer.
-   * @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public BasicProfileAnalyzer(List analyzerConfigList) throws WSIException
-  {
-    super(analyzerConfigList, new ToolInfo(TOOL_NAME));
-    new XMLDocumentCache();
-  }
-
-  /**
-   * Basic profile analyzer.
-   * @param analyzerConfigList a list of configurations for the analyzer.
-   * @param wsdlURI a wsdl document location.
-   * @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public BasicProfileAnalyzer(List analyzerConfigList, String wsdlURI)
-    throws WSIException
-  {
-    super(analyzerConfigList, new ToolInfo(TOOL_NAME));
-    new XMLDocumentCache();
-    
-    try
-    {
-      // Get the WSDL document
-      if (wsdlURI != null)
-        this.wsdlDocument = new WSDLDocument(wsdlURI);
-    }
-
-    catch (WSDLException we)
-    {
-      throw new WSIException(we.getMessage(), we);
-    }
-
-  }
-
-  /**
-   * Process all conformance validation functions.
-   * @return status code.
-   * @throws WSIException if conformance validation process failed.
-   */
-  public int validateConformance() throws WSIException
-  {
-    int statusCode = 0;
-
-    Report report = null;
-    ReportArtifact reportArtifact = null;
-    String wsdlURI = null;
-    //WSDLDocument wsdlDocument = null;
-
-    // Set up initial analyzer context based on entries in the config file
-    this.analyzerContext =
-      new AnalyzerContext(new ServiceReference(getAnalyzerConfig()));
-
-    try
-    {
-      // Read profile assertions
-      ProfileAssertionsReader profileAssertionsReader =
-        documentFactory.newProfileAssertionsReader();
-      this.profileAssertions =
-        profileAssertionsReader.readProfileAssertions(
-          getAnalyzerConfig().getTestAssertionsDocumentLocation());
-
-      // Create report from document factory
-      report = documentFactory.newReport();
-      report.setLocation(getAnalyzerConfig().getReportLocation());
-
-      // Create report context
-      ReportContext reportContext =
-        new ReportContext(
-          WSIConstants.DEFAULT_REPORT_TITLE,
-          profileAssertions,
-          this);
-      report.setReportContext(reportContext);
-
-      // Create report writer
-      ReportWriter reportWriter = documentFactory.newReportWriter();
-      // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT 
-      //reportWriter.setWriter(new FileWriter(analyzerConfig.getReportLocation()));
-      reportWriter.setWriter(getAnalyzerConfig().getReportLocation());
-
-      // Create reporter
-      this.reporter = new DefaultReporter(report, reportWriter);
-
-      // Start writing report
-      this.reporter.startReport();
-
-      // --------------------------------
-      // DISCOVERY ARTIFACT:
-      // --------------------------------
-
-      // Set current artifact
-      reportArtifact = setCurrentArtifact(ArtifactType.ARTIFACT_TYPE_DISCOVERY);
-
-      // If UDDI options specified, then process UDDI test assertions
-      if ((wsdlURI = validateUDDI(reportArtifact, factory.newUDDIValidator()))
-        == null)
-      {
-        if (getAnalyzerConfig().isWSDLReferenceSet())
-        {
-          // Otherwise use the WSDL options to get the WSDL location
-          wsdlURI = getAnalyzerConfig().getWSDLLocation();
-        }
-      }
-
-      // Indicate that we are done with this artifact
-      this.reporter.endCurrentArtifact();
-
-      // --------------------------------
-      // DESCRIPTION ARTIFACT:
-      // --------------------------------
-
-      // Set current artifact
-      reportArtifact =
-        setCurrentArtifact(ArtifactType.ARTIFACT_TYPE_DESCRIPTION);
-
-      // Call WSDLValidator 
-      wsdlDocument =
-        validateWSDL(
-          reportArtifact,
-          factory.newWSDLValidator(),
-          wsdlURI,
-          wsdlDocument);
-
-      // If WSDL document object is null, then throw exception
-      if ((wsdlDocument == null) && (getAnalyzerConfig().isWSDLReferenceSet()))
-      {
-        throw new WSIException(
-          messageList.getMessage(
-            "config05",
-            "WSDL document was either not found or could not be processed."));
-      }
-
-      // Indicate that we are done with this artifact
-      this.reporter.endCurrentArtifact();
-
-      // REMOVE:
-      // If processing log entries and there isn't a WSDL URI, 
-      // then throw an exception since it is required to process the log entries
-      //if ((wsdlURI == null) && (analyzerConfig.getLogLocation() != null)) {
-      //  throw new WSIException("Must specify the WSDL document location to validate message log.");
-      //}
-
-      // --------------------------------
-      // MESSAGE ARTIFACT:
-      // --------------------------------
-
-      // Set current artifact
-      reportArtifact = setCurrentArtifact(ArtifactType.ARTIFACT_TYPE_MESSAGE);
-
-      // Process test assertions for the messages
-      validateMessages(
-        reportArtifact,
-        factory.newMessageValidator(),
-        wsdlDocument);
-
-      // Indicate that we are done with this artifact
-      this.reporter.endCurrentArtifact();
-
-      // --------------------------------
-      // ENVELOPE ARTIFACT:
-      // --------------------------------
-
-      // If that is not the Basic Profile 1.0, then process
-      // the envelope artifact
-      if (!profileAssertions.getTADName()
-        .equals(WSIConstants.BASIC_PROFILE_TAD_NAME))
-      {
-
-        // Set current artifact
-        reportArtifact = setCurrentArtifact(ArtifactType.ARTIFACT_TYPE_ENVELOPE);
-
-        // Process test assertions for the envelopes
-        validateEnvelopes(
-          reportArtifact,
-          factory.newEnvelopeValidator(),
-          wsdlDocument);
-
-        // Indicate that we are done with this artifact
-        this.reporter.endCurrentArtifact();
-      }
-
-      // Finish the conformance report
-      reporter.finishReport();
-    }
-
-    catch (Exception e)
-    {
-      StringWriter sw = new StringWriter();
-      PrintWriter pw = new PrintWriter(sw);
-
-      String message =
-        messageList.getMessage(
-          "error03",
-          "The conformance validation process failed.");
-
-      // Finish report
-      if (reporter != null)
-      {
-        pw.println(message);
-        pw.println(
-          messageList.getMessage("exception01", "Exception: ")
-            + e.getClass().getName());
-        e.printStackTrace(pw);
-        reporter.finishReportWithError(sw.toString());
-      }
-
-      if (e instanceof WSIException)
-        throw (WSIException) e;
-      else
-        throw new WSIException(message, e);
-    }
-
-    if (report != null)
-    {
-      statusCode =
-        (report.getSummaryResult().equals(AssertionResult.RESULT_PASSED)
-          ? 0
-          : 1);
-    }
-
-    return statusCode;
-  }
-
-  /**
-   * Run UDDI test assertions.
-   */
-  private String validateUDDI(
-    ReportArtifact reportArtifact,
-    UDDIValidator uddiValidator)
-    throws WSIException
-  {
-    String wsdlURI = null;
-
-    // Init UDDIValidator
-    uddiValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_DISCOVERY),
-      reportArtifact,
-      getAnalyzerConfig().getUDDIReference(),
-      this.reporter);
-
-    // Call UDDIValidator 
-    if (getAnalyzerConfig().isUDDIReferenceSet())
-    {
-      wsdlURI = uddiValidator.validate();
-
-      // Cleanup
-      uddiValidator.cleanup();
-    }
-
-    else
-    {
-      // Set all missingInput
-      uddiValidator.setAllMissingInput();
-    }
-
-    return wsdlURI;
-  }
-
-  /**
-   * Run WSDL test assertions.
-   */
-  private WSDLDocument validateWSDL(
-    ReportArtifact reportArtifact,
-    WSDLValidator wsdlValidator,
-    String wsdlURI,
-    WSDLDocument document)
-    throws WSIException
-  {
-    WSDLDocument returnWSDLDocument = null;
-
-    // Init WSDLValidator
-    wsdlValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_DESCRIPTION),
-      reportArtifact,
-      wsdlURI,
-      document,
-      this.reporter);
-
-    // If a WSDL URI was specified or located in a UDDI registry, then process the WSDL tests
-    if (wsdlURI != null || document != null)
-    {
-      // Call WSDLValidator 
-      returnWSDLDocument = wsdlValidator.validate();
-
-      // Cleanup
-      wsdlValidator.cleanup();
-    }
-
-    else
-    {
-      // Set all missingInput
-      wsdlValidator.setAllMissingInput();
-    }
-
-    return returnWSDLDocument;
-  }
-
-  /**
-   * Run message test assertions.
-   */
-  private void validateMessages(
-    ReportArtifact reportArtifact,
-    MessageValidator messageValidator,
-    WSDLDocument document)
-    throws WSIException
-  {
-    //Log log = null;
-    //MessageEntry logEntry = null;
-
-    // Init MessageValidator
-    messageValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_MESSAGE),
-      reportArtifact,
-      document,
-      this.reporter);
-
-    // If the log file location was specified, then process test assertions for the messages
-    if (getAnalyzerConfig().getLogLocation() != null)
-    {
-      // Get the log file reader
-      LogReader logReader = documentFactory.newLogReader();
-
-      // Create log reader callback
-      MessageProcessor messageProcessor =
-        new MessageProcessor(messageValidator);
-
-      // Start reading the log file
-      logReader.readLog(getAnalyzerConfig().getLogLocation(), messageProcessor);
-
-      // Cleanup
-      messageValidator.cleanup();
-    }
-
-    // Otherwise all are missingInput
-    else
-    {
-      // Set all missingInput
-      messageValidator.setAllMissingInput();
-    }
-  }
-
-  /**
-   * Run envelope test assertions.
-   */
-  private void validateEnvelopes(
-    ReportArtifact reportArtifact,
-    EnvelopeValidator envelopeValidator,
-    WSDLDocument document)
-    throws WSIException
-  {
-    // Init envelopeValidator
-    envelopeValidator.init(
-      this.analyzerContext,
-      this.profileAssertions.getArtifact(ArtifactType.TYPE_ENVELOPE),
-      reportArtifact,
-      document,
-      this.reporter);
-
-    // If the log file location was specified, then process test assertions for the messages
-    if (getAnalyzerConfig().getLogLocation() != null)
-    {
-      // Get the log file reader
-      LogReader logReader = documentFactory.newLogReader();
-
-      // Create log reader callback
-      EnvelopeProcessor envelopeProcessor =
-        new EnvelopeProcessor(envelopeValidator);
-
-      // Start reading the log file
-      logReader.readLog(getAnalyzerConfig().getLogLocation(), envelopeProcessor);
-
-      // Cleanup
-      envelopeValidator.cleanup();
-    }
-
-    // Otherwise all are missingInput
-    else
-    {
-      // Set all missingInput
-      envelopeValidator.setAllMissingInput();
-    }
-  }
-
-  /**
-   * Command line interface for the analyzer tool.
-   * @param args command line arguments.
-   * @throws IOException if IO problems occur.
-   */
-  public static void main(String[] args) throws IOException
-  {
-    int statusCode = 0;
-    Analyzer analyzer = null;
-
-    try
-    {
-      // Set document builder factory class
-      System.setProperty(
-        WSIProperties.PROP_JAXP_DOCUMENT_FACTORY,
-        WSIProperties.getProperty(WSIProperties.PROP_JAXP_DOCUMENT_FACTORY));
-
-      // Set the system property for UDDI4J transport
-      System.setProperty(
-        TransportFactory.PROPERTY_NAME,
-        WSIProperties.getProperty(TransportFactory.PROPERTY_NAME));
-
-      // Create the analyzer object
-      analyzer = new BasicProfileAnalyzer(args);
-
-      // Have it process the conformance validation functions
-      statusCode = analyzer.validateConformance();
-
-      // Display message
-      analyzer.printMessage(
-        "created01",
-        null,
-        "Conformance report has been created.");
-    }
-
-    catch (Exception e)
-    {
-      statusCode = 1;
-
-      String messageID;
-      String defaultMessage;
-      String messageData;
-
-      if ((e instanceof WSIFileNotFoundException)
-        || (e instanceof IllegalArgumentException))
-      {
-        //printStackTrace = false;
-        messageID = "error01";
-        defaultMessage = "Analyzer Error:";
-        messageData = e.getMessage();
-      }
-
-      else
-      {
-        //printStackTrace = true;
-        messageID = "error02";
-        defaultMessage = "Analyzer Stopped By Exception:";
-        messageData = e.toString();
-      }
-
-      if (analyzer != null)
-        analyzer.printMessage(messageID, messageData, defaultMessage);
-      else
-        Analyzer.staticPrintMessage(messageID, messageData, defaultMessage);
-
-      if (analyzer != null
-        && analyzer.getAnalyzerConfig() != null
-        && analyzer.getAnalyzerConfig().getVerboseOption())
-        dump(e);
-    }
-
-    // Exit
-    System.exit(statusCode);
-  }
-
-  /**
-   * Set current artifact.
-   * @param artifactType an ArtifactType object.
-   * @return a ReportArtifact object.
-   * @throws WSIException if problems creating report artifact.
-   */
-  protected ReportArtifact setCurrentArtifact(ArtifactType artifactType)
-    throws WSIException
-  {
-    // Create artifact
-    ReportArtifact reportArtifact = reporter.createArtifact();
-    reportArtifact.setType(artifactType);
-
-    // Add artifact to report
-    this.reporter.setCurrentArtifact(reportArtifact);
-
-    return reportArtifact;
-  }
-
-  /**
-   * Print exception.
-   * @param t a Throwable object.
-   */
-  public static void dump(Throwable t)
-  {
-    while (t instanceof WSIException)
-    {
-      Throwable nested = ((WSIException) t).getTargetException();
-      if (nested == null)
-        break;
-      else
-        t = nested;
-    }
-    t.printStackTrace();
-  }
-
-  /**
-   * Message processor class.
-   */
-  class MessageProcessor implements MessageEntryHandler
-  {
-    MessageValidator messageValidator = null;
-
-    /**
-     * Create message processor as a log reader callback function.
-     */
-    MessageProcessor(MessageValidator messageValidator)
-    {
-      this.messageValidator = messageValidator;
-    }
-
-    /**
-     * Process artifact reference.
-     */
-    public void processArtifactReference(ArtifactReference artifactReference)
-      throws WSIException
-    {
-      reporter.addArtifactReference(artifactReference);
-    }
-
-    /**
-     * Process a single log entry.
-     */
-    public void processLogEntry(EntryContext entryContext) throws WSIException
-    {
-      // Validate message
-      messageValidator.validate(entryContext);
-    }
-
-  }
-
-  /**
-   * Envelope processor class.
-   */
-  class EnvelopeProcessor implements MessageEntryHandler
-  {
-    EnvelopeValidator envelopeValidator = null;
-
-    /**
-     * Create envelope processor as a log reader callback function.
-     */
-    EnvelopeProcessor(EnvelopeValidator envelopeValidator)
-    {
-      this.envelopeValidator = envelopeValidator;
-    }
-
-    /**
-     * Process artifact reference.
-     */
-    public void processArtifactReference(ArtifactReference artifactReference)
-      throws WSIException
-    {
-      reporter.addArtifactReference(artifactReference);
-    }
-
-    /**
-     * Process a single log entry.
-     */
-    public void processLogEntry(EntryContext entryContext) throws WSIException
-    {
-      // Validate envelopes
-      envelopeValidator.validate(entryContext);
-    }
-
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/CandidateInfo.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/CandidateInfo.java
deleted file mode 100644
index 553cbee..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/CandidateInfo.java
+++ /dev/null

@@ -1,918 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.util.URI;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLUtils;
-
-/**
- * Provide a normalized set of data relating to the service under test.
- * For example, with endpoint correlation and wsdlElement of type "message" 
- * there could be multiple matches for most element types including WSDL Service.
- * (though the objective is to ensure filtering to a single service if at all possible). 
- * 
- * @author gturrell
- */
-
-// ADD:could be better as a singleton?
-
-public class CandidateInfo
-{
-
-  // Normalized fixed correlation data derived from the analyzer config and the wsdl,
-  // representing what we know about the service from these two sources.  
-  private Definition[] definitions = null;
-
-  private Import[] imports = null;
-  private Types[] types = null;
-
-  private Message[] messages = null;
-  private Operation[] operations = null;
-  private PortType[] portTypes = null;
-  private Binding[] bindings = null;
-  private Port[] ports = null;
-
-  private URI[] endPoints = null; // list obtainable from a port
-
-  private WSDLDocument wsdlDocument; // reference probably not desirable here
-
-  /**
-   * Constructor for CandidateInfo.
-   * Extract normalised entry data from wsdl, according to config wsdlElement & serviceLocation
-   * @param serviceReference a ServiceReference object.
-   * @param wsdlDocument a WSDL document.
-   * @throws WSIException if problems occur creating CandidateInfo object.
-   */
-  public CandidateInfo(
-    ServiceReference serviceReference,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-
-    // ADD: check for null document?
-
-    WSDLElement wsdlElement = serviceReference.getWSDLElement();
-
-    this.wsdlDocument = wsdlDocument;
-
-    /*
-     * Generalised fields independent of wsdlElement:
-     */
-    // ADD: check whether these need to be either expanded or filtered down.
-    // Assume WSDL4J pulls int the full tree at the root document for now		
-    //this.imports = wsdlDocument.getImports();
-
-    // ... or if only down to first level....
-    this.imports =
-      (Import[]) getAllImports(
-        wsdlDocument.getDefinitions()).toArray(new Import[] {
-    });
-
-    /* Definitions. 
-     * Note that the the first array element is for the root doc
-     * which contains all WSDL elements in scope via <import> declarations,
-     * as well as the root document itself. Therefore the second definitions 
-     * array element and above are redundant, but *may* prove useful to the assertion
-     * code.
-     */
-
-    this.definitions = new Definition[imports.length + 1];
-    // allow room for root doc		
-
-    this.definitions[0] = wsdlDocument.getDefinitions(); // root document    
-
-    // Allocate array for types elements
-    Types[] tempTypes = new Types[definitions.length];
-
-    int typesCount = 0;
-
-    if (definitions[0].getTypes() != null)
-    {
-      tempTypes[0] = this.definitions[0].getTypes(); // root document	
-      typesCount++;
-    }
-
-    // Definitions from other (imported) wsdls correlating to the candidate
-    // Only one level down for now
-    for (int i = 0; i < imports.length; i++)
-    {
-      if (((definitions[i + 1] = imports[i].getDefinition()) != null)
-        && (definitions[i + 1].getTypes() != null))
-      {
-        tempTypes[typesCount] = definitions[i + 1].getTypes();
-        typesCount++;
-      }
-    }
-
-    if (typesCount > 0)
-    {
-      this.types = new Types[typesCount];
-
-      for (int i = 0; i < typesCount; i++)
-        this.types[i] = tempTypes[i];
-    }
-    /* 
-     * Populate element hierachy:
-     * Port
-     * Binding
-     * PortType
-     * operation(s)
-     * message(s)
-     */
-
-    if (wsdlElement.isPort())
-    {
-
-      Port port = null;
-
-      // Use parentElementName to qualify the port within a service.		
-      QName serviceName = wsdlElement.getParentElementQName();
-      Service[] s = wsdlDocument.getServices();
-      String portName = wsdlElement.getName();
-      for (int i = 0; i < s.length && port == null; i++)
-      {
-        if (s[i].getQName().equals(serviceName))
-        {
-          port = s[i].getPort(portName);
-        }
-      }
-
-      if (port == null)
-      {
-        throw new WSIException(
-          "WSDL Port \'"
-            + portName
-            + "\' for Service \'"
-            + serviceName
-            + "\' not found in service description");
-      }
-      else
-      {
-        this.ports = new Port[] { port };
-        // ADD: do serviceLocation check for soapbind:address?
-        descendents(port);
-      }
-
-      // ADD: the following could be instantiated here instead to refine context info
-      // definitions 
-      // imports 
-      // types
-
-    }
-
-    else if (wsdlElement.isBinding())
-    {
-      if (wsdlElement.getQName() != null
-        && wsdlElement.getQName().getLocalPart() != null
-        && wsdlElement.getQName().getLocalPart().length() > 0)
-      {
-        Binding binding =
-          wsdlDocument.getDefinitions().getBinding(wsdlElement.getQName());
-
-        if (binding == null)
-        {
-          throw new WSIException(
-            "WSDL Binding named \'"
-              + wsdlElement.getQName()
-              + "\' not found in service description");
-        }
-        else
-        {
-          this.bindings = new Binding[] { binding };
-
-          // the rest ... below binding:	
-          // portTypes from binding
-          // operations from portTypes
-          // messages from operations
-          descendents(binding);
-
-          // above binding:
-          // ports
-          // definitions, imports, types (future?)				
-          // ancestors(bindings);
-        }
-      }
-    }
-
-    else if (wsdlElement.isPortType())
-    {
-
-      PortType portType =
-        wsdlDocument.getDefinitions().getPortType(wsdlElement.getQName());
-      this.portTypes = new PortType[] { portType };
-
-      if (portType == null)
-      {
-        throw new WSIException(
-          "WSDL PortType named \'"
-            + wsdlElement.getQName()
-            + "\' not found in service description");
-      }
-      else
-      {
-        this.portTypes = new PortType[] { portType };
-        // the rest ... below portType:	
-        descendents(portType);
-
-        // above portType:
-        // ports
-        // definitions, imports, types (future) ?
-        //ancestors(portTypes);		
-      }
-    }
-    else if (wsdlElement.isOperation())
-    {
-
-      Operation operation = null;
-      String configOpName = wsdlElement.getName();
-
-      // Use parentElementName to qualify the operation within a portType.
-      QName portTypeName = wsdlElement.getParentElementQName();
-      PortType[] p = wsdlDocument.getPortTypes();
-      for (int i = 0; i < p.length && operation == null; i++)
-      {
-        if (p[i].getQName().equals(portTypeName))
-        {
-          // wsdl4j available method call below implies that only 
-          // name+inputname+outputname uniquely defines operation! 
-          // Since we do not have <input> & <output> name information
-          // available in the config, use this instead for now: - 
-          // Get the first operation we find:
-          Iterator opIt = p[i].getOperations().iterator();
-          Operation op = null;
-          while (opIt.hasNext() && operation == null)
-          {
-            op = (Operation) opIt.next();
-            if (configOpName.equals(op.getName()))
-            {
-              operation = op;
-            }
-          }
-        }
-      }
-
-      if (operation == null)
-      {
-        throw new WSIException(
-          "No WSDL Operation named \'"
-            + wsdlElement.getQName()
-            + "\' found in service description");
-      }
-      else
-      {
-        this.operations = new Operation[] { operation };
-
-        descendents(operation);
-        //ancestors(operations);
-      }
-    }
-
-    else if (wsdlElement.isMessage())
-    {
-
-      Message message =
-        wsdlDocument.getDefinitions().getMessage(wsdlElement.getQName());
-      if (message == null)
-      {
-        throw new WSIException(
-          "No WSDL Message named \'"
-            + wsdlElement.getQName()
-            + "\' found in service description");
-      }
-      else
-      {
-        this.messages = new Message[] { message };
-
-        //ancestors(messages); 
-      }
-    }
-
-    else
-    {
-      throw new WSIException(
-        "Unrecognised <WSDLElement type> in config: " + wsdlElement.getType());
-    }
-
-    // get info about the effective service location (s)
-    //this.endPoints = deriveEndpoints(analyzerConfig, this.ports, this.definitions);
-    this.endPoints =
-      deriveEndpoints(serviceReference, this.ports, this.definitions);
-  }
-
-  /** 
-     * ancestor code is not used at present.
-     * 
-     */
-  /*   
-     protected void ancestors(Port[] ports) {
-     	// no ancestors of Port required (for now)
-     } 	    
-     protected void ancestors(Binding[] bindings) {	    
-    		// Ports from Bindings  1-2-1
-     	
-     	// *** cheat for now - get ports from all services in the wsdl doc
-     	// ADD: find correct mapping based on the supplied bindings
-     	Service[] service = wsdlDocument.getServices();
-     	HashSet set = new HashSet();
-  		for (int i=0; i>service.length; i++) {
-  			set.add(service[i].getPorts());  
-  		}
-  			
-  		// assign the parent group and process the grandparents if any								
-  		ancestors(this.ports = (Port[])set.toArray(this.ports = new Port[0]));
-     }
-     protected void ancestors(PortType[] portTypes) {	    
-    		// Bindings from PortTypes  1-2-1
-     	
-     	// add have to start with all bindings in doc and search for those
-     	// with the portType  
-     	HashSet set = new HashSet();
-  		for (int i=0; i>portTypes.length; i++) {
-  		// set.add(portTypes[i].get());  
-  		}
-  			
-  		// assign the parent group and process the grandparents if any								
-  		ancestors(this.bindings = (Binding[])set.toArray(this.bindings = new Binding[0]));
-     }
-     protected void ancestors(Operation[] operations) {	    
-    		// PortTypes from Operations  1-2-1
-     	  
-     	HashSet set = new HashSet();
-  		for (int i=0; i>operations.length; i++) {
-  			// set.add(operations[i].get());  
-  		}
-  			
-  		// assign the parent group and process the grandparents if any								
-  		ancestors(this.portTypes = (PortType[])set.toArray(this.portTypes = new PortType[0]));
-     }
-     protected void ancestors(Message[] messages) {	    
-    		// Operations from Messages  1-2-1
-     	// ADD fix it!  
-     	HashSet set = new HashSet();
-  		for (int i=0; i>messages.length; i++) {
-  			// set.add(messages[i].get());  
-  		}
-  			
-  		// assign the parent group 	
-  		this.portTypes = (PortType[])set.toArray(this.portTypes = new PortType[0]);
-     }
-  */
-
-  /**
-   * Descendant method for completing candidate service context creation.
-   * @param port  a Port object
-   * @throws WSIException if port is null.
-   */
-  protected void descendents(Port port) throws WSIException
-  {
-    // Binding from Port  1-2-1
-
-    if (port == null)
-    {
-      throw new WSIException("Internal error: expected a Port value");
-    }
-    else
-    {
-      this.bindings = new Binding[] { port.getBinding()};
-      if (this.bindings[0] != null)
-      {
-        /* Assign the child group and process the grandchildren if any.
-        * Null argument value passed into the following method would 
-        * suggest a WSDL definition inconsistency
-        * which will be picked up during Description Artifact TA testing.
-        */
-        descendents(this.bindings[0]);
-      }
-    }
-  }
-
-  /**
-   * Descendant method for completing candidate service context creation.
-   * @param binding  a Binding object
-   * @throws WSIException if binding is null.
-   */
-  protected void descendents(Binding binding) throws WSIException
-  {
-    // portType from Binding 1-2-1
-
-    if (binding == null)
-    {
-      throw new WSIException("Internal error: expected a Binding value");
-    }
-    else
-    {
-      this.portTypes = new PortType[] { binding.getPortType()};
-      if (this.portTypes[0] != null)
-      {
-        /* Assign the child group and process the grandchildren if any.
-        	* Null argument value passed into the following method would 
-        	* suggest a WSDL definition inconsistency
-        	* which will be picked up during Description Artifact TA testing.
-        	*/
-        descendents(this.portTypes[0]);
-
-        // Get any messages that are referenced from headers and headerfaults
-
-        // Get reference to definition
-        Definition definition = definitions[0];
-
-        // If there are messages already, then get them as a collection
-        HashSet messageSet = new HashSet();
-        if (messages != null)
-        {
-          for (int i = 0; i < messages.length; i++)
-          {
-            messageSet.add(messages[i]);
-          }
-        }
-
-        // Get the messages that are referenced only by a binding 
-        HashSet bindingMessages = WSDLUtils.findMessages(definition, binding);
-
-        // Add these messages to the complete message list  
-        messageSet.addAll(bindingMessages);
-
-        // Create array from message set
-        this.messages =
-          (Message[]) messageSet.toArray(this.messages = new Message[0]);
-      }
-    }
-  }
-
-  /**
-   * Descendant method for completing candidate service context creation.
-   * @param portType  a PortType object
-   * @throws WSIException if portType is null.
-   */
-  protected void descendents(PortType portType) throws WSIException
-  {
-    // Operations from PortType 1-2-n
-
-    if (portType == null)
-    {
-      throw new WSIException("Internal error: expected a PortType value");
-    }
-    else
-    {
-      this.operations =
-        (Operation[]) (portType
-          .getOperations()
-          .toArray(this.operations = new Operation[0]));
-      if (this.operations.length > 0)
-      {
-        descendents(this.operations);
-      }
-    }
-  }
-
-  /**
-     * Descendant method for completing candidate service context creation.
-     * @param operation  a Operation object
-     * @throws WSIException if operation is null.
-     */
-  protected void descendents(Operation operation) throws WSIException
-  {
-    // Messages from Operation
-
-    if (operation == null)
-    {
-      throw new WSIException("Internal error: expected an Operation value");
-    }
-    else
-    {
-      descendents(new Operation[] { operation });
-    }
-  }
-
-  /**
-   * Descendant method for completing candidate service context creation.
-   * @param operations  an array of operations.
-   * @throws WSIException if operations is null.
-   */
-  protected void descendents(Operation[] operations) throws WSIException
-  {
-    // Messages from Operations 1-2-n
-
-    if (operations == null)
-    {
-      throw new WSIException("Internal error: expected an Operation[] value");
-    }
-
-    HashSet set = new HashSet();
-    for (int i = 0; i < operations.length; i++)
-    {
-      if (operations[i].getInput() != null)
-        set.add(operations[i].getInput().getMessage()); //1-2-1
-      if (operations[i].getOutput() != null)
-        set.add(operations[i].getOutput().getMessage()); //1-2-1
-
-      // get messages associated with faults for this operation 
-      // 1-2-n
-      Iterator it = operations[i].getFaults().values().iterator();
-      while (it.hasNext())
-      {
-        set.add(((Fault) it.next()).getMessage());
-      }
-    }
-    this.messages = (Message[]) set.toArray(this.messages = new Message[0]);
-    // no descendents of messages so stop.
-  }
-
-  /**
-   * Provide a recursive non-repeating list of imports for the specified
-   * WSDL document definition.
-   */
-  /*   private HashSet getAllImports(Definition rootDef) throws WSIException {
-     	
-     	HashSet importSet = new HashSet();
-     	
-     	Collection importList =  rootDef.getImports().values();
-     	Iterator i = importList.iterator();
-     	
-     	while (i.hasNext()) {
-     		Import nextImport = (Import)(i.next());
-     		if (nextImport != null) {
-     			// its a wsdl document
-     			importSet.addAll(getAllImports(nextImport.getDefinition()));
-     		}   			
-     	}
-     	
-     	return (importSet);
-     }
-   */
-  private HashSet getAllImports(Definition rootDef) throws WSIException
-  {
-
-    HashSet importSet = new HashSet();
-
-    Map importMap = rootDef.getImports();
-    Iterator i = importMap.values().iterator();
-
-    while (i.hasNext())
-    {
-      List nextImportList = (List) (i.next());
-      Iterator listIt = nextImportList.iterator();
-      while (listIt.hasNext())
-      {
-        Import nextImport = (Import) listIt.next();
-        if (nextImport != null)
-        {
-          // its a wsdl document
-          importSet.add(nextImport);
-          if (nextImport.getDefinition() != null)
-          {
-            HashSet subTreeImports = getAllImports(nextImport.getDefinition());
-            Iterator subIt = subTreeImports.iterator();
-            while (subIt.hasNext())
-            {
-              importSet.add((Import) (subIt.next()));
-            }
-          }
-        }
-      }
-    }
-
-    return (importSet);
-  }
-
-  /**
-   * get all service location endpoint values
-   * relevant to the service under test.
-   * 
-   * If the service location is specified in the config we use
-   * just that.
-   * Otherwise, if the port is specified, we get all endpoints
-   * associated with that port.
-   * If we have neither the service location value or the port,
-   * then all endpoints in the definition are used.
-   */
-  private URI[] deriveEndpoints(
-  //AnalyzerConfig analyzerConfig, 
-  ServiceReference serviceReference, Port[] ports, Definition[] definitions)
-  {
-
-    URI[] endp = null;
-    //Port port = null;	
-    try
-    {
-      String serviceLocation = null;
-      // try service location...
-      //if ((serviceLocation = analyzerConfig.getServiceLocation()) != null) {      
-      if ((serviceLocation = serviceReference.getServiceLocation()) != null)
-      {
-        endp = new URI[] { new URI(serviceLocation)};
-      }
-      //else if (analyzerConfig.getWSDLElement().isPort()) {
-      else if (serviceReference.getWSDLElement().isPort())
-      {
-        if (ports.length != 1)
-        {
-          throw new WSIException("Internal error - expected 1-element Port array");
-        }
-        //else {
-        //	port = ports[0]; // if Port was given in config, there is just one
-        //}
-        //QName soapAddress = new QName(WSIConstants.NS_URI_WSDL_SOAP, "address");
-        Iterator i = ports[0].getExtensibilityElements().iterator();
-        while (i.hasNext() && serviceLocation == null)
-        {
-          ExtensibilityElement extElem = (ExtensibilityElement) i.next();
-          if (extElem instanceof SOAPAddress)
-          {
-            //if (extEl.getElementType().equals(soapAddress) {
-            // this element is our SOAPAddress - get the location
-            serviceLocation = ((SOAPAddress) extElem).getLocationURI();
-            endp = new URI[] { new URI(serviceLocation)};
-          }
-        }
-      }
-      else
-      { // no port info from config, so supply all in document
-        // QName soapAddress = new QName(WSIConstants.NS_URI_WSDL_SOAP, "address");
-        HashSet endpointSet = new HashSet();
-        Iterator i = definitions[0].getExtensibilityElements().iterator();
-        while (i.hasNext())
-        {
-          ExtensibilityElement extElem = (ExtensibilityElement) i.next();
-          if (extElem instanceof SOAPAddress)
-          {
-            //if (extEl.getElementType().equals(soapAddress) {
-            // this element is our SOAPAddress - get the location
-            endpointSet.add(((SOAPAddress) extElem).getLocationURI());
-          }
-        }
-        // Convert the derived List to a URI array
-        endp = (URI[]) endpointSet.toArray(endp = new URI[0]);
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    return endp;
-  }
-
-  /**
-   * Returns the binding.
-   * @return Binding
-   */
-  public Binding[] getBindings()
-  {
-    return bindings;
-  }
-
-  /**
-   * Returns the endPoints.
-   * @return URI[]
-   */
-  public URI[] getEndPoints()
-  {
-    // get list of matching endpoint(s) associated with service.
-    return endPoints;
-  }
-
-  /**
-  * Returns the endPoints matching the specified host and port.
-  * @param hostAndPort  host and port location.
-  * @return URI[] if matched, null otherwise.
-  */
-  public URI[] getEndPoints(String hostAndPort)
-  {
-    // get list of matching endpoints associated with service,
-    // having the specified host and port configuration
-    String port;
-
-    Vector matchedEndpoints = new Vector();
-    for (int i = 0; i < endPoints.length; i++)
-    {
-      // PB: If the endpoint does not contain a port number, then default it to "80"
-      port =
-        (endPoints[i].getPort() == -1)
-          ? "80"
-          : String.valueOf(endPoints[i].getPort());
-      if (hostAndPort.equals(endPoints[i].getHost() + ":" + port))
-      {
-        matchedEndpoints.add(endPoints[i]);
-      }
-    }
-    return (URI[]) matchedEndpoints.toArray(new URI[0]);
-  }
-
-  /**
-   * Returns the operation.
-   * @return Operation
-   */
-  public Operation[] getOperations()
-  {
-    return operations;
-  }
-
-  /**
-   * Returns the portType.
-   * @return PortType
-   */
-  public PortType[] getPortType()
-  {
-    return portTypes;
-  }
-
-  /**
-   * Returns true if the hostAndPort matches at least one context endpoint.
-   * @param hostAndPortString a host and port location.
-   * @return true if the hostAndPort matches at least one context endpoint.
-   * @throws WSIException if given hostandPort String does not convert to URI.
-   */
-  public boolean hasHostAndPort(String hostAndPortString) throws WSIException
-  {
-    URI hostAndPort;
-    try
-    {
-      hostAndPort = new URI(hostAndPortString);
-    }
-    catch (Exception e)
-    {
-      throw new WSIException(
-        "Could not convert string to URI: " + hostAndPortString);
-    }
-    String host = hostAndPort.getHost();
-    int port = hostAndPort.getPort();
-    for (int i = 0; i < this.endPoints.length; i++)
-    {
-      if (this.endPoints[i].getHost().equals(host)
-        && this.endPoints[i].getPort() == port)
-      {
-        return true;
-      }
-    }
-    return false; // for now
-  }
-
-  /**
-   * Returns the definitions.
-   * @return Definition[]
-   */
-  public Definition[] getDefinitions()
-  {
-    return definitions;
-  }
-
-  /**
-   * Returns the imports.
-   * @return Import[]
-   */
-  public Import[] getImports()
-  {
-    return imports;
-  }
-
-  /**
-   * Returns the messages.
-   * @return Message[]
-   */
-  public Message[] getMessages()
-  {
-    return messages;
-  }
-
-  /**
-   * Returns the ports.
-   * @return Port[]
-   */
-  public Port[] getPorts()
-  {
-    return ports;
-  }
-
-  /**
-   * Returns the portTypes.
-   * @return PortType[]
-   */
-  public PortType[] getPortTypes()
-  {
-    return portTypes;
-  }
-
-  /**
-   * Returns the types.
-   * @return Types[]
-   */
-  public Types[] getTypes()
-  {
-    return types;
-  }
-  /**
-   * Returns the wsdlDocument.
-   * @return WSDLDocument
-   */
-  public WSDLDocument getWsdlDocument()
-  {
-    return wsdlDocument;
-  }
-
-  /**
-   * Return the definition element that contains the types element.
-   * @param types a Types object.
-   * @return the definition element that contains the types element.
-   */
-  public Definition getDefinition(Types types)
-  {
-    Definition definition = null;
-    Types checkTypes;
-
-    for (int i = 0; i < definitions.length && definition == null; i++)
-    {
-      if (((checkTypes = definitions[i].getTypes()) != null)
-        && (checkTypes.equals(types)))
-      {
-        definition = definitions[i];
-      }
-    }
-
-    return definition;
-  }
-
-  /**
-   * Return the definition element that contains the binding element.
-   * @param binding a Binding object.
-   * @return the definition element that contains the binding element.
-   */
-  public Definition getDefinition(Binding binding)
-  {
-    Definition definition = null;
-
-    for (int i = 0; i < definitions.length && definition == null; i++)
-    {
-      if (definitions[i].getBinding(binding.getQName()) != null)
-        definition = definitions[i];
-    }
-
-    return definition;
-  }
-
-  /**
-   * Return the definition element that contains the portType element.
-   * @param portType a PortType object.
-   * @return the definition element that contains the portType element.
-   */
-  public Definition getDefinition(PortType portType)
-  {
-    Definition definition = null;
-
-    for (int i = 0; i < definitions.length && definition == null; i++)
-    {
-      if (definitions[i].getPortType(portType.getQName()) != null)
-        definition = definitions[i];
-    }
-
-    return definition;
-  }
-
-  /**
-   * Return the definition element that contains the message.
-   * @param message a Message object.
-   * @return the definition element that contains the message.
-   */
-  public Definition getDefinition(Message message)
-  {
-    Definition definition = null;
-
-    for (int i = 0; i < definitions.length && definition == null; i++)
-    {
-      if (definitions[i].getMessage(message.getQName()) != null)
-        definition = definitions[i];
-    }
-
-    return definition;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java
deleted file mode 100644
index 3f3eb4d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.util.XMLInfo;
-
-/**
- * This class maintains the Environment information.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class EnvironmentInfo implements XMLInfo
-{
-  /**
-   * Log timestamp.
-   */
-  protected String logTimestamp = null;
-
-  /**
-   * Monitor config comment.
-   */
-  protected String monitorConfigComment = null;
-
-  /**
-   * Create object.
-   * @param logTimestamp the log timestamp.
-   * @param monitorConfigComment the Monitor config comment.
-   */
-  public EnvironmentInfo(String logTimestamp, String monitorConfigComment)
-  {
-    this.logTimestamp = logTimestamp;
-    this.monitorConfigComment = monitorConfigComment;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.util.XMLInfo#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if (!nsName.equals(""))
-      nsName += ":";
-
-    // Start element
-    pw.print("      <" + nsName + WSIConstants.ELEM_LOG + " ");
-    pw.println(
-      WSIConstants.ATTR_TIMESTAMP + "=\"" + this.logTimestamp + "\"/>");
-
-    pw.print(
-      "        <"
-        + WSIConstants.NS_NAME_WSI_LOG
-        + WSIConstants.ELEM_COMMENT
-        + ">");
-    pw.print(this.monitorConfigComment);
-    pw.println(
-      "        </"
-        + WSIConstants.NS_NAME_WSI_LOG
-        + WSIConstants.ELEM_COMMENT
-        + ">");
-
-    // End element
-    pw.println("    </" + nsName + WSIConstants.ELEM_LOG + ">");
-
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/ServiceReference.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/ServiceReference.java
deleted file mode 100644
index 773e484..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/ServiceReference.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer;
-
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-
-/**
- * This class contains all of the information that is needed to process description test assertions.  The infromation
- * in this object will be derived from analyzer configuration information, UDDI entries, or the WSDL port element. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ServiceReference
-{
-  protected WSDLElement wsdlElement;
-  protected String wsdlLocation;
-  protected String serviceLocation;
-
-  /**
-   * Create service reference without references.  All of them will be set later as test assertions are 
-   * being processed.
-   */
-  public ServiceReference()
-  {
-  }
-
-  /**
-   * Create service reference from entries specified in the analyzer config file.  This information may include
-   * the information extracted from the wsdlElement, wsdlURI and serviceLocation elements.
-   * @param analyzerConfig an AnalyzerConfig object.
-   */
-  public ServiceReference(AnalyzerConfig analyzerConfig)
-  {
-    this.wsdlElement = analyzerConfig.getWSDLElement();
-    this.wsdlLocation = analyzerConfig.getWSDLLocation();
-    this.serviceLocation = analyzerConfig.getServiceLocation();
-
-  }
-
-  /**
-   * Get the WSDL element where analysis should begin.
-   * @return he WSDL element where analysis should begin.
-   * @see #setWSDLElement
-   */
-  public WSDLElement getWSDLElement()
-  {
-    return this.wsdlElement;
-  }
-
-  /**
-   * Set the WSDL element where analysis should begin.
-   * @param wsdlElement the WSDL element where analysis should begin.
-   * @see #getWSDLElement
-   */
-  public void setWSDLElement(WSDLElement wsdlElement)
-  {
-    this.wsdlElement = wsdlElement;
-  }
-
-  /**
-   * Get WSDL document location.
-   * @return WSDL document location.
-   * @see #setWSDLLocation
-   */
-  public String getWSDLLocation()
-  {
-    return this.wsdlLocation;
-  }
-
-  /**
-   * Set WSDL document location.
-   * @param wsdlLocation WSDL document location.
-   * @see #getWSDLLocation
-   */
-  public void setWSDLLocation(String wsdlLocation)
-  {
-    this.wsdlLocation = wsdlLocation;
-  }
-
-  /**
-   * Get Web service location.
-   * @return Web service location.
-   * @see #setServiceLocation
-   */
-  public String getServiceLocation()
-  {
-    return this.serviceLocation;
-  }
-
-  /**
-   * Set Web service location.
-   * @param serviceLocation eb service location.
-   * @see #getServiceLocation
-   */
-  public void setServiceLocation(String serviceLocation)
-  {
-    this.serviceLocation = serviceLocation;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfig.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfig.java
deleted file mode 100644
index 14a2199..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfig.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-
-/**
- * This is the interface for the analzyer configuration file.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface AnalyzerConfig extends WSIDocument
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_CONFIG;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG, ELEM_NAME);
-
-  /**
-   * Correlation types.
-   */
-  public static final String CORRELATION_TYPE_OPERATION = "operation";
-  public static final String CORRELATION_TYPE_NAMESPACE = "namespace";
-  public static final String CORRELATION_TYPE_ENDPOINT = "endpoint";
-
-  /**
-   * Initialize analyzer config.
-   * @param messageList a MessageList object.
-   */
-  public void init(MessageList messageList);
-
-  /**
-   * Get optional description.
-   * @return optional description.
-   * @see #setDescription
-   */
-  public String getDescription();
-
-  /**
-   * Set optional description.
-   * @param description  an optional description.
-   * @see #getDescription
-   */
-  public void setDescription(String description);
-
-  /**
-   * Get verbose option.
-   * @return true if verbose.
-   * @see #setVerboseOption
-   */
-  public boolean getVerboseOption();
-
-  /**
-   * Set verbose option.
-   * @param verbose verbose option.
-   * @see #getVerboseOption
-   */
-  public void setVerboseOption(boolean verbose);
-
-  /**
-   * Get assertion results option.
-   * @return assertion results option.
-   * @see #setAssertionResultsOption
-   */
-  public AssertionResultsOption getAssertionResultsOption();
-
-  /**
-   * Set assertion results option.
-   * @param assertionResultsOption  assertion results option.
-   * @see #getAssertionResultsOption
-   */
-  public void setAssertionResultsOption(AssertionResultsOption assertionResultsOption);
-
-  /**
-   * Get replace report file option.
-   * @return replace report file option.
-   * @see #setReplaceReport
-   */
-  public boolean getReplaceReport();
-
-  /**
-   * Set replace report file option.
-   * @param replaceReport  eplace report file option.
-   * @see #getReplaceReport
-   */
-  public void setReplaceReport(boolean replaceReport);
-
-  /**
-   * Get report file location.
-   * @return report file location.
-   * @see #setReportLocation
-   */
-  public String getReportLocation();
-
-  /**
-   * Set replace report file option.
-   * @param reportURI report location.
-   * @see #getReportLocation
-   */
-  public void setReportLocation(String reportURI);
-
-  /**
-   * Get style sheet.
-   * @return style sheet.
-   * @see #setAddStyleSheet
-   */
-  public AddStyleSheet getAddStyleSheet();
-
-  /**
-   * Set style sheet.
-   * @param addStyleSheet a style sheet.
-   * @see #getAddStyleSheet
-   */
-  public void setAddStyleSheet(AddStyleSheet addStyleSheet);
-
-  /**
-   * Get profile test assertions document location.
-   * @return rofile test assertions document location.
-   * @see #setTestAssertionsDocumentLocation
-   */
-  public String getTestAssertionsDocumentLocation();
-
-  /**
-   * Set profile test assertions document location.
-   * @param testAssertionsDocumentURI profile test assertions document location.
-   * @see #getTestAssertionsDocumentLocation
-   */
-  public void setTestAssertionsDocumentLocation(String testAssertionsDocumentURI);
-
-  /**
-   * Get mesage log location.
-   * @return mesage log location.
-   * @see #setLogLocation
-   */
-  public String getLogLocation();
-
-  /**
-   * Set message log location.
-   * @param logURI message log location.
-   * @see #getLogLocation
-   */
-  public void setLogLocation(String logURI);
-
-  /**
-   * Is message log location specified.
-   * @return true if message log location is set.
-   */
-  public boolean isLogSet();
-
-  /**
-   * Get correlation type.
-   * @return correlation type.
-   * @see #setCorrelationType
-   */
-  public String getCorrelationType();
-
-  /**
-   * Set correlation type.
-   * @param correlationType correlation type.
-   * @see #getCorrelationType
-   */
-  public void setCorrelationType(String correlationType);
-
-  /**
-   * Is WSDL reference set.
-   * @return true if WSDL reference is set.
-   */
-  public boolean isWSDLReferenceSet();
-
-  /**
-   * Get WSDL reference.
-   * @return WSDL reference.
-   * @see #setWSDLReference
-   */
-  public WSDLReference getWSDLReference();
-
-  /**
-   * Set WSDL reference.
-   * @param wsdlReference WSDL reference.
-   * @see #getWSDLReference
-   */
-  public void setWSDLReference(WSDLReference wsdlReference);
-
-  /**
-   * Get WSDL element.
-   * @return WSDL element.
-   */
-  public WSDLElement getWSDLElement();
-
-  /**
-   * Get WSDL document location.
-   * @return WSDL document location.
-   */
-  public String getWSDLLocation();
-
-  /**
-   * Get service location.
-   * @return service location.
-   */
-  public String getServiceLocation();
-
-  /**
-   * Is UDDI reference set.
-   * @return true if UDDI reference is set.
-   */
-  public boolean isUDDIReferenceSet();
-
-  /**
-   * Get UDDI reference.
-   * @return UDDI reference.
-   * @see #setUDDIReference
-   */
-  public UDDIReference getUDDIReference();
-
-  /**
-   * Set UDDI reference.
-   * @param uddiReference UDDI reference.
-   * @see #getUDDIReference
-   */
-  public void setUDDIReference(UDDIReference uddiReference);
-
-  /**
-   * Parse the command line arguments.
-   * @param args the command line arguments.
-   * @param validate flag for command line validation.
-   * @throws WSIException if problems parsing the command line arguments.
-   */
-  public void parseArgs(String[] args, boolean validate) throws WSIException;
-
-  /**
-   * Get string representation of this object.
-   * @return string representation of this object.
-   */
-  public String toString();
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java
deleted file mode 100644
index 7c364fb..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import java.io.Reader;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-
-
-/**
- * Defines the interface used to read the analyzer config documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface AnalyzerConfigReader extends DocumentReader {
-
-  /**
-   * Initialize analyzer config reader.
-   * @param messageList a MessageList object.
-   */
-  public void init(MessageList messageList);
-  
-  /**
-   * Read the analyzer config file.
-   * @param analyzerConfigURI the analyzer config file location.
-   * @return the AnalyzerConfig object.
-   * @throws WSIException if unable to read the analyzer config file.
-   */
-  public AnalyzerConfig readAnalyzerConfig(String analyzerConfigURI) throws WSIException;
-  
-  /**
-   * Read the analyzer config file.
-   * @param reader a Reader object.
-   * @return the AnalyzerConfig object.
-   * @throws WSIException if unable to parse the analyzer config file.
-   */
-  public AnalyzerConfig readAnalyzerConfig(Reader reader) throws WSIException;
-}
-
-

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultType.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultType.java
deleted file mode 100644
index 020c9d1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultType.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- *
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-
-/**
- * Test assertion result type.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public final class AssertionResultType
-{
-  /**
-   * This type.
-   */
-  private String resultType = _ALL;
-
-  /**
-   * String version of result types.
-   */
-  private static final String _ALL = "all";
-  private static final String _NOT_INFO = "notInfo";
-  private static final String _ONLY_FAILED = "onlyFailed";
-  private static final String _NOT_PASSED = "notPassed";
-
-  /**
-   * Result types.
-   */
-  public static final AssertionResultType ALL = new AssertionResultType(_ALL);
-  public static final AssertionResultType NOT_INFO = new AssertionResultType(_NOT_INFO);
-  public static final AssertionResultType ONLY_FAILED =
-    new AssertionResultType(_ONLY_FAILED);
-  public static final AssertionResultType NOT_PASSED =
-    new AssertionResultType(_NOT_PASSED);
-
-  /**
-   * Do not allow this object to be created with null constructor.
-   */
-  private AssertionResultType()
-  {
-  }
-
-  /**
-   * Create result type.
-   * @param resultType a result type.
-   */
-  private AssertionResultType(String resultType)
-  {
-    this.resultType = resultType;
-  }
-
-  /**
-   * Is result type all.
-   * @return true if the result type is all.
-   */
-  public boolean isAll()
-  {
-    return resultType.equals(_ALL);
-  }
-
-  /**
-   * Is result type failed only.
-   * @return true if the result type is failed only.
-   */
-  public boolean isFailedOnly()
-  {
-    return resultType.equals(_ONLY_FAILED);
-  }
-
-  /**
-   * Is result type not passed.
-   * @return true if the result type is not passed.
-   */
-  public boolean isNotPassed()
-  {
-    return resultType.equals(_NOT_PASSED);
-  }
-
-  /**
-   * Is result type not info.
-   * @return true if the result type is not info.
-   */
-  public boolean isNotInfo()
-  {
-    return resultType.equals(_NOT_INFO);
-  }
-
-  /**
-   * Get result type.
-   * @return result type.
-   */
-  public String getType()
-  {
-    return resultType;
-  }
-
-  /**
-   * Create new assertion result type.
-   * @param resultType an assertion result type.
-   * @return new assertion result type.
-   * @throws WSIException if invalid assertion result type was specified.
-   */
-  public static AssertionResultType newInstance(String resultType)
-    throws WSIException
-  {
-    AssertionResultType assertionResultType = null;
-
-    if (resultType == null)
-    {
-      assertionResultType = NOT_INFO;
-    }
-
-    else if (resultType.equals(_ALL))
-    {
-      assertionResultType = ALL;
-    }
-
-    else if (resultType.equals(_ONLY_FAILED))
-    {
-      assertionResultType = ONLY_FAILED;
-    }
-
-    else if (resultType.equals(_NOT_PASSED))
-    {
-      assertionResultType = NOT_PASSED;
-    }
-    else if (resultType.equals(_NOT_INFO))
-    {
-      assertionResultType = NOT_INFO;
-    }
-
-    else
-    {
-      throw new WSIException(
-        "An invalid assertion result type was specified: " + resultType + ".");
-    }
-
-    return assertionResultType;
-  }
-
-  /**
-   * Get string representation of this object.
-   * @return string representation of this object.
-   */
-  public String toString()
-  {
-    return resultType;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultsOption.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultsOption.java
deleted file mode 100644
index 34ed56f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultsOption.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * This interface contains a definition of the assertion results that 
- * should be included in the report.  It also contains information 
- * that indicates which messages should be included in the report.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface AssertionResultsOption extends DocumentElement
-{
-  /**
-   * Get assertion result type.
-   * @return assertion result type.
-   * @see #setAssertionResultType
-   */
-  public AssertionResultType getAssertionResultType();
-
-  /**
-   * Set assertion result type.
-   * @param resultType assertion result type.
-   * @see #getAssertionResultType
-   */
-  public void setAssertionResultType(AssertionResultType resultType);
-
-  /**
-   * Get show message entry indicator.
-   * @return show message entry indicator.
-   * @see #setShowMessageEntry
-   */
-  public boolean getShowMessageEntry();
-
-  /**
-   * Set show message entry indictor.
-   * @param showMessageEntry show message entry indictor.
-   * @see #getShowMessageEntry
-   */
-  public void setShowMessageEntry(boolean showMessageEntry);
-
-  /**
-   * Get show assertion description indicator.
-   * @return show assertion description indicator.
-   * @see #setShowAssertionDescription
-   */
-  public boolean getShowAssertionDescription();
-
-  /**
-   * Set show assertion description indictor.
-   * @param showAssertionDescription show assertion description indictor.
-   * @see #getShowAssertionDescription
-   */
-  public void setShowAssertionDescription(boolean showAssertionDescription);
-
-  /**
-   * Get show failure message indicator.
-   * @return show failure message indicator.
-   * @see #setShowFailureMessage
-   */
-  public boolean getShowFailureMessage();
-
-  /**
-   * Set show failure message indicator.
-   * @param showFailureMessage show failure message indicator.
-   * @see #getShowFailureMessage
-   */
-  public void setShowFailureMessage(boolean showFailureMessage);
-
-  /**
-   * Get show error detail indicator.
-   * @return show error detail indicator.
-   * @see #setShowFailureDetail
-   */
-  public boolean getShowFailureDetail();
-
-  /**
-   * Set show error detail indicator.
-   * @param showfailureDetail show error detail indicator.
-   * @see #getShowFailureDetail
-   */
-  public void setShowFailureDetail(boolean showfailureDetail);
-
-  /**
-   * Get string representation of this object.
-   * @return string representation of this object.
-   */
-  public String toString();
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java
deleted file mode 100644
index 2a3bcd2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The interface for a reference to a discovery artifact.  
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface UDDIReference extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_UDDI_REFERENCE;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG, ELEM_NAME);
-
-  /**
-   * UDDI key type: bindingKey.
-   */
-  public static final String BINDING_KEY = "bindingKey";
-
-  /**
-   * UDDI key type: tModelKey.
-   */
-  public static final String TMODEL_KEY = "tModelKey";
-
-  /**
-   * Get UDDI  key type.
-   * @return UDDI  key type.
-   * @see #setKeyType
-   */
-  public String getKeyType();
-
-  /**
-   * Set UDDI key type.
-   * @param keyType UDDI key type.
-   * @see #getKeyType
-   */
-  public void setKeyType(String keyType);
-
-  /**
-   * Get UDDI key.
-   * @return UDDI key.
-   * @see #setKey
-   */
-  public String getKey();
-
-  /**
-   * Set UDDI key.
-   * @param key UDDI key.
-   * @see #getKey
-   */
-  public void setKey(String key);
-
-  /**
-   * Get UDDI inquiry URL.
-   * @return UDDI inquiry URL.
-   * @see #setInquiryURL
-   */
-  public String getInquiryURL();
-
-  /**
-   * Set UDDI inquiryURL.
-   * @param inquiryURL UDDI inquiryURL.
-   * @see #getInquiryURL
-   */
-  public void setInquiryURL(String inquiryURL);
-
-  /**
-   * Get WSDL element.
-   * @return WSDL element.
-   * @see #setWSDLElement
-   */
-  public WSDLElement getWSDLElement();
-
-  /**
-   * Set WSDL element.
-   * @param wsdlElement WSDL element.
-   * @see #getWSDLElement
-   */
-  public void setWSDLElement(WSDLElement wsdlElement);
-
-  /**
-   * Get service location.
-   * @return service location.
-   * @see #setServiceLocation
-   */
-  public String getServiceLocation();
-
-  /**
-   * Set service location.
-   * @param serviceLocation service location.
-   * @see #getServiceLocation
-   */
-  public void setServiceLocation(String serviceLocation);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java
deleted file mode 100644
index 2be33e2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The base interface for WSDL definitions. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface WSDLElement extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_WSDL_ELEMENT;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG, ELEM_NAME);
-
-  /**
-   * Get WSDL element type.
-   * @return WSDL element type.
-   * @see #setType
-   */
-  public String getType();
-
-  /**
-   * Set WSDL element type.
-   * @param type WSDL element type.
-   * @see #getType
-   */
-  public void setType(String type);
-
-  /**
-   * Get WSDL element namespace.
-   * @return WSDL element namespace.
-   * @see #setNamespace
-   */
-  public String getNamespace();
-
-  /**
-   * Set WSDL element namespace.
-   * @param namespace WSDL element namespace.
-   * @see #getNamespace
-   */
-  public void setNamespace(String namespace);
-
-  /**
-   * Get WSDL element name.
-   * @return WSDL element name.
-   * @see #setName
-   */
-  public String getName();
-
-  /**
-   * Set WSDL element name.
-   * @param name WSDL element name.
-   * @see #getName
-   */
-  public void setName(String name);
-
-  /**
-   * Get WSDL element qualified name.
-   * @return WSDL element qualified name.
-   */
-  public QName getQName();
-
-  /**
-   * Get WSDL parent element name.
-   * @return WSDL parent element name.
-   * @see #setParentElementName
-   * 
-   */
-  public String getParentElementName();
-
-  /**
-   * Set WSDL parent element name.
-   * @param parentElementName WSDL parent element name.
-   * @see #getParentElementName
-   */
-  public void setParentElementName(String parentElementName);
-
-  /**
-   * Get WSDL parent element QName.
-   * @return WSDL parent element QName.
-   */
-  public QName getParentElementQName();
-
-  /**
-   * Is port element.
-   * @return true if the element is a port.
-   */
-  public boolean isPort();
-
-  /**
-   * Is binding element.
-   * @return true if the lement is a binding.
-   */
-  public boolean isBinding();
-
-  /**
-   * Is portType element.
-   * @return true if element is a port type.
-   */
-  public boolean isPortType();
-
-  /**
-   * Is operation element.
-   * @return true if the element is an operation.
-   */
-  public boolean isOperation();
-
-  /**
-   * Is message element.
-   * @return true if element is a message.
-   */
-  public boolean isMessage();
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java
deleted file mode 100644
index ec550c2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The interface for a reference to a description artifact.  
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface WSDLReference extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_WSDL_REFERENCE;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG, ELEM_NAME);
-
-  /**
-   * Get WSDL element.
-   * @return WSDL element.
-   * @see #setWSDLElement
-   */
-  public WSDLElement getWSDLElement();
-
-  /**
-   * Set WSDL element.
-   * @param wsdlElement WSDL element.
-   * @see #getWSDLElement
-   */
-  public void setWSDLElement(WSDLElement wsdlElement);
-
-  /**
-   * Get WSDL location.
-   * @return WSDL location.
-   * @see #setWSDLLocation
-   */
-  public String getWSDLLocation();
-
-  /**
-   * Set WSDL location.
-   * @param wsdlLocation WSDL location.
-   * @see #getWSDLLocation
-   */
-  public void setWSDLLocation(String wsdlLocation);
-
-  /**
-   * Get service location.
-   * @return service location.
-   * @see #setServiceLocation
-   */
-  public String getServiceLocation();
-
-  /**
-   * Set service location.
-   * @param serviceLocation service location.
-   * @see #getServiceLocation
-   */
-  public void setServiceLocation(String serviceLocation);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java
deleted file mode 100644
index 95ee74a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java
+++ /dev/null

@@ -1,1060 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.Analyzer;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * This class is an implementation of the analyzer configuration file interface.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class AnalyzerConfigImpl implements AnalyzerConfig
-{
-  /**
-   * Message list reference.
-   */
-  protected MessageList messageList = null;
-
-  /**
-   * Analyzer configuration file URI.
-   */
-  protected String configURI = null;
-
-  /**
-   * Optional description.
-   */
-  protected String description = null;
-
-  /**
-   * Verbose option.
-   */
-  protected boolean verbose = false;
-
-  /**
-   * Assertion results option.
-   */
-  protected AssertionResultsOption assertionResultsOption =
-    new AssertionResultsOptionImpl();
-
-  /**
-   * Report location.
-   */
-  protected String reportURI = WSIConstants.DEFAULT_REPORT_URI;
-
-  /**
-   * Replace report indicator.
-   */
-  protected boolean replaceReport = false;
-
-  /**
-   * Add style sheet.
-   */
-  protected AddStyleSheet addStyleSheet;
-
-  /**
-   * Profile test assertions document location.
-   */
-  protected String testAssertionsDocumentURI =
-    WSIConstants.DEFAULT_TEST_ASSERTIONS_DOCUMENT_URI;
-
-  /**
-   * Message log location.
-   */
-  protected String logURI = null;
-
-  /**
-   * Message correlation type.
-   */
-  protected String correlationType =
-    WSIConstants.ATTRVAL_CORRELATION_TYPE_OPERATION;
-
-  /**
-   * WSDL reference.
-   */
-  protected WSDLReference wsdlReference = null;
-
-  /**
-   * UDDI reference.
-   */
-  protected UDDIReference uddiReference = null;
-
-  /**
-   * Default constructor.
-   */
-  public AnalyzerConfigImpl()
-  {
-  }
-
-  /**
-   * Constructor with all settings.
-   * @param description                an optional description.
-   * @param verbose                    the verbose option.
-   * @param assertionResultsOption     an assertion results option.
-   * @param reportURI                  report location.
-   * @param replaceReport              a replace report indicator.
-   * @param addStyleSheet              add style sheet.
-   * @param testAssertionsDocumentURI  profile test assertions document location.
-   * @param logURI                     message log location.
-   * @param correlationType            message correlation type.
-   * @param wsdlReference              a WSDL reference..
-   * @param uddiReference              a UUDDI reference.
-   */
-  public AnalyzerConfigImpl(
-    String description,
-    boolean verbose,
-    AssertionResultsOption assertionResultsOption,
-    String reportURI,
-    boolean replaceReport,
-    AddStyleSheet addStyleSheet,
-    String testAssertionsDocumentURI,
-    String logURI,
-    String correlationType,
-    WSDLReference wsdlReference,
-    UDDIReference uddiReference)
-  {
-    this.description = description;
-    this.verbose = verbose;
-    this.assertionResultsOption = assertionResultsOption;
-    this.reportURI = reportURI;
-    this.replaceReport = replaceReport;
-    this.addStyleSheet = addStyleSheet;
-    this.testAssertionsDocumentURI = testAssertionsDocumentURI;
-    this.logURI = logURI;
-    this.correlationType = correlationType;
-    this.wsdlReference = wsdlReference;
-    this.uddiReference = uddiReference;
-  }
-
-  /**
-   * Initialize analyzer config.
-   */
-  public void init(MessageList messageList)
-  {
-    this.messageList = messageList;
-  }
-
-  /**
-   * Get optional description.
-   * @see #setDescription
-   */
-  public String getDescription()
-  {
-    return this.description;
-  }
-
-  /**
-   * Set optional description.
-   * @see #getDescription
-   */
-  public void setDescription(String description)
-  {
-    this.description = description;
-  }
-
-  /**
-   * @see #setVerboseOption
-   */
-  public boolean getVerboseOption()
-  {
-    return this.verbose;
-  }
-
-  /**
-   * @see #getVerboseOption
-   */
-  public void setVerboseOption(boolean verbose)
-  {
-    this.verbose = verbose;
-  }
-
-  /**
-   * Get assertion results option.
-   * @see #setAssertionResultsOption
-   */
-  public AssertionResultsOption getAssertionResultsOption()
-  {
-    return this.assertionResultsOption;
-  }
-
-  /**
-   * Set assertion results option.
-   * @see #getAssertionResultsOption
-   */
-  public void setAssertionResultsOption(AssertionResultsOption assertionResultsOption)
-  {
-    this.assertionResultsOption = assertionResultsOption;
-  }
-
-  /**
-   * @see #setReportLocation
-   */
-  public String getReportLocation()
-  {
-    return this.reportURI;
-  }
-
-  /**
-   * @see #getReportLocation
-   */
-  public void setReportLocation(String reportURI)
-  {
-    this.reportURI = reportURI;
-  }
-
-  /**
-   * Get replace report file option.
-   * @see #setReplaceReport
-   */
-  public boolean getReplaceReport()
-  {
-    return this.replaceReport;
-  }
-
-  /**
-   * Set report file location.
-   * @see #getReplaceReport
-   */
-  public void setReplaceReport(boolean replaceReport)
-  {
-    this.replaceReport = replaceReport;
-  }
-
-  /**
-   * Get add style sheet.
-   * @see #setAddStyleSheet
-   */
-  public AddStyleSheet getAddStyleSheet()
-  {
-    return this.addStyleSheet;
-  }
-
-  /**
-   * Set replace report file option.
-   * @see #getAddStyleSheet
-   */
-  public void setAddStyleSheet(AddStyleSheet addStyleSheet)
-  {
-    this.addStyleSheet = addStyleSheet;
-  }
-
-  /**
-   * @see #setTestAssertionDocumentLocation
-   */
-  public String getTestAssertionsDocumentLocation()
-  {
-    return this.testAssertionsDocumentURI;
-  }
-
-  /**
-   * @see #getTestAssertionDocumentLocation
-   */
-  public void setTestAssertionsDocumentLocation(String testAssertionsDocumentURI)
-  {
-    this.testAssertionsDocumentURI = testAssertionsDocumentURI;
-  }
-
-  /**
-   * @see #setLogLocation
-   */
-  public String getLogLocation()
-  {
-    return logURI;
-  }
-
-  /**
-   * @see #getLogLocation
-   */
-  public void setLogLocation(String logURI)
-  {
-    this.logURI = logURI;
-  }
-
-  public boolean isLogSet()
-  {
-    return (logURI != null);
-  }
-
-  /**
-   * Get correlation type.
-   * @see #setCorrelationType
-   */
-  public String getCorrelationType()
-  {
-    return this.correlationType;
-  }
-
-  /**
-   * Set correlation type.
-   * @see #getCorrelationType
-   * 
-   */
-  public void setCorrelationType(String correlationType)
-  {
-    this.correlationType = correlationType;
-  }
-
-  /**
-   * Is WSDL reference set.
-   */
-  public boolean isWSDLReferenceSet()
-  {
-    return (this.wsdlReference == null ? false : true);
-  }
-
-  /**
-   * Get WSDL reference.
-   * @see #setWSDLReference
-   */
-  public WSDLReference getWSDLReference()
-  {
-    return this.wsdlReference;
-  }
-
-  /**
-   * Set WSDL reference.
-   * @see #getWSDLReference
-   */
-  public void setWSDLReference(WSDLReference wsdlReference)
-  {
-    this.wsdlReference = wsdlReference;
-  }
-
-  /**
-   * Get WSDL element.
-   * 
-   */
-  public WSDLElement getWSDLElement()
-  {
-    return (this.wsdlReference == null)
-      ? null
-      : this.wsdlReference.getWSDLElement();
-  }
-
-  /**
-   * Get service location.
-   */
-  public String getServiceLocation()
-  {
-    return (this.wsdlReference == null)
-      ? null
-      : this.wsdlReference.getServiceLocation();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig#getWSDLLocation()
-   */
-  public String getWSDLLocation()
-  {
-    return (this.wsdlReference == null)
-      ? null
-      : this.wsdlReference.getWSDLLocation();
-  }
-
-  /**
-   * @see org.wsi.test.analyzer.config.AnalyzerConfig#isUddiReferenceSet)
-   */
-  public boolean isUDDIReferenceSet()
-  {
-    return (this.uddiReference == null ? false : true);
-  }
-
-  /**
-   * Get UDDI reference.
-   * @see #setUDDIReference
-   */
-  public UDDIReference getUDDIReference()
-  {
-    return this.uddiReference;
-  }
-
-  /**
-   * Set UDDI reference.
-   * @see #getUDDIReference
-   */
-  public void setUDDIReference(UDDIReference uddiReference)
-  {
-    this.uddiReference = uddiReference;
-  }
-
-  /**
-   * @see #setLocation
-   */
-  public String getLocation()
-  {
-    return configURI;
-  }
-
-  /**
-   * @see getLocation
-   */
-  public void setLocation(String configURI)
-  {
-    this.configURI = configURI;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.WSIDocument#toXMLString()
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Start element
-    pw.println("    <" + nsName + ELEM_NAME + ">");
-
-    // Verbose option
-    pw.print("      <" + nsName + WSIConstants.ELEM_VERBOSE + ">");
-    pw.print(getVerboseOption());
-    pw.println("</" + nsName + WSIConstants.ELEM_VERBOSE + ">");
-
-    // Get assertion results option
-    pw.print(assertionResultsOption.toXMLString(nsName));
-
-    // report file
-    pw.print("        <" + nsName + WSIConstants.ELEM_REPORT_FILE + " ");
-    pw.print(WSIConstants.ATTR_REPLACE + "=\"" + getReplaceReport() + "\" ");
-    pw.println(
-      WSIConstants.ATTR_LOCATION + "=\"" + getReportLocation() + "\">");
-    pw.print(getAddStyleSheet().toXMLString(namespaceName));
-    pw.println("        </" + nsName + WSIConstants.ELEM_REPORT_FILE + ">");
-
-    // test assertion file
-    pw.print(
-      "        <" + nsName + WSIConstants.ELEM_TEST_ASSERTIONS_FILE + ">");
-    pw.print(getTestAssertionsDocumentLocation());
-    pw.println("</" + nsName + WSIConstants.ELEM_TEST_ASSERTIONS_FILE + ">");
-
-    // log file
-    pw.print("        <" + nsName + WSIConstants.ELEM_LOG_FILE);
-    pw.print(
-      " "
-        + WSIConstants.ATTR_CORRELATION_TYPE
-        + "=\""
-        + this.correlationType
-        + "\">");
-    pw.print(getLogLocation());
-    pw.println("</" + nsName + WSIConstants.ELEM_LOG_FILE + ">");
-
-    // WSDL reference 
-    if (this.wsdlReference != null)
-    {
-      pw.print(getWSDLReference().toXMLString(nsName));
-    }
-
-    // UDDI Reference
-    if (this.uddiReference != null)
-    {
-      pw.print(getUDDIReference().toXMLString(nsName));
-    }
-
-    // End element
-    pw.println("    </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    // verbose option
-    pw.println("  verbose .................... " + this.verbose);
-
-    // assertionResults options
-    pw.print(this.assertionResultsOption.toString());
-
-    // reportFile options
-    pw.println("  Report File:");
-    pw.println("    replace .................. " + this.replaceReport);
-    pw.println("    location ................. " + this.reportURI);
-    if (this.addStyleSheet != null)
-    {
-      pw.println("    Style Sheet:");
-      if (this.addStyleSheet.getHref() != null)
-        pw.println(
-          "      href ................... " + this.addStyleSheet.getHref());
-      if (this.addStyleSheet.getType() != null)
-        pw.println(
-          "      type ................... " + this.addStyleSheet.getType());
-      if (this.addStyleSheet.getTitle() != null)
-        pw.println(
-          "      title .................. " + this.addStyleSheet.getTitle());
-      if (this.addStyleSheet.getMedia() != null)
-        pw.println(
-          "      media .................. " + this.addStyleSheet.getMedia());
-      if (this.addStyleSheet.getCharset() != null)
-        pw.println(
-          "      charset ................ " + this.addStyleSheet.getCharset());
-      if (this.addStyleSheet.getAlternate() != null)
-        pw.println(
-          "      alternate .............. "
-            + this.addStyleSheet.getAlternate());
-    }
-
-    // testAssertionsFile parameter
-    pw.println(
-      "  testAssertionsFile ......... " + this.testAssertionsDocumentURI);
-
-    // logFile options
-    if (this.logURI != null)
-    {
-      pw.println("  Message Log File:");
-      pw.println("    location ................. " + this.logURI);
-      pw.println("    correlationType .......... " + this.correlationType);
-    }
-
-    // wsdlReference options   
-    if (this.isWSDLReferenceSet())
-    {
-      pw.print(this.wsdlReference.toString());
-    }
-
-    // uddiReference options
-    if (this.isUDDIReferenceSet())
-    {
-      pw.print(this.uddiReference.toString());
-    }
-
-    // description parameter
-    if (this.description != null)
-    {
-      pw.println("  description ................ " + this.description);
-    }
-
-    return sw.toString();
-  }
-
-  /**
-   * Set config values from another analyzer config object.
-   */
-  private void setConfig(AnalyzerConfig analyzerConfig)
-  {
-    this.configURI = analyzerConfig.getLocation();
-    this.description = analyzerConfig.getDescription();
-    this.verbose = analyzerConfig.getVerboseOption();
-    this.assertionResultsOption = analyzerConfig.getAssertionResultsOption();
-    this.reportURI = analyzerConfig.getReportLocation();
-    this.replaceReport = analyzerConfig.getReplaceReport();
-    this.logURI = analyzerConfig.getLogLocation();
-    this.correlationType = analyzerConfig.getCorrelationType();
-    this.testAssertionsDocumentURI =
-      analyzerConfig.getTestAssertionsDocumentLocation();
-    this.addStyleSheet = analyzerConfig.getAddStyleSheet();
-    this.wsdlReference = analyzerConfig.getWSDLReference();
-    this.uddiReference = analyzerConfig.getUDDIReference();
-  }
-
-  /**
-   * Parse command line arguments.
-   */
-  public void parseArgs(String[] args, boolean validate) throws WSIException
-  {
-    WSDLReference wsdlReference = null;
-    UDDIReference uddiReference = null;
-
-    // Get new config reader
-    AnalyzerConfigReader analyzerConfigReader = new AnalyzerConfigReaderImpl();
-    analyzerConfigReader.init(this.messageList);
-
-    // Analyzer config object which will be merged after all of the input parms are processed
-    AnalyzerConfig analyzerConfigFromArgs = null;
-
-    // Assertion results option
-    AssertionResultsOption assertionResultsOption = null;
-
-    // If no input arguments, then throw exception
-    if (args.length == 0)
-    {
-      // ADD: 
-      throw new IllegalArgumentException(
-        getMessage("usage01", Analyzer.USAGE_MESSAGE));
-    }
-
-    // Parse the command line arguments to locate the config file option (if it was specified)
-    for (int argCount = 0; argCount < args.length; argCount++)
-    {
-      // -config
-      if ((args[argCount].equalsIgnoreCase("-config"))
-        || (args[argCount].equals("-c")))
-      {
-        argCount++;
-        analyzerConfigFromArgs =
-          analyzerConfigReader.readAnalyzerConfig(
-            getOptionValue(args, argCount));
-      }
-    }
-
-    // If config file was not specified, then create analyzer config object
-    if (analyzerConfigFromArgs == null)
-    {
-      analyzerConfigFromArgs = new AnalyzerConfigImpl();
-      analyzerConfigFromArgs.init(this.messageList);
-    }
-
-    // Get assertion results option
-    if ((assertionResultsOption =
-      analyzerConfigFromArgs.getAssertionResultsOption())
-      == null)
-    {
-      assertionResultsOption = new AssertionResultsOptionImpl();
-      analyzerConfigFromArgs.setAssertionResultsOption(assertionResultsOption);
-    }
-
-    // Parse all of the command line arguments
-    for (int argCount = 0; argCount < args.length; argCount++)
-    {
-      // -config
-      if ((args[argCount].equalsIgnoreCase("-config"))
-        || (args[argCount].equals("-c")))
-      {
-        // Skip this option since it was already processed
-        argCount++;
-      }
-
-      // -verbose
-      else if (
-        (args[argCount].equalsIgnoreCase("-verbose"))
-          || (args[argCount].equals("-v")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setVerboseOption(
-          Boolean.valueOf(getOptionValue(args, argCount)).booleanValue());
-      }
-
-      // -assertionResults
-      else if (
-        (args[argCount].equalsIgnoreCase("-assertionResults"))
-          || (args[argCount].equals("-a")))
-      {
-        argCount++;
-        assertionResultsOption.setAssertionResultType(
-          AssertionResultType.newInstance(getOptionValue(args, argCount)));
-      }
-
-      // -messageEntry
-      else if (
-        (args[argCount].equalsIgnoreCase("-messageEntry"))
-          || (args[argCount].equals("-M")))
-      {
-        argCount++;
-        assertionResultsOption.setShowMessageEntry(
-          Boolean.valueOf(getOptionValue(args, argCount)).booleanValue());
-      }
-
-      // -assertionDescription
-      else if (
-        (args[argCount].equalsIgnoreCase("-assertionDescription"))
-          || (args[argCount].equals("-A")))
-      {
-        argCount++;
-        assertionResultsOption.setShowAssertionDescription(
-          Boolean.valueOf(args[argCount]).booleanValue());
-      }
-
-      // -failureMessage
-      else if (
-        (args[argCount].equalsIgnoreCase("-failureMessage"))
-          || (args[argCount].equals("-F")))
-      {
-        argCount++;
-        assertionResultsOption.setShowFailureMessage(
-          Boolean.valueOf(getOptionValue(args, argCount)).booleanValue());
-      }
-
-      // -failureDetail
-      else if (
-        (args[argCount].equalsIgnoreCase("-failureDetail"))
-          || (args[argCount].equals("-D")))
-      {
-        argCount++;
-        assertionResultsOption.setShowFailureDetail(
-          Boolean.valueOf(getOptionValue(args, argCount)).booleanValue());
-      }
-
-      // -logFile
-      else if (
-        (args[argCount].equalsIgnoreCase("-logFile"))
-          || (args[argCount].equals("-l")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setLogLocation(getOptionValue(args, argCount));
-      }
-
-      // -testAssertionFile
-      else if (
-        (args[argCount].equalsIgnoreCase("-testAssertionFile"))
-          || (args[argCount].equals("-t")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setTestAssertionsDocumentLocation(
-          getOptionValue(args, argCount));
-      }
-
-      // -reportFile
-      else if (
-        (args[argCount].equalsIgnoreCase("-reportFile"))
-          || (args[argCount].equals("-r")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setReportLocation(
-          getOptionValue(args, argCount));
-      }
-
-      // -replace
-      else if (
-        (args[argCount].equalsIgnoreCase("-replace"))
-          || (args[argCount].equals("-R")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setReplaceReport(
-          Boolean.valueOf(getOptionValue(args, argCount)).booleanValue());
-      }
-
-      // -correlationType
-      else if (
-        (args[argCount].equalsIgnoreCase("-correlationType"))
-          || (args[argCount].equals("-C")))
-      {
-        argCount++;
-        analyzerConfigFromArgs.setCorrelationType(
-          getOptionValue(args, argCount));
-      }
-
-      // -wsdlElement
-      else if (
-        (args[argCount].equalsIgnoreCase("-wsdlElement"))
-          || (args[argCount].equals("-W")))
-      {
-        String optionName = args[argCount];
-        argCount++;
-
-        WSDLElement wsdlElement = new WSDLElementImpl();
-        wsdlElement.setName(getOptionValue(args, argCount, optionName));
-        argCount++;
-        wsdlElement.setType(getOptionValue(args, argCount, optionName));
-        argCount++;
-        wsdlElement.setNamespace(getOptionValue(args, argCount, optionName));
-        if (!args[argCount].startsWith("-"))
-        {
-          argCount++;
-          wsdlElement.setParentElementName(
-            getOptionValue(args, argCount, optionName));
-        }
-
-        if (wsdlReference != null)
-        {
-          wsdlReference.setWSDLElement(wsdlElement);
-        }
-        else if (uddiReference != null)
-        {
-          uddiReference.setWSDLElement(wsdlElement);
-        }
-        else
-        {
-          throw new IllegalArgumentException(
-            getMessage(
-              "config10",
-              "The -wsdlElement option must appear after the -wsdlURI or -uddiKey options."));
-        }
-
-        analyzerConfigFromArgs.setWSDLReference(wsdlReference);
-      }
-
-      // -serviceLocation
-      else if (
-        (args[argCount].equalsIgnoreCase("-serviceLocation"))
-          || (args[argCount].equals("-S")))
-      {
-        argCount++;
-
-        if (wsdlReference != null)
-        {
-          wsdlReference.setServiceLocation(getOptionValue(args, argCount));
-        }
-        else if (uddiReference != null)
-        {
-          uddiReference.setServiceLocation(getOptionValue(args, argCount));
-        }
-        else
-        {
-          throw new IllegalArgumentException(
-            getMessage(
-              "config11",
-              "The -serviceLocation option must appear after the -wsdlURI or -uddiKey options."));
-        }
-      }
-
-      // -wsdlURI
-      else if (
-        (args[argCount].equalsIgnoreCase("-wsdlURI"))
-          || (args[argCount].equals("-W")))
-      {
-        argCount++;
-        if (wsdlReference == null)
-          wsdlReference = new WSDLReferenceImpl();
-        wsdlReference.setWSDLLocation(getOptionValue(args, argCount));
-        analyzerConfigFromArgs.setWSDLReference(wsdlReference);
-      }
-
-      // -uddiKeyType
-      else if (
-        (args[argCount].equalsIgnoreCase("-uddiKeyType"))
-          || (args[argCount].equals("-K")))
-      {
-        argCount++;
-        if (uddiReference == null)
-          uddiReference = new UDDIReferenceImpl();
-        uddiReference.setKeyType(getOptionValue(args, argCount));
-        analyzerConfigFromArgs.setUDDIReference(uddiReference);
-      }
-
-      // -uddiKey
-      else if (
-        (args[argCount].equalsIgnoreCase("-uddiKey"))
-          || (args[argCount].equals("-k")))
-      {
-        argCount++;
-        if (uddiReference == null)
-          uddiReference = new UDDIReferenceImpl();
-        uddiReference.setKey(getOptionValue(args, argCount));
-        analyzerConfigFromArgs.setUDDIReference(uddiReference);
-      }
-
-      // -inquiryURL
-      else if (
-        (args[argCount].equalsIgnoreCase("-inquiryURL"))
-          || (args[argCount].equals("-i")))
-      {
-        argCount++;
-        if (uddiReference == null)
-          uddiReference = new UDDIReferenceImpl();
-        uddiReference.setInquiryURL(getOptionValue(args, argCount));
-        analyzerConfigFromArgs.setUDDIReference(uddiReference);
-      }
-
-      // ADD: Need to add support for other options (-config, -binding, etc.)
-      else
-      {
-        throw new IllegalArgumentException(
-          getMessage(
-            "config12",
-            args[argCount],
-            "The specified option is not supported:"));
-      }
-    }
-
-    // If addStyleSheet was not specified, then create a comment version of it
-    if (analyzerConfigFromArgs.getAddStyleSheet() == null)
-    {
-      AddStyleSheet addStyleSheet = new AddStyleSheetImpl();
-      addStyleSheet.setHref(WSIConstants.DEFAULT_REPORT_XSL);
-      addStyleSheet.setType(WSIConstants.DEFAULT_XSL_TYPE);
-      addStyleSheet.setComment(true);
-      analyzerConfigFromArgs.setAddStyleSheet(addStyleSheet);
-    }
-
-    // Merge config info into this object
-    setConfig(analyzerConfigFromArgs);
-
-    if (validate)
-    {  
-      // Verify that all required options were specified and 
-      // that the specified ones were correct
-      checkConfigOptions();
-    }
-  }
-
-  /**
-   * Verify config options.
-   */
-  private void checkConfigOptions() throws WSIException
-  {
-    String fileLocation;
-
-    // If wsdlReference and uddiReference specified, then throw exception
-    if ((this.isWSDLReferenceSet()) && (this.isUDDIReferenceSet()))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config04",
-          "Can not specify both the WSDL reference and UDDI reference options"));
-    }
-
-    // Check if test assertion file exists
-    if ((fileLocation = this.getTestAssertionsDocumentLocation()) == null)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config16",
-          "Test assertion document location must be specified."));
-    }
-
-    else if (!Utils.fileExists(fileLocation))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config14",
-          fileLocation,
-          "Could not find test assertion document.  Specified file location:"));
-    }
-
-    // Check if log file exists
-    if ((fileLocation = this.getLogLocation()) != null)
-    {
-      if (!Utils.fileExists(fileLocation))
-        throw new IllegalArgumentException(
-          messageList.getMessage(
-            "config02",
-            fileLocation,
-            "Could not find log file:"));
-    }
-
-    // Check if WSDL file exists
-    if ((this.getWSDLReference() != null)
-      && (fileLocation = this.getWSDLReference().getWSDLLocation()) != null)
-    {
-      if (!Utils.fileExists(fileLocation))
-        throw new IllegalArgumentException(
-          messageList.getMessage(
-            "config03",
-            fileLocation,
-            "Could not find WSDL file:"));
-    }
-
-    File file = null;
-    try
-    {
-      // Get file object for report file
-      file = new File(this.getReportLocation());
-    }
-
-    catch (Exception e)
-    {
-      throw new IllegalArgumentException(
-        messageList.getMessage(
-          "config17",
-          "Could not get report file location."));
-    }
-
-    // If replace flag is false and file exists, then throw exception
-    if (file.exists() && !this.getReplaceReport())
-    {
-      throw new IllegalArgumentException(
-        messageList.getMessage(
-          "config15",
-          "Report file already exists and replace option was not specified."));
-    }
-
-    if (correlationType != null
-      && !this.correlationType.equals(
-        WSIConstants.ATTRVAL_CORRELATION_TYPE_ENDPOINT)
-      && !this.correlationType.equals(
-        WSIConstants.ATTRVAL_CORRELATION_TYPE_NAMESPACE)
-      && !this.correlationType.equals(
-        WSIConstants.ATTRVAL_CORRELATION_TYPE_OPERATION))
-    {
-      throw new IllegalArgumentException(
-        messageList.getMessage(
-          "config18",
-          "Invalid correlation type specified."));
-    }
-  }
-
-  /**
-   * Get option value.
-   */
-  private String getOptionValue(String[] args, int index) throws WSIException
-  {
-    return getOptionValue(args, index, args[index - 1]);
-  }
-
-  /**
-   * Get option value.
-   */
-  private String getOptionValue(String[] args, int index, String optionName)
-    throws WSIException
-  {
-    // If index greater than array length, then throw exception
-    if (index >= args.length)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config13",
-          optionName,
-          "Option did not contain a value.  Specified option:"));
-    }
-
-    // If the value is an option (i.e. starts with a "-"), then throw exception
-    if (args[index].startsWith("-"))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config13",
-          optionName,
-          "Option did not contain a value.  Specified option:"));
-    }
-
-    return (args[index]);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(String messageID, String defaultMessage)
-  {
-    return getMessage(messageID, null, defaultMessage);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(
-    String messageID,
-    String messageData,
-    String defaultMessage)
-  {
-    String message = defaultMessage;
-    if (messageList != null)
-      message = messageList.getMessage(messageID, messageData, defaultMessage);
-    else if (messageData != null)
-      message += " " + messageData + ".";
-
-    return message;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java
deleted file mode 100644
index 1a4de86..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java
+++ /dev/null

@@ -1,559 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * This class is the implementation used to read the analyzer config documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class AnalyzerConfigReaderImpl implements AnalyzerConfigReader
-{
-  /**
-   * Message list.
-   */
-  protected MessageList messageList;
-
-  /**
-   * Document location.
-   */
-  protected String documentURI;
-
-  /**
-   * Initialize analyzer config reader.
-   */
-  public void init(MessageList messageList)
-  {
-    this.messageList = messageList;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader#readAnalyzerConfig(String)
-   */
-  public AnalyzerConfig readAnalyzerConfig(String analyzerConfigURI)
-    throws WSIException
-  {
-    FileReader fileReader = null;
-    try
-    {
-      fileReader = new FileReader(analyzerConfigURI);
-    }
-
-    catch (FileNotFoundException fnfe)
-    {
-      throw new WSIFileNotFoundException(
-        getMessage(
-          "config01",
-          analyzerConfigURI,
-          "Could not find analyzer config file: "),
-        fnfe);
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(
-        getMessage(
-          "config08",
-          analyzerConfigURI,
-          "Could not read analyzer config file: "),
-        e);
-    }
-
-    return readAnalyzerConfig(fileReader);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader#readAnalyzerConfig(Reader)
-   */
-  public AnalyzerConfig readAnalyzerConfig(Reader reader) throws WSIException
-  {
-    AnalyzerConfig analyzerConfig = new AnalyzerConfigImpl();
-
-    // Parse XML
-    Document doc = XMLUtils.parseXML(reader);
-
-    // Parse elements in the config document
-    parseConfigElement(analyzerConfig, doc.getDocumentElement());
-
-    return analyzerConfig;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentReader#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.documentURI;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentReader#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.documentURI = documentURI;
-  }
-
-  /**
-   * Parse config element.
-   */
-  private void parseConfigElement(
-    AnalyzerConfig analyzerConfig,
-    Element element)
-    throws WSIException
-  {
-    // ADD: Get name and version
-
-    // ADD: Verify that this is the config element
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // DEBUG:
-    //System.out.println("Element name: " + nextElement.getClass().getName());
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <description>
-      if (isElement(nextElement, WSIConstants.ELEM_DESCRIPTION))
-      {
-        analyzerConfig.setDescription(XMLUtils.getText(nextElement));
-      }
-
-      // <verbose>
-      else if (isElement(nextElement, WSIConstants.ELEM_VERBOSE))
-      {
-        analyzerConfig.setVerboseOption(
-          XMLUtils.getBooleanValue(nextElement, false));
-      }
-
-      // <assertionResults>
-      else if (isElement(nextElement, WSIConstants.ELEM_ASSERTION_RESULTS))
-      {
-        // Create assertion results option object
-        AssertionResultsOption assertionResultsOption =
-          new AssertionResultsOptionImpl();
-        analyzerConfig.setAssertionResultsOption(assertionResultsOption);
-
-        // Set result type
-        String resultType =
-          XMLUtils.getAttributeValue(nextElement, WSIConstants.ATTR_TYPE);
-        assertionResultsOption.setAssertionResultType(
-          AssertionResultType.newInstance(resultType));
-
-        // Set show log entry
-        assertionResultsOption.setShowMessageEntry(
-          XMLUtils.getBooleanValue(
-            nextElement,
-            WSIConstants.ATTR_MESSAGE_ENTRY,
-            assertionResultsOption.getShowMessageEntry()));
-
-        // Set show failure message
-        assertionResultsOption.setShowFailureMessage(
-          XMLUtils.getBooleanValue(
-            nextElement,
-            WSIConstants.ATTR_FAILURE_MESSAGE,
-            assertionResultsOption.getShowFailureMessage()));
-
-        // Set show failure detail
-        assertionResultsOption.setShowFailureDetail(
-          XMLUtils.getBooleanValue(
-            nextElement,
-            WSIConstants.ATTR_FAILURE_DETAIL,
-            assertionResultsOption.getShowFailureDetail()));
-
-        // REMOVE: Set show warning message
-        //assertionResultsOption.setShowWarningMessage(XMLUtils.getBooleanValue(nextElement, 
-        //      WSIConstants.ATTR_WARNING_MESSAGE, assertionResultsOption.getShowWarningMessage()));
-      }
-
-      // <reportFile>
-      else if (isElement(nextElement, WSIConstants.ELEM_REPORT_FILE))
-      {
-        parseReportFileElement(analyzerConfig, nextElement);
-      }
-
-      // <testAssertionFile>
-      else if (isElement(nextElement, WSIConstants.ELEM_TEST_ASSERTIONS_FILE))
-      {
-        analyzerConfig.setTestAssertionsDocumentLocation(
-          XMLUtils.getText(nextElement));
-      }
-
-      // <logFile>
-      else if (isElement(nextElement, WSIConstants.ELEM_LOG_FILE))
-      {
-        String correlationType =
-          XMLUtils.getAttributeValue(
-            nextElement,
-            WSIConstants.ATTR_CORRELATION_TYPE);
-        analyzerConfig.setCorrelationType(
-          correlationType == null ? "operation" : correlationType);
-        analyzerConfig.setLogLocation(XMLUtils.getText(nextElement));
-      }
-
-      // <wsdlReference>
-      else if (isElement(nextElement, WSIConstants.ELEM_WSDL_REFERENCE))
-      {
-        parseWsdlReference(analyzerConfig, nextElement);
-      }
-
-      // <uddiReference>
-      else if (isElement(nextElement, WSIConstants.ELEM_UDDI_REFERENCE))
-      {
-        parseUddiReference(analyzerConfig, nextElement);
-      }
-
-      else
-      {
-        // Throw exception
-        throw new IllegalArgumentException(
-          getMessage(
-            "config06",
-            nextElement.getLocalName(),
-            "Invalid analyzer config element:"));
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-  }
-
-  /**
-   * Parse reportFile element.
-   */
-  private void parseReportFileElement(
-    AnalyzerConfig analyzerConfig,
-    Element element)
-    throws WSIException
-  {
-    // Get report location and replace indicator
-    analyzerConfig.setReplaceReport(
-      XMLUtils.getBooleanValue(element, WSIConstants.ATTR_REPLACE, false));
-    analyzerConfig.setReportLocation(
-      XMLUtils.getAttributeValue(
-        element,
-        WSIConstants.ATTR_LOCATION,
-        WSIConstants.DEFAULT_REPORT_URI));
-
-    // ADD: If the report location wasn't specified, then throw an exception
-    //if (analyzerConfig.getReportLocation() == null)
-    //  throw new WSIException("The analyzer configuration file must contain the report file location.");
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <addStyleSheet>
-      if (isElement(nextElement, WSIConstants.ELEM_ADD_STYLE_SHEET))
-      {
-        AddStyleSheet addStyleSheet = new AddStyleSheetImpl();
-
-        // Parse the element  
-        TestUtils.parseAddStyleSheet(
-          nextElement,
-          addStyleSheet,
-          WSIConstants.DEFAULT_REPORT_XSL);
-
-        // Set add style sheet
-        analyzerConfig.setAddStyleSheet(addStyleSheet);
-      }
-
-      else
-      {
-        // Throw exception
-        throw new IllegalArgumentException(
-          getMessage(
-            "config06",
-            nextElement.getLocalName(),
-            "Invalid analyzer config element:"));
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-  }
-
-  /**
-   * Parse wsdl reference element.
-   */
-  private void parseWsdlReference(
-    AnalyzerConfig analyzerConfig,
-    Element element)
-    throws WSIException
-  {
-    // Create UDDI reference
-    WSDLReference wsdlReference = new WSDLReferenceImpl();
-
-    // Set WSDL reference
-    analyzerConfig.setWSDLReference(wsdlReference);
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <wsdlURI>
-      if (isElement(nextElement, WSIConstants.ELEM_WSDL_URI))
-      {
-        // Set WSDL location
-        wsdlReference.setWSDLLocation(XMLUtils.getText(nextElement));
-      }
-
-      // <serviceLocation>
-      else if (isElement(nextElement, WSIConstants.ELEM_SERVICE_LOCATION))
-      {
-        // Set service location
-        wsdlReference.setServiceLocation(XMLUtils.getText(nextElement));
-      }
-
-      // <wsdlElement>
-      else if (isElement(nextElement, WSIConstants.ELEM_WSDL_ELEMENT))
-      {
-        // Set WSDL element
-        wsdlReference.setWSDLElement(parseWsdlElement(nextElement));
-      }
-
-      else
-      {
-        // Throw exception
-        throw new IllegalArgumentException(
-          getMessage(
-            "config06",
-            nextElement.getLocalName(),
-            "Invalid analyzer config element:"));
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-
-    // If WSDL element or WSL URI not specified, then throw exception
-    if ((wsdlReference.getWSDLElement() == null)
-      || (wsdlReference.getWSDLLocation() == null))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config07",
-          "Both the <wsdlElement> and <wsdlURI> elements must be specified."));
-    }
-
-    // If type is port or operation, then parent element name must be specified
-    if (((wsdlReference
-      .getWSDLElement()
-      .getType()
-      .equalsIgnoreCase(EntryType.TYPE_DESCRIPTION_PORT))
-      || (wsdlReference
-        .getWSDLElement()
-        .getType()
-        .equalsIgnoreCase(EntryType.TYPE_DESCRIPTION_OPERATION)))
-      && (wsdlReference.getWSDLElement().getParentElementName() == null))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config09",
-          "The parentElementName attribute must be specified with a WSDL type of "
-            + EntryType.TYPE_DESCRIPTION_PORT
-            + " or "
-            + EntryType.TYPE_DESCRIPTION_OPERATION
-            + "."));
-    }
-  }
-
-  /**
-   * Parse uddi reference.
-   */
-  private void parseUddiReference(
-    AnalyzerConfig analyzerConfig,
-    Element element)
-    throws WSIException
-  {
-    // Create UDDI reference
-    UDDIReference uddiReference = new UDDIReferenceImpl();
-
-    // Set UDDI reference
-    analyzerConfig.setUDDIReference(uddiReference);
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <inquiryURL>
-      if (isElement(nextElement, WSIConstants.ELEM_INQUIRY_URL))
-      {
-        // Set inquiry URL
-        uddiReference.setInquiryURL(XMLUtils.getText(nextElement));
-      }
-
-      // <uddiKey>
-      else if (isElement(nextElement, WSIConstants.ELEM_UDDI_KEY))
-      {
-        // Set UDDI key and key type
-        uddiReference.setKey(XMLUtils.getText(nextElement));
-        uddiReference.setKeyType(
-          XMLUtils.getAttributeValue(nextElement, WSIConstants.ATTR_TYPE));
-      }
-
-      // <wsdlElement>
-      else if (isElement(nextElement, WSIConstants.ELEM_WSDL_ELEMENT))
-      {
-        // Set WSDL element
-        uddiReference.setWSDLElement(parseWsdlElement(nextElement));
-      }
-
-      // <serviceLocation>
-      else if (isElement(nextElement, WSIConstants.ELEM_SERVICE_LOCATION))
-      {
-        // Set service location
-        uddiReference.setServiceLocation(XMLUtils.getText(nextElement));
-      }
-
-      /* REMOVE:
-      // <wsdlElement>
-      else if (isElement(nextElement, WSIConstants.ELEM_WSDL_ELEMENT)) {
-        // Set service location
-        parseWsdlElement(analyzerConfig, nextElement);
-       }
-       */
-
-      else
-      {
-        // Throw exception
-        throw new IllegalArgumentException(
-          getMessage(
-            "config06",
-            nextElement.getLocalName(),
-            "Invalid analyzer config element:"));
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-  }
-
-  /**
-   * Parse WSDL element.
-   */
-  private WSDLElement parseWsdlElement(Element element) throws WSIException
-  {
-    WSDLElement wsdlElement = new WSDLElementImpl();
-
-    // Set type, namespace, parent element name and name
-    wsdlElement.setType(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_TYPE));
-    wsdlElement.setNamespace(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_NAMESPACE));
-    wsdlElement.setParentElementName(
-      XMLUtils.getAttributeValue(
-        element,
-        WSIConstants.ATTR_PARENT_ELEMENT_NAME));
-
-    String wsdlElementName = XMLUtils.getText(element);
-    if (wsdlElementName.equals(""))
-    {
-      // Throw exception
-      throw new IllegalArgumentException(
-        getMessage("config19", "The WSDL element name must be specified."));
-    }
-    wsdlElement.setName(wsdlElementName);
-
-    return wsdlElement;
-  }
-
-  /**
-   * Determine if this element matches specified local name in the analyzer config namespace.
-   */
-  private boolean isElement(Element element, String localName)
-  {
-    return isElement(
-      element,
-      getValidWSIAnalyzerConfigNamespaces(),
-      localName);
-  }
-
-  
-  static public List getValidWSIAnalyzerConfigNamespaces()
-  {
-  	ArrayList list = new ArrayList();
-  	list.add(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG_2003);
-  	list.add(WSIConstants.NS_URI_WSI_ANALYZER_CONFIG);
-  	return list;
-  }
-  
-  /**
-   * Determine if this element matches specified local name in the analyzer config namespace.
-   */
-  private boolean isElement(
-    Element element,
-    List namespaces,
-    String localName)
-  {
-    return XMLUtils.isElement(element, namespaces, localName);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(String messageID, String defaultMessage)
-  {
-    return getMessage(messageID, null, defaultMessage);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(
-    String messageID,
-    String messageData,
-    String defaultMessage)
-  {
-    String message = defaultMessage;
-    if (messageList != null)
-      message = messageList.getMessage(messageID, messageData, defaultMessage);
-    else
-      message += " " + messageData + ".";
-
-    return message;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java
deleted file mode 100644
index fbe3d0f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java
+++ /dev/null

@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-
-/**
- * This class contains the assertion results option definition.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class AssertionResultsOptionImpl implements AssertionResultsOption
-{
-  /**
-   * Assertion result type.
-   */
-  protected AssertionResultType resultType = AssertionResultType.ALL;
-
-  /**
-   * Show message entry indicator.
-   */
-  protected boolean showMessageEntry = true;
-
-  /**
-   * Show assertion description indicator.
-   */
-  protected boolean showAssertionDescription = false;
-
-  /**
-   * Show failure message indicator.
-   */
-  protected boolean showFailureMessage = true;
-
-  /**
-   * Show failure detail indicator.
-   */
-  protected boolean showFailureDetail = true;
-
-  /**
-   * Get assertion result type.
-   * @see #setAssertionResultType
-   */
-  public AssertionResultType getAssertionResultType()
-  {
-    return resultType;
-  }
-
-  /**
-   * Set assertion result type.
-   * @see #getAssertionResultType
-   */
-  public void setAssertionResultType(AssertionResultType resultType)
-  {
-    this.resultType = resultType;
-  }
-
-  /**
-   * Get show message entry indicator.
-   * @see #setShowMessageEntry
-   */
-  public boolean getShowMessageEntry()
-  {
-    return this.showMessageEntry;
-  }
-
-  /**
-   * Set show message entry indictor.
-   * @see #getShowMessageEntry
-   */
-  public void setShowMessageEntry(boolean showMessageEntry)
-  {
-    this.showMessageEntry = showMessageEntry;
-  }
-
-  /**
-   * Get show assertion description indicator.
-   * @see #setShowAssertionDescription
-   */
-  public boolean getShowAssertionDescription()
-  {
-    return this.showAssertionDescription;
-  }
-
-  /**
-   * Set show assertion description indictor.
-   * @see #getShowAssertionDescription
-   */
-  public void setShowAssertionDescription(boolean showAssertionDescription)
-  {
-    this.showAssertionDescription = showAssertionDescription;
-  }
-
-  /**
-   * Get show failure message indicator.
-   * @see #setShowFailureMessage
-   */
-  public boolean getShowFailureMessage()
-  {
-    return this.showFailureMessage;
-  }
-
-  /**
-   * Set show failure mesage indicator.
-   * @see #getShowFailureMessage
-   */
-  public void setShowFailureMessage(boolean showFailureMessage)
-  {
-    this.showFailureMessage = showFailureMessage;
-  }
-
-  /**
-   * Get show failure detail indicator.
-   * @see #setShowFailureDetail
-   */
-  public boolean getShowFailureDetail()
-  {
-    return this.showFailureDetail;
-  }
-
-  /**
-   * Set show failure detail indicator.
-   * @see #getShowFailureDetail
-   */
-  public void setShowFailureDetail(boolean showFailureDetail)
-  {
-    this.showFailureDetail = showFailureDetail;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("  Assertion Results:");
-    pw.println("    type ..................... " + this.resultType);
-    pw.println("    messageEntry ............. " + this.showMessageEntry);
-    pw.println(
-      "    assertionDescription ..... " + this.showAssertionDescription);
-    pw.println("    failureMessage ........... " + this.showFailureMessage);
-    pw.println("    failureDetail ............ " + this.showFailureDetail);
-
-    return sw.toString();
-  }
-
-  /**
-   * Get representation of this object as an XML string.
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Config options
-    pw.print("      <" + nsName + WSIConstants.ELEM_ASSERTION_RESULTS + " ");
-    pw.print(WSIConstants.ATTR_TYPE + "=\"" + getAssertionResultType() + "\" ");
-    pw.print(
-      WSIConstants.ATTR_MESSAGE_ENTRY + "=\"" + getShowMessageEntry() + "\" ");
-    pw.print(
-      WSIConstants.ATTR_ASSERTION_DESCRIPTION
-        + "=\""
-        + getShowAssertionDescription()
-        + "\" ");
-    pw.print(
-      WSIConstants.ATTR_FAILURE_MESSAGE
-        + "=\""
-        + getShowFailureMessage()
-        + "\" ");
-    pw.println(
-      WSIConstants.ATTR_FAILURE_DETAIL
-        + "=\""
-        + getShowFailureDetail()
-        + "\"/>");
-    // REMOVE:
-    //pw.println(WSIConstants.ATTR_WARNING_MESSAGE + "=\"" + getShowWarningMessage() + "\"/>");
-
-    return sw.toString();
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/UDDIReferenceImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/UDDIReferenceImpl.java
deleted file mode 100644
index 8dc7b6c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/UDDIReferenceImpl.java
+++ /dev/null

@@ -1,197 +0,0 @@
-/*******************************************************************************
- *
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-
-/**
- * The iimplementation for a reference to a discovery artifact.  
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class UDDIReferenceImpl implements UDDIReference
-{
-  /**
-   * UDDI key type.
-   */
-  protected String keyType = null;
-
-  /**
-   * UDDI key.
-   */
-  protected String key = null;
-
-  /**
-   * UDDI inquiry URL.
-   */
-  protected String inquiryURL = null;
-
-  /**
-   * WSDL element.
-   */
-  protected WSDLElement wsdlElement = null;
-
-  /**
-   * Service location.
-   */
-  protected String serviceLocation = null;
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference#getKeyType()
-   */
-  public String getKeyType()
-  {
-    return this.keyType;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference#setKeyType(String)
-   */
-  public void setKeyType(String keyType)
-  {
-    if (keyType.equals(BINDING_KEY) || keyType.equals(TMODEL_KEY))
-      this.keyType = keyType;
-    else
-      throw new IllegalArgumentException(
-        "Invalid UDDI key type: [" + keyType + "].");
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference#getKey()
-   */
-  public String getKey()
-  {
-    return this.key;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference#setKey(String)
-   */
-  public void setKey(String key)
-  {
-    this.key = key;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference#getInquiryURL()
-   */
-  public String getInquiryURL()
-  {
-    return this.inquiryURL;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference#setInquiryURL(String)
-   */
-  public void setInquiryURL(String inquiryURL)
-  {
-    this.inquiryURL = inquiryURL;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#getWSDLElement()
-   */
-  public WSDLElement getWSDLElement()
-  {
-    return this.wsdlElement;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#setWSDLElement(WSDLElement)
-   */
-  public void setWSDLElement(WSDLElement wsdlElement)
-  {
-    this.wsdlElement = wsdlElement;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#getServiceLocation()
-   */
-  public String getServiceLocation()
-  {
-    return this.serviceLocation;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#setServiceLocation()
-   */
-  public void setServiceLocation(String serviceLocation)
-  {
-    this.serviceLocation = serviceLocation;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("  UDDI Reference: ");
-    pw.println("    UDDI Key: ");
-    pw.println("      type ................... " + this.keyType);
-    pw.println("      key .................... " + this.key);
-    pw.println("    inquiryURL ............... " + this.inquiryURL);
-    if (this.serviceLocation != null)
-      pw.println("    serviceLocation .......... " + this.serviceLocation);
-    if (this.wsdlElement != null)
-      pw.print(this.wsdlElement.toString());
-
-    return sw.toString();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Element
-    pw.println("      <" + nsName + ELEM_NAME + ">");
-    pw.print("        <" + nsName + WSIConstants.ELEM_UDDI_KEY + " ");
-    pw.print(WSIConstants.ATTR_TYPE + "=\"" + getKeyType() + "\">");
-    pw.print(getKey());
-    pw.println("</" + nsName + WSIConstants.ELEM_UDDI_KEY + ">");
-    pw.print("        <" + nsName + WSIConstants.ELEM_INQUIRY_URL + ">");
-    pw.print(getInquiryURL());
-    pw.println("</" + nsName + WSIConstants.ELEM_INQUIRY_URL + ">");
-
-    if (this.wsdlElement != null)
-      pw.print(getWSDLElement().toXMLString(nsName));
-
-    if (this.serviceLocation != null)
-    {
-      pw.print("        <" + nsName + WSIConstants.ELEM_SERVICE_LOCATION + ">");
-      pw.print(getServiceLocation());
-      pw.println(
-        "        </" + nsName + WSIConstants.ELEM_SERVICE_LOCATION + ">");
-    }
-
-    pw.println("      </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java
deleted file mode 100644
index ff14b85..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-
-/**
- * The implementation for WSDL definitions. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class WSDLElementImpl implements WSDLElement
-{
-  protected String type;
-  protected String namespace;
-  protected String name;
-  protected String parentElementName;
-
-  /**
-   * @see #setType
-   */
-  public String getType()
-  {
-    return this.type;
-  }
-
-  /**
-   * @see #getType
-   */
-  public void setType(String type)
-  {
-    this.type = type;
-  }
-
-  /**
-   * @see #setNamespace
-   */
-  public String getNamespace()
-  {
-    return this.namespace;
-  }
-
-  /**
-   * @see #getNamespace
-   */
-  public void setNamespace(String namespace)
-  {
-    this.namespace = namespace;
-  }
-
-  /**
-   * @see #setName
-   */
-  public String getName()
-  {
-    return this.name;
-  }
-
-  /**
-   * @see #getName
-   */
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  public QName getQName()
-  {
-    return new QName(this.namespace, this.name);
-  }
-
-  /**
-   * Get WSDL parent element name.
-   * @see #setParentElementName
-  
-   */
-  public String getParentElementName()
-  {
-    return this.parentElementName;
-  }
-
-  /**
-   * Set WSDL parent element name.
-   * @see #getParentElementName
-   */
-  public void setParentElementName(String parentElementName)
-  {
-    this.parentElementName = parentElementName;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.analyzer.config.WSDLElement#getParentElementQName()
-   */
-  public QName getParentElementQName()
-  {
-    return new QName(this.namespace, this.parentElementName);
-  }
-
-  /**
-   * Is port element.
-   */
-  public boolean isPort()
-  {
-    return type.equals(EntryType.TYPE_DESCRIPTION_PORT);
-  }
-
-  /**
-   * Is binding element.
-   */
-  public boolean isBinding()
-  {
-    return type.equals(EntryType.TYPE_DESCRIPTION_BINDING);
-  }
-
-  /**
-   * Is portType element.
-   */
-  public boolean isPortType()
-  {
-    return type.equals(EntryType.TYPE_DESCRIPTION_PORTTYPE);
-  }
-
-  /**
-   * Is operation element.
-   */
-  public boolean isOperation()
-  {
-    return type.equals(EntryType.TYPE_DESCRIPTION_OPERATION);
-  }
-
-  /**
-   * Is message element.
-   */
-  public boolean isMessage()
-  {
-    return type.equals(EntryType.TYPE_DESCRIPTION_MESSAGE);
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("    WSDL Element: ");
-    pw.println("      type ................... " + this.type);
-    pw.println("      namespace .............. " + this.namespace);
-    pw.println("      name ................... " + this.name);
-
-    if (this.parentElementName != null)
-      pw.println("      parentElementName ...... " + this.parentElementName);
-
-    return sw.toString();
-  }
-
-  /**
-   * Get representation of this object as an XML string.
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Config options
-    pw.print("        <" + nsName + ELEM_NAME + " ");
-    pw.print(WSIConstants.ATTR_TYPE + "=\"" + getType() + "\" ");
-    pw.print(WSIConstants.ATTR_NAMESPACE + "=\"" + getNamespace() + "\" ");
-    if (this.parentElementName != null)
-      pw.print(
-        WSIConstants.ATTR_PARENT_ELEMENT_NAME
-          + "=\""
-          + getParentElementName()
-          + "\"");
-    pw.print(">");
-    pw.print(getName());
-    pw.println("</" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java
deleted file mode 100644
index 64bff43..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
-/**
- * The implementation for a reference to a description artifact.  
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class WSDLReferenceImpl implements WSDLReference
-{
-  /**
-   * WSDL element.
-   */
-  protected WSDLElement wsdlElement = null;
-
-  /**
-   * Service location.
-   */
-  protected String serviceLocation = null;
-
-  /**
-   * WSDL document location.
-   */
-  protected String wsdlLocation = null;
-
-  /**
-   * Default constructor.
-   */
-  public WSDLReferenceImpl()
-  {
-  }
-
-  /**
-   * Constructor with all settings.
-   * @param wsdlElement      a WSDL element.
-   * @param wsdlLocation     a WSDL document location.
-   * @param serviceLocation  a service location.
-   */
-  public WSDLReferenceImpl(
-    WSDLElement wsdlElement,
-    String wsdlLocation,
-    String serviceLocation)
-  {
-    this.wsdlElement = wsdlElement;
-    this.wsdlLocation = wsdlLocation;
-    this.serviceLocation = serviceLocation;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#getWSDLElement()
-   */
-  public WSDLElement getWSDLElement()
-  {
-    return this.wsdlElement;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#setWSDLElement(WSDLElement)
-   */
-  public void setWSDLElement(WSDLElement wsdlElement)
-  {
-    this.wsdlElement = wsdlElement;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#getWSDLLocation()
-   */
-  public String getWSDLLocation()
-  {
-    return this.wsdlLocation;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#setWSDLLocation()
-   */
-  public void setWSDLLocation(String wsdlLocation)
-  {
-    this.wsdlLocation = wsdlLocation;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#getServiceLocation()
-   */
-  public String getServiceLocation()
-  {
-    return this.serviceLocation;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference#setServiceLocation()
-   */
-  public void setServiceLocation(String serviceLocation)
-  {
-    this.serviceLocation = serviceLocation;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("  WSDL Reference:");
-    pw.print(this.wsdlElement.toString());
-    pw.println("    wsdlURI .................. " + this.wsdlLocation);
-    if (this.serviceLocation != null)
-      pw.println("  serviceLocation .......... " + this.serviceLocation);
-
-    return sw.toString();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Element
-    pw.println("      <" + nsName + ELEM_NAME + ">");
-    pw.print(getWSDLElement().toXMLString(nsName));
-    pw.print("        <" + nsName + WSIConstants.ELEM_WSDL_URI + ">");
-    pw.print(getWSDLLocation());
-    pw.println("</" + nsName + WSIConstants.ELEM_WSDL_URI + ">");
-
-    if (this.serviceLocation != null)
-    {
-      pw.print("        <" + nsName + WSIConstants.ELEM_SERVICE_LOCATION + ">");
-      pw.print(XMLUtils.xmlEscapedString(getServiceLocation()));
-      pw.println("</" + nsName + WSIConstants.ELEM_SERVICE_LOCATION + ">");
-    }
-
-    pw.println("      </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/AddStyleSheet.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/AddStyleSheet.java
deleted file mode 100644
index 0fdf7f9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/AddStyleSheet.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.common;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The interface for AddStyleSheet element. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface AddStyleSheet extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_ADD_STYLE_SHEET;
-
-  /**
-   * Get href.
-   * @return href.
-   * @see #setHref
-   */
-  public String getHref();
-
-  /**
-   * Set href.
-   * @param href a href.
-   * @see #getHref
-   */
-  public void setHref(String href);
-
-  /**
-   * Get type.
-   * @return type.
-   * @see #setType
-   */
-  public String getType();
-
-  /**
-   * Set type.
-   * @param type a type.
-   * @see #getType
-   */
-  public void setType(String type);
-
-  /**
-   * Get title.
-   * @return title.
-   * @see #setTitle
-   */
-  public String getTitle();
-
-  /**
-   * Set title.
-   * @param title a title.
-   * @see #getTitle
-   */
-  public void setTitle(String title);
-
-  /**
-   * Get media.
-   * @return media.
-   * @see #setMedia
-   */
-  public String getMedia();
-
-  /**
-   * Set title.
-   * @param media media.
-   * @see #getMedia
-   */
-  public void setMedia(String media);
-
-  /**
-   * Get charset.
-   * @return charset.
-   * @see #setCharset
-   */
-  public String getCharset();
-
-  /**
-   * Set charset.
-   * @param charset charset.
-   * @see #getCharset
-   */
-  public void setCharset(String charset);
-
-  /**
-   * Get alternate.
-   * @return alternate.
-   * @see #setAlternate
-   */
-  public String getAlternate();
-
-  /**
-   * Set alternate.
-   * @param alternate alternate.
-   * @see #getAlternate
-   */
-  public void setAlternate(String alternate);
-
-  /**
-   * Set if the style sheet declaration should be a comment.
-   * @param comment a boolean.
-   */
-  public void setComment(boolean comment);
-
-  /**
-   * Get style sheet declaration.
-   * @return style sheet declaration.
-   */
-  public String getStyleSheetString();
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java
deleted file mode 100644
index 9965d16..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java
+++ /dev/null

@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.common.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.TreeMap;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-
-/**
- * The implementation for AddStyleSheet element. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class AddStyleSheetImpl implements AddStyleSheet
-{
-  /**
-   * Attribute values.
-   */
-  protected TreeMap attributeValueList = new TreeMap();
-
-  /**
-   * List of attributes.
-   */
-  protected String[] attributeNameList =
-    {
-      WSIConstants.ATTR_HREF,
-      WSIConstants.ATTR_TYPE,
-      WSIConstants.ATTR_TITLE,
-      WSIConstants.ATTR_MEDIA,
-      WSIConstants.ATTR_CHARSET,
-      WSIConstants.ATTR_ALTERNATE };
-
-  /**
-   * Set if the style sheet declaration should be a comment.
-   */
-  protected boolean comment = false;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getHref()
-   */
-  public String getHref()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_HREF);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setHref(String)
-   */
-  public void setHref(String href)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_HREF, href);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getType()
-   */
-  public String getType()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_TYPE);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setType(String)
-   */
-  public void setType(String type)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_TYPE, type);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getTitle()
-   */
-  public String getTitle()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_TITLE);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setTitle(String)
-   */
-  public void setTitle(String title)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_TITLE, title);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getMedia()
-   */
-  public String getMedia()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_MEDIA);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setMedia(String)
-   */
-  public void setMedia(String media)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_MEDIA, media);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getCharset()
-   */
-  public String getCharset()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_CHARSET);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setCharset(String)
-   */
-  public void setCharset(String charset)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_CHARSET, charset);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getAlternate()
-   */
-  public String getAlternate()
-  {
-    return (String) this.attributeValueList.get(WSIConstants.ATTR_ALTERNATE);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#setAlternate(String)
-   */
-  public void setAlternate(String alternate)
-  {
-    this.attributeValueList.put(WSIConstants.ATTR_ALTERNATE, alternate);
-  }
-
-  /* (non-Javadoc)
-   * Set if the style sheet declaration should be a comment.
-   */
-  public void setComment(boolean comment)
-  {
-    this.comment = comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.common.AddStyleSheet#getStyleSheetString()
-   */
-  public String getStyleSheetString()
-  {
-    StringBuffer styleSheet = new StringBuffer();
-
-    if (comment)
-      styleSheet.append("<!-- ");
-
-    styleSheet.append("<?xml-stylesheet");
-
-    String value;
-    for (int i = 0; i < attributeNameList.length; i++)
-    {
-      if ((value = (String) attributeValueList.get(attributeNameList[i]))
-        != null)
-        styleSheet.append(" " + attributeNameList[i] + "=\"" + value + "\"");
-    }
-
-    // End element
-    styleSheet.append(" ?>");
-
-    if (comment)
-      styleSheet.append(" -->");
-
-    return styleSheet.toString();
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    return getStyleSheetString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Config options
-    pw.print("      <" + nsName + ELEM_NAME + " ");
-    pw.print(WSIConstants.ATTR_HREF + "=\"" + getHref() + "\" ");
-    pw.print(WSIConstants.ATTR_TYPE + "=\"" + getType() + "\" ");
-    if (getTitle() != null)
-      pw.print(WSIConstants.ATTR_TITLE + "=\"" + getTitle() + "\" ");
-    if (getMedia() != null)
-      pw.print(WSIConstants.ATTR_MEDIA + "=\"" + getMedia() + "\" ");
-    if (getCharset() != null)
-      pw.print(WSIConstants.ATTR_CHARSET + "=\"" + getCharset() + "\" ");
-    if (getAlternate() != null)
-      pw.print(WSIConstants.ATTR_ALTERNATE + "=\"" + getAlternate() + "\" ");
-    pw.println("/>");
-
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentElement.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentElement.java
deleted file mode 100644
index c96d278..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentElement.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.document;
-
-/**
- * Defines the interface used for all Conformance XML documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface DocumentElement
-{
-  /**
-   * Return XML string representation of this object.
-   * @param namespaceName  a namespace prefix.
-   * @return XML string representation of this object.
-   */
-  public String toXMLString(String namespaceName);
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentFactory.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentFactory.java
deleted file mode 100644
index 98e90cc..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentFactory.java
+++ /dev/null

@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.document;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.LogReader;
-import org.eclipse.wst.wsi.internal.core.log.LogWriter;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertionsReader;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.report.ReportWriter;
-import org.eclipse.wst.wsi.internal.core.util.WSIProperties;
-
-/**
- * This abstract class defines the factory interface that can be used to 
- * read and write all of the Conformance XML documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public abstract class DocumentFactory
-{
-  /**
-   * Get a new instance of a DocumentFactory.
-   * @return a new instance of a DocumentFactory.
-   * @throws WSIException if problems occur during creation.
-   */
-  public static DocumentFactory newInstance() throws WSIException
-  {
-    // Return instance of factory
-    return newInstance(getFactoryClassName());
-  }
-
-  /**
-   * Get a new instance of a DocumentFactory using the specified
-   * factory class name.
-   * @param factoryClassName factory class name.
-   * @return a new instance of a DocumentFactory.
-   * @throws WSIException if problems occur during creation.
-   */
-  public static DocumentFactory newInstance(String factoryClassName)
-    throws WSIException
-  {
-    DocumentFactory documentFactory = null;
-
-    // If a factory class name was specified, then create object
-    if (factoryClassName != null)
-    {
-      try
-      {
-        // Get class object
-        Class factoryClass = Class.forName(factoryClassName);
-
-        // Create new factory
-        documentFactory = (DocumentFactory) factoryClass.newInstance();
-      }
-
-      catch (Exception e)
-      {
-        throw new WSIException(
-          "Could not instantiate document factory class: "
-            + factoryClassName
-            + ".",
-          e);
-      }
-    }
-    else
-    {
-      throw new WSIException("A WSIDocumentFactory implementation class was not found.");
-    }
-
-    // Return factory
-    return documentFactory;
-  }
-
-  // DOCUMENT TYPES
-
-  /**
-   * Create log file.
-   * @return log file.
-   */
-  public abstract Log newLog();
-
-  /**
-   * Create monitor config.
-   * @return newly created monitor config.
-   */
-  public abstract MonitorConfig newMonitorConfig();
-
-  /**
-   * Create analyzer config.
-   * @return newly created analyzer config.
-   */
-  public abstract AnalyzerConfig newAnalyzerConfig();
-
-  /**
-   * Create profile assertions.
-   * @return newly created profile assertions.
-   */
-  public abstract ProfileAssertions newProfileAssertions();
-
-  /**
-   * Create report.
-   * @return newly created report.
-   */
-  public abstract Report newReport();
-
-  // READERS
-
-  /**
-   * Create profile assertions reader.
-   * @return newly created profile assertions reader.
-   */
-  public abstract ProfileAssertionsReader newProfileAssertionsReader();
-
-  /**
-   * Create monitor config reader.
-   * @return newly created monitor config reader.
-   */
-  public abstract MonitorConfigReader newMonitorConfigReader();
-
-  /**
-   * Create analyzer config reader.
-   * @return newly created analyzer config reader.
-   */
-  public abstract AnalyzerConfigReader newAnalyzerConfigReader();
-
-  /**
-   * Create log reader.
-   * @return newly created log reader.
-   */
-  public abstract LogReader newLogReader();
-
-  // ADD: Add other readers
-
-  // WRITERS
-
-  /**
-   * Create report writer.
-   * @return newly created report writer.
-   */
-  public abstract ReportWriter newReportWriter();
-
-  /**
-   * Create log writer.
-   * @return newly created log writer.
-   */
-  public abstract LogWriter newLogWriter();
-
-  // ADD: Add other writers
-
-  /**
-   * Find the factory class name which can be specified as a Java property.
-   */
-  private static String getFactoryClassName()
-  {
-    // Get property value
-    return WSIProperties.getProperty(
-      WSIProperties.PROP_DOCUMENT_FACTORY,
-      WSIProperties.DEF_DOCUMENT_FACTORY);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentReader.java
deleted file mode 100644
index 387ce53..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentReader.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.document;
-
-/**
- * Defines the interface used to read the Conformance XML documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface DocumentReader
-{
-  /**
-   * Get document location.
-   * @return document location.
-   * @see #setLocation
-   */
-  public String getLocation();
-
-  /**
-   * Set document location.
-   * @param documentURI document location.
-   * @see #getLocation
-   */
-  public void setLocation(String documentURI);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java
deleted file mode 100644
index 9c88926..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.document;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.w3c.dom.Document;
-
-/**
- * Defines the interface used to write the Conformance XML documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface DocumentWriter
-{
-  /**
-   * Get the Document object associated with this Conformance document.
-   * @return the Document object associated with this Conformance document.
-   * @throws UnsupportedOperationException if operation is not supported.
-   */
-  public Document getDocument() throws UnsupportedOperationException;
-
-  /**
-   * Set writer.
-   * @param documentLocation the location of the document.
-   * @throws IOException if failed or interrupted I/O operations. 
-   */
-  public void setWriter(String documentLocation) throws IOException;
-
-  /**
-   * Write out only a part of a document to the location
-   * that was previously set using the setLocation method.
-   * @param reader a Reader object.
-   * @throws WSIException if there is trouble writing out the document.
-   * @throws IllegalStateException if this operation has been invoked 
-   *         at an illegal or inappropriate time.
-   */
-  public void write(Reader reader) throws WSIException, IllegalStateException;
-
-  /**
-   * Write out only a part of a document.
-   * @param reader a Reader object.
-   * @param writer a Writer object.
-   * @throws WSIException if there is trouble writing out the document.
-   */
-  public void write(Reader reader, Writer writer) throws WSIException;
-
-  /**
-   * Close writer.
-   * @throws WSIException if there is trouble closing the writer.
-   * @throws IllegalStateException if this operation has been invoked 
-   *         at an illegal or inappropriate time.
-   */
-  public void close() throws WSIException, IllegalStateException;
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/WSIDocument.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/WSIDocument.java
deleted file mode 100644
index b8db0d7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/WSIDocument.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.document;
-
-/**
- * Defines the interface used for all Conformance XML documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface WSIDocument extends DocumentElement
-{
-  /**
-   * Get the location of the document.
-   * @return the location of the document.
-   * @see #setLocation
-   */
-  public String getLocation();
-
-  /**
-   * Set the location of the document.
-   * @param documentURI the location of the document.
-   * @see #getLocation
-   */
-  public void setLocation(String documentURI);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentFactoryImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentFactoryImpl.java
deleted file mode 100644
index f18c74d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentFactoryImpl.java
+++ /dev/null

@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.document.impl;
-
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfigReader;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.AnalyzerConfigImpl;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.AnalyzerConfigReaderImpl;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.LogReader;
-import org.eclipse.wst.wsi.internal.core.log.LogWriter;
-import org.eclipse.wst.wsi.internal.core.log.impl.LogImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.LogReaderImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.LogWriterImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader;
-import org.eclipse.wst.wsi.internal.core.monitor.config.impl.MonitorConfigImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.impl.MonitorConfigReaderImpl;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertionsReader;
-import org.eclipse.wst.wsi.internal.core.profile.impl.ProfileAssertionsImpl;
-import org.eclipse.wst.wsi.internal.core.profile.impl.ProfileAssertionsReaderImpl;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.report.ReportWriter;
-import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl;
-import org.eclipse.wst.wsi.internal.core.report.impl.ReportWriterImpl;
-
-/**
- * This is the implementation of the Conformance document factory which provides access to
- * implementations of the documents, readers and writers. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class DocumentFactoryImpl extends DocumentFactory
-{
-  /**
-   * Document factory implementation.
-   */
-  public DocumentFactoryImpl()
-  {
-  }
-
-  /**
-   * Create log file.
-   */
-  public Log newLog()
-  {
-    return new LogImpl();
-  }
-
-  /**
-   * Create monitor config.
-   */
-  public MonitorConfig newMonitorConfig()
-  {
-    return new MonitorConfigImpl();
-  }
-
-  /**
-   * Create analyzer config.
-   */
-  public AnalyzerConfig newAnalyzerConfig()
-  {
-    return new AnalyzerConfigImpl();
-  }
-
-  /**
-   * Create profile assertions.
-   */
-  public ProfileAssertions newProfileAssertions()
-  {
-    return new ProfileAssertionsImpl();
-  }
-
-  /**
-   * Create report.
-   */
-  public Report newReport()
-  {
-    return new ReportImpl();
-  }
-
-  /**
-   * Create monitor config reader.
-   */
-  public MonitorConfigReader newMonitorConfigReader()
-  {
-    return new MonitorConfigReaderImpl();
-  }
-
-  /**
-   * Create analyzer config reader.
-   */
-  public AnalyzerConfigReader newAnalyzerConfigReader()
-  {
-    return new AnalyzerConfigReaderImpl();
-  }
-
-  /**
-   * Create profile assertions reader.
-   */
-  public ProfileAssertionsReader newProfileAssertionsReader()
-  {
-    // Return implementation
-    return new ProfileAssertionsReaderImpl();
-  }
-
-  /**
-   * Create log reader.
-   */
-  public LogReader newLogReader()
-  {
-    // Return implementation
-    return new LogReaderImpl();
-  }
-
-  // WRITERS
-
-  /**
-   * Create log writer.
-   */
-  public LogWriter newLogWriter()
-  {
-    return new LogWriterImpl();
-  }
-
-  /**
-   * Create a new instance of a DocumentReader.
-   */
-  public ReportWriter newReportWriter()
-  {
-    // Return implementation
-    return new ReportWriterImpl();
-  }
-
-  /**
-   * Find the factory class name which can be specified as a Java property.
-   */
-  //private static String getFactoryClassName()
-  //{
-  //  // Get property value
-  //  return WSIProperties.getProperty(
-  //    WSIProperties.PROP_DOCUMENT_FACTORY,
-  //    WSIProperties.DEF_DOCUMENT_FACTORY);
-  //}
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java
deleted file mode 100644
index a61e6d1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Beacon Information Technology Inc. and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   BeaconIT - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.document.impl;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentWriter;
-import org.w3c.dom.Document;
-
-/**
- * Defines the implementation used to write the Conformance XML 
- * documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public abstract class DocumentWriterImpl implements DocumentWriter
-{
-  /**
-   * Document writer.
-   */
-  protected Writer writer = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#getDocument()
-   */
-  public Document getDocument() throws UnsupportedOperationException
-  {
-    // ADD:
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#setWriter(String)
-   */
-  public void setWriter(String documentLocation)
-    throws UnsupportedEncodingException, FileNotFoundException
-  {
-    // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT 
-    this.writer =
-      new PrintWriter(
-        new OutputStreamWriter(
-          new FileOutputStream(documentLocation),
-          "UTF-8"));
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#write(Reader)
-   */
-  public synchronized void write(Reader reader)
-    throws WSIException, IllegalStateException
-  {
-    // If the writer was not specified, then throw an exception
-    if (writer == null)
-      throw new IllegalStateException("Could not write document since writer was not set.");
-
-    write(reader, writer);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#write(Reader, Writer)
-   */
-  public synchronized void write(Reader reader, Writer writer)
-    throws WSIException
-  {
-    // Create buffered reader
-    BufferedReader bufReader = new BufferedReader(reader);
-
-    // Create print writer
-    PrintWriter printWriter = new PrintWriter(writer);
-
-    String nextLine = null;
-
-    try
-    {
-      // Read each line from the reader
-      while ((nextLine = bufReader.readLine()) != null)
-      {
-        // Write text and flush stream
-        printWriter.println(nextLine);
-      }
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException("Could not write document.", e);
-    }
-
-    // Flush and close the writer
-    printWriter.flush();
-    //printWriter.close();    
-  }
-
-  /**
-   * Close writer.
-   */
-  public void close() throws WSIException, IllegalStateException
-  {
-    // If the writer was not specified, then throw an exception
-    if (writer == null)
-      throw new IllegalStateException("Could not write log file since writer was not set.");
-
-    try
-    {
-      // Close the writer
-      writer.close();
-    }
-
-    catch (IOException ioe)
-    {
-      throw new WSIException(ioe.toString(), ioe);
-    }
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java
deleted file mode 100644
index 4c586b7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log;
-
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
-
-/**
- * The interface for the message log file.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface Log extends WSIDocument
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_LOG;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_LOG, ELEM_NAME);
-
-  /**
-   * Add message to log file.  The message will contain both 
-   * transport and content information.
-   * @param logEntry message containing both transport and content information.
-   * @throws WSIException if problems occur adding the message to log file.
-   */
-  public void addLogEntry(MessageEntry logEntry) throws WSIException;
-
-  /**
-   * Get the number of log entries.
-   * @return the number of log entries. 
-   */
-  public int getEntryCount();
-
-  /**
-   * Get a specific log file entry. 
-   * @param index index into log entries.
-   * @return log file entry at specified index.
-   */
-  public MessageEntry getLogEntry(int index);
-
-  /**
-   * Get log entry list.
-   * @return list of log entries.
-   */
-  public Vector getLogEntryList();
-
-  /**
-   * Get last log entry.
-   * @return ast log entry.
-   */
-  public MessageEntry getLastLogEntry();
-
-  /**
-   * Create log entry object.
-   * @return newly created log entry.
-   */
-  public MessageEntry createLogEntry();
-
-  /**
-   * Set style sheet string.
-   * @param styleSheetString a style sheet string.
-   */
-  public void setStyleSheetString(String styleSheetString);
-
-  /**
-   * Get start element string.
-   * @param namespaceName a namespace prefix.
-   * @return start element string.
-   */
-  public String getStartXMLString(String namespaceName);
-
-  /**
-   * Get end element string.
-   * @param namespaceName a namespace prefix.
-   * @return end element string. 
-   */
-  public String getEndXMLString(String namespaceName);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java
deleted file mode 100644
index cd60128..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log;
-
-import java.io.Reader;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-
-/**
- * Defines the interface used to read the Log file.
- * 
- * @version 1.0.1
- * @author Neil Delima (nddelima@ca.ibm.com)
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface LogReader extends DocumentReader
-{
-  /**
-   * Start reading log entries from a specified URI location using the specified callback.
-   * 
-   * @param logURI the location of the log file.
-   * @param logEntryHandler the function that will be called to process each log entry.
-   * @throws WSIException if problem reading log.
-   */
-  public void readLog(String logURI, MessageEntryHandler logEntryHandler)
-    throws WSIException;
-
-  /**
-   * Start reading log entries from a reader using the specified callback.
-   * 
-   * @param reader the source for the log file.
-   * @param logEntryHandler the function that will be called to process each log entry.
-   * @throws WSIException if problem reading log.
-   */
-  public void readLog(Reader reader, MessageEntryHandler logEntryHandler)
-    throws WSIException;
-
-  // ADD: Do we need to add functions that will read the entire log file?
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java
deleted file mode 100644
index e8e33e8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log;
-
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentWriter;
-
-/**
- * Defines the interface used to write the Log file.
- * 
- * @version 1.0.1
- * @author Neil Delima (nddelima@ca.ibm.com)
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface LogWriter extends DocumentWriter
-{
-  /**
-   * Write the entire contents of the document using the location
-   * that was previously set using the setLocation method.
-   * @param log the Log object.
-   * @throws IllegalStateException if this operation has been invoked 
-   *         at an illegal or inappropriate time
-   * @throws WSIException if problems occur during the writing of 
-   *         the log.
-   */
-  public void write(Log log) throws IllegalStateException, WSIException;
-
-  /**
-   * Write the entire contents of the document.
-   * @param log the Log object.
-   * @param writer a Writer object.
-   * @throws WSIException if problems occur during the writing of 
-   *         the log.
-   */
-  public void write(Log log, Writer writer) throws WSIException;
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MessageEntry.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MessageEntry.java
deleted file mode 100644
index 1b58ff3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MessageEntry.java
+++ /dev/null

@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-/**
-* Message entry interface.
-*
-* @version 1.0.1
-* @author Peter Brittenham (peterbr@us.ibm.com)
-*/
-public interface MessageEntry extends DocumentElement
-{
- /**
-  * Element name.
-  */
- public static final String ELEM_NAME = WSIConstants.ELEM_MESSAGE_ENTRY;
-
- /**
-  * QName.
-  */
- public static final QName QNAME =
-   new QName(WSIConstants.NS_URI_WSI_LOG, ELEM_NAME);
-
- /**
-  * Type of log entry.
-  */
- public static final String TYPE_REQUEST = "request";
- public static final String TYPE_RESPONSE = "response";
-
- /**
-  * Gets the id.
-  * @return the id.
-  * @see #setId
-  */
- public String getId();
-
- /**
-  * Sets the id.
-  * @param id the identifier for the log entry.
-  * @see #getId
-  */
- public void setId(String id);
-
- /**
-  * Gets the conversation id.
-  * @return the conversation id.
-  * @see #setConversationId
-  */
- public String getConversationId();
-
- /**
-  * Sets the conversation id.
-  * @param conversationId the conversation id.
-  * @see #getConversationId
-  */
- public void setConversationId(String conversationId);
-
- /**
-  * Gets the timestamp.
-  * @return the timestamp.
-  * @see #setTimestamp
-  */
- public String getTimestamp();
-
- /**
-  * Sets the timestamp.
-  * @param timestamp the timestamp.
-  * @see #getTimestamp
-  */
- public void setTimestamp(String timestamp);
-
- /**
-  * Gets the type.
-  * @return the type.
-  * @see #setType
-  */
- public String getType();
-
- /**
-  * Sets the type.
-  * @param type the type.
-  * @see #getType
-  */
- public void setType(String type);
-
- /**
-  * Gets the sender host and port.
-  * @return  the sender host and port.
-  * @see #setSenderHostAndPort
-  */
- public String getSenderHostAndPort();
-
- /**
-  * Sets the sender host and port.
-  * @param senderHostAndPort the sender host and port.
-  * @see #getSenderHostAndPort
-  */
- public void setSenderHostAndPort(String senderHostAndPort);
-
- /**
-  * Gets the receiver host and port.
-  * @return the receiver host and port.
-  * @see #setReceiverHostAndPort
-  */
- public String getReceiverHostAndPort();
-
- /**
-  * Sets the receiver host and port.
-  * @param receiverHostAndPort the receiver host and port.
-  * @see #getReceiverHostAndPort
-  */
- public void setReceiverHostAndPort(String receiverHostAndPort);
-
- /**
-  * Gets the message.
-  * @return the message.
-  * @see #setMessage
-  */
- public String getMessage();
-
- /**
-  * Sets the message.
-  * @param message the message.
-  * @see #getMessage
-  */
- public void setMessage(String message);
-
- /**
-  * Sets the encoding.
-  * @param encoding the encoding.
-  * @see #getMessage
-  */
- public void setEncoding(String encoding);
-
- /**
-  * Gets the BOM.
-  * @return the BOM.
-  * @see #setBOM
-  */
- public int getBOM();
-
- /**
-  * Sets the BOM.
-  * @param bom the BOM.
-  * @see #getBOM
-  */
- public void setBOM(int bom);
-
- /**
-  * Gets the HTTP headers.
-  * @return the HTTP headers.
-  * @see #setHTTPHeaders
-  */
- public String getHTTPHeaders();
-
- /**
-  * Sets the HTTP headers.
-  * @param httpHeaders the HTTP headers.
-  * @see #getHTTPHeaders
-  */
- public void setHTTPHeaders(String httpHeaders);
-
- /**
-  * Gets element location.
-  * @return element location.
-  * @see #setElementLocation
-  */
- public ElementLocation getElementLocation();
-
- /**
-  * Sets element location.
-  * @param elementLocation element location.
-  * @see #getElementLocation
-  */
- public void setElementLocation(ElementLocation elementLocation);
- 
- /**
-  * If content is MIME type returns true, otherwise false  
-  * @return if content is MIME type returns true, otherwise false
-  */
- public boolean isMimeContent();
- 
- /**
-  * Set flag to determine if content is MIME type. 
-  * @param isMimeContent a booolean value
-  */
- public void setMimeContent(boolean isMimeContent);
-
- /**
-  * Returns array of the MIME parts of the message.
-  * @return array of the MIME parts of the message.
-  * @see #isMIMEContent() 
-  */
- public MimeParts getMimeParts();
- 
- /**
-  * Sets the MIME parts of the message.
-  * @param mimeParts he MIME parts of the message.
-  * @see #getMimeParts
-  */
- public void setMimeParts(MimeParts mimeParts);
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MessageEntryHandler.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MessageEntryHandler.java
deleted file mode 100644
index 0401e2a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MessageEntryHandler.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
-
-/**
- * Defines the interface for the MessageEntry handler.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Graham Turrell (gturrell@uk.ibm.com)
- */
-public interface MessageEntryHandler
-{
-  /**
-   * Process artifact reference.
-   * @param artifactReference artifact reference.
-   * @throws WSIException if problems occur while processing artifact reference.
-   */
-  public void processArtifactReference(ArtifactReference artifactReference)
-    throws WSIException;
-
-  /**
-   * Process a single log entry.
-   * @param entryContext a single log entry.
-   * @throws WSIException if problems occur while processing a single log entry.
-  
-   */
-  public void processLogEntry(EntryContext entryContext) throws WSIException;
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MimePart.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MimePart.java
deleted file mode 100644
index ae68791..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MimePart.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*
- * Created on Nov 22, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.wsi.internal.core.log;
-
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * @author lauzond
- * 
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
- */
-public interface MimePart extends DocumentElement {
-
-	/**
-	 * Gets the content for the mime part.
-	 * 
-	 * @return the mime content.
-	 * @see #setContent
-	 */
-	public String getContent();
-
-	/**
-	 * Sets the content for the mime part.
-	 * 
-	 * @param mimeContent
-	 *            the mime content.
-	 * @see #getContent
-	 */
-	public void setContent(String mimeContent);
-
-	/**
-	 * Gets the headers for the mime part.
-	 * 
-	 * @return the mime headers.
-	 * @see #setMimeHeaders
-	 */
-	public String getHeaders();
-
-	/**
-	 * Sets the headers for the mime part.
-	 * 
-	 * @param mimeHeaders
-	 *            the mime headers.
-	 * @see #getHeaders
-	 */
-	public void setHeaders(String mimeHeaders);
-
-	/**
-	 * Gets the boundary strings for the mime part. Note that the last part of a
-	 * multipart/ related message will have 2 boundary strings. All other parts
-	 * will have one.
-	 * 
-	 * @return the boundary strings.
-	 * @see #setBoundaryStrings
-	 */
-	public String[] getBoundaryStrings();
-
-	/**
-	 * Sets the boundary strings for the mime part. Note that the last part of a
-	 * multipart/ related message will have 2 boundary strings. All other parts
-	 * will have one.
-	 * 
-	 * @param boundaryStrings
-	 *            the boundary strings.
-	 * @see #getBoundaryStrings
-	 */
-	public void setBoundaryStrings(String[] mimeHeaders);
-
-	public String toXMLString(String namespaceName);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MimeParts.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MimeParts.java
deleted file mode 100644
index cce3f1c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/MimeParts.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log;
-
-import java.util.Collection;
-
-/**
- * Mime parts interface.
- *
- * @version 1.0.1
- * @author David Lauzon (lauzond@ca.ibm.com)
- */
-public interface MimeParts
-{
-  /**
-   * Returns the start attribute value from the .
-   * @return the he start attribute value.
-   * @see #setRootPart
-   */
-  /**
-   * Returns the root part, otherwise null.
-   * @return the root part.
-   * @see #setRootPart
-   */
-  public MimePart getRootPart();
-
-  /**
-   * Sets the root part.
-   * @param rootPart the root part.
-   * @see #getRootPart
-   */
-  public void setRootPart(MimePart rootPart);
-
-  /**
-   * Returns the number of parts.
-   * @return the number of parts.
-   */
-  public int count();
-
-  /**
-   * Gets the conversation id.
-   * @return the conversation id.
-   * @see #setConversationId
-   */
-  public void addPart(MimePart part);
-
-  /**
-   * Returns a list of mime parts.
-   * @return a list of mime parts.
-   */
-  public Collection getParts();
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java
deleted file mode 100644
index 02d78ad..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * This class represents the message log file.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class LogImpl implements Log
-{
-  /**
-   * Log URI.
-   */
-  protected String logURI = null;
-
-  /**
-   * Start time stamp.
-   */
-  protected String startTimestamp = null;
-
-  /**
-   * Log entries.
-   */
-  protected Vector logEntryList = new Vector();
-
-  /**
-   * Last log entry.
-   */
-  protected MessageEntry lastLogEntry = null;
-
-  /**
-   * Log title.
-   */
-  // ADD: Should we provide a way to set the log title?
-  protected String logTitle = "Message Log File";
-
-  /**
-   * Style sheet string.
-   */
-  protected String styleSheetString = null;
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.Log#addLogEntry(LogEntry)
-   */
-  public void addLogEntry(MessageEntry logEntry) throws WSIException
-  {
-    // Save last log entry
-    lastLogEntry = logEntry;
-
-    // Add log entry
-    logEntryList.add(logEntry);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.Log#getEntryCount()
-   */
-  public int getEntryCount()
-  {
-    return logEntryList.size();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.Log#getLogEntry(int)
-   */
-  public MessageEntry getLogEntry(int index)
-  {
-    return (MessageEntry) logEntryList.elementAt(index);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.Log#getLogEntryList()
-   */
-  public Vector getLogEntryList()
-  {
-    return logEntryList;
-  }
-
-  /**
-   * Get last log entry.
-   */
-  public MessageEntry getLastLogEntry()
-  {
-    return lastLogEntry;
-  }
-
-  /**
-   * Create log entry object.
-   */
-  public MessageEntry createLogEntry()
-  {
-    return new MessageEntryImpl();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.WSIDocument#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.logURI;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.WSIDocument#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.logURI = documentURI;
-  }
-
-  /**
-   * Set style sheet string.
-   */
-  public void setStyleSheetString(String styleSheetString)
-  {
-    this.styleSheetString = styleSheetString;
-  }
-
-  /**
-   * Get start element string. 
-   */
-  public String getStartXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Create report element 
-    pw.println(WSIConstants.XML_DECL);
-    if (this.styleSheetString != null)
-      pw.println(this.styleSheetString);
-
-    // Add XML comment
-    String comment;
-    if ((comment = TestUtils.getXMLComment()) != null)
-      pw.print(comment);
-
-    // Log
-    pw.print("<" + nsName + ELEM_NAME);
-
-    // REMOVED: No longer required by the monitor spec
-    //pw.print(" " + WSIConstants.ATTR_NAME + "=\"" + logTitle + "\"");
-    pw.println(
-      " " + WSIConstants.ATTR_TIMESTAMP + "=\"" + Utils.getTimestamp() + "\"");
-    pw.println("    xmlns=\"" + WSIConstants.NS_URI_WSI_LOG + "\"");
-    pw.println(
-      "    xmlns:"
-        + WSIConstants.NS_NAME_WSI_MONITOR_CONFIG
-        + "=\""
-        + WSIConstants.NS_URI_WSI_MONITOR_CONFIG
-        + "\"");
-    //pw.println("    xmlns:" + WSIConstants.NS_NAME_WSI_COMMON + "=\"" + 
-    //      WSIConstants.NS_URI_WSI_COMMON + "\"");
-    pw.println(
-      "    xmlns:"
-        + WSIConstants.NS_NAME_XSI
-        + "=\""
-        + WSIConstants.NS_URI_XSI
-        + "\">");
-
-    // Add  monitor tool info
-    //pw.println(monitor.toXMLString(nsName));
-
-    // Return XML string
-    return sw.toString();
-  }
-
-  /**
-   * Get end element string. 
-   */
-  public String getEndXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // End log element 
-    pw.println("</" + nsName + ELEM_NAME + ">");
-
-    // Return XML string
-    return sw.toString();
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    // ADD:
-    return null;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java
deleted file mode 100644
index f92971d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java
+++ /dev/null

@@ -1,784 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log.impl;
-
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.ToolEnvironment;
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.LogReader;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntryHandler;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.impl.CommentImpl;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.impl.ArtifactReferenceImpl;
-import org.eclipse.wst.wsi.internal.core.report.impl.EntryImpl;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Defines the implementation used to read the Log file.
- * 
- * @version 1.0.1
- * @author Neil Delima (nddelima@ca.ibm.com)
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Graham Turrell (gturrell@uk.ibm.com)
- */
-public class LogReaderImpl implements LogReader
-{
-  /**
-   * Document location.
-   */
-  private String documentURI;
-
-  /** Used to ensure that the implementer is the first element after the log element **/
-  private int firstLogElement = 0;
-  private int elementCount = 0;
-  private boolean bMonitorFirst = false;
-
-  private WSIException wsiException = null;
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.LogReader#readLog(String, LogEntryHandler)
-   */
-  public void readLog(String logURI, MessageEntryHandler logReaderCallback)
-    throws WSIException
-  {
-    // Read the log file entries
-    readLog(new InputSource(logURI), logReaderCallback);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.LogReader#readLog(Reader, LogEntryHandler)
-   */
-  public void readLog(Reader reader, MessageEntryHandler logReaderCallback)
-    throws WSIException
-  {
-    // Read the log file entries
-    readLog(new InputSource(reader), logReaderCallback);
-  }
-
-  /**
-   * Read and parse the log file.
-   * @param inputSource          an InputSource object
-   * @param messageEntryHandler  a MessageEntryHandler object
-   * @throws WSIException if a problem occurs while reading the log file.
-   */
-  protected void readLog(
-    InputSource inputSource,
-    MessageEntryHandler messageEntryHandler)
-    throws WSIException
-  {
-    try
-    {
-      // Get the XML reader
-      XMLReader xmlReader = XMLUtils.getXMLReader();
-
-      /** TO DO:  The LogFile must be valid wrt its schema.  The schemaLocation probably
-       * needs to be set in some properties file.
-       * These two are to turn on validation 
-      reader.setFeature(FEATURE_VALIDATION,true);
-      */
-
-      // Set the content handler
-      xmlReader.setContentHandler(new LogFileHandler(messageEntryHandler));
-
-      // Start parsing the file
-      xmlReader.parse(inputSource);
-
-      // ADD: Need to find a way to determine when this exception should be thrown, 
-      // since by the time we get here all of the test assertions have been processed.
-      // Also, only the last exception is propogated back.  Should all of the exceptions
-      // be captured and propogated back?
-      if (wsiException != null)
-      {
-        // TEMP: For now, don't throw the exception
-        //throw wsiException;
-      }
-
-      //Requirement, the monitor MUST be the first child of the log.
-      //Perhaps we need to preprocess the log if this is the first condition to be met.
-      if (!bMonitorFirst)
-        throw new WSIException(
-          "The Element \""
-            + WSIConstants.ELEM_MONITOR
-            + "\" is not the first child of the Element \"log\"");
-    }
-    catch (Exception e)
-    {
-      throw new WSIException(
-        "An error occurred while processing the message log file.",
-        e);
-    }
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentReader#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.documentURI;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.document.DocumentReader#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.documentURI = documentURI;
-  }
-
-  /**
-  * Process and handles elements and attribute in the log file and invokes
-  * message validation assertions serially as the file is being processed,
-  * if a messagevalidator exists.
-  */
-  private class LogFileHandler extends DefaultHandler
-  {
-
-    /** private members that represent a MessageEntry.*/
-    private String id;
-    private String conversationID;
-    private String type;
-    private String timestamp;
-    private StringBuffer senderHostAndPort = null;
-    private StringBuffer receiverHostAndPort  = null;
-    private StringBuffer messageContent  = null;
-    private StringBuffer httpHeaders  = null;
-    private StringBuffer boundary  = null;
-    private StringBuffer mimeHeaders = null;
-    private StringBuffer mimeContent = null;
-    private MimeParts mimeParts = null;
-    private List boundaries = null;
-
-    private int bom = 0;
-
-    private String logTimestamp = null;
-    private StringBuffer monitorComment;
-    private boolean ignoreComment = false;
-
-    /** Other private members */
-    private String currentElement;
-
-    private ElementLocation entryElementLocation = null;
-
-    private ToolInfo toolInfo = null;
-
-    private Vector messageEntryList = new Vector();
-
-    private MessageEntryHandler logEntryHandler = null;
-
-    private Locator locator = null;
-
-    /**
-     * Log file handler. 
-     */
-    public LogFileHandler(MessageEntryHandler logEntryHandler)
-    {
-      this.logEntryHandler = logEntryHandler;
-
-      toolInfo = new ToolInfo();
-      toolInfo.setToolEnvironment(new ToolEnvironment());
-    }
-
-    /** 
-     * Start document. 
-     */
-    public void startDocument()
-    {
-    }
-
-    /** 
-     * Set document locato.
-     */
-    public void setDocumentLocator(Locator locator)
-    {
-      this.locator = locator;
-
-      // DEBUG:
-      //System.out.println("line: " + locator.getLineNumber() + ", column: " + locator.getColumnNumber());
-    }
-
-    /** 
-     * Start element. 
-     */
-    public void startElement(
-      String namespaceURI,
-      String localName,
-      String qName,
-      Attributes attributes)
-    {
-      // DEBUG:
-      //System.out.println("localName:" + localName + ", line: " + locator.getLineNumber() + ", column: " + locator.getColumnNumber());
-
-      //Requirement, the implementer MUST be the first child of the log       
-      if (elementCount == 2)
-        if (firstLogElement == 1)
-          bMonitorFirst = true;
-
-      elementCount++;
-
-      // <log>
-      if (localName == WSIConstants.ELEM_LOG)
-      {
-        // Save the timestamp value
-        this.logTimestamp = attributes.getValue(WSIConstants.ATTR_TIMESTAMP);
-      }
-
-      // <wsi-config:configuration>
-      else if (
-        (localName == WSIConstants.ELEM_CONFIG)
-          && (namespaceURI == WSIConstants.NS_URI_WSI_MONITOR_CONFIG))
-      {
-        // Save comment element if it exists
-        ignoreComment = false;
-      }
-
-      // <wsi-config:comment>
-      else if (
-        (localName == WSIConstants.ELEM_COMMENT)
-          && (namespaceURI == WSIConstants.NS_URI_WSI_MONITOR_CONFIG))
-      {
-        // If this is the comment element within the configuration element, then get its content
-        if (!ignoreComment)
-        {
-          currentElement = WSIConstants.ELEM_COMMENT;
-          monitorComment = new StringBuffer();
-        }
-      }
-
-      // <wsi-config:redirect>
-      else if (
-        (localName == WSIConstants.ELEM_REDIRECT)
-          && (namespaceURI == WSIConstants.NS_URI_WSI_MONITOR_CONFIG))
-      {
-        // After hitting the first redirect statement, ignore all comment elements
-        ignoreComment = true;
-        monitorComment = null;
-      }
-
-      // <monitor>
-      else if (localName == WSIConstants.ELEM_MONITOR)
-      {
-        firstLogElement++;
-        toolInfo.setName(WSIConstants.ELEM_MONITOR);
-
-        // Get the monitor version and release date
-        toolInfo.setVersion(attributes.getValue(WSIConstants.ATTR_VERSION));
-        toolInfo.setReleaseDate(
-          attributes.getValue(WSIConstants.ATTR_RELEASE_DATE));
-      }
-
-      // <implementer>
-      else if (localName == WSIConstants.ELEM_IMPLEMENTER)
-      {
-        currentElement = WSIConstants.ELEM_IMPLEMENTER;
-        toolInfo.setImplementer(attributes.getValue(WSIConstants.ATTR_NAME));
-        toolInfo.setLocation(attributes.getValue(WSIConstants.ATTR_LOCATION));
-      }
-
-      // <runtime>
-      else if (localName == WSIConstants.ELEM_RUNTIME)
-      {
-        currentElement = WSIConstants.ELEM_RUNTIME;
-        toolInfo.getToolEnvironment().setRuntimeName(
-          attributes.getValue(WSIConstants.ATTR_NAME));
-        toolInfo.getToolEnvironment().setRuntimeVersion(
-          attributes.getValue(WSIConstants.ATTR_VERSION));
-      }
-
-      // <operatingSystem>
-      else if (localName == WSIConstants.ELEM_OPERATING_SYSTEM)
-      {
-        currentElement = WSIConstants.ELEM_OPERATING_SYSTEM;
-        toolInfo.getToolEnvironment().setOSName(
-          attributes.getValue(WSIConstants.ATTR_NAME));
-        toolInfo.getToolEnvironment().setOSVersion(
-          attributes.getValue(WSIConstants.ATTR_VERSION));
-      }
-
-      // <xmlParser>
-      else if (localName == WSIConstants.ELEM_XML_PARSER)
-      {
-        currentElement = WSIConstants.ELEM_XML_PARSER;
-        toolInfo.getToolEnvironment().setXMLParserName(
-          attributes.getValue(WSIConstants.ATTR_NAME));
-        toolInfo.getToolEnvironment().setXMLParserVersion(
-          attributes.getValue(WSIConstants.ATTR_VERSION));
-      }
-
-      // <messageEntry>
-      else if (localName == WSIConstants.ELEM_MESSAGE_ENTRY)
-      {
-        currentElement = WSIConstants.ELEM_MESSAGE_ENTRY;
-        entryElementLocation = new ElementLocation(this.locator);
-        timestamp = attributes.getValue(WSIConstants.ATTR_TIMESTAMP);
-        conversationID = attributes.getValue(WSIConstants.ATTR_CONVERSATION_ID);
-        id = attributes.getValue(WSIConstants.ATTR_ID_UC);
-        type = attributes.getValue(WSIConstants.ATTR_TYPE);
-      }
-
-      // <httpHeaders>
-      else if (localName == WSIConstants.ELEM_HTTP_HEADERS)
-      {
-        //Note: Character data could be split up and returned 
-        //in more more than one characters call. 
-        httpHeaders = new StringBuffer();
-        currentElement = WSIConstants.ELEM_HTTP_HEADERS;
-      }
-
-      // <messageContent>
-      else if (localName == WSIConstants.ELEM_MESSAGE_CONTENT)
-      {
-        messageContent = new StringBuffer();
-        mimeParts = null;
-        currentElement = WSIConstants.ELEM_MESSAGE_CONTENT;
-        String bomString = attributes.getValue(WSIConstants.ATTR_BOM);
-        if (bomString != null)
-          bom = Integer.valueOf(bomString).intValue();
-        else
-          bom = 0;
-      }
-
-      // <messageContentWithAttachments>
-      else if (localName == WSIConstants.ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS)
-      {
-        messageContent = null;
-        mimeParts = new MimePartsImpl();
-
-        String bomString = attributes.getValue(WSIConstants.ATTR_BOM);
-        if (bomString != null)
-          bom = Integer.valueOf(bomString).intValue();
-        else
-          bom = 0;
-      }
-
-      // <mimePart>
-      else if (localName == WSIConstants.ELEM_MIME_PART)
-      {
-        if (boundaries == null)
-          boundaries = new ArrayList(2);
-        else
-          boundaries.clear();
-      }
-
-      // <boundaryString>
-      else if (localName == WSIConstants.ELEM_BOUNDARY_STRING)
-      {
-        boundary = new StringBuffer();
-        currentElement = WSIConstants.ELEM_BOUNDARY_STRING;
-      }
-
-      // <mimeHeaders>
-      else if (localName == WSIConstants.ELEM_MIME_HEADERS)
-      {
-        mimeHeaders = new StringBuffer();
-        currentElement = WSIConstants.ELEM_MIME_HEADERS;
-      }
-
-      // <mimeContent>
-      else if (localName == WSIConstants.ELEM_MIME_CONTENT)
-      {
-        mimeContent = new StringBuffer();
-        currentElement = WSIConstants.ELEM_MIME_CONTENT;
-      }
-
-      // <senderHostAndPort>
-      else if (localName == WSIConstants.ELEM_SENDER_HOST_AND_PORT)
-      {
-        senderHostAndPort = new StringBuffer();
-        currentElement = WSIConstants.ELEM_SENDER_HOST_AND_PORT;
-      }
-
-      // <receiverHostAndPort>
-      else if (localName == WSIConstants.ELEM_RECEIVER_HOST_AND_PORT)
-      {
-        receiverHostAndPort = new StringBuffer();
-        currentElement = WSIConstants.ELEM_RECEIVER_HOST_AND_PORT;
-      }
-    }
-
-    /** 
-    * Characters callback. 
-    */
-    public void characters(char ch[], int start, int length)
-    {
-      // Ignoring CRLF that appears in log elements
-      int altStart = start;
-      int altLength = length;
-      if (start > 0 && ch[start-1] == 13 && ch[start] == 10)
-      {
-        altStart++;
-        altLength--;
-      }
-
-      // <wsi-monConfig:comment>
-      if (monitorComment != null && currentElement == WSIConstants.ELEM_COMMENT)
-      {
-        monitorComment.append(ch, start, length);
-      }
-
-      // <messageContent>
-      else if (messageContent != null
-        && currentElement == WSIConstants.ELEM_MESSAGE_CONTENT)
-      {
-        messageContent.append(ch, start, length);
-      }
-
-      // <httpHeaders>
-      else if (httpHeaders != null
-        && currentElement == WSIConstants.ELEM_HTTP_HEADERS)
-      {
-        httpHeaders.append(ch, start, length);
-      }
-
-      // <boundaryString>
-      else if (boundary != null
-        && currentElement == WSIConstants.ELEM_BOUNDARY_STRING)
-      {
-        boundary.append(ch, altStart, altLength);
-      }
-
-      // <mimeHeaders>
-      else if (mimeHeaders != null
-        && currentElement == WSIConstants.ELEM_MIME_HEADERS)
-      {
-        mimeHeaders.append(ch, altStart, altLength);
-      }
-
-      // <mimeContent>
-      else if (mimeContent != null
-        && currentElement == WSIConstants.ELEM_MIME_CONTENT)
-      {
-        mimeContent.append(ch, altStart, altLength);
-      }
-
-      // <senderHostAndPort>
-      else if (senderHostAndPort != null
-        && currentElement == WSIConstants.ELEM_SENDER_HOST_AND_PORT)
-      {
-        senderHostAndPort.append(ch, start, length);
-      }
-
-      // <receiverHostAndPort>
-      else if (receiverHostAndPort != null
-        && currentElement == WSIConstants.ELEM_RECEIVER_HOST_AND_PORT)
-      {
-        receiverHostAndPort.append(ch, start, length);
-      }
-    }
-
-    /** 
-     * End Element. 
-     */
-    public void endElement(String namespaceURI, String localName, String qName)
-    {
-      // <wsi-config:comment>
-      if (
-        (localName == WSIConstants.ELEM_COMMENT)
-          && (namespaceURI == WSIConstants.NS_URI_WSI_MONITOR_CONFIG))
-      {
-        // If we saved the comment, then process it and the log timestamp
-        if (this.monitorComment != null)
-        {
-          ArtifactReference artifactReference = new ArtifactReferenceImpl();
-          artifactReference.setTimestamp(this.logTimestamp);
-          Comment comment = new CommentImpl();
-          comment.setText(monitorComment.toString());
-          artifactReference.setDocumentElement(
-            comment,
-            WSIConstants.NS_NAME_WSI_MONITOR_CONFIG);
-          processArtifactReference(artifactReference);
-        }
-      }
-
-      // <boundaryString>
-      else if (localName == WSIConstants.ELEM_BOUNDARY_STRING)
-      {
-        // Adding boundary string to a list
-        boundaries.add(boundary.toString());
-      }
-
-      // <mimePart>
-      else if (localName == WSIConstants.ELEM_MIME_PART)
-      {
-        // Creating a MessageMIMEPart instance
-        MimePart part = new MimePartImpl();
-        part.setHeaders(mimeHeaders.toString());
-        part.setContent(mimeContent.toString());
-        part.setBoundaryStrings((String[])boundaries.toArray(new String[0]));
-
-        mimeParts.addPart(part);
-      }
-
-      // <messageEntry>
-      else if (localName == WSIConstants.ELEM_MESSAGE_ENTRY)
-      {
-        // Assumption: Related messages are sequentially available in the message log.
-        if (MessageEntry.TYPE_REQUEST.equalsIgnoreCase(type))
-        {
-          // Create log entry
-          MessageEntry messageEntryRequest =
-            createMessageEntry(
-                id,
-                conversationID,
-                type,
-                timestamp,
-                senderHostAndPort.toString(),
-                receiverHostAndPort.toString(),
-                messageContent == null ? "" : messageContent.toString(),
-                httpHeaders.toString(),
-                mimeParts,
-                entryElementLocation);
-
-          // Add log entry to the list
-          messageEntryList.add(messageEntryRequest);
-
-          // Request is now processed only when the response is received.             
-        }
-
-        else if (MessageEntry.TYPE_RESPONSE.equalsIgnoreCase(type))
-        {
-          // Create log entry
-          MessageEntry messageEntryResponse =
-            createMessageEntry(
-                id,
-                conversationID,
-                type,
-                timestamp,
-                senderHostAndPort.toString(),
-                receiverHostAndPort.toString(),
-                messageContent == null ? "" : messageContent.toString(),
-                httpHeaders.toString(),
-                mimeParts,
-                entryElementLocation);
-
-          // Add log entry to the list
-          messageEntryList.add(messageEntryResponse);
-
-          if (logEntryHandler != null)
-          {
-            // look up the request message
-            // ISSUE : need to throw & catch a nullpointerexception in here...
-            MessageEntry messageEntryRequest = findRelatedRequest(messageEntryResponse);
-
-            if (messageEntryRequest != null)
-            {
-              // Create entry 
-              // ADD: Need to create entry from report
-              //Entry entry = this.reporter.getReport().createEntry();
-              Entry entry = new EntryImpl();
-              entry.setEntryType(
-                  EntryType.getEntryType(EntryType.TYPE_MESSAGE_REQUEST));
-              entry.setReferenceID(messageEntryRequest.getId());
-              entry.setEntryDetail(messageEntryRequest);
-
-              // Create the context for the request-response pair
-              EntryContext requestTargetContext =
-                new EntryContext(
-                    entry,
-                    messageEntryRequest,
-                    messageEntryResponse);
-              if (requestTargetContext != null)
-                processLogEntry(requestTargetContext);
-            }
-
-            // Create entry 
-            // ADD: Need to create entry from report
-            //Entry entry = this.reporter.getReport().createEntry();
-            Entry entry = new EntryImpl();
-            entry.setEntryType(
-                EntryType.getEntryType(EntryType.TYPE_MESSAGE_RESPONSE));
-            entry.setReferenceID(messageEntryResponse.getId());
-            entry.setEntryDetail(messageEntryResponse);
-
-            EntryContext responseTargetContext =
-              new EntryContext(
-                  entry,
-                  messageEntryRequest,
-                  messageEntryResponse);
-            if (responseTargetContext != null)
-              processLogEntry(responseTargetContext);
-          }
-        }
-      }
-
-      currentElement = null;
-    }
-
-    /** 
-    * End Document. 
-    */
-    public void endDocument()
-    {
-      //If we want to serially process the log file.  Invoke validateMessages with
-      //msgValidator!=null.  Here we have the option of clearing the logEntry vector
-      //once message validation is done.
-      //if (msgValidator!=null)
-      //logEntryList.clear();
-    }
-
-    /**
-     * Process the message in the log entry.
-     */
-    public void processLogEntry(EntryContext entryContext)
-    {
-      try
-      {
-        //Before validating any messages check if implementer is the first element.
-        logEntryHandler.processLogEntry(entryContext);
-      }
-      catch (Exception e)
-      {
-        wsiException =
-          new WSIException(
-            "An error occurred while validating"
-              + " the message logEntry: "
-              + entryContext.getMessageEntry().getId(),
-            e);
-      }
-    }
-
-    /**
-     * Process the artifact reference.
-     */
-    private void processArtifactReference(ArtifactReference artifactReference)
-    {
-      try
-      {
-        //Before validating any messages check if implementer is the first element.
-        logEntryHandler.processArtifactReference(artifactReference);
-      }
-
-      catch (Exception e)
-      {
-        wsiException =
-          new WSIException(
-            "An error occurred while processing"
-              + " the artifact reference: "
-              + artifactReference.toString(),
-            e);
-      }
-    }
-
-    /**
-       * Find the related Request LogEntry.  The current rule for related log entires is
-       * that a request will always precede its response.
-       * ISSUE: Sequence in log file is timestamp driven (monitor spec). 
-       * Assertion is that for a given conversationID, a second request is not sent 
-       * until its response is received (chronologically). 
-       * This method will have to be modified if the rule changes.
-       */
-    // could be made more efficient by keeping a much smaller list of unresponded requests...
-    public MessageEntry findRelatedRequest(MessageEntry logEntryResponse)
-    {
-      for (int entry = messageEntryList.size() - 1; entry >= 0; entry--)
-      {
-        // Get the log entry of the matching request
-        MessageEntry logEntry = (MessageEntry) messageEntryList.get(entry);
-        // Ignore own entry
-        if (!logEntryResponse.equals(logEntry))
-        {
-          if (logEntryResponse
-            .getConversationId()
-            .equals(logEntry.getConversationId()))
-          {
-            // found the most recently read message with the same conversationID.
-            // From above, this should be the corresponding request. Check as far as possible.
-            if (logEntry.getType().equals(MessageEntry.TYPE_REQUEST))
-            {
-              return logEntry;
-            }
-            else
-            {
-              return null; // expected a request. need to throw an exception!
-            }
-          }
-        }
-      }
-      return null;
-      // conversationID match not found anywhere. need to throw an exception!
-    }
-
-    /**
-     * Create log entry.
-     */
-    private MessageEntry createMessageEntry(
-      String id,
-      String conversationId,
-      String type,
-      String timestamp,
-      String senderIPPort,
-      String receiverIPPort,
-      String messageContent,
-      String httpHeaders,
-      MimeParts mimeParts,
-      ElementLocation elementLocation)
-    {
-      // Create log entry
-      MessageEntry messageEntry = new MessageEntryImpl();
-      messageEntry.setId(id);
-      messageEntry.setConversationId(conversationID);
-      messageEntry.setType(type);
-      messageEntry.setTimestamp(timestamp);
-      messageEntry.setSenderHostAndPort(senderIPPort);
-      messageEntry.setReceiverHostAndPort(receiverIPPort);
-      messageEntry.setHTTPHeaders(httpHeaders);
-      messageEntry.setBOM(bom);
-      messageEntry.setElementLocation(elementLocation);
-
-      String encoding = null;
-      if (mimeParts == null)
-      {
-        // Get the encoding for this message content
-        encoding = Utils.getXMLEncoding(messageContent);
-        messageEntry.setMessage(messageContent);
-       	messageEntry.setMimeContent(false);
-      }
-      else
-      {
-       	messageEntry.setMimeParts(mimeParts);
-       	MimePart root = Utils.findRootPart(httpHeaders, mimeParts.getParts());
-       	if (root != null)
-       	{
-          // Get the encoding for this message content
-          encoding = Utils.getXMLEncoding(root.getContent());
-          mimeParts.setRootPart(root);
-       	}
-   		// else empty body
-       	messageEntry.setMimeContent(true);
-      }
-      if ((encoding == null) || (encoding.equals("")))
-         encoding = WSIConstants.DEFAULT_XML_ENCODING;
-      messageEntry.setEncoding(encoding);
-
-      return messageEntry;
-    }
-
-  } //End ContentHandler
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogWriterImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogWriterImpl.java
deleted file mode 100644
index 90ee982..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogWriterImpl.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log.impl;
-
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.impl.DocumentWriterImpl;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.LogWriter;
-
-/**
- * Defines the implementation used to write the Log file.
- * 
- * @version 1.0.1
- * @author Neil Delima (nddelima@ca.ibm.com)
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class LogWriterImpl extends DocumentWriterImpl implements LogWriter
-{
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.LogWriter#write(Log)
-   */
-  public synchronized void write(Log log)
-    throws IllegalStateException, WSIException
-  {
-    // If the writer was not specified, then throw an exception
-    if (writer == null)
-      throw new IllegalStateException("Could not write log file since writer was not set.");
-
-    // Write log file
-    write(log, writer);
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.log.LogWriter#write(Log, Writer)
-   */
-  public synchronized void write(Log log, Writer writer) throws WSIException
-  {
-    // ADD:
-    throw new WSIException("Write entire log file function not supported yet.");
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java
deleted file mode 100644
index afc7a3f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java
+++ /dev/null

@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-/**
- * Message entry implementation.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class MessageEntryImpl implements MessageEntry
-{
-  /**
-   * Log entry id.
-   */
-  protected String id;
-
-  protected String conversationId;
-  protected String type;
-  protected String timestamp;
-  protected String senderHostAndPort;
-  protected String receiverHostAndPort;
-  protected String message = "";
-  protected String httpHeaders = "";
-  protected int bom;
-  protected String encoding = "";
-  protected boolean isMimeContent = false;
-  protected MimeParts mimeParts = new MimePartsImpl();
-
-  protected ElementLocation elementLocation = null;
-
-  /**
-   * Empty constructor.
-   */
-  public MessageEntryImpl()
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getId()
-   */
-  public String getId()
-  {
-    return this.id;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setId(String)
-   */
-  public void setId(String id)
-  {
-    this.id = id;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getConversationId()
-   */
-  public String getConversationId()
-  {
-    return this.conversationId;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setConversationId(String)
-   */
-  public void setConversationId(String conversationId)
-  {
-    this.conversationId = conversationId;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getTimestamp()
-   */
-  public String getTimestamp()
-  {
-    return this.timestamp;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setTimestamp(String)
-   */
-  public void setTimestamp(String timestamp)
-  {
-    this.timestamp = timestamp;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getType()
-   */
-  public String getType()
-  {
-    return this.type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setType(String)
-   */
-  public void setType(String type)
-  {
-    this.type = type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getSenderHostAndPort()
-   */
-  public String getSenderHostAndPort()
-  {
-    return this.senderHostAndPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setSenderHostAndPort(String)
-   */
-  public void setSenderHostAndPort(String senderHostAndPort)
-  {
-    this.senderHostAndPort = senderHostAndPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getReceiverHostAndPort()
-   */
-  public String getReceiverHostAndPort()
-  {
-    return this.receiverHostAndPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setReceiverHostAndPort(String)
-   */
-  public void setReceiverHostAndPort(String receiverHostAndPort)
-  {
-    this.receiverHostAndPort = receiverHostAndPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getMessage()
-   */
-  public String getMessage()
-  {
-  	if (!this.isMimeContent)
-       return this.message;
-  	else
-  	{
-  	   if (this.mimeParts.getRootPart() == null) return "";
-  	   else return this.mimeParts.getRootPart().getContent();
-  	}
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setMessage(String)
-   */
-  public void setMessage(String message)
-  {
-    this.message = message;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setEncoding(String)
-   */
-  public void setEncoding(String encoding)
-  {
-    this.encoding = encoding;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#getBOM()
-   */
-  public int getBOM()
-  {
-    return bom;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#setBOM(int)
-   */
-  public void setBOM(int bom)
-  {
-    this.bom = bom;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#getHTTPHeaders()
-   */
-  public String getHTTPHeaders()
-  {
-    return this.httpHeaders;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.LogEntry#setHTTPHeaders(String)
-   */
-  public void setHTTPHeaders(String httpHeaders)
-  {
-    this.httpHeaders = httpHeaders;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#getElementLocation()
-   */
-  public ElementLocation getElementLocation()
-  {
-    return this.elementLocation;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#setElementLocation(org.wsi.xml.dom.ElementLocation)
-   */
-  public void setElementLocation(ElementLocation elementLocation)
-  {
-    this.elementLocation = elementLocation;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    return toXMLString(WSIConstants.NS_NAME_WSI_LOG);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // ADD: Need to add way to indicate XML schema type for logEntry
-    // Add log entry
-    pw.print("<" + nsName + ELEM_NAME + " ");
-    pw.print(
-      "xsi:type=\"httpMessageEntry\" ");
-    pw.print(WSIConstants.ATTR_ID_UC + "=\"" + id + "\" ");
-    pw.print(
-      WSIConstants.ATTR_CONVERSATION_ID + "=\"" + conversationId + "\" ");
-    pw.print(WSIConstants.ATTR_TYPE + "=\"" + type + "\" ");
-    pw.println(WSIConstants.ATTR_TIMESTAMP + "=\"" + timestamp + "\">");
-
-    if (isMimeContent())
-    {
-        // Add message content with attachments element
-        pw.print("<" + nsName + WSIConstants.ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS);
-        if (bom != 0)
-          pw.print(" " + WSIConstants.ATTR_BOM + "=\"" + bom + "\"");
-        pw.print(">");
-
-        Collection partList = mimeParts.getParts();
-        if (!partList.isEmpty())
-        {
-         	Iterator iMimeParts = partList.iterator();
-        	while (iMimeParts.hasNext())
-            {
-        	  MimePart mimePart = (MimePart)iMimeParts.next();
-         	  pw.print(mimePart.toXMLString(namespaceName));
-            }
-        }
-
-        // Add end message element
-        pw.println("</" + nsName + WSIConstants.ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS + ">");
-    }
-    else
-    {
-      // Add message content element
-      pw.print("<" + nsName + WSIConstants.ELEM_MESSAGE_CONTENT);
-      if (bom != 0)
-        pw.print(" " + WSIConstants.ATTR_BOM + "=\"" + bom + "\"");
-      pw.print(">");
-
-      // Add encoded message
-      pw.print(XMLUtils.xmlEscapedString(message));
-      
-      // Add end message element
-      pw.println("</" + nsName + WSIConstants.ELEM_MESSAGE_CONTENT + ">");
-    }
-
-    // Add senderIPPort element
-    pw.println(
-      "<"
-        + nsName
-        + WSIConstants.ELEM_SENDER_HOST_AND_PORT
-        + ">"
-        + senderHostAndPort
-        + "</"
-        + nsName
-        + WSIConstants.ELEM_SENDER_HOST_AND_PORT
-        + ">");
-
-    // Add receiverIP element
-    pw.println(
-      "<"
-        + nsName
-        + WSIConstants.ELEM_RECEIVER_HOST_AND_PORT
-        + ">"
-        + receiverHostAndPort
-        + "</"
-        + nsName
-        + WSIConstants.ELEM_RECEIVER_HOST_AND_PORT
-        + ">");
-
-    // Add HTTPHeaders element
-    pw.print("<" + nsName + WSIConstants.ELEM_HTTP_HEADERS + ">");
-
-    // ADD: Does this string need to be XML encoded?
-    // Add HTTP headers
-    pw.print(XMLUtils.xmlEscapedString(httpHeaders));
-
-    // End HTTPHeaders element
-    pw.println("</" + nsName + WSIConstants.ELEM_HTTP_HEADERS + ">");
-
-    // End log entry
-    pw.println("</" + nsName + ELEM_NAME + ">");
-
-    // Return string
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#isMimeContent()
-   */
-  public boolean isMimeContent()
-  {
-    return isMimeContent;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#setMimeContent()
-   */
-  public void setMimeContent(boolean isMimeContent)
-  {
-    this.isMimeContent = isMimeContent;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#getMIMEParts()
-   */
-  public MimeParts getMimeParts()
-  {
-    return mimeParts;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MessageEntry#setMimeParts()
-   */
-  public void setMimeParts(MimeParts mimeParts)
-  {
-    this.mimeParts = mimeParts;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MimePartImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MimePartImpl.java
deleted file mode 100644
index 5025fce..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MimePartImpl.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*
- * Created on Nov 22, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.wsi.internal.core.log.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
-/**
- * @author lauzond
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class MimePartImpl implements MimePart 
-{
-  private String mimeContent;
-  private String mimeHeaders;
-  private String[] boundaryStrings = new String[0];
-  
-  public MimePartImpl ()
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MimePart#getContent()
-   */
-  public String getContent()
-  {
-    return this.mimeContent;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MimePart#setContent(String)
-   */
-  public void setContent(String mimeContent)
-  {
-  	this.mimeContent = mimeContent;
-  }
-
-  /**
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsi.internal.core.log.MimePart#getHeaders()
-   */
-  public String getHeaders()
-  {
-  	return this.mimeHeaders;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MimePart#setHeaders(String)
-   */
-  public void setHeaders(String mimeHeaders)
-  {
-  	this.mimeHeaders = mimeHeaders;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MimePart#getBoundaryStrings()
-   */
-  public String[] getBoundaryStrings()
-  {
-  	return this.boundaryStrings;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MimePart#setBoundaryStrings(String[])
-   */
-  public void setBoundaryStrings(String[] boundaryStrings)
-  {
-  	this.boundaryStrings = boundaryStrings;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    return toXMLString(WSIConstants.NS_NAME_WSI_LOG);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Add mimePart element
-    pw.println("<" + nsName + WSIConstants.ELEM_MIME_PART  + ">");
-    
-    // Add boundary string element
-     for (int i = 0; i < boundaryStrings.length; i++)
-    {
-        pw.print("<" + nsName + WSIConstants.ELEM_BOUNDARY_STRING + ">");
-        pw.print(boundaryStrings[i]);
-        pw.println("</" + nsName + WSIConstants.ELEM_BOUNDARY_STRING + ">");
-    }
-   
-    // Add mimeHeaders element
-    pw.print("<" + nsName + WSIConstants.ELEM_MIME_HEADERS + ">");
-    pw.print(XMLUtils.xmlEscapedString(mimeHeaders));
-    pw.println("</" + nsName + WSIConstants.ELEM_MIME_HEADERS + ">");
-
-    // Add encoded content
-    pw.print("<" + nsName + WSIConstants.ELEM_MIME_CONTENT + ">");
-    if ((mimeContent.indexOf("<") != -1)  || 
-        (mimeContent.indexOf(">") != -1)  || 
-		(mimeContent.indexOf("\"") != -1) ||
-		(mimeContent.indexOf("\'") != -1))
-    	pw.print(XMLUtils.xmlEscapedString(mimeContent));
-    else
-        pw.print(getContent());
-    pw.println("</" + nsName + WSIConstants.ELEM_MIME_CONTENT + ">");
- 
-    // Add end message element
-    pw.println("</" + nsName + WSIConstants.ELEM_MIME_PART + ">");
-
-    // Return string
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MimePartsImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MimePartsImpl.java
deleted file mode 100644
index d3392c1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MimePartsImpl.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.log.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-
-/**
- * MimePartsImpl class.
- *
- * @version 1.0.1
- * @author David Lauzon (lauzond@ca.ibm.com)
- */
-public class MimePartsImpl implements MimeParts
-{
-	
-  protected MimePart rootPart;
-  protected Collection mimeParts = new ArrayList();
-
-  public MimePartsImpl()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MimeParts#getRootPart()
-   */
-  public MimePart getRootPart()
-  {
-	return rootPart;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MimeParts#setRootPart(MimePart)
-   */
-  public void setRootPart(MimePart rootPart)
-  {
-  	this.rootPart = rootPart;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MimeParts#count()
-   */
-  public int count()
-  {
-	return mimeParts.size();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MimeParts#addPart(MimePart)
-   */
-  public void addPart(MimePart part)
-  {
-  	if (part != null)
-  	  mimeParts.add(part);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.log.MimeParts#getParts()
-   */
-  public Collection getParts()
-  {
-  	return mimeParts;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ChunkedData.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ChunkedData.java
deleted file mode 100644
index c6b1a01..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ChunkedData.java
+++ /dev/null

@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-/**
- * This class will process chunked data.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class ChunkedData
-{
-  protected boolean moreChunkedData = false;
-  protected String chunkedData = "";
-  protected SocketHandler socketHandler = null;
-
-  /**
-   * Constructs a ChunkedData object.
-   */
-  public ChunkedData()
-  {
-  }
-
-  /**
-   * Constructs a ChunkedData object.
-   * @param socketHandler socket handler.
-   * @param moreChunkedData chunked data.
-   */
-  public ChunkedData(SocketHandler socketHandler, boolean moreChunkedData)
-  {
-    this.socketHandler = socketHandler;
-    this.moreChunkedData = moreChunkedData;
-  }
-
-  /**
-   * Constructs a ChunkedData object.
-   * @param socketHandler socket handler.
-   * @param chunkedData chunked data.
-   */
-  public ChunkedData(SocketHandler socketHandler, String chunkedData)
-  {
-    this.socketHandler = socketHandler;
-    this.chunkedData = chunkedData;
-    this.moreChunkedData = checkData(chunkedData);
-  }
-
-  /**
-   * Add the chunked data to the buffer.
-   * @param chunkedData chunked data.
-   */
-  public void addData(String chunkedData)
-  {
-    this.chunkedData += chunkedData;
-    this.moreChunkedData = checkData(chunkedData);
-  }
-
-  /**
-   * Get data buffer.
-   * @return  data buffer.
-   */
-  public String getData()
-  {
-    return this.chunkedData;
-  }
-
-  /**
-   * Clear data buffer.
-   */
-  public void clearData()
-  {
-    this.chunkedData = "";
-  }
-
-  /**
-   * Returns true if there is more chunked data.
-   * @return true if there is more chunked data.
-   */
-  public boolean isMoreChunkedData()
-  {
-    return this.moreChunkedData;
-  }
-
-  /**
-   * Decode and add data to the buffer.
-   * @param messageBuffer a StringBuffer object.
-   * @return true if data is added to the buffer.
-   */
-  public boolean decodeAndAddDataToBuffer(StringBuffer messageBuffer)
-  {
-    boolean moreChunkedData = false;
-    if (!this.moreChunkedData)
-    {
-      // DEBUG:
-      debug("decodeAndAddDataToBuffer", "chunkedData: " + chunkedData);
-
-      moreChunkedData = decodeData(chunkedData, messageBuffer);
-    }
-
-    return moreChunkedData;
-  }
-
-  /**
-   * Check data.
-   */
-  private boolean checkData(String chunkedData)
-  {
-    boolean moreChunkedData = false;
-    // Look for [CRLF][0][CRLF] in the chunked data      
-    if (chunkedData.indexOf(SocketHandler.CRLF + "0" + SocketHandler.CRLF) != -1)
-    {
-      moreChunkedData = false;
-
-      // DEBUG:
-      debug(
-        "checkData",
-        "Chunk contains [CRLF][0][CRLF], so there is no more data.");
-    }
-
-    // Look for [0][CRLF] at start of chunked data      
-    else if (chunkedData.startsWith("0" + SocketHandler.CRLF))
-    {
-      moreChunkedData = false;
-
-      // DEBUG:
-      debug(
-        "checkData",
-        "Chunk data starts with [0][CRLF], so there is no more data.");
-    }
-
-    // Otherwise step through it to see if we have all of the data
-    else
-    {
-      moreChunkedData = true;
-    }
-
-    return moreChunkedData;
-  }
-
-  /**
-   * Decode chunked data.
-   * 
-   * Data format:
-   * <pre>
-   *   [Chunk Size][CRLF][Data Chunk][CRLF][Chunk Size][CRLF][Data Chunk][CRLF]...[0][CRLF][Optional Footer][CRLF]
-   * </pre>
-   * 
-   * @param chunkedData
-   * @param messageLoggingBuffer
-   */
-  private boolean decodeData(String chunkedData, StringBuffer messageBuffer)
-  {
-    boolean endOfData = false;
-    int nextIndex = 0;
-    int prevIndex = 0;
-    int chunkSize = 0;
-
-    String nextChunkData = null;
-
-    // Process each chunk of data
-    while (!(endOfData)
-      && (nextIndex < chunkedData.length())
-      && (nextIndex = chunkedData.indexOf(SocketHandler.CRLF, prevIndex)) != -1)
-    {
-      // Get the data length which is right after this
-      String hexChunkedSize = chunkedData.substring(prevIndex, nextIndex);
-
-      // Decode length
-      chunkSize = Integer.decode("0x" + hexChunkedSize).intValue();
-
-      // DEBUG:
-      debug("decodeData", "chunkedSize: " + chunkSize);
-
-      // If size is zero, then we have hit the end of the chunked data
-      if (chunkSize == 0)
-      {
-        endOfData = true;
-      }
-
-      // If we don't have all of the data then stop
-      else if (nextIndex + 2 + chunkSize > chunkedData.length())
-      {
-        break;
-      }
-
-      else
-      {
-        nextChunkData =
-          chunkedData.substring(nextIndex + 2, nextIndex + 2 + chunkSize);
-
-        // DEBUG:
-        debug("decodeData", "nextChunkData: " + nextChunkData);
-
-        // Get message based on length
-        if (messageBuffer != null)
-          messageBuffer.append(nextChunkData);
-      }
-
-      // Point at the next chunk size
-      prevIndex = nextIndex + 2 + chunkSize + 2;
-    }
-
-    return endOfData;
-  }
-
-  /**
-   * Debug.
-   */
-  private void debug(String method, String message)
-  {
-    this.socketHandler.debug("ChunkedData", method, message);
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ConnectionListener.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ConnectionListener.java
deleted file mode 100644
index f48ce9e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ConnectionListener.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-/**
- * This interface is for receiving connection events.
- * 
- * @author Sergey Suhoruchkin
- * @version 1.0.1
- */
-public interface ConnectionListener
-{
-  /**
-   * Invoked when connection is closed.
-   * @param connection socket connection.
-   */
-  public void connectionClosed(SocketConnection connection);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java
deleted file mode 100644
index 49cc049..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java
+++ /dev/null

@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-import java.io.StringReader;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.LogWriter;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-
-/**
- * This class is the queue that is used to write request and response messages
- * to the log file in the correct order.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class MessageEntryQueue
-{
-  /**
-   * Request type message entry queue.
-   */
-  protected Vector requestList = new Vector();
-
-  /**
-   * Response type message entry queue.
-   */
-  protected Vector responseList = new Vector();
-
-  /**
-   * Monitor.
-   */
-  protected Monitor monitor = null;
-
-  /**
-   * Log file.
-   */
-  protected Log log = null;
-
-  /**
-   * Log writer.
-   */
-  protected LogWriter logWriter = null;
-
-  /**
-   * List lock.
-   */
-  protected String listLock = "listLock";
-
-  /**
-   * Message ID which is incremented when a new log entry is added to the log file.
-   */
-  protected int messageId = 1;
-
-  /**
-   * Create message entry queue.
-   * @param monitor a monitor.
-   * @param log the log.
-   * @param logWriter a log writer.
-   */
-  public MessageEntryQueue(Monitor monitor, Log log, LogWriter logWriter)
-  {
-    // Save input references
-    this.monitor = monitor;
-    this.log = log;
-    this.logWriter = logWriter;
-  }
-
-  /**
-   * Add log entry to queue.
-   * @param messageEntry a message entry.
-   * @throws WSIException is there is a problem adding the log 
-   *         entry to the queue.
-   */
-  public synchronized void addMessageEntry(MessageEntry messageEntry)
-    throws WSIException
-  {
-    synchronized (listLock)
-    {
-      // If this is a request type of message entry, then add to request list
-      if (messageEntry.getType().equals(MessageEntry.TYPE_REQUEST))
-      {
-        requestList.add(messageEntry);
-      }
-
-      // Otherwise this is a response type of message entry
-      else
-      {
-        responseList.add(messageEntry);
-      }
-    }
-
-    // Tell the log entry writer thread to run
-    writeFromQueue();
-  }
-
-  /**
-   * Determine if any log entries need to be written.
-   * @throws WSIException is there is a problem adding log entries.
-  
-   */
-  public synchronized void writeFromQueue() throws WSIException
-  {
-    MessageEntry requestMessageEntry = null;
-    MessageEntry responseMessageEntry = null;
-    boolean responseFound = false;
-
-    // Create array that will contain list of index to remove from request list
-    int[] requestIndexList = new int[requestList.size()];
-    int reqIndexCount = 0;
-
-    synchronized (listLock)
-    {
-      // If there are entries in the request queue,
-      // then try to match them with entries in the response queue
-      for (int reqIndex = 0; reqIndex < requestList.size(); reqIndex++)
-      {
-        // Get request log entry
-        requestMessageEntry = (MessageEntry) requestList.elementAt(reqIndex);
-
-        // Check each response log entry to see if the conversationId matches
-        responseFound = false;
-        for (int respIndex = 0;
-          respIndex < responseList.size() && !responseFound;
-          respIndex++)
-        {
-          // Get response log entry
-          responseMessageEntry =
-            (MessageEntry) responseList.elementAt(respIndex);
-
-          // If the request and response have the same conversationId,
-          // then write them out to the log file
-          if (requestMessageEntry
-            .getConversationId()
-            .equals(responseMessageEntry.getConversationId()))
-          {
-            responseFound = true;
-
-            // Set the id for the log entries
-            requestMessageEntry.setId(getNextMessageId());
-            responseMessageEntry.setId(getNextMessageId());
-
-            // Write out request and then response
-            //==== SS start : what this line is used for??? - causes memory leak, as no removeLogEntry is called ====
-            //            log.addLogEntry(requestMessageEntry);
-            //==== SS end ===
-            StringReader requestReader =
-              new StringReader(requestMessageEntry.toXMLString(""));
-            logWriter.write(requestReader);
-
-            // Display message
-            printMessage(requestMessageEntry);
-
-            // Write out response
-            //==== SS start : what this line is used for??? - causes memory leak, as no removeLogEntry is called ====
-            //            log.addLogEntry(responseMessageEntry);
-            //==== SS end ===
-            StringReader responseReader =
-              new StringReader(responseMessageEntry.toXMLString(""));
-            logWriter.write(responseReader);
-
-            // Display message
-            printMessage(responseMessageEntry);
-
-            // Add request to list so that it can be removed later
-            requestIndexList[reqIndexCount++] = reqIndex;
-
-            // Remove log entry from response list
-            responseList.remove(respIndex);
-          }
-        }
-      }
-
-      // Remove requests that were written out
-      for (int count = 0; count < reqIndexCount; count++)
-        requestList.remove(requestIndexList[count]);
-    }
-  }
-
-  /**
-   * Get the next message identifier.
-   * @return the next message identifier.
-   */
-  protected synchronized String getNextMessageId()
-  {
-    return String.valueOf(messageId++);
-  }
-
-  /**
-   * Display message.
-   * @param messageEntry a message entry.
-   */
-  protected void printMessage(MessageEntry messageEntry)
-  {
-    // Display message
-    monitor.printMessage(
-      "log01",
-      messageEntry.getId()
-        + ", "
-        + messageEntry.getType()
-        + ", "
-        + messageEntry.getSenderHostAndPort(),
-      "Log message entry -  ID: "
-        + messageEntry.getId()
-        + ", Type: "
-        + messageEntry.getType()
-        + ", Sender: "
-        + messageEntry.getSenderHostAndPort());
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java
deleted file mode 100644
index 59e2fd6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java
+++ /dev/null

@@ -1,505 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.LogWriter;
-import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-
-/**
- * Message Monitor.
- *
- * @author Peter Brittenham (peterbr.us.ibm.com)
- */
-
-public class Monitor
-{
-  /**
-   * Message list.
-   */
-  protected MessageList messageList = null;
-
-  private final static String RESOURCE_BUNDLE_NAME =
-    "org.wsi.test.monitor.Monitor";
-
-  public final static String USAGE_MESSAGE =
-    "Usage: Monitor -config <configFilename>";
-
-  /**
-   * Converstation ID.
-   */
-  private int conversationId = 1;
-
-  private Log log = null;
-  private LogWriter logWriter = null;
-  private MonitorConfig monitorConfig = null;
-
-  /**
-  * Tool information.
-  */
-  public static final String TOOL_NAME = "Monitor";
-
-  protected ToolInfo toolInfo = null;
-
-  protected Vector listenerList = new Vector();
-
-  protected MessageEntryQueue messageEntryQueue = null;
-
-  /**
-   * Message monitor.
-   * @param args command line arguments.
-   * @throws WSIException if there is a problem creating a Monitor object.
-   */
-  public Monitor(String[] args) throws WSIException
-  {
-    // Create message list
-    this.messageList = new MessageList(RESOURCE_BUNDLE_NAME);
-
-    // Tool information
-    toolInfo = new ToolInfo(TOOL_NAME);
-
-    // Create document factory
-    DocumentFactory documentFactory = DocumentFactory.newInstance();
-
-    // Get new config object
-    monitorConfig = documentFactory.newMonitorConfig();
-    monitorConfig.init(this.messageList);
-
-    // Parse command line arguments
-    monitorConfig.parseArgs(args);
-
-    String logLocation = monitorConfig.getLogLocation();
-    if (logLocation.indexOf(WSIConstants.PATH_SEPARATOR) > -1)
-    {
-      throw new WSIException(
-        messageList.getMessage(
-          "config11",
-          monitorConfig.getLogLocation(),
-          "The log file location value cannot contain the pass separator character:"));
-    }
-
-    File file = null;
-    try
-    {
-      // Get file object for log file
-      file = new File(monitorConfig.getLogLocation());
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(
-        messageList.getMessage("config07", "Could not get log file location."),
-        e);
-    }
-
-    // If replace flag is false and file exists, then throw exception
-    if (file.exists() && !monitorConfig.getReplaceLog())
-    {
-      throw new IllegalArgumentException(
-        messageList.getMessage(
-          "config08",
-          monitorConfig.getLogLocation(),
-          "Log file already exists:"));
-    }
-
-    try
-    {
-      // Create output file
-      log = documentFactory.newLog();
-
-      // Set style sheet string
-      log.setStyleSheetString(
-        monitorConfig.getAddStyleSheet().getStyleSheetString());
-
-      // Get log writer
-      logWriter = documentFactory.newLogWriter();
-      logWriter.setWriter(monitorConfig.getLogLocation());
-
-      // Write start of log file
-      logWriter.write(new StringReader(log.getStartXMLString("")));
-
-      // Write monitor tool information
-      logWriter.write(new StringReader(toXMLString("")));
-
-      // Create log entry queue
-      messageEntryQueue = new MessageEntryQueue(this, log, logWriter);
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(
-        messageList.getMessage(
-          "error03",
-          "Could not create log or log writer."),
-        e);
-    }
-
-    // Get manInTheMiddle settings
-    ManInTheMiddle manInTheMiddle = monitorConfig.getManInTheMiddle();
-
-    // Get list of redirects
-    Iterator iterator = manInTheMiddle.getRedirectList().iterator();
-
-    // Process each redirect
-    Redirect redirect;
-    while (iterator.hasNext())
-    {
-      // Get next redirect
-      redirect = (Redirect) iterator.next();
-
-      // Create server socket socket listener
-      listenerList.add(new ServerSocketListener(this, redirect));
-    }
-
-    // Add shutdown hook
-    Runtime.getRuntime().addShutdownHook(new ShutdownHook());
-
-    // Create and start console
-    Console console = new Console();
-    console.start();
-  }
-
-  /**
-   * Get the monitor config file.
-   * @return the monitor config file.
-   */
-  public MonitorConfig getMonitorConfig()
-  {
-    return monitorConfig;
-  }
-
-  /**
-   * Get the log object.
-   * @return the log object.
-   */
-  public Log getLog()
-  {
-    return this.log;
-  }
-
-  /**
-   * Get the log entry queue object.
-   * @return the log entry queue object.
-   */
-  public MessageEntryQueue getMessageEntryQueue()
-  {
-    return this.messageEntryQueue;
-  }
-
-  /**
-   * Terminate the monitor.
-   */
-  void exitMonitor()
-  {
-    printMessage("stopping01", "Stopping the monitor...");
-    System.exit(0);
-  }
-
-  /**
-   * Stop the monitor because an exception occurred.
-   */
-  void exitMonitor(Exception e)
-  {
-    // Display error message
-    printMessage(
-      "stopping02",
-      "Stopping monitor because an exception occurred.");
-    System.err.println("EXCEPTION: " + e.toString());
-    if (this.monitorConfig.getVerboseOption())
-      e.printStackTrace();
-
-    // Exit monitor
-    exitMonitor();
-  }
-
-  /**
-   * Stop the monitor.
-   */
-  void stopMonitor()
-  {
-    try
-    {
-      // Get list of listeners to stop
-      Iterator iterator = listenerList.iterator();
-
-      while (iterator.hasNext())
-      {
-        ((ServerSocketListener) iterator.next()).shutdown();
-      }
-
-      // Wait for the cleanup timeout seconds
-      Thread.sleep(monitorConfig.getTimeout() * 1000);
-
-      // Write end of log file
-      if (logWriter != null)
-      {
-        logWriter.write(new StringReader(log.getEndXMLString("")));
-
-        logWriter.close();
-      }
-    }
-
-    catch (Exception e)
-    {
-      // ADD: How should this execption be handled?
-    }
-
-    printMessage("stopped01", "Monitor stopped.");
-  }
-
-  /**
-   * Command line interface.
-   * @param args command line arguments.
-   */
-  public static void main(String[] args)
-  {
-    Monitor monitor = null;
-
-    try
-    {
-      if (args.length < 2)
-      {
-        staticPrintMessage("usage01", USAGE_MESSAGE);
-        System.exit(1);
-      }
-
-      if (!args[0].equalsIgnoreCase("-config"))
-      {
-        staticPrintMessage("usage01", USAGE_MESSAGE);
-        System.exit(1);
-      }
-
-      // Run the monitor
-      monitor = new Monitor(args);
-    }
-
-    catch (Exception e)
-    {
-      boolean printStackTrace = true;
-      String messageID;
-      String defaultMessage;
-      String messageData;
-
-      if ((e instanceof WSIFileNotFoundException)
-        || (e instanceof IllegalArgumentException))
-      {
-        printStackTrace = false;
-        messageID = "error01";
-        defaultMessage = "Monitor Error:";
-        messageData = e.getMessage();
-      }
-
-      else
-      {
-        printStackTrace = true;
-        messageID = "error02";
-        defaultMessage = "Monitor Stopped By Exception:";
-        messageData = e.toString();
-      }
-
-      if (monitor != null)
-        monitor.printMessage(messageID, messageData, defaultMessage);
-      else
-        Monitor.staticPrintMessage(messageID, messageData, defaultMessage);
-
-      if (printStackTrace)
-        e.printStackTrace();
-
-      // Exit
-      if (monitor != null)
-        monitor.exitMonitor();
-      else
-        System.exit(2);
-    }
-  }
-
-  /**
-   * Print a message from the resource bundle.
-   * @param key a key.
-   * @param defaultMessage a default message.
-   */
-  public void printMessage(String key, String defaultMessage)
-  {
-    printMessage(key, null, defaultMessage);
-  }
-
-  /**
-   * Print a message from the resource bundle.
-   * @param key a key.
-   * @param messageData message data.
-   * @param defaultMessage a default message.
-   */
-  public void printMessage(
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    messageList.printMessage(key, messageData, defaultMessage);
-  }
-
-  /**
-   * Print message.
-   * @param key a key.
-   * @param defaultMessage a default message.
-   */
-  public static void staticPrintMessage(String key, String defaultMessage)
-  {
-    staticPrintMessage(key, null, defaultMessage);
-  }
-
-  /**
-   * Print message.
-   * @param key a key.
-   * @param messageData message data.
-   * @param defaultMessage a default message.
-  
-   */
-  public static void staticPrintMessage(
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    MessageList.printMessage(
-      RESOURCE_BUNDLE_NAME,
-      key,
-      messageData,
-      defaultMessage);
-  }
-
-  /**
-   * Get the next conversation identifier.
-   * @return the next conversation identifier.
-   */
-  synchronized int getNextConversationId()
-  {
-    return conversationId++;
-  }
-
-  /**
-   * Return XML string representation of this object.
-   * @param namespaceName namespace prefix.
-   * @return XML string representation of this object.
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    // Start
-    pw.print(toolInfo.getStartXMLString(namespaceName));
-
-    // Config
-    pw.print(
-      monitorConfig.toXMLString(WSIConstants.NS_NAME_WSI_MONITOR_CONFIG));
-
-    // End
-    pw.println(toolInfo.getEndXMLString(namespaceName));
-
-    return sw.toString();
-  }
-
-  /**
-   * Shutdown hook.
-   */
-  class ShutdownHook extends Thread
-  {
-    /**
-     * Run shutdown procedure.
-     */
-    public void run()
-    {
-      stopMonitor();
-    }
-  }
-
-  /**
-   * Run command from console.
-   */
-  class Console extends Thread
-  {
-    /**
-     * Prompt user and wait for input.
-     */
-    public void run()
-    {
-      // Get the exit string
-      String exitString = messageList.getMessage("exit01", "exit");
-
-      // Display options and how to stop application
-      TestUtils.printToolInfo(toolInfo);
-      System.out.print(monitorConfig.toString());
-      System.out.println(" ");
-      printMessage(
-        "start01",
-        "The "
-          + toolInfo.getName()
-          + " tool is ready to intercept and log web service messages.");
-      printMessage(
-        "start02",
-        "Type \"exit\" to stop the " + toolInfo.getName() + ".");
-      System.out.println(" ");
-
-      // Get the time to stop accepting connections
-      long stopTime =
-        System.currentTimeMillis() + (monitorConfig.getLogDuration() * 1000);
-      // SS
-
-      try
-      {
-        // Get stdin as a buffered reader
-        BufferedReader reader =
-          new BufferedReader(new InputStreamReader(System.in));
-
-        // Process input from console
-        boolean exit = false;
-        while ((!exit) && (System.currentTimeMillis() < stopTime))
-        { // SS
-          // Sleep
-          Thread.sleep(500);
-
-          // Check for user input
-          if (reader.ready())
-          {
-            if (reader.readLine().equalsIgnoreCase(exitString))
-              exit = true;
-          }
-        }
-      }
-
-      catch (Exception e)
-      {
-        // ADD: How should this be handled?
-        System.err.println(e.toString());
-      }
-
-      // Exit
-      exitMonitor();
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.properties b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.properties
deleted file mode 100644
index d4d606c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.properties
+++ /dev/null

@@ -1,38 +0,0 @@
-# /*******************************************************************************
-#  * Copyright (c) 2002-2005 IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM - Initial API and implementation
-#  *******************************************************************************/
-
-#
-# Monitor message resource bundle.
-#
-usage01=Usage: Monitor -config <configFilename>
-stopped01=Monitor stopped.
-error01=Monitor Error:
-error02=Monitor Stopped By Exception: 
-error03=Could not create log or log writer.
-error04=Monitor cannot connect to a redirect host:
-stopping01=Stopping the monitor...
-stopping02=Stopping monitor because an exception occurred.
-log01=Log message entry [ID, Type, Sender]:
-start01=The Monitor tool is ready to intercept and log web service messages.
-start02=Type "exit" to stop the Monitor.
-exit01=exit
-config01=The specified option is not supported:
-config02=Monitor configuration file was not found.  Specified file location:
-config03=Could not read monitor configuration file.  Specified file location:
-config04=Element must contain an integer value.  Element name:
-config05=Monitor configuration file did not contain any redirect statements.
-config06=Monitor configuration file did not contain the log file URI.
-config07=Could not get log file location.
-config08=Log file already exists.  Specified file location:
-config09=Element is missing. Element name:
-config10=Parameter value can't be negative. Element name:
-config11=The log file location value cannot contain the pass separator character:
-

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java
deleted file mode 100644
index 7516c8c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-
-/**
- * A server socket listener.
- *
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class ServerSocketListener
-  extends Thread
-  implements ConnectionListener // SS
-{
-  protected Monitor monitor = null;
-  protected Redirect redirect = null;
-
-  protected ServerSocket serverSocket = null;
-  protected boolean stopServerSocket = false;
-
-  protected Vector connectionList = new Vector();
-
-  /**
-   * Create server socket listener.
-   * @param monitor a Monitor object.
-   * @param redirect a Redirect object.
-   */
-  public ServerSocketListener(Monitor monitor, Redirect redirect)
-  {
-    this.monitor = monitor;
-    this.redirect = redirect;
-
-    // Start listening
-    start();
-  }
-
-  /**
-   * Run the thread and listen for a connection on the socket.
-   */
-  public void run()
-  {
-    try
-    {
-      // Create server socket
-      serverSocket =
-        new ServerSocket(
-          redirect.getListenPort(),
-          redirect.getMaxConnections());
-      // SS
-
-      // Set timeout so that server socket will continue to accept connections
-      serverSocket.setSoTimeout(0);
-
-      // Listen for connections until interrupted
-      while (!stopServerSocket)
-      {
-        // Accept connections
-        Socket socket = serverSocket.accept();
-
-        // If the server socket was NOT stopped, process connection
-        if (!stopServerSocket)
-        {
-          // Create new connection
-          SocketConnection socketConnection =
-            new SocketConnection(this.monitor, this.redirect, socket);
-
-          //register as a listener
-          socketConnection.addConnectionListener(this); // SS
-
-          // Add to connection list
-          connectionList.add(socketConnection);
-        }
-      }
-    }
-
-    catch (Exception e)
-    {
-      // If the exception was NOT caused by closing the socket, then stop monitor
-      if (!e.getMessage().equals("socket closed"))
-      {
-        monitor.exitMonitor(e);
-      }
-    }
-  }
-
-  /**
-   * Stop listening for a connection on the socket.
-   */
-  public void shutdown()
-  {
-    try
-    {
-      // Shutdown all active connections
-      Iterator iterator = connectionList.iterator();
-      while (iterator.hasNext())
-      {
-        ((SocketConnection) iterator.next()).shutdown();
-      }
-
-      // Tell the server socket listening thread to stop
-      this.stopServerSocket = true;
-
-      // Set the server socket timeout to 1 ms
-      serverSocket.setSoTimeout(1);
-
-      // Close the server socket
-      if (serverSocket != null)
-        serverSocket.close();
-    }
-
-    catch (Exception e)
-    {
-    }
-  }
-
-  // ==== SS start ====
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.ConnectionListener#connectionClosed()
-   */
-  public void connectionClosed(SocketConnection connection)
-  {
-    connectionList.remove(connection);
-  }
-  // ==== SS end ====
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java
deleted file mode 100644
index fe2a0f4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java
+++ /dev/null

@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-import java.net.Socket;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * A socket connection.
- *
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class SocketConnection extends Thread
-{
-  protected Monitor monitor;
-  protected Redirect redirect;
-  protected Socket inSocket;
-  protected Socket outSocket;
-
-  protected String httpProxyHost = null;
-  protected int httpProxyPort;
-
-  protected SocketHandler requestSocketHandler = null;
-  protected SocketHandler responseSocketHandler = null;
-
-  private Vector listeners = new Vector(); // SS
-
-  /**
-   * Create socket connection.
-   * @param monitor  a Monitor object.
-   * @param redirect a Redirect object.
-   * @param inSocket in socket.
-   */
-  public SocketConnection(Monitor monitor, Redirect redirect, Socket inSocket)
-  {
-    this.monitor = monitor;
-    this.redirect = redirect;
-    this.inSocket = inSocket;
-
-    // Start processing the connection
-    start();
-  }
-
-  /**
-   * Process the socket connection.
-   */
-  public void run()
-  {
-    // Get the HTTP proxy settings if there are any set (not used currently)
-    loadHttpProxySettings();
-
-    try
-    {
-      // Open the connection to the server
-      this.outSocket = new Socket(redirect.getToHost(), redirect.getToPort());
-
-      // Set the read timeout for the input socket
-      this.inSocket.setSoTimeout(redirect.getReadTimeoutSeconds() * 1000);
-
-      // Get the next conversation ID
-      int conversationId = monitor.getNextConversationId();
-
-      // Create the socket handlers which are used to send the data from
-      // the client to the server
-      requestSocketHandler =
-        new SocketHandler(
-          this,
-          MessageEntry.TYPE_REQUEST,
-          conversationId,
-          redirect.getToHost(),
-          this.inSocket,
-          this.outSocket,
-          redirect.getReadTimeoutSeconds());
-      responseSocketHandler =
-        new SocketHandler(
-          this,
-          MessageEntry.TYPE_RESPONSE,
-          conversationId,
-          redirect.getToHost(),
-          this.outSocket,
-          this.inSocket,
-          redirect.getReadTimeoutSeconds());
-
-      // Tell each socketHandler about the other one
-      requestSocketHandler.setPairedSocketHandler(responseSocketHandler);
-      responseSocketHandler.setPairedSocketHandler(requestSocketHandler);
-    }
-
-    catch (Exception e)
-    {
-      Monitor.staticPrintMessage(
-        "error04",
-        redirect.getToHost(),
-        "Monitor cannot connect to a redirect host:");
-
-      shutdown();
-
-      try
-      {
-        this.inSocket.close();
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-  }
-
-  /**
-   * Log message.
-   * @param conversationID      the coversation id.
-   * @param connectionType      the connection type.
-   * @param timestamp           the timestamp.
-   * @param senderHostAndPort   the sender host and port.
-   * @param receiverHostAndPort the receiver host and port.
-   * @param messageBuffer       the message.
-   * @param bom                 the BOM.
-   * @param encoding            the encoding.
-   * @throws WSIException if  there is a problem logging message.
-  */
-  public void logMessage(
-    int conversationID,
-    String connectionType,
-    String timestamp,
-    String senderHostAndPort,
-    String receiverHostAndPort,
-    StringBuffer messageBuffer,
-    int bom,
-    String encoding)
-    throws WSIException
-  {
-    MessageEntry messageEntry = null;
-
-    // Create message entry
-    messageEntry =
-      createMessageEntry(
-        conversationID,
-        connectionType,
-        timestamp,
-        senderHostAndPort,
-        receiverHostAndPort,
-        messageBuffer.toString(),
-        bom,
-        encoding);
-
-    // DEBUG:
-    //debug("logMessage", " messageEntry: " + messageEntry);
-
-    // Add entry to the queue
-    monitor.getMessageEntryQueue().addMessageEntry(messageEntry);
-  }
-
-  /**
-   * Create a log entry from all of the data that was gathered.
-   */
-  private MessageEntry createMessageEntry(
-    int conversationID,
-    String messageType,
-    String timestamp,
-    String senderHostAndPort,
-    String receiverHostAndPort,
-    String message,
-    int bom,
-    String encoding)
-    throws WSIException
-  {
-    // Create log entry object
-    MessageEntry messageEntry = monitor.getLog().createLogEntry();
-
-    // Set input information in log entry
-    // NOTE:  The ID is set just before the log entry is written to the log file in LogEntryQueue
-    //logEntry.setId(id);
-    messageEntry.setConversationId(String.valueOf(conversationID));
-    messageEntry.setType(messageType);
-    messageEntry.setTimestamp(timestamp);
-    messageEntry.setSenderHostAndPort(senderHostAndPort);
-    messageEntry.setReceiverHostAndPort(receiverHostAndPort);
-    messageEntry.setEncoding(encoding);
-
-    // Get HTTP headers from full message
-    String httpHeaders = Utils.getHTTPHeaders(message);
-    messageEntry.setHTTPHeaders(httpHeaders);
-	
-   if (Utils.isMultipartRelatedMessage(httpHeaders))
-    {
-    	MimeParts mimeParts = Utils.parseMultipartRelatedMessage(message, httpHeaders, encoding);
-    	if (mimeParts == null)
-    	{
-    	  // problem creating Mimeparts -- treat it as simple SOAP message
-    	  String content = Utils.getContent(message);
-    	  messageEntry.setMessage(content);
-    	  messageEntry.setMimeContent(false);
-    	}
-    	else
-    	{
-          messageEntry.setMimeParts(mimeParts);
-          messageEntry.setMimeContent(true);
-    	}
-    }
-    else
-    {
-      // Get the message content
-      String content = Utils.getContent(message);
-      messageEntry.setMessage(content);
-      messageEntry.setMimeContent(false);
-    }
-
-    // Set the BOM, if there is one
-    if (bom != 0)
-      messageEntry.setBOM(bom);
-
-    return messageEntry;
-  }
-
-  /**
-   * Load HTTP proxy settings.
-   */
-  public void loadHttpProxySettings()
-  {
-    // Get the HTTP proxy host setting
-    this.httpProxyHost = System.getProperty("http.proxyHost");
-    if (this.httpProxyHost != null && httpProxyHost.equals(""))
-      this.httpProxyHost = null;
-
-    // If there was an HTTP proxy host setting, then get the port
-    if (this.httpProxyHost != null)
-    {
-      String portString = System.getProperty("http.proxyPort");
-
-      // Set default to 80
-      if (portString == null || portString.equals(""))
-        this.httpProxyPort = 80;
-      else
-        httpProxyPort = Integer.parseInt(portString);
-    }
-  }
-
-  Monitor getMonitor()
-  {
-    return this.monitor;
-  }
-
-  synchronized void wakeUp()
-  {
-    fireConnectionClosed(); // SS
-    notifyAll();
-  }
-
-  /**
-   * Shutdown.
-   */
-  public void shutdown()
-  {
-    if (this.requestSocketHandler != null)
-      this.requestSocketHandler.shutdown();
-    if (this.responseSocketHandler != null)
-      this.responseSocketHandler.shutdown();
-  }
-
-  // ==== SS start ====
-  /**
-   * Add connection event listener.
-   * @param listener event listener.
-   * @see #removeConnectionListener
-   */
-  public void addConnectionListener(ConnectionListener listener)
-  {
-    listeners.add(listener);
-  }
-  /**
-   * Remove connection event listener.
-   * @param listener event listener.
-   * @see #addConnectionListener
-   */
-  public void removeConnectionListener(ConnectionListener listener)
-  {
-    listeners.remove(listener);
-  }
-  /**
-   * Notify listeners on connection close.
-   */
-  private void fireConnectionClosed()
-  {
-    for (Iterator i = listeners.iterator(); i.hasNext();)
-    {
-      ConnectionListener listener = (ConnectionListener) i.next();
-      listener.connectionClosed(this);
-    }
-  }
-  // ==== SS end ====
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java
deleted file mode 100644
index 8a38a26..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java
+++ /dev/null

@@ -1,963 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Beacon Information Technology Inc. and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   BeaconIT - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.Socket;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * Socket Handler.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class SocketHandler extends Thread
-{
-  protected SocketConnection socketConnection;
-  protected SocketHandler pairedSocketHandler;
-  protected String connectionType;
-  protected int conversationID;
-  protected String targetHost;
-  protected int readTimeoutSeconds;
-
-  protected Socket inSocket;
-  protected Socket outSocket;
-  protected InputStream inputStream = null;
-  protected OutputStream outputStream = null;
-
-  protected boolean verbose = false;
-
-  protected boolean readTimedOut = false;
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  private String mimeCharset = null;
-  private String xmlEncoding = null;
-
-  protected static final String CRLF = "\r\n";
-
-  protected static final String HTTP_100_CONTINUE =
-    "100 Continue".toUpperCase();
-  protected static final String CHUNKED =
-    "Transfer-Encoding: chunked".toUpperCase();
-  protected static final String CHUNKED_WITH_QUOTES =
-    "Transfer-Encoding: \"chunked\"".toUpperCase();
-  protected static final String CONTENT_LENGTH =
-    "Content-Length:".toUpperCase();
-
-  /**
-   * Create socket handler.
-   * @param socketConnection   socket connection.
-   * @param connectionType     connection type.
-   * @param conversationID     conversation id.
-   * @param targetHost         target host.
-   * @param inSocket           in socket.
-   * @param outSocket          out socket.
-   * @param readTimeoutSeconds read timeout seconds.
-   */
-  public SocketHandler(
-    SocketConnection socketConnection,
-    String connectionType,
-    int conversationID,
-    String targetHost,
-    Socket inSocket,
-    Socket outSocket,
-    int readTimeoutSeconds)
-  {
-    this.socketConnection = socketConnection;
-    this.connectionType = connectionType;
-    this.conversationID = conversationID;
-    this.targetHost = targetHost;
-    this.inSocket = inSocket;
-    this.outSocket = outSocket;
-    this.readTimeoutSeconds = readTimeoutSeconds;
-
-    // ADD:
-    verbose =
-      socketConnection.getMonitor().getMonitorConfig().getVerboseOption();
-
-    start();
-  }
-
-  /**
-   * Set paired socket handler.
-   * @param pairedSocketHandler paired socket handler.
-   */
-  public void setPairedSocketHandler(SocketHandler pairedSocketHandler)
-  {
-    this.pairedSocketHandler = pairedSocketHandler;
-  }
-
-  /**
-   * Send the data from the input socket to the output socket.
-   */
-  public void run()
-  {
-    int readLen;
-    String readMsg;
-    MessageContext messageContext = null;
-
-    // Create read buffer      
-    byte[] readBuffer = new byte[4096];
-
-    try
-    {
-      // Get the input and output streams
-      this.inputStream = this.inSocket.getInputStream();
-      this.outputStream = this.outSocket.getOutputStream();
-
-      // Process while the connection is active 
-      // (NOTE: there might be more than 1 message per connection)
-      boolean connectionActive = true;
-      while (connectionActive)
-      {
-        // Reset all data
-        readLen = 0;
-        messageContext = new MessageContext();
-
-        // Read until message is complete
-        boolean messageComplete = false;
-        while (!messageComplete)
-        {
-          try
-          {
-            // DEBUG:
-            debug("run", "Read data from the input stream.");
-
-            // Read data from the input stream
-            readLen = inputStream.read(readBuffer, 0, readBuffer.length);
-
-            // Reset read timeout flag
-            readTimedOut = false;
-
-            // DEBUG:
-            debug("run", "readLen: " + readLen);
-
-            if (readLen == -1)
-            {
-              connectionActive = false;
-              messageComplete = true;
-            }
-
-            // If data was read, then check for 100 continue
-            else if (readLen > 0)
-            {
-              // If this is the first data that was read, then get the timestamp
-              if (messageContext.timestamp == null)
-                messageContext.timestamp = Utils.getTimestamp();
-
-              if (connectionType.equals(MessageEntry.TYPE_REQUEST))
-              {
-                byte[] toHost =
-                  new String(
-                    socketConnection.redirect.getToHost()
-                      + ":"
-                      + socketConnection.redirect.getToPort())
-                    .getBytes();
-
-                String message = new String(readBuffer, 0, readLen);
-
-                int index = message.indexOf(CRLF + "Host: ");
-                if (index > -1)
-                {
-                  index += 8;
-                  int secondPart = message.indexOf(CRLF, index);
-
-                  // Write the data to the output stream and then go format it
-                  write(this.outputStream, readBuffer, 0, index);
-                  write(this.outputStream, toHost, 0, toHost.length);
-                  write(
-                    this.outputStream,
-                    readBuffer,
-                    secondPart,
-                    readLen - secondPart);
-                }
-                else
-                {
-                  // Write the data to the output stream and then go format it
-                  write(this.outputStream, readBuffer, 0, readLen);
-                }
-              }
-              else
-              {
-                // Write the data to the output stream and then go format it
-                write(this.outputStream, readBuffer, 0, readLen);
-              }
-
-              // DEBUG:
-              if (verbose)
-              {
-                String bufferString = new String(readBuffer, 0, readLen);
-                debug("run", "buffer as string: [" + bufferString + "]");
-                if (bufferString.length() <= 50)
-                  debug(
-                    "run",
-                    "buffer as hexstring: ["
-                      + Utils.toHexString(bufferString)
-                      + "]");
-                else
-                  debug(
-                    "run",
-                    "buffer as hexstring: ["
-                      + Utils.toHexString(bufferString.substring(0, 50))
-                      + " ...]");
-              }
-
-              // See if this part of the buffer contains the BOM
-              if (messageContext.bom == 0)
-              {
-                messageContext.bom = getBOM(readBuffer);
-              }
-
-              // DEBUG
-              debug("run", "bom: " + messageContext.bom);
-
-              String encoding;
-
-              try
-              {
-                encoding = getEncoding();
-                readMsg =
-                  new String(
-                    readBuffer,
-                    0,
-                    readLen,
-                    Utils.getJavaEncoding(encoding));
-                setEncoding(readMsg);
-                if (!encoding.equals(getEncoding()))
-                {
-                  encoding = getEncoding();
-                  readMsg =
-                    new String(
-                      readBuffer,
-                      0,
-                      readLen,
-                      Utils.getJavaEncoding(encoding));
-                }
-              }
-
-              catch (UnsupportedEncodingException uee)
-              {
-                debug("run", "EXCEPTION (3): " + uee.toString());
-                throw new RuntimeException(uee.toString());
-              }
-
-              // Set encoding in the message context
-              messageContext.encoding = encoding;
-
-              // DEBUG
-              debug("run", "encoding: " + messageContext.encoding);
-
-              // Process message
-              messageContext = processMessage(readLen, readMsg, messageContext);
-            }
-
-            // If message is complete, then log it and reset buffer
-            if ((isMessageComplete(messageContext))
-              || ((readLen == -1) && (messageContext.messageBuffer.length() > 0)))
-            {
-              // Log message
-              logMessage(messageContext);
-
-              // Set message complete
-              messageComplete = true;
-            }
-          }
-
-          catch (InterruptedIOException ie)
-          {
-            // Set read timeout flag
-            readTimedOut = true;
-
-            debug("run", "InterruptedIOException: " + ie.toString());
-
-            // If the read is not done, then shutdown 
-            if (pairedSocketHandler != null
-              && pairedSocketHandler.isReadWaiting()
-              && pairedSocketHandler.isReadTimedOut())
-            {
-              // DEBUG:
-              debug("run", "read timed out on both sockets");
-
-              // If there is data in the message buffer and it is complete, then log it
-              if ((isMessageComplete(messageContext))
-                || (messageContext.messageBuffer.length() > 0))
-              {
-                // Log message
-                logMessage(messageContext);
-              }
-
-              // Set message complete
-              connectionActive = false;
-              messageComplete = true;
-            }
-          }
-
-          catch (Exception e2)
-          {
-            // DEBUG:
-            debug(
-              "run",
-              "EXCEPTION (2): "
-                + e2.toString()
-                + "\n"
-                + Utils.getExceptionDetails(e2));
-            //e2.printStackTrace();
-
-            // If there is data in the message buffer and it is complete, then log it
-            if ((isMessageComplete(messageContext))
-              || (messageContext.messageBuffer.length() > 0))
-            {
-              // Log message
-              logMessage(messageContext);
-            }
-
-            // Set message complete
-            connectionActive = false;
-            messageComplete = true;
-          }
-        }
-      }
-    }
-
-    catch (Exception e)
-    {
-      // DEBUG:
-      debug(
-        "run",
-        "EXCEPTION (1): "
-          + e.getMessage()
-          + "\n"
-          + Utils.getExceptionDetails(e));
-      //e.printStackTrace();
-    }
-
-    catch (Error err)
-    {
-      // DEBUG:
-      debug("run", "ERROR: " + err.getMessage());
-      //err.printStackTrace();
-    }
-
-    finally
-    {
-      shutdown();
-      socketConnection.wakeUp();
-    }
-  }
-
-  /**
-   * Process the message.
-   */
-  private MessageContext processMessage(
-    int readLen,
-    String readMsg,
-    MessageContext inMessageContext)
-    throws WSIException
-  {
-    boolean continueRead = false;
-
-    // Initialize message context                                       
-    MessageContext messageContext = inMessageContext;
-
-    // Get message buffer and chunked data from message context
-    StringBuffer messageBuffer = messageContext.messageBuffer;
-    ChunkedData chunkedData = messageContext.chunkedData;
-
-    // If all we received was the header with 100 continue, then ignore it
-    if ((readMsg.toUpperCase().indexOf(HTTP_100_CONTINUE) != -1)
-      && (readLen >= 25))
-    {
-      // DEBUG:
-      debug("processMessage", "Ignore HTTP 100 Continue.");
-
-      // Find the end of the HTTP 100 message
-      int index = Utils.getFirstCRLFCRLF(readMsg);
-
-      // If there is only the HTTP 100 message, then just ignore it
-      if (index == readMsg.length())
-        continueRead = true;
-
-      // Otherwise remove the HTTP 100 message and continue
-      else
-        readMsg = readMsg.substring(index);
-    }
-
-    // ADD: What if a bypassed message contains another message after it?
-    if (!continueRead && bypassMessage(readMsg))
-    {
-      // DEBUG:
-      debug(
-        "processMessage",
-        "Do not log message as defined in the monitor spec, but it will be sent.");
-
-      continueRead = true;
-    }
-
-    if (!continueRead)
-    {
-      int index = 0;
-
-      // If there is chunked data, then get the length
-      if ((readMsg.toUpperCase().indexOf(CHUNKED) != -1)
-        || (readMsg.toUpperCase().indexOf(CHUNKED_WITH_QUOTES) != -1))
-      {
-        // DEBUG:
-        debug("processMessage", "Processing chunked data...");
-
-        // Get the location of the first CFLF
-        if ((index = readMsg.indexOf(CRLF + CRLF)) == -1)
-        {
-          throw new WSIException("Could not locate end of HTTP header.");
-        }
-
-        // Include the CRLF+CRLF in the index
-        index += 4;
-
-        // DEBUG:
-        debug(
-          "processMessage",
-          "Add header before decoding chunked data: ["
-            + readMsg.substring(0, index)
-            + "]");
-
-        // Add HTTP header to buffer
-        messageBuffer.append(readMsg.substring(0, index));
-
-        // If there is no more data (i.e. header only), then just indicate that there is more chunked data
-        if (readMsg.length() == index)
-        {
-          chunkedData = new ChunkedData(this, true);
-
-          // DEBUG:
-          debug(
-            "processMessage",
-            "There is chunk data, but none in this part of the message.");
-        }
-
-        // Determine if the remainder of the data is complete (i.e. ends with [0][CRLF][Optional Footer][CRLF])
-        else
-        {
-          // Create chunked data object
-          chunkedData = new ChunkedData(this, readMsg.substring(index));
-
-          if (!chunkedData.isMoreChunkedData())
-          {
-            chunkedData.decodeAndAddDataToBuffer(messageBuffer);
-          }
-        }
-      }
-
-      else if (chunkedData != null && chunkedData.isMoreChunkedData())
-      {
-        // DEBUG:
-        debug("processMessage", "Processing MORE chunked data...");
-
-        // Add data
-        chunkedData.addData(readMsg);
-
-        // Decode data
-        if (!chunkedData.isMoreChunkedData())
-        {
-          chunkedData.decodeAndAddDataToBuffer(messageBuffer);
-        }
-      }
-
-      // Else just append the data to the buffer
-      else
-      {
-        // DEBUG:
-        debug(
-          "processMessage",
-          "Add data to message entry buffer: [" + readMsg + "]");
-
-        messageBuffer.append(readMsg);
-      }
-    }
-
-    // Set updated message buffer and chunked data in message context    
-    messageContext.messageBuffer = messageBuffer;
-    messageContext.chunkedData = chunkedData;
-
-    // Return message context 
-    return messageContext;
-  }
-
-  /**
-   * Shutdown input socket and close input stream.
-   * @param inSocket in socket.
-   * @param inputStream input stream.
-   */
-  protected void stopInput(Socket inSocket, InputStream inputStream)
-  {
-    try
-    {
-      // If there is a input socket, then shutdown the input
-      if (inSocket != null)
-      {
-        inSocket.shutdownInput();
-      }
-
-      // If there is an input stream then close it
-      if (inputStream != null)
-      {
-        inputStream.close();
-      }
-    }
-    catch (Exception e)
-    {
-      // Ignore since we are stopping everything
-    }
-
-    inputStream = null;
-  }
-
-  /**
-   * Shutdown output socket and close output stream.
-   * @param outSocket out socket.
-   * @param outputStream output stream.
-   */
-  protected void stopOutput(Socket outSocket, OutputStream outputStream)
-  {
-    try
-    {
-      // If there is an output stream, then flush it
-      if (outputStream != null)
-      {
-        outputStream.flush();
-      }
-
-      // If there is a input socket, then shutdown the input
-      if (outSocket != null)
-      {
-        outSocket.shutdownOutput();
-      }
-
-      // If there is an output stream then close it
-      if (outputStream != null)
-      {
-        outputStream.close();
-      }
-    }
-
-    catch (Exception e)
-    {
-      // Ignore since we are stopping everything
-    }
-
-    outputStream = null;
-  }
-
-  /**
-   * Shutdown handler.
-   */
-  public void shutdown()
-  {
-    // Stop both the input and output
-    stopInput(this.inSocket, this.inputStream);
-    stopOutput(this.outSocket, this.outputStream);
-  }
-
-  /**
-   * Display debug messages.
-   */
-  void debug(String method, String message)
-  {
-    debug("SocketHandler", method, message);
-  }
-
-  /**
-   * Display debug messages.
-   */
-  void debug(String className, String method, String message)
-  {
-    if (verbose)
-      print(className, method, message);
-  }
-
-  /**
-   * Display messages.
-   */
-  void print(String className, String method, String message)
-  {
-    System.out.println(
-      "["
-        + Thread.currentThread().getName()
-        + "] ["
-        + className
-        + "."
-        + method
-        + "] ["
-        + this.connectionType
-        + "] "
-        + message);
-  }
-
-  /** 
-   * Write data.
-   */
-  private void write(
-    OutputStream outputStream,
-    byte[] buffer,
-    int start,
-    int length)
-    throws IOException
-  {
-    if (outputStream == null)
-    {
-      // DEBUG:
-      debug("write", "Could not write buffer because output stream is null.");
-    }
-    else
-    {
-      // DEBUG:
-      debug("write", "buffer: [" + new String(buffer, start, length) + "]");
-
-      outputStream.write(buffer, start, length);
-    }
-  }
-
-  /** 
-   * Check if message is complete.
-   * 
-   * @param messageContext
-   */
-  private boolean isMessageComplete(MessageContext messageContext)
-    throws WSIException
-  {
-    int index, index2, contentLen;
-    boolean messageComplete = false;
-
-    boolean moreChunkedData = messageContext.chunkedData.isMoreChunkedData();
-
-    String message = messageContext.messageBuffer.toString();
-
-    // Find the first CRLF + CRLF which marks the end of the HTTP header
-    String httpHeader;
-    index = Utils.getFirstCRLFCRLF(message);
-    if (index == -1)
-      httpHeader = message;
-    else
-      httpHeader = message.substring(0, index);
-
-    // If chunked data, then complete only if there is no more data
-    if (((httpHeader.toUpperCase().indexOf(CHUNKED) != -1)
-      || (httpHeader.toUpperCase().indexOf(CHUNKED_WITH_QUOTES) != -1))
-      && (!moreChunkedData))
-    {
-      debug(
-        "isMessageComplete",
-        "HTTP header indicates chunked data and there is no more chunked data");
-      messageComplete = true;
-    }
-
-    // Check for content length
-    else if ((index = httpHeader.toUpperCase().indexOf(CONTENT_LENGTH)) == -1)
-    {
-      debug("isMessageComplete", "HTTP header does not contain content length");
-
-      // Should not have complete POST header without content length
-      if (httpHeader.startsWith("POST"))
-      {
-        if (httpHeader.endsWith(CRLF + CRLF))
-        {
-          throw new WSIException("Could not locate content-length in HTTP POST header.");
-        }
-
-        messageComplete = false;
-      }
-
-      // This could be a GET, so see if the the complete header has been received
-      else if (
-        httpHeader.startsWith("GET")
-          && (message.length() == httpHeader.length()
-            && message.endsWith(CRLF + CRLF)))
-      {
-        messageComplete = true;
-      }
-
-      else
-      {
-        messageComplete = false;
-      }
-    }
-
-    // If there is content length, then see if the entire message has been received
-    else if ((index = httpHeader.toUpperCase().indexOf(CONTENT_LENGTH)) != -1)
-    {
-      // Find end of content length value
-      index2 = httpHeader.indexOf(CRLF, index);
-
-      debug("isMessageComplete", "CRLF: " + Utils.toHexString(CRLF));
-      debug(
-        "isMessageComplete",
-        "httpHeader/index: " + Utils.toHexString(httpHeader.substring(index)));
-
-      // Get content length
-      contentLen =
-        Integer
-          .decode(
-            httpHeader.substring(index + CONTENT_LENGTH.length() + 1, index2))
-          .intValue();
-
-      // DEBUG:
-      debug("isMessageComplete", "contentLen: " + contentLen);
-
-      // Find the first CRLF + CRLF which marks the end of the HTTP header
-      index = Utils.getFirstCRLFCRLF(message);
-
-      // DEBUG:
-      debug(
-        "isMessageComplete",
-        "actual received message length: " + (message.length() - (index)));
-
-      // If content length is equal to actual message content length, then message is complete
-      if (contentLen == message.length() - index)
-      {
-        messageComplete = true;
-
-        // DEBUG:
-        debug(
-          "isMessageComplete",
-          "contentLen = actual received message length.");
-      }
-    }
-
-    // Message is not complete
-    else
-    {
-      messageComplete = false;
-    }
-
-    // DEBUG:
-    debug("isMessageComplete", "messageComplete: " + messageComplete);
-
-    return messageComplete;
-  }
-
-  /** 
-   * Log message.
-   * 
-   * @param messageBuffer
-   */
-  private void logMessage(MessageContext messageContext) throws WSIException
-  {
-    // Determine sender and receiver host/port
-    String senderHostAndPort, receiverHostAndPort;
-
-    // Request
-    if (connectionType.equals(MessageEntry.TYPE_REQUEST))
-    {
-      senderHostAndPort =
-        inSocket.getInetAddress().getHostAddress() + ":" + inSocket.getPort();
-      receiverHostAndPort = targetHost + ":" + outSocket.getPort();
-    }
-
-    // Response      
-    else
-    {
-      senderHostAndPort = targetHost + ":" + inSocket.getPort();
-      receiverHostAndPort =
-        outSocket.getInetAddress().getHostAddress() + ":" + outSocket.getPort();
-    }
-
-    // Create message entry
-    this.socketConnection.logMessage(
-      conversationID,
-      this.connectionType,
-      messageContext.timestamp,
-      senderHostAndPort,
-      receiverHostAndPort,
-      messageContext.messageBuffer,
-      messageContext.bom,
-      messageContext.encoding);
-  }
-
-  /**
-   * Check for HTTP messages that should not be logged.
-   */
-  private boolean bypassMessage(String message)
-  {
-    boolean bypass = false;
-    if ((message.startsWith("CONNECT"))
-      || (message.startsWith("TRACE"))
-      || (message.startsWith("DELETE"))
-      || (message.startsWith("OPTIONS"))
-      || (message.startsWith("HEAD")))
-    {
-      bypass = true;
-    }
-
-    return bypass;
-  }
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  /**
-   * Set Encoding Parameters
-   * @param messageFragment String of a HTTP message fragment.
-   * @author K.Nakagome@BeaconIT Japan SIG 
-   */
-  private void setEncoding(String messageFragment)
-  {
-    if (mimeCharset == null || mimeCharset.length() == 0)
-    {
-      mimeCharset = Utils.getHTTPCharset(messageFragment);
-    }
-    if (xmlEncoding == null || xmlEncoding.length() == 0)
-    {
-      xmlEncoding = Utils.getXMLEncoding(messageFragment);
-    }
-    return;
-  }
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  /**
-   * Get Encoding Parameter
-   * @return Character encoding of HTTP message.
-   * @author K.Nakagome@BeaconIT Japan SIG 
-   */
-  private String getEncoding()
-  {
-    String encoding = WSIConstants.DEFAULT_XML_ENCODING;
-    if (mimeCharset != null && mimeCharset.length() > 0)
-    {
-      encoding = mimeCharset;
-    }
-    if (xmlEncoding != null && xmlEncoding.length() > 0)
-    {
-      encoding = xmlEncoding;
-    }
-    return encoding;
-  }
-
-  /**
-   * Get the Byte Order Mark from the message (if there is one).
-   */
-  private int getBOM(byte[] message)
-  {
-    int bom = 0;
-
-    byte FF = (byte) 0xFF;
-    byte FE = (byte) 0xFE;
-    byte EF = (byte) 0xEF;
-    byte BB = (byte) 0xBB;
-    byte BF = (byte) 0xBF;
-
-    // Search through the byte array for CRLF+CRLF.  This will mark the end of the header.
-    int i = Utils.getFirstCRLFCRLF(message, 0);
-    if (i != -1)
-    {
-      // DEBUG:
-      debug(
-        "getBOM",
-        "message[i]: "
-          + message[i]
-          + ", message[i+1]: "
-          + message[i+1]);
-
-      // Check for UTF-8 BOM
-      if (((i + 2) < message.length)
-        && message[i] == EF
-        && message[i+1] == BB
-        && message[i+2] == BF)
-      {
-        bom = 0xEFBBBF;
-      }
-      // Check for UTF-16 big-endian BOM
-      else if (
-        ((i+1) < message.length)
-          && message[i] == FE
-          && message[i + 1] == FF)
-      {
-        bom = 0xFEFF;
-      }
-      // Check for UTF-16 little-endian BOM
-      else if (
-        ((i+1) < message.length)
-          && message[i] == FF
-          && message[i+1] == FE)
-      {
-        bom = 0xFFFE;
-      }
-      // ADD: Do we need to check for other BOMs
-    }
-    return bom;
-  }
-
-  /**
-   * Determine if the read is still waiting for data.
-   */
-  boolean isReadWaiting()
-  {
-    boolean readWaiting = false;
-
-    try
-    {
-      // DEBUG:
-      debug(
-        "isReadWaiting",
-        "inSocket.getInputStream().available(): "
-          + inSocket.getInputStream().available());
-
-      if (inSocket.getInputStream().available() == 0)
-      {
-        readWaiting = true;
-      }
-    }
-
-    catch (IOException ioe)
-    {
-    }
-
-    return readWaiting;
-  }
-
-  /**
-   * Get read timed out flag.
-   */
-  boolean isReadTimedOut()
-  {
-    return this.readTimedOut;
-  }
-
-  /**
-   * Message context contains information about the message that is being processed.
-   */
-  class MessageContext
-  {
-    StringBuffer messageBuffer;
-    ChunkedData chunkedData;
-    String timestamp;
-    int bom;
-    String encoding;
-
-    /**
-     * Create new message context.
-     */
-    MessageContext()
-    {
-      messageBuffer = new StringBuffer();
-      chunkedData = new ChunkedData();
-      timestamp = null;
-      bom = 0;
-      encoding = WSIConstants.DEFAULT_XML_ENCODING;
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java
deleted file mode 100644
index bde4ad6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The interface for monitor config Comment element.  
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface Comment extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_COMMENT;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_MONITOR_CONFIG, ELEM_NAME);
-
-  /**
-   * Get comment text.
-   * @return comment text.
-   * @see #setText
-   */
-  public String getText();
-
-  /**
-   * Set comment text.
-   * @param text the comment text.
-   * @see #getText
-   */
-  public void setText(String text);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/ManInTheMiddle.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/ManInTheMiddle.java
deleted file mode 100644
index 85c0aa2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/ManInTheMiddle.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config;
-
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The interface for the monitor config ManInTheMiddle element.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface ManInTheMiddle extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_MAN_IN_THE_MIDDLE;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_MONITOR_CONFIG, ELEM_NAME);
-
-  /**
-   * Get comment.
-   * @return comment.
-   * @see #setComment
-   */
-  public Comment getComment();
-
-  /**
-   * Set comment.
-   * @param comment the Comment object.
-   * @see #getComment
-   */
-  public void setComment(Comment comment);
-
-  /**
-   * Get redirects.
-   * @return the redirirects.
-   * @see #setRedirectList
-   */
-  public Vector getRedirectList();
-
-  /**
-   * Add redirect.
-   * @param redirect the Redirect object.
-   */
-  public void addRedirect(Redirect redirect);
-
-  /**
-   * Set redirects.
-   * @param redirectList a list of the redirects.
-   * @see #getRedirectList 
-   */
-  public void setRedirectList(Vector redirectList);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java
deleted file mode 100644
index 11df1ed..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-
-/**
- * This is the interface for the monitor configuration file.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface MonitorConfig extends WSIDocument
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_CONFIG;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_MONITOR_CONFIG, ELEM_NAME);
-
-  /**
-   * Initialize monitor config.
-   * @param messageList a lMessageList object.
-   */
-  public void init(MessageList messageList);
-
-  /**
-   * Get comment.
-   * @return comment.
-   * @see #setComment
-   */
-  public Comment getComment();
-
-  /**
-   * Set comment.
-   * @param comment a Comment object.
-   * @see #getComment
-   */
-  public void setComment(Comment comment);
-
-  /**
-   * Get log file location.
-   * @return log file location.
-   * @see #setLogLocation
-   */
-  public String getLogLocation();
-
-  /**
-   * Set log file location.
-   * @param logURI log file location.
-   * @see #getLogLocation
-   */
-  public void setLogLocation(String logURI);
-
-  /**
-   * Get replace log.
-   * @return replace log.
-   * @see #setReplaceLog
-   */
-  public boolean getReplaceLog();
-
-  /**
-   * Set replace log.
-   * @param replaceLog a replace log.
-   * @see #getReplaceLog
-   */
-  public void setReplaceLog(boolean replaceLog);
-
-  /**
-   * Get add style sheet.
-   * @return add style sheet.
-   * @see #setAddStyleSheet
-   */
-  public AddStyleSheet getAddStyleSheet();
-
-  /**
-   * Set add style sheet.
-   * @param addStyleSheet add style sheet.
-   * @see #getAddStyleSheet
-   */
-  public void setAddStyleSheet(AddStyleSheet addStyleSheet);
-
-  /**
-   * Get log duration.
-   * @return log duration.
-   * @see #setLogDuration
-   */
-  public int getLogDuration();
-
-  /**
-   * Set log duration.
-   * @param logDuration log duration.
-   * @see #getLogDuration
-   */
-  public void setLogDuration(int logDuration);
-
-  /**
-   * Get timeout.
-   * @return timeout.
-   * @see #setTimeout
-   */
-  public int getTimeout();
-
-  /**
-   * Set timeout.
-   * @param timeout timeout.
-   * @see #getTimeout
-   */
-  public void setTimeout(int timeout);
-
-  /**
-   * Get man-in-the-middle information.
-   * @return man-in-the-middle information.
-   * @see #setManInTheMiddle
-   */
-  public ManInTheMiddle getManInTheMiddle();
-
-  /**
-   * Set man-in-the-middle information.
-   * @param manInTheMiddle man-in-the-middle information.
-   * @see #getManInTheMiddle
-   */
-  public void setManInTheMiddle(ManInTheMiddle manInTheMiddle);
-
-  /**
-   * Get verbose option.
-   * @return verbose option.
-   * @see #setVerboseOption
-   */
-  public boolean getVerboseOption();
-
-  /**
-   * Set verbose option.
-   * @param verbose verbose option.
-   * @see #getVerboseOption
-   */
-  public void setVerboseOption(boolean verbose);
-
-  /**
-   * Parse the command line arguments.
-   * @param args the command line arguments.
-   * @throws WSIException if problems occur while parsing the 
-   *         command line arguments,
-   */
-  public void parseArgs(String[] args) throws WSIException;
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java
deleted file mode 100644
index 38fbd07..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config;
-
-import java.io.Reader;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-
-/**
- * Defines the interface used to read the monitor config documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface MonitorConfigReader extends DocumentReader
-{
-  /**
-   * Initialize monitor config.
-   * @param messageList a MessageList object.
-   */
-  public void init(MessageList messageList);
-
-  /**
-   * Read the monitor config file.
-   * @param monitorConfigURI the monitor config file location.
-   * @return a MonitorConfig object
-   * @throws WSIException if problems occur while reading monitor config file.
-   */
-  public MonitorConfig readMonitorConfig(String monitorConfigURI)
-    throws WSIException;
-
-  /**
-   * Read the monitor config file.
-   * @param reader a Reader object.
-   * @return a MonitorConfig object
-   * @throws WSIException if problems occur while reading monitor config file.
-   */
-  public MonitorConfig readMonitorConfig(Reader reader) throws WSIException;
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Redirect.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Redirect.java
deleted file mode 100644
index 6e3082d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Redirect.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * The interface for monitor config Redirect element.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface Redirect extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_REDIRECT;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_MONITOR_CONFIG, ELEM_NAME);
-
-  /**
-   * Get comment.
-   * @return comment.
-   * @see #setComment
-   */
-  public Comment getComment();
-
-  /**
-   * Set comment.
-   * @param comment a Commentobject.
-   * @see #getComment
-   */
-  public void setComment(Comment comment);
-
-  /**
-   * Get listen port.
-   * @return listen port.
-   * @see #setListenPort
-   */
-  public int getListenPort();
-
-  /**
-   * Set listen port.
-   * @param listenPort listen port.
-   * @see #getListenPort
-   */
-  public void setListenPort(int listenPort);
-
-  /**
-   * Get host.
-   * @return host.
-   * @see #setHost
-   */
-  public String getHost();
-
-  /**
-   * Set host.
-   * @param host  host.
-   * @see #getHost
-   */
-  public void setHost(String host);
-
-  /**
-   * Get send to port.
-   * @return send to port.
-   */
-  public int getToPort();
-
-  /**
-   * Get send to host.
-   * @return send to host.
-   */
-  public String getToHost();
-
-  /**
-   * Get send to protocol.
-   * @return send to protocol.
-   */
-  public String getToProtocol();
-
-  /**
-   * Get maximum connections.
-   * @return maximum connections.
-   * @see #setMaxConnections
-   */
-  public int getMaxConnections();
-
-  /**
-   * Set maximum connections.
-   * @param maxConnections maximum connections.
-   * @see #getMaxConnections
-   */
-  public void setMaxConnections(int maxConnections);
-
-  /**
-   * Get read timeout seconds.
-   * @return read timeout seconds.
-   * @see #setReadTimeoutSeconds
-   */
-  public int getReadTimeoutSeconds();
-
-  /**
-   * Set read timeout seconds.
-   * @param readTimeoutSeconds read timeout seconds.
-   * @see #getReadTimeoutSeconds
-   */
-  public void setReadTimeoutSeconds(int readTimeoutSeconds);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/CommentImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/CommentImpl.java
deleted file mode 100644
index 61c09b5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/CommentImpl.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-
-/**
- * The implementation for monitor config Comment element. 
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class CommentImpl implements Comment
-{
-  /**
-   * Comment text.
-   */
-  protected String text = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Comment#getText()
-   */
-  public String getText()
-  {
-    return this.text;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Comment#setText(String)
-   */
-  public void setText(String text)
-  {
-    this.text = text;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Config options
-    //pw.print("    <" + nsName + ELEM_NAME + " xmlns=\"" + WSIConstants.NS_URI_WSI_MONITOR_CONFIG + "\">");    
-    pw.print("    <" + nsName + ELEM_NAME + ">");
-    pw.print(this.text);
-
-    // End element
-    pw.println("</" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-  public String toString()
-  {
-    return text;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/ManInTheMiddleImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/ManInTheMiddleImpl.java
deleted file mode 100644
index 858fa63..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/ManInTheMiddleImpl.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-
-/**
- * The implementation for the monitor config ManInTheMiddle element.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class ManInTheMiddleImpl implements ManInTheMiddle
-{
-  /**
-   * Comment.
-   */
-  protected Comment comment;
-
-  /**
-   * Redirect list.
-   */
-  protected Vector redirectList = new Vector();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.ManInTheMiddle#getComment()
-   */
-  public Comment getComment()
-  {
-    return this.comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.ManInTheMiddle#setComment(Comment)
-   */
-  public void setComment(Comment comment)
-  {
-    this.comment = comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.ManInTheMiddle#getRedirectList()
-   */
-  public Vector getRedirectList()
-  {
-    return redirectList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.ManInTheMiddle#addRedirect(Redirect)
-   */
-  public void addRedirect(Redirect redirect)
-  {
-    redirectList.add(redirect);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.ManInTheMiddle#setRedirectList(Vector)
-   */
-  public void setRedirectList(Vector redirectList)
-  {
-    this.redirectList = redirectList;
-  }
-
-  /* (non-Javadoc)
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("  man-in-the-middle comment ... " + this.comment);
-
-    // Redirect list
-    int count = 1;
-    Redirect redirect;
-    Iterator iterator = redirectList.iterator();
-    while (iterator.hasNext())
-    {
-      // Get next redirect element
-      redirect = (Redirect) iterator.next();
-      pw.println("  redirect [" + count++ +"]");
-      pw.print(redirect.toString());
-    }
-
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Start element
-    pw.println("      <" + nsName + ELEM_NAME + ">");
-
-    // Comment
-    if (this.comment != null)
-    {
-      pw.println(this.comment.toXMLString(nsName));
-    }
-
-    // Redirect
-    Redirect redirect;
-    Iterator iterator = redirectList.iterator();
-    while (iterator.hasNext())
-    {
-      // Get next redirect element
-      redirect = (Redirect) iterator.next();
-      pw.print(redirect.toXMLString(nsName));
-    }
-
-    // End element
-    pw.println("      </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java
deleted file mode 100644
index 586966d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java
+++ /dev/null

@@ -1,561 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.Monitor;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-
-/**
- * This is the implementation for the monitor configuration file.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class MonitorConfigImpl implements MonitorConfig
-{
-  /**
-   * Message list reference.
-   */
-  protected MessageList messageList = null;
-
-  /**
-   * Monitor configuration file URI.
-   */
-  protected String documentURI = null;
-
-  /**
-   * Comment.
-   */
-  protected Comment comment = null;
-
-  /**
-   * Log location.
-   */
-  protected String logURI;
-
-  /**
-   * Replace log indicator.
-   */
-  protected boolean replaceLog = false;
-
-  /**
-   * Style sheet declaration.
-   */
-  protected AddStyleSheet addStyleSheet;
-
-  /**
-   * Log duration.
-   */
-  protected int logDuration = 600;
-
-  /**
-   * Timeout.
-   */
-  protected int timeout = 3;
-
-  /**
-   * Man-in-the-middle settings.
-   */
-  protected ManInTheMiddle manInTheMiddle = null;
-
-  /**
-   * Verbose option.
-   */
-  protected boolean verbose = false;
-
-  /**
-   * Initialize monitor config.
-   */
-  public void init(MessageList messageList)
-  {
-    this.messageList = messageList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getComment()
-   */
-  public Comment getComment()
-  {
-    return this.comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setComment(Comment)
-   */
-  public void setComment(Comment comment)
-  {
-    this.comment = comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getLogLocation()
-   */
-  public String getLogLocation()
-  {
-    return this.logURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setLogLocation(String)
-   */
-  public void setLogLocation(String logURI)
-  {
-    this.logURI = logURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getReplaceLog()
-   */
-  public boolean getReplaceLog()
-  {
-    return this.replaceLog;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setReplaceLog(boolean)
-   */
-  public void setReplaceLog(boolean replaceLog)
-  {
-    this.replaceLog = replaceLog;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getAddStyleSheet()
-   */
-  public AddStyleSheet getAddStyleSheet()
-  {
-    return this.addStyleSheet;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setAddStyleSheet(org.wsi.test.common.AddStyleSheet)
-   */
-  public void setAddStyleSheet(AddStyleSheet addStyleSheet)
-  {
-    this.addStyleSheet = addStyleSheet;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getLogDuration()
-   */
-  public int getLogDuration()
-  {
-    return logDuration;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setLogDuration(int)
-   */
-  public void setLogDuration(int logDuration)
-  {
-    this.logDuration = logDuration;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getTimeout()
-   */
-  public int getTimeout()
-  {
-    return this.timeout;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setTimeout(int)
-   */
-  public void setTimeout(int timeout)
-  {
-    this.timeout = timeout;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getManInTheMiddle()
-   */
-  public ManInTheMiddle getManInTheMiddle()
-  {
-    return manInTheMiddle;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setManInTheMiddle(ManInTheMiddle)
-   */
-  public void setManInTheMiddle(ManInTheMiddle manInTheMiddle)
-  {
-    this.manInTheMiddle = manInTheMiddle;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.WSIDocument#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.documentURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.WSIDocument#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.documentURI = documentURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#getVerboseOption()
-   */
-  public boolean getVerboseOption()
-  {
-    return this.verbose;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfig#setVerboseOption(boolean)
-   */
-  public void setVerboseOption(boolean verbose)
-  {
-    this.verbose = verbose;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Config options
-    pw.println("    <" + nsName + ELEM_NAME + ">");
-
-    // Comment
-    if (this.comment != null)
-    {
-      pw.print(comment.toXMLString(nsName));
-    }
-
-    // Log file
-    pw.print("      <" + nsName + WSIConstants.ELEM_LOG_FILE + " ");
-    pw.print(WSIConstants.ATTR_REPLACE + "=\"" + this.replaceLog + "\" ");
-    pw.println(WSIConstants.ATTR_LOCATION + "=\"" + this.logURI + "\">");
-    pw.print(getAddStyleSheet().toXMLString(namespaceName));
-    pw.println("    </" + nsName + WSIConstants.ELEM_LOG_FILE + ">");
-
-    // Log duration
-    pw.print("      <" + nsName + WSIConstants.ELEM_LOG_DURATION + ">");
-    pw.print(this.logDuration);
-    pw.println("</" + nsName + WSIConstants.ELEM_LOG_DURATION + ">");
-
-    // Timeout
-    pw.print(
-      "      <" + nsName + WSIConstants.ELEM_CLEANUP_TIMEOUT_SECONDS + ">");
-    pw.print(this.timeout);
-    pw.println("</" + nsName + WSIConstants.ELEM_CLEANUP_TIMEOUT_SECONDS + ">");
-
-    // Man-in-the-middle
-    if (this.manInTheMiddle != null)
-    {
-      pw.print(manInTheMiddle.toXMLString(nsName));
-    }
-
-    // End element
-    pw.println("    </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("  comment ..................... " + this.comment);
-    pw.println("  logURI ...................... " + this.logURI);
-    pw.println("  replaceLog .................. " + this.replaceLog);
-    pw.println("  logDuration ................. " + this.logDuration);
-    pw.println("  timeout ..................... " + this.timeout);
-
-    // addStyleSheet
-    if (this.addStyleSheet != null)
-      pw.println(
-        "  addStyleSheet ............... " + this.addStyleSheet.toString());
-
-    // Man-in-the-middle
-    if (this.manInTheMiddle != null)
-    {
-      pw.print(this.manInTheMiddle.toString());
-    }
-
-    return sw.toString();
-  }
-
-  /**
-   * Set config values from another monitor config object.
-   */
-  private void setConfig(MonitorConfig monitorConfig)
-  {
-    // ADD: Should this be a clone operation?
-    this.comment = monitorConfig.getComment();
-    this.documentURI = monitorConfig.getLocation();
-    this.logURI = monitorConfig.getLogLocation();
-    this.replaceLog = monitorConfig.getReplaceLog();
-    this.logDuration = monitorConfig.getLogDuration();
-    this.timeout = monitorConfig.getTimeout();
-    this.manInTheMiddle = monitorConfig.getManInTheMiddle();
-    this.addStyleSheet = monitorConfig.getAddStyleSheet();
-    this.verbose = monitorConfig.getVerboseOption();
-  }
-
-  /**
-   * Verify config options.
-   */
-  private void verifyConfig() throws WSIException
-  {
-    // If no redirect statements, then exit
-    if ((this.manInTheMiddle == null)
-      || (this.manInTheMiddle.getRedirectList() == null)
-      || (this.manInTheMiddle.getRedirectList().size() == 0))
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config05",
-          "Monitor config file did not contain any redirect statements."));
-    }
-
-    if (this.logURI == null)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config06",
-          "Monitor config file did not contain the log file URI."));
-    }
-  }
-
-  /**
-   * Parse the command line arguments.
-   */
-  public void parseArgs(String[] args) throws WSIException
-  {
-    // Get new config reader
-    MonitorConfigReader monitorConfigReader = new MonitorConfigReaderImpl();
-
-    // Monitor config object which will be merged after all of the input parms are processed
-    MonitorConfig monitorConfigFromArgs = null;
-
-    // If no input arguments, then throw exception
-    if (args.length == 0)
-    {
-      // ADD: 
-      throw new IllegalArgumentException(
-        getMessage("usage01", Monitor.USAGE_MESSAGE));
-    }
-
-    // Parse the command line arguments to locate the config file option (if it was specified)
-    for (int argCount = 0; argCount < args.length; argCount++)
-    {
-      // -configFile
-      if ((args[argCount].equalsIgnoreCase("-config"))
-        || (args[argCount].equals("-c")))
-      {
-        argCount++;
-        monitorConfigFromArgs =
-          monitorConfigReader.readMonitorConfig(args[argCount]);
-      }
-    }
-
-    // If config file was not specified, then create analyzer config object
-    if (monitorConfigFromArgs == null)
-    {
-      monitorConfigFromArgs = new MonitorConfigImpl();
-      monitorConfigFromArgs.init(this.messageList);
-    }
-
-    // Parse all of the command line arguments
-    for (int argCount = 0; argCount < args.length; argCount++)
-    {
-      // -configFile
-      if ((args[argCount].equalsIgnoreCase("-config"))
-        || (args[argCount].equals("-c")))
-      {
-        // Skip this option since it was already processed
-        argCount++;
-      }
-
-      // -comment
-      else if (
-        (args[argCount].equalsIgnoreCase("-comment"))
-          || (args[argCount].equals("-C")))
-      {
-        argCount++;
-        Comment comment = new CommentImpl();
-        comment.setText(args[argCount]);
-        monitorConfigFromArgs.setComment(comment);
-      }
-
-      // -logFile
-      else if (
-        (args[argCount].equalsIgnoreCase("-logFile"))
-          || (args[argCount].equals("-l")))
-      {
-        argCount++;
-        monitorConfigFromArgs.setLogLocation(args[argCount]);
-      }
-
-      // -replace
-      else if (
-        (args[argCount].equalsIgnoreCase("-replace"))
-          || (args[argCount].equals("-r")))
-      {
-        argCount++;
-        monitorConfigFromArgs.setReplaceLog(
-          Boolean.valueOf(args[argCount]).booleanValue());
-      }
-
-      // -logDuration
-      else if (
-        (args[argCount].equalsIgnoreCase("-logDuration"))
-          || (args[argCount].equals("-d")))
-      {
-        argCount++;
-        monitorConfigFromArgs.setLogDuration(
-          Integer.valueOf(args[argCount]).intValue());
-      }
-
-      // -timeout
-      else if (
-        (args[argCount].equalsIgnoreCase("-timeout"))
-          || (args[argCount].equals("-t")))
-      {
-        argCount++;
-        monitorConfigFromArgs.setTimeout(
-          Integer.valueOf(args[argCount]).intValue());
-      }
-
-      // -manInTheMiddle
-      else if (
-        (args[argCount].equalsIgnoreCase("-manInTheMiddle"))
-          || (args[argCount].equals("-m")))
-      {
-        ManInTheMiddle manInTheMiddle = null;
-
-        // Increment arg count
-        argCount++;
-
-        // Get the man-in-the-middle object
-        if ((manInTheMiddle = monitorConfigFromArgs.getManInTheMiddle())
-          == null)
-          manInTheMiddle = new ManInTheMiddleImpl();
-
-        // ADD: Check for correct number of remaining args
-
-        // Create redirect
-        Redirect redirect = new RedirectImpl();
-
-        // Get the redirect values 
-        redirect.setListenPort(Integer.valueOf(args[argCount++]).intValue());
-        redirect.setHost(args[argCount++]);
-        redirect.setMaxConnections(
-          Integer.valueOf(args[argCount++]).intValue());
-        redirect.setReadTimeoutSeconds(
-          Integer.valueOf(args[argCount++]).intValue());
-
-        // Add redirect
-        manInTheMiddle.addRedirect(redirect);
-
-        // Set the man-in-the-middle
-        monitorConfigFromArgs.setManInTheMiddle(manInTheMiddle);
-      }
-
-      // -verbose
-      else if (
-        (args[argCount].equalsIgnoreCase("-verbose"))
-          || (args[argCount].equals("-v")))
-      {
-        argCount++;
-        //monitorConfigFromArgs.setVerboseOption(Boolean.valueOf(args[argCount]).booleanValue());
-        monitorConfigFromArgs.setVerboseOption(true);
-      }
-
-      // -GUI
-      else if (args[argCount].equalsIgnoreCase("-GUI"))
-      {
-        // Ignore -GUI option
-      }
-
-      else
-      {
-        throw new IllegalArgumentException(
-          getMessage(
-            "config01",
-            args[argCount],
-            "The specified option is not supported."));
-      }
-    }
-
-    // If addStyleSheet was not specified, then create a comment version of it
-    if (monitorConfigFromArgs.getAddStyleSheet() == null)
-    {
-      AddStyleSheet addStyleSheet = new AddStyleSheetImpl();
-      addStyleSheet.setHref(WSIConstants.DEFAULT_LOG_XSL);
-      addStyleSheet.setType(WSIConstants.DEFAULT_XSL_TYPE);
-      addStyleSheet.setComment(true);
-      monitorConfigFromArgs.setAddStyleSheet(addStyleSheet);
-    }
-
-    // Merge config info into this object
-    setConfig(monitorConfigFromArgs);
-
-    // Verify config options
-    verifyConfig();
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(String messageID, String defaultMessage)
-  {
-    return getMessage(messageID, null, defaultMessage);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(
-    String messageID,
-    String messageData,
-    String defaultMessage)
-  {
-    String message = defaultMessage;
-    if (messageList != null)
-      message = messageList.getMessage(messageID, messageData, defaultMessage);
-    else
-      message += " " + messageData + ".";
-
-    return message;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java
deleted file mode 100644
index 004abca..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java
+++ /dev/null

@@ -1,479 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.Reader;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
-import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Defines the implementation used to read the monitor config documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class MonitorConfigReaderImpl implements MonitorConfigReader
-{
-  /**
-   * Message list reference.
-   */
-  protected MessageList messageList = null;
-
-  /**
-   * Document location.
-   */
-  protected String documentURI;
-
-  /**
-   * Initialize monitor config.
-   */
-  public void init(MessageList messageList)
-  {
-    this.messageList = messageList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfigReader#readMonitorConfig(String)
-   */
-  public MonitorConfig readMonitorConfig(String monitorConfigURI)
-    throws WSIException
-  {
-    FileReader fileReader = null;
-
-    try
-    {
-      fileReader = new FileReader(monitorConfigURI);
-    }
-
-    catch (FileNotFoundException fnfe)
-    {
-      throw new WSIFileNotFoundException(
-        getMessage("config02", monitorConfigURI, "Could not find file:"),
-        fnfe);
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(
-        getMessage("config03", monitorConfigURI, "Could not read file:"),
-        e);
-    }
-
-    return readMonitorConfig(fileReader);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.MonitorConfigReader#readMonitorConfig(Reader)
-   */
-  public MonitorConfig readMonitorConfig(Reader reader) throws WSIException
-  {
-    MonitorConfig monitorConfig = new MonitorConfigImpl();
-
-    // Parse XML
-    Document doc = XMLUtils.parseXML(reader);
-
-    // Parse elements in the config document
-    parseConfigElement(monitorConfig, doc.getDocumentElement());
-
-    return monitorConfig;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentReader#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.documentURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentReader#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.documentURI = documentURI;
-  }
-
-  /**
-   * Parse config element.
-   */
-  private void parseConfigElement(MonitorConfig monitorConfig, Element element)
-    throws WSIException
-  {
-    // ADD: Verify that this is the config element
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    boolean isLogDurationDefine = false;
-    boolean isCleanupTimeoutSecondsDefine = false;
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <logFile>
-      if (isElement(nextElement, WSIConstants.ELEM_LOG_FILE))
-      {
-        // Parse the log element
-        parseLogFileElement(monitorConfig, nextElement);
-      }
-
-      // <logDuration>
-      else if (isElement(nextElement, WSIConstants.ELEM_LOG_DURATION))
-      {
-        monitorConfig.setLogDuration(getIntValue(nextElement));
-        if (monitorConfig.getLogDuration() < 0)
-          throw new IllegalArgumentException(
-            getMessage(
-              "config09",
-              WSIConstants.ELEM_LOG_DURATION,
-              "Parameter value can't be negative. Element name:"));
-        isLogDurationDefine = true;
-      }
-
-      // <cleanupTimeoutSeconds>
-      else if (
-        isElement(nextElement, WSIConstants.ELEM_CLEANUP_TIMEOUT_SECONDS))
-      {
-        monitorConfig.setTimeout(getIntValue(nextElement));
-        if (monitorConfig.getTimeout() < 0)
-          throw new IllegalArgumentException(
-            getMessage(
-              "config09",
-              WSIConstants.ELEM_CLEANUP_TIMEOUT_SECONDS,
-              "Parameter value can't be negative. Element name:"));
-        isCleanupTimeoutSecondsDefine = true;
-      }
-
-      // <manInTheMiddle>
-      else if (isElement(nextElement, WSIConstants.ELEM_MAN_IN_THE_MIDDLE))
-      {
-        ManInTheMiddle manInTheMiddle = new ManInTheMiddleImpl();
-        monitorConfig.setManInTheMiddle(manInTheMiddle);
-        parseManInTheMiddleElement(manInTheMiddle, nextElement);
-      }
-
-      // <comment>
-      else if (isElement(nextElement, WSIConstants.ELEM_COMMENT))
-      {
-        Comment comment = new CommentImpl();
-        comment.setText(XMLUtils.getText(nextElement));
-        monitorConfig.setComment(comment);
-      }
-
-      else
-      {
-        // ADD: handle invalid elements
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-
-    if (!isLogDurationDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_LOG_DURATION,
-          "Element is missing. Element name:"));
-    }
-    if (!isCleanupTimeoutSecondsDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_CLEANUP_TIMEOUT_SECONDS,
-          "Element is missing. Element name:"));
-    }
-  }
-
-  /**
-   * Parse logFile element.
-   */
-  private void parseLogFileElement(
-    MonitorConfig monitorConfig,
-    Element element)
-    throws WSIException
-  {
-    // Get the location attribute
-    monitorConfig.setLogLocation(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_LOCATION));
-
-    // Get the replace attribute
-    monitorConfig.setReplaceLog(
-      XMLUtils.getBooleanValue(element, WSIConstants.ATTR_REPLACE, false));
-
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <addStyleSheet>
-      if (isElement(nextElement, WSIConstants.ELEM_ADD_STYLE_SHEET))
-      {
-        AddStyleSheet addStyleSheet = new AddStyleSheetImpl();
-
-        // Parse the element  
-        TestUtils.parseAddStyleSheet(
-          nextElement,
-          addStyleSheet,
-          WSIConstants.DEFAULT_LOG_XSL);
-
-        // Set add style sheet
-        monitorConfig.setAddStyleSheet(addStyleSheet);
-      }
-
-      else
-      {
-        // ADD: handle invalid elements
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-  }
-
-  /**
-   * Parse manIntheMiddle element.
-   */
-  private void parseManInTheMiddleElement(
-    ManInTheMiddle manInTheMiddle,
-    Element element)
-    throws WSIException
-  {
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <redirect>
-      if (isElement(nextElement, WSIConstants.ELEM_REDIRECT))
-      {
-        Redirect redirect = new RedirectImpl();
-        manInTheMiddle.addRedirect(redirect);
-        parseRedirectElement(redirect, nextElement);
-      }
-
-      // <comment>
-      else if (isElement(nextElement, WSIConstants.ELEM_COMMENT))
-      {
-        Comment comment = new CommentImpl();
-        comment.setText(XMLUtils.getText(nextElement));
-        manInTheMiddle.setComment(comment);
-      }
-
-      else
-      {
-        // ADD: handle invalid elements
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-  }
-
-  /**
-   * Parse redirect element.
-   */
-  private void parseRedirectElement(Redirect redirect, Element element)
-    throws WSIException
-  {
-    // Get first child element
-    Element nextElement = XMLUtils.getFirstChild(element);
-
-    boolean isListenPortDefine = false;
-    boolean isSchemeAndHostPortDefine = false;
-    boolean isMaxConnectionsDefine = false;
-    boolean isReadTimeoutSecondsDefine = false;
-
-    // Process each child element
-    while (nextElement != null)
-    {
-      // <listenPort>
-      if (isElement(nextElement, WSIConstants.ELEM_LISTEN_PORT))
-      {
-        redirect.setListenPort(getIntValue(nextElement));
-        isListenPortDefine = true;
-      }
-
-      // <schemeAndHostPort>
-      else if (isElement(nextElement, WSIConstants.ELEM_SCHEME_AND_HOSTPORT))
-      {
-        redirect.setHost(XMLUtils.getText(nextElement));
-        isSchemeAndHostPortDefine = true;
-      }
-
-      // <maxConnections>
-      else if (isElement(nextElement, WSIConstants.ELEM_MAX_CONNECTIONS))
-      {
-        redirect.setMaxConnections(getIntValue(nextElement));
-        isMaxConnectionsDefine = true;
-      }
-
-      // <readTimeoutSeconds>
-      else if (isElement(nextElement, WSIConstants.ELEM_READ_TIMEOUT_SECONDS))
-      {
-        redirect.setReadTimeoutSeconds(getIntValue(nextElement));
-        if (redirect.getReadTimeoutSeconds() < 0)
-        {
-          throw new IllegalArgumentException(
-            getMessage(
-              "config09",
-              WSIConstants.ELEM_READ_TIMEOUT_SECONDS,
-              "Parameter value can't be negative. Element name:"));
-        }
-        isReadTimeoutSecondsDefine = true;
-      }
-
-      // <comment>
-      else if (isElement(nextElement, WSIConstants.ELEM_COMMENT))
-      {
-        Comment comment = new CommentImpl();
-        comment.setText(XMLUtils.getText(nextElement));
-        redirect.setComment(comment);
-      }
-
-      else
-      {
-        // ADD: handle invalid elements
-      }
-
-      // Get next element
-      nextElement = XMLUtils.getNextSibling(nextElement);
-    }
-
-    if (!isListenPortDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_LISTEN_PORT,
-          "Element is missing. Element name:"));
-    }
-    if (!isSchemeAndHostPortDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_SCHEME_AND_HOSTPORT,
-          "Element is missing. Element name:"));
-
-    }
-    if (!isMaxConnectionsDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_MAX_CONNECTIONS,
-          "Element is missing. Element name:"));
-    }
-    if (!isReadTimeoutSecondsDefine)
-    {
-      throw new IllegalArgumentException(
-        getMessage(
-          "config10",
-          WSIConstants.ELEM_READ_TIMEOUT_SECONDS,
-          "Element is missing. Element name:"));
-    }
-  }
-
-  /**
-   * Determine if this element matches specified local name in the analyzer config namespace.
-   */
-  private boolean isElement(Element element, String localName)
-  {
-    return isElement(
-      element,
-      WSIConstants.NS_URI_WSI_MONITOR_CONFIG,
-      localName);
-  }
-
-  /**
-   * Determine if this element matches specified local name in the analyzer config namespace.
-   */
-  private boolean isElement(
-    Element element,
-    String namespace,
-    String localName)
-  {
-    return XMLUtils.isElement(element, namespace, localName);
-  }
-
-  /**
-   * Get element text as an int.
-   */
-  private int getIntValue(Element element) throws WSIException
-  {
-    int returnValue;
-    String intValue = null;
-
-    // Get value as a string
-    if ((intValue = XMLUtils.getText(element)) == null)
-    {
-      throw new WSIException(
-        getMessage(
-          "config04",
-          element.getLocalName() + "Element must contain an integer value:"));
-    }
-
-    else
-    {
-      returnValue = Integer.valueOf(intValue).intValue();
-    }
-
-    // Return int
-    return returnValue;
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(String messageID, String defaultMessage)
-  {
-    return getMessage(messageID, null, defaultMessage);
-  }
-
-  /**
-   * Get message from resource bundle.
-   */
-  private String getMessage(
-    String messageID,
-    String messageData,
-    String defaultMessage)
-  {
-    String message = defaultMessage;
-    if (messageList != null)
-      message = messageList.getMessage(messageID, messageData, defaultMessage);
-    else
-      message += " " + messageData + ".";
-
-    return message;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java
deleted file mode 100644
index a1d169c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java
+++ /dev/null

@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
-/**
- *  The implementation for monitor config Redirect element.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class RedirectImpl implements Redirect
-{
-  /**
-   * Comment.
-   */
-  protected Comment comment;
-
-  /**
-   * Listen port.
-   */
-  protected int listenPort;
-
-  /**
-   * Host.
-   */
-  protected String host;
-
-  /**
-   * To protocol.
-   */
-  protected String toProtocol;
-
-  /**
-   * To port.
-   */
-  protected int toPort;
-
-  /**
-   * To host.
-   */
-  protected String toHost;
-
-  /**
-   * Maximum connections.
-   */
-  protected int maxConnections;
-
-  /**
-   * Read timeout seconds.
-   */
-  protected int readTimeoutSeconds;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#getComment()
-   */
-  public Comment getComment()
-  {
-    return this.comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#setComment(comment)
-   */
-  public void setComment(Comment comment)
-  {
-    this.comment = comment;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#getListenPort()
-   */
-  public int getListenPort()
-  {
-    return this.listenPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#setListenPort(int)
-   */
-  public void setListenPort(int listenPort)
-  {
-    this.listenPort = listenPort;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#getHost()
-   */
-  public String getHost()
-  {
-    return this.host;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#setHost(String)
-   */
-  public void setHost(String host)
-  {
-    this.host = host;
-
-    // Parse location to get protocol, host and port
-    URL url;
-    try
-    {
-      url = new URL(host);
-      this.toProtocol = url.getProtocol();
-      this.toHost = url.getHost();
-      this.toPort = url.getPort();
-      if (this.toPort == -1)
-      {
-        if (this.toProtocol.equalsIgnoreCase("http"))
-          this.toPort = 80;
-        else
-          this.toPort = 80;
-      }
-    }
-
-    catch (MalformedURLException mue)
-    {
-      throw new IllegalArgumentException(
-        "The "
-          + WSIConstants.ELEM_SCHEME_AND_HOSTPORT
-          + " option contains an invalid value: "
-          + host);
-    }
-
-    if ((url.getPath() != null && !url.getPath().equals(""))
-      || (url.getQuery() != null && !url.getQuery().equals("")))
-      throw new IllegalArgumentException(
-        "The "
-          + WSIConstants.ELEM_SCHEME_AND_HOSTPORT
-          + " option must contain only a scheme, host and port: "
-          + host);
-  }
-
-  /**
-   * Get to port.
-   * @see org.eclipse.wst.wsi.monitor.config.Redirect#getToPort()
-   */
-  public int getToPort()
-  {
-    return this.toPort;
-  }
-
-  /**
-   * Get to host.
-   * @see org.eclipse.wst.wsi.monitor.config.Redirect#getToHost()
-   */
-  public String getToHost()
-  {
-    return this.toHost;
-  }
-
-  /**
-   * Get to protocol.
-   * @see org.eclipse.wst.wsi.monitor.config.Redirect#getToProtocol()
-   */
-  public String getToProtocol()
-  {
-    return this.toProtocol;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#getMaxConnections()
-   */
-  public int getMaxConnections()
-  {
-    return this.maxConnections;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#setMaxConnections(int)
-   */
-  public void setMaxConnections(int maxConnections)
-  {
-    this.maxConnections = maxConnections;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#getReadTimeoutSeconds()
-   */
-  public int getReadTimeoutSeconds()
-  {
-    return this.readTimeoutSeconds;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.monitor.config.Redirect#setReadTimeoutSeconds(int)
-   */
-  public void setReadTimeoutSeconds(int readTimeoutSeconds)
-  {
-    this.readTimeoutSeconds = readTimeoutSeconds;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("    comment ................... " + this.comment);
-    pw.println("    listenPort ................ " + this.listenPort);
-    pw.println("    host ...................... " + cutHost(this.host));
-    pw.println("    maxConnections ............ " + this.maxConnections);
-    pw.println("    readTimeoutSeconds ........ " + this.readTimeoutSeconds);
-
-    return sw.toString();
-  }
-
-  /**
-   * Formats host name according to the specification (path is ommited).
-   * @param host
-   * @return
-   */
-  private String cutHost(String host)
-  {
-    try
-    {
-      URL url = new URL(host);
-      String port = url.getPort() > -1 ? String.valueOf(url.getPort()) : "80";
-      // REMOVED: This code only works on 1.4
-      // String.valueOf(url.getDefaultPort());
-      return url.getProtocol() + "://" + url.getHost() + ":" + port;
-    }
-    catch (Exception e)
-    {
-      return host;
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Start element
-    pw.println("        <" + nsName + WSIConstants.ELEM_REDIRECT + ">");
-
-    // Comment
-    if (this.comment != null)
-    {
-      pw.println(this.comment.toXMLString(nsName));
-    }
-
-    // listenPort
-    pw.print("          <" + nsName + WSIConstants.ELEM_LISTEN_PORT + ">");
-    pw.print(getListenPort());
-    pw.println("</" + nsName + WSIConstants.ELEM_LISTEN_PORT + ">");
-
-    // schemeAndHostPort
-    pw.print(
-      "          <" + nsName + WSIConstants.ELEM_SCHEME_AND_HOSTPORT + ">");
-    pw.print(XMLUtils.xmlEscapedString(getHost()));
-    pw.println("</" + nsName + WSIConstants.ELEM_SCHEME_AND_HOSTPORT + ">");
-
-    // maxConnections
-    pw.print("          <" + nsName + WSIConstants.ELEM_MAX_CONNECTIONS + ">");
-    pw.print(getMaxConnections());
-    pw.println("</" + nsName + WSIConstants.ELEM_MAX_CONNECTIONS + ">");
-
-    // readTimeoutSeconds
-    pw.print(
-      "          <" + nsName + WSIConstants.ELEM_READ_TIMEOUT_SECONDS + ">");
-    pw.print(getReadTimeoutSeconds());
-    pw.println("</" + nsName + WSIConstants.ELEM_READ_TIMEOUT_SECONDS + ">");
-
-    // End Element
-    pw.println("        </" + nsName + WSIConstants.ELEM_REDIRECT + ">");
-
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/EntryTypeList.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/EntryTypeList.java
deleted file mode 100644
index 6d8d13a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/EntryTypeList.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile;
-
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * This interface is used to maintain a profile EntryTypeList.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface EntryTypeList extends DocumentElement
-{
-  /**
-   * Log input.
-   */
-  public static final String LOG_INPUT_NONE = "none";
-  public static final String LOG_INPUT_REQUEST = "request";
-  public static final String LOG_INPUT_RESPONSE = "response";
-
-  /**
-   * WSDL input.
-   */
-  public static final String WSDL_INPUT_NONE = "none";
-
-  /**
-   * UDDI input.
-   */
-  public static final String UDDI_INPUT_NONE = "none";
-
-  /**
-   * Get log input.
-   * @return log input.
-   * @see #setLogInput
-   */
-  public String getLogInput();
-
-  /**
-   * Set log input.
-   * @param logInput log input.
-   * @see #getLogInput
-   */
-  public void setLogInput(String logInput);
-
-  /**
-   * Get WSDL input.
-   * @return WSDL input.
-   * @see #setWSDLInput
-   */
-  public String getWSDLInput();
-
-  /**
-   * Set WSDL input.
-   * @param wsdlInput WSDL input.
-   * @see #getWSDLInput
-   */
-  public void setWSDLInput(String wsdlInput);
-
-  /**
-   * Get UDDI input.
-   * @return UDDI input.
-   * @see #setUDDIInput
-   */
-  public String getUDDIInput();
-
-  /**
-   * Set UDDI input.
-   * @param uddiInput UDDI input.
-   * @see #getUDDIInput
-   */
-  public void setUDDIInput(String uddiInput);
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/Profile.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/Profile.java
deleted file mode 100644
index bc326c3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/Profile.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile;
-
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * This interface is used to maintain Profile information.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface Profile extends DocumentElement
-{
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java
deleted file mode 100644
index 1934f2a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile;
-
-import java.util.LinkedList;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-
-/**
- * An artifact contains a set of related test assertions.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface ProfileArtifact extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_ARTIFACT;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ASSERTIONS, ELEM_NAME);
-
-  /**
-   * Get type.
-   * @return artifact type.
-   * @see #setType
-   */
-  public ArtifactType getType();
-
-  /**
-   * Set type.
-   * @param type an artifact type.
-   * @see #getType
-   */
-  public void setType(ArtifactType type);
-
-  /**
-   * Get specification list.
-   * @return specification list.
-   * @see #setSpecificationList
-   */
-  public Vector getSpecificationList();
-
-  /**
-   * Set specification list.
-   * @param specificationList specification list.
-   * @see #getSpecificationList
-   */
-  public void setSpecificationList(Vector specificationList);
-
-  /**
-   * Get test assertion list.
-   * @return test assertion list.
-   */
-  public LinkedList getTestAssertionList();
-
-  /**
-   * Get test assertion.
-   * @param id test assertion id.
-   * @return test assertion.
-   */
-  public TestAssertion getTestAssertion(String id);
-
-  /**
-   * Add test assertion.
-   * @param testAssertion test assertion.
-   */
-  public void addTestAssertion(TestAssertion testAssertion);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java
deleted file mode 100644
index 3c67761..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile;
-
-import java.util.TreeMap;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
-
-/**
- * This interface maintains profile assertions.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface ProfileAssertions extends WSIDocument
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_PROFILE_ASSERTIONS;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_ASSERTIONS, ELEM_NAME);
-
-  /**
-   * Get list of profiles.
-   * @return list of profiles.
-   * @see #setProfileList
-   */
-  public Vector getProfileList();
-
-  /**
-   * Set list of profiles.
-   * @param profileList list of profiles.
-   * @see #getProfileList
-   */
-  public void setProfileList(Vector profileList);
-
-  /**
-   * Add profile.
-   * @param profile profile.
-   */
-  public void addProfile(Profile profile);
-
-  /**
-   * Get list of artifacts.
-   * @return list of artifacts.
-   * @see #setArtifactList
-   */
-  public TreeMap getArtifactList();
-
-  /**
-   * Get artifact.
-   * @param type an artifact type.
-   * @return a profile artifact based on the given type.
-   */
-  public ProfileArtifact getArtifact(String type);
-
-  /**
-   * Set list of artifacts.
-   * @param artifactList a list pf profile artifiacts.
-   * @see #getArtifactList
-   */
-  public void setArtifactList(TreeMap artifactList);
-
-  /**
-   * Add artifact.
-   * @param artifact profile artifact.
-   */
-  public void addArtifact(ProfileArtifact artifact);
-
-  /**
-   * Get test assertion.
-   * @param id test assertion id.
-   * @return test assertion.
-   */
-  public TestAssertion getTestAssertion(String id);
-
-  /**
-   * Create artifact.
-   * @return newly created profile artifact.
-   */
-  public ProfileArtifact createArtifact();
-
-  /**
-   * Returns the name of the profile test assertion document.
-   * @return the name of the document. 
-   */
-  public String getTADName();
-
-  /**
-   * Set the name of the profile test assertion document.
-   * @param documentName the name of the document.
-   */
-  public void setTADName(String documentName);
-
-  /**
-   * Returns the version of the profile test assertion document.
-   * @return the version of the document.
-   */
-  public String getTADVersion();
-
-  /**
-   * Set the version of the profile test assertion document.
-   * @param documentVersion the version of the document.
-   */
-  public void setTADVersion(String documentVersion);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java
deleted file mode 100644
index 00b0a3d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile;
-
-import java.io.Reader;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-
-/**
- * Defines the interface used to read a profile assertions documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface ProfileAssertionsReader extends DocumentReader
-{
-  /**
-   * Read the profile assertions file.
-   * @param assertionsURI he profile assertions file location.
-   * @return the ProfileAssertions object.
-   * @throws WSIException if problem occur while reading the file.
-   */
-  public ProfileAssertions readProfileAssertions(String assertionsURI)
-    throws WSIException;
-
-  /**
-   * Read the profile assertions  file.
-   * @param reader a Reader object.
-   * @return the ProfileAssertions object.
-   * @throws WSIException  if problem occur while reading the file.
-   */
-  public ProfileAssertions readProfileAssertions(Reader reader)
-    throws WSIException;
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java
deleted file mode 100644
index ef53475..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile;
-
-import java.util.Vector;
-
-/**
- * A test assertion is one assertion in a profile definition.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface TestAssertion
-{
-  public static final String TYPE_INFORMATIONAL = "informational";
-  
-  /**
-   * Get test assertion id.
-   * @return test assertion id.
-   * @see #setId
-   */
-  public String getId();
-
-  /**
-   * Set test assertion id.
-   * @param id test assertion id.
-   * @see #getId
-   */
-  public void setId(String id);
-
-  /**
-   * Get test assertion type.
-   * @return test assertion type.
-   * @see #setType
-   */
-  public String getType();
-
-  /**
-   * Set test assertion type.
-   * @param  type test assertion type.
-   * @see #getType
-   */
-  public void setType(String type);
-
-  /**
-   * Get test assertion primary entry type name.
-   * @return test assertion primary entry type name.
-   * @see #setEntryTypeName
-   */
-  public String getEntryTypeName();
-
-  /**
-   * Set test assertion primary entry type name.
-   * @param entryTypeName test assertion primary entry type name.
-   * @see #getEntryTypeName
-   */
-  public void setEntryTypeName(String entryTypeName);
-
-  /**
-   * Get enabled indicator.
-   * @return enabled indicator.
-   * @see #setEnabled
-   */
-  public boolean isEnabled();
-
-  /**
-   * Set  enabled indicator.
-   * @param enabled enabled indicator.
-   * @see #isEnabled
-   */
-  public void setEnabled(boolean enabled);
-
-  /**
-   * Get context.
-   * @return context.
-   * @see #setContext
-   */
-  public String getContext();
-
-  /**
-   * Set context.
-   * @param context context.
-   * @see #getContext
-   */
-  public void setContext(String context);
-
-  /**
-   * Get assertion description.
-   * @return assertion description.
-   * @see #setAssertionDescription
-   */
-  public String getAssertionDescription();
-
-  /**
-   * Set assertion description.
-   * @param assertionDescription assertion description.
-   * @see #getAssertionDescription
-   */
-  public void setAssertionDescription(String assertionDescription);
-
-  /**
-   * Get failure message.
-   * @return failure message.
-   * @see #setFailureMessage
-   */
-  public String getFailureMessage();
-
-  /**
-   * Set failure message.
-   * @param failureMessage failure message.
-   * @see #getFailureMessage
-   */
-  public void setFailureMessage(String failureMessage);
-
-  /**
-   * Get failure detail description.
-   * @return failure detail description.
-   * @see #setFailureDetailDescription
-   */
-  public String getFailureDetailDescription();
-
-  /**
-   * Set failure detail description.
-   * @param failureDetailDescription failure detail description.
-   * @see #getFailureDetailDescription
-   */
-  public void setFailureDetailDescription(String failureDetailDescription);
-
-  /**
-   * Get detail description.
-   * @return detail description.
-   * @see #setDetailDescription
-   */
-  public String getDetailDescription();
-
-  /**
-   * Set detail description.
-   * @param detailDescription detail description.
-   * @see #getDetailDescription
-   */
-  public void setDetailDescription(String detailDescription);
-
-  /**
-   * Get additional entry type list.
-   * @return additional entry type list.
-   * @see #setAdditionalEntryTypeList
-   */
-  public EntryTypeList getAdditionalEntryTypeList();
-
-  /**
-   * Set additional entry type list.
-   * @param entryTypeList additional entry type list.
-   * @see #getAdditionalEntryTypeList
-   */
-  public void setAdditionalEntryTypeList(EntryTypeList entryTypeList);
-
-  /**
-   * Get list of prereq ids.
-   * @return list of prereq ids.
-   */
-  public Vector getPrereqIdList();
-
-  /**
-   * Add prereq test assertion id.
-   * @param  prereqId prereq test assertion id.
-   */
-  public void addPrereqId(String prereqId);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/EntryTypeListImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/EntryTypeListImpl.java
deleted file mode 100644
index 5d81f2d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/EntryTypeListImpl.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.impl;
-
-import org.eclipse.wst.wsi.internal.core.profile.EntryTypeList;
-
-/**
- * This implementation is used to maintain a profile EntryTypeList.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class EntryTypeListImpl implements EntryTypeList
-{
-  /**
-   * Log input.
-   */
-  protected String logInput = null;
-
-  /**
-   * WSDL input.
-   */
-  protected String wsdlInput = null;
-
-  /**
-   * UDDI input.
-   */
-  protected String uddiInput = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.EntryTypeList#getLogInput()
-   */
-  public String getLogInput()
-  {
-    return this.logInput;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.EntryTypeList#setLogInput(String)
-   */
-  public void setLogInput(String logInput)
-  {
-    this.logInput = logInput;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.EntryTypeList#getWSDLInput()
-   */
-  public String getWSDLInput()
-  {
-    return this.wsdlInput;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.EntryTypeList#setWSDLInput(String)
-   */
-  public void setWSDLInput(String wsdlInput)
-  {
-    this.wsdlInput = wsdlInput;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.EntryTypeList#getUDDIInput()
-   */
-  public String getUDDIInput()
-  {
-    return this.uddiInput;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.EntryTypeList#setUDDIInput(String)
-   */
-  public void setUDDIInput(String uddiInput)
-  {
-    this.uddiInput = uddiInput;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    return null;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java
deleted file mode 100644
index b4ab3be..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.LinkedList;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-
-/**
- * An artifact contains a set of related test assertions.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ProfileArtifactImpl implements ProfileArtifact
-{
-  /**
-   * Artifact type.
-   */
-  protected ArtifactType type;
-
-  /**
-   * Test assertion map.
-   */
-  protected TreeMap testAssertionMap = new TreeMap();
-
-  /**
-   * Test assertion list.
-   */
-  protected LinkedList testAssertionList = new LinkedList();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#getType()
-   */
-  public ArtifactType getType()
-  {
-    return this.type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#setType(ArtifactType)
-   */
-  public void setType(ArtifactType type)
-  {
-    this.type = type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#getSpecificationList()
-   */
-  public Vector getSpecificationList()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#setSpecificationList(Vector)
-   */
-  public void setSpecificationList(Vector specificationList)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#getTestAssertionList()
-   */
-  public LinkedList getTestAssertionList()
-  {
-    return this.testAssertionList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#getTestAssertion(String)
-   */
-  public TestAssertion getTestAssertion(String id)
-  {
-    return (TestAssertion) this.testAssertionMap.get(id);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ReportArtifact#addTestAssertion(TestAssertion)
-   */
-  public void addTestAssertion(TestAssertion testAssertion)
-  {
-    // ADD: Need to merge the list and map
-    this.testAssertionMap.put(testAssertion.getId(), testAssertion);
-    this.testAssertionList.add(testAssertion);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // ReportArtifact
-    pw.println("      <" + nsName + ELEM_NAME + ">");
-
-    pw.println("      </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java
deleted file mode 100644
index 2c81419..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.impl;
-
-import java.util.Iterator;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.profile.Profile;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-
-/**
- * This class ...
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ProfileAssertionsImpl implements ProfileAssertions
-{
-  /**
-   * Location of the profile definition.
-   */
-  protected String documentURI;
-
-  /**
-   * Name of the profile test assertion document.
-   */
-  protected String documentName;
-
-  /**
-   * Version of the profile test assertion document.
-   */
-  protected String documentVersion;
-
-  // ADD: A profile definition should also have a description.
-
-  /**
-   * List of profiles.
-   */
-  Vector profileList = new Vector();
-
-  /**
-   * List of artifacts.
-   */
-  TreeMap artifactList = new TreeMap();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#getProfileList()
-   */
-  public Vector getProfileList()
-  {
-    return this.profileList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#setProfileList(Vector)
-   */
-  public void setProfileList(Vector profileList)
-  {
-    this.profileList = profileList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#addProfile(Profile)
-   */
-  public void addProfile(Profile profile)
-  {
-    this.profileList.add(profile);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#getArtifactList()
-   */
-  public TreeMap getArtifactList()
-  {
-    return this.artifactList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#getArtifact(java.lang.String)
-   */
-  public ProfileArtifact getArtifact(String type)
-  {
-    return (ProfileArtifact) this.artifactList.get(type);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#setArtifactList(TreeMap)
-   */
-  public void setArtifactList(TreeMap artifactList)
-  {
-    this.artifactList = artifactList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#addArtifact(ReportArtifact)
-   */
-  public void addArtifact(ProfileArtifact artifact)
-  {
-    this.artifactList.put(artifact.getType(), artifact);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#getTestAssertion(String)
-   */
-  public TestAssertion getTestAssertion(String id)
-  {
-    TestAssertion testAssertion = null;
-
-    // Go through the list of artifacts and find the test assertion 
-    Iterator iterator = artifactList.values().iterator();
-    while ((iterator.hasNext()) && (testAssertion == null))
-    {
-      testAssertion = ((ProfileArtifact) iterator.next()).getTestAssertion(id);
-    }
-
-    return testAssertion;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertions#createArtifact()
-   */
-  public ProfileArtifact createArtifact()
-  {
-    return new ProfileArtifactImpl();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.WSIDocument#getLocation()
-   */
-  public String getLocation()
-  {
-    return this.documentURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.WSIDocument#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-    this.documentURI = documentURI;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions#getTADName()
-   */
-  public String getTADName()
-  {
-    return this.documentName;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions#setTADName(String)
-   */
-  public void setTADName(String documentName)
-  {
-    this.documentName = documentName;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions#getTADVersion()
-   */
-  public String getTADVersion()
-  {
-    return this.documentVersion;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions#setTADVersion(String)
-   */
-  public void setTADVersion(String documentVersion)
-  {
-    this.documentVersion = documentVersion;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    return null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java
deleted file mode 100644
index 3b2a9d9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java
+++ /dev/null

@@ -1,543 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.impl;
-
-import java.io.Reader;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.TreeMap;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.EntryTypeList;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertionsReader;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * This class ...
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ProfileAssertionsReaderImpl implements ProfileAssertionsReader
-{
-  /**
-   * Profile assertions.
-   */
-  protected ProfileAssertions profileAssertions;
-
-  /**
-   * ReportArtifact list.
-   */
-  protected TreeMap artifactList = new TreeMap();
-
-  /**
-   * Create new reader.
-   */
-  public ProfileAssertionsReaderImpl()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertionsReader#readProfileAssertions(String)
-   */
-  public ProfileAssertions readProfileAssertions(String assertionsURI)
-    throws WSIException
-  {
-    return readProfileAssertions(new InputSource(assertionsURI));
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.ProfileAssertionsReader#readProfileAssertions(Reader)
-   */
-  public ProfileAssertions readProfileAssertions(Reader reader)
-    throws WSIException
-  {
-    return readProfileAssertions(new InputSource(reader));
-  }
-
-  /**
-   * Read profile assertions.
-   */
-  private ProfileAssertions readProfileAssertions(InputSource inputSource)
-    throws WSIException
-  {
-    // Create profile assertions
-    profileAssertions = new ProfileAssertionsImpl();
-
-    // Profile parts are put into a vector
-    artifactList = new TreeMap();
-
-    try
-    {
-      // Create xml reader
-      XMLReader reader = XMLUtils.getXMLReader();
-
-      // Set content handler to inner class
-      reader.setContentHandler(new ProfileAssertionsHandler());
-
-      // Parse profile definition file
-      reader.parse(inputSource);
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException("Could not read and parse profile definition.", e);
-    }
-    finally
-    {
-      //Check to see if the version of test asssertion document is supported
-      if (!Utils.isValidProfileTADVersion(profileAssertions))
-      {
-        throw new WSIException(
-          "\nVersion "
-            + profileAssertions.getTADVersion()
-            + " of the \""
-            + profileAssertions.getTADName()
-            + "\"\n"
-            + "document is not compatible with this version of"
-            + "\n"
-            + "the test tools.");
-      }
-    }
-
-    // The assertions from the TAD are reordered for purposes of processing. All
-    // assertions of an artifact are reordered such that prerequisites occur
-    // before the assertions they prereq. The assumption is that  prerequisites do
-    // not cross artifact types.
-    //
-    Iterator it = artifactList.keySet().iterator();
-    // for each artifact type do reordering assertion 
-    while (it.hasNext())
-    {
-      ProfileArtifact art = (ProfileArtifact) artifactList.get(it.next());
-      // result list of the reordering assertions 
-      LinkedList res = new LinkedList();
-      Iterator it2 = art.getTestAssertionList().iterator();
-      // sort the artifact assertions into result list 
-      while (it2.hasNext())
-      {
-        // call for each assertion , 
-        // if the assertion has the prereq, the prereq will added first into res list
-        sortTestAssertions(art, (TestAssertion) it2.next(), res);
-      }
-      // replace the original assertions list to the prereq reordering assertions list
-      art.getTestAssertionList().clear();
-      art.getTestAssertionList().addAll(res);
-    }
-    // Put the profile parts into the profile definition
-    profileAssertions.setArtifactList(artifactList);
-
-    return profileAssertions;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentReader#getLocation()
-   */
-  public String getLocation()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentReader#setLocation(String)
-   */
-  public void setLocation(String documentURI)
-  {
-  }
-
-  /**
-   * Recursive walk to order assertions so that assertions are 
-   * processed following the ones that prereq them.
-   * If assertion has prereq, then add it to the result list first.
-   *  
-   * @param art profile artifact for call @link ProfileArtifact#getTestAssertion(String)
-   * @param asrt test assertion
-   * @param list result list to sort
-   */
-  private void sortTestAssertions(ProfileArtifact art, TestAssertion asrt, List list)
-  {
-    // if assertion is null or does not exist, then exit
-    if((asrt == null) || list.contains(asrt)) 
-      return;
-    
-    // if it has not prereq, add the asertion and exit
-    if(asrt.getPrereqIdList().isEmpty()) 
-    {
-      list.add(asrt);
-      return;
-    }
-    // get list prereq assertion and reqursive call sortTestAssertions this each    
-    Iterator it = asrt.getPrereqIdList().iterator();
-    while(it.hasNext()) {
-      String id = (String) it.next();
-      sortTestAssertions(art, art.getTestAssertion(id), list);
-    }
-    list.add(asrt);
-  }
-
-  /**
-   * Inner class: ProfileAssertionsHandler
-   */
-  class ProfileAssertionsHandler extends DefaultHandler
-  {
-    private ProfileArtifact artifact = profileAssertions.createArtifact();
-    private StringBuffer context = null;
-    private StringBuffer assertionDescription = null;
-    private StringBuffer failureMessage = null;
-    private StringBuffer failureDetailDescription = null;
-    private StringBuffer detailDescription = null;
-    private StringBuffer testAssertionId = null;
-    private String currentElement = null;
-    private TestAssertion testAssertion = null;
-    private StringBuffer logInput = null;
-    private StringBuffer wsdlInput = null;
-    private EntryTypeList entryTypeList = null;
-
-    // Process start element event
-    public void startElement(
-      String namespaceURI,
-      String localName,
-      String qName,
-      Attributes atts)
-    {
-      if (namespaceURI != null
-        && (namespaceURI.equals(WSIConstants.NS_URI_WSI_ASSERTIONS_2003)
-        ||  namespaceURI.equals(WSIConstants.NS_URI_WSI_ASSERTIONS)))
-      {
-        // Save element name
-        currentElement = localName;
-
-        // <artifact>
-        if (localName.equals(WSIConstants.ELEM_ARTIFACT))
-        {
-          // Create a new profile artifact object
-          artifact = profileAssertions.createArtifact();
-
-          // Set type
-          artifact.setType(
-            ArtifactType.newArtifactType(
-              atts.getValue(WSIConstants.ATTR_TYPE)));
-
-          // ADD: Get specification list
-
-          // Add artifact to list of artifact list
-          artifactList.put(artifact.getType().getTypeName(), artifact);
-        }
-
-        // <testAssertion>
-        else if (localName.equals(WSIConstants.ELEM_TEST_ASSERTION))
-        {
-          // Create test assertion
-          testAssertion = new TestAssertionImpl();
-
-          // Get attribute values
-          String id = atts.getValue("", WSIConstants.ATTR_ID);
-          testAssertion.setId(id);
-          testAssertion.setType(atts.getValue("", WSIConstants.ATTR_TYPE));
-          testAssertion.setEntryTypeName(
-            atts.getValue("", WSIConstants.ATTR_ENTRY_TYPE));
-          
-          // if assertion already checked then disable it
-          if (alreadyChecked(id))
-        	  testAssertion.setEnabled(false);
-          else
-        	  testAssertion.setEnabled(Boolean.valueOf(atts.getValue("", WSIConstants.ATTR_ENABLED)).booleanValue());
-
-          // Add test assertion to artifact
-          artifact.addTestAssertion(testAssertion);
-        }
-
-        // <context>
-        else if (localName.equals(WSIConstants.ELEM_CONTEXT))
-        {
-          context = new StringBuffer();
-        }
-
-        // <assertionDescription>
-        else if (localName.equals(WSIConstants.ELEM_ASSERTION_DESCRIPTION))
-        {
-          assertionDescription = new StringBuffer();
-        }
-
-        // <failureMessage>
-        else if (localName.equals(WSIConstants.ELEM_FAILURE_MESSAGE))
-        {
-          failureMessage = new StringBuffer();
-        }
-
-        // <failureDetailDescription>
-        else if (localName.equals(WSIConstants.ELEM_FAILURE_DETAIL_DESCRIPTION))
-        {
-          failureDetailDescription = new StringBuffer();
-        }
-
-        // <detailDescription>
-        else if (localName.equals(WSIConstants.ELEM_DETAIL_DESCRIPTION))
-        {
-          detailDescription = new StringBuffer();
-        }
-
-        // <testAssertionID>
-        else if (localName.equals(WSIConstants.ELEM_TEST_ASSERTION_ID))
-        {
-          testAssertionId = new StringBuffer();
-        }
-
-        // <additionalEntryTypeList>
-        else if (
-          localName.equals(WSIConstants.ELEM_ADDITIONAL_ENTRY_TYPE_LIST))
-        {
-          // Create entry type list
-          entryTypeList = new EntryTypeListImpl();
-        }
-
-        // <messageInput>
-        else if (localName.equals(WSIConstants.ELEM_MESSAGE_INPUT))
-        {
-          logInput = new StringBuffer();
-        }
-
-        // <wsdlInput>
-        else if (localName.equals(WSIConstants.ELEM_WSDL_INPUT))
-        {
-          wsdlInput = new StringBuffer();
-        }
-        // <profileAssertions>
-        else if (localName.equals(WSIConstants.ELEM_PROFILE_ASSERTIONS))
-        {
-          profileAssertions.setTADName(
-            atts.getValue("", WSIConstants.ATTR_NAME));
-          profileAssertions.setTADVersion(
-            atts.getValue("", WSIConstants.ATTR_VERSION));
-        }
-
-        /* REMOVE:     
-        // <uddiInput>
-        else if (localName.equals(WSIConstants.ELEM_UDDI_INPUT)) {
-          uddiInput = new StringBuffer();
-        } 
-        */
-      }
-    } // END startElement
-
-    public void endElement(String namespaceURI, String localName, String qname)
-    {
-      // If this is the profile namespace, then check for and process selected elements
-      if (namespaceURI != null
-        && (namespaceURI.equals(WSIConstants.NS_URI_WSI_ASSERTIONS_2003)
-        || namespaceURI.equals(WSIConstants.NS_URI_WSI_ASSERTIONS)))
-      {
-        // <context>
-        if (localName.equals(WSIConstants.ELEM_CONTEXT))
-        {
-          // Set context in test assertion
-          testAssertion.setContext(context.toString());
-          context = null;
-        }
-
-        // <assertionDescription>
-        else if (localName.equals(WSIConstants.ELEM_ASSERTION_DESCRIPTION))
-        {
-          // Set assertion description in test assertion
-          testAssertion.setAssertionDescription(
-            assertionDescription.toString());
-          assertionDescription = null;
-        }
-
-        // <failureMessage>
-        else if (localName.equals(WSIConstants.ELEM_FAILURE_MESSAGE))
-        {
-          // Set failure message in test assertion
-          testAssertion.setFailureMessage(failureMessage.toString());
-          failureMessage = null;
-        }
-
-        // <failureDetailDescription>
-        else if (localName.equals(WSIConstants.ELEM_FAILURE_DETAIL_DESCRIPTION))
-        {
-          // Set failure detail description in test assertion
-          testAssertion.setFailureDetailDescription(
-            failureDetailDescription.toString());
-          failureDetailDescription = null;
-        }
-
-        // <detailDescription>
-        else if (localName.equals(WSIConstants.ELEM_DETAIL_DESCRIPTION))
-        {
-          // Set detail description in test assertion
-          testAssertion.setDetailDescription(detailDescription.toString());
-          detailDescription = null;
-        }
-
-        // <testAssertionID>
-        else if (localName.equals(WSIConstants.ELEM_TEST_ASSERTION_ID))
-        {
-          // Set test assertion id in prereq list
-          testAssertion.addPrereqId(testAssertionId.toString());
-          testAssertionId = null;
-        }
-
-        // <addtionalEntryTypeList>
-        else if (
-          localName.equals(WSIConstants.ELEM_ADDITIONAL_ENTRY_TYPE_LIST))
-        {
-          // Set target list
-          testAssertion.setAdditionalEntryTypeList(entryTypeList);
-          entryTypeList = null;
-        }
-
-        // <messageInput>
-        else if (localName.equals(WSIConstants.ELEM_MESSAGE_INPUT))
-        {
-          // Set test assertion id in prereq list
-          entryTypeList.setLogInput(logInput.toString());
-          logInput = null;
-        }
-
-        // <wsdlInput>
-        else if (localName.equals(WSIConstants.ELEM_WSDL_INPUT))
-        {
-          // Set test assertion id in prereq list
-          entryTypeList.setWSDLInput(wsdlInput.toString());
-          wsdlInput = null;
-        }
-
-        // <profileAssertions>
-        else if (localName.equals(WSIConstants.ELEM_PROFILE_ASSERTIONS))
-        {
-          // a no-op
-        }
-
-        /* REMOVE:
-        // <uddiInput>
-        else if (localName.equals(WSIConstants.ELEM_UDDI_INPUT)) {
-          // Set test assertion id in prereq list
-           entryTypeList.setUDDIInput(uddiInput.toString());         
-          uddiInput = null;
-        }
-        */
-      }
-    } // END endElement
-
-    public void characters(char[] ch, int start, int length)
-    {
-      // <context>
-      if ((context != null)
-        && (currentElement.equals(WSIConstants.ELEM_CONTEXT)))
-      {
-        context.append(ch, start, length);
-      }
-
-      // <assertionDescription>
-      else if (
-        (assertionDescription != null)
-          && (currentElement.equals(WSIConstants.ELEM_ASSERTION_DESCRIPTION)))
-      {
-        assertionDescription.append(ch, start, length);
-      }
-
-      // <failureMessage>
-      else if (
-        (failureMessage != null)
-          && (currentElement.equals(WSIConstants.ELEM_FAILURE_MESSAGE)))
-      {
-        failureMessage.append(ch, start, length);
-      }
-
-      // <failureDetailDescription>
-      else if (
-        (failureDetailDescription != null) && (
-          currentElement.equals(WSIConstants.ELEM_FAILURE_DETAIL_DESCRIPTION)))
-      {
-        failureDetailDescription.append(ch, start, length);
-      }
-
-      // <detailDescription>
-      else if (
-        (detailDescription != null)
-          && (currentElement.equals(WSIConstants.ELEM_DETAIL_DESCRIPTION)))
-      {
-        detailDescription.append(ch, start, length);
-      }
-
-      // <testAssertionID>
-      else if (
-        (testAssertionId != null)
-          && (currentElement.equals(WSIConstants.ELEM_TEST_ASSERTION_ID)))
-      {
-        testAssertionId.append(ch, start, length);
-      }
-
-      // <messageInput>
-      else if (
-        (logInput != null)
-          && (currentElement.equals(WSIConstants.ELEM_MESSAGE_INPUT)))
-      {
-        logInput.append(ch, start, length);
-      }
-
-      // <wsdlInput>
-      else if (
-        (wsdlInput != null)
-          && (currentElement.equals(WSIConstants.ELEM_WSDL_INPUT)))
-      {
-        wsdlInput.append(ch, start, length);
-      }
-
-      /* REMOVE:
-      // <uddiInput>
-      else if ((uddiInput != null) && (currentElement.equals(WSIConstants.ELEM_UDDI_INPUT))) {
-        uddiInput.append(ch, start, length);
-      }
-      */
-    }
-  }
-
-  /**
-   * NOTE that this api assumes that base wsdl validator has already validated
-   * the wsdl document and corresponding schemas against the wsdl 1.1 specification.
-   * Note also that there are a number of duplicate checks between the base validator
-   * and the ws-i validator. Since some of these checks are cpu intensive, we disable 
-   * those assertions here. 
-   *
-   * Returns true if the assertion has already been checked by the base validator. 
-   * @param testAssertion
-   * @return true if the assertion has already been checked by the base validator. 
-   */
-  protected boolean alreadyChecked(String id)
-  {
-	 boolean result = false;
-	 if (id != null)
-	 {
-       result = (id.equals("BP2110") ||
-    		   	 id.equals("BP2115") ||
-		         id.equals("BP2417") ||
-		         id.equals("BP2114") ||
-		         id.equals("BP2123") ||
-		         id.equals("SSBP2209") ||
-		         id.equals("AP2209"));
-	 }
-	 return result;
-}
-
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java
deleted file mode 100644
index 769757a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.impl;
-
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.profile.EntryTypeList;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-
-/**
- * This class ...
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class TestAssertionImpl implements TestAssertion
-{
-  /**
-   * Test assertion id.
-   */
-  protected String id = null;
-
-  /**
-   * Test assertion type.
-   */
-  protected String type = null;
-
-  /**
-   * Test assertion primary entry type name.
-   */
-  protected String entryTypeName = null;
-
-  /**
-   * Test assertion enabled indicator.
-   */
-  protected boolean enabled = true;
-
-  /**
-   * Context.
-   */
-  protected String context = null;
-
-  /**
-   * Assertion description.
-   */
-  protected String assertionDescription = null;
-
-  /**
-   * Failure message.
-   */
-  protected String failureMessage = null;
-
-  /**
-   * Failure detail description.
-   */
-  protected String failureDetailDescription = null;
-
-  /**
-   * Detail description.
-   */
-  protected String detailDescription = null;
-
-  /**
-   * Addtional entry type list.
-   */
-  protected EntryTypeList entryTypeList = null;
-
-  /**
-   * Prereq ID list.
-   */
-  protected Vector prereqIdList = new Vector();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getId()
-   */
-  public String getId()
-  {
-    return this.id;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setId(String)
-   */
-  public void setId(String id)
-  {
-    this.id = id;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getType()
-   */
-  public String getType()
-  {
-    return this.type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setType(String)
-   */
-  public void setType(String type)
-  {
-    this.type = type;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getEntryTypeName()
-   */
-  public String getEntryTypeName()
-  {
-    return this.entryTypeName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setEntryTypeName(String)
-   */
-  public void setEntryTypeName(String entryTypeName)
-  {
-    this.entryTypeName = entryTypeName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#isEnabled()
-   */
-  public boolean isEnabled()
-  {
-    return enabled;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setEnabled(boolean)
-   */
-  public void setEnabled(boolean enabled)
-  {
-    this.enabled = enabled;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getContext()
-   */
-  public String getContext()
-  {
-    return context;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setContext(String)
-   */
-  public void setContext(String context)
-  {
-    this.context = context;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getAssertionDescription()
-   */
-  public String getAssertionDescription()
-  {
-    return this.assertionDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setAssertionDescription(String)
-   */
-  public void setAssertionDescription(String assertionDescription)
-  {
-    this.assertionDescription = assertionDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getFailureMessage()
-   */
-  public String getFailureMessage()
-  {
-    return this.failureMessage;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setFailureMessage(String)
-   */
-  public void setFailureMessage(String failureMessage)
-  {
-    this.failureMessage = failureMessage;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getFailureDetailDescription()
-   */
-  public String getFailureDetailDescription()
-  {
-    return this.failureDetailDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setFailureDetailDescription(String)
-   */
-  public void setFailureDetailDescription(String failureDetailDescription)
-  {
-    this.failureDetailDescription = failureDetailDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getDetailDescription()
-   */
-  public String getDetailDescription()
-  {
-    return this.detailDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setDetailDescription(String)
-   */
-  public void setDetailDescription(String detailDescription)
-  {
-    this.detailDescription = detailDescription;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getAdditionalEntryTypeList()
-   */
-  public EntryTypeList getAdditionalEntryTypeList()
-  {
-    return this.entryTypeList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#setAdditionalEntryTypeList(org.wsi.test.profile.EntryTypeList)
-   */
-  public void setAdditionalEntryTypeList(EntryTypeList entryTypeList)
-  {
-    this.entryTypeList = entryTypeList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#getPrereqIdList()
-   */
-  public Vector getPrereqIdList()
-  {
-    return prereqIdList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.TestAssertion#addPrereqId(String)
-   */
-  public void addPrereqId(String prereqId)
-  {
-    this.prereqIdList.add(prereqId);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java
deleted file mode 100644
index 7289ed0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.w3c.dom.Document;
-
-/**
- * The base interface for the profile validator.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface BaseValidator
-{
-  /**
-   * Set all test assertions for an artifact to missingInput.
-   * @throws WSIException if there is any problems while processing.
-   */
-  public void setAllMissingInput() throws WSIException;
-
-  /**
-   * Cleanup after processing all of the test assertions for an artifact.
-   * @throws WSIException if there is any problems during cleanup.
-   */
-  public void cleanup() throws WSIException;
-
-  /**
-     * Parse XML document and validate with a schema document.
-     * @param urlString XML document location.
-     * @param baseURI a base url to assist in locating the XML document.
-     * @param schema the related XML schema.
-     * @return XML document.
-     * @throws WSIException if there are any problems while parsing or 
-     *         validating the XML document.
-     */
-  public Document parseXMLDocumentURL(
-    String urlString,
-    String baseURI,
-    String schema)
-    throws WSIException;
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java
deleted file mode 100644
index 08bb99a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java
+++ /dev/null

@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-
-/**
- * This class contains the target information needed by a test assertion.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- * @author Graham Turrell (gturrell@uk.ibm.com)
- */
-public class EntryContext
-{
-  protected Entry entry = null;
-
-  protected MessageEntry request = null;
-  protected MessageEntry response = null;
-  protected MessageEntry messageEntry = null;
-
-  protected Document requestDocument = null;
-  protected Document responseDocument = null;
-  protected Document messageEntryDocument = null;
-
-  protected WSDLDocument wsdlDocument = null;
-
-  protected AnalyzerContext analyzerContext = null;
-
-  /**
-   * Create entry context.
-   * @param entry    a message entry.
-   * @param request  the request.
-   * @param response the response.
-   */
-  public EntryContext(Entry entry, MessageEntry request, MessageEntry response)
-  {
-    this(entry, request, response, null);
-  }
-
-  /**
-   * Create entry context.
-   * @param entry           a message entry.
-   * @param request         the request.
-   * @param response        the response.
-   * @param analyzerContext the analyzerContext.
-   */
-  public EntryContext(
-    Entry entry,
-    MessageEntry request,
-    MessageEntry response,
-    AnalyzerContext analyzerContext)
-  {
-    this.entry = entry;
-    this.request = request;
-    this.response = response;
-    this.analyzerContext = analyzerContext;
-
-    try
-    {
-      // Parse all documents
-      if(request.isMimeContent()) 
-      {
-      	MimePart part = request.getMimeParts().getRootPart();
-        if ((part != null) && (part.getContent().length() > 0))
-          requestDocument = XMLUtils.parseXML(part.getContent());
-      }
-      else 
-      {
-        if (request.getMessage().length() > 0)
-          requestDocument = XMLUtils.parseXML(request.getMessage());
-      }
-
-      if(response.isMimeContent()) 
-      {
-      	MimePart part = response.getMimeParts().getRootPart();
-      	if ((part != null) && (part.getContent().length() > 0))
-          responseDocument = XMLUtils.parseXML(part.getContent());
-      }
-      else 
-      {
-        if (response.getMessage().length() > 0)
-          responseDocument = XMLUtils.parseXML(response.getMessage());
-      }
-    }
-
-    catch (WSIException we)
-    {
-    }
-
-    // need some exception handling in here and more careful checking
-    if (entry.getEntryType().equals(EntryType.ENTRY_TYPE_REQUEST))
-    {
-      this.messageEntry = request;
-      this.messageEntryDocument = requestDocument;
-    }
-    else
-    {
-      this.messageEntry = response;
-      this.messageEntryDocument = responseDocument;
-    }
-  }
-
-  /**
-   * Create entry context.
-   * @param entry a message entry.
-   * @param wsdlDocument a WSDL document.
-   */
-  public EntryContext(Entry entry, WSDLDocument wsdlDocument)
-  {
-    this.entry = entry;
-    this.wsdlDocument = wsdlDocument;
-  }
-
-  /**
-   * Create entry context.
-   * @param entry a message entry.
-   * @param analyzerContext the analyzerContext.
-   */
-  public EntryContext(Entry entry, AnalyzerContext analyzerContext)
-  {
-    this.entry = entry;
-    this.analyzerContext = analyzerContext;
-  }
-
-  /**
-   * Returns the entry. 
-   * @return the entry. 
-   */
-  public Entry getEntry()
-  {
-    return this.entry;
-  }
-
-  /**
-   * Returns the request.
-   * @return the request.
-   */
-  public MessageEntry getRequest()
-  {
-    return request;
-  }
-
-  /**
-   * Returns the response.
-   * @return the response.
-   */
-  public MessageEntry getResponse()
-  {
-    return response;
-  }
-
-  /**
-   * Returns the log entry which is not null.
-   * @return the log entry.
-   */
-  public MessageEntry getMessageEntry()
-  {
-    return messageEntry;
-  }
-
-  /**
-   * Returns the request.
-   * @return MessageEntry
-   */
-  public Document getRequestDocument()
-  {
-    return requestDocument;
-  }
-
-  /**
-   * Returns the response.
-   * @return the response.
-   */
-  public Document getResponseDocument()
-  {
-    return responseDocument;
-  }
-
-  /**
-   * Returns the log entry which is not null.
-   * @return the log entry.
-   */
-  public Document getMessageEntryDocument()
-  {
-    return messageEntryDocument;
-  }
-
-  /**
-   * Returns the WSDL document.
-   * @return the WSDL document.
-   */
-  public WSDLDocument getWSDLDocument()
-  {
-    return wsdlDocument;
-  }
-
-  /**
-   * Returns analyzerContext.
-   * @return analyzerContext
-   */
-  public AnalyzerContext getAnalyzerContext()
-  {
-    return this.analyzerContext;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java
deleted file mode 100644
index 4b1f3c9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-
-/**
- * Interface definition for envelope validation test procedure.
- *
- * @version 1.0
- */
-public interface EnvelopeValidator extends BaseValidator
-{
-
-  /**
-   * Initiailize validation test procedure.
-   * @param analyzerContext the analyzerContext.
-   * @param artifact        an profile artifact.
-   * @param reportArtifact  the report artifact.
-   * @param wsdlDocument the Web service definition
-   * @param reporter the reporter which is used to add errors to the conformance report
-   * @throws WSIException if message validator could not be initialized.
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact artifact,
-    ReportArtifact reportArtifact,
-    WSDLDocument wsdlDocument,
-    Reporter reporter)
-    throws WSIException;
-
-  /**
-   * Validate the envelope located by the log entry. 
-   * @param entryContext a log entry locating an envelope.
-   * @throws WSIException if an unexpected error occurred while
-   *         processing the log entry.
-   */
-  public void validate(EntryContext entryContext) throws WSIException;
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java
deleted file mode 100644
index 13618a3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-
-/**
- * Interface definition for message validation test procedure.
- *
- * @version 1.0.1
- * @author Peter Brittenham
- * @author Graham Turrell (gturrell@uk.ibm.com)
- */
-public interface MessageValidator extends BaseValidator
-{
-  /**
-   * HTTP 1.0 version indicator.
-   */
-  public static final String HTTP_VERSION_1_0 = "HTTP/1.0";
-
-  /**
-   * HTTP 1.1 version indicator.
-   */
-  public static final String HTTP_VERSION_1_1 = "HTTP/1.1";
-
-  /**
-   * HTTP POST message indicator.
-   */
-  public static final String HTTP_POST = "POST";
-
-  /**
-   * Initiailize validation test procedure.
-   * @param analyzerContext the analyzerContext.
-   * @param artifact        an profile artifact.
-   * @param reportArtifact  the report artifact.
-   * @param wsdlDocument the Web service definition
-   * @param reporter the reporter which is used to add errors to the conformance report
-   * @throws WSIException if message validator could not be initialized.
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact artifact,
-    ReportArtifact reportArtifact,
-    WSDLDocument wsdlDocument,
-    Reporter reporter)
-    throws WSIException;
-
-  /**
-   * Validate the message located by the log entry. 
-   * @param entryContext a log entry locating a message.
-   * @throws WSIException if an unexpected error occurred while 
-   *         processing the log entry.
-   */
-  public void validate(EntryContext entryContext) throws WSIException;
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java
deleted file mode 100644
index 3a19394..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.util.WSIProperties;
-
-/**
-* This class is used to access an implementation of a ProfileValidatorFactory abstract class.
- *
- * @version 1.0.1
- * @author Peter Brittenham
- */
-public abstract class ProfileValidatorFactory
-{
-  /** 
-   * Create a new instance of a UDDI validator.
-   * @return  an object that implements the WSDLValidator interface.
-   * @throws WSIException if UDDI validator cannot be instantiated. 
-   */
-  public abstract UDDIValidator newUDDIValidator() throws WSIException;
-
-  /** 
-   * Create a new instance of a WSDL validator.
-   * @return an object that implements the WSDLValidator interface. 
-   * @throws WSIException if WSDL validator cannot be instantiated.
-   */
-  public abstract WSDLValidator newWSDLValidator() throws WSIException;
-
-  /** 
-   * Create a new instance of a message validator.
-   * NOTE: Do we need to differentiate between the tranport and SOAP 
-   * message validator?
-   *
-   * @return an object that implements the MessageValidator interface.
-   * @throws WSIException if message validatorcannot be instantiated. 
-   */
-  public abstract MessageValidator newMessageValidator() throws WSIException;
-
-  /** 
-   * Create a new instance of an envelope validator.
-   * @return an object that implements the EnvelopeValidator interface.
-   * @throws WSIException if message validator cannot be instantiated. 
-   */
-  public abstract EnvelopeValidator newEnvelopeValidator() throws WSIException;
-
-  /**
-   * Instantiate the implementation of the ProfileValidatorFactory class.
-   * The implementation class for this interface is specified in the following 
-   * Java system property:
-   * <UL>
-   *   <LI>wsi.profile.validator.factory
-   * </UL>
-   *
-   * @return the ProfileValidatorFactory object.
-   * @throws WSIException if factory class cannot be instantiated.
-   */
-  public static ProfileValidatorFactory newInstance() throws WSIException
-  {
-    ProfileValidatorFactory factory = null;
-    String factoryClassName = null;
-
-    try
-    {
-      // Get factory class name
-      factoryClassName =
-        WSIProperties.getProperty(
-          WSIProperties.PROP_VALIDATOR_FACTORY,
-          WSIProperties.DEF_VALIDATOR_FACTORY);
-
-      // Create the factory class
-      Class factoryClass = Class.forName(factoryClassName);
-
-      // Instantiate the factory 
-      factory = (ProfileValidatorFactory) factoryClass.newInstance();
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(
-        "Could not instantiate factory class: " + factoryClassName + ".",
-        e);
-    }
-
-    // Return factory
-    return factory;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java
deleted file mode 100644
index af18363..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-
-/**
- * The WSDL validator will verify that the WSDL and associated XML schema definitions
- * are in conformance with the profile.
- *
- * @version 1.0.1
- * @author Peter Brittenham
- */
-public interface UDDIValidator extends BaseValidator
-{
-  /**
-   * Initiailize validation test procedure.
-   * @param analyzerContext the analyzerContext.
-   * @param artifact        an profile artifact.
-   * @param reportArtifact  the report artifact.
-   * @param uddiReference   a UDDI reference.
-   * @param reporter        a Reporter object.
-   * @throws WSIException if UDDI validator could not be initialized.
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact artifact,
-    ReportArtifact reportArtifact,
-    UDDIReference uddiReference,
-    Reporter reporter)
-    throws WSIException;
-
-  /**
-   * Validate the UDDI based service description.
-   * @return If the UDDI entries are valid, then the value returned 
-   *         is the URL for the WSDL document.
-   * @throws WSIException WSIException if an unexpected error occurred
-   *         while processing the UDDIentries.
-   */
-  public String validate() throws WSIException;
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java
deleted file mode 100644
index e42bd2c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-
-/**
- * The WSDL validator will verify that the WSDL and associated XML schema definitions
- * are in conformance with the profile.
- *
- * @version 1.0.1
- * @author Peter Brittenham
- */
-public interface WSDLValidator extends BaseValidator
-{
-  /**
-   * Initiailize validation test procedure.
-   * @param analyzerContext the analyzerContext.
-   * @param artifact        the profile artifact.
-   * @param reportArtifact  the report artifact.
-   * @param wsdlURL         the WSDL document location.
-   * @param wsdlDocument    the WSDL document.
-   * @param reporter        a Reporter object.
-   * @throws WSIException if WSDL validator could not be initialized.
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact artifact,
-    ReportArtifact reportArtifact,
-    String wsdlURL,
-    WSDLDocument wsdlDocument,
-    Reporter reporter)
-    throws WSIException;
-
-  /**
-   * Validate the WSDL based service description.
-   * @return the WSDL document.
-   * @throws WSIException if an unexpected error occurred
-   *         while validating he WSDL based service description.
-   */
-  public WSDLDocument validate() throws WSIException;
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcess.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcess.java
deleted file mode 100644
index 23a3d2c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcess.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-
-
-/**
- * Process assertion.
- */
-public abstract class AssertionProcess
-{
-  protected String result;
-  protected String failureDetailMessage;
-  protected FailureDetail failureDetail;
-  private final BaseValidatorImpl base_validator;
-  
-  /**
-   * @param BaseValidatorImpl
-   */
-  public AssertionProcess(BaseValidatorImpl impl)
-  {
-    this.base_validator = impl;
-  }
-
-  /**
-   * Create assertion result.
-   */
-  void reset()
-  {
-    result = AssertionResult.RESULT_PASSED;
-    failureDetailMessage = null;
-    failureDetail = null;
-  }
-
-  /**
-   * Validate assertion.
-   */
-  public abstract AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext targetContext)
-    throws WSIException;
-
-  /**
-   * Verbose output.
-   */
-  public void debug(String message)
-  {
-    if ((base_validator != null) && base_validator.verboseOption)
-    {
-      System.err.println(message);
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcessVisitor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcessVisitor.java
deleted file mode 100644
index 4ccceed..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcessVisitor.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLVisitor;
-import org.w3c.dom.Element;
-
-
-/**
- * Process assertion using WSDLVisitor interface.
- */
-public abstract class AssertionProcessVisitor
-  extends AssertionProcess
-  implements WSDLVisitor
-{
-  /**
-   * @param BaseValidatorImpl
-   */
-  public AssertionProcessVisitor(BaseValidatorImpl impl)
-  {
-    super(impl);
-  }
-  
-  public void visit(Part obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Service obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Types obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Operation obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Input obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Output obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Fault obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Binding obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    BindingOperation obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    BindingInput obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    BindingOutput obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    BindingFault obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Import obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Element obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Message obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Port obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(PortType obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(Definition obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    ExtensibilityElement obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(SOAPBinding obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(SOAPBody obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(SOAPHeader obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    SOAPHeaderFault obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(SOAPFault obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  public void visit(
-    SOAPOperation obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java
deleted file mode 100644
index 7672745..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java
+++ /dev/null

@@ -1,1837 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.util.URI;
-import org.apache.xerces.xs.XSConstants;
-import org.apache.xerces.xs.XSModel;
-import org.apache.xerces.xs.XSTypeDefinition;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.analyzer.CandidateInfo;
-import org.eclipse.wst.wsi.internal.core.analyzer.ServiceReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.WSDLValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.util.xml.DOM2Writer;
-import com.ibm.wsdl.util.xml.DOMUtils;
-
-/**
- * The WSDL validator will verify that the WSDL and associated XML schema definitions
- * are in conformance with the profile.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Jim Clune
- * @author Graham Turrell (gturrell@uk.ibm.com)
- * @author Neil Delima (nddelima@ca.ibm.com) 
- */
-public abstract class BaseMessageValidator
-  extends BaseValidatorImpl
-{
-  /**
-  * WSDL document.
-  */
-  private WSDLDocument wsdlDocument;
-
-  /**
-   * Log entry.
-   */
-  protected MessageEntry logEntry;
-  protected Log log;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.MessageValidator#init(org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext, org.wsi.test.profile.ProfileArtifact, org.wsi.test.report.ReportArtifact, org.wsi.wsdl.WSDLDocument, org.wsi.test.report.Reporter)
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact profileArtifact,
-    ReportArtifact reportArtifact,
-    WSDLDocument wsdlDocument,
-    Reporter reporter)
-    throws WSIException
-  {
-    // BaseValidatorImpl
-    super.init(analyzerContext, profileArtifact, reportArtifact, reporter);
-
-    // Save input references
-    this.wsdlDocument = wsdlDocument;
-  }
-
-  /**
-   * Returns wsdlDocument
-   * @return wsdlDocument
-   */
-  public WSDLDocument getWSDLDocument()
-  {
-    return wsdlDocument;
-  }
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.MessageValidator#validate(org.wsi.test.profile.validator.EntryContext)
-   */
-  public void validate(EntryContext entryContext) throws WSIException
-  {
-    //Entry entry = null;
-
-    // Save log entry to be referenced by other methods
-    this.logEntry = entryContext.getMessageEntry();
-
-    // Get reference to the analyzer config object
-    AnalyzerConfig analyzerConfig =
-      reporter.getReport().getReportContext().getAnalyzer().getAnalyzerConfig();
-
-    /* If Service Description (WSDL/UDDI) NOT supplied in analyzer config OR
-     * Service Description IS supplied and the current message correlates to it...
-     */
-    if ((wsdlDocument == null)
-      || messageCorrelatesToService(
-        entryContext,
-        analyzerConfig.getCorrelationType()))
-    {
-      // now inner classes moved out from the validator
-      //String classPrefix = this.getClass().getName() + "$";
-      String classPrefix = this.getClass().getPackage().getName()+".";
-
-      // Process assertions for this artifact against the target context
-      processAssertions(classPrefix, entryContext);
-    }
-  }
-
-  /**
-   * Check whether the message correlates to the service under test.
-   * Use the request part of the request-response pair, from which the correlation of the response is implied.
-   * Entities from the Service under test are determined once for all.
-   * @param entryContext    an entry context.
-   * @param correlationType a correlation type.
-   * @return true if the message correlates to the service under test.
-   * @throws WSIException if correlation type is not appropriate.
-   */
-  private boolean messageCorrelatesToService(
-    EntryContext entryContext,
-    String correlationType)
-    throws WSIException
-  {
-
-    URI[] endpoints = null;
-    boolean correlation = false;
-
-    /* TEMP: Get it from analyzer config passed in on init method
-    CandidateInfo candidate = entryContext
-                              .getAnalyzerContext()
-                              .getCandidateInfo();
-    */
-    CandidateInfo candidate = analyzerContext.getCandidateInfo();
-
-    // Service reference 
-    ServiceReference serviceReference = analyzerContext.getServiceReference();
-
-    // Get the definition element
-    Definition definition = candidate.getWsdlDocument().getDefinitions();
-
-    Binding binding = null;
-    if (serviceReference.getWSDLElement().isPort())
-    {
-      // Get service
-      Service service =
-        definition.getService(
-          serviceReference.getWSDLElement().getParentElementQName());
-
-      // Get port
-      Port port = service.getPort(serviceReference.getWSDLElement().getName());
-
-      // Get binding
-      binding = port.getBinding();
-    }
-    else if (serviceReference.getWSDLElement().isBinding())
-    {
-      // Get binding
-      binding =
-        definition.getBinding(serviceReference.getWSDLElement().getQName());
-    }
-
-    if (binding == null)
-    {
-      return false;
-    }
-
-    if ((endpoints = hostAndPortCorrelation(entryContext)) != null
-      && urlPathCorrelation(entryContext, endpoints))
-    {
-
-      /* If correlation type is "endpoint", this is all the correlation that can be done.
-       * (Note - this is incomplete correlation since >1 service could be associated with the endpoint.
-       *  Therefore , if messages for different services on the same endpoint appear in the log file
-       *  and correlation type is "endpoint", all those messages will be analyzed).
-       */
-      if (correlationType
-        .equals(WSIConstants.ATTRVAL_CORRELATION_TYPE_ENDPOINT))
-      {
-        correlation = true;
-      }
-      else
-      {
-        // always allow GET requests right through if they've passed Endpoint Correlation
-        String requestType = getHttpRequestType(entryContext);
-        if ((requestType != null) && requestType.equalsIgnoreCase("GET"))
-        {
-          correlation = true;
-        }
-        else
-        {
-          // The correlationType is not "endpoint" so continue on to processing for at least 
-          // "namespace" correlation...
-
-          // get the operation signature (input & output) from request & response messages...	   
-          // and do a quick DOM parse 
-          Document requestMessage = entryContext.getRequestDocument();
-
-          // Check if namespace is found in request message only
-          if (namespaceCorrelation(binding, requestMessage))
-          {
-            // If namespace found and the correlation type is namespace, then process messages
-            if (correlationType
-              .equals(WSIConstants.ATTRVAL_CORRELATION_TYPE_NAMESPACE))
-            {
-              correlation = true;
-            }
-
-            // If operation is found and correlation type is operation, then process messages
-            else if (
-              (operationCorrelation(binding, requestMessage))
-                && (correlationType
-                  .equals(WSIConstants.ATTRVAL_CORRELATION_TYPE_OPERATION)))
-            {
-              correlation = true;
-            }
-            else
-            {
-              // this should never happen if config schema was followed correctly
-              throw new WSIException(
-                "Bad correlation type found in config: " + correlationType);
-            }
-          }
-        }
-      }
-    }
-
-    return correlation;
-  }
-
-  /** 
-   *  Correlation Check 1: Service Description endpoint vs HTTP Header (test 1)
-   *  Check if receiverHostAndPort from request message log matches host & port from WSDL SOAP binding for
-   *  the Service under test.
-   *  If it does not, stop processing this message pair.
-   * @param entryContext an entry context.
-   * @return if receiverHostAndPort from request message log matches 
-   *         host & port from WSDL SOAP binding for the Service.
-   * @throws WSIException if problem occurs during correlation check.
-   */
-  private URI[] hostAndPortCorrelation(EntryContext entryContext)
-    throws WSIException
-  {
-
-    // get <receiverHostAndPort> from request message
-    String httpHostAndPort = entryContext.getRequest().getReceiverHostAndPort();
-    // Search endpoint list for a match with <receiverHostAndPort>
-
-    /* TEMP: Get it from analyzer config passed in on init method
-    return entryContext.getAnalyzerContext()
-                       .getCandidateInfo()
-                       .getEndPoints(httpHostAndPort);
-    */
-    return analyzerContext.getCandidateInfo().getEndPoints(httpHostAndPort);
-  }
-
-  /** 
-   * Correlation Check 2: Service Description endpoint vs HTTP Header (test 2)
-   * 
-   * Use analyzer config host & port, plus URL path (from request message header HTTP POST)
-   * to look for the corresponding endpoint in the Service Definition.
-   * If it does not, stop processing this message pair.
-   * @param entryContext an entry context.
-   * @param endpoints an array of endpoints.
-   * @return true if corresponding endpoints are found in the Service Definition.
-   * @throws WSIException if problem occurs during correlation check.
-   */
-  private boolean urlPathCorrelation(
-    EntryContext entryContext,
-    URI[] endpoints)
-    throws WSIException
-  {
-
-    // compares: protocol (must be http for POST), host, port and path.
-
-    // get POST URI path from message using Tokenizer	
-    Vector requestLine =
-      getHttpRequest(entryContext.getRequest().getHTTPHeaders());
-    if (requestLine == null)
-    {
-      return false; // an unexpected HTTP request type !
-    }
-
-    String requestPath = (String) requestLine.get(1);
-    // Path immediately follows POST
-
-    // compare path with those in the previous generated URI list	
-    Vector filteredEndpoints = new Vector();
-    for (int i = 0; i < endpoints.length; i++)
-    {
-      if (endpoints[i].toString().endsWith(requestPath))
-      {
-        filteredEndpoints.add(endpoints[i]);
-      }
-    }
-
-    if (filteredEndpoints.size() == 0)
-      return false;
-
-    // this URI should be unique in the WSDL - there should be at most one match
-    // but if we have at least one, that's sufficient to accept the message
-
-    return true;
-  }
-
-  /** 
-   * Correlation Check 3: Service Description namespace.
-   * 
-   * Determine if the Service Description declares the namespace that appears in the (request?) message soap body.
-   * Location of relevent namespace :
-   * Operation type                    	- Message Namespace: (compare with)  Service Definition Namespace:
-   * (from message? endpoint? where?)
-   * rpc-literal                           &lt;soap:Body&gt; child namespace.        &lt;soapbind:body&gt; namespace.
-   * doc-literal			                 &lt;soap:Body&gt; child namespace.       targetNameSpace of schema that
-   *                                                                          defines  &lt;soap:body&gt; child.
-   * If it doesn't match, stop processing this message pair.
-   * @param binding a binding.
-   * @param request a request.
-   * @return true if description declared in the description are the 
-   *         same as those that appear in the message soap body.
-   * @throws WSIException if problem occurs during correlationcheck.                                                                       
-   */
-  private boolean namespaceCorrelation(Binding binding, Document request)
-    throws WSIException
-  {
-    boolean namespaceFound = false;
-    String bindingStyle = WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC;
-
-    // Get operation namespace from the request soap message
-    String soapOpNS = getSoapBodyChild(request).getNamespaceURI();
-
-    // Get soapbind:binding
-    SOAPBinding soapBinding = null;
-    if ((soapBinding = WSDLUtils.getSoapBinding(binding)) != null)
-    {
-      bindingStyle = soapBinding.getStyle();
-    }
-
-    // Go through each operation in the binding and check for namespace match
-    Iterator operations = binding.getBindingOperations().iterator();
-    while (operations.hasNext() && !(namespaceFound))
-    {
-      BindingOperation bindingOperation = (BindingOperation) operations.next();
-
-      // If rpc-literal, then look at namespace attribute on soapbind:body
-      if (WSDLUtils.isRpcLiteral(bindingStyle, bindingOperation))
-      {
-        // Get soapbind:body element 
-        SOAPBody soapBody = WSDLUtils.getInputSoapBody(bindingOperation);
-
-        if ((soapBody.getNamespaceURI() != null)
-          && (soapBody.getNamespaceURI().equals(soapOpNS)))
-        {
-          namespaceFound = true;
-        }
-      }
-
-      // If doc-literal, then check namespace
-      else if (WSDLUtils.isDocLiteral(bindingStyle, bindingOperation))
-      {
-        int partCount;
-        Iterator partsIterator = null;
-
-        // Get first part name from soapbind:body element parts attribute
-        String partName = getFirstPartName(bindingOperation);
-
-        // Get the list of parts from the message           
-        Map partsMap = null;
-        if ((partsMap =
-          bindingOperation.getOperation().getInput().getMessage().getParts())
-          != null)
-        {
-          partsIterator = partsMap.values().iterator();
-
-          // If the part name wasn't specified on the soapbind:body element, then process just the first one
-          if (partName == null)
-            partCount = 1;
-          else
-            partCount = partsMap.size();
-
-          for (int i = 0; i < partCount && !namespaceFound; i++)
-          {
-            // Get next part
-            Part part = (Part) partsIterator.next();
-
-            // If part name matches or there is no part name, then check namespace
-            if ((partName == null)
-              || ((partName != null) && (part.getName().equals(partName))))
-            {
-              if ((part.getElementName().getNamespaceURI() != null)
-                && (part.getElementName().getNamespaceURI().equals(soapOpNS)))
-              {
-                namespaceFound = true;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return namespaceFound;
-  }
-
-  /** 
-  * Correlation Check 4 : Service Description "operation"
-  *
-  * Check if the message content matches any of the candidate operation definitions 
-  * for request and response in the Service Description.
-  *  
-  * For both request and response, look for the soap body child element name
-  * in the list of candidate operation names.
-  * @param binding        a binding.
-  * @param requestMessage a request message.
-  * @return true if the message content matches any of the candidate 
-  *         operation definitions for request and response in the 
-  *         Service Description.
-  * @throws WSIException if problem occurs during correlationcheck.
-  */
-  private boolean operationCorrelation(
-    Binding binding,
-    Document requestMessage)
-    throws WSIException
-  {
-    boolean operationFound = false;
-
-    String bindingStyle = WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC;
-
-    // Get soapbind:binding
-    SOAPBinding soapBinding = null;
-    if ((soapBinding = WSDLUtils.getSoapBinding(binding)) != null)
-    {
-      bindingStyle = soapBinding.getStyle();
-    }
-
-    // Get the first child element from the soap body
-    Element soapBodyChild = getSoapBodyChild(requestMessage);
-
-    // If there is a child element, then check it
-    if (soapBodyChild != null)
-    {
-      // Get operation name from the soap:body
-      String operationName = soapBodyChild.getLocalName();
-
-      // Get operation QName
-      QName operationQName =
-        new QName(soapBodyChild.getNamespaceURI(), operationName);
-
-      // Go through each operation in the binding and check for namespace match
-      Iterator operations = binding.getBindingOperations().iterator();
-      while (operations.hasNext() && !(operationFound))
-      {
-        BindingOperation bindingOperation =
-          (BindingOperation) operations.next();
-
-        // If rpc-literal, then look at namespace attribute on soapbind:body
-        if (WSDLUtils.isRpcLiteral(bindingStyle, bindingOperation))
-        {
-          // Get soapbind:body element 
-          if (bindingOperation.getName().equals(operationName))
-            operationFound = true;
-        }
-
-        // If doc-literal, then check namespace
-        else if (WSDLUtils.isDocLiteral(bindingStyle, bindingOperation))
-        {
-          int partCount;
-          Iterator partsIterator = null;
-
-          // Get first part name from soapbind:body element parts attribute
-          String partName = getFirstPartName(bindingOperation);
-
-          // Get the list of parts from the message           
-          Map partsMap = null;
-          if ((partsMap =
-            bindingOperation.getOperation().getInput().getMessage().getParts())
-            != null)
-          {
-            partsIterator = partsMap.values().iterator();
-
-            // If the part name wasn't specified on the soapbind:body element, then process just the first one
-            if (partName == null)
-              partCount = 1;
-            else
-              partCount = partsMap.size();
-
-            for (int i = 0; i < partCount && !operationFound; i++)
-            {
-              // Get next part
-              Part part = (Part) partsIterator.next();
-
-              // If part name matches or there is no part name, then check namespace
-              if ((partName == null)
-                || ((partName != null) && (part.getName().equals(partName))))
-              {
-                if ((part.getElementName() != null)
-                  && (part.getElementName().equals(operationQName)))
-                {
-                  operationFound = true;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    // Go through each operation to find a match
-    return operationFound;
-  }
-
-  /**
-   * Create failure detail.
-   * @param message       a message.
-   * @param entryContext  an entry context.
-   * @return failure detail.
-   */
-  public FailureDetail createFailureDetail(
-    String message,
-    EntryContext entryContext)
-  {
-    FailureDetail failureDetail = reporter.createFailureDetail();
-    failureDetail.setFailureMessage(message);
-    failureDetail.setElementLocation(
-      entryContext.getMessageEntry().getElementLocation());
-    return failureDetail;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isNotApplicable(org.wsi.test.profile.TestAssertion)
-   */
-  protected boolean isNotApplicable(TestAssertion testAssertion)
-  {
-    boolean notApplicable = false;
-
-    // If the additional entry is not available, then set notApplicable
-    if (testAssertion.getAdditionalEntryTypeList().getWSDLInput() != null
-      && !testAssertion.getAdditionalEntryTypeList().getWSDLInput().equals("none")
-      && analyzerContext.getServiceReference().getWSDLLocation() == null)
-    {
-      notApplicable = true;
-    }
-
-    return notApplicable;
-  }
-
-
-  /**
-   * Get POST request.
-   * @param httpHeader an HTTP 
-   * @return POST request.
-   */
-  public Vector getPostRequest(String httpHeader)
-  {
-    //Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
-    Vector requestLine = new Vector();
-    String startLine = null;
-
-    StringTokenizer httpMessageTokenizer =
-      new StringTokenizer(httpHeader, "\n\r\f");
-
-    if (httpMessageTokenizer.hasMoreTokens())
-    {
-      startLine = httpMessageTokenizer.nextToken();
-    }
-
-    if (startLine.startsWith("POST"))
-    {
-      StringTokenizer startLineTokenizer =
-        new StringTokenizer(startLine, "\u0020");
-      while (startLineTokenizer.hasMoreTokens())
-      {
-        requestLine.add(startLineTokenizer.nextToken());
-      }
-    }
-    return requestLine;
-  }
-
-  /**
-   * Get HTTP request.
-   * @param httpHeader an HTTP 
-   * @return HTTP request.
-  */
-  private Vector getHttpRequest(String httpHeader)
-  {
-    //Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
-    Vector requestLine = new Vector();
-    String startLine = null;
-
-    StringTokenizer httpMessageTokenizer =
-      new StringTokenizer(httpHeader, "\n\r\f");
-
-    if (httpMessageTokenizer.hasMoreTokens())
-    {
-      startLine = httpMessageTokenizer.nextToken();
-    }
-
-    if (startLine.startsWith("POST") || startLine.startsWith("GET"))
-    {
-      StringTokenizer startLineTokenizer =
-        new StringTokenizer(startLine, "\u0020");
-      while (startLineTokenizer.hasMoreTokens())
-      {
-        requestLine.add(startLineTokenizer.nextToken());
-      }
-    }
-    else
-    {
-      requestLine = null; // signify not POST or GET
-    }
-
-    return requestLine;
-  }
-
-  /**
-   * Get HTTP request type.
-   * @param entryContext an entry context.
-   * @return HTTP request type.
-   */
-  private String getHttpRequestType(EntryContext entryContext)
-  {
-    //Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
-
-    String httpHeader = entryContext.getRequest().getHTTPHeaders();
-    String httpRequestType = null;
-    String startLine = null;
-
-    StringTokenizer httpMessageTokenizer =
-      new StringTokenizer(httpHeader, "\n\r\f");
-
-    if (httpMessageTokenizer.hasMoreTokens())
-    {
-      startLine = httpMessageTokenizer.nextToken();
-      StringTokenizer startLineTokenizer =
-        new StringTokenizer(startLine, "\u0020");
-      if (startLineTokenizer.hasMoreTokens())
-      {
-        httpRequestType = startLineTokenizer.nextToken();
-      }
-    }
-    return httpRequestType;
-  }
-
-  /**
-   * Determine if the message is a response for a one-way operation.
-   * @param entryContext an entry context.
-   * @return true if the message is a response for a one-way operation.
-   */
-  public boolean isOneWayResponse(EntryContext entryContext)
-  {
-    boolean oneway = false;
-
-    // TEMP: If this is a response message and there is no content, then set one-way to true
-    // TEMP: Need to find a way to determine if the response is for a one-way message
-    if (entryContext
-      .getMessageEntry()
-      .getType()
-      .equalsIgnoreCase(MessageEntry.TYPE_RESPONSE)
-      && entryContext.getMessageEntry().getMessage().length() == 0)
-    {
-      oneway = true;
-    }
-
-    return oneway;
-  }
-
-  /**
-   * messageIsDocLitSchemaValid.
-   *
-   * Validates the doc-lit messages against the schema found in a candidate wsdl document.
-   *
-   * Identify (or be given) a reference in the wsdl to elements (found in &lt;wsdl:types&gt;&lt;schema&gt;...)
-   * that are immediate children elements in the soap body.
-   * @param entryContext an entry context.
-   * @return true if the document literal message is compliant to the 
-   *         schema found in a candidate WSDL document.
-   * @throws WSIException if there is a parsing problem during validation.
-   */
-  public boolean messageIsDocLitSchemaValid(EntryContext entryContext)
-    throws WSIException
-  {
-
-    // This method should use a validating parser that is capable of acceppting multiple schema references
-    // programmatically. Then, every schema in candidate wsdl can be passed in to the validator. This avoids the
-    // need to pinpoint a particular schema element from all candidate wsdl:types, corresponding to the 
-    // wsdl:operation being used. The pinpointing is an incomplete workaround for parsers not capable 
-    // of accepting arrays of scehma references 
-    // [ i.e. the DOM factory.setAttribute(JAXP_SCHEMA SOURCE, Object[] {...}) ]
-    // get all xs:schema from all candidate wsdl:types                    
-    // add each <schema> to an array and pass this array to the validating parser
-    // when validating the/each soap body child.
-
-    // use the referenced WSDL file and its imported files to find schemas
-    List schemaWSDLs = new ArrayList();
-    List inlineSchemas = new ArrayList();
-    List schemaStrings = new ArrayList();
-
-    Definition[] allDefs =
-      analyzerContext.getCandidateInfo().getDefinitions();
-    for (int thisDef = 0; thisDef < allDefs.length; thisDef++)
-    {
-      schemaWSDLs.add(allDefs[thisDef].getDocumentBaseURI());
-    }
-    Iterator fileIterator = schemaWSDLs.iterator();
-    while (fileIterator.hasNext())
-    {
-      // parse file if possible
-      Document wsdlDoc = null;
-      String wsdlURI = (String) fileIterator.next();
-      try
-      {
-        wsdlDoc = XMLUtils.parseXMLDocumentURL(wsdlURI, null);
-      }
-      catch (Exception e)
-      {
-        continue;
-      }
-      Element root = wsdlDoc.getDocumentElement();
-      // find the schema
-      NodeList schemaElements = root.getElementsByTagNameNS(
-        WSITag.ELEM_XSD_SCHEMA.getNamespaceURI(),
-        WSITag.ELEM_XSD_SCHEMA.getLocalPart());
-
-      for (int elem = 0; elem < schemaElements.getLength(); elem++)
-      {     
-        Element schema = (Element) schemaElements.item(elem);
-        // copying all the NS declarations from wsdl:definitions wsdl:types
-        copyNSDeclarations(root, schema);
-        copyNSDeclarations((Element) schema.getParentNode(), schema);
-        // Replacing all relative schemaLocation URIs with absolute ones
-        replaceRelativeURIs(schema, wsdlURI);
-        inlineSchemas.add(schema);
-      }
-    }
-
-    // Note that the Xerces parser ONLY accepts an array
-    // of schemas with unique namespaces.
-    if (!duplicateNamespacesDetected(inlineSchemas))
-    {
-      // Serialize the schema elements inside the Types, then use this as
-      // the schema string for the validation
-      Iterator i = inlineSchemas.iterator();
-      while (i.hasNext())
-      {
-    	Element schema = (Element)i.next(); 
-        String schemaString = DOM2Writer.nodeToString(schema);
-        schemaStrings.add(schemaString);
-      }
-
-      NodeList elementList = entryContext.getMessageEntryDocument()
-        .getElementsByTagNameNS(WSITag.ELEM_SOAP_BODY.getNamespaceURI(),
-            WSITag.ELEM_SOAP_BODY.getLocalPart());
-      if (elementList == null || elementList.getLength() != 1)
-      {
-        // should only be a single soap body !
-        return false; // probably an error condition though
-      }
-
-      NodeList soapBodyChildList = ((Element)elementList.item(0)).getChildNodes();
-      for (int child = 0; child < soapBodyChildList.getLength(); child++)
-      {
-        Node soapBodyChild = soapBodyChildList.item(child);
-        if (soapBodyChild.getNodeType() == Node.ELEMENT_NODE)
-        {
-          // do all for now
-          try
-          {
-            // Write out element tree to String
-            String messageContent = DOM2Writer.nodeToString(soapBodyChild);
-            // parse the child element, validating against the schema 
-            XMLUtils.parseXML(messageContent, schemaStrings);
-          }
-          catch (WSIException e)
-          {
-            if (e.getTargetException() instanceof SAXException)
-            {
-              // validation failed
-              throw new WSIException(e.getTargetException().getMessage());
-            }
-            throw e;
-          }
-          catch (Exception e)
-          {
-            throw new WSIException("Validating Parsing problem", e);
-            // Bad things have happened
-          }
-        }
-      }   
-    }
-    return true;
-  }
-
-  /**
-   * Copy the namespace declarations.
-   * @param parent a message.
-   * @param child a stripped message.
-   */
-  private void copyNSDeclarations(Element parent, Element child)
-  {
-    NamedNodeMap nodeMap = parent.getAttributes();
-    for (int nodeId = 0; nodeId < nodeMap.getLength(); nodeId++)
-    {
-      Node node = nodeMap.item(nodeId);
-
-      if ((node.getNodeType() == Node.ATTRIBUTE_NODE)
-        && (node.getNodeName().startsWith("xmlns:")))
-      {
-        String nodeName = node.getNodeName();
-        // If an NS being copied is not the same as the child element has, copy it
-        if (!child.getNodeName().startsWith(
-          nodeName.substring(nodeName.indexOf(":") + 1) + ":"))
-        {
-          child.setAttribute(nodeName, node.getNodeValue());
-        }
-      }
-    }
-  }
-
-  /**
-   * Replaces all relative URIs for schemaLocation attributes.
-   * @param schema an xsd:schema element.
-   * @param wsdlURI an URI of WSDL that contains xsd:schema being processed.
-   */
-  private void replaceRelativeURIs(Element schema, String wsdlURI)
-  {
-    // Retrieving all xsd:import elements
-    NodeList imports = schema.getElementsByTagNameNS(
-      WSITag.ELEM_XSD_IMPORT.getNamespaceURI(),
-      WSITag.ELEM_XSD_IMPORT.getLocalPart());
-    // Going through the elements
-    for (int i = 0; i < imports.getLength(); i++)
-    {
-      Element imp = (Element) imports.item(i);
-      // Getting the schemaLocation attribute
-      Attr schemaLocation =
-        XMLUtils.getAttribute(imp, WSITag.ATTR_XSD_SCHEMALOCATION);
-      // If the attribute is present
-      if (schemaLocation != null)
-      {
-        // Trying to create an URI object using attribute's value
-        URI uri = null;
-        try
-        {
-          uri = new URI(schemaLocation.getValue());
-        }
-        catch (Exception e) {}
-        // If the value is not an absolute URI (the URI constructor throws the
-        // MalformedURIException), creating the absolute URI using wsdlURI
-        if (uri == null)
-        {
-          String newURI = wsdlURI.substring(0, wsdlURI.lastIndexOf("/") + 1)
-            + schemaLocation.getValue();
-          try
-          {
-            uri = new URI(newURI);
-            // Setting a new URI as a value for the schemaLocation attribute
-            schemaLocation.setValue(uri.toString());
-          }
-          catch (Exception e) {}
-        }
-      }
-    }
-  }
-
-  /**
-   * Returns binding operation matched for SOAP message.
-   * @param entryType message entry type.
-   * @param doc a message.
-   * @return any binding operation matched, null if it is not found.
-   */
-  public BindingOperation getOperationMatch(EntryType entryType, Document doc) 
-  {
-    BindingOperation bindingOperation = null;
-    try
-    {
-      // Getting the name of the first SOAP Body child element
-      QName operation = getOperationFromMessage(doc);
-      if (operation != null)
-      {
-        // Retrieving all the RPC binding operations from wsdl:binding
-        BindingOperation[] rpcBindingOps = getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC,
-          analyzerContext.getCandidateInfo().getBindings());
-        // Retrieving binding operation by the given operation name
-        bindingOperation = getOperationMatch(
-          entryType, operation, rpcBindingOps);
-        // If no one RPC operation matched
-        if(bindingOperation == null)
-        {
-          // Retrieving all the document binding operations from wsdl:binding
-          BindingOperation[] docBindingOperations = getMatchingBindingOps(
-            WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC,
-            analyzerContext.getCandidateInfo().getBindings());
-          // Retrieving binding operation by given element name
-          BindingOperation[] potentialDocLitOps =
-            getDocLitOperations(entryType, operation, docBindingOperations);
-          // If there is exactly one operation matched
-          if (potentialDocLitOps.length == 1)
-            bindingOperation = potentialDocLitOps[0];
-        }
-      }
-    }
-    catch (Exception e) {}
-
-    return bindingOperation;
-  }
-
-  /**
-   * Match either Input or Output.
-   * @param messageEntryType message entry type.
-   * @param soapMessage soap message.
-   * @param op binding operations.
-   * @return matched operation.
-   */
-  public BindingOperation getOperationMatch(
-    EntryType messageEntryType,
-    Document soapMessage,
-    BindingOperation[] op)
-  {
-    // Get operation from message
-    QName operation = getOperationFromMessage(soapMessage);
-    // list of QNames
-
-    return getOperationMatch(messageEntryType, operation, op);
-  }
-
-  /**
-   * Match either Input or Output.
-   * @param messageEntryType message entry type.
-   * @param operation SOAP operation name.
-   * @param op binding operations.
-   * @return matched operation.
-   */
-  public BindingOperation getOperationMatch(
-    EntryType messageEntryType,
-    QName operation,
-    BindingOperation[] op)
-  {
-    QName checkOperation;
-
-    // Look for a candidate operation in the wsdl that matches this signature.
-    for (int k = 0; k < op.length; k++)
-    {
-      String name = null;
-      List extensibles = null;
-      BindingOperation bindingOp = op[k];
-
-      if (messageEntryType.isType(EntryType.TYPE_MESSAGE_REQUEST)
-        && (bindingOp.getOperation().getInput() != null))
-      {
-        name = bindingOp.getOperation().getName();
-        extensibles = bindingOp.getBindingInput().getExtensibilityElements();
-      }
-      else if (
-        messageEntryType.isType(EntryType.TYPE_MESSAGE_RESPONSE)
-          && (bindingOp.getOperation().getOutput() != null))
-      {
-        name = bindingOp.getOperation().getName() + "Response";
-        extensibles = bindingOp.getBindingOutput().getExtensibilityElements();
-      }
-
-      // Get soap:body
-      SOAPBody soapBody = getSoapBody(extensibles);
-      if (soapBody == null)
-        checkOperation = new QName(name);
-      else
-        checkOperation = new QName(soapBody.getNamespaceURI(), name);
-
-      if (operation != null && operation.equals(checkOperation))
-      {
-        return (bindingOp);
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Match either Input or Output.
-   * @param messageEntryType a message entry type.
-   * @param soapMessage a soap message.
-   * @param op binsing operations.
-   * @return matched operation.
-   */
-  public BindingOperation getOperationPartsMatch(
-    EntryType messageEntryType,
-    Document soapMessage,
-    BindingOperation[] op)
-  {
-    Map parts = getPartListFromMessage(soapMessage); // list of QNames
-
-    // Look for a candidate operation in the wsdl that matches this signature.
-    for (int k = 0; k < op.length; k++)
-    {
-
-      Message wsdlMessage = null;
-      List extensibles = null;
-      BindingOperation bindingOp = op[k];
-
-      if (messageEntryType.isType(EntryType.TYPE_MESSAGE_REQUEST)
-        && (bindingOp.getOperation().getInput() != null))
-      {
-        wsdlMessage = bindingOp.getOperation().getInput().getMessage();
-        extensibles = bindingOp.getBindingInput().getExtensibilityElements();
-      }
-      else if (
-        messageEntryType.isType(EntryType.TYPE_MESSAGE_RESPONSE)
-          && (bindingOp.getOperation().getOutput() != null))
-      {
-        wsdlMessage = bindingOp.getOperation().getOutput().getMessage();
-        extensibles = bindingOp.getBindingOutput().getExtensibilityElements();
-      }
-      //wsdlFaultParts = op[k].getFaults();
-      // ADD: check for case when response message is a fault
-
-      if (sameParts(parts, wsdlMessage, getSoapHeader(extensibles)))
-      {
-        return (bindingOp);
-      }
-    }
-    return null;
-  }
-
-  /** 
-   * BindingOperation getOperationPartsMatch(..).
-   * 
-   * Find one or more matching binding operations from the WSDL corresponding to the
-   * given request-response signature.
-   * 
-   * This overloaded version is intended for possible Correlation only (not assertions),
-   * since it checks for an operation signature on a request-response pair.
-   * Assertions now check request & response messages independently. 
-   * @param requestMessage a request message.
-   * @param responseMessage a response message.
-   * @param op binding operations.
-   * @return matched operation.
-   */
-  //private BindingOperation getOperationPartsMatch(
-  //  Document requestMessage,
-  //  Document responseMessage,
-  //  BindingOperation[] op)
-  //{
-  //  Map inParts = getPartListFromMessage(requestMessage); // list of QNames
-  //  Map outParts = getPartListFromMessage(responseMessage);
-  //  // list of QNames
-  //
-  //  // Look for a candidate operation in the wsdl that matches this signature.
-  //  for (int k = 0; k < op.length; k++)
-  //  {
-  //
-  //    //Map wsdlFaultParts = null;
-  //    Message wsdlInMessage = null;
-  //    Message wsdlOutMessage = null;
-  //
-  //    BindingOperation bindingOp = op[k];
-  //    if (bindingOp.getOperation().getInput() != null)
-  //    {
-  //      wsdlInMessage = bindingOp.getOperation().getInput().getMessage();
-  //    }
-  //
-  //    if (bindingOp.getOperation().getOutput() != null)
-  //    {
-  //      wsdlOutMessage = bindingOp.getOperation().getOutput().getMessage();
-  //    }
-  //    //wsdlFaultParts = op[k].getFaults();
-  //    // ADD: check for case when response message is a fault
-  //
-  //    if (sameParts(inParts,
-  //      wsdlInMessage,
-  //      getSoapHeader(bindingOp.getBindingInput().getExtensibilityElements())))
-  //    {
-  //      // match on the request - now check response if its not a fault
-  //      if (responseMessage != null && isFault(responseMessage))
-  //      {
-  //        return (bindingOp);
-  //      }
-  //      else if (
-  //        sameParts(
-  //          outParts,
-  //          wsdlOutMessage,
-  //          getSoapHeader(
-  //            bindingOp.getBindingOutput().getExtensibilityElements())))
-  //      {
-  //        // It does match so treat this as a relevant message pair. 
-  //        // Let the message through for validation.
-  //        //ADD: could pass the operations list back to the entryContext for the message.
-  //        return (bindingOp);
-  //      }
-  //    }
-  //  }
-  //  return null;
-  //}
-
-  /**
-   * Get the soap:body from a List of extensibility elements.
-   * @param extElems a list of extensibility elements.
-   * @return the soap:body from a List of extensibility elements.
-   */
-  private SOAPBody getSoapBody(List extElems)
-  {
-    // Find the soap body
-    if (extElems != null)
-    {
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(i);
-        if (extElem.getElementType().equals(WSITag.WSDL_SOAP_BODY))
-        {
-          return (SOAPBody) extElem;
-        }
-        // If the element is mime:multipartRelated
-        else if (extElem.getElementType().equals(WSITag.WSDL_MIME_MULTIPART))
-        {
-          // Getting the mime:part elements of the mime:multipartRelated
-          List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-          // Going through all the mime:part elements
-          for (int j = 0; j < mimeParts.size(); j++)
-          {
-            // Collecting all the mime:content elements of this mime:part
-            SOAPBody soapBody = getSoapBody(
-              ((MIMEPart) mimeParts.get(j)).getExtensibilityElements());
-            if (soapBody != null)
-              return soapBody;
-          }
-        }
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * Get the SOAPHeader from a List of extensibility elements.
-   * @param extensibles a list of extensibility elements.
-   * @return the SOAPHeader from a List of extensibility elements.
-   */
-  private SOAPHeader getSoapHeader(List extensibles)
-  {
-    SOAPHeader soapHeader = null;
-
-    // find the soap header
-    if (extensibles != null)
-    {
-      Iterator i = extensibles.iterator();
-      while (i.hasNext() && soapHeader == null)
-      {
-        try
-        {
-          soapHeader = (SOAPHeader) i.next();
-        }
-        catch (ClassCastException c)
-        {
-        }
-      }
-    }
-    return soapHeader;
-  }
-
-  /**
-   * Get first part name from soapbind:body element.
-   */
-  private String getFirstPartName(BindingOperation bindingOperation)
-  {
-    String partName = null;
-    List extList = null;
-    Iterator partsIterator = null;
-
-    // Determine if there is a list of parts by finding the soapbind:body element
-    if ((extList =
-      bindingOperation.getBindingInput().getExtensibilityElements())
-      != null)
-    {
-      List partsList = null;
-      Iterator extIterator = extList.iterator();
-      while (extIterator.hasNext() && (partName == null))
-      {
-        Object extElement = extIterator.next();
-        if (extElement instanceof SOAPBody)
-        {
-          if ((partsList = ((SOAPBody) extElement).getParts()) != null)
-          {
-            partsIterator = partsList.iterator();
-
-            // Since this is a doc literal binding there should be only one part name
-            if (partsIterator.hasNext())
-              partName = (String) partsIterator.next();
-          }
-        }
-      }
-    }
-
-    return partName;
-  }
-
-  public BindingOperation[] getDocLitOperations(
-    EntryType messageType,
-    QName partElementQName,
-    BindingOperation[] wsdlOperations)
-  {
-
-    if (messageType.isType(EntryType.ENTRY_TYPE_REQUEST))
-    {
-      return getInputDocLitOperations(partElementQName, wsdlOperations);
-    }
-    else if (messageType.isType(EntryType.ENTRY_TYPE_RESPONSE))
-    {
-      return getOutputDocLitOperations(partElementQName, wsdlOperations);
-    }
-    else
-    {
-      return null; // should be one or the other
-    }
-  }
-
-  private BindingOperation[] getInputDocLitOperations(
-    QName partElementQName,
-    BindingOperation[] wsdlOperations)
-  {
-
-    Vector potentialOps = new Vector();
-
-    for (int i = 0; i < wsdlOperations.length; i++)
-    {
-      if (wsdlOperations[i].getOperation().getInput() != null)
-      {
-        Message message = wsdlOperations[i].getOperation().getInput().getMessage();
-        // If SOAP Body child element is not present and wsdl:message does not have any wsdl:parts, that is the match 
-        if (partElementQName == null)
-        {
-          if (message.getParts().isEmpty())
-            potentialOps.add(wsdlOperations[i]);
-          continue;
-        }
-
-        Iterator partsIt = message.getParts().values().iterator();
-        while (partsIt.hasNext())
-        {
-          Part nextPart = (Part) partsIt.next();
-          if (partElementQName.equals(nextPart.getElementName()))
-          {
-            // matching part found (doc-lit) - add to list of possible operation matches
-            potentialOps.add(wsdlOperations[i]);
-            break;
-          }
-        }
-      }
-    }
-    return (BindingOperation[]) potentialOps.toArray(new BindingOperation[0]);
-  }
-
-  private BindingOperation[] getOutputDocLitOperations(
-    QName partElementQName,
-    BindingOperation[] wsdlOperations)
-  {
-
-    Vector potentialOps = new Vector();
-
-    for (int i = 0; i < wsdlOperations.length; i++)
-    {
-      if (wsdlOperations[i].getOperation().getOutput() != null)
-      {
-        Message message = wsdlOperations[i].getOperation().getOutput().getMessage();
-        // If SOAP Body child element is not present and wsdl:message does not have any wsdl:parts, that is the match
-        if (partElementQName == null)
-        {
-          if (message.getParts().isEmpty())
-            potentialOps.add(wsdlOperations[i]);
-          continue;
-        }
-
-        Iterator partsIt = message.getParts().values().iterator();
-        while (partsIt.hasNext())
-        {
-          Part nextPart = (Part) partsIt.next();
-          if (partElementQName.equals(nextPart.getElementName()))
-          {
-            // matching part found (doc-lit) - add to list of possible operation matches
-            potentialOps.add(wsdlOperations[i]);
-            break;
-          }
-        }
-      }
-    }
-    return (BindingOperation[]) potentialOps.toArray(new BindingOperation[0]);
-  }
-
-  /**
-   * Compare soap message element part names with Parts from specified wsdl Operation
-   */
-  //private boolean sameParts(HashSet messageParts, Map wsdlParts)
-  //{
-  //
-  //  // look for the soap-message operation signature
-  //  Iterator i = wsdlParts.values().iterator();
-  //  // build a set of Part names
-  //  HashSet h = new HashSet();
-  //  while (i.hasNext())
-  //  {
-  //    Part p = (Part) i.next();
-  //    h.add(p.getName());
-  //  }
-  //
-  //  // compare with the parts list from the message	(unordered)
-  //  return (h.equals(messageParts));
-  //}
-
-  /**
-   * Compare soap message element part names with Parts from specified wsdl Operation
-   */
-  private boolean sameParts(
-    Map messageParts,
-    Message wsdlMessage,
-    SOAPHeader soapHeader)
-  {
-
-    String soapHeaderPart = null;
-    if (soapHeader != null)
-      soapHeaderPart = soapHeader.getPart();
-
-    // check null conditions
-    if (messageParts == null && wsdlMessage == null)
-    {
-      return true; // simple equality test
-    }
-    else if (messageParts == null || wsdlMessage == null)
-    {
-      return false;
-    }
-
-    Vector v = new Vector();
-    //List wsdlParts = wsdlMessage.getOrderedParts(null);
-    Map wsdlParts = null;
-    if (wsdlMessage.getParts() != null)
-    {
-      wsdlParts = wsdlMessage.getParts();
-      // look for the soap-message operation signature
-      Iterator i = wsdlParts.values().iterator();
-      // build a set of Part names    
-      while (i.hasNext())
-      {
-        Part p = (Part) i.next();
-        // do not include the part for the soap:header (if any)
-        if (!p.getName().equals(soapHeaderPart))
-        {
-          // check that the part is associated with the soap:body
-          v.add(new QName(p.getName()));
-        }
-      }
-      // if one of the parts is associated with a soap:header in the binding
-      // (by <soap:header part="{partname}">), remove this from the set
-
-    }
-
-    // compare with the parts list from the message	(ordered)
-    if (v.isEmpty() && messageParts.isEmpty())
-    {
-      return true;
-    }
-
-    // PB: Changed to containsAll() since equals() fails when using JRE 1.4
-    if (v.containsAll(messageParts.keySet())
-      && (v.size() == messageParts.size()))
-    {
-      // Check for xsi:type mismatch
-      Iterator parts = messageParts.keySet().iterator();
-      QName partName, xsiType;
-      while (parts.hasNext())
-      {
-        partName = (QName) parts.next();
-
-        // Get xsi:type QName
-        if ((xsiType = (QName) messageParts.get(partName)) != null
-          && wsdlParts != null)
-        {
-          // Get the WSDL part definition
-          Part part = (Part) wsdlParts.get(partName.getLocalPart());
-
-          // If xsiType is NOT derived from the type of the corresponding WSDL part
-          if (!isDerivedType(xsiType, part.getTypeName()))
-          {
-            // return false
-            return false;
-          }
-        }
-      }
-
-      return true;
-    }
-    else
-      return false;
-    //return (v.equals(messageParts));
-  }
-
-  /**
-   * Checks whether one schema type is derived from another.
-   * @param extType an assumed derived type.
-   * @param type an assumed base type.
-   * @return true if extType is derived from type, false otherwise
-   */
-  public boolean isDerivedType(QName extType, QName type)
-  {
-    // If either of types is null, return false
-    if (extType == null || type == null)
-      return false;
-    // If the types are equal, return true
-    if (extType.equals(type))
-      return true;
-
-    // Going through all schemas 
-    Iterator i = wsdlDocument.getSchemas().values().iterator();
-    while (i.hasNext())
-    {
-      XSModel xsModel = (XSModel) i.next();
-      // Retrieving the derived type definition
-      XSTypeDefinition xsType = xsModel.getTypeDefinition(
-        extType.getLocalPart(), extType.getNamespaceURI());
-      // If it is found and derived from the base type, return true
-      if (xsType != null && xsType.derivedFrom(type.getNamespaceURI(),
-        type.getLocalPart(), XSConstants.DERIVATION_NONE))
-      {
-        return true;
-      }
-    }
-    // extType is not derived from type, return false
-    return false;
-  }
-
-  /**
-  	* Get a list of QNames of parts from the soap body of the specified message
-  	*/
-  public Element getSoapBodyChild(Document doc)
-  {
-
-    Element opElem = null;
-    if (doc != null)
-    {
-      Element root = doc.getDocumentElement();
-      NodeList bodies =
-        root.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Body");
-      // Get the list of soap:body child element names from the request message
-      if (bodies != null && bodies.getLength() > 0)
-      {
-        Element body = (Element) bodies.item(0);
-        NodeList children = body.getChildNodes();
-        for (int i = 0; i < children.getLength() && opElem == null; ++i)
-        {
-          Node n = children.item(i);
-          if (n instanceof Element)
-          {
-            opElem = (Element) n;
-          }
-        }
-      }
-    }
-    return opElem;
-  }
-
-  /** Check whether this message is a soap fault
-   */
-  public boolean isFault(Document doc)
-  {
-    boolean isFault = false;
-
-    if (doc != null)
-    {
-      Element root = doc.getDocumentElement();
-      isFault =
-        (root
-          .getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Fault")
-          .getLength()
-          > 0);
-    }
-
-    return isFault;
-  }
-
-  /** 
-   * Check whether this message has a soap body with a child element.
-   */
-  public boolean containsSoapBodyWithChild(Document doc)
-  {
-    boolean contains = false;
-
-    if (doc != null)
-    {
-      contains = ((getSoapBodyChild(doc) == null) ? false : true);
-    }
-
-    return contains;
-  }
-
-  /**
-   * Get SOAPAction value from the HTTP headers.
-   * @param headers HTTP headers
-   * @return SOAPAction value
-   */
-  public String getSoapAction(String headers) throws WSIException
-  {
-    // get SOAPAction
-    String action = null;
-    if (headers != null)
-      action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-    return action;
-  }
-
-  /**
-   * Get a list of QNames of parts from the soap body of the specified message.
-   * This method assumes RPC style message content
-   */
-  private QName getOperationFromMessage(Document doc)
-  {
-    QName operation = null;
-    if (doc != null)
-    {
-      Element root = doc.getDocumentElement();
-      NodeList bodies =
-        root.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Body");
-      if (bodies != null && bodies.getLength() > 0)
-      {
-        Element body = (Element) bodies.item(0);
-        NodeList children = body.getChildNodes();
-        for (int i = 0; i < children.getLength(); ++i)
-        {
-          Node n = children.item(i);
-          // If element, then this is the operation name
-          if (n instanceof Element)
-          {
-            operation = new QName(n.getNamespaceURI(), n.getLocalName());
-          }
-        }
-      }
-    }
-
-    return operation;
-  }
-
-  /**
-   * Get a list of QNames of parts from the soap body of the specified message.
-   * This method assumes RPC style message content
-   */
-  private Map getPartListFromMessage(Document doc)
-  {
-    Map parts = new HashMap();
-    if (doc != null)
-    {
-      Element root = doc.getDocumentElement();
-      NodeList bodies =
-        root.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Body");
-      // Get the list of soap:body grand-child element names from the request message
-      // (immediate child is the message name)
-      if (bodies != null && bodies.getLength() > 0)
-      {
-        Element body = (Element) bodies.item(0);
-        NodeList children = body.getChildNodes();
-        for (int i = 0; i < children.getLength(); ++i)
-        {
-          Node n = children.item(i);
-          if (n instanceof Element)
-          {
-            // this is the operation name. Its children are the parts
-            NodeList grandChildren = n.getChildNodes();
-            for (int j = 0; j < grandChildren.getLength(); j++)
-            {
-              Node m = grandChildren.item(j);
-              if (m instanceof Element)
-              {
-                // Determine if the part has an xsi:type
-                Attr attr =
-                  XMLUtils.getAttribute(
-                    (Element) m,
-                    new QName(WSIConstants.NS_URI_XSI, "type"));
-
-                QName xsiType = null;
-
-                // If there is an xsi:type attribute, then get the value as a QName 
-                try
-                {
-                  if (attr != null)
-                    xsiType =
-                      DOMUtils.getQName(attr.getNodeValue(), (Element) m);
-                }
-                catch (javax.wsdl.WSDLException we)
-                {
-                }
-
-                // add to the child element list
-                parts.put(
-                  new QName(m.getNamespaceURI(), m.getLocalName()),
-                  xsiType);
-              }
-            }
-          }
-        }
-      }
-    }
-    return parts;
-  }
-
-  public BindingOperation[] getMatchingBindingOps(
-    String bindingStyle,
-    Binding[] bindings)
-    throws WSIException
-  {
-
-    HashSet bindingOperationsSet = new HashSet();
-
-    // whizz through the bindings, checking for a bindingOperation matching the message
-    for (int i = 0; i < bindings.length; i++)
-    {
-
-      Binding tryBinding = bindings[i];
-      List bindingOps = tryBinding.getBindingOperations();
-
-      if (bindingOps != null)
-      {
-
-        // search through binding Operations
-        Iterator bindingOpIt = tryBinding.getBindingOperations().iterator();
-        while (bindingOpIt.hasNext())
-        {
-
-          BindingOperation bindingOp = (BindingOperation) bindingOpIt.next();
-          // check depends on which binding style is declared in the wsdl
-          SOAPOperation soapOp = WSDLValidatorImpl.getSoapOperation(bindingOp);
-          //GT: move this method to utils
-
-          String style;
-          if ((soapOp == null) || (style = soapOp.getStyle()) == null)
-          {
-            // use the style of the parent bindingOp
-
-            SOAPBinding soapBind = WSDLValidatorImpl.getSoapBinding(tryBinding);
-            //GT: move this method to utils
-            if ((style = soapBind.getStyle()) == null)
-            {
-              style = WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC;
-              //default
-            }
-          }
-          if (style.equals(bindingStyle))
-          {
-
-            bindingOperationsSet.add(bindingOp);
-
-          }
-        }
-      } // current binding has no bindingOperations, ignore
-    }
-    return (BindingOperation[]) bindingOperationsSet.toArray(
-      new BindingOperation[0]);
-  }
-
-  /**
-   * Checks whether soap:body element is literal.
-   * @param extElements extensibility elements of wsdl:input or wsdl:output
-   * of a binding
-   */
-  public boolean isLiteral(List extElems)
-  {
-    SOAPBody soapBody = getSOAPBody(extElems);
-    if (soapBody != null
-      && soapBody.getUse().equals(WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-      return true;
-    else
-      return false;
-  }
-
-  /**
-   * Orders wsdl:part names keeping in mind the "parts" attribute of WSDL soap:body
-   * @param messageParts a list of wsdl:partS
-   * @param extElems extensibility elements in the binding
-   * @return the ordered list of part names
-   */
-  public List orderPartNames(List messageParts, List extElems)
-  {
-    List orderedPartNames = new ArrayList();
-    List bodyParts = null;
-
-    SOAPBody soapBody = getSOAPBody(extElems);
-    if (soapBody != null)
-      bodyParts = soapBody.getParts();
-
-    Iterator i = messageParts.iterator();
-    while (i.hasNext())
-    {
-      String partName = ((Part) i.next()).getName();
-      // If the parts attribute is not specified or contains
-      // the wsdl:part name, then adding part name to the ordered list
-      if (bodyParts == null || bodyParts.contains(partName))
-        orderedPartNames.add(partName);
-    }
-
-    return orderedPartNames;
-  }
-
-  /**
-   * Retrieves the SOAPBody object from a list of extensibility elments in binding
-   * @param extElems extensibility elements
-   * @return the SOAPBody element
-   */
-  public SOAPBody getSOAPBody(List extElems)
-  {
-    if (extElems == null)
-      return null;
-    for (Iterator i = extElems.iterator(); i.hasNext();)
-    {
-      Object obj = i.next();
-      if (obj instanceof SOAPBody)
-        return (SOAPBody) obj;
-    }
-
-    return null;
-  }
- 
-  public List resolveSameNamespaces(List schemaElements)
-  {
-  	List namespaces = new ArrayList();
-  	List result = new ArrayList();
-  	Iterator i = schemaElements.iterator();
-    while (i.hasNext())
-    {
-      Element schema = (Element) i.next();
-      String targetNamespace = schema.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-      if (!namespaces.contains(targetNamespace))
-      {
-        namespaces.add(targetNamespace);
-    	List schemas = getSchemasWithSameNamespace(schemaElements, targetNamespace);
-    	if (schemas.size() == 1)
-      	{
-      	  result.add(schema);
-      	}
-    	else
-    	{
-    		// copying all the NS declarations from wsdl:definitions wsdl:types
-      //copyNSDeclarations(root, schema);
-      copyNSDeclarations((Element) schema.getParentNode(), schema);
-      // Replacing all relative schemaLocation URIs with absolute ones
-      //replaceRelativeURIs(schema, wsdlURI);
-      // Serialize the schema elements inside the Types, then use this as
-      // the schema string for the validation
-      //String schemaString =
-      //  DOM2Writer.nodeToString(schema);
-      // schemaStrings.add(schemaString);
-      	}
-      }
-    }
-  	return null;
-  }
-  	
-  public List getSchemasWithSameNamespace(List schemaElements, String targetNamespace)
-  { 
-  	List result = new ArrayList();
-    Iterator i = schemaElements.iterator();
-    while (i.hasNext())
-    {
-      Element schema = (Element)i.next();
-      String schemaTargetNamespace = schema.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-      if (schemaTargetNamespace == null)
-       	schemaTargetNamespace = "";
-        
-      if (schemaTargetNamespace.equals(targetNamespace))
-      {
-       	result.add(schema);
-      }
-    }
-    return result;
-  }
-
-  public boolean duplicateNamespacesDetected(List schemaElements)
-  { 
-  	boolean result = false;
-    List namespaces = new ArrayList();
-    Iterator i = schemaElements.iterator();
-    while (i.hasNext())
-    {
-    	Element schema = (Element)i.next();
-        String targetNamespace = schema.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-        if (targetNamespace == null)
-        	targetNamespace = "";
-        
-        if (namespaces.contains(targetNamespace))
-        {
-        	result = true;
-        	break;
-        }
-        else
-        {
-        	namespaces.add(targetNamespace);
-        }
-    }
-    return result;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseValidatorImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseValidatorImpl.java
deleted file mode 100644
index b72ce34..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseValidatorImpl.java
+++ /dev/null

@@ -1,705 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.BaseValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EnvelopeValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.report.PrereqFailedList;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.report.impl.PrereqFailedListImpl;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCacheUser;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-/**
- * The WSDL validator will verify that the WSDL and associated XML schema definitions
- * are in conformance with the profile.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Graham Turrell   (gturrell@uk.ibm.com)
- */
-public abstract class BaseValidatorImpl
-  extends XMLDocumentCacheUser
-  implements BaseValidator
-{
-
-  /**
-   * A hashtable that maps assertion results to their priorities, 0 is lowest
-   */
-  private static final Hashtable resultPriority = new Hashtable(6);
-  static {
-    resultPriority.put(AssertionResult.RESULT_PASSED, new Integer(0));
-    resultPriority.put(AssertionResult.RESULT_NOT_APPLICABLE, new Integer(1));
-    resultPriority.put(AssertionResult.RESULT_MISSING_INPUT, new Integer(2));
-    resultPriority.put(AssertionResult.RESULT_WARNING, new Integer(3));
-    resultPriority.put(AssertionResult.RESULT_PREREQ_FAILED, new Integer(4));
-    resultPriority.put(AssertionResult.RESULT_FAILED, new Integer(5));
-  }
-
-  /**
-   * The highest priority value being passed when processing pre-requisites
-   */
-  private static final int MAX_VALID_PRIORITY = 1;
-
-  /**
-   * Analyzer context.
-   */
-  public AnalyzerContext analyzerContext;
-
-  /**
-   * Profile artifact.
-   */
-  protected ProfileArtifact profileArtifact;
-
-  /**
-   * Reporter.
-   */
-  protected Reporter reporter;
-
-  /**
-   * Entry.
-   */
-  // protected Entry entry;
-
-  /**
-   * Report artifact.
-   */
-  protected ReportArtifact reportArtifact;
-
-  /**
-   * Verbose option.
-   */
-  public boolean verboseOption = false;
-
-  /**
-   * Test assertion processed count.
-   */
-  protected int assertionCount = 0;
-
-  /**
-   * Constructor.
-   */
-  public BaseValidatorImpl()
-  {
-  }
-
-  /**
-   * Initiailize validation test procedure.
-   * @param analyzerContext the analyzerContext.
-   * @param profileArtifact the profile artifiact.
-   * @param reportArtifact  the report artifact.
-   * @param reporter        a Reporter object.
-   * @throws WSIException if validator could not be initialized.
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact profileArtifact,
-    ReportArtifact reportArtifact,
-    Reporter reporter)
-    throws WSIException
-  {
-    // Save input references
-    this.analyzerContext = analyzerContext;
-    this.profileArtifact = profileArtifact;
-    this.reportArtifact = reportArtifact;
-    this.reporter = reporter;
-
-    // Get verbose option    
-    verboseOption =
-      reporter
-        .getReport()
-        .getReportContext()
-        .getAnalyzer()
-        .getAnalyzerConfig()
-        .getVerboseOption();
-  }
-
-  /**
-   * Process all of the test assertions for one entry.
-   * @param classPrefix a class prefix.
-   * @param entryContext an entry context.
-   * @throws WSIException if serious problems occur while processing 
-   *         all of the test assertions for an entry.
-   */
-  protected void processAssertions(
-    String classPrefix,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    long startTime = 0;
-
-    HashMap processList = new HashMap();
-    TestAssertion testAssertion = null;
-    AssertionProcess assertionProcess;
-    AssertionResult assertionResult;
-
-    TreeMap preReqResults;
-    PrereqFailedList prereqFailedList;
-    String preReqId;
-
-    Class[] paramTypes = new Class[1];
-    // If this is an instance of MessageValidator or EnvelopeValidator
-    // then use BaseMessageValidator as a param type of assertions constructor
-    paramTypes[0] = this instanceof BaseMessageValidator ?
-      BaseMessageValidator.class : this.getClass();
-
-    Object[] params = new Object[1];
-    params[0] = this;
-
-    // Get entry from context
-    Entry entry = entryContext.getEntry();
-
-    // Add entry to artifact
-    this.reportArtifact.addEntry(entry);
-
-    // Add entry to report
-    if (this instanceof EnvelopeValidator)
-     	this.reporter.setCurrentEnvelopeEntry(entry); 
-	else this.reporter.setCurrentEntry(entry);
-
-    try
-    {
-      // Go through the list of test assertions for the artifact
-      Iterator iterator = profileArtifact.getTestAssertionList().iterator();
-      while (iterator.hasNext())
-      {
-        // Get next test assertion
-        testAssertion = (TestAssertion) iterator.next();
-
-        // Reset variables
-        assertionResult = null;
-
-        // If the test assertion is enabled, then continue
-        //        if ((testAssertion.isEnabled()) && 
-        //            testAssertion.getEntryTypeName().equals(targetContext.getEntry().getEntryType().getTypeName())) { 
-        if (testAssertion.isEnabled()
-          && isPrimaryEntryTypeMatch(testAssertion, entryContext))
-        {
-          try
-          {
-            // Add 1 to assertion processed count
-            assertionCount++;
-
-            // If the assertion process hasn't been created yet, then create it
-            if ((assertionProcess =
-              (AssertionProcess) processList.get(testAssertion.getId()))
-              == null)
-            {
-
-              // Create a new assertion process
-              Class assertionClass =
-                Class.forName(classPrefix + testAssertion.getId());
-
-              assertionProcess =
-                (AssertionProcess) assertionClass.getConstructor(
-                  paramTypes).newInstance(
-                  params);
-
-              // Add it to the list
-              processList.put(testAssertion.getId(), assertionProcess);
-            }
-
-            // Check whether entry is null
-            if (entry.getEntryDetail() == null)
-            {
-              assertionResult =
-                createAssertionResult(
-                  testAssertion,
-                  AssertionResult.RESULT_MISSING_INPUT,
-                  (String) null);
-            }
-
-            // Check to see if the test assertion should be run
-            //if (isNotApplicable(testAssertion, entryContext)) {
-            else if (isNotApplicable(testAssertion))
-            {
-              assertionResult =
-                createAssertionResult(
-                  testAssertion,
-                  AssertionResult.RESULT_NOT_APPLICABLE,
-                  (String) null);
-            }
-            else
-            {
-              // Processing all the assertion pre-requisites
-
-              preReqResults = null;
-              prereqFailedList = null;
-              // Get list of pre-reqs for specified assertion
-              Iterator i = testAssertion.getPrereqIdList().iterator();
-              while (i.hasNext())
-              {
-                if (preReqResults == null)
-                  preReqResults = new TreeMap();
-                // Get next id
-                preReqId = (String) i.next();
-                // Get the prereq result
-                AssertionResult preReqResult = reporter.getAssertionResult(preReqId);
-
-                // Adding a result priority value to preReqResults
-                preReqResults.put(
-                  resultPriority.get(preReqResult.getResult()),
-                  preReqResult.getResult());
-
-                // If the prereq failed, then add it to the list
-                if (((Integer)resultPriority.get(preReqResult.getResult())).intValue()
-                  > MAX_VALID_PRIORITY)
-                {
-                  // Adding failed prereq ID to the list
-                  if (prereqFailedList == null)
-                    prereqFailedList = new PrereqFailedListImpl();
-                  prereqFailedList.addTestAssertionID(preReqId);
-                }
-              }
-
-              if (prereqFailedList != null) {
-                // Getting the highest pre-requisites' result
-                Integer maxRes = (Integer)preReqResults.lastKey();
-                String resString = (String)preReqResults.get(maxRes);
-                if (resString.equals(AssertionResult.RESULT_FAILED)
-                  ||resString.equals(AssertionResult.RESULT_WARNING)) {
-                  resString = AssertionResult.RESULT_PREREQ_FAILED;
-                }
-                // Create assertion result based on pre-requisites which are not passed
-                assertionResult = createAssertionResult(testAssertion, resString, prereqFailedList);
-              }
-
-              // Pre-requisites are passed, validate current assertion
-              else {
-
-                // Reset test assertion
-                assertionProcess.reset();
-
-                //  VERBOSE
-                if (verboseOption)
-                {
-                  System.err.println(
-                    "  Processing "
-                      + testAssertion.getId()
-                      + " for entry reference ID ["
-                      + entry.getReferenceID()
-                      + "] ...");
-                  startTime = System.currentTimeMillis();
-                }
-
-                // Validate the target
-                assertionResult =
-                  assertionProcess.validate(testAssertion, entryContext);
-
-                //  VERBOSE
-                if (verboseOption)
-                {
-                  System.err.println(
-                    "    Elapsed time: "
-                      + (System.currentTimeMillis() - startTime)
-                      + "ms");
-                }                
-              }
-            }
-
-            // Add result to the report
-            reporter.addAssertionResult(assertionResult);
-          }
-
-          catch (ClassNotFoundException cnfe)
-          {
-            // DEBUG:
-            if (testAssertion != null)
-            {
-              reporter
-                .getReport()
-                .getReportContext()
-                .getAnalyzer()
-                .printMessage(
-                "WARNING: "
-                  + testAssertion.getId()
-                  + " is not supported currently.");
-            }
-          }
-        }
-      }
-    }
-
-    catch (Exception e)
-    {
-      System.err.println("EXECEPTION: " + e.getMessage());
-      if (verboseOption)
-        e.printStackTrace();
-
-      if (e instanceof WSIException)
-        throw (WSIException) e;
-      else
-        throw new WSIException(e.getMessage(), e);
-    }
-
-    finally
-    {
-      // Indicate that we are done with this assertion target
-      this.reporter.endCurrentEntry();
-    }
-  }
-
-  /**
-   * Determine if the test assertion should be processed for the current entry.
-   * @param testAssertion a test assertion.
-   * @param entryContext  the entry context.
-   * @return true if the test assertion should be processed for the current entry.
-   */
-  protected abstract boolean isPrimaryEntryTypeMatch(
-    TestAssertion testAssertion,
-    EntryContext entryContext);
-
-  /**
-   * Determine if the test assertion should be processed for the current entry.
-   * @param testAssertion  a test assertion.
-   * @param entry          an Entry object
-   * @return true if the test assertion should be processed for the current entry.
-   */
-  protected boolean isPrimaryEntryTypeMatch(
-    TestAssertion testAssertion,
-    Entry entry)
-  {
-    boolean match = false;
-
-    // If the test assertion entry type matches the target context entry type, then contine
-    if (testAssertion
-      .getEntryTypeName()
-      .equals(entry.getEntryType().getTypeName()))
-    {
-      match = true;
-    }
-
-    return match;
-  }
-
-  /**
-   * Determine if the test assertion is not applicable.
-   * @param testAssertion a test assertion.
-   * @return true if the test assertion is not applicable.
-   */
-  protected abstract boolean isNotApplicable(TestAssertion testAssertion);
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.BaseValidator#cleanup()
-   */
-  public void cleanup() throws WSIException
-  {
-    // If no assertions were processed, then set all missingInput
-    if (assertionCount == 0)
-      setAllMissingInput();
-  }
-
-  /**
-   * Create assertion result.
-   * @param testAssertion a test assertion.
-   * @param result        a String object.
-   * @param failureDetail a FailureDetail object.
-   * @return newly created test result.
-   */
-  public AssertionResult createAssertionResult(
-    TestAssertion testAssertion,
-    String result,
-    FailureDetail failureDetail)
-  {
-    Vector failureDetailList = null;
-
-    // Create failure detail list
-    if (failureDetail != null)
-    {
-      failureDetailList = new Vector();
-      failureDetailList.add(failureDetail);
-    }
-
-    return createAssertionResult(testAssertion, result, failureDetailList);
-  }
-
-  /**
-   * Create assertion result.
-   * @param testAssertion         a test assertion.
-   * @param result                a String object.
-   * @param failureDetailMessage  a failure detail message.
-   * @return newly created test result.
-   */
-  public AssertionResult createAssertionResult(
-    TestAssertion testAssertion,
-    String result,
-    String failureDetailMessage)
-  {
-    return createAssertionResult(
-      testAssertion,
-      result,
-      failureDetailMessage,
-      null);
-  }
-
-  /**
-   * Create assertion result.
-   * @param testAssertion         a test assertion.
-   * @param result                a String object.
-   * @param failureDetailMessage  a failure detail message.
-   * @param elementLocation       element location.
-   * @return newly created test result.
-   */
-  public AssertionResult createAssertionResult(
-    TestAssertion testAssertion,
-    String result,
-    String failureDetailMessage,
-    ElementLocation elementLocation)
-  {
-    // Create failure detail list
-    Vector failureDetailList = null;
-    if (failureDetailMessage != null)
-    {
-      failureDetailList = new Vector();
-      FailureDetail failureDetail = reporter.createFailureDetail();
-      failureDetail.setFailureMessage(failureDetailMessage);
-      failureDetail.setElementLocation(elementLocation);
-      failureDetailList.add(failureDetail);
-    }
-
-    return createAssertionResult(testAssertion, result, failureDetailList);
-  }
-
-  /**
-   * Create assertion result.
-   * @param testAssertion     a test assertion.
-   * @param result            a String object.
-   * @param failureDetailList a failure detail list.
-   * @return newly created test result.
-   */
-  public AssertionResult createAssertionResult(
-    TestAssertion testAssertion,
-    String result,
-    Vector failureDetailList)
-  {
-    // Create assertion result
-    AssertionResult assertionResult = reporter.createAssertionResult();
-
-    // Set values in assertion result
-    assertionResult.setAssertion(testAssertion);
-    assertionResult.setResult(result);
-    assertionResult.setEntry(reporter.getReport().getCurrentEntry());
-
-    // Set failure detail list
-    assertionResult.setFailureDetailList(failureDetailList);
-
-    return assertionResult;
-  }
-
-  /**
-   * Create assertion result.
-   * @param testAssertion     a test assertion.
-   * @param result            a String object.
-   * @param prereqFailedList  a list failed pre-requisite assertions.
-   * @return newly created test result.
-   */
-  public AssertionResult createAssertionResult(
-    TestAssertion testAssertion,
-    String result,
-    PrereqFailedList prereqFailedList)
-  {
-    // Create assertion result
-    AssertionResult assertionResult = reporter.createAssertionResult();
-
-    // Set values in assertion result
-    assertionResult.setAssertion(testAssertion);
-    assertionResult.setResult(result);
-    assertionResult.setEntry(reporter.getReport().getCurrentEntry());
-    assertionResult.setPrereqFailedList(prereqFailedList);
-
-    return assertionResult;
-  }
-
-  /**
-   * Add assertion result to report.
-   * @param assertionId  assertion id.
-   * @param result       assertion result.
-   * @throws WSIException if the assertion result cannot be added to the report.
-   */
-  protected void addAssertionResult(String assertionId, String result)
-    throws WSIException
-  {
-    // Create test assertion result
-    AssertionResult assertionResult = reporter.createAssertionResult();
-
-    // Set assertion, result and target
-    assertionResult.setAssertion(profileArtifact.getTestAssertion(assertionId));
-    assertionResult.setResult(result);
-    assertionResult.setEntry(reporter.getReport().getCurrentEntry());
-
-    // Add it to the report
-    reporter.addAssertionResult(assertionResult);
-  }
-
-  /**
-   * Add assertion result to report with an error detail message.
-   * @param assertionId          assertion id.
-   * @param result               assertion result.
-   * @param failureDetailMessage an error detail message.
-   * @throws WSIException if the assertion result cannot be added to the report.
-   */
-  protected void addAssertionResult(
-    String assertionId,
-    String result,
-    String failureDetailMessage)
-    throws WSIException
-  {
-    // Convert message to vector
-    Vector failureDetailList = null;
-    if (failureDetailMessage != null)
-    {
-      failureDetailList = new Vector();
-      FailureDetail failureDetail = reporter.createFailureDetail();
-      failureDetailList.add(failureDetail);
-    }
-
-    // Add assertion result
-    addAssertionResult(assertionId, result, failureDetailList);
-  }
-
-  /**
-   * Add assertion result to report.
-   * @param assertionId        assertion id.
-   * @param result             assertion result.
-   * @param failureDetailList  a list of error detail messages.
-   * @throws WSIException if the assertion result cannot be added to the report.
-   */
-  protected void addAssertionResult(
-    String assertionId,
-    String result,
-    Vector failureDetailList)
-    throws WSIException
-  {
-    // Create test assertion result
-    AssertionResult assertionResult = reporter.createAssertionResult();
-
-    // Set assertion, result and target
-    assertionResult.setAssertion(profileArtifact.getTestAssertion(assertionId));
-    assertionResult.setResult(result);
-    assertionResult.setEntry(reporter.getReport().getCurrentEntry());
-    assertionResult.setFailureDetailList(failureDetailList);
-
-    // Add it to the report
-    reporter.addAssertionResult(assertionResult);
-  }
-
-  /**
-   * Add missingInput assertion result to report.
-   * @param testAssertion a test assertion.
-   * @throws WSIException if there is any problem adding missingInput 
-   * 		 assertion result to report.
-   */
-  protected void addMissingInputResult(TestAssertion testAssertion)
-    throws WSIException
-  {
-    // Create test assertion result
-    AssertionResult assertionResult = reporter.createAssertionResult();
-
-    // Set assertion, result and target
-    assertionResult.setAssertion(testAssertion);
-    assertionResult.setResult(AssertionResult.RESULT_MISSING_INPUT);
-    assertionResult.setEntry(reporter.getReport().getCurrentEntry());
-
-    // Add it to the report
-    reporter.addAssertionResult(assertionResult);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.BaseValidator#setAllMissingInput()
-   */
-  public void setAllMissingInput() throws WSIException
-  {
-    // If profile artifact is set
-    if (profileArtifact != null)
-    {
-      TestAssertion testAssertion;
-  
-      // Create entry
-      Entry entry = this.reporter.getReport().createEntry();
-      entry.setArtifactName(this.reportArtifact.getType().getTypeName());
-  
-      // Add entry to artifact
-      this.reportArtifact.addEntry(entry);
-  
-      // Add entry to report
-      this.reporter.setCurrentEntry(entry);
-  
-      // Go through the list of test assertions for the artifact
-      Iterator iterator = profileArtifact.getTestAssertionList().iterator();
-      while (iterator.hasNext())
-      {
-        // Get next test assertion
-        testAssertion = (TestAssertion) iterator.next();
-  
-        // Add missingInput result
-        if (testAssertion.isEnabled())
-          addMissingInputResult(testAssertion);
-      }
-  
-      // Indicate that we are done with this assertion target
-      this.reporter.endCurrentEntry();
-    }
-  }
-
-  /**
-   * Set all results for an entry type to missingInput.
-   * @param entryType an EntryType object.
-   * @throws WSIException if there is any problem while processing.
-   */
-  protected void setMissingInput(EntryType entryType) throws WSIException
-  {
-    TestAssertion testAssertion;
-
-    // Create entry 
-    Entry entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(entryType);
-    entry.setReferenceID("[" + entryType.getTypeName() + "]");
-
-    // Add entry to artifact
-    this.reportArtifact.addEntry(entry);
-
-    // Add entry to report
-    this.reporter.setCurrentEntry(entry);
-
-    //try {
-    // Go through the list of test assertions for the artifact
-    Iterator iterator = profileArtifact.getTestAssertionList().iterator();
-    while (iterator.hasNext())
-    {
-      // Get next test assertion
-      testAssertion = (TestAssertion) iterator.next();
-      if (testAssertion.isEnabled()
-        && isPrimaryEntryTypeMatch(testAssertion, entry))
-      {
-        addMissingInputResult(testAssertion);
-      }
-    }
-
-    // Indicate that we are done with this entry
-    this.reporter.endCurrentEntry();
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java
deleted file mode 100644
index 4add155..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EnvelopeValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.ProfileValidatorFactory;
-import org.eclipse.wst.wsi.internal.core.profile.validator.UDDIValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.WSDLValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.EnvelopeValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.message.MessageValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi.UDDIValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.WSDLValidatorImpl;
-
-/**
- * This class is an implementation of the WSILDocumentFactory.
- *
- * @version 1.0.1
- * @author: Peter Brittenham
- */
-public class ProfileValidatorFactoryImpl extends ProfileValidatorFactory
-{
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.ProfileValidatorFactory#newUDDIValidator()
-   */
-  public UDDIValidator newUDDIValidator() throws WSIException
-  {
-    // Create new UDDI validator 
-    UDDIValidator uddiValidator = new UDDIValidatorImpl();
-    // Return validator
-    return uddiValidator;
-  }
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.ProfileValidatorFactory#newWSDLValidator()
-   */
-  public WSDLValidator newWSDLValidator() throws WSIException
-  {
-    // Create new WSDL validator 
-    WSDLValidator wsdlValidator = new WSDLValidatorImpl();
-
-    // Return validator
-    return wsdlValidator;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.ProfileValidatorFactory#newMessageValidator()
-   */
-  public MessageValidator newMessageValidator() throws WSIException
-  {
-    // Create new message validator 
-    MessageValidator messageValidator = new MessageValidatorImpl();
-    // Return validator
-    return messageValidator;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.ProfileValidatorFactory#newEnvelopeValidator()
-   */
-  public EnvelopeValidator newEnvelopeValidator() throws WSIException
-  {
-    // Create new envelope validator 
-    EnvelopeValidator envelopeValidator = new EnvelopeValidatorImpl();
-    // Return validator
-    return envelopeValidator;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java
deleted file mode 100644
index a7f2ebd..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-
-/**
- * AP1920
- *
- * <context>For an envelope in a response message
- * containing a soap:Fault element</context>
- * <assertionDescription>In a description, if and only if, the wsdl:output
- * element is described using WSDL MIME binding, then the envelope in the
- * response message can contain faults with attachments.</assertionDescription>
- */
-public class AP1920 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1920(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try 
-    {
-      if (!entryContext.getMessageEntry().isMimeContent())
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // check for a fault element within the message 
-      if((entryContext.getMessageEntryDocument() == null) || 
-          entryContext.getMessageEntryDocument().
-          getElementsByTagNameNS(WSITag.ELEM_SOAP_FAULT.getNamespaceURI(), 
-              WSITag.ELEM_SOAP_FAULT.getLocalPart()).getLength() != 1)
-        throw new AssertionNotApplicableException();
-      
-      BindingOperation bindingOperation = validator.getOperationMatch(
-          EntryType.getEntryType(EntryType.TYPE_MESSAGE_REQUEST),
-          entryContext.getRequestDocument());
-
-      // If there is no matched operation, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-      // If the envelope in a response message contains a fault with attachments
-      // and the corresponding wsdl:output element in the description is not 
-      // described using the WSDL MIME binding, the assertion is failed  
-      if ((entryContext.getMessageEntry().getMimeParts().count() > 1) &&
-          (getMultipartRelatedBindings(bindingOperation) == null))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = 
-          validator.createFailureDetail("The message contains \"" + 
-              entryContext.getMessageEntry().getMimeParts().count() + "\" part(s)", 
-              entryContext);
-      }
-    }
-    catch(AssertionNotApplicableException e)
-    {
-       result = AssertionResult.RESULT_NOT_APPLICABLE; 
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-  
-  /**
-   * Returns Multipart related bindings, if does not found, returns null.
-   * @param op binding operation
-   * @return Multipart related bindings, if does not found, returns null.
-   */
-  private MIMEMultipartRelated getMultipartRelatedBindings(
-      BindingOperation op) 
-  {
-    // Finding operation extensibility elems
-    // in the binding depending on message type
-    List extElems = op.getBindingOutput().getExtensibilityElements();
-    // check list on first element
-    if((extElems == null) || (extElems.size() == 0) || 
-       !(extElems.get(0) instanceof MIMEMultipartRelated))
-      return null;
-    return (MIMEMultipartRelated) extElems.get(0); 
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1928.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1928.java
deleted file mode 100644
index 5965fcf..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1928.java
+++ /dev/null

@@ -1,426 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.xs.XSComplexTypeDefinition;
-import org.apache.xerces.xs.XSConstants;
-import org.apache.xerces.xs.XSElementDeclaration;
-import org.apache.xerces.xs.XSModel;
-import org.apache.xerces.xs.XSModelGroup;
-import org.apache.xerces.xs.XSObjectList;
-import org.apache.xerces.xs.XSParticle;
-import org.apache.xerces.xs.XSTerm;
-import org.apache.xerces.xs.XSTypeDefinition;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.MIMEConstants;
-import org.eclipse.wst.wsi.internal.core.util.MIMEUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * AP1928
- *
- * <context>For a candidate envelope containing a URI reference
- * that is typed using the ref:swaRef schema type</context>
- * <assertionDescription>In an envelope, a URI reference that is typed using
- * the ref:swaRef schema type resolves to a MIME part in the same message
- * as the envelope.</assertionDescription>
- */
-public class AP1928 extends AssertionProcess implements WSITag
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1928(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (!entryContext.getMessageEntry().isMimeContent())
-      {
-        throw new AssertionNotApplicableException();
-      }
-      // get the rrot part of a multipart/related message
-      Document root = entryContext.getMessageEntryDocument();
-      MimeParts mimeParts = entryContext.getMessageEntry().getMimeParts();
-
-      // get an operation matched for the message
-      BindingOperation bindingOperation = validator.getOperationMatch(
-        entryContext.getEntry().getEntryType(), root);
- 
-      // if no one operation matches, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-
-      // get the corresponding extensibility elements and message
-      List extElems;
-      Message message;
-      if (MessageEntry.TYPE_REQUEST
-        .equals(entryContext.getEntry().getEntryType()))
-      {
-        extElems = bindingOperation.getBindingInput() == null ? null
-          : bindingOperation.getBindingInput().getExtensibilityElements();
-        message = bindingOperation.getOperation().getInput() == null ? null
-          : bindingOperation.getOperation().getInput().getMessage();
-      }
-      else
-      {
-        extElems = bindingOperation.getBindingOutput() == null ? null
-          : bindingOperation.getBindingOutput().getExtensibilityElements();
-        message = bindingOperation.getOperation().getOutput() == null ? null
-          : bindingOperation.getOperation().getOutput().getMessage();
-      }
-
-      // If there are no extensibility elements in the WSDL binding operation,
-      // the assertion is not applicable
-      if (extElems == null || extElems.size() < 1)
-        throw new AssertionNotApplicableException();
-
-      // Collecting the names of schema elements that are defined
-      // with the ref:swaRef schema type
-      List swaRefs = getSwaRefs((ExtensibilityElement)extElems.get(0), message);
-      // If such schema elements are not found, the assertion is not applicable
-      if (swaRefs.isEmpty())
-        throw new AssertionNotApplicableException();
-
-      // Going through all the schema element names
-      for (int i = 0; i < swaRefs.size(); i++)
-      {
-        QName elemName = (QName) swaRefs.get(i);
-        // Looking for such elements in the root MIME part
-        NodeList elems = root.getDocumentElement().getElementsByTagNameNS(
-            elemName.getNamespaceURI(), elemName.getLocalPart());
-        // Going through all the ref:swaRef references
-        for (int j = 0; j < elems.getLength(); j++)
-        {
-          Node elem = elems.item(j);
-          // Getting a value of this reference
-          String ref = elem.getFirstChild() == null ? null
-            : elem.getFirstChild().getNodeValue();
-          // If the value is invalid, the assertion failed
-          if (ref == null)
-            throw new AssertionFailException("The element " + elem.getNodeName()
-              + " of the ref:swaRef schema type is specified, but its vaule"
-              + " is invalid.");
-          // If the URI does not start with the "cid:" content-id prefix
-          // The assertion failed
-          if (!ref.startsWith("cid:"))
-          {
-            throw new AssertionFailException("The URI " + ref
-              + " of the ref:swaRef schema type must use the cid: prefix.");
-          }
-          boolean refFound = false;
-          Iterator iMimeParts = mimeParts.getParts().iterator();
-          // Going through all the MIME parts of the SOAP message
-          while (iMimeParts.hasNext())
-          {
-            MimePart mimePart = (MimePart)iMimeParts.next();
-            // Getting part's Content-ID header
-            String cid = MIMEUtils.getMimeHeaderAttribute(
-                mimePart.getHeaders(), MIMEConstants.HEADER_CONTENT_ID);
-            if (cid != null)
-            {
-              // If the header value equals the reference URI,
-              // the corresponding MIME part is found
-              if (cid.equals('<' + ref.substring(4) + '>'))
-              {
-                refFound = true;
-                break;
-              }
-            }
-          }
-          // If the corresponding MIME part is not found
-          // the assertion failed
-          if (!refFound)
-            throw new AssertionFailException("The SOAP message does not contain"
-              + " a MIME part with the <" + ref.substring(4) + "> Content-ID.");
-        }
-      }
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Collects names of schema elements that are defined with the ref:swaRef
-   * schema type.
-   * @param extElem a list of extensibility elements
-   * @param message the corresponding message element.
-   * @return a list of such names found.
-   */
-  private List getSwaRefs(ExtensibilityElement extElem, Message message)
-  {
-    List swaRefs = new ArrayList();
-    if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-    {
-      // Getting the root mime:part
-      List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-      if (mimeParts.size() > 0)
-      {
-        // Getting extensibility elements of the first mime:part
-        List elems = ((MIMEPart) mimeParts.get(0)).getExtensibilityElements();
-        List boundParts = new ArrayList();
-        // Going through all the MIME part's extensibility elements
-        for (int k = 0; k < elems.size(); k ++)
-        {
-          ExtensibilityElement elem = (ExtensibilityElement) elems.get(k);
-          // If that is a soap:body
-          if (elem.getElementType().equals(WSDL_SOAP_BODY) && message != null)
-          {
-            // Getting parts specified by the parts attribute
-            List bodyParts = ((SOAPBody) elem).getParts();
-            // Collecting all the message parts bound by this soapbind:body
-            Iterator i = message.getParts().values().iterator();
-            while (i.hasNext())
-            {
-              Part part = (Part) i.next();
-              if (bodyParts == null || bodyParts.contains(part.getName()))
-              {
-                boundParts.add(part);
-              }
-            }
-          }
-          // else if that is a soap:header
-          else if (elem.getElementType().equals(WSDL_SOAP_HEADER))
-          {
-            QName msgName;
-            String partName;
-            if (elem instanceof SOAPHeader)
-            {
-              SOAPHeader header = (SOAPHeader) elem;
-              // If the part is bound by this element
-              msgName = header.getMessage();
-              partName = header.getPart();
-            }
-            // WSDL4J 1.4 does not recognize soap:header elements that
-            // are enclosed in mime:multipartRelated, so using a workaround
-            else
-            {
-              Element header =
-                ((UnknownExtensibilityElement) elem).getElement();
-              // Getting the element's message attribute
-              String msgVal = header.getAttribute("message");
-              // finding the colon delimiter
-              int colonPos = msgVal.indexOf(":");
-              String ns = null;
-              // Getting a local part
-              String lp = colonPos > -1 ? msgVal.substring(colonPos + 1) : msgVal;
-              // If the delimiter is found
-              if (colonPos > -1)
-              {
-                // Retrieving a namespace URI
-                ns = validator.getWSDLDocument()
-                .getDefinitions().getNamespace(msgVal.substring(0, colonPos));
-              }
-              msgName = new QName(ns, lp);
-              partName = header.getAttribute("part");
-            }
-            // Getting a message referenced by this soapbind:header element
-            Message msg = 
-              validator.getWSDLDocument().getDefinitions().getMessage(msgName);
-            if (msg != null)
-            {
-              // Adding the part to the list of bound parts
-              Part part = msg.getPart(partName);
-              if (part != null)
-                boundParts.add(part);
-            }
-          }
-        }
-
-        // All the bound parts from soapbind:body and soapbind:header
-        // are collected, finding swaRef references.
-        for (int i = 0; i < boundParts.size(); i++)
-        {
-          Part part = (Part) boundParts.get(i);
-          QName ref;
-          short type;
-          // Getting either part's element reference or type reference
-          if ((ref = part.getTypeName()) != null)
-          {
-            type = XSConstants.TYPE_DEFINITION;
-          }
-          else if ((ref = part.getElementName()) != null)
-          {
-            type = XSConstants.ELEMENT_DECLARATION;
-          }
-          // The part conatins neither element nor type attribute,
-          // proceeding with the next part
-          else
-          {
-            continue;
-          }
-          // Getting a list of schemas defined
-          Map schemas = validator.getWSDLDocument().getSchemas();
-          // Going through the schemas
-          Iterator it = schemas.values().iterator();
-          while (it.hasNext())
-          {
-            XSModel xsModel = (XSModel) it.next();
-            XSTypeDefinition xsType = null;
-            // Getting the corresponding part type
-            if (type == XSConstants.ELEMENT_DECLARATION)
-            {
-              // Getting schema element
-              XSElementDeclaration elem = xsModel.getElementDeclaration(
-                ref.getLocalPart(), ref.getNamespaceURI());
-              if (elem != null)
-              {
-                // Getting element's type
-                xsType = elem.getTypeDefinition();
-                // If it is ref:swaRef
-                if (WSIConstants.NS_URI_SWA_REF.equals(xsType.getName())
-                  && WSIConstants.SCHEMA_TYPE_SWA_REF.equals(
-                    xsType.getNamespace()))
-                {
-                  // Adding the name of the element to the list
-                  swaRefs.add(
-                    new QName(elem.getNamespace(), elem.getName()));
-                }
-              }
-            }
-            else
-            {
-              xsType = xsModel.getTypeDefinition(
-                ref.getLocalPart(), ref.getNamespaceURI());
-            }
-            // Collecting all the element names,adding element names to the list
-            swaRefs.addAll(collectSwaRefs(xsType));
-          }
-        }
-      }
-    }
-    return swaRefs;
-  }
-
-  /**
-   * Collects names of schema elements that are defined with the ref:swaRef
-   * schema type.
-   * @param xsType a schema type.
-   * @return a list of names found.
-   */
-  private List collectSwaRefs(XSTypeDefinition xsType)
-  {
-    List swaRefs = new ArrayList();
-    if (xsType != null)
-    {
-      // If this is a complex type
-      if (xsType.getTypeCategory() == XSTypeDefinition.COMPLEX_TYPE)
-      {
-        XSComplexTypeDefinition xsComplexType =
-          (XSComplexTypeDefinition) xsType;
-        // If it contains mixed context
-        if (xsComplexType.getParticle() != null)
-        {
-          // collecting element names 
-          swaRefs.addAll(collectSwaRefs(xsComplexType.getParticle().getTerm()));
-        }
-      }
-    }
-    return swaRefs;
-  }
-
-  /**
-   * Collects names of schema elements that are defined with the ref:swaRef
-   * schema type.
-   * @param term a schema term.
-   * @return a list of names found.
-   */
-  private List collectSwaRefs(XSTerm term)
-  {
-    List swaRefs = new ArrayList(); 
-    // If a term is an element declaration
-    if (term.getType() == XSConstants.ELEMENT_DECLARATION)
-    {
-      XSElementDeclaration elem = (XSElementDeclaration) term;
-      XSTypeDefinition xsType = elem.getTypeDefinition();
-      // If element's type is ref:swaRef
-      if (WSIConstants.NS_URI_SWA_REF.equals(xsType.getNamespace())
-        && WSIConstants.SCHEMA_TYPE_SWA_REF.equals(xsType.getName()))
-      {
-        // Add element's name to the list
-        swaRefs.add(
-          new QName(elem.getNamespace(), elem.getName()));
-      }
-      else
-      {
-        // else collecting element names from element's type
-        swaRefs.addAll(collectSwaRefs(xsType));
-      }
-    }
-    // else if a term is a model group
-    else if(term.getType() == XSConstants.MODEL_GROUP)
-    {
-      // Getting a list of Particle schema components
-      XSObjectList list = ((XSModelGroup) term).getParticles();
-      for (int i = 0; i < list.getLength(); i++)
-      {
-        // Collecting element names
-        swaRefs.addAll(collectSwaRefs(((XSParticle) list.item(i)).getTerm()));
-      }
-    }
-    return swaRefs;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1005.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1005.java
deleted file mode 100644
index 7aa465d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1005.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1005.
- */
-public class BP1005 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1005(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (this.validator.isOneWayResponse(entryContext))
-        throw new AssertionNotApplicableException();
-
-      // Parse message
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // If this is a fault mesage, then it is not applicable
-      if (this.validator.isFault(doc))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Check if there is a soap body element
-      if (!this.validator.containsSoapBodyWithChild(doc))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Parse request message
-      Document docRequest = entryContext.getRequestDocument();
-
-      // get SOAPAction
-      String headers = entryContext.getRequest().getHTTPHeaders();
-      String action = null;
-      if (headers != null)
-        action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-
-      Binding binding = validator.analyzerContext.getCandidateInfo().getBindings()[0];
-      TypesRegistry registry =
-        new TypesRegistry(
-          this.validator.getWSDLDocument().getDefinitions(),
-          validator);
-      OperationSignature.OperationMatch match =
-        OperationSignature.matchOperation(
-          docRequest,
-          action,
-          binding,
-          registry);
-      if (match == null)
-        throw new AssertionNotApplicableException();
-
-      BindingOperation bindingOperation = match.getOperation();
-
-      // Is rpc style?
-      if (!WSIConstants
-        .ATTRVAL_SOAP_BIND_STYLE_RPC
-        .equals(match.getOperationStyle()))
-        throw new AssertionNotApplicableException();
-
-      List extElements = null;
-
-      if (bindingOperation.getBindingOutput() != null)
-        extElements =
-          bindingOperation.getBindingOutput().getExtensibilityElements();
-
-      // Is message RPC-literal?
-      if (!validator.isLiteral(extElements))
-        throw new AssertionNotApplicableException();
-
-      //Get message
-
-      // Gets body
-      NodeList soapBodyList =
-        doc.getElementsByTagNameNS(
-          WSIConstants.NS_URI_SOAP,
-          XMLUtils.SOAP_ELEM_BODY);
-      if (soapBodyList.getLength() == 0 || soapBodyList.getLength() > 1)
-      {
-        // There is not a body or more than one bodies in the envlope.
-        throw new AssertionFailException();
-      }
-      Element soapBodyElem = (Element) soapBodyList.item(0);
-
-      // Find wrapper element in the body
-      Element wrapperElement = XMLUtils.getFirstChild(soapBodyElem);
-      if (wrapperElement == null)
-      {
-        throw new AssertionFailException();
-      }
-
-      if (wrapperElement
-        .getLocalName()
-        .equals(bindingOperation.getName() + "Response"))
-      {
-        result = AssertionResult.RESULT_PASSED;
-      }
-      else
-      {
-        result = AssertionResult.RESULT_FAILED;
-      }
-
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1007.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1007.java
deleted file mode 100644
index 4694869..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1007.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Document;
-
-
-/**
- * BP1007
- *
- * <context>For a candidate message, in the message log file</context>
- * <assertionDescription>DTDs relating to soap:header or soap:body documents, are not present in the message: no DOCTYPE element is present.</assertionDescription>
- */
-public class BP1007 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1007(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Parse log message 
-    Document doc = entryContext.getMessageEntryDocument();
-    if (doc == null)
-    {
-      // message is empty or invalid, the assertion is not applicable
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    // else if the message contains a Document Type Declaration, the assertion failed
-    else if (doc.getDoctype() != null)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        testAssertion.getFailureDetailDescription(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1008.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1008.java
deleted file mode 100644
index 2120236..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1008.java
+++ /dev/null

@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1008.
- * Message has part accessor elements for parameters and return value, in no namespaces, 
- * but the children of these are namespace qualified with the same targetNamespace with which 
- * their types are defined.
- */
-public class BP1008 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1008(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-
-      if (this.validator.isOneWayResponse(entryContext))
-        throw new AssertionFailException(
-          AssertionResult.RESULT_NOT_APPLICABLE);
-
-      // Parse message
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // If there is no message, then throw fail exception
-      if (doc == null)
-        throw new AssertionFailException();
-
-      if (this.validator.isFault(doc))
-      {
-        throw new AssertionFailException(
-          AssertionResult.RESULT_NOT_APPLICABLE);
-      }
-
-      // Check if there is a soap body element
-      if (!this.validator.containsSoapBodyWithChild(doc))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Parse request message
-      Document docRequest = entryContext.getRequestDocument();
-
-      // get SOAPAction
-      String action =
-        validator.getSoapAction(entryContext.getRequest().getHTTPHeaders());
-
-      Binding binding = validator.analyzerContext.getCandidateInfo().getBindings()[0];
-      //Definition definition = entryContext.getAnalyzerContext().getCandidateInfo().getDefinitions()[0];
-      TypesRegistry registry =
-        new TypesRegistry(
-          this.validator.getWSDLDocument().getDefinitions(),
-          validator);
-      OperationSignature.OperationMatch match =
-        OperationSignature.matchOperation(
-          docRequest,
-          action,
-          binding,
-          registry);
-      if (match == null)
-        throw new AssertionNotApplicableException();
-
-      BindingOperation bindingOperation = match.getOperation();
-
-      // Is rpc style?
-      if (!WSIConstants
-        .ATTRVAL_SOAP_BIND_STYLE_RPC
-        .equals(match.getOperationStyle()))
-        throw new AssertionFailException(
-          AssertionResult.RESULT_NOT_APPLICABLE);
-
-      // Gets body
-      NodeList soapBodyList =
-        doc.getElementsByTagNameNS(
-          WSIConstants.NS_URI_SOAP,
-          XMLUtils.SOAP_ELEM_BODY);
-      if (soapBodyList.getLength() == 0 || soapBodyList.getLength() > 1)
-      {
-        // There is not a body or more than one bodies in the envlope.
-        throw new AssertionFailException();
-      }
-      Element soapBodyElem = (Element) soapBodyList.item(0);
-
-      result = null;
-
-      // Find operation in the body
-      Element soapOperation = XMLUtils.getFirstChild(soapBodyElem);
-      if (soapOperation == null)
-      {
-        throw new AssertionFailException();
-      }
-
-      // Find operation message and ext. elements in the binding
-      Message operationMessage = null;
-      List extElements = null;
-      if (MessageEntry
-        .TYPE_REQUEST
-        .equals(entryContext.getMessageEntry().getType()))
-      {
-        operationMessage =
-          bindingOperation.getOperation().getInput().getMessage();
-        if (bindingOperation.getBindingInput() != null)
-          extElements =
-            bindingOperation.getBindingInput().getExtensibilityElements();
-      }
-      else
-      {
-        if (MessageEntry
-          .TYPE_RESPONSE
-          .equals(entryContext.getMessageEntry().getType()))
-        {
-          operationMessage =
-            bindingOperation.getOperation().getOutput().getMessage();
-          if (bindingOperation.getBindingOutput() != null)
-            extElements =
-              bindingOperation.getBindingOutput().getExtensibilityElements();
-        }
-      }
-
-      // Is message RPC-literal?
-      if (!validator.isLiteral(extElements))
-        throw new AssertionFailException(
-          AssertionResult.RESULT_NOT_APPLICABLE);
-
-      // gets first child of message
-      Element soapMessagePart = XMLUtils.getFirstChild(soapOperation);
-      if (soapMessagePart == null)
-      {
-        throw new AssertionPassException();
-      }
-
-      while (soapMessagePart != null)
-      {
-        // check whether part accessor or return are in no namespace		    		
-
-        if (soapMessagePart.getNamespaceURI() != null
-          || "".equals(soapMessagePart.getNamespaceURI()))
-        {
-          throw new AssertionFailException();
-        }
-
-        //    check whether children are namespace qualified 
-        //  with the same targetNamespace with which their types are defined
-        String typesTargetNS =
-          getTypeNS(operationMessage, soapMessagePart.getLocalName());
-
-        if (typesTargetNS == null)
-          throw new AssertionFailException();
-
-        if (!checkChildrenNamespace(soapMessagePart, typesTargetNS))
-        {
-          throw new AssertionFailException();
-        }
-
-        soapMessagePart = XMLUtils.getNextSibling(soapMessagePart);
-      }
-
-      result = AssertionResult.RESULT_PASSED;
-
-    }
-    catch (AssertionFailException e)
-    {
-      if (e.getMessage() != null && e.getMessage().length() > 0)
-        result = e.getMessage();
-      else
-        result = AssertionResult.RESULT_FAILED;
-    }
-    catch (AssertionPassException e)
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    if (result == AssertionResult.RESULT_FAILED)
-    {
-      failureDetail = this.validator.createFailureDetail(null, entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Gets part type NS.
-   * @param message
-   * @param partName
-   * @return String
-   */
-  private String getTypeNS(Message message, String partName)
-  {
-    Part part = message.getPart(partName);
-    if (part == null)
-      return null;
-    else
-      return part.getTypeName().getNamespaceURI();
-  }
-
-  /**
-   * Checks children elements' namespace.
-   * @param node
-   * @param typesTargetNS
-   * @return boolean
-   */
-
-  private boolean checkChildrenNamespace(Element node, String typesTargetNS)
-  {
-    NodeList parts = node.getElementsByTagName("*");
-    for (int i = 0; i < parts.getLength(); i++)
-    {
-      Element part = (Element) parts.item(i);
-      if (!typesTargetNS.equals(part.getNamespaceURI()))
-      {
-        return false;
-      }
-      if (!checkChildrenNamespace(part, typesTargetNS))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1009.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1009.java
deleted file mode 100644
index 32e401b..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1009.java
+++ /dev/null

@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.OperationType;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1009.
- * Message includes all soapbind:headers specified in the wsdl:input 
- * (if request) or wsdl:output (if response) of the operation referred 
- * to by its wsdl:binding, and may also include headers that were not specified.
- */
-public class BP1009 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1009(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (this.validator.isOneWayResponse(entryContext))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Parse message
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // Parse request message
-      Document docRequest = entryContext.getRequestDocument();
-
-      if (doc == null || docRequest == null)
-        throw new AssertionNotApplicableException();
-
-      // Check if there is a soap body element
-      if (!this.validator.containsSoapBodyWithChild(doc))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      if (this.validator.isFault(doc))
-      {
-        throw new AssertionFailException(
-          AssertionResult.RESULT_NOT_APPLICABLE);
-      }
-
-      // get SOAPAction
-      String headers = entryContext.getRequest().getHTTPHeaders();
-      String action = null;
-      if (headers != null)
-        action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-
-      Binding binding = validator.analyzerContext.getCandidateInfo().getBindings()[0];
-      TypesRegistry registry =
-        new TypesRegistry(
-          this.validator.getWSDLDocument().getDefinitions(),
-          validator);
-      OperationSignature.OperationMatch match =
-        OperationSignature.matchOperation(
-          docRequest,
-          action,
-          binding,
-          registry);
-
-      if (match == null)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      BindingOperation bindingOperation = match.getOperation();
-
-      // If this is a one-way operation and we are processing a response, then set result to notApplicable
-      if (bindingOperation
-        .getOperation()
-        .getStyle()
-        .equals(OperationType.ONE_WAY)
-        && (entryContext
-          .getMessageEntry()
-          .getType()
-          .equals(MessageEntry.TYPE_RESPONSE)))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // find body
-      NodeList soapBodyList =
-        doc.getElementsByTagNameNS(
-          WSIConstants.NS_URI_SOAP,
-          XMLUtils.SOAP_ELEM_BODY);
-      if (soapBodyList.getLength() == 0 || soapBodyList.getLength() > 1)
-      {
-        // There is not a body or more than one bodies in the envlope.
-        throw new AssertionPassException();
-      }
-      // find headers
-      NodeList soapHeaders =
-        doc.getElementsByTagNameNS(
-          WSITag.ELEM_SOAP_HEADER.getNamespaceURI(),
-          WSITag.ELEM_SOAP_HEADER.getLocalPart());
-
-      //find all operation
-      //Element soapOperation = XMLUtils.getFirstChild(soapBodyElem);
-
-      // gets soapbind:headers
-      List bindingHeaders = null;
-      if (entryContext
-        .getMessageEntry()
-        .getType()
-        .equals(MessageEntry.TYPE_REQUEST))
-      {
-        if (bindingOperation.getBindingInput() != null)
-          bindingHeaders =
-            bindingOperation.getBindingInput().getExtensibilityElements();
-        else
-          throw new AssertionFailException();
-
-      }
-      else
-      {
-        if (entryContext
-          .getMessageEntry()
-          .getType()
-          .equals(MessageEntry.TYPE_RESPONSE))
-        {
-          if (bindingOperation.getBindingOutput() != null)
-            bindingHeaders =
-              bindingOperation.getBindingOutput().getExtensibilityElements();
-          else
-            throw new AssertionFailException();
-        }
-      }
-      if (bindingHeaders == null || bindingHeaders.size() == 0)
-      {
-        throw new AssertionPassException();
-      }
-
-      Iterator iterator = bindingHeaders.iterator();
-      while (iterator.hasNext())
-      {
-        Object bindingHeader = iterator.next();
-        if (bindingHeader instanceof SOAPHeader)
-        {
-          // find soapbind:header in SOAP message
-          if (!isBindingHeaderInSOAPMessage(entryContext,
-            soapHeaders,
-            (SOAPHeader) bindingHeader))
-          {
-            throw new AssertionFailException();
-          }
-        }
-      }
-
-      result = AssertionResult.RESULT_PASSED;
-
-    }
-    catch (AssertionFailException e)
-    {
-      if (e.getMessage() != null && e.getMessage().length() > 0)
-        result = e.getMessage();
-      else
-        result = AssertionResult.RESULT_FAILED;
-    }
-    catch (AssertionPassException e)
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    if (result == AssertionResult.RESULT_FAILED)
-    {
-      failureDetail = this.validator.createFailureDetail(null, entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /**
-  * Checks whether specified SOAPHeader is in the SOAPMessage.
-  * @param soapHeaderList
-  * @param SOAPHeader
-  * @return boolean
-  */
-  private boolean isBindingHeaderInSOAPMessage(
-    EntryContext entryContext,
-    NodeList soapHeaders,
-    SOAPHeader bindingHeader)
-  {
-
-    Message msg = getMessageByQName(entryContext, bindingHeader.getMessage());
-    if (msg == null)
-      return false;
-
-    Part part = msg.getPart(bindingHeader.getPart());
-    if (part == null)
-      return false;
-
-    QName partElementName = part.getElementName();
-    QName partTypeName = part.getTypeName();
-
-    if (partTypeName == null && partElementName == null)
-      return false;
-
-    if (soapHeaders == null || soapHeaders.getLength() == 0)
-    {
-      return false;
-    }
-    Vector headersList =
-      XMLUtils.getChildElements((Element) soapHeaders.item(0));
-
-    for (int indexHeader = 0;
-      indexHeader < headersList.size();
-      indexHeader++)
-    {
-      Element soapHeaderPart = (Element) headersList.get(indexHeader);
-      if (soapHeaderPart != null)
-      {
-        QName soapHeaderPartQName =
-          new QName(
-            soapHeaderPart.getNamespaceURI(),
-            soapHeaderPart.getLocalName());
-        if ((partTypeName != null
-          && partTypeName.equals(soapHeaderPartQName))
-          || (partElementName != null
-            && partElementName.equals(soapHeaderPartQName)))
-        {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Gets message by QName.
-   * @param entryContext
-   * @param messageName
-   * @return Message
-   */
-  private Message getMessageByQName(
-    EntryContext entryContext,
-    QName messageName)
-  {
-    Definition[] defs = validator.analyzerContext.getCandidateInfo().getDefinitions();
-    for (int i = 0; i < defs.length; i++)
-    {
-      Message msg = defs[i].getMessage(messageName);
-      if (msg != null)
-        return msg;
-    }
-    return null;
-  }
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1011.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1011.java
deleted file mode 100644
index 3a37ab6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1011.java
+++ /dev/null

@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * BP1011.
- */
-public class BP1011 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1011(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // TODO need to handle soap with attachments
-      if (entryContext.getMessageEntry().isMimeContent())
-      	 throw new AssertionNotApplicableException();
-         
-      Binding[] bindings = validator.analyzerContext.getCandidateInfo().getBindings();
-
-      // get soap message child name
-      // Get the DOM contents of the message soap:body (if non-empty)
-      Document messageDoc = null;
-
-      QName messagePartElementQName = null;
-
-      if (!entryContext.getMessageEntry().getMessage().equals(""))
-      {
-        messageDoc = entryContext.getMessageEntryDocument();
-        //messageDoc = XMLUtils.parseXML(entryContext.getMessageEntry().getMessage(), 
-        //	WSIProperties.DEF_SOAP_SCHEMA);
-        // get soap operation name from the soap:body
-
-        // NOTE: getSoapBodyChild() may return null, if the soap:body did not contain any child elements
-        Element soapMessageElement = validator.getSoapBodyChild(messageDoc);
-
-        // for doc-lit... find the wsdl:part from one of the specified operations that has 
-        // the soap element used in the message.      
-        // we are looking for a part with an element attrib val matching the soap message element
-        if (soapMessageElement != null)
-        {
-          messagePartElementQName =
-            new QName(
-              soapMessageElement.getNamespaceURI(),
-              soapMessageElement.getLocalName());
-        }
-      }
-
-      if ((messageDoc == null) || this.validator.isFault(messageDoc))
-      {
-        // empty messages and fault messages do not qualify for this TA
-        throw new AssertionNotApplicableException();
-      }
-
-      // look for match(s) in doc operations
-      // if found, we're done, else
-      // look for match(s) in rpc operations
-
-      /* Doc-lit 
-       * get list of operations (from candidates) for which the first soap:body child QName is the
-       * <part element="..."> value of that operation's <wsdl:input> or <wsdl:output> element (depending
-       * on whether message is a request or a response).
-       */
-
-      BindingOperation[] docBindingOperations =
-        validator.getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC,
-          bindings);
-      // list of operations that match the <wsdl:input> or <wsdl:output> (depending on entryType)
-      // for part element="..."
-      // (ISSUE: what about part type="..."?)
-      BindingOperation[] potentialDocLitOps =
-        validator.getDocLitOperations(
-          entryContext.getEntry().getEntryType(),
-          messagePartElementQName,
-          docBindingOperations);
-      if (potentialDocLitOps.length != 0)
-      {
-        // found at least one doc lit match
-
-        // *** Now we know it's document-literal, schema-validate the SOAP payload accordingly            		
-        try
-        {
-          this.validator.messageIsDocLitSchemaValid(entryContext);
-        }
-        catch (Exception e)
-        {
-          throw new AssertionFailException(e.getMessage());
-        }
-        throw new AssertionPassException();
-      }
-
-      /* soap message is not doc-lit so try :
-       * Rpc-lit
-       */
-      BindingOperation[] rpcBindingOperations =
-        this.validator.getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC,
-          bindings);
-
-      // Determine if there is an operation match
-      BindingOperation rcpOpMatch =
-        this.validator.getOperationMatch(
-          entryContext.getEntry().getEntryType(),
-          messageDoc,
-          rpcBindingOperations);
-      if (rcpOpMatch != null)
-      {
-        // Determine if the parts match
-        rcpOpMatch =
-          this.validator.getOperationPartsMatch(
-            entryContext.getEntry().getEntryType(),
-            messageDoc,
-            rpcBindingOperations);
-      }
-
-      if (rcpOpMatch == null)
-      {
-        //not matched with rpc either. Prepare assertion failure.
-        StringBuffer rpcOperationList = new StringBuffer();
-        for (int i = 0; i < rpcBindingOperations.length; i++)
-        {
-          rpcOperationList.append(rpcBindingOperations[i].toString() + "\n");
-        }
-
-        StringBuffer docOperationList = new StringBuffer();
-        for (int i = 0; i < docBindingOperations.length; i++)
-        {
-          docOperationList.append(docBindingOperations[i].toString() + "\n");
-        }
-
-        throw new AssertionFailException(
-          "--MESSAGE:\n"
-            + entryContext.getMessageEntry().getMessage()
-            + "\n--CANDIDATE RPC STYLE OPERATIONS ("
-            + (rpcBindingOperations.length != 0
-              ? (rpcBindingOperations.length + "):\n" + rpcOperationList)
-              : "NONE)")
-            + "\n--CANDIDATE DOCUMENT STYLE OPERATIONS ("
-            + (docBindingOperations.length != 0
-              ? (docBindingOperations.length + "):\n" + docOperationList)
-              : "NONE)"));
-
-      }
-    }
-    catch (AssertionPassException e)
-    {
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1012.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1012.java
deleted file mode 100644
index 115d4ef..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1012.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1012.
- */
-public class BP1012 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1012(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // look for <soap:Envelope> elements:
-      // (Note: since this is a Soap message we expect exactly one soap envelope, but we do not assume it).
-      Document requestDoc = entryContext.getRequestDocument();
-
-      // message is empty or invalid, the assertion is not applicable
-      if (requestDoc == null)
-        throw new AssertionNotApplicableException();
-
-      Element envElem = requestDoc.getDocumentElement();
-      //NodeList soapEnvList = requestDoc.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Envelope");
-
-      // If the document element tag name is not Envelope
-      // or the namespace is http://schemas.xmlsoap.org/soap/envelope/
-      if (!envElem.getLocalName().equals(XMLUtils.SOAP_ELEM_ENVELOPE)
-        || envElem.getNamespaceURI().equals(WSIConstants.NS_URI_SOAP))
-        // Request contains proper soap Envelope element
-        throw new AssertionNotApplicableException();
-
-      // we expect a Soap Fault as a response	
-      Document responseDoc =
-        XMLUtils.parseXML(entryContext.getResponse().getMessage());
-      NodeList soapFaultList =
-        responseDoc.getElementsByTagNameNS(
-          WSIConstants.NS_URI_SOAP,
-          "Fault");
-      // ADD extra check here that the <soap:Fault> is a child of <soap:Envelope> ??		      				
-      if ((soapFaultList == null) || (soapFaultList.getLength() == 0))
-      {
-        // No Soap fault found.
-        // Assertion failed (ADD highlight the child here ?)
-        throw new AssertionFailException(
-          "--- REQUEST:\n"
-            + entryContext.getRequest().getMessage()
-            + "\n--- RESPONSE:\n"
-            + entryContext.getResponse().getMessage());
-      }
-
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1013.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1013.java
deleted file mode 100644
index eb6f8eb..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1013.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-
-
-/**
- * BP1013.
- */
-public class BP1013 extends BP1011
-{
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1013(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1031.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1031.java
deleted file mode 100644
index cfbdafb..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1031.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-
-/**
- * BP1031.
- * 
- * @author: Graham Turrell, IBM UK
- */
-public class BP1031 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1031(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    failureDetail = null;
-    try
-    {
-      Document doc;
-      // Check if this is one way response
-      // or message is mepty or invalid
-      if (this.validator.isOneWayResponse(entryContext)
-          || (doc = entryContext.getMessageEntryDocument()) == null)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      if (!this.validator.isFault(doc))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      NodeList faultCodes = doc.getElementsByTagName("faultcode");
-      for (int i = 0; i < faultCodes.getLength(); i++)
-      {
-        NodeList faultCodeNodes = (faultCodes.item(i)).getChildNodes();
-        for (int j = 0; j < faultCodeNodes.getLength(); j++)
-        {
-          if (faultCodeNodes.item(j) instanceof Text)
-          {
-            Text faultCodeText = (Text) faultCodeNodes.item(j);
-            if (faultCodeText.getData().indexOf('.') > 0)
-            {
-              throw new AssertionFailException();
-              // dotted notation used.
-            }
-          }
-        }
-      }
-
-      throw new AssertionPassException();
-      // no dotted notation used in a faultcode element
-    }
-    catch (AssertionPassException e)
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_WARNING;
-      failureDetail =
-        this.validator.createFailureDetail(
-          entryContext.getMessageEntry().getMessage(),
-          entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1032.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1032.java
deleted file mode 100644
index 4741307..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1032.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-
-/**
- * BP1032
- *
- * <context>For a candidate envelope</context>
- * <assertionDescription>The soap:Envelope, soap:Header, and soap:Body elements do not have any attributes in the namespace "http://schemas.xmlsoap.org/soap/envelope/"</assertionDescription>
- */
-public class BP1032 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1032(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    try
-    {
-      // Getting a message document
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // If the message is empty or invalid, the assertion is not applicable
-      if (doc == null)
-        throw new AssertionNotApplicableException();
-
-      // Getting a root element
-      Element element = doc.getDocumentElement();
-
-      // Assuming that root element should be soap:Envelope
-      // If not, the assertion is not applicable
-      if (!element.getLocalName().equals(XMLUtils.SOAP_ELEM_ENVELOPE))
-        throw new AssertionNotApplicableException();
-
-      // looking for any attribute of soap:Envelope in the namespace
-      // "http://schemas.xmlsoap.org/soap/envelope/"
-      // If at least one attribute is found, the assertion failed
-      Attr attr = getAttribute(element.getAttributes());
-      if (attr != null)
-        throw new AssertionFailException("soap:Envelope attribute name is "
-          + attr.getName());
-
-      // Getting the first child of soap:Envelope
-      element = XMLUtils.getFirstChild(element);
-
-      // If the child is soap:Header
-      if (element != null
-        && element.getLocalName().equals(XMLUtils.SOAP_ELEM_HEADER))
-      {
-        // looking for any attribute of soap:Header in the namespace
-        // "http://schemas.xmlsoap.org/soap/envelope/"
-        // If at least one attribute is found, the assertion failed
-        attr = getAttribute(element.getAttributes());
-        if (attr != null)
-          throw new AssertionFailException("soap:Header attribute name is "
-            + attr.getName());
-
-        // Moving to the next soap:Envelope child
-        element = XMLUtils.getNextSibling(element);
-      }
-
-      // If the child is soap:Body
-      if (element != null
-        && element.getLocalName().equals(XMLUtils.SOAP_ELEM_BODY))
-      {
-        // looking for any attribute of soap:Body in the namespace
-        // "http://schemas.xmlsoap.org/soap/envelope/"
-        // If at least one attribute is found, the assertion failed
-        attr = getAttribute(element.getAttributes());
-        if (attr != null)
-          throw new AssertionFailException("soap:Body attribute name is "
-            + attr.getName());
-      }
-
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Looks for an attribute that is in the namespace
-   * http://schemas.xmlsoap.org/soap/envelope/
-   * @param attrs a collection of attributes
-   * @return an attribute in the specified namespace or null
-   */
-  private Attr getAttribute(NamedNodeMap attrs)
-  {
-    Attr ret = null;
-    if (attrs != null)
-    {
-      for(int i = 0; i < attrs.getLength(); i++)
-      {
-        Attr attr = (Attr) attrs.item(i);
-        if (attr.getNamespaceURI() != null
-          && attr.getNamespaceURI().equals(WSIConstants.NS_URI_SOAP))
-        {
-          ret = attr;
-          break;
-        }
-      }
-    }
-
-    return ret;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1033.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1033.java
deleted file mode 100644
index 12ec8a1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1033.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * BP1033
- *
- * <context>For a candidate envelope</context>
- * <assertionDescription>The SOAP envelope does not contain the namespace declaration xmlns:xml="http://www.w3.org/XML/1998/namespace".</assertionDescription>
- */
-public class BP1033 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1033(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // Getting a message document
-      Document doc = entryContext.getMessageEntryDocument();
-      // If the message is empty or invalid, the assertion is not applicable
-      if (doc == null)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Getting the root element
-      Element elem = doc.getDocumentElement();
-      // If it is not the soap:Envelope, the assertion is not applicable
-      if (!elem.getNamespaceURI().equals(WSIConstants.NS_URI_SOAP)
-        || !elem.getLocalName().equals(XMLUtils.SOAP_ELEM_ENVELOPE))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // If the envelope contains the xmlns:xml namespace declaration,
-      // the assertion failed
-      String incorrectElementName = getIncorrectElementName(elem);
-      if (incorrectElementName != null)
-      {
-        throw new AssertionFailException("The name of an element containing "
-          + "such namespace declaration is \"" + incorrectElementName + "\".");
-      }
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_WARNING;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Looks for any element that contains the attribute xmlns:xml="http://www.w3.org/XML/1998/namespace". 
-   * @param elem the root element.
-   * @return the name of an element found or null.
-   */
-  private String getIncorrectElementName(Element elem)
-  {
-    // Getting a value of the attribute xmlns:xml
-    String attrValue = elem.getAttributeNS(
-      WSIConstants.NS_URI_XMLNS, "xml");
-    // If it equals to "http://www.w3.org/XML/1998/namespace",
-    // return an element name;
-    if (WSIConstants.NS_URI_XML.equals(attrValue))
-    {
-      return elem.getNodeName();
-    }
-    // Going through element's children
-    Element child = XMLUtils.getFirstChild(elem);
-    while (child != null)
-    {
-      // If any of them has xmlns:xml attribute, return a value
-      String name = getIncorrectElementName(child);
-      if (name != null)
-      {
-        return name;
-      }
-      // Getting the next element's child
-      child = XMLUtils.getNextSibling(child);
-    }
-    // No xmlns:xml attributes found, return null
-    return null;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1100.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1100.java
deleted file mode 100644
index 12bad72..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1100.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1100.
- * A message that does not contain a SOAP fault SHOULD use a "200 OK" 
- * HTTP status code.
- */
-public class BP1100 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1100(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    if (this.validator.isOneWayResponse(entryContext))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // look for <soap:Fault> element:
-      Document doc = entryContext.getMessageEntryDocument();
-      if (doc == null)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        Element root = doc.getDocumentElement();
-        NodeList faultList =
-          root.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Fault");
-
-        // If response does not contain a soap:Fault, then check it
-        if ((faultList == null) || (faultList.getLength() == 0))
-        {
-          // Response does not contain a soap:Fault
-          // check HTTP status code
-          String httpStatus =
-            Utils.getHTTPStatusCode(
-              entryContext.getMessageEntry().getHTTPHeaders());
-          if (!"200".equals(httpStatus))
-          {
-            result = AssertionResult.RESULT_WARNING;
-            //failureDetailMessage = entryContext.getMessageEntry().getMessage();
-            failureDetail =
-              this.validator.createFailureDetail(
-                "\nResponse message:\nHeaders:\n"
-                  + entryContext.getMessageEntry().getHTTPHeaders()
-                  + "\nMessage:\n"
-                  + entryContext.getMessageEntry().getMessage(),
-                entryContext);
-          }
-        }
-
-        // If it is a soap:Fault, then the result must be notApplicable
-        else
-        {
-          result = AssertionResult.RESULT_NOT_APPLICABLE;
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1107.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1107.java
deleted file mode 100644
index 11c8691..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1107.java
+++ /dev/null

@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Fault;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.NullUtil;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.util.WSDLUtil;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * BP1107.
- * The contained soapbind:fault is defined in the wsdl:binding.
- */
-public class BP1107 extends AssertionProcessVisitor
-{
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1107(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private OperationSignature responseSig = null;
-  private Vector faults = null;
-
-  /**
-   * @see org.eclipse.wst.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPFault, Object, WSDLTraversalContext)
-   */
-  public void visit(SOAPFault fault, Object parent, WSDLTraversalContext ctx)
-  {
-    String faultName = fault.getName();
-
-    if (faultName == null)
-      faultName = ctx.getBindingFault().getName();
-
-    Operation op = ctx.getBindingOperation().getOperation();
-    if (op == null /* || faultName == null*/
-      ) // may be it's possible to have legal fault with null name
-      return;
-
-    // we suppose that SOAPFault.getName() corresponds to the abstract operation's fault name           
-    Fault f = op.getFault(faultName);
-    if (f == null)
-      return;
-
-    Message m = f.getMessage();
-    // message should have only one part
-    if (m == null || m.getParts() == null || m.getParts().size() != 1)
-      return;
-
-    //Part faultPart = WSDLUtil.getPart(m, faultName);
-    Part faultPart = (Part) m.getParts().values().iterator().next();
-
-    TypesRegistry tReg = (TypesRegistry) ctx.getParameter("TypesRegistry");
-    QName elemQName = faultPart.getElementName();
-    QName typeQName = faultPart.getTypeName();
-    if (typeQName == null)
-      typeQName = tReg.getType(faultPart.getElementName());
-    if (typeQName == null)
-      throw new IllegalArgumentException("Part type can not be null.");
-
-    // for all faults; if it presents in the definition remove it from list
-    for (int i = 0; i < faults.size();)
-    {
-      Element elem = (Element) faults.get(i);
-
-      // TODO: I don't understand why this is here.  Only the element setting should be checked. 
-      //boolean matchByType =
-      //  elem.getLocalName().equals(typeQName.getLocalPart()) && NullUtil.equals(elem.getNamespaceURI(), typeQName.getNamespaceURI());
-
-      boolean matchByElement =
-        elemQName != null
-          && elem.getLocalName().equals(elemQName.getLocalPart())
-          && NullUtil.equals(
-            elem.getNamespaceURI(),
-            elemQName.getNamespaceURI());
-
-      //if (matchByType || matchByElement)
-      if (matchByElement)
-        faults.remove(i);
-      else
-        i++;
-    }
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    if (this.validator.isOneWayResponse(entryContext))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // Parse request and response message
-      Document docRequest = entryContext.getRequestDocument();
-      Document docResponse = entryContext.getMessageEntryDocument();
-
-      if ((docRequest == null) || (docResponse == null))
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else if (!this.validator.isFault(docResponse))
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        // create request signature
-        OperationSignature.OperationMatch match =
-          OperationSignature.matchOperation(
-            docRequest,
-            this.validator.getSoapAction(entryContext.getRequest().getHTTPHeaders()),
-            validator.analyzerContext.getCandidateInfo().getBindings()[0],
-            new TypesRegistry(
-                validator.analyzerContext
-                .getCandidateInfo()
-                .getWsdlDocument()
-                .getDefinitions(),
-                validator));
-
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-        if (match != null)
-        {
-          // MOVED: Parse response message
-          //doc = entryContext.getMessageEntryDocument();
-
-          responseSig = new OperationSignature(docResponse);
-          if (WSIConstants
-            .ATTRVAL_SOAP_BIND_STYLE_RPC
-            .equals(match.getOperationStyle()))
-            responseSig.createRPCSignature();
-
-          WSDLTraversal traversal = new WSDLTraversal();
-          //VisitorAdaptor.adapt(this);
-          traversal.setVisitor(this);
-          traversal.visitSOAPFault(true);
-          traversal.ignoreBindingInput();
-          traversal.ignoreBindingOutput();
-
-          if (responseSig == null || !responseSig.isFault())
-          {
-            result = AssertionResult.RESULT_NOT_APPLICABLE;
-          }
-          else if (responseSig != null && responseSig.isFault())
-          {
-            // extract all faults and try find them in the definition
-            // extracts only faults with namespace
-            Element body =
-              XMLUtils.findChildElement(
-                docResponse.getDocumentElement(),
-                WSITag.ELEM_SOAP_BODY);
-            Element fault =
-              XMLUtils.findChildElement(body, WSITag.ELEM_SOAP_FAULT);
-            Element detail = XMLUtils.getElement("detail", fault);
-            if (detail == null)
-            {
-              result = AssertionResult.RESULT_NOT_APPLICABLE;
-            }
-            else
-            {
-              result = AssertionResult.RESULT_PASSED;
-
-              faults = XMLUtils.getChildElements(detail);
-
-              // REMOVE: Why do the faults have to be namespaced qualified?
-              //XMLUtils.removeAllElementsWithoutNS(faults);
-
-              // if faults exist try to validate it
-              if (faults.size() > 0)
-              {
-                Map m = new HashMap();
-                WSDLUtil.expandDefinition(
-                    validator.analyzerContext
-                    .getCandidateInfo()
-                    .getWsdlDocument()
-                    .getDefinitions());
-                m.put(
-                  "definition",
-                  validator.analyzerContext
-                    .getCandidateInfo()
-                    .getWsdlDocument()
-                    .getDefinitions());
-                TypesRegistry tReg =
-                  new TypesRegistry(
-                      validator.analyzerContext
-                      .getCandidateInfo()
-                      .getWsdlDocument()
-                      .getDefinitions(),
-                      validator);
-                m.put("TypesRegistry", tReg);
-                traversal.traverse(match.getOperation(), m);
-                if (faults.size() > 0)
-                {
-                  result = AssertionResult.RESULT_WARNING;
-                  StringWriter sw = new StringWriter();
-                  for (int i = 0; i < faults.size(); i++)
-                  {
-                    try
-                    {
-                      XMLUtils.serializeElement((Element) faults.get(i), sw);
-                    }
-                    catch (Exception e)
-                    {
-                    }
-                  }
-                  try
-                  {
-                    sw.close();
-                  }
-                  catch (Exception e)
-                  {
-                  }
-                  failureDetail =
-                    this.validator.createFailureDetail(
-                      "\nFaults:\n" + sw.toString(),
-                      entryContext);
-                }
-                else
-                  result = AssertionResult.RESULT_PASSED;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1201.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1201.java
deleted file mode 100644
index 7af6934..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1201.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * BP1201.
- * The namespace of the soap:Envelope in the message has value: http://schemas.xmlsoap.org/soap/envelope/. 
- */
-public class BP1201 extends AssertionProcess implements WSITag
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1201(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    Document doc;
-    // Check if this is one way response or message is mepty or invalid
-    if (this.validator.isOneWayResponse(entryContext) ||
-      (doc = entryContext.getMessageEntryDocument()) == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      Element root = doc.getDocumentElement();
-      String ns = root.getNamespaceURI();
-      String local = root.getLocalName();
-      if (!ELEM_SOAP_ENVELOPE.getNamespaceURI().equals(ns))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = validator.createFailureDetail(
-          "Root element has namespace: " + ns, entryContext);
-      }
-
-      else if (!ELEM_SOAP_ENVELOPE.getLocalPart().equals(local))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = validator.createFailureDetail(
-          "Root element has local name: " + local, entryContext);
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1202.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1202.java
deleted file mode 100644
index a5abee1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1202.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1202. 
- * Each child element (if any) of the soap:Body element is namespace qualified (not the grandchildren).
- */
-public class BP1202 extends AssertionProcess implements WSITag
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1202(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Parse log message 
-    Document doc = entryContext.getMessageEntryDocument();
-
-    if (validator.isOneWayResponse(entryContext))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Check if there is a soap body element
-    else if (!validator.containsSoapBodyWithChild(doc))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // Get the root element
-      Element root = doc.getDocumentElement();
-
-      // Get a node list which should contain the soap:Body element
-      NodeList rootNodeList = root.getElementsByTagNameNS(
-        ELEM_SOAP_BODY.getNamespaceURI(), ELEM_SOAP_BODY.getLocalPart());
-
-      // If there is at least one soap:Body element,
-      // then make sure that each child is namespace qualified
-      if (rootNodeList.getLength() > 0)
-      {
-        // Get the soap:Body element
-        Element body = (Element) rootNodeList.item(0);
-
-        // Get the list of soap:Body child elements 
-        NodeList children = body.getChildNodes();
-
-        // Make sure that each child element is namespace qualified
-        for (int i = 0;
-          i < children.getLength() && result == AssertionResult.RESULT_PASSED;
-          ++i)
-        {
-          Node n = children.item(i);
-          if (n instanceof Element)
-          {
-            String ns = n.getNamespaceURI();
-            if (ns == null || ns.length() == 0)
-            {
-              result = AssertionResult.RESULT_FAILED;
-              failureDetail = validator.createFailureDetail(
-                entryContext.getMessageEntry().getMessage(), entryContext);
-            }
-          }
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1203.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1203.java
deleted file mode 100644
index 8470acb..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1203.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1203. 
- * The namespace of the detail element of a qualified attribute in the soap:Fault is a 
- * foreign namespace, different from "http://schemas.xmlsoap.org/soap/envelope/".
- */
-public class BP1203 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1203(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    boolean qualifiedAttributes = false;
-
-    Document doc;
-    // Check if this is one way response or message is mepty or invalid
-    if (this.validator.isOneWayResponse(entryContext)
-        || (doc = entryContext.getMessageEntryDocument()) == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // ADD: Need to determine if this check is required, since it should already be done
-      // Applicable to response messages only
-      if (entryContext
-        .getMessageEntry()
-        .getType()
-        .equalsIgnoreCase(MessageEntry.TYPE_RESPONSE))
-      {
-        // look for <soap:Fault> element:
-        NodeList faultList =
-          doc.getElementsByTagNameNS(
-            WSIConstants.NS_URI_SOAP,
-            XMLUtils.SOAP_ELEM_FAULT);
-        if ((faultList == null) || (faultList.getLength() == 0))
-        {
-          // Response does not contain a soap:Fault
-          result = AssertionResult.RESULT_NOT_APPLICABLE;
-        }
-
-        // we have a soap:Fault. 
-        else
-        {
-          try
-          {
-            // look at each soap:Fault in turn
-            for (int i = 0; i < faultList.getLength(); i++)
-            {
-              Element soapFault = (Element) faultList.item(i);
-              // find the detail element(s) if any
-              NodeList detailList =
-                soapFault.getElementsByTagName(XMLUtils.SOAP_ELEM_FAULT_DETAIL);
-              if (detailList != null)
-              {
-                // for each detail element...     				
-                for (int j = 0; j < detailList.getLength(); j++)
-                {
-                  NamedNodeMap detailAttribs =
-                    detailList.item(j).getAttributes();
-                  // check for any qualified attributes
-                  if (detailAttribs != null)
-                  {
-                    for (int k = 0; k < detailAttribs.getLength(); k++)
-                    {
-                      Attr nextAttr = (Attr) (detailAttribs.item(k));
-                      // for each qualified attribute, check that 
-                      // qname != http://schemas.xmlsoap.org/soap/envelope
-                      if (nextAttr.getNamespaceURI() != null)
-                      {
-                        qualifiedAttributes = true;
-                        if (nextAttr
-                          .getNamespaceURI()
-                          .equals(WSIConstants.NS_URI_SOAP))
-                        {
-                          // found unexpected qname
-                          throw new AssertionFailException(
-                            entryContext.getMessageEntry().getMessage());
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-
-            if (!qualifiedAttributes)
-              result = AssertionResult.RESULT_NOT_APPLICABLE;
-          }
-          catch (AssertionFailException e)
-          {
-            result = AssertionResult.RESULT_FAILED;
-            failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-          }
-        }
-      }
-      else
-      {
-        // target message is not a Response
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java
deleted file mode 100644
index 5bf480d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java
+++ /dev/null

@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1204.
- * The serialized array form in the message does not contain the 
- * soapenc:arrayType attribute.
- * 
- */
-public class BP1204 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1204(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-
-      if (this.validator.isOneWayResponse(entryContext))
-        throw new AssertionNotApplicableException();
-
-      // Parse message
-      Document doc =
-        XMLUtils.parseXML(entryContext.getMessageEntry().getMessage());
-
-      if (this.validator.isFault(doc))
-      {
-        throw new AssertionPassException();
-      }
-
-      // Parse request message
-      Document docRequest =
-        XMLUtils.parseXML(entryContext.getRequest().getMessage());
-
-      // get SOAPAction
-      String headers = entryContext.getRequest().getHTTPHeaders();
-      String action = null;
-      if (headers != null)
-        action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-
-      Binding binding = validator.analyzerContext.getCandidateInfo().getBindings()[0];
-      TypesRegistry registry =
-        new TypesRegistry(
-          this.validator.getWSDLDocument().getDefinitions(),
-          validator);
-      OperationSignature.OperationMatch match =
-        OperationSignature.matchOperation(
-          docRequest,
-          action,
-          binding,
-          registry);
-
-      if (match == null)
-        throw new AssertionPassException();
-
-      BindingOperation bindingOperation = match.getOperation();
-
-      Message operationMessage = null;
-      if (MessageEntry
-        .TYPE_REQUEST
-        .equals(entryContext.getMessageEntry().getType())
-        && (bindingOperation.getOperation().getInput() != null))
-      {
-        operationMessage =
-          bindingOperation.getOperation().getInput().getMessage();
-      }
-      else
-      {
-        if (MessageEntry
-          .TYPE_RESPONSE
-          .equals(entryContext.getMessageEntry().getType())
-          && (bindingOperation.getOperation().getOutput() != null))
-        {
-          operationMessage =
-            bindingOperation.getOperation().getOutput().getMessage();
-        }
-      }
-
-      if (operationMessage == null)
-        throw new AssertionPassException();
-
-      boolean isContainArray = false;
-
-      Collection parts = operationMessage.getParts().values();
-      for (Iterator iter = parts.iterator(); iter.hasNext();)
-      {
-        Part part = (Part) iter.next();
-
-        QName type = null;
-
-        if (part.getTypeName() == null)
-        {
-          type = registry.getType(part.getElementName());
-        }
-        else
-        {
-          type = part.getTypeName();
-        }
-
-        isContainArray =
-          registry.isExtendsArray(type)
-            || registry.isUsesWSDLArrayType(type)
-            || isArrayType(type);
-        if (isContainArray)
-          break;
-      }
-
-      if (isContainArray)
-      {
-        // Gets body
-        NodeList soapBodyList =
-          doc.getElementsByTagNameNS(
-            WSIConstants.NS_URI_SOAP,
-            XMLUtils.SOAP_ELEM_BODY);
-        if (soapBodyList.getLength() == 0 || soapBodyList.getLength() > 1)
-        {
-          throw new AssertionFailException();
-        }
-
-        Element soapBodyElem = (Element) soapBodyList.item(0);
-
-        NodeList soapBodyCildrenList =
-          soapBodyElem.getElementsByTagNameNS("*", "*");
-        for (int indexChild = 0;
-          indexChild < soapBodyCildrenList.getLength();
-          indexChild++)
-        {
-          Element elem = (Element) soapBodyCildrenList.item(indexChild);
-          if (elem
-            .hasAttributeNS(
-              WSIConstants.NS_URI_SOAP_ENCODING,
-              WSIConstants.ATTR_ARRAY_TYPE))
-          {
-            throw new AssertionFailException();
-          }
-        }
-
-        throw new AssertionPassException();
-      }
-      else
-      {
-        throw new AssertionPassException();
-      }
-
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail =
-        this.validator.createFailureDetail(
-          entryContext.getMessageEntry().getMessage(),
-          entryContext);
-    }
-    catch (AssertionPassException e)
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Checks whether type uses an array or not.
-   * @param type
-   * @return boolean
-   */
-  private boolean isArrayType(QName type)
-  {
-    boolean arrayType = false;
-
-    Element typeElement = getTypeElement(type);
-    if (typeElement != null)
-    {
-      NodeList list =
-        typeElement.getElementsByTagNameNS(
-          WSIConstants.NS_URI_XSD,
-          "sequence");
-      if (list.getLength() > 0)
-        arrayType = true;
-    }
-
-    return arrayType;
-  }
-
-  /**
-   * Gets XML element defining the type.
-   * @param type
-   * @return Element
-   */
-  private Element getTypeElement(QName type)
-  {
-    Types[] allTypes = validator.analyzerContext.getCandidateInfo().getTypes();
-    for (int i = 0; allTypes != null && i < allTypes.length; i++)
-    {
-      Element typesElement = null;
-      if (allTypes[i] != null)
-      {
-        typesElement = allTypes[i].getDocumentationElement();
-        if (typesElement == null)
-        {
-          List extList = allTypes[i].getExtensibilityElements();
-          for (Iterator iter = extList.iterator(); iter.hasNext();)
-          {
-            ExtensibilityElement extElem = (ExtensibilityElement) iter.next();
-
-            if (extElem
-              .getElementType()
-              .equals(new QName(WSIConstants.NS_URI_XSD, "schema")))
-            {
-              typesElement =
-                ((UnknownExtensibilityElement) extElem).getElement();
-              break;
-            }
-          }
-        }
-        if (typesElement != null)
-        {
-          NodeList complexTypesList =
-            typesElement.getElementsByTagNameNS(
-              WSIConstants.NS_URI_XSD,
-              "complexType");
-          for (int j = 0; j < complexTypesList.getLength(); j++)
-          {
-            Element typeElem = (Element) complexTypesList.item(j);
-            if (type.getLocalPart().equals(typeElem.getAttribute("name")))
-            {
-              return typeElem;
-            }
-          }
-
-        }
-      }
-    }
-    return null;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1208.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1208.java
deleted file mode 100644
index a26af92..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1208.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLTraversal;
-import org.w3c.dom.Document;
-import org.w3c.dom.ProcessingInstruction;
-
-
-/**
- * BP1208 NOT FULLY TESTED.
- */
-public class BP1208 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1208(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Parse log message 
-    Document doc = entryContext.getMessageEntryDocument();
-    if (doc == null) {
-      //message is empty or invalid, the assertion is not applicable
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    } else {
-
-      // Traverse document looking for processing instructions.
-      // ISSUE: this inner class needs ... revisiting/replacing
-      // EG. Do we want to list all processing instructions, 
-      // or is the first sufficient?
-      XMLTraversal traversal = new XMLTraversal()
-      {
-        public void visit(ProcessingInstruction pi)
-        {
-          try
-          {
-            result = AssertionResult.RESULT_FAILED;
-            failureDetailMessage =
-              "Target: " + pi.getTarget() + ", Data: " + pi.getData();
-          }
-          catch (Exception e)
-          {
-            // ADD: How should this exception be handled?
-          }
-
-          super.visit(pi);
-        }
-      };
-
-      traversal.visit(doc);
-
-      if (result == AssertionResult.RESULT_FAILED
-        && failureDetailMessage != null)
-      {
-        failureDetail = this.validator.createFailureDetail(failureDetailMessage, entryContext);
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1211.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1211.java
deleted file mode 100644
index 69133b8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1211.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLTags;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * BP1211.
- * 
- * Context: 
- * For a candidate message in the message log file, that is referred by a binding style RPC-literal
- * 
- * Description:
- * Part accessor elements in the message do not have an xsi:nil attribute with a value of "1" or "true".
- */
-public class BP1211 extends AssertionProcess implements XMLTags
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1211(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (validator.isOneWayResponse(entryContext))
-        throw new AssertionNotApplicableException();
-
-      // Parse message
-      Document doc = entryContext.getMessageEntryDocument();
-      Document docRequest = entryContext.getRequestDocument();
-
-      Element soapOperation = null;
-      // If there is a Fault entry or no body entries,
-      // the assertion is not applicable
-      if (validator.isFault(doc)
-        || (soapOperation = validator.getSoapBodyChild(doc)) == null)
-        throw new AssertionNotApplicableException();
-
-      // Get SOAPAction
-      String headers = entryContext.getRequest().getHTTPHeaders();
-      String action = null;
-      if (headers != null)
-        action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-
-      // Get the binding that is being processed                
-      Binding binding = validator.analyzerContext.getCandidateInfo().getBindings()[0];
-
-      //Create the types registry
-      TypesRegistry registry =
-        new TypesRegistry(
-          this.validator.getWSDLDocument().getDefinitions(),
-          validator);
-
-      // Find an operation match        
-      OperationSignature.OperationMatch match =
-        OperationSignature.matchOperation(
-          docRequest,
-          action,
-          binding,
-          registry);
-      if (match == null)
-        throw new AssertionNotApplicableException();
-
-      // Get the binding operation based on the match
-      BindingOperation bindingOperation = match.getOperation();
-
-      // If this is not rpc-literal, then return notApplicable result
-      if (!WSDLUtils
-        .isRpcLiteral(match.getOperationStyle(), bindingOperation))
-        throw new AssertionNotApplicableException();
-
-      // Going through all the accessors
-      Element accessor = XMLUtils.getFirstChild(soapOperation);
-      while (accessor != null)
-      {
-        Attr attr = XMLUtils.getAttribute(accessor, ATTR_XSI_NIL);
-        // If there is xsi:nil attribute and its value is "1" or "true"
-        // the assertion failed
-        if (attr != null
-          && (attr.getValue().equals("1") || attr.getValue().equals("true")))
-        {
-          throw new AssertionFailException("The accessor name is "
-            + accessor.getNodeName());
-        }
-        // Getting the next accessor
-        accessor = XMLUtils.getNextSibling(accessor);
-      }
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1212.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1212.java
deleted file mode 100644
index 8c1f772..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1212.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * BP1212
- *
- * <context>For a candidate non-fault envelope containing a soap:body with at least one element</context>
- * <assertionDescription>The envelope contains exactly one part accessor element for each of the wsdl:part elements bound to the envelope's corresponding soapbind:body element.</assertionDescription>
- */
-public class BP1212 extends AssertionProcess {
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1212(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (validator.isOneWayResponse(entryContext))
-        throw new AssertionNotApplicableException();
-
-      // Getting a message document
-      Document doc = entryContext.getMessageEntryDocument();
-
-      Element soapOperation = null;
-      // If there is a Fault entry or no body entries,
-      // the assertion is not applicable
-      if (validator.isFault(doc)
-        || (soapOperation = validator.getSoapBodyChild(doc)) == null)
-        throw new AssertionNotApplicableException();
-
-      // Creating a qualified name of potential SOAP operation
-      QName operationQName = new QName(
-        soapOperation.getNamespaceURI(), soapOperation.getLocalName());
-
-      // Retrieving all the RPC binding operations from wsdl:binding
-      BindingOperation[] rpcBindingOperations =
-        validator.getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC,
-          validator.analyzerContext.getCandidateInfo().getBindings());
-
-      // Retrieving binding operation by given operation name
-      BindingOperation bindingOperation = validator.getOperationMatch(
-        entryContext.getEntry().getEntryType(),
-        operationQName,
-        rpcBindingOperations);
-
-      // If there is no matched operation, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-
-      // Finding operation message parts and extensibility elems
-      // in the binding depending on message type
-      List operationMessageParts = null;
-      List extElems = null;
-      if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_REQUEST))
-      {
-        operationMessageParts = bindingOperation.getOperation()
-          .getInput().getMessage().getOrderedParts(null);
-        if (bindingOperation.getBindingInput() != null)
-          extElems =
-            bindingOperation.getBindingInput().getExtensibilityElements();
-      }
-      else
-      {
-        operationMessageParts = bindingOperation.getOperation()
-          .getOutput().getMessage().getOrderedParts(null);
-        if (bindingOperation.getBindingOutput() != null)
-          extElems =
-            bindingOperation.getBindingOutput().getExtensibilityElements();
-      }
-
-      // Getting all the accessors of the operation element
-      List accessors = XMLUtils.getChildElements(soapOperation);
-      // Getting the ordered list of wsdl:part names
-      List orderedPartNames =
-        validator.orderPartNames(operationMessageParts, extElems);
-      // Going through all the wsdl:part names
-      Iterator i = orderedPartNames.iterator();
-      while (i.hasNext())
-      {
-        String partName = (String) i.next();
-        // If there is not exactly one accessor for the part specified,
-        // the assertion failed
-        if (getPartsCount(accessors, partName) != 1)
-          throw new AssertionFailException(
-            "The name of wsdl:part is " + partName);
-      }
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Counts the amount of accessors of a specific name
-   * @param accessors a list of accessors
-   * @param name the name of accessor elements to be counted
-   * @return
-   */
-  private int getPartsCount(List accessors, String name)
-  {
-    int count = 0;
-
-    for (int i = 0; i < accessors.size(); i++)
-    {
-      Element accessor = (Element) accessors.get(i);
-      if (accessor.getLocalName().equals(name))
-        count++;
-    }
-
-    return count;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1213.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1213.java
deleted file mode 100644
index 555d846..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1213.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * BP1213
- *
- * <context>For a candidate non-fault envelope containing a soap:Body element, and is referred by a doc-literal binding</context>
- * <assertionDescription>The envelope has no element content in the soap:Body element if the value of the parts attribute of the soapbind:body is an empty string in the corresponding doc-literal description.</assertionDescription>
- */
-public class BP1213 extends AssertionProcess {
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1213(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (validator.isOneWayResponse(entryContext))
-        throw new AssertionNotApplicableException();
-
-      // Getting a message document
-      Document doc = entryContext.getMessageEntryDocument();
-
-      Element messageElement = null;
-      // If the message is empty or invalid or there is a Fault entry
-      // or there is no body entries, the assertion is not applicable
-      if (doc == null
-        || validator.isFault(doc)
-        || (messageElement = validator.getSoapBodyChild(doc)) == null)
-        throw new AssertionNotApplicableException();
-
-      // Getting a qualified name of message element
-      QName messagePartElementQName = new QName(
-        messageElement.getNamespaceURI(), messageElement.getLocalName());
-
-      // Retrieving all the document binding operations from wsdl:binding
-      BindingOperation[] docBindingOperations =
-        validator.getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC,
-          validator.analyzerContext.getCandidateInfo().getBindings());
-
-      // Retrieving binding operation by given element name
-      BindingOperation[] potentialDocLitOps =
-        validator.getDocLitOperations(
-          entryContext.getEntry().getEntryType(),
-          messagePartElementQName,
-          docBindingOperations);
-
-      // If there is not exactly one operation matched,
-      // the assertion is not applicable
-      if (potentialDocLitOps.length != 1)
-        throw new AssertionNotApplicableException();
-
-      // Finding operation extensibility elems
-      // in the binding depending on message type
-      List extElems = null;
-      if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_REQUEST)
-        && potentialDocLitOps[0].getBindingInput() != null)
-      {
-        extElems = potentialDocLitOps[0]
-          .getBindingInput().getExtensibilityElements();
-      }
-      else if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_RESPONSE)
-        && potentialDocLitOps[0].getBindingOutput() != null)
-      {
-        extElems = potentialDocLitOps[0]
-          .getBindingOutput().getExtensibilityElements();
-      }
-
-      // Getting the parts attribute from soapbind:body
-      List parts = null;
-      SOAPBody soapBody = validator.getSOAPBody(extElems);
-      if (soapBody != null)
-        parts = soapBody.getParts();
-
-      // if the parts attribute is an empty string and there is
-      // at least one accessor, the assertion failed
-      if (parts != null && parts.isEmpty()
-        && !XMLUtils.getChildElements(messageElement).isEmpty())
-        throw new AssertionFailException("wsdl:operation name is "
-          + potentialDocLitOps[0].getName());
-
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1214.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1214.java
deleted file mode 100644
index ada1346..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1214.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * BP1214
- *
- * <context>For a candidate non-fault envelope containing a soap:Body element, and is referred by a rpc-literal binding</context>
- * <assertionDescription>The envelope does not contain any part accessor elements if the value of the parts attribute of the soapbind:body is an empty string in the corresponding rpc-literal description.</assertionDescription>
- */
-public class BP1214 extends AssertionProcess {
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1214(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (validator.isOneWayResponse(entryContext))
-        throw new AssertionNotApplicableException();
-
-      // Getting a message document
-      Document doc = entryContext.getMessageEntryDocument();
-
-      Element soapOperation = null;
-      // If there is a Fault entry or no body entries,
-      // the assertion is not applicable
-      if (validator.isFault(doc)
-        || (soapOperation = validator.getSoapBodyChild(doc)) == null)
-        throw new AssertionNotApplicableException();
-
-      // Creating a qualified name of potential SOAP operation
-      QName operationQName = new QName(
-        soapOperation.getNamespaceURI(), soapOperation.getLocalName());
-
-      // Retrieving all the RPC binding operations from wsdl:binding
-      BindingOperation[] rpcBindingOperations =
-        validator.getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC,
-          validator.analyzerContext.getCandidateInfo().getBindings());
-
-      // Retrieving binding operation by given operation name
-      BindingOperation bindingOperation = validator.getOperationMatch(
-        entryContext.getEntry().getEntryType(),
-        operationQName,
-        rpcBindingOperations);
-
-      // If there is no matched operation, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-
-      // Finding operation extensibility elems
-      // in the binding depending on message type
-      List extElems = null;
-      if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_REQUEST)
-        && bindingOperation.getBindingInput() != null)
-      {
-        extElems =
-          bindingOperation.getBindingInput().getExtensibilityElements();
-      }
-      else if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_RESPONSE)
-        && bindingOperation.getBindingOutput() != null)
-      {
-        extElems =
-          bindingOperation.getBindingOutput().getExtensibilityElements();
-      }
-
-      // If the message is not literal, the assertion is not applicable
-      if (!validator.isLiteral(extElems))
-        throw new AssertionNotApplicableException();
-
-      // Getting the parts attribute from soapbind:body
-      List parts = null;
-      SOAPBody soapBody = validator.getSOAPBody(extElems);
-      if (soapBody != null)
-        parts = soapBody.getParts();
-
-      // if the parts attribute is an empty string and there is
-      // at least one accessor, the assertion failed
-      if (parts != null && parts.isEmpty()
-        && !XMLUtils.getChildElements(soapOperation).isEmpty())
-        throw new AssertionFailException("wsdl:operation name is "
-          + bindingOperation.getName());
-
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1301.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1301.java
deleted file mode 100644
index 92a20c7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1301.java
+++ /dev/null

@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1301.
- */
-public class BP1301 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1301(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    //Get the requets message and check the value of mustUnderstand.
-    String message = entryContext.getMessageEntry().getMessage();
-    Object[] mustUnderstandAttributes = getMustUnderstandAttributes(message);
-
-    if (mustUnderstandAttributes == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      for (int index = 0; index < mustUnderstandAttributes.length; index++)
-      {
-        if ((mustUnderstandAttributes[index] != null)
-          && (mustUnderstandAttributes[index].equals("1")
-            || mustUnderstandAttributes[index].equals("0")))
-        {
-          result = AssertionResult.RESULT_PASSED;
-        }
-        else
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail =
-            this.validator.createFailureDetail(
-              "The SOAP mustUnderstand attribute was present "
-                + " and its value was  "
-                + mustUnderstandAttributes[index],
-              entryContext);
-        } //End if
-      } //End for
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  //Retreives the value of the mustUnderstand attribute from ALL SOAP header
-  //If the Header is missing or if it does not contain any targets or if
-  //the header does not contain a mustUnderstand attribute then set the
-  //assertionResult to RESULT_NOT_APPLICABLE.
-  private Object[] getMustUnderstandAttributes(String message)
-    throws WSIException
-  {
-    if (message == null || message.trim().equals("")) {
-      return null;
-    }
-
-    Document doc = XMLUtils.parseXML(message);
-    NodeList headers =
-      doc.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Header");
-
-    //If a header not present set result to notApplicable
-    //else process each headerEntry
-    if (headers.getLength() <= 0)
-    {
-      return null;
-    }
-    else
-    {
-      Vector mustUnderstandAttributes = new Vector();
-      Element header = (Element) headers.item(0);
-      if (header == null)
-        return null;
-
-      NodeList headerEntries = header.getChildNodes();
-      //For each header entry check retreive the mustUnderstand attribute 
-      //if any, else set the test result to notApplicable
-
-      //This is used to indicate if a header contained any child Elements
-      boolean headerTargets = false;
-
-      for (int index = 0; index < headerEntries.getLength(); ++index)
-      {
-        Node headerEntry = headerEntries.item(index);
-        if (headerEntry.getNodeType() == Node.ELEMENT_NODE)
-        {
-          headerTargets = true;
-          Attr mustUnderstand =
-            ((Element) headerEntry).getAttributeNodeNS(
-              WSIConstants.NS_URI_SOAP,
-              "mustUnderstand");
-          //Retreive the value of the mustUnderstand attribute of the request.
-          if (mustUnderstand != null)
-          {
-            String mustUnderstandValue = mustUnderstand.getNodeValue();
-            mustUnderstandAttributes.add(mustUnderstandValue);
-          }
-          else
-          {
-            result = AssertionResult.RESULT_NOT_APPLICABLE;
-            //The SOAP Header does not contain a mustUnderstand attribute."
-          } //	mustUnderstand != null
-        }
-      } //End for
-
-      if (!headerTargets)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-        //The SOAP Header does not contain any header entries.
-      }
-
-      return mustUnderstandAttributes.toArray();
-    } //End If headers.getLength() < 0	
-  }
-
-  /**
-   * Returns true if this object is must understand fault code.
-   * @param faultCodeElem understand fault code.
-   * @return true if this object is must understand fault code.
-   */
-  public boolean isMustUnderstandFaultCode(Element faultCodeElem)
-  {
-    //A faultcode may or maynot have a prefix, if it does its namespace should be 
-    //htt://schemas.xmlsoap.org/soap/envelope which is the same as the faultcode element.
-    //If a prefix is present and it corresponds to a different namespace or is null 
-    //then this returns false.  The local part of the faultcode is then check to see
-    //if it is one of the permitted values.
-    if (faultCodeElem == null)
-      return false;
-
-    String faultCode = faultCodeElem.getFirstChild().getNodeValue().trim();
-    if (faultCode == null)
-      return false;
-
-    String faultCodeElemPrefix = faultCodeElem.getPrefix();
-    String faultCodePrefix = faultCode.substring(0, faultCode.indexOf(':'));
-    String faultCodeName =
-      faultCode.substring(faultCode.indexOf(':') + 1, faultCode.length());
-
-    if ((faultCodeElemPrefix != null || faultCodePrefix != null))
-    {
-      if (faultCodePrefix.equals(faultCodeElemPrefix)
-        && (faultCodeName.equals("MustUnderstand")
-          || faultCodeName.startsWith("MustUnderstand.")))
-        return true;
-      else
-        return false;
-    }
-    else
-    {
-      if (faultCode.equals("MustUnderstand")
-        || faultCodeName.startsWith("MustUnderstand."))
-        return true;
-      else
-        return false;
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1302.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1302.java
deleted file mode 100644
index 63acd56..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1302.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
-   * BP1302.
-   * The soap:faultcode value in the soap:Fault element of the response 
-   * message is not custom, and is one of: VersionMismatch, MustUnderstand, Client, Server.
-   */
-public class BP1302 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1302(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  //SOAP fault code values should not be custom: only standard code qualifiers 
-  //are used: VersionMismatch, MustUnderstand, Client, Server
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    //String requestMessage = null;
-    String responseMessage = null;
-
-    if (this.validator.isOneWayResponse(entryContext))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      //Get the response message check the faultcode.
-      MessageEntry logEntryResponse = entryContext.getResponse();
-      if (logEntryResponse != null)
-      {
-        responseMessage = logEntryResponse.getMessage();
-
-        Document targetDoc = XMLUtils.parseXML(responseMessage);
-        NodeList faultCodes = targetDoc.getElementsByTagName("faultcode");
-        //                    targetDoc.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "faultcode");
-
-        if (faultCodes.getLength() <= 0)
-          result = AssertionResult.RESULT_NOT_APPLICABLE;
-        //No faultcode	
-
-        for (int i = 0; i < faultCodes.getLength(); i++)
-        {
-          Node faultCodeElem = faultCodes.item(i);
-          //If the faultcode was MustUnderstand, check the value of 
-          //the mustUnderstand attribute in the request.
-          if (faultCodeElem == null)
-            result = AssertionResult.RESULT_NOT_APPLICABLE;
-          else if (faultCodeElem.getNodeType() == Node.ELEMENT_NODE)
-          {
-            if (isValidFaultCode((Element) faultCodeElem))
-            {
-              result = AssertionResult.RESULT_PASSED;
-            }
-            else
-            {
-              result = AssertionResult.RESULT_WARNING;
-              failureDetail =
-                this.validator.createFailureDetail(responseMessage, entryContext);
-              //failureDetail =
-              //    "The faultcode value was : "
-              //        + faultCodeElem.getFirstChild().getNodeValue().trim();
-            } //End if (faultCode.equals...)
-          }
-          else
-          {
-            result = AssertionResult.RESULT_NOT_APPLICABLE;
-          }
-        } //End for	
-      } //End if logEntryResponse!= null
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Check faultCode.
-   * @param faultCodeElem a faultcode.
-   * @return true if faultcode is valid.
-   */
-  public boolean isValidFaultCode(Element faultCodeElem)
-  {
-    //A faultcode may or maynot have a prefix, if it does its namespace should be 
-    //http://schemas.xmlsoap.org/soap/envelope which is the same as the faultcode element.
-    //If a prefix is present and it corresponds to a different namespace or is null 
-    //then this returns false.  The local part of the faultcode is then check to see
-    //if it is one of the permitted values.
-    if (faultCodeElem == null)
-      return true;
-
-    String faultCode = faultCodeElem.getFirstChild().getNodeValue().trim();
-    if (faultCode == null)
-      return false;
-
-    // FIX: This is not correct, since this element can not be namespace qualified
-    String faultCodeElemPrefix = faultCodeElem.getParentNode().getPrefix();
-
-    // If this is not a QName then return false
-    int index;
-    String faultCodePrefix = null;
-    String faultCodeName = faultCode;
-    if ((index = faultCode.indexOf(':')) != -1)
-    {
-      faultCodePrefix = faultCode.substring(0, index);
-      faultCodeName = faultCode.substring(index + 1, faultCode.length());
-    }
-
-    if ((faultCodeElemPrefix != null && faultCodePrefix != null))
-    {
-      if (faultCodePrefix.equals(faultCodeElemPrefix))
-      {
-        if ((faultCodeName.equals("MustUnderstand")
-          || faultCodeName.equals("VersionMismatch")
-          || faultCodeName.equals("Client")
-          || faultCodeName.equals("Server")))
-          /* REMOVE:
-          || faultCodeName.startsWith("MustUnderstand.")
-          || faultCodeName.startsWith("VersionMismatch.")
-          || faultCodeName.startsWith("Client.")
-          || faultCodeName.startsWith("Server.")))
-          */
-          return true;
-        else
-          return false;
-      }
-      else
-      {
-        return true;
-      }
-    }
-    else
-    {
-      if (faultCodeName.equals("MustUnderstand")
-        || faultCodeName.equals("VersionMismatch")
-        || faultCodeName.equals("Client")
-        || faultCodeName.equals("Server")
-        || faultCodeName.startsWith("MustUnderstand.")
-        || faultCodeName.startsWith("VersionMismatch.")
-        || faultCodeName.startsWith("Client.")
-        || faultCodeName.startsWith("Server."))
-        return true;
-      else
-        return false;
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1305.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1305.java
deleted file mode 100644
index 1c7976f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1305.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.net.HttpURLConnection;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-
-/**
-   * BP1305.
-   * It is in an HTTP 500 message with "Server" Error code.
-   */
-public class BP1305 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1305(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    Document doc;
-    // Check if this is one way response
-    // or message is mepty or invalid
-    if (this.validator.isOneWayResponse(entryContext)
-      || (doc = entryContext.getMessageEntryDocument()) == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // look for <soap:Fault> element:
-      NodeList faultList =
-        doc.getElementsByTagNameNS(
-          WSIConstants.NS_URI_SOAP,
-          XMLUtils.SOAP_ELEM_FAULT);
-      if ((faultList == null) || (faultList.getLength() == 0))
-      {
-        // Response does not contain a soap:fault
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        // we have a soap:Fault. Check that it is contained in a HTTP 500 message
-        // GT : base HTTP Header parsing on BP1001 - this should be factored to a 
-        // general-purpose HTTP message parsing method or methods (request & response)
-        String httpHeader = entryContext.getMessageEntry().getHTTPHeaders();
-        //Response-Line   = HTTP-Version ResponseCode ResponseMsg SP CRLF
-        Vector responseLine = new Vector();
-        String startLine = null;
-        //String httpVersion = null;
-        //String responseCode = null;
-        String statusCode = null;
-        StringTokenizer httpMessageTokenizer =
-          new StringTokenizer(httpHeader, "\n\r\f");
-
-        if (httpMessageTokenizer.hasMoreTokens())
-          startLine = httpMessageTokenizer.nextToken();
-
-        if (startLine.startsWith("HTTP"))
-        {
-          StringTokenizer startLineTokenizer =
-            new StringTokenizer(startLine, "\u0020");
-
-          while (startLineTokenizer.hasMoreTokens())
-          {
-            responseLine.add(startLineTokenizer.nextToken());
-          }
-
-          //httpVersion = (String) responseLine.get(0);
-
-          // PB: Check for 500 status code which should be the second token in the string
-          statusCode = (String) responseLine.get(1);
-
-          //responseCode = (String) responseLine.get(1);
-          //statusCode = (String) responseLine.get(2);
-        }
-        try
-        {
-          // PB: Just check for 500 status code
-          if (!statusCode
-            .equals(String.valueOf(HttpURLConnection.HTTP_INTERNAL_ERROR)))
-          {
-            //if (!responseCode.equalsIgnoreCase("OK") ||
-            //	(!statusCode.equalsIgnoreCase("ServerError"))) {     			
-            // Assertion failed
-            throw new AssertionFailException(httpHeader);
-          }
-        }
-        catch (AssertionFailException e)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1306.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1306.java
deleted file mode 100644
index 13e40ed..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1306.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
-   * BP1306.
-   * The soap:Fault element does not have children other than soap:faultcode, soap:faultstring, soap:faultactor or soap:detail.
-   */
-public class BP1306 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1306(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    Document doc;
-    // Check if this is one way response
-    // or message is mepty or invalid
-    if (this.validator.isOneWayResponse(entryContext)
- 	    || (doc = entryContext.getMessageEntryDocument()) == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // look for <soap:Fault> element:
-      NodeList faultList =
-        doc.getElementsByTagNameNS(
-          WSIConstants.NS_URI_SOAP,
-          XMLUtils.SOAP_ELEM_FAULT);
-      if ((faultList == null) || (faultList.getLength() == 0))
-      {
-        // Response does not contain a soap:fault
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        // check that no soap:fault contains only faultcode, faultstring, faultactor, detail.
-        // If it does, further check that it is unqualified.
-        // For each <soap:Fault>
-        try
-        {
-          for (int n = 0; n < faultList.getLength(); n++)
-          {
-            for (Node child = faultList.item(n).getFirstChild();
-              child != null;
-              child = child.getNextSibling())
-            {
-              if ((child.getNodeType() == Node.ELEMENT_NODE)
-                && !(child
-                  .getLocalName()
-                  .equalsIgnoreCase(XMLUtils.SOAP_ELEM_FAULT_CODE)
-                  || child.getLocalName().equalsIgnoreCase(
-                    XMLUtils.SOAP_ELEM_FAULT_STRING)
-                  || child.getLocalName().equalsIgnoreCase(
-                    XMLUtils.SOAP_ELEM_FAULT_ACTOR)
-                  || child.getLocalName().equalsIgnoreCase(
-                    XMLUtils.SOAP_ELEM_FAULT_DETAIL)))
-              {
-                // PB: This is checked in 1316 now
-                //|| (child.getNamespaceURI() != null)) {
-                // Assertion failed
-                throw new AssertionFailException(
-                  entryContext.getMessageEntry().getMessage());
-              }
-            }
-          }
-        }
-        catch (AssertionFailException e)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1307.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1307.java
deleted file mode 100644
index f66dd61..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1307.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1307.
- * The elements of the message that are namespaced 
- * "http://schemas.xmlsoap.org/soap/envelope/" do not have a soap:encodingStyle attribute.
- */
-public class BP1307 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1307(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    Document doc;
-    // Check if this is one way response
-    // or message is mepty or invalid
-    if (this.validator.isOneWayResponse(entryContext)
-      || (doc = entryContext.getMessageEntryDocument()) == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // look for <soap:xxx> elements:
-      NodeList soapList =
-        doc.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "*");
-      if ((soapList == null) || (soapList.getLength() == 0))
-      {
-        // Response does not contain any soap envelope elements
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        // check that no <soap:xxx> elements contains a soap:encodingStyle attribute
-        // For each <soap:xxx>
-        try
-        {
-          for (int n = 0; n < soapList.getLength(); n++)
-          {
-            Element nextElem = (Element) soapList.item(n);
-            if (nextElem
-              .getAttributeNodeNS(WSIConstants.NS_URI_SOAP, "encodingStyle")
-              != null)
-            {
-              // Assertion failed
-              throw new AssertionFailException(
-                entryContext.getMessageEntry().getMessage());
-            }
-          }
-        }
-        catch (AssertionFailException e)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1308.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1308.java
deleted file mode 100644
index ecc0a6f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1308.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1308.
- * The children elements of soap:Body do not have a soap:encodingStyle attribute.
- */
-public class BP1308 extends AssertionProcess implements WSITag
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1308(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // Getting a message document
-      Document doc = entryContext.getMessageEntryDocument();
-      // If the message is empty or invalid, the assertion is not applicable
-      if (doc == null)
-        throw new AssertionNotApplicableException();
-
-      // look for soap:Body elements:
-      NodeList soapBodyList = doc.getElementsByTagNameNS(
-        ELEM_SOAP_BODY.getNamespaceURI(), ELEM_SOAP_BODY.getLocalPart());
-
-      // The message does not contain any soap:Body, the assertion is not applicable
-      if ((soapBodyList == null) || (soapBodyList.getLength() == 0))
-        throw new AssertionNotApplicableException();
-
-      // check that no soap:Body child elements contain a soap:encodingStyle attribute
-      // Getting the first soap:Body child element
-      Element child =
-        XMLUtils.getFirstChild((Element) soapBodyList.item(0));
-      while (child != null)
-      {
-        if (child.getAttributeNodeNS(
-          ELEM_SOAP_BODY.getNamespaceURI(), "encodingStyle") != null)
-        {
-          throw new AssertionFailException("The child element name is \"" +
-            child.getNodeName() + "\".");
-        }
-        // Getting the next soap:Body child element
-        child = XMLUtils.getNextSibling(child);
-      }
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1309.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1309.java
deleted file mode 100644
index fb3b6a4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1309.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1309.
- * The soap:Envelope does not have direct children after the soap:Body element 
- */
-public class BP1309 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1309(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    Document doc;
-    // Check if this is one way response
-    // or message is mepty or invalid
-    if (this.validator.isOneWayResponse(entryContext)
-      || (doc = entryContext.getMessageEntryDocument()) == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // look for <soap:Envelope> elements:
-      // (Note: since this is a Soap message we expect exactly one soap envelope, but we do not assume it).
-      NodeList soapEnvList =
-        doc.getElementsByTagNameNS(
-          WSIConstants.NS_URI_SOAP,
-          XMLUtils.SOAP_ELEM_ENVELOPE);
-      if ((soapEnvList == null) || (soapEnvList.getLength() == 0))
-      {
-        // Response does not contain any soap Envelope element(s)
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        // check that if a <soap:Body> exists in a <soap:Envelope>, that its the last in the envelope        		      		
-        try
-        {
-          // For each <soap:Envelope>
-          for (int n = 0; n < soapEnvList.getLength(); n++)
-          {
-            // Get the list of all elements in the Envelope       				
-            Element soapEnv = (Element) soapEnvList.item(n);
-            NodeList envChildList = soapEnv.getChildNodes();
-            Vector envChildElemList = new Vector();
-            for (int v = 0; v < envChildList.getLength(); v++)
-            {
-              Node nextNode = envChildList.item(v);
-              if (nextNode.getNodeType() == Node.ELEMENT_NODE)
-              {
-                envChildElemList.addElement((Element) nextNode);
-              }
-            }
-            // Search the list for <soap:Body>
-            for (int m = 0; m < envChildElemList.size(); m++)
-            {
-              Element envChildElem = (Element) envChildElemList.elementAt(m);
-              if (envChildElem
-                .getNamespaceURI()
-                .equals(WSIConstants.NS_URI_SOAP)
-                && envChildElem.getLocalName().equals(XMLUtils.SOAP_ELEM_BODY))
-              {
-                // found a <soap:Body> so check its the last in the list of child elements of the Envelope
-                if (envChildElem != envChildElemList.lastElement())
-                {
-                  throw new AssertionFailException(
-                    entryContext.getMessageEntry().getMessage());
-                }
-              }
-            }
-          }
-        }
-        catch (AssertionFailException e)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1316.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1316.java
deleted file mode 100644
index f84182f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1316.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BP1316.
- * The soap:Fault element children (soap:faultcode, soap:faultstring, soap:faultactor or soap:detail) are unqualified.
- */
-public class BP1316 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1316(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    Document doc;
-    // Check if this is one way response
-    // or message is mepty or invalid
-    if (this.validator.isOneWayResponse(entryContext)
-      || (doc = entryContext.getMessageEntryDocument()) == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // look for <soap:Fault> element:
-      NodeList faultList =
-        doc.getElementsByTagNameNS(
-          WSIConstants.NS_URI_SOAP,
-          XMLUtils.SOAP_ELEM_FAULT);
-      if ((faultList == null) || (faultList.getLength() == 0))
-      {
-        // Response does not contain a soap:fault
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        // check that no soap:fault contains only faultcode, faultstring, faultactor, detail.
-        // If it does, further check that it is unqualified.
-        // For each <soap:Fault>
-        try
-        {
-          for (int n = 0; n < faultList.getLength(); n++)
-          {
-            for (Node child = faultList.item(n).getFirstChild();
-              child != null;
-              child = child.getNextSibling())
-            {
-              if ((child.getNodeType() == Node.ELEMENT_NODE)
-                && (child
-                  .getLocalName()
-                  .equalsIgnoreCase(XMLUtils.SOAP_ELEM_FAULT_CODE)
-                  || child.getLocalName().equalsIgnoreCase(
-                    XMLUtils.SOAP_ELEM_FAULT_STRING)
-                  || child.getLocalName().equalsIgnoreCase(
-                    XMLUtils.SOAP_ELEM_FAULT_ACTOR)
-                  || child.getLocalName().equalsIgnoreCase(
-                    XMLUtils.SOAP_ELEM_FAULT_DETAIL))
-                && (child.getNamespaceURI() != null))
-              {
-                // Assertion failed
-                throw new AssertionFailException(
-                  entryContext.getMessageEntry().getMessage());
-              }
-            }
-          }
-        }
-        catch (AssertionFailException e)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1318.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1318.java
deleted file mode 100644
index a180801..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1318.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
-	 * BP1318
-	 * 
-	 * The grandchildren elements of soap:Body do not have a soap:encodingStyle attribute.
-	 */
-public class BP1318 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1318(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (this.validator.isOneWayResponse(entryContext))
-        throw new AssertionNotApplicableException();
-
-      // Parse message
-      Document responseDoc = entryContext.getMessageEntryDocument();
-      Document requestDoc = entryContext.getRequestDocument();
-
-      // messages are empty or invalid, DOM objects are null
-      if (responseDoc == null || requestDoc == null) {
-        throw new AssertionNotApplicableException();
-      }
-
-      //if (isFault(responseDoc))
-      //  throw new AssertionNotApplicableException();
-
-      // Get SOAPAction
-      String headers = entryContext.getRequest().getHTTPHeaders();
-      String action = null;
-      if (headers != null)
-        action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-
-      // Get the binding that is being processed                
-      Binding binding = validator.analyzerContext.getCandidateInfo().getBindings()[0];
-
-      //Create the types registry
-      TypesRegistry registry =
-        new TypesRegistry(
-          this.validator.getWSDLDocument().getDefinitions(),
-          validator);
-
-      // Find an operation match        
-      OperationSignature.OperationMatch match =
-        OperationSignature.matchOperation(
-          requestDoc,
-          action,
-          binding,
-          registry);
-      if (match == null)
-        throw new AssertionNotApplicableException();
-
-      // Get the binding operation based on the match
-      BindingOperation bindingOperation = match.getOperation();
-
-      // If this is not rpc-literal, then return notApplicable result
-      if (!WSDLUtils
-        .isRpcLiteral(match.getOperationStyle(), bindingOperation))
-      {
-        throw new AssertionNotApplicableException();
-      }
-      // look for <soap:Body> elements:
-      NodeList soapBodyList =
-        responseDoc.getElementsByTagNameNS(
-          WSIConstants.NS_URI_SOAP,
-          XMLUtils.SOAP_ELEM_BODY);
-      if ((soapBodyList == null) || (soapBodyList.getLength() == 0))
-        // Response does not contain any soap Body elements
-        throw new AssertionNotApplicableException();
-
-      // check that no <soap:Body> child or grandchild elements contains a soap:encodingStyle attribute
-      // For each <soap:Body>
-      boolean grandChildFound = false;
-      for (int n = 0; n < soapBodyList.getLength(); n++)
-      {
-        Element nextBodyElem = (Element) soapBodyList.item(n);
-        // REMOVE: This will get all nodes (child, grandchildren, etc.)
-        //NodeList childList = nextBodyElem.getElementsByTagName("*");
-        NodeList childList = nextBodyElem.getChildNodes();
-        if (childList != null)
-        {
-          // check all child elements
-          for (int m = 0; m < childList.getLength(); m++)
-          {
-            if (childList.item(m).getNodeType() == Node.ELEMENT_NODE)
-            {
-              Element nextChildElem = (Element) childList.item(m);
-              // check children of this child
-              // REMOVE: This will get all nodes (child, grandchildren, etc.)
-              NodeList grandChildList = nextChildElem.getChildNodes();
-              if (grandChildList != null)
-              {
-                for (int p = 0; p < grandChildList.getLength(); p++)
-                {
-                  if (grandChildList.item(p).getNodeType()
-                    == Node.ELEMENT_NODE)
-                  {
-                  	grandChildFound = true;
-                    Element nextGrandChildElem =
-                      (Element) grandChildList.item(p);
-                    if (nextGrandChildElem
-                      .getAttributeNodeNS(
-                        WSIConstants.NS_URI_SOAP,
-                        "encodingStyle")
-                      != null)
-                    {
-                      // Assertion failed (ADD highlight the child here ?)
-                      throw new AssertionFailException(
-                        entryContext.getMessageEntry().getMessage());
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      if (!grandChildFound)
-      {
-      	throw new AssertionNotApplicableException();
-      }
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1600.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1600.java
deleted file mode 100644
index e28c5b8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1600.java
+++ /dev/null

@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-
-/**
- * BP1600
- *
- * <context>For a candidate envelope</context>
- * <assertionDescription>The envelope conforms to the structure specified in SOAP 1.1 Section 4.</assertionDescription>
- */
-public class BP1600 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1600(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // Getting a message document
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // If the message is empty or invalid, the assertion failed
-      if (doc == null)
-      {
-      	if (this.validator.isOneWayResponse(entryContext))
-      		throw new AssertionNotApplicableException();
-        else 
-        	throw new AssertionFailException("The log message is empty or invalid.");
-      }
-      // SOAP 1.1 specifications, Section 4.
-      // http://www.w3.org/TR/2000/NOTE-SOAP-20000508/#_Toc478383494
-
-      // The namespace identifier for the elements and attributes defined
-      // in this section is "http://schemas.xmlsoap.org/soap/envelope/".
-
-      //  o The Envelope is the top element of the XML document representing the message.
-
-      // Rule 1. Envelope
-      //  o The element name is "Envelope".
-      //  o The element MUST be present in a SOAP message
-      //  o The element MAY contain namespace declarations as well as additional attributes.
-      //    If present, such additional attributes MUST be namespace-qualified. Similarly,
-      //    the element MAY contain additional sub elements. If present these elements
-      //    MUST be namespace-qualified and MUST follow the SOAP Body element.
-
-      // Getting the top element
-      Element element = doc.getDocumentElement();
-
-      // Assuming that the top element should be soap:Envelope
-      // If not, the assertion failed
-      if (!element.getLocalName().equals(XMLUtils.SOAP_ELEM_ENVELOPE)
-        || !isSOAPNamespace(element.getNamespaceURI()))
-        throw new AssertionFailException("The top element is not soap:Envelope");
-
-      // Collecting all the namespace declarations
-      Collection envelopeNamespaces = collectNamespaces(element.getAttributes());
-      envelopeNamespaces.add(WSIConstants.NS_URI_XMLNS);
-
-      // Getting an attribute that is not in any of the namespaces
-      Attr notValidAttr = getNotValidAttr(
-        element.getAttributes(),
-        envelopeNamespaces);
-
-      // If found one, the assertion failed
-      if (notValidAttr != null)
-        throw new AssertionFailException("The attribute "
-          + notValidAttr.getNodeName() + " is not namespace-qualified");
-
-
-      // Rule 2. Header 
-      //  o The element name is "Header".
-      //  o The element MAY be present in a SOAP message. If present, the element
-      //    MUST be the first immediate child element of a SOAP Envelope element.
-      //  o The element MAY contain a set of header entries each being an immediate
-      //    child element of the SOAP Header element. All immediate child elements
-      //    of the SOAP Header element MUST be namespace-qualified.
-
-      // Getting the first sub element of the envelope
-      element = XMLUtils.getFirstChild(element);
-
-      // If the child is soap:Header
-      if (element != null
-        && element.getLocalName().equals(XMLUtils.SOAP_ELEM_HEADER)
-        && isSOAPNamespace(element.getNamespaceURI()))
-      {
-
-        // Going through all the Header entries
-        Element headerEntry = XMLUtils.getFirstChild(element);
-        while (headerEntry != null)
-        {
-          // Collecting all the namespaces for the current entry
-          Collection headerEntryNamespaces = collectNamespaces(
-            headerEntry.getAttributes());
-
-          // If the entry is not in the namespaces, the assertion failed
-          if (!envelopeNamespaces.contains(headerEntry.getNamespaceURI())
-            && !headerEntryNamespaces.contains(headerEntry.getNamespaceURI()))
-            throw new AssertionFailException("The header entry "
-              + headerEntry.getNodeName() + " is not namespace-qualified");
-
-          // Getting the next Header entry
-          headerEntry = XMLUtils.getNextSibling(headerEntry);
-        }
-
-        // Getting the next sub element of the envelope
-        element = XMLUtils.getNextSibling(element);
-      }
-
-
-      // Rule 3. Body
-      //  o The element name is "Body".
-      //  o The element MUST be present in a SOAP message and MUST be an immediate
-      //    child element of a SOAP Envelope element. It MUST directly follow the
-      //    SOAP Header element if present. Otherwise it MUST be the first immediate
-      //    child element of the SOAP Envelope element.
-      //  o The element MAY contain a set of body entries each being an immediate
-      //    child element of the SOAP Body element. Immediate child elements of the
-      //    SOAP Body element MAY be namespace-qualified. SOAP defines the SOAP Fault
-      //    element, which is used to indicate error messages.
-
-      // if the SOAP Body element is not presented, the assertion failed
-      if (element == null
-        || !element.getLocalName().equals(XMLUtils.SOAP_ELEM_BODY)
-        || !isSOAPNamespace(element.getNamespaceURI()))
-        throw new AssertionFailException("The soap:Body element is not presented "
-          + "or follows an additional sub element of soap:Envelope");
-
-      // Processing all other sub elements of the envelope
-      element = XMLUtils.getNextSibling(element);
-      while (element != null)
-      {
-        // Checking for the SOAP Header element
-        if (element.getLocalName().equals(XMLUtils.SOAP_ELEM_HEADER)
-          && isSOAPNamespace(element.getNamespaceURI()))
-            throw new AssertionFailException(
-              "The soap:Header element cannot follow the soap:Body element");
-
-        // Collecting all the namespaces for the current element
-        Collection elementNamespaces = collectNamespaces(
-          element.getAttributes());
-
-        // If the element is not in the namespaces, the assertion failed
-        if (!envelopeNamespaces.contains(element.getNamespaceURI())
-          && !elementNamespaces.contains(element.getNamespaceURI()))
-          throw new AssertionFailException("The sub envelope element "
-            + element.getNodeName() + " is not namespace-qualified");
-
-        // Getting the next sub element of the envelope
-        element = XMLUtils.getNextSibling(element);
-      }
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    catch (AssertionNotApplicableException anae)
-	{
-	  result = AssertionResult.RESULT_NOT_APPLICABLE;
-	}
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Collects all the namespace declarations from attributes collection
-   * @param attrs an attributes collection
-   * @return a collection of namespaces
-   */
-  private Collection collectNamespaces(NamedNodeMap attrs)
-  {
-    Collection ns = new HashSet();
-    if (attrs != null)
-    {
-      for(int i = 0; i < attrs.getLength(); i++)
-      {
-        Attr attr = (Attr) attrs.item(i);
-        if (attr.getNamespaceURI() != null
-          && attr.getNamespaceURI().equals(WSIConstants.NS_URI_XMLNS))
-          ns.add(attr.getValue());
-      }
-    }
-
-    return ns;
-  }
-
-  /**
-   * Retrieves an attribute that is not in namespaces
-   * @param attrs an attributes collection
-   * @param ns a namespaces collection
-   * @return an attribtue that is not in any of the namespaces specified
-   */
-  private Attr getNotValidAttr(NamedNodeMap attrs, Collection ns)
-  {
-    Attr ret = null;
-    if (attrs != null)
-    {
-      for(int i = 0; i < attrs.getLength(); i++)
-      {
-        Attr attr = (Attr) attrs.item(i);
-        if (attr.getNamespaceURI() == null
-          || !ns.contains(attr.getNamespaceURI()))
-        {
-          ret = attr;
-          break;
-        }
-      }
-    }
-    return ret;
-  }
-
-  /**
-   * Qualifies whether a namespace is the SOAP namespace
-   * "http://schemas.xmlsoap.org/soap/envelope/"
-   * @param ns a namespace to be qualified
-   * @return true if the namespace is qualified, false otherwise
-   */
-  private boolean isSOAPNamespace(String ns)
-  {
-    if (ns == null)
-      return false;
-
-    return ns.equals(WSIConstants.NS_URI_SOAP);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1601.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1601.java
deleted file mode 100644
index 78e7c45..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1601.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.xml.sax.SAXException;
-
-
-/**
- * BP1601.
- */
-public class BP1601 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1601(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // One-way responses will not contain a SOAP message
-    if (this.validator.isOneWayResponse(entryContext))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      try
-      {
-        // Try to parse the SOAP message
-        //Document doc = XMLUtils.parseXML(entryContext.getMessageEntry().getMessage());
-        XMLUtils.parseXML(entryContext.getMessageEntry().getMessage());
-      }
-      catch (WSIException e)
-      {
-        if (e.getTargetException() instanceof SAXException)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail =
-            this.validator.createFailureDetail(
-              e.getTargetException().getMessage(),
-              entryContext);
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1701.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1701.java
deleted file mode 100644
index cca1c89..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1701.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import com.ibm.wsdl.util.xml.DOM2Writer;
-
-
-/**
- * BP1701.
- */
-public class BP1701 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1701(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    if (this.validator.isOneWayResponse(entryContext))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      try
-      {
-        // TEMP: Use local copy of schema for now
-        // Document doc = XMLUtils.parseXML(entryContext.getLogEntry().getMessage(), WSIConstants.NS_URI_SOAP);
-        // Document doc = XMLUtils.parseXML(entryContext.getLogEntry().getMessage(), "schemas/soapEnvelope.xsd");
-
-        // Get a non-validated but (well-formed) DOM tree of the message content
-        Document doc =
-          XMLUtils.parseXML(entryContext.getMessageEntry().getMessage());
-
-        // Remove any xsi:types attributes from the message (SOAP Header, Body and Envelope itself)
-
-        NodeList elementList = doc.getElementsByTagName("*");
-        if (elementList != null)
-        {
-          for (int i = 0; i < elementList.getLength(); i++)
-          {
-            Element element = (Element) elementList.item(i);
-            element.removeAttributeNS(WSIConstants.NS_URI_XSI, "type");
-          }
-        }
-
-        // Write out the (potentially) modified tree to String
-        String filteredMessage = DOM2Writer.nodeToString(doc);
-
-        // Parse the result with validation "on"
-        XMLUtils.parseXML(
-          filteredMessage,
-          TestUtils.getSOAPSchemaLocation());
-      }
-      catch (WSIException e)
-      {
-        if (e.getTargetException() instanceof SAXException)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail =
-            this.validator.createFailureDetail(
-              Utils.getExceptionDetails(e.getTargetException()),
-              entryContext);
-        }
-      }
-      catch (Exception e)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail =
-          this.validator.createFailureDetail(Utils.getExceptionDetails(e), entryContext);
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1755.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1755.java
deleted file mode 100644
index 7b83ee2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1755.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * BP1755
- *
- * <context>For a candidate non-fault envelope containing a soap:body with at least one element, and that is referred by a binding style RPC-literal</context>
- * <assertionDescription>Each part accessor element in the envelope has a local name of the same value as the name attribute of the corresponding wsdl:part element.</assertionDescription>
- */
-public class BP1755 extends AssertionProcess {
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1755(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (validator.isOneWayResponse(entryContext))
-        throw new AssertionNotApplicableException();
-
-      // Getting a message document
-      Document doc = entryContext.getMessageEntryDocument();
-
-      Element soapOperation = null;
-      // If there is a Fault entry or no body entries,
-      // the assertion is not applicable
-      if (validator.isFault(doc)
-        || (soapOperation = validator.getSoapBodyChild(doc)) == null)
-        throw new AssertionNotApplicableException();
-
-      // Creating a qualified name of potential SOAP operation
-      QName operationQName = new QName(
-        soapOperation.getNamespaceURI(), soapOperation.getLocalName());
-
-      // Retrieving all the RPC binding operations from wsdl:binding
-      BindingOperation[] rpcBindingOperations =
-        validator.getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC,
-          validator.analyzerContext.getCandidateInfo().getBindings());
-
-      // Retrieving binding operation by given operation name
-      BindingOperation bindingOperation = validator.getOperationMatch(
-        entryContext.getEntry().getEntryType(),
-        operationQName,
-        rpcBindingOperations);
-
-      // If there is no matched operation, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-
-      // Finding operation message parts and extensibility elems
-      // in the binding depending on message type
-      List operationMessageParts = null;
-      List extElems = null;
-      if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_REQUEST))
-      {
-        operationMessageParts = bindingOperation.getOperation()
-          .getInput().getMessage().getOrderedParts(null);
-        if (bindingOperation.getBindingInput() != null)
-          extElems =
-            bindingOperation.getBindingInput().getExtensibilityElements();
-      }
-      else
-      {
-        operationMessageParts = bindingOperation.getOperation()
-          .getOutput().getMessage().getOrderedParts(null);
-        if (bindingOperation.getBindingOutput() != null)
-          extElems =
-            bindingOperation.getBindingOutput().getExtensibilityElements();
-      }
-
-      // If the message is not literal, the assertion is not applicable
-      if (!validator.isLiteral(extElems))
-        throw new AssertionNotApplicableException();
-
-
-      /* Basic Profile Version 1.1 (http://www.ws-i.org/Profiles/Basic/2003-12/BasicProfile-1.1.htm)
-       * says that the order of the elements in the soap:body of an ENVELOPE MUST be
-       * the same as that of the wsdl:parts in the wsdl:message that describes it.
-       * However, we should keep in mind there is the "parts" attribute of soapbind:body
-       * that indicates which parts appear within the SOAP Body. 
-       */
-
-      // Getting the ordered list of wsdl:part names
-      List orderedPartNames =
-        validator.orderPartNames(operationMessageParts, extElems);
-      Iterator i = orderedPartNames.iterator();
-      // Getting the first accessor
-      Element accessor = XMLUtils.getFirstChild(soapOperation);
-      while (accessor != null)
-      {
-        // If there is no the corresponding wsdl:part element
-        // for an accessor, the assertion failed
-        if (!i.hasNext())
-          throw new AssertionFailException(
-            "The part accessor element '" + accessor.getLocalName()
-            + "' does not have the corresponding wsdl:part element.");
-
-        // If local name of accessor does not equal to the name of the
-        // corresponding wsdl:part element, the assertion failed
-        String partName = (String) i.next();
-        if (!accessor.getLocalName().equals(partName))
-          throw new AssertionFailException(
-            "The accessor local name is " + accessor.getLocalName()
-            + ", the corresponding part element name is " + partName);
-
-        // Getting the next accessor
-        accessor = XMLUtils.getNextSibling(accessor);
-      }
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4100.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4100.java
deleted file mode 100644
index fe09c00..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4100.java
+++ /dev/null

@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPHeader;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-
-/**
- * BP4100
- * <context>For a candidate envelope containing a header block that is either mandatory or is not described in the wsdl:binding.</context>
- * <assertionDescription>An envelope contains a header block that is either mandatory or is not described in the wsdl:binding.</assertionDescription>
- */
-public class BP4100 extends AssertionProcess {
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP4100(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // Parsing the message
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // If the message is empty or invalid, the assertion is not applicable
-      if (doc == null)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Getting header elements from envelope
-      Element root = doc.getDocumentElement();
-      NodeList headerList = root.getElementsByTagNameNS(
-        WSIConstants.NS_URI_SOAP, XMLUtils.SOAP_ELEM_HEADER);
-
-      // If there is no header, the assertion is not applicable
-      if (headerList == null || headerList.getLength() == 0)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Getting the header element
-      Node header = headerList.item(0);
-
-      // Getting the immediate child elements of the header
-      NodeList elems = header.getChildNodes();
-
-      // If there are no child elements of the header
-      // the assertion is not applicable
-      if (elems == null || elems.getLength() == 0)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Walking through child elements
-      for (int i = 0; i < elems.getLength(); i++)
-      {
-
-        if (elems.item(i).hasAttributes())
-        {
-          // Getting the mustUnderstand attribute
-          Node muNode = elems.item(i).getAttributes().getNamedItem(
-            root.getPrefix() + ":" + XMLUtils.SOAP_ATTR_MUST_UNDERSTAND);
-          // If a header block is mandatory, then the assertion passed
-          if (muNode != null && muNode.getNodeValue().equals("1"))
-          {
-            throw new AssertionPassException();
-          }
-        }
-
-        // Getting header block name
-        String blockName = elems.item(i).getLocalName();
-        // If the name is not presented (occurs when element is empty string)
-        // then continue with the next element
-        if (blockName == null)
-        {
-          continue;
-        }
-
-        boolean blockNameExists = false;
-
-        // Getting WSDL bindings
-        Binding[] bindings = validator.getWSDLDocument().getBindings();
-        for (int j = 0; j < bindings.length; j++) 
-        {
-          // Getting wsdl:operations
-          List operations = bindings[j].getBindingOperations();
-          Iterator k = operations.iterator();
-          while (k.hasNext() && !blockNameExists)
-          {
-            BindingOperation operation = (BindingOperation) k.next();
-
-            // If this is a request message,
-            // then getting wsdl:input for an operation 
-            if (entryContext.getMessageEntry().getType().equals(
-              MessageEntry.TYPE_REQUEST))
-            {
-              BindingInput opInput = operation.getBindingInput();
-              if (opInput != null)
-              {
-                // If wsdl:input is presented then checking
-                // whether the block name is described there or not
-                blockNameExists = blockNameExists(
-                  opInput.getExtensibilityElements(), blockName);
-              }
-            }
-            // If this is a response message,
-            // then getting wsdl:output for an operation
-            else
-            {
-              BindingOutput opOutput = operation.getBindingOutput();
-              if (opOutput != null)
-              {
-                // If wsdl:output is presented then checking
-                // whether the block name is described there or not
-                blockNameExists = blockNameExists(
-                  opOutput.getExtensibilityElements(), blockName);
-              }
-            }
-          }
-        }
-
-        // If a header block is not described in the appropriate wsdl:binding
-        // then the assertion passed
-        if (!blockNameExists)
-        {
-          throw new AssertionPassException();
-        }
-      }
-
-      // No one header block is either mandatory or is not described in the
-      // appropriate wsdl:binding, the assertion is not applicable
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    }
-    catch (AssertionPassException ape)
-    {
-      failureDetail = validator.createFailureDetail(
-        testAssertion.getDetailDescription(), entryContext);
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Checks the existense of blockName in wsdlsoap:header, if it is found in
-   * a list of ExtensibilityElement objects
-   * 
-   * @param elems A list of ExtensibilityElement objects
-   * @param blockName The name that will be checked for existence
-   * @return true if blockName is described in the wsdlsoap:header extensibility element
-   */
-  private boolean blockNameExists(List elems, String blockName)
-  {
-    if (elems == null)
-    {
-      return false;
-    }
-
-    Iterator i = elems.iterator();
-    while (i.hasNext())
-    {
-      ExtensibilityElement elem = (ExtensibilityElement) i.next();
-      String elemName = elem.getElementType().getLocalPart();
-      if (elemName.equals("header"))
-      {
-        SOAPHeader soapHeader = (SOAPHeader) elem;
-        if (soapHeader.getPart().equals(blockName))
-        {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4101.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4101.java
deleted file mode 100644
index afd93f3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4101.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * BP4101
- * <context>For a candidate envelope containing a soap:actor attribute with a value other than the special uri "http://schemas.xmlsoap.org/soap/actor/next".</context>
- * <assertionDescription>A header element in the envelope contains a soap:actor attribute with a value other than the special uri "http://schemas.xmlsoap.org/soap/actor/next".</assertionDescription>
- */
-public class BP4101 extends AssertionProcess {
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP4101(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try {
-
-      // Parsing the message
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // If the message is empty or invalid, the assertion is not applicable
-      if (doc == null)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Getting header elements from envelope
-      Element root = doc.getDocumentElement();
-      NodeList headerList = root.getElementsByTagNameNS(
-        WSIConstants.NS_URI_SOAP, XMLUtils.SOAP_ELEM_HEADER);
-
-      // If there is no header, the assertion is not applicable
-      if (headerList == null || headerList.getLength() == 0)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Getting the header element
-      Node header = headerList.item(0);
-
-      // Getting the immediate child elements of the header
-      NodeList elems = header.getChildNodes();
-
-      // If there is no child elements of the header
-      // the assertion is not applicable
-      if (elems == null || elems.getLength() == 0)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Walking through child elements
-      for (int i = 0; i < elems.getLength(); i++)
-      {
-        // Getting node attributes
-        NamedNodeMap attrs = elems.item(i).getAttributes();
-
-        // If the node does not have attributes then continue
-        if (attrs == null)
-        {
-          continue;
-        }
-
-        // Getting actor attribute
-        Node actor = attrs.getNamedItem(root.getPrefix()
-          + ":" + XMLUtils.SOAP_ATTR_ACTOR);
-
-        // If the actor attribute is presented and does not equal
-        // to "http://schemas.xmlsoap.org/soap/actor/next",
-        // then the assertion passed
-        if (actor != null
-          && !actor.getNodeValue().equals(WSIConstants.NS_URI_SOAP_NEXT_ACTOR))
-        {
-          throw new AssertionPassException();
-        }
-      }
-
-      // No one actor attribute has a value other than
-      // "http://schemas.xmlsoap.org/soap/actor/next",
-      // the assertion is not applicable 
-      result  = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    }
-    catch (AssertionPassException ape)
-    {
-      failureDetail = validator.createFailureDetail(
-        testAssertion.getDetailDescription(), entryContext);
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4102.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4102.java
deleted file mode 100644
index 1be1792..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4102.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * BP4102
- * <context>For a candidate envelope containing a fault with a non-empty detail element.</context>
- * <assertionDescription>A Fault element in an envelope contains a non-empty detail element.</assertionDescription>
- */
-public class BP4102 extends AssertionProcess {
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP4102(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try {
-
-      // Parsing the message
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // If the message is empty or invalid, the assertion is not applicable
-      if (doc == null)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Getting Fault elements from envelope
-      Element root = doc.getDocumentElement();
-      NodeList faultList = root.getElementsByTagNameNS(
-        WSIConstants.NS_URI_SOAP, XMLUtils.SOAP_ELEM_FAULT);
-
-      // If there is no Fault element, the assertion is not applicable
-      if (faultList == null || faultList.getLength() == 0)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Fault element must not appear more than once
-      // within a Body element, so getting the first one
-      Element fault = (Element) faultList.item(0);
-
-      // Getting Fualt's detail elements
-      NodeList details = fault.getElementsByTagName(
-        XMLUtils.SOAP_ELEM_FAULT_DETAIL);
-      // If there is a non-empty detail element, then the assertion passed
-      if (details != null
-        && details.getLength() > 0)
-      {
-        NodeList list = details.item(0).getChildNodes();
-        // search first element node 
-        for (int i = 0; i < list.getLength(); i++)
-        {
-          if((list.item(i).getNodeType() == Node.ELEMENT_NODE) 
-          && (list.item(i).getLocalName() != null) ) 
-          {
-            throw new AssertionPassException();
-          }
-        }
-      }
-
-      // There is no detail element in Fault,
-      // the assertion is not applicable
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    }
-    catch (AssertionPassException ape)
-    {
-      failureDetail = validator.createFailureDetail(
-        testAssertion.getDetailDescription(), entryContext);
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4109.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4109.java
deleted file mode 100644
index 92f8d1d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4109.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
-
-/**
- * BP4109
- *
- * <context>For a candidate envelope containing a soap:Body element with attributes</context>
- * <assertionDescription>An envelope contains a a soap:Body element with attributes.</assertionDescription>
- */
-public class BP4109 extends AssertionProcess {
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP4109(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try {
-
-      // Parsing the message
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // If the message is empty or invalid, the assertion is not applicable
-      if (doc == null)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Getting the soap:Body elements from envelope
-      NodeList bodyList = doc.getDocumentElement().getElementsByTagNameNS(
-        WSIConstants.NS_URI_SOAP, XMLUtils.SOAP_ELEM_BODY);
-
-      // If there is no Body element, the assertion is not applicable
-      if (bodyList == null || bodyList.getLength() == 0)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Getting the first soap:Body element
-      Element body = (Element) bodyList.item(0);
-
-      // If the Body element has attributes (excluding namespace declarations),
-      // the assertion passed
-      NamedNodeMap attrs = body.getAttributes();
-      if (attrs != null)
-      {
-        for (int i = 0; i < attrs.getLength(); i++)
-        {
-          String attrName = ((Attr) attrs.item(i)).getName();
-          if (!attrName.equals("xmlns") && !attrName.startsWith("xmlns:"))
-          {
-            throw new AssertionPassException();
-          }
-        }
-      }
-
-      throw new AssertionNotApplicableException();
-    }
-    catch (AssertionPassException ape)
-    {
-      failureDetail = validator.createFailureDetail(
-        testAssertion.getDetailDescription(), entryContext);
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java
deleted file mode 100644
index be2014c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EnvelopeValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-
-/**
- * @version 1.0
- */
-public class EnvelopeValidatorImpl
-  extends BaseMessageValidator
-  implements EnvelopeValidator
-{
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isPrimaryEntryTypeMatch(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  protected boolean isPrimaryEntryTypeMatch(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-  {
-    boolean match = false;
-
-    // Verify that the entry and test assertion have the same primary context
-    if ((testAssertion.getEntryTypeName().equals(EntryType.TYPE_ENVELOPE_ANY))
-      || (testAssertion.getEntryTypeName().equals(EntryType.TYPE_ENVELOPE_REQUEST)
-        && (entryContext
-          .getEntry()
-          .getEntryType()
-          .getTypeName()
-          .equals(EntryType.TYPE_MESSAGE_REQUEST)))
-      || (testAssertion.getEntryTypeName().equals(EntryType.TYPE_ENVELOPE_RESPONSE)
-        && (entryContext
-          .getEntry()
-          .getEntryType()
-          .getTypeName()
-          .equals(EntryType.TYPE_MESSAGE_RESPONSE))))
-    {
-      match = true;
-    }
-
-    return match;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP1601.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP1601.java
deleted file mode 100644
index 919d35a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP1601.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * SSBP1601
- */
-public class SSBP1601 extends BP1601
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public SSBP1601(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP9704.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP9704.java
deleted file mode 100644
index ac5526f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP9704.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * SSBP9704
- *
- * <context>For a candidate envelope</context>
- * <assertionDescription>The ENVELOPE does not contain the namespace declaration xmlns:xml="http://www.w3.org/XML/1998/namespace".</assertionDescription>
- */
-public class SSBP9704 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public SSBP9704(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // Getting a message document
-      Document doc = entryContext.getMessageEntryDocument();
-      // If the message is empty or invalid, the assertion is not applicable
-      if (doc == null)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // Getting the root element
-      Element elem = doc.getDocumentElement();
-      // If it is not the soap:Envelope, the assertion is not applicable
-      if (!elem.getNamespaceURI().equals(WSIConstants.NS_URI_SOAP)
-        || !elem.getLocalName().equals(XMLUtils.SOAP_ELEM_ENVELOPE))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // If the envelope contains the xmlns:xml namespace declaration,
-      // the assertion failed
-      String incorrectElementName = getIncorrectElementName(elem);
-      if (incorrectElementName != null)
-      {
-        throw new AssertionFailException("The name of an element containing "
-          + "such namespace declaration is \"" + incorrectElementName + "\".");
-      }
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_WARNING;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Looks for any element that contains the attribute xmlns:xml="http://www.w3.org/XML/1998/namespace". 
-   * @param elem the root element.
-   * @return the name of an element found or null.
-   */
-  private String getIncorrectElementName(Element elem)
-  {
-    // Getting a value of the attribute xmlns:xml
-    String attrValue = elem.getAttributeNS(
-      WSIConstants.NS_URI_XMLNS, "xml");
-    // If it equals to "http://www.w3.org/XML/1998/namespace",
-    // return an element name;
-    if (WSIConstants.NS_URI_XML.equals(attrValue))
-    {
-      return elem.getNodeName();
-    }
-    // Going through element's children
-    Element child = XMLUtils.getFirstChild(elem);
-    while (child != null)
-    {
-      // If any of them has xmlns:xml attribute, return a value
-      String name = getIncorrectElementName(child);
-      if (name != null)
-      {
-        return name;
-      }
-      // Getting the next element's child
-      child = XMLUtils.getNextSibling(child);
-    }
-    // No xmlns:xml attributes found, return null
-    return null;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1003.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1003.java
deleted file mode 100644
index 53ff372..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1003.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP1003
- *
- * <context>For a candidate non-multipart/related message in the log file, which has a non-empty entity-body</context>
- * <assertionDescription>
- *  The logged SOAP envelope is a UTF-8 transcript of an envelope originally encoded as UTF-8 or UTF-16. 
- *  The HTTP Content-Type header's charset value is either UTF-8 or UTF-16. Looking at the messageContent 
- *  element of the logged message, either 
- *    (1) it has a BOM attribute which maps the charset value in the Content-Type header, or 
- *    (2) it has it has an XML declaration which matches the charset value in the Content-Type header, or 
- *    (3) there is no BOM attribute and no XML declaration, and the charset value is UTF-8.
- * </assertionDescription>
- *
- * @author lauzond
- */
-public class AP1003 extends SSBP1003 {
-
-	/**
-	 * @param impl
-	 */
-	public AP1003(BaseMessageValidator impl) 
-	{
-		super(impl);
-	}
-
-	public AssertionResult validate(
-	  TestAssertion testAssertion,
-	  EntryContext entryContext)
-	  throws WSIException
-	{
-	  // If there is a SOAP Message with Attachments, the assertion is not applicable
-	  if (entryContext.getMessageEntry().isMimeContent())
-	  {
-	  	return validator.createAssertionResult(testAssertion, AssertionResult.RESULT_NOT_APPLICABLE, failureDetail);
-	  }
-      else
-      {
-        return super.validate(testAssertion, entryContext);
-	  }
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1902.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1902.java
deleted file mode 100644
index bd900e6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1902.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP1902
- *
- * <context>For a candidate message</context>
- * <assertionDescription>In a description, if the wsdl:input or wsdl:output
- * element in the wsdl:binding specifies WSDL MIME binding, then the message
- * can contain SOAP attachments.</assertionDescription>
- */
-public class AP1902 extends AssertionProcess implements WSITag
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1902(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // Getting an operation matched for a message
-      BindingOperation bindingOperation = validator.getOperationMatch(
-        entryContext.getEntry().getEntryType(),
-        entryContext.getMessageEntryDocument());
-      // If no one operation matches, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-      // Getting the corresponding extensibility elements
-      List extElems;
-      String type;
-      if (MessageEntry.TYPE_REQUEST
-        .equals(entryContext.getEntry().getEntryType()))
-      {
-        type = "input";
-        extElems = bindingOperation.getBindingInput() == null ? null
-          : bindingOperation.getBindingInput().getExtensibilityElements();
-      }
-      else
-      {
-        type = "output";
-        extElems = bindingOperation.getBindingOutput() == null ? null
-          : bindingOperation.getBindingOutput().getExtensibilityElements();
-      }
-      // If the MIME binding is not used, but the message has
-      // at least one non-root MIME part, the assertion failed
-      if (!usesMimeBinding(extElems)
-        && entryContext.getMessageEntry().getMimeParts().count() > 1)
-      {
-        throw new AssertionFailException("The wsdl:" + type + " of the \""
-          + bindingOperation.getName() + "\" binding operation.");
-      }
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Checks whether the first extensibility element is mime:multipartRelated.
-   * @param extElems a list of extensibility elements.
-   * @return true if the element is mime:multipartRelated, false otherwise
-   */
-  private boolean usesMimeBinding(List extElems) {
-    // If the first extensibility element is mime:multipartRelated,
-    // return true
-    if (extElems != null && extElems.size() > 0
-      && ((ExtensibilityElement)extElems.get(0))
-      .getElementType().equals(WSDL_MIME_MULTIPART))
-    {
-      return true;
-    }
-    // otherwise return false
-    return false;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1915.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1915.java
deleted file mode 100644
index e852976..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1915.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.MIMEConstants;
-import org.eclipse.wst.wsi.internal.core.util.MIMEUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * AP1915
- *
- * <context>For a candidate root-part of a multipart/related message</context>
- * <assertionDescription>The entity body of the root-part of a
- * multipart/related message is serialized using either UTF-8 or UTF-16
- * character encoding.</assertionDescription>
- */
-public class AP1915 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1915(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // get MIME parts
-    if (!entryContext.getMessageEntry().isMimeContent())
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      MimeParts mimeParts = entryContext.getMessageEntry().getMimeParts();    	
-      MimePart part = mimeParts.getRootPart();
-      if (part == null)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        String xmlEncoding = null;
-        String charset = MIMEUtils.getMimeHeaderSubAttribute(
-          part.getHeaders(),
-          MIMEConstants.HEADER_CONTENT_TYPE, 
-          "charset");
-        try
-        {
-          // The HTTP Content-Type header's charset value is either UTF-8 or UTF-16. 
-          if((charset != null) && (charset.equalsIgnoreCase("utf-8") ||
-              charset.equalsIgnoreCase("utf-16")))
-          {
-            // Looking at the messageContent element of the logged message, either 
-            // (1) it has a BOM attribute which maps the charset value in the Content-Type header, or 
-            int bom = 0;
-            if ((bom = entryContext.getMessageEntry().getBOM()) != 0)
-            {
-              if ((bom == WSIConstants.BOM_UTF8
-                && !charset.equalsIgnoreCase("utf-8"))
-                || ((bom == WSIConstants.BOM_UTF16
-                  && !charset.equalsIgnoreCase("utf-16")))
-                || ((bom == WSIConstants.BOM_UTF16_BIG_ENDIAN
-                  && !charset.equalsIgnoreCase("utf-16"))))
-              {
-                throw new AssertionFailException("The BOM (" + bom + 
-                    ") and charset value (" + charset + ")do not match.");
-              }
-            }
-            // (2) it has an XML declaration which matches the charset value in the Content-Type header, or 
-            else if (((xmlEncoding = 
-              Utils.getXMLEncoding(part.getContent())) != null) &&
-              !xmlEncoding.equals(""))  
-            {
-              if(!xmlEncoding.equalsIgnoreCase(charset))
-              {
-                throw new AssertionFailException("The XML declaration encoding (" + 
-                    xmlEncoding + ") and charset value (" + charset + 
-                    ") do not match.");
-              }
-            
-            }
-            // (3) there is no BOM attribute and no XML declaration, and the charset value is UTF-8.
-            else if(!charset.equalsIgnoreCase("utf-8"))
-            {
-              throw new AssertionFailException("The no BOM attribute and no XML "+
-                  "declaration, and the charset value is (" + charset + ")");
-            }
-          }
-          // header do not found or incorrect charset value
-          else 
-          {
-            throw new AssertionFailException("Either the Content-Type header is not "+
-                "present in the Root Part or a charset value is invalid.");
-          }
-        }
-        catch (AssertionFailException e) 
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail = validator.createFailureDetail(e.getMessage(), entryContext);
-        }
-      }
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1917.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1917.java
deleted file mode 100644
index 012d0d6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1917.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.soap.SOAPBody;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-/**
- * AP1917
- *
- * <context>For a candidate message containing zero attachment parts</context>
- * <assertionDescription>A message containing zero attachment parts is sent
- * using a content-type of either "text/xml" as though a SOAP HTTP binding were
- * used or "multipart/related" when the WSDL description for the message
- * specifies the mime:multipartRelated element on the corresponding wsdl:input
- * or wsdl:output element in its wsdl:binding.</assertionDescription>
- */
-public class AP1917 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1917(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // not applicable if there are attachments
-      if (entryContext.getMessageEntry().isMimeContent())
-      {
-        if (entryContext.getMessageEntry().getMimeParts().count() > 1)
-           throw new AssertionNotApplicableException();
-      }
-
-      BindingOperation bindingOperation = validator.getOperationMatch(
-          entryContext.getEntry().getEntryType(),
-          entryContext.getMessageEntryDocument());
-
-      // If there is no matched operation, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-
-      // Finding operation extensibility elems
-      // in the binding depending on message type
-      List extElems = null;
-      if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_REQUEST)
-        && bindingOperation.getBindingInput() != null)
-      {
-        extElems = bindingOperation
-          .getBindingInput().getExtensibilityElements();
-      }
-      else if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_RESPONSE)
-        && bindingOperation.getBindingOutput() != null)
-      {
-        extElems = bindingOperation
-          .getBindingOutput().getExtensibilityElements();
-      }
-
-      // check list
-      if((extElems == null) || (extElems.size() == 0))
-      {
-        throw new AssertionNotApplicableException();
-      }
-      
-      // determine type 
-      boolean isMultiPart = false;
-      
-      // if MIMEMultipartRelated then only root-part allowed 
-      if(extElems.get(0) instanceof MIMEMultipartRelated)
-      {
-        if(((MIMEMultipartRelated) extElems.get(0)).getMIMEParts().size() != 1) {
-          throw new AssertionNotApplicableException();
-        }
-        isMultiPart = true;
-      }
-      // else if not soapbind:body root element
-      else if(!(extElems.get(0) instanceof SOAPBody))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // get HTTP content type
-      String contentType = HTTPUtils.getHttpHeaderAttribute(
-          entryContext.getMessageEntry().getHTTPHeaders(),
-          HTTPConstants.HEADER_CONTENT_TYPE);
- 
-      //allow "text/xml" or 
-      //("multipart/related" and "mime:multipartRelated" WSDL bindings)
-      if((contentType == null) || 
-         (!contentType.equalsIgnoreCase(WSIConstants.CONTENT_TYPE_MULTIPART) &&
-         !contentType.equalsIgnoreCase(WSIConstants.CONTENT_TYPE_TEXT_XML)) ||
-         ((contentType.equalsIgnoreCase(WSIConstants.CONTENT_TYPE_MULTIPART) && 
-             !isMultiPart)))
-      {
-        throw new AssertionFailException("The content-type header field  " +
-            "value \"" + contentType + "\" is incorrect");
-      }
-    } 
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = 
-        validator.createFailureDetail(e.getMessage(), entryContext);
-    }
-    
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1925.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1925.java
deleted file mode 100644
index b01a2b8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1925.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-/**
- * AP1925
- *
- * <context>For a candidate message</context>
- * <assertionDescription>If the WSDL description lists at least one non-root
- * MIME part, then the corresponding message has a Content-Type HTTP header
- * field-value with a media-type of "multipart/related.</assertionDescription>
- */
-public class AP1925 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1925(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      BindingOperation bindingOperation = validator.getOperationMatch(
-          entryContext.getEntry().getEntryType(),
-          entryContext.getMessageEntryDocument());
-  
-      // If there is no matched operation, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-  
-      // Finding operation extensibility elems
-      // in the binding depending on message type
-      List extElems = null;
-      if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_REQUEST)
-        && bindingOperation.getBindingInput() != null)
-      {
-        extElems = bindingOperation
-          .getBindingInput().getExtensibilityElements();
-      }
-      else if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_RESPONSE)
-        && bindingOperation.getBindingOutput() != null)
-      {
-        extElems = bindingOperation
-          .getBindingOutput().getExtensibilityElements();
-      }
-      // check list on first element
-      if((extElems == null) || (extElems.size() == 0) || 
-         !(extElems.get(0) instanceof MIMEMultipartRelated))
-        throw new AssertionNotApplicableException();
-      
-      // get list mime parts from definition
-      MIMEMultipartRelated mime = (MIMEMultipartRelated) extElems.get(0);
-      List parts = mime.getMIMEParts();
-      // if parts count is more than one, than assertion is notApplicable
-      if(parts.size() <= 1)
-        throw new AssertionNotApplicableException();
-      String contentType = HTTPUtils.getHttpHeaderAttribute(
-          entryContext.getMessageEntry().getHTTPHeaders(),
-          HTTPConstants.HEADER_CONTENT_TYPE); 
-      if((contentType == null) || 
-         !contentType.equalsIgnoreCase(WSIConstants.CONTENT_TYPE_MULTIPART))
-      {
-        throw new AssertionFailException("Incorrect Content-Type value \"" +
-            contentType + "\" in HTTP header");
-      }
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = 
-        validator.createFailureDetail(e.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Returns the part value from MIMEContent element
-   * @param part MIMEPart element
-   * @return the part value from MIMEContent element
-   */
-  //private String getMIMEContentPart(MIMEPart part) {
-  //  List list = part.getExtensibilityElements();
-  //  if(list.size() == 0)
-  //    return null;
-  //  return ((MIMEContent) list.get(0)).getPart();
-  //}
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1926.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1926.java
deleted file mode 100644
index a3f24ec..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1926.java
+++ /dev/null

@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.mime.MIMEContent;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.MIMEConstants;
-import org.eclipse.wst.wsi.internal.core.util.MIMEUtils;
-
-/**
- * AP1926
- *
- * <context>For a candidate message</context>
- * <assertionDescription>A message includes all of the MIME parts described by
- * its WSDL MIME binding.</assertionDescription>
- */
-public class AP1926 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1926(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if(!entryContext.getMessageEntry().isMimeContent())
-      {
-        throw new AssertionNotApplicableException();
-      }
-      
-      // get message mime parts
-      MimeParts mimeParts = entryContext.getMessageEntry().getMimeParts();
-      
-      BindingOperation bindingOperation = validator.getOperationMatch(
-          entryContext.getEntry().getEntryType(),
-          entryContext.getMessageEntryDocument());
-
-      // If there is no matched operation, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-
-      // Finding operation extensibility elems
-      // in the binding depending on message type
-      List extElems = null;
-      if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_REQUEST)
-        && bindingOperation.getBindingInput() != null)
-      {
-        extElems = bindingOperation
-          .getBindingInput().getExtensibilityElements();
-      }
-      else if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_RESPONSE)
-        && bindingOperation.getBindingOutput() != null)
-      {
-        extElems = bindingOperation
-          .getBindingOutput().getExtensibilityElements();
-      }
-      // check list for the first element
-      if((extElems == null) || (extElems.size() == 0) || 
-         !(extElems.get(0) instanceof MIMEMultipartRelated))
-        throw new AssertionNotApplicableException();
-      
-      // get list mime parts from definition
-      MIMEMultipartRelated mime = (MIMEMultipartRelated) extElems.get(0);
-      List parts = mime.getMIMEParts();
-
-      if(mimeParts.getRootPart() == null || mimeParts.count()==0)
-        throw new AssertionNotApplicableException();
-      // skip root part
-      for (int i = 1; i < parts.size(); i++)
-      {
-        String partName = getMIMEContentPart((MIMEPart) parts.get(i));
-        // find the corresponding MIME part
-        if (findMIMEPart(mimeParts.getParts(), partName) == null) 
-        {            
-          throw new AssertionFailException("The corresponding binding " +
-              "operation \"" + bindingOperation.getName() + 
-              "\" does not contain part \"" + partName + "\"");
-        }
-      }
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = 
-        validator.createFailureDetail(e.getMessage(), entryContext);
-    }
-    
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * find corresponding MIME part
-   * @param parts array of soap MIME parts
-   * @param partName part name to find
-   * @return corresponding MIME part "Content-ID" value, 
-   * if the part doesnt found, retuns null
-   * @throws WSIException
-   */
-  private String findMIMEPart(Collection parts, String partName)
-    throws WSIException
-  {
-    if(partName == null)
-       return null;
-    Iterator iparts = parts.iterator();
-    while (iparts.hasNext())
-    {
-      MimePart part = (MimePart)iparts.next();
-      String m_partName = MIMEUtils.getMimeHeaderAttribute(
-          part.getHeaders(), MIMEConstants.HEADER_CONTENT_ID);
-
-      // check value format <partname=UID@host>
-      if ((m_partName != null) && (m_partName.startsWith("<")) && 
-          (m_partName.indexOf("=") != -1) && 
-          (encodePartName(m_partName.substring(1, m_partName.indexOf("="))).equals(partName)))
-      {
-        return m_partName;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the part value from MIMEContent element
-   * @param part MIMEPart element
-   * @return the part value from MIMEContent element
-   */
-  private String getMIMEContentPart(MIMEPart part) {
-    List list = part.getExtensibilityElements();
-    if(list.size() == 0)
-      return null;
-    return ((MIMEContent) list.get(0)).getPart();
-  }
-  
-  /**
-   * Encode string from %HH to UTF
-   * @param str string
-   * @return encoded string from %HH format
-   */
-  private String encodePartName(String str) {
-    StringBuffer res = new StringBuffer("");
-    for (int i = 0; i < str.length(); i++)
-    {
-      if((str.charAt(i) == '%') && (str.length() > i+2))
-      {
-        try
-        {
-          int value = Integer.parseInt(
-              String.valueOf(str.charAt(i+1)) +
-              String.valueOf(str.charAt(i+2)), 16);
-          res.append((char) value);
-          i +=2;
-        }
-        catch(NumberFormatException e){}
-      } 
-      else 
-      {
-        res.append(str.charAt(i));
-      }
-    }
-    return res.toString();
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1931.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1931.java
deleted file mode 100644
index 01cdfc9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1931.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * AP1931
- *
- * <context>For a candidate root-part of a multipart/related message</context>
- * <assertionDescription>The entity body of the root-part of multipart/related
- * message is a soap:Envelope.</assertionDescription>
- */
-public class AP1931 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1931(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // check for the root part
-    if(entryContext.getMessageEntry().isMimeContent() &&
-       (entryContext.getMessageEntry().getMimeParts().getRootPart() != null))
-    {
-      try
-      {
-      // parse root part message
-      Document doc = XMLUtils.parseXML(
-          entryContext.getMessageEntry().getMimeParts().getRootPart().getContent());
-      
-      // get entity body
-      Element el = doc.getDocumentElement();
-      
-      // if the element is not soap:Envelope, then fail  
-      if(!el.getLocalName().equals(WSITag.ELEM_SOAP_ENVELOPE.getLocalPart()) ||
-         !el.getNamespaceURI().equals(WSITag.ELEM_SOAP_ENVELOPE.getNamespaceURI()))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = validator.createFailureDetail(
-            "the entity body of the root part is {" +
-            el.getNamespaceURI() + "}" + el.getLocalName(), entryContext);
-      }
-      } 
-      catch (Exception e)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = validator.createFailureDetail(
-            "the entity body of the root part does not contain " +
-            "\"soap:Envelope\" element", entryContext);
-      }
-    } 
-    else 
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1932.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1932.java
deleted file mode 100644
index d9c0fc7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1932.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-/**
- * AP1932
- *
- * <context>For a candidate message containing a Content-Type HTTP header
- * field-value with a media type of "multipart/related"</context>
- * <assertionDescription>In a message, the Content-Type HTTP header field-value
- * has a type parameter with a value of "text/xml" when it has a media type of
- * "multipart/related".</assertionDescription>
- */
-public class AP1932 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1932(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // check for multipart/related content type
-    String content_type = HTTPUtils.getHttpHeaderAttribute(
-        entryContext.getMessageEntry().getHTTPHeaders(), 
-        HTTPConstants.HEADER_CONTENT_TYPE);
-    
-    if((content_type == null) || 
-       (!content_type.equalsIgnoreCase(WSIConstants.CONTENT_TYPE_MULTIPART)))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    } 
-    else  
-    {
-      String subType = HTTPUtils.getHttpHeaderSubAttribute(
-          entryContext.getMessageEntry().getHTTPHeaders(), 
-          HTTPConstants.HEADER_CONTENT_TYPE, "type");
-      if((subType == null)
-        || !subType.equalsIgnoreCase(WSIConstants.CONTENT_TYPE_TEXT_XML))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = validator.createFailureDetail(
-            "The \"type\" parameter value is \"" + subType + "\"", entryContext);
-      }
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1933.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1933.java
deleted file mode 100644
index a4491fb..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1933.java
+++ /dev/null

@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.mime.MIMEContent;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.MIMEConstants;
-import org.eclipse.wst.wsi.internal.core.util.MIMEUtils;
-
-/**
- * AP1933
- *
- * <context>For a candidate message</context>
- * <assertionDescription>If a description binds a wsdl:message part to a
- * mime:content element, then the corresponding MIME part in a message has a
- * content-id header with a globally unique value of the form
- * &lt;partname=ID@hostname&gt;, where 'partname' is the value of the name attribute of
- * the wsdl:part element referenced by the mime:content.</assertionDescription>
- */
-public class AP1933 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1933(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    try
-    {
-      if(!entryContext.getMessageEntry().isMimeContent())
-      {
-        throw new AssertionNotApplicableException();
-      }
-      
-      // get message mime parts
-      MimeParts mimeParts = entryContext.getMessageEntry().getMimeParts();
-      
-      BindingOperation bindingOperation = validator.getOperationMatch(
-          entryContext.getEntry().getEntryType(),
-          entryContext.getMessageEntryDocument());
-
-      // If there is no matched operation, the assertion is not applicable
-      if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-
-      // Finding operation extensibility elems
-      // in the binding depending on message type
-      List extElems = null;
-      if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_REQUEST)
-        && bindingOperation.getBindingInput() != null)
-      {
-        extElems = bindingOperation
-          .getBindingInput().getExtensibilityElements();
-      }
-      else if (entryContext.getMessageEntry().getType().equals(
-        MessageEntry.TYPE_RESPONSE)
-        && bindingOperation.getBindingOutput() != null)
-      {
-        extElems = bindingOperation
-          .getBindingOutput().getExtensibilityElements();
-      }
-      // check list for the first element
-      if((extElems == null) || (extElems.size() == 0) || 
-         !(extElems.get(0) instanceof MIMEMultipartRelated))
-        throw new AssertionNotApplicableException();
-      
-      // get list mime parts from definition
-      MIMEMultipartRelated mime = (MIMEMultipartRelated) extElems.get(0);
-      List parts = mime.getMIMEParts();
-      
-      // skip root part
-      for (int i = 1; i < parts.size(); i++)
-      {
-        String partName = getMIMEContentPart((MIMEPart) parts.get(i));
-        // find the corresponding MIME part
-        if (findMIMEPart(mimeParts.getParts(), partName) == null) 
-        {            
-          throw new AssertionFailException("The corresponding binding " +
-              "operation \"" + bindingOperation.getName() + 
-              "\" does not contain part \"" + partName + "\"");
-        }
-      }
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = 
-        validator.createFailureDetail(e.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-  
-  /**
-   * find corresponding MIME part
-   * @param parts array of soap MIME parts
-   * @param partName part name to find
-   * @return corresponding MIME part "Content-ID" value, 
-   * if the part doesnt found, retuns null
-   * @throws WSIException
-   */
-  private String findMIMEPart(Collection parts, String partName)
-    throws WSIException, AssertionFailException
-  {
-    if(partName == null)
-       return null;
-    
-    Iterator iparts = parts.iterator();
-    int i = 0;
-    while (iparts.hasNext())
-    {
-      i = i + 1;
-      MimePart part = (MimePart)iparts.next();
-      String m_partName = MIMEUtils.getMimeHeaderAttribute(
-          part.getHeaders(), MIMEConstants.HEADER_CONTENT_ID);
-
-      // check value format <partname=UID@hostname>
-      if ((m_partName != null) && m_partName.startsWith("<") && m_partName.endsWith(">")) 
-      {
-        int idx, atIdx;
-        String enPartName = null;
-        String uid = null;
-        String host = null;
-        
-        // get part name from content-id
-        if ((idx = m_partName.indexOf("=")) != -1) 
-        {
-          enPartName = encodePartName(m_partName.substring(1, idx)); 
-        }
-        // get uid and hostname from content-id
-        if (((atIdx = m_partName.indexOf("@")) != -1) && (atIdx > idx)) 
-        {
-          uid = m_partName.substring(idx+1, atIdx);
-          host = m_partName.substring(atIdx+1, m_partName.length()-1);
-        }
-        // if part names match, validate format
-        if((enPartName != null) && enPartName.equals(partName))
-        {
-          if((uid == null) || (uid.length() == 0))
-            throw new AssertionFailException(
-                "The \"Content-ID\" attribute of the part \""+(i+1)+
-                "\"contains value \""+ m_partName+
-                "\" which has a incorrect UID format");
-          if(host == null) 
-            throw new AssertionFailException(
-                "The \"Content-ID\" attribute of the part \""+(i+1)+
-                "\"contains value \""+ m_partName+
-                "\" which has a incorrect host format");
-          // check for malformed URL
-          try
-          {
-            new URL("HTTP", host, "");
-          }
-          catch (MalformedURLException e)
-          {
-            throw new AssertionFailException(
-                "The \"Content-ID\" attribute of the part \""+(i+1)+
-                "\"contains value \""+ m_partName+
-                "\" which has a incorrect host format");
-          }
-          return m_partName;
-        } 
-      }
-    }
-    return null;
-  }
-  
-  /**
-   * Returns the part value from MIMEContent element
-   * @param part MIMEPart element
-   * @return the part value from MIMEContent element
-   */
-  private String getMIMEContentPart(MIMEPart part) 
-  {
-    List list = part.getExtensibilityElements();
-    if(list.size() == 0)
-      return null;
-    return ((MIMEContent) list.get(0)).getPart();
-  }
-  
-  /**
-   * Encode string from %HH to UTF
-   * @param str string
-   * @return encoded string from %HH format
-   */
-  private String encodePartName(String str) {
-    StringBuffer res = new StringBuffer("");
-    for (int i = 0; i < str.length(); i++)
-    {
-      if((str.charAt(i) == '%') && (str.length() > i+2))
-      {
-        try
-        {
-          int value = Integer.parseInt(
-              String.valueOf(str.charAt(i+1)) +
-              String.valueOf(str.charAt(i+2)), 16);
-          res.append((char) value);
-          i +=2;
-        }
-        catch(NumberFormatException e){}
-      } 
-      else 
-      {
-        res.append(str.charAt(i));
-      }
-    }
-    return res.toString();
-  }  
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1934.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1934.java
deleted file mode 100644
index 1c06051..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1934.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.MIMEConstants;
-import org.eclipse.wst.wsi.internal.core.util.MIMEUtils;
-
-/**
- * AP1934
- *
- * <context>For a candidate part of a multipart/related message</context>
- * <assertionDescription>The Content-Transfer-Encoding field of a part in a
- * multipart/related message has a value of "7bit", "8bit", "binary",
- * "quoted-printable" or "base64".</assertionDescription>
- */
-public class AP1934 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1934(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // check for multipart/related content type
-    if(!entryContext.getMessageEntry().isMimeContent())
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    } 
-    else 
-    {
-      // get MIME parts
-      MimeParts parts = entryContext.getMessageEntry().getMimeParts();
-      if(parts.count() == 0) 
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-      	Iterator iparts = parts.getParts().iterator();
-        // check each part for the Content-Transfer-Encoding field
-        int i = 0;
-        while (iparts.hasNext())
-        {
-          MimePart part = (MimePart)iparts.next();
-          String type_value = MIMEUtils.getMimeHeaderAttribute(
-              part.getHeaders(),
-              MIMEConstants.HEADER_CONTENT_TRANSFER_ENCODING);
-          if (type_value != null)
-          {
-            if((type_value == null) || !(type_value.equalsIgnoreCase("7bit") ||
-                type_value.equalsIgnoreCase("8bit") || 
-                type_value.equalsIgnoreCase("base64") ||
-                type_value.equalsIgnoreCase("quoted-printable") ||
-                type_value.equalsIgnoreCase("binary")))
-            {
-              result = AssertionResult.RESULT_FAILED;
-              failureDetail = validator.createFailureDetail(
-                  "(" + (i+1) +
-                  "), part header field \"Content-Transfer-Encoding\" has incorrect value \""+
-                  type_value+"\"", entryContext);
-            }
-          }
-          i++;
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1935.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1935.java
deleted file mode 100644
index 4d8fce7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1935.java
+++ /dev/null

@@ -1,348 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-/**
- * AP1935
- *
- * <context>For a candidate part of a multipart/related message</context>
- * <assertionDescription>The encoding of the body of a part in a
- * multipart/related message conforms to the encoding indicated by the
- * Content-Transfer-Encoding field-value,
- * as specified by RFC2045.</assertionDescription>
- */
-public class AP1935 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1935(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    if(!entryContext.getMessageEntry().isMimeContent())
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    } 
-    else 
-    {
-      // get MIME parts
-      MimeParts parts = entryContext.getMessageEntry().getMimeParts();
-      if(parts.count() == 0)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        // check each part for the encoding match
-      	Iterator iparts = parts.getParts().iterator();
-      	int i = 0;
-      	MimePart root = parts.getRootPart();
-        while (iparts.hasNext())
-        {
-          i = i = 1;
-          try
-          {
-        	MimePart part = (MimePart)iparts.next();
-        	
-            // get encoding from header
-            String encoding =  HTTPUtils.getHttpHeaderAttribute(part.getHeaders(), 
-            	HTTPConstants.HEADER_CONTENT_TRANSFER_ENCODING);
-          
-           	if ((part == root) || 
-           		((encoding != null) && encoding.equalsIgnoreCase("base64")))
-              checkPart(part, encoding, false);
-          	else 
-          	  checkPart(part, encoding, true);
-          } catch (AssertionFailException e)
-          {
-            result = AssertionResult.RESULT_FAILED;
-            failureDetail = validator.createFailureDetail(
-                "part "+(i+1)+" Error: " + e.getMessage(), entryContext);
-          }
-        }
-      }
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-  /**
-   * Check message entry to encoding conformity 
-   * @param entry message entry
-   * @throws AssertionFailException if message does not encoding conformity  
-   * @throws WSIException 
-   */
-  private void checkPart(MimePart part, String  encoding, boolean encoded) 
-    throws AssertionFailException, WSIException
-  {
-    String content = null;
-    if (encoded)
-       content = new String(Utils.decodeBase64(part.getContent()));
-     else
-    	content = part.getContent();
-    
-    if(encoding == null) 
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    // check 7bit
-    } else if(encoding.equalsIgnoreCase("7bit")) {
-      checkOn7bit(content);
-    // check 8bit
-    } else if(encoding.equalsIgnoreCase("8bit")) {
-      checkOn8bit(content);
-    // check quoted-printable
-    } else if(encoding.equalsIgnoreCase("quoted-printable")) {
-      checkOnQuotedPrintable(content);
-    // check base64
-    } else if(encoding.equalsIgnoreCase("base64")) {
-      checkOnBase64(content);
-    }
-    // we dont check binary encoding, since message can contains any chars 
-  }
-
-  /**
-   * Validate a 7bit encoded message (RFC2045)
-   * @param message message to check
-   * @throws AssertionFailException if message does not conform
-   */
-  private void checkOn7bit(String message) 
-    throws AssertionFailException
-  {
-    String[] strs = split(message);
-    for (int i = 0; i < strs.length; i++)
-    {
-      String str = strs[i];
-      
-      // check string length
-      if(str.length() > 998) 
-      {
-        throw new AssertionFailException("The length (" + str.length() + 
-            ") of the line (" + (i+1) + ") greater than 998");
-      }
-      // No octets with decimal values greater than 127
-      // are allowed and neither are NULs (octets with decimal value 0).  CR
-      //(decimal value 13) and LF (decimal value 10) octets only occur as
-      // part of CRLF line separation sequences.
-      char[] chars = str.toCharArray();
-      for (int j = 0; j < chars.length; j++)
-      {
-        if((chars[j] > 127) || (chars[j] == 0) || 
-            (chars[j] == 10) || (chars[j] == 13))
-        {
-          throw new AssertionFailException("The char (" + chars[j] + 
-              ")[code=" + (byte) chars[j] + " position=" + j + 
-              "] does not allows in 7bit encoding content");
-        }
-      }
-    }
-  }
-
-  /**
-   * Validate an 8bit encoded message (RFC2045)
-   * @param message message to check
-   * @throws AssertionFailException if message does not conform
-   */
-  private void checkOn8bit(String message) 
-    throws AssertionFailException
-  {
-    String[] strs = split(message);
-    for (int i = 0; i < strs.length; i++)
-    {
-      String str = strs[i];
-      
-      // check string length
-      if(str.length() > 998) 
-      {
-        throw new AssertionFailException("The length (" + str.length() + 
-            ") of the line (" + (i+1) + ") greater than 998");
-      }
-      // octets with decimal values greater than 127
-      // may be used.  As with "7bit data" CR and LF octets only occur as part
-      // of CRLF line separation sequences and no NULs are allowed. 
-      char[] chars = str.toCharArray();
-      for (int j = 0; j < chars.length; j++)
-      {
-        if((chars[j] == 0) || (chars[j] == 10) || (chars[j] == 13))
-        {
-          throw new AssertionFailException("The char (" + chars[j] + 
-              ")[code=" + (byte) chars[j] + " position=" + j + 
-              "] does not allows in 8bit encoding content");
-        }
-      }
-    }
-  }
-
-  /**
-   * Validate a quoted-printable encoded message (RFC2045)
-   * @param message message to check
-   * @throws AssertionFailException if message does not conform
-   */
-  private void checkOnQuotedPrintable(String message)
-    throws AssertionFailException
-  {
-    String[] strs = split(message);
-    for (int i = 0; i < strs.length; i++)
-    {
-      // check length
-      // RFC2045
-      // (5)   (Soft Line Breaks) The Quoted-Printable encoding
-      //REQUIRES that encoded lines be no more than 76
-      //characters long.  If longer lines are to be encoded
-      //with the Quoted-Printable encoding, "soft" line breaks
-      //must be used.  An equal sign as the last character on a
-      //encoded line indicates such a non-significant ("soft")
-      //line break in the encoded text.
-      if(((strs[i].indexOf("\t") != -1) || (strs[i].indexOf(" ") != -1)) &&
-          (strs[i].length() > 76))
-      {
-        throw new AssertionFailException("The length (" + strs[i].length() + 
-            ") of the line (" + (i+1) + 
-            ") greater than 76, \"soft\" line breaks must be used");
-      }
-
-      char[] chars = strs[i].toCharArray();
-      for (int j = 0; j < chars.length; j++)
-      {
-        //(1)   (General 8bit representation) Any octet, except a CR or
-        //LF that is part of a CRLF line break of the canonical
-        //(standard) form of the data being encoded, may be
-        //represented by an "=" followed by a two digit
-        //hexadecimal representation of the octet's value.  The
-        //digits of the hexadecimal alphabet, for this purpose,
-        //are "0123456789ABCDEF".  Uppercase letters must be
-        //used; lowercase letters are not allowed.  Thus, for
-        //example, the decimal value 12 (US-ASCII form feed) can
-        //be represented by "=0C", and the decimal value 61 (US-
-        //ASCII EQUAL SIGN) can be represented by "=3D".  This
-        //rule must be followed except when the following rules
-        //allow an alternative encoding.
-        // (2)   (Literal representation) Octets with decimal values of
-        //33 through 60 inclusive, and 62 through 126, inclusive,
-        //MAY be represented as the US-ASCII characters which
-        //correspond to those octets (EXCLAMATION POINT through
-        //LESS THAN, and GREATER THAN through TILDE,
-        //respectively).
-        if((chars[j] == 61) && (chars.length > j+2)) 
-        {
-          if(!isHex(chars[j+1]) || !isHex(chars[j+2]))
-          {
-            throw new AssertionFailException("the quoted char (" + 
-                 chars[j] + chars[j+1] + chars[j+2] + ") is incorrect");
-          } else {
-            j += 2;
-          }
-        } 
-        // check for space and tab
-        else if((chars[j] != 9) && (chars[j] != 32))
-        {
-          // check invalid symbol
-          if((chars[j] == 0) || (chars[j] == 10) || (chars[j] == 13) ||
-             (chars[j] < 33) || (chars[j] > 126) || (chars[j] == 61))
-          {
-            throw new AssertionFailException("The char (" + chars[j] + 
-                ")[code=" + (byte) chars[j] + " position=" + j + 
-                "] must be quoted");
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Validate a base64 encoded message (RFC3548)
-   * @param message message to check
-   * @throws AssertionFailException if message does not conform
-   */
-  private void checkOnBase64(String message)
-  throws AssertionFailException
-  {
-    String[] strs = split(message);
-    for (int i = 0; i < strs.length; i++)
-    {
-      String str = strs[i];
-      
-      // check string length
-      if(str.length() > 76) 
-      {
-        throw new AssertionFailException("The length (" + str.length() + 
-            ") of the line (" + (i+1) + ") greater than 998");
-      }
-      // check for "ABCDEFGHIJKLMNOPQRSTUVWXYZabcefghijklmnopqrstuvwxyz0123456789/+"
-      char[] chars = str.toCharArray();
-      for (int j = 0; j < chars.length; j++)
-      {
-        char c = chars[i];
-        if((c < 47) || (c > 122) || ((c > 57) && (c < 65)) || 
-           ((c > 90) && (c < 97)))
-        {
-          throw new AssertionFailException("The char (" + chars[j] + 
-              ")[code=" + (byte) chars[j] + " position=" + j + 
-              "] does not allows in base64 encoding content");
-        }
-      }
-    }
-  }
-  
-  /**
-   * split string to array of strings and use as delimeter CRLF
-   * @param str original string
-   * @return array of strings
-   */
-  private String[] split(String str)
-  {
-    ArrayList list = new ArrayList();
-    for(int idx = str.indexOf("\r\n"); idx != -1; idx = str.indexOf("\r\n"))
-    {
-      list.add(str.substring(0, idx));
-      str = str.substring(idx+2);
-    }
-    list.add(str);
-    return (String[]) list.toArray(new String[list.size()]);
-  }
-  
-  /**
-   * Returns true if byte is "0123456789ABCDEF" range, false othewise
-   * @param c char
-   * @return true if byte is "0123456789ABCDEF" range, false othewise
-   */
-  private boolean isHex(char c) {
-    return (((c >= 48) && (c <= 57)) || ((c >= 65) && (c <= 70))); 
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1936.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1936.java
deleted file mode 100644
index db8ae71..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1936.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP1936
- * <context>For a candidate multipart/related message</context>
- * <assertionDescription>In a message, all MIME encapsulation boundary strings 
- * are preceded with the ascii characters CR (13) and LF (10) 
- * in that sequence.</assertionDescription>
- */
-public class AP1936 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public AP1936(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // if boundary equals null, then result is not applicable
-    if (!entryContext.getMessageEntry().isMimeContent())
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }    
-    // otherwise it is true -- checked in monitor
-    // MimeParts mimeParts = entryContext.getMessageEntry().getMimeParts();
-    // Iterator i = mimeParts.getParts().iterator();
-    // boolean invalidBoundaryStringFound = false;
-    //while (i.hasNext() && !invalidBoundaryStringFound)
-    //{
-    //	MimePart part = (MimePart)i.next();
-    //	String[] boundaries = part.getBoundaryStrings();
-    //	for (int j = 0; j<boundaries.length; j++)
-    //	{
-    //		if (!boundaries[j].startsWith("&#xd;\n"))
-    //		{
-    //			invalidBoundaryStringFound = true;
-    //			result = AssertionResult.RESULT_FAILED;
-    //			failureDetail = validator.createFailureDetail(boundaries[j], entryContext);
-    //			break;
-    //		}
-    //	}
-    //}
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1942.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1942.java
deleted file mode 100644
index 5fb7973..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1942.java
+++ /dev/null

@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEContent;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.MIMEConstants;
-import org.eclipse.wst.wsi.internal.core.util.MIMEUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-
-/**
- * AP1942
- *
- * <context>For a candidate part of a multipart/related message that is bound
- * to a mime:content that refers to global element declaration (via the element
- * attribute of the wsdl:part element)</context>
- * <assertionDescription>The bound message part is serialized within the MIME
- * part as a serialization of an XML infoset whose root element is described by
- * the referenced element.</assertionDescription>
- */
-public class AP1942 extends AssertionProcess implements WSITag
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1942(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      if (!entryContext.getMessageEntry().isMimeContent())
-      {
-      	throw new AssertionNotApplicableException();
-      }
-      else
-      {
-      	MimeParts mimeParts = entryContext.getMessageEntry().getMimeParts();
-      
-        // If the message does not contain non-root MIME parts
-        // the assertion is not applicable
-        if (mimeParts.count()< 2)
-          throw new AssertionNotApplicableException();
-      
-        // Getting an operation matched for a message
-        BindingOperation bindingOperation = validator.getOperationMatch(
-          entryContext.getEntry().getEntryType(),
-          entryContext.getMessageEntryDocument());
-        // If no one operation matches, the assertion is not applicable
-        if (bindingOperation == null)
-        throw new AssertionNotApplicableException();
-        // Getting the corresponding extensibility elements and message
-        List extElems;
-        Message message;
-        if (MessageEntry.TYPE_REQUEST
-          .equals(entryContext.getEntry().getEntryType()))
-        {
-          extElems = bindingOperation.getBindingInput() == null ? null
-            : bindingOperation.getBindingInput().getExtensibilityElements();
-          message = bindingOperation.getOperation().getInput() == null ? null
-            : bindingOperation.getOperation().getInput().getMessage();
-        }
-        else
-        {
-          extElems = bindingOperation.getBindingOutput() == null ? null
-            : bindingOperation.getBindingOutput().getExtensibilityElements();
-          message = bindingOperation.getOperation().getOutput() == null ? null
-            : bindingOperation.getOperation().getOutput().getMessage();
-        }
-        // A variable that indicates a binding contains at least one
-        // mime:content element that refers to global element declaration 
-        boolean mimeContentFound = false;
-        // Going through the message MIME parts
-        Iterator iMimeParts = mimeParts.getParts().iterator();
-        int i = 0;
-        while (iMimeParts.hasNext())
-        {
-      	  i = i + 1;
-          // Getting a MIME part
-          MimePart mimePart = (MimePart)iMimeParts.next();
-          // Getting a part name form the Content-ID header
-          String partName = MIMEUtils.getMimeHeaderAttribute(
-            mimePart.getHeaders(), MIMEConstants.HEADER_CONTENT_ID);
-          try
-          {
-            int idx = partName.indexOf("=");
-            if((idx != -1) && partName.startsWith("<"))
-              partName = encodePartName(partName.substring(1, idx));
-          }
-          catch (Exception e)
-          {
-            // Could not extract a part name from the header,
-            // proceed with the next MIME part
-            continue;
-          }
-
-          // If the part is bound by a mime:content element
-          if (boundToMimeContent(extElems, partName) && message != null)
-          {
-            // Getting the corresponding part
-            Part part = (Part) message.getParts().get(partName);
-            QName refName;
-            // If the part refers to global element declaration
-            if (part != null && (refName = part.getElementName()) != null)
-            {
-              mimeContentFound = true;
-              // Trying to parse part content
-              Document doc = null;
-              try
-              {
-                doc = XMLUtils.parseXML(mimePart.getContent());
-              }
-              catch (Exception e) {}
-              // If the message is not an XML infoset, the assertion failed
-              if (doc == null)
-              {
-                throw new AssertionFailException("The bound message part of the "
-                  + "MIME part number " + (i + 1) + " is invalid XML infoset.");
-              }
-              // Creating a QName object of the root element
-              QName rootName = new QName(
-                doc.getDocumentElement().getNamespaceURI(),
-                doc.getDocumentElement().getLocalName());
-              // If the names of the root element and the referenced element
-              // are not equal, the assertion failed
-              if (!refName.equals(rootName))
-              {
-                throw new AssertionFailException("The root element name is "
-                  + rootName + ", the name of the referenced element is "
-                  + refName + ".");
-              }
-            }
-          }
-        }
-        // If no mime:contentS found, the assertion is not applicable
-        if (!mimeContentFound)
-          throw new AssertionNotApplicableException();
-      }
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-
-  /**
-   * Validates whether a part is bound by a mime:content element.
-   * @param extElems a list of extensibility elements.
-   * @param part a part name.
-   * @return true if a part is bound by mime:content, false otherwise.
-   */
-  private boolean boundToMimeContent(List extElems, String part)
-  {
-    if (extElems != null && extElems.size() > 0)
-    {
-      ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(0);
-      // Expected the first ext elem is mime:multipartRelated
-      if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-      {
-        // Getting the mime:part elements of the mime:multipartRelated
-        List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-        for (int i = 0; i < mimeParts.size(); i++)
-        {
-          // Getting the mime:part element needed
-          List elems = ((MIMEPart) mimeParts.get(i)).getExtensibilityElements();
-          if (elems.size() > 0)
-          {
-            // Getting the first element
-            ExtensibilityElement elem = (ExtensibilityElement) elems.get(0);
-            // If the element is mime:content and it binds a part
-            if (elem.getElementType().equals(WSDL_MIME_CONTENT)
-              && part.equals(((MIMEContent)elem).getPart()))
-            {
-              return true;
-            }
-          }
-        }
-      }
-    }
-    return false;
-  }
-  
-  /**
-   * Encode string from %HH to UTF
-   * @param str string
-   * @return encoded string from %HH format
-   */
-  private String encodePartName(String str) {
-    StringBuffer res = new StringBuffer("");
-    for (int i = 0; i < str.length(); i++)
-    {
-      if((str.charAt(i) == '%') && (str.length() > i+2))
-      {
-        try
-        {
-          int value = Integer.parseInt(
-              String.valueOf(str.charAt(i+1)) +
-              String.valueOf(str.charAt(i+2)), 16);
-          res.append((char) value);
-          i +=2;
-        }
-        catch(NumberFormatException e){}
-      } 
-      else 
-      {
-        res.append(str.charAt(i));
-      }
-    }
-    return res.toString();
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1945.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1945.java
deleted file mode 100644
index 1dbf310..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1945.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-/**
- * AP1945
- * <context>For a candidate message</context>
- * <assertionDescription>The Content-Type HTTP header field-value in a message 
- * is either "multipart/related" or "text/xml".</assertionDescription>
- */
-public class AP1945 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public AP1945(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    String headerName = HTTPConstants.HEADER_CONTENT_TYPE;
-
-    // Getting a header
-    String headerValue = HTTPUtils.getHttpHeaderAttribute(
-        entryContext.getMessageEntry().getHTTPHeaders(),
-        headerName);
-    // If headerValue is null, the assertion is not applicable
-    if (headerValue == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    } 
-    // If the header is "multipart/related" or "text/xml",
-    // then the assertion passed
-    else if (headerValue.equalsIgnoreCase(WSIConstants.CONTENT_TYPE_MULTIPART)
-        || headerValue.equalsIgnoreCase(WSIConstants.CONTENT_TYPE_TEXT_XML))
-    {
-    }
-    // else the assertion failed
-    else {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-          headerValue, entryContext);
-    }
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1946.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1946.java
deleted file mode 100644
index aaf0f1c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1946.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP1946
- *
- * <context>For a candidate multipart/related message
- * containing non-root parts</context>
- * <assertionDescription>The candidate multipart/related message
- * containing non-root parts.</assertionDescription>
- */
-public class AP1946 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP1946(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // If there are more than one MIME parts, the assertion passed 
-    if (entryContext.getMessageEntry().getMimeParts().count() > 1)
-    {
-      failureDetail = validator.createFailureDetail(
-          testAssertion.getDetailDescription(), entryContext);
-    }
-    // The assertion is not applicable
-    else
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5100.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5100.java
deleted file mode 100644
index 850e660..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5100.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP5100
- *
- * <context>For a candidate  non-multipart/related message in the log file, with an HTTP entity-body.</context>
- * <assertionDescription>The SOAP envelope is the exclusive payload of the HTTP entity-body.</assertionDescription>
- *
- * @author lauzond
- */
-public class AP5100 extends SSBP5100 
-{
-	/**
-     * Constructor.
-	 * @param impl
-	 */
-	public AP5100(BaseMessageValidator impl) 
-	{
-		super(impl);
-	}
-
-	public AssertionResult validate(
-	  TestAssertion testAssertion,
-	  EntryContext entryContext)
-	  throws WSIException
-	{
-	  // If there is a SOAP Message with Attachments, the assertion is not applicable
-	  if (entryContext.getMessageEntry().isMimeContent())
-	  {
-	  	return validator.createAssertionResult(testAssertion, AssertionResult.RESULT_NOT_APPLICABLE, failureDetail);
-	  }
-      else
-      {
-        return super.validate(testAssertion, entryContext);
-	  }
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5101.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5101.java
deleted file mode 100644
index 5ba2cb9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5101.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
- package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP5101
- * <context>For a non-multipart/related candidate message in the log file.</context>
- * <assertionDescription>A message must have a "Content-Type" HTTP header field.  The "Content-Type" HTTP header field must have a field-value whose media type is "text/xml".</assertionDescription>
- * 
- * @author lauzond
- */
-public class AP5101 extends SSBP5101 {
-
-	/**
-	 * @param impl
-	 */
-	public AP5101(BaseMessageValidator impl) 
-	{
-		super(impl);
-	}
-
-	public AssertionResult validate(
-	  TestAssertion testAssertion,
-	  EntryContext entryContext)
-	  throws WSIException
-	{
-	  // If there is a SOAP Message with Attachments, the assertion is not applicable
-	  if (entryContext.getMessageEntry().isMimeContent())
-	  {
-	  	return validator.createAssertionResult(testAssertion, AssertionResult.RESULT_NOT_APPLICABLE, failureDetail);
-	  }
-      else
-      {
-        return super.validate(testAssertion, entryContext);
-	  }
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1001.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1001.java
deleted file mode 100644
index 0abcbcc..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1001.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
- package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP1001.
- * If it is a request, the arg #2 of POST is &lt;HTTP/1.1&gt;. If absent, first line of the 
- * body is: HTTP-Version = HTTP/1.1. If it is a response, it starts with &lt;HTTP/1.1&gt;.
- */
-public class BP1001 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1001(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    String httpHeader = entryContext.getMessageEntry().getHTTPHeaders();
-
-    // If this is a request message, then check POST header
-    if (entryContext
-      .getMessageEntry()
-      .getType()
-      .equalsIgnoreCase(MessageEntry.TYPE_REQUEST))
-    {
-      Vector requestLine;
-      if (((requestLine = this.validator.getPostRequest(httpHeader)) == null)
-        || (requestLine.size() == 0))
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        String method = (String) requestLine.get(0);
-        //String requestURI = (String) requestLine.get(1);
-        String httpVersion = (String) requestLine.get(2);
-
-        //For each request message that is an HTTP POST
-        if (method.equals(MessageValidator.HTTP_POST) && httpVersion != null)
-        {
-          if (httpVersion.equals(MessageValidator.HTTP_VERSION_1_1))
-          {
-            result = AssertionResult.RESULT_PASSED;
-          }
-          else
-          {
-            result = AssertionResult.RESULT_WARNING;
-            failureDetail = this.validator.createFailureDetail(httpHeader, entryContext);
-          }
-        }
-      }
-    }
-
-    // Otherwise it must be a response
-    else
-    {
-      if (httpHeader.startsWith(MessageValidator.HTTP_VERSION_1_1))
-      {
-        result = AssertionResult.RESULT_PASSED;
-      }
-      else
-      {
-        result = AssertionResult.RESULT_WARNING;
-        failureDetail = this.validator.createFailureDetail(httpHeader, entryContext);
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1002.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1002.java
deleted file mode 100644
index 7564c15..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1002.java
+++ /dev/null

@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP1002.
- * If it is a request, the arg #2 of POST is &lt;HTTP/1.1&gt; or &lt;HTTP/1.0&gt;. If absent, first line 
- * of the body is: HTTP-Version = HTTP/1.1. (or HTTP/1.0). If it is a response, it starts with 
- * &lt;HTTP/1.1&gt; or &lt;HTTP/1.0&gt; or higher;
- */
-public class BP1002 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1002(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    String httpHeader = entryContext.getMessageEntry().getHTTPHeaders();
-
-    // If this is a request message, then check POST for 1.1 or 1.0
-    if (entryContext
-      .getMessageEntry()
-      .getType()
-      .equalsIgnoreCase(MessageEntry.TYPE_REQUEST))
-    {
-      // Get each entry in the post header
-      StringTokenizer postMessage = new StringTokenizer(httpHeader, " \r\n");
-
-      // If there is no third token, then fail
-      if (postMessage.countTokens() < 3)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = this.validator.createFailureDetail(httpHeader, entryContext);
-      }
-      else
-      {
-        // Get the 3rd token (there must be a better way to do this?)
-        String httpVersion = "";
-        String messageType = "";
-        for (int i = 0; i < 3; i++)
-        {
-          // Message type
-          if (i == 0)
-            messageType = postMessage.nextToken();
-          else if (i == 2)
-            httpVersion = postMessage.nextToken();
-          else
-            postMessage.nextToken();
-        }
-
-        if (!messageType.equals("POST"))
-        {
-          result = AssertionResult.RESULT_NOT_APPLICABLE;
-        }
-
-        // If the third token is not HTTP/1.1 ot HTTP/1.0, then fail
-        else if (
-          (!httpVersion.equalsIgnoreCase(MessageValidator.HTTP_VERSION_1_1))
-            && (!httpVersion.equalsIgnoreCase(MessageValidator.HTTP_VERSION_1_0)))
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail = this.validator.createFailureDetail(httpHeader, entryContext);
-        }
-      }
-    }
-
-    // Else it is a response message
-    else
-    {
-      // Response-Line (1st) = HTTP-Version SP Response-code SP Response-text CRLF
-      StringTokenizer httpMessageTokenizer =
-        new StringTokenizer(httpHeader, "\n\r\f");
-
-      String startLine = null;
-      try
-      {
-        if (httpMessageTokenizer.hasMoreTokens())
-        {
-          startLine = httpMessageTokenizer.nextToken();
-        }
-        else
-        {
-          // HTTP version info expected but not found
-          // (state the fact in the exception message?)
-          throw new AssertionFailException(httpHeader);
-        }
-
-        // check that protocol version indicates HTTP/1.0 or HTTP/1.1
-        if (!startLine.startsWith(MessageValidator.HTTP_VERSION_1_1)
-          && !startLine.startsWith(MessageValidator.HTTP_VERSION_1_0))
-        {
-          throw new AssertionFailException(httpHeader);
-        }
-      }
-      catch (AssertionFailException e)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1004.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1004.java
deleted file mode 100644
index 8b06ae7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1004.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP1004. 
- * The request message is a POST message, without any use of framework extension.
- */
-public class BP1004 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1004(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    String httpHeader = entryContext.getMessageEntry().getHTTPHeaders();
-    StringTokenizer httpMessageTokenizer =
-      new StringTokenizer(httpHeader, "\n\r\f");
-
-    // Check if this is a POST message
-    if (!httpHeader.startsWith(MessageValidator.HTTP_POST))
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(httpHeader, entryContext);
-    }
-
-    String line = null;
-    while (httpMessageTokenizer.hasMoreTokens()
-      && (result.equals(AssertionResult.RESULT_PASSED)))
-    {
-      line = httpMessageTokenizer.nextToken();
-      if ((line != null)
-        && (line.startsWith("M-POST") || line.startsWith("Ext:")))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = this.validator.createFailureDetail(httpHeader, entryContext);
-      }
-    } //End While
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1006.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1006.java
deleted file mode 100644
index b067ce0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1006.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.Map;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-
-/**
- * BP1006. 
- */
-public class BP1006 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1006(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Parse the HTTP header
-    String rawHTTPHeader = entryContext.getMessageEntry().getHTTPHeaders();
-    Map httpHeader = HTTPUtils.getHttpHeaderTokens(rawHTTPHeader, ":");
-
-    // Get the soap action header
-    String soapAction = (String) httpHeader.get("SOAPAction".toUpperCase());
-
-    // If there is no soap action header, then NA
-    if (soapAction == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else if (!(soapAction.startsWith("\"")) || !(soapAction.endsWith("\"")))
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail =
-        this.validator.createFailureDetail(
-          "HTTP Header: \"" + rawHTTPHeader + "\".",
-          entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1010.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1010.java
deleted file mode 100644
index faac735..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1010.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Operation;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.w3c.dom.Document;
-
-
-/**
- * BP1010.
- * It MUST NOT contain a SOAP Envelope: the HTTP entity-body must be empty.
- */
-public class BP1010 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1010(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    try
-    {
-      // Parse request message
-      Document docRequest = entryContext.getRequestDocument();
-
-      // get SOAPAction
-      String headers = entryContext.getRequest().getHTTPHeaders();
-      String action = null;
-      if (headers != null)
-        action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-
-      Binding binding = validator.analyzerContext.getCandidateInfo().getBindings()[0];
-      TypesRegistry registry =
-        new TypesRegistry(
-          this.validator.getWSDLDocument().getDefinitions(),
-          validator);
-      OperationSignature.OperationMatch match =
-        OperationSignature.matchOperation(
-          docRequest,
-          action,
-          binding,
-          registry);
-
-      if (match == null)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-
-        BindingOperation bindingOperation = match.getOperation();
-        //find operation in port type
-        Operation operation = bindingOperation.getOperation();
-        if (operation == null)
-        {
-          result = AssertionResult.RESULT_FAILED;
-        }
-        else
-        {
-          if (operation.getOutput() == null)
-          {
-            String message = entryContext.getMessageEntry().getMessage();
-            if (message.length() == 0)
-            {
-              result = AssertionResult.RESULT_PASSED;
-            }
-            else
-            {
-              result = AssertionResult.RESULT_FAILED;
-            }
-          }
-          else
-          {
-            result = AssertionResult.RESULT_NOT_APPLICABLE;
-          }
-        }
-      }
-
-      if (result == AssertionResult.RESULT_FAILED)
-      {
-        failureDetail = this.validator.createFailureDetail(null, entryContext);
-      }
-    }
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1101.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1101.java
deleted file mode 100644
index baecac1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1101.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-
-/**
- * BP1101.
- * A response message that does not contain a SOAP message SHOULD be sent 
- * using either a "200 OK" or "202 Accepted" HTTP status code.
- */
-public class BP1101 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1101(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    // response does not contains SOAP message
-    if (entryContext.getMessageEntry().getMessage() == null
-      || "".equals(entryContext.getMessageEntry().getMessage()))
-    {
-      // check HTTP status code 
-      String httpStatus =
-        Utils.getHTTPStatusCode(
-          entryContext.getMessageEntry().getHTTPHeaders());
-      if ("200".equals(httpStatus));
-      else if ("202".equals(httpStatus));
-
-      // If 4xx, then result is notApplicable
-      else if (httpStatus.startsWith("4"))
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        result = AssertionResult.RESULT_WARNING;
-        failureDetail =
-          this.validator.createFailureDetail(
-            "\nResponse message:\nHeaders:\n"
-              + entryContext.getMessageEntry().getHTTPHeaders()
-              + "Message:\n"
-              + entryContext.getMessageEntry().getMessage(),
-            entryContext);
-      }
-    }
-    else
-    {
-      // response contains SOAP message
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1103.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1103.java
deleted file mode 100644
index 900938f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1103.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-
-/**
- * BP1103.
- * The request message should not contain a POST method.
- */
-public class BP1103 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1103(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    MessageEntry request = entryContext.getRequest();
-    String requestHeaders = request.getHTTPHeaders();
-
-    // Get HTTP status code
-    String httpStatus =
-      Utils.getHTTPStatusCode(
-        entryContext.getMessageEntry().getHTTPHeaders());
-
-    if (requestHeaders.startsWith("POST "))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else if (!"405".equals(httpStatus))
-    {
-      result = AssertionResult.RESULT_WARNING;
-      failureDetail =
-        this.validator.createFailureDetail(
-          "\nRequest message:\nHeaders:\n"
-            + entryContext.getRequest().getHTTPHeaders()
-            + "\nMessage:\n"
-            + entryContext.getRequest().getMessage()
-            + "\n\nResponse message:\nHeaders:\n"
-            + entryContext.getResponse().getHTTPHeaders()
-            + "\nMessage:\n"
-            + entryContext.getResponse().getMessage(),
-          entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1104.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1104.java
deleted file mode 100644
index 4fcdbd7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1104.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-
-/**
- * BP1104.
- * The request message should not contain a content-type of "text/xml".
- */
-public class BP1104 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1104(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // check request for the "text/xml" content type
-    MessageEntry request = entryContext.getRequest();
-    String headers = request.getHTTPHeaders();
-    String contentType = (String) HTTPUtils.getHttpHeaderTokens(headers, ":")
-      .get(HTTPConstants.HEADER_CONTENT_TYPE.toUpperCase());
-
-    // Get HTTP status code
-    String httpStatus =
-      Utils.getHTTPStatusCode(
-        entryContext.getMessageEntry().getHTTPHeaders());
-
-    // If the request message has a content type of text/xml,
-    // then the assertion is not applicable
-    if (contentType != null
-      && contentType.indexOf(WSIConstants.CONTENT_TYPE_TEXT_XML) != -1)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // check HTTP status code
-      if (!"415".equals(httpStatus))
-      {
-        result = AssertionResult.RESULT_WARNING;
-        failureDetail =
-          this.validator.createFailureDetail(
-            "\nRequest message:\nHeaders:\n"
-              + entryContext.getRequest().getHTTPHeaders()
-              + "\nMessage:\n"
-              + entryContext.getRequest().getMessage()
-              + "\n\nResponse message:\nHeaders:\n"
-              + entryContext.getResponse().getHTTPHeaders()
-              + "\nMessage:\n"
-              + entryContext.getResponse().getMessage(),
-            entryContext);
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1116.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1116.java
deleted file mode 100644
index 250f84f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1116.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.w3c.dom.Document;
-
-
-/**
- * BP1116.
- * SOAPAction header should contain a quoted string that has same 
- * value as the value of the soapbind:operation/@soapAction attribute, 
- * and an empty string ("") if there is no such attribute.
- */
-public class BP1116 extends AssertionProcessVisitor
-{
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP1116(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private String action = null;
-  private String headers = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPOperation soapOper,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String soapAction = soapOper.getSoapActionURI();
-    if (soapAction == null)
-    {
-      if (!"".equals(action))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetailMessage =
-          "\nHTTP headers:\n" + headers + "\nsoapAction:\n" + soapAction;
-      }
-    }
-    else
-    {
-      if (!soapAction.equals(action))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetailMessage =
-          "\nHTTP headers:\n" + headers + "\nsoapAction:\n" + soapAction;
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // Parse request message
-      Document doc = entryContext.getMessageEntryDocument();
-
-      // get SOAPAction
-      headers = entryContext.getRequest().getHTTPHeaders();
-      if (headers != null)
-        action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-
-      if (action == null) 
-        throw new AssertionNotApplicableException();
-
-      if (action.length() > 1
-        && action.charAt(0) == '"'
-        && action.charAt(action.length() - 1) == '"')
-      {
-        action = action.substring(1, action.length() - 1);
-      }
-
-      OperationSignature.OperationMatch match =
-        OperationSignature.matchOperation(
-          doc,
-          null,
-          validator.analyzerContext.getCandidateInfo().getBindings()[0],
-          new TypesRegistry(
-              validator.analyzerContext
-              .getCandidateInfo()
-              .getWsdlDocument()
-              .getDefinitions(),
-              validator),
-          false);
-
-      if (match != null)
-      {
-        WSDLTraversal traversal = new WSDLTraversal();
-        //VisitorAdaptor.adapt(this);
-        traversal.setVisitor(this);
-        traversal.visitSOAPOperation(true);
-        traversal.traverse(match.getOperation());
-      }
-      else
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-    }
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    if (result == AssertionResult.RESULT_FAILED
-      && failureDetailMessage != null)
-    {
-      failureDetail = this.validator.createFailureDetail(failureDetailMessage, entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4103.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4103.java
deleted file mode 100644
index e63a5cf..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4103.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-/**
- * BP4103
- *
- * <context>For a candidate message in the message log file</context>
- * <assertionDescription>The message contains an HTTP Authentication header field</assertionDescription>
- */
-public class BP4103 extends AssertionProcess {
-
-  private static final String HTTP_AUTH_SCHEME_BASIC = "Basic";
-  private static final String HTTP_AUTH_SCHEME_DIGEST = "Digest";
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP4103(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Getting message headers
-    String headers = entryContext.getMessageEntry().getHTTPHeaders();
-    // If this is a request message
-    if (entryContext.getMessageEntry().getType().equals(MessageEntry.TYPE_REQUEST))
-    {
-      // If the request headers contain authentication scheme "Basic" or "Digest"
-      // or there are no HTTP Authentication headers, the assertion is not applicable
-      if (!containsInvalidAuth(headers, HTTPConstants.HEADER_AUTHORIZATION)
-        && !containsInvalidAuth(headers, HTTPConstants.HEADER_PROXY_AUTHORIZATION))
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-    }
-    // else this is a response
-    else
-    {
-      // If the response headers contain authentication scheme "Basic" or "Digest"
-      // or there are no HTTP Authentication headers, the assertion is not applicable
-      if (!containsInvalidAuth(headers, HTTPConstants.HEADER_WWW_AUTHENTICATE)
-        && !containsInvalidAuth(headers, HTTPConstants.HEADER_PROXY_AUTHENTICATE))
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-    }
-
-    // Assertion result has not been changed, HTTP Authentication headers
-    // does not contain authentication scheme "Basic" or "Digest",
-    // the assertion passed
-    if (result.equals(AssertionResult.RESULT_PASSED))
-    {
-      failureDetail = validator.createFailureDetail(
-        testAssertion.getDetailDescription(), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Checks whether HTTP headers contain HTTP Authentication headers that uses
-   * authentication scheme other than "Basic" or "Digest".
-   * @param headers HTTP headers.
-   * @param header a header name being retrieved.
-   * @return true if the HTTP Authentication header that uses authentication
-   * scheme other than "Basic" or "Digest" is found, false otherwise.
-   */
-  private boolean containsInvalidAuth(String headers, String header)
-  {
-    // Getting a header value
-    String headerValue = null;
-    try
-    {
-      headerValue = (String) HTTPUtils.getHttpHeaderTokens(headers,":")
-        .get(header.toUpperCase());
-    }
-    catch (Exception e) {}
-
-    // If the header is presented
-    if (headerValue != null)
-    {
-      // Retrieving authentication scheme
-      int idxSP = headerValue.indexOf(" ");
-      if (idxSP > -1)
-      {
-        headerValue = headerValue.substring(0, idxSP);
-      }
-      // If a scheme is neither "Basic" nor "Digest", return true
-      if (!headerValue.equalsIgnoreCase(HTTP_AUTH_SCHEME_BASIC)
-        && !headerValue.equalsIgnoreCase(HTTP_AUTH_SCHEME_DIGEST))
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4104.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4104.java
deleted file mode 100644
index 36d0cf9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4104.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-/**
- * BP4104
- * <context>For a candidate message in the message log file containing an HTTP Header field that is not from the following list of specified header fields: (http://www.mnot.net/drafts/draft-nottingham-http-header-reg-00.txt)</context>
- * <assertionDescription>The message contains an HTTP Header field that is not from the following list of specified header fields: (http://www.mnot.net/drafts/draft-nottingham-http-header-reg-00.txt)</assertionDescription>
- */
-public class BP4104 extends AssertionProcess {
-
-  private final BaseMessageValidator validator;
-
-  private List knownHeaderNames;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP4104(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-    knownHeaderNames = null;
-  }
-
-  private List getAllKnownHeaderNames() {
-    if (knownHeaderNames == null) {
-      knownHeaderNames = HTTPConstants.getAllKnownHeaderNames();
-    }
-    return knownHeaderNames;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    // getting HTTP Headers
-    Map hmap = HTTPUtils.getHttpHeaderTokens(
-      entryContext.getMessageEntry().getHTTPHeaders(), ":");
-
-    Iterator i = hmap.keySet().iterator() ;
-    while (i.hasNext()) {
-      String headerName = (String) i.next();
-      // If header name is not known, then the assertion passed
-      if (!getAllKnownHeaderNames().contains(headerName.toUpperCase()))
-      {
-        failureDetail = validator.createFailureDetail(
-          testAssertion.getDetailDescription(), entryContext);
-
-        break;
-      }
-    }
-
-    // If there is no HTTP header that is not from a list,
-    // then the assertion is not applicable 
-    if (failureDetail == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4105.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4105.java
deleted file mode 100644
index d14f778..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4105.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-
-/**
- * BP4105
- * <context>For a candidate message in the message log file containing a Content-encoding HTTP header field with a value other than "gzip", "compress" or "deflate"</context>
- * <assertionDescription>The contained Content-encoding HTTP header field has a value other than "gzip", "compress" or "deflate".</assertionDescription>
- */
-public class BP4105 extends AssertionProcess {
-
-  // All the registered content-coding value tokens (RFC2616) except "identity"
-  private static final String GZIP_VALUE = "gzip";
-  private static final String COMPRESS_VALUE = "compress";
-  private static final String DEFLATE_VALUE = "deflate";
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP4105(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    // Getting the Content-Encoding HTTP header value
-    String contentEncoding = (String) HTTPUtils.getHttpHeaderTokens(
-      entryContext.getMessageEntry().getHTTPHeaders(),
-      ":").get(HTTPConstants.HEADER_CONTENT_ENCODING.toUpperCase());
-
-    if (contentEncoding != null)
-    {
-      // Lowering value's case because RFC2616 says
-      // that all content-coding values are case-insensitive
-      contentEncoding = contentEncoding.toLowerCase();
-
-      // Multiple encodings can be applied to an entity,
-      // so breaking the value into tokens
-      StringTokenizer st = new StringTokenizer(contentEncoding, ",");
-      while (st.hasMoreTokens())
-      {
-        String token = st.nextToken().trim();
-        // If a token does not equal to any registered one
-        // then the assertion passed
-        if ( !token.equals(GZIP_VALUE)
-          && !token.equals(COMPRESS_VALUE)
-          && !token.equals(DEFLATE_VALUE)) {
-
-          failureDetail = validator.createFailureDetail(
-            testAssertion.getDetailDescription(), entryContext);
-
-          break;
-        }
-      }
-    }
-
-    // If there is no unregistered value of Content-Encoding,
-    // then the assertion is not applicable 
-    if (failureDetail == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4106.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4106.java
deleted file mode 100644
index a278633..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4106.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-
-/**
- * BP4106
- * <context>For a candidate response message in the message log file that contains a transfer-encoding HTTP header field.</context>
- * <assertionDescription>The contained transfer-encoding HTTP header field has a value of "chunked"</assertionDescription>
- */
-public class BP4106 extends AssertionProcess {
-
-  private static final String CHUNKED_VALUE = "chunked";
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP4106(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    // Getting a Transfer-Encoding HTTP header value
-    String transferEncoding = (String) HTTPUtils.getHttpHeaderTokens(
-      entryContext.getMessageEntry().getHTTPHeaders(),
-      ":").get(HTTPConstants.HEADER_TRANSFER_ENCODING.toUpperCase());
-
-    if (transferEncoding != null)
-    {
-      // Lowering value's case because RFC2616 says
-      // that all transfer-coding values are case-insensitive
-      transferEncoding = transferEncoding.toLowerCase();
-
-      // If the value is other than "chunked", then the assertion passed
-      if (!transferEncoding.equals(CHUNKED_VALUE)) {
-        failureDetail = validator.createFailureDetail(
-          testAssertion.getDetailDescription(), entryContext);
-      }
-    }
-
-    // If there is no Tranfer-Encoding or its value is "chunked",
-    // then the assertion is not applicable 
-    if (failureDetail == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4107.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4107.java
deleted file mode 100644
index e699a33..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4107.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-
-/**
- * BP4107
- * <context>For a request message containing an Upgrade field in the HTTP Headers.</context>
- * <assertionDescription>The request message contains an Upgrade field in the HTTP Headers.</assertionDescription>
- */
-public class BP4107 extends AssertionProcess {
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public BP4107(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Getting the Upgrade HTTP header value
-    String upgrage = (String) HTTPUtils.getHttpHeaderTokens(
-      entryContext.getMessageEntry().getHTTPHeaders(),
-      ":").get(HTTPConstants.HEADER_UPGRADE.toUpperCase()); 
-
-    // If the header is presented, then the assertion passed
-    if (upgrage != null)
-    {
-      failureDetail = validator.createFailureDetail(
-        testAssertion.getDetailDescription(), entryContext);
-    }
-    // else the assertion is not applicable
-    else
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java
deleted file mode 100644
index 015bff2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.MessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-
-/**
- * @version 1.0
- */
-public class MessageValidatorImpl
-  extends BaseMessageValidator
-  implements MessageValidator
-{
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isPrimaryEntryTypeMatch(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  protected boolean isPrimaryEntryTypeMatch(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-  {
-    boolean match = false;
-
-    // Verify that the entry and test assertion have the same primary context
-    if ((testAssertion.getEntryTypeName().equals(EntryType.TYPE_MESSAGE_ANY))
-      || (testAssertion.getEntryTypeName().equals(EntryType.TYPE_MESSAGE_REQUEST)
-        && (entryContext
-          .getEntry()
-          .getEntryType()
-          .getTypeName()
-          .equals(EntryType.TYPE_MESSAGE_REQUEST)))
-      || (testAssertion.getEntryTypeName().equals(EntryType.TYPE_MESSAGE_RESPONSE)
-        && (entryContext
-          .getEntry()
-          .getEntryType()
-          .getTypeName()
-          .equals(EntryType.TYPE_MESSAGE_RESPONSE)))
-      || testAssertion.getEntryTypeName().equals(EntryType.TYPE_MIME_ROOT_PART)
-      || testAssertion.getEntryTypeName().equals(EntryType.TYPE_MIME_PART))
-    {
-      match = true;
-    }
-
-    return match;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP1003.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP1003.java
deleted file mode 100644
index 461eae6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP1003.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.Map;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-
-/**
- * SSBP1003.
- *
- * <context>For a candidate non-multipart/related message in the log file, which has a non-empty entity-body</context>
- * <assertionDescription>
- *  The logged SOAP envelope is a UTF-8 transcript of an envelope originally encoded as UTF-8 or UTF-16. 
- *  The HTTP Content-Type header's charset value is either UTF-8 or UTF-16. Looking at the messageContent 
- *  element of the logged message, either 
- *    (1) it has a BOM attribute which maps the charset value in the Content-Type header, or 
- *    (2) it has it has an XML declaration which matches the charset value in the Content-Type header, or 
- *    (3) there is no BOM attribute and no XML declaration, and the charset value is UTF-8.
- * </assertionDescription>
- *
- * @author lauzond
- */ 
-public class SSBP1003 extends AssertionProcess
-{
-  protected final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public SSBP1003(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // If there is a response message for one-way operation, the assertion is not applicable
-      if (validator.isOneWayResponse(entryContext))
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      String httpHeader = entryContext.getMessageEntry().getHTTPHeaders();
-
-      Map httpHeaderMap = HTTPUtils.getHttpHeaderTokens(httpHeader, ":");
-      String contentType = (String) httpHeaderMap.get("Content-Type".toUpperCase());
-
-      if (contentType == null)
-      {
-        throw new AssertionFailException(
-          "The Content-Type header is not present.");
-      }
-
-      contentType = contentType.trim();
-      String charset = contentType.substring(
-        contentType.indexOf(";") + 1, contentType.length());
-      charset = charset.trim();
-      if (!charset.startsWith("charset"))
-      {
-        throw new AssertionFailException(
-          "Missing or bad \"charset\" attribute in the Content-Type header: "
-          + charset);
-      }
-
-      String charsetValue = charset.substring(
-        charset.indexOf("=") + 1, charset.length());
-      if (charsetValue.startsWith("\""))
-      {
-        charsetValue = charsetValue.substring(1, charsetValue.length() - 1);
-      }
-
-      if (!charsetValue.equalsIgnoreCase("utf-8")
-          && !charsetValue.equalsIgnoreCase("utf-16"))
-      {
-        throw new AssertionFailException("The value of the \"charset\" "
-          + "attribute of the Content-Type header is " + contentType);
-      }
-      // Parse log message
-      //gets first string
-      int idx = entryContext.getMessageEntry().getMessage().indexOf("<?xml");
-      if (idx == -1)
-      {
-        throw new AssertionPassException();
-      }
-
-      int idx2 = entryContext.getMessageEntry().getMessage().indexOf("?>");
-      if (idx2 == -1)
-      {
-        throw new AssertionPassException();
-      }
-
-      String xmlDeclaration = entryContext.getMessageEntry().getMessage()
-        .substring(idx, idx2 + "?>".length());
-
-      idx = xmlDeclaration.indexOf("encoding");
-      if (idx == -1)
-      {
-        if (charsetValue.equalsIgnoreCase("utf-8"))
-        {
-            throw new AssertionPassException();
-        }
-        else
-        {
-          throw new AssertionFailException("There is no XML declaration and the"
-            + " charset value in the Content-Type header is not UTF-8."
-            + "\nCharset value in the Content-Type header: " + charsetValue);
-        }
-      }
-
-      int idxQ = xmlDeclaration.indexOf('\'', idx);
-      int idxQQ = xmlDeclaration.indexOf('\"', idx);
-      int idxQuote = -1;
-      char qouteCh = '\0';
-      if (idxQ == -1)
-      {
-        idxQuote = idxQQ;
-        qouteCh = '\"';
-      }
-      else
-      {
-        if (idxQQ == -1)
-        {
-          idxQuote = idxQ;
-          qouteCh = '\'';
-        }
-        else
-        {
-          if (idxQQ < idxQ)
-          {
-            idxQuote = idxQQ;
-            qouteCh = '\"';
-          }
-          else
-          {
-            idxQuote = idxQ;
-            qouteCh = '\'';
-          }
-        }
-      }
-
-      if (idxQuote == -1 || qouteCh == '\0')
-      {
-        throw new AssertionPassException();
-      }
-
-      int idxLQoute = xmlDeclaration.indexOf(qouteCh, idxQuote + 1);
-
-      if (idxLQoute == -1)
-      {
-        throw new AssertionPassException();
-      }
-
-      String xmlEncoding =
-        xmlDeclaration.substring(idxQuote + 1, idxLQoute);
-      if (charsetValue.equalsIgnoreCase(xmlEncoding))
-      {
-        // If there is a BOM, then check that it is the same as the xmlEncoding
-        int bom = 0;
-        if ((bom = entryContext.getMessageEntry().getBOM()) != 0)
-        {
-          if ((bom == WSIConstants.BOM_UTF8
-            && !xmlEncoding.equalsIgnoreCase("utf-8"))
-            || ((bom == WSIConstants.BOM_UTF16
-              && !xmlEncoding.equalsIgnoreCase("utf-16")))
-            || ((bom == WSIConstants.BOM_UTF16_BIG_ENDIAN
-              && !xmlEncoding.equalsIgnoreCase("utf-16"))))
-          {
-            throw new AssertionFailException(
-              "The BOM and XML declaration do not match.");
-          }
-        }
-
-        throw new AssertionPassException();
-      }
-      else
-      {
-        throw new AssertionFailException("There is an XML declaration, but its "
-          + "encoding value does not match the charset value.\n"
-          + "Charset value in the Content-Type header: " + charsetValue
-          + "\nEncoding in the XML declaration: " + xmlEncoding);
-      }
-    }
-    catch (AssertionPassException e)
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5100.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5100.java
deleted file mode 100644
index f62152a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5100.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-
-
-/**
- * SSBP5100
- * <context>For a candidate message in the log file, with an HTTP entity-body.</context>
- * <assertionDescription>The SOAP envelope is the exclusive payload of the HTTP entity-body.</assertionDescription>
- */
-public class SSBP5100 extends AssertionProcess {
-
-  protected final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public SSBP5100(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    try
-    {
-      // Getting a message document
-      Document doc = entryContext.getMessageEntryDocument();
-      
-      // If the message is empty or invalid, the assertion is not applicable
-      if (doc == null)
-      { 
-      	if (this.validator.isOneWayResponse(entryContext))
-      		 throw new AssertionNotApplicableException();
-      	else	
-             throw new AssertionFailException();
-      }
-      if (!doc.getDocumentElement().getLocalName().equals(XMLUtils.SOAP_ELEM_ENVELOPE))
-        throw new AssertionFailException();
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-          testAssertion.getFailureMessage(),
-          entryContext);
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5101.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5101.java
deleted file mode 100644
index 82ae520..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5101.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-
-/**
- * SSBP5101
- * <context>For a candidate message in the log file.</context>
- * <assertionDescription>A message must have a "Content-Type" HTTP header field.  The "Content-Type" HTTP header field must have a field-value whose media type is "text/xml".</assertionDescription>
- * 
- * @author lauzond
- */
-public class SSBP5101 extends AssertionProcess {
-
-  protected final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public SSBP5101(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    // getting Content-Type HTTP header
-    String contentType = (String) HTTPUtils.getHttpHeaderTokens(
-      entryContext.getMessageEntry().getHTTPHeaders(),
-      ":").get(HTTPConstants.HEADER_CONTENT_TYPE.toUpperCase());
-
-    // if Content-Type header is not presented
-    // or does not equal to text/xml, then the assertion is failed
-    if (contentType == null
-      || !contentType.startsWith(WSIConstants.CONTENT_TYPE_TEXT_XML))
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        testAssertion.getFailureMessage(),
-        entryContext);
-    }
-    return this.validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1001.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1001.java
deleted file mode 100644
index 53066b5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1001.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI1001
- */
-public class WSI1001 extends BP1001
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1001(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1002.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1002.java
deleted file mode 100644
index cb4308b..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1002.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI1002
- */
-public class WSI1002 extends BP1002
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1002(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1003.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1003.java
deleted file mode 100644
index 7d04104..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1003.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI1003
- */
-public class WSI1003 extends SSBP1003
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1003(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1004.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1004.java
deleted file mode 100644
index adfad86..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1004.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI1004
- */
-public class WSI1004 extends BP1004
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1004(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1005.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1005.java
deleted file mode 100644
index f31c006..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1005.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1005;
-
-/**
- * WSI1005
- */
-public class WSI1005 extends BP1005
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1005(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1006.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1006.java
deleted file mode 100644
index 72d6f88..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1006.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI1006
- */
-public class WSI1006 extends BP1006
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1006(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1007.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1007.java
deleted file mode 100644
index 9385aaa..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1007.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1007;
-
-/**
- * WSI1007
- */
-public class WSI1007 extends BP1007
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1007(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1008.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1008.java
deleted file mode 100644
index 92cd0ee..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1008.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1008;
-
-/**
- * WSI1008
- */
-public class WSI1008 extends BP1008
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1008(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1009.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1009.java
deleted file mode 100644
index 5b68ebe..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1009.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1009;
-
-/**
- * WSI1009
- */
-public class WSI1009 extends BP1009
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1009(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1010.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1010.java
deleted file mode 100644
index 022d986..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1010.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI1010
- */
-public class WSI1010 extends BP1010
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1010(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1011.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1011.java
deleted file mode 100644
index cadcdcb..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1011.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1011;
-
-/**
- * WSI1011
- */
-public class WSI1011 extends BP1011
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1011(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1012.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1012.java
deleted file mode 100644
index 57f571b..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1012.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1012;
-
-/**
- * WSI1012
- */
-public class WSI1012 extends BP1012
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1012(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1013.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1013.java
deleted file mode 100644
index 587e597..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1013.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1013;
-
-/**
- * WSI1013
- */
-public class WSI1013 extends BP1013
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1013(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1031.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1031.java
deleted file mode 100644
index dcd3917..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1031.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1031;
-
-/**
- * WSI1031
- */
-public class WSI1031 extends BP1031
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1031(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1100.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1100.java
deleted file mode 100644
index 4c20a04..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1100.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1100;
-
-/**
- * WSI1100
- */
-public class WSI1100 extends BP1100
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1100(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1101.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1101.java
deleted file mode 100644
index cbb113c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1101.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI1101
- */
-public class WSI1101 extends BP1101
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1101(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1102.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1102.java
deleted file mode 100644
index f13832d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1102.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPConstants;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.HttpHeadersValidator;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-
-/**
- * BPWSI4.
- * The request message should be invalid (HTTP request malformed, 
- * XML not well formed, ...).
- */
-public class WSI1102 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1102(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    String httpHeader = entryContext.getMessageEntry().getHTTPHeaders();
-
-    String requestMessage = null;
-    //String responseMessage = null;
-    String contentType = null;
-    result = null;
-    //
-
-    try
-    {
-      // check HTTP status code
-      String httpStatus =
-        Utils.getHTTPStatusCode(
-          entryContext.getMessageEntry().getHTTPHeaders());
-      if ("400".equals(httpStatus))
-      {
-
-        requestMessage = entryContext.getRequest().getMessage();
-
-        String requestHTTPHeaders =
-          entryContext.getRequest().getHTTPHeaders();
-
-        //check request HTTP Headers
-
-        //HttpHeadersValidator validator = new HttpHeadersValidator();
-
-        if (!HttpHeadersValidator
-          .validateHttpRequestHeaders(requestHTTPHeaders))
-        {
-          result = AssertionResult.RESULT_PASSED;
-        }
-
-        //check request xml message
-
-        contentType = (String) HTTPUtils.getHttpHeaderTokens(httpHeader, ":")
-         .get(HTTPConstants.HEADER_CONTENT_TYPE.toUpperCase());
-        if (contentType.indexOf(WSIConstants.CONTENT_TYPE_TEXT_XML) != -1)
-        {
-          try
-          {
-            if (requestMessage != null)
-            {
-              DocumentBuilderFactory factory =
-                DocumentBuilderFactory.newInstance();
-              DocumentBuilder builder = factory.newDocumentBuilder();
-              //Document doc = builder.parse(new InputSource(new StringReader(requestMessage)));
-              builder.parse(
-                new InputSource(new StringReader(requestMessage)));
-            }
-
-          }
-          catch (SAXException e)
-          {
-            result = AssertionResult.RESULT_PASSED;
-          }
-          catch (Exception e)
-          {
-            new WSIException(e.getMessage(), e);
-          }
-        }
-
-        if (result == null)
-        {
-          result = AssertionResult.RESULT_WARNING;
-          failureDetail =
-            this.validator.createFailureDetail(
-              "\nRequest message:\nHeaders:\n"
-                + entryContext.getRequest().getHTTPHeaders()
-                + "Message:\n"
-                + entryContext.getRequest().getMessage()
-                + "\n\nResponse message:\nHeaders:\n"
-                + entryContext.getResponse().getHTTPHeaders()
-                + "Message:\n"
-                + entryContext.getResponse().getMessage(),
-              entryContext);
-        }
-      }
-      else
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-    }
-    catch (WSIException wsie)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1103.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1103.java
deleted file mode 100644
index 6246529..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1103.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI1103
- */
-public class WSI1103 extends BP1103
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1103(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1104.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1104.java
deleted file mode 100644
index 422e46d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1104.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI1104.
- * The request message should not contain a content-type of "text/xml".
- */
-public class WSI1104 extends BP1104
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1104(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1105.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1105.java
deleted file mode 100644
index 4d1a3bc..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1105.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.SetCookie2Validator;
-
-
-/**
- * BPWSI4.
- * The Cookies should conform to RFC2965.
- */
-public class WSI1105 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1105(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    SetCookie2Validator cookieVal = new SetCookie2Validator();
-    String headers = entryContext.getMessageEntry().getHTTPHeaders();
-    if (entryContext
-      .getMessageEntry()
-      .getType()
-      .equalsIgnoreCase(MessageEntry.TYPE_RESPONSE))
-    {
-      // if response trom server
-      String setCookie2 =
-        (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("Set-Cookie2".toUpperCase());
-      if (setCookie2 == null)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        if (cookieVal.isSetCookie2(setCookie2.trim()))
-          result = AssertionResult.RESULT_PASSED;
-        else
-        {
-          result = AssertionResult.RESULT_WARNING;
-          failureDetail =
-            this.validator.createFailureDetail(
-              "\nMessage:\nHeaders:\n"
-                + entryContext.getMessageEntry().getHTTPHeaders()
-                + "\nSOAP message:\n"
-                + entryContext.getMessageEntry().getMessage(),
-              entryContext);
-        }
-      }
-    }
-    else
-    {
-      // if request to the server
-      String cookie =
-        (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("Cookie");
-      if (cookie == null)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        if (cookieVal.isCookie(cookie.trim()))
-          result = AssertionResult.RESULT_PASSED;
-        else
-        {
-          result = AssertionResult.RESULT_WARNING;
-          failureDetail =
-            this.validator.createFailureDetail(
-              "\nMessage:\nHeaders:\n"
-                + entryContext.getMessageEntry().getHTTPHeaders()
-                + "\nSOAP message:\n"
-                + entryContext.getMessageEntry().getMessage(),
-              entryContext);
-        }
-      }
-    }
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1107.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1107.java
deleted file mode 100644
index f1913e5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1107.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1107;
-
-/**
- * WSI1107
- */
-public class WSI1107 extends BP1107
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1107(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1108.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1108.java
deleted file mode 100644
index a5236e6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1108.java
+++ /dev/null

@@ -1,415 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.NullUtil;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.util.WSDLUtil;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * BPWSI4.
- * Each soapbind extension element with a wsdl:required 
- * attribute of false must appear in a message.
- */
-public class WSI1108 extends AssertionProcessVisitor implements WSITag
-{
-
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1108(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private OperationSignature.OperationMatch match = null;
-  private EntryContext entryContext = null;
-  private OperationSignature responseSig = null;
-  private Vector headerRarts = null;
-  private boolean visitFault = false;
-  private boolean existSOAPHeader = true;
-  private boolean isRequest = false;
-  private boolean existSOAPHeaderFault = true;
-
-  /**
-   * @see org.eclipse.wst.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPBody, Object, WSDLTraversalContext)
-   */
-  public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-  {
-
-    // if "wsdl:required" is true then return
-    if (body.getRequired() != null
-      && body.getRequired().booleanValue() == true)
-      return;
-
-    // assert parent instanceof BindingOutput
-    BindingOperation bop = ctx.getBindingOperation();
-    if (bop.getOperation() == null
-      || bop.getOperation().getOutput() == null
-      || bop.getOperation().getOutput().getMessage() == null)
-      return;
-    Message msg = bop.getOperation().getOutput().getMessage();
-    List parts =
-      WSDLUtil.getParts(
-        bop.getOperation(),
-        msg,
-        body,
-        match.getOperationStyle());
-
-    QName additionalName = null;
-    // if operation is rpc, add to parts qname qith function name
-    if (WSIConstants
-      .ATTRVAL_SOAP_BIND_STYLE_RPC
-      .equals(match.getOperationStyle()))
-    {
-      // found out target namespace
-      String namespace = body.getNamespaceURI();
-      if (namespace == null || namespace.length() == 0)
-        // !! ATTENTION
-        // namespace should be retrieved from service target nameapce            
-        namespace = ctx.getBinding().getQName().getNamespaceURI();
-
-      // insert operation name as first signature part
-      additionalName =
-        new QName(
-          namespace,
-          bop
-            .getOperation()
-            .getOutput()
-            .getMessage()
-            .getQName()
-            .getLocalPart());
-    }
-
-    // create the signature of this operation
-    OperationSignature op =
-      new OperationSignature(
-        parts,
-        null,
-        new TypesRegistry(
-            validator.analyzerContext
-            .getCandidateInfo()
-            .getWsdlDocument()
-            .getDefinitions(),
-            validator),
-        false);
-    if (additionalName != null)
-      op.getSignature().add(0, additionalName);
-
-    if (op.getSignature().equals(responseSig.getSignature()))
-    {
-      //            ctx.cancelBindingOperationProcessing();
-    }
-    else
-    {
-      // create the signature of this operation
-      op =
-        new OperationSignature(
-          parts,
-          null,
-          new TypesRegistry(
-              validator.analyzerContext
-              .getCandidateInfo()
-              .getWsdlDocument()
-              .getDefinitions(),
-              validator),
-          true);
-
-      if (additionalName != null)
-        op.getSignature().add(0, additionalName);
-      if (op.getSignature().equals(responseSig.getSignature()))
-      {
-        //              ctx.cancelBindingOperationProcessing();
-      }
-      else
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail =
-          this.validator.createFailureDetail(
-            "\nMessage:\n" + entryContext.getMessageEntry().getMessage(),
-            entryContext);
-        ctx.cancelBindingOperationProcessing();
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPHeader, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPHeader header,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-
-    if (existSOAPHeaderFault == false)
-    {
-      existSOAPHeader = false;
-      ctx.cancelBindingOperationProcessing();
-      return;
-    }
-    // if "wsdl:required" is true then return
-    if (header.getRequired() != null
-      && header.getRequired().booleanValue() == true)
-      return;
-    // find headr part
-    Definition d = (Definition) ctx.getParameter("definition");
-    TypesRegistry tReg = (TypesRegistry) ctx.getParameter("TypesRegistry");
-    Part mesPart =
-      WSDLUtil.getPart(d.getMessage(header.getMessage()), header.getPart());
-
-    // test this part and parts from header        
-    QName partQName = mesPart.getTypeName();
-    if (partQName == null)
-      partQName = tReg.getType(mesPart.getElementName());
-    if (partQName == null)
-      throw new IllegalArgumentException(
-        "Part type can not be null." + mesPart.getElementName().toString());
-    String local = partQName.getLocalPart();
-    String ns = partQName.getNamespaceURI();
-
-    existSOAPHeader = false;
-    for (int i = 0; i < headerRarts.size(); i++)
-    {
-      Element elem = (Element) headerRarts.get(i);
-      if (elem.getLocalName().equals(local)
-        && NullUtil.equals(ns, elem.getNamespaceURI()))
-      {
-        existSOAPHeader = true;
-        break;
-      }
-    }
-    if (existSOAPHeader == true)
-      ctx.cancelSOAPHeaderProcessing();
-    if (isRequest == true)
-      ctx.cancelBindingOperationProcessing();
-    if (existSOAPHeader == false && isRequest == false)
-      existSOAPHeaderFault = false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPHeaderFault, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPHeaderFault headerFault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    // find headr part
-    Definition d = (Definition) ctx.getParameter("definition");
-    TypesRegistry tReg = (TypesRegistry) ctx.getParameter("TypesRegistry");
-    Part mesPart =
-      WSDLUtil.getPart(
-        d.getMessage(headerFault.getMessage()),
-        headerFault.getPart());
-
-    // test this part and parts from headerfault
-    QName partQName = mesPart.getTypeName();
-    if (partQName == null)
-      partQName = tReg.getType(mesPart.getElementName());
-    if (partQName == null)
-      throw new IllegalArgumentException(
-        "Part type can not be null." + mesPart.getElementName().toString());
-    String local = partQName.getLocalPart();
-    String ns = partQName.getNamespaceURI();
-
-    for (int i = 0; i < headerRarts.size(); i++)
-    {
-      Element elem = (Element) headerRarts.get(i);
-      if (elem.getLocalName().equals(local)
-        && NullUtil.equals(ns, elem.getNamespaceURI()))
-      {
-        existSOAPHeaderFault = true;
-        break;
-      }
-    }
-    if (existSOAPHeaderFault == true)
-      ctx.cancelSOAPHeaderProcessing();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPFault, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPFault fault, Object parent, WSDLTraversalContext ctx)
-  {
-    // set in true if any SOAPFault exist
-    visitFault = true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    if (this.validator.isOneWayResponse(entryContext))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      this.entryContext = entryContext;
-      // Parse request message
-      Document doc = entryContext.getRequestDocument();
-      // create request signature
-      match =
-        OperationSignature.matchOperation(
-          doc,
-          null,
-          validator.analyzerContext.getCandidateInfo().getBindings()[0],
-          new TypesRegistry(
-              validator.analyzerContext
-              .getCandidateInfo()
-              .getWsdlDocument()
-              .getDefinitions(),
-              validator),
-          false);
-
-      // if such operation exist      
-      if (match != null)
-      {
-        isRequest =
-          MessageEntry.TYPE_REQUEST.equals(
-            entryContext.getMessageEntry().getType());
-        // Parse message
-        doc = entryContext.getMessageEntryDocument();
-
-        if (!isRequest)
-        {
-          responseSig = new OperationSignature(doc);
-          if (WSIConstants
-            .ATTRVAL_SOAP_BIND_STYLE_RPC
-            .equals(match.getOperationStyle()))
-            responseSig.createRPCSignature();
-        }
-        // extract all headers from message
-        Element headerElem =
-          XMLUtils.findChildElement(
-            doc.getDocumentElement(),
-            WSITag.ELEM_SOAP_HEADER);
-        headerRarts = new Vector();
-        if (headerElem != null)
-          headerRarts = XMLUtils.getChildElements(headerElem);
-
-        WSDLTraversal traversal = new WSDLTraversal();
-        //VisitorAdaptor.adapt(this);
-        traversal.setVisitor(this);
-        traversal.visitSOAPBody(true);
-        traversal.visitSOAPHeader(true);
-        traversal.visitSOAPHeaderFault(true);
-        traversal.visitSOAPFault(true);
-
-        traversal.ignoreReferences();
-        traversal.ignoreBindingInput2SOAPBody();
-
-        if (isRequest)
-          traversal.ignoreBindingOutput();
-        else
-          traversal.ignoreBindingInput2SOAPHeader();
-
-        if (responseSig != null && responseSig.isFault())
-          traversal.ignoreBindingOutput();
-        else
-          traversal.ignoreBindingFault();
-
-        existSOAPHeaderFault = true;
-        Map m = new HashMap();
-        WSDLUtil.expandDefinition(
-            validator.analyzerContext
-            .getCandidateInfo()
-            .getWsdlDocument()
-            .getDefinitions());
-        m.put(
-          "definition",
-          validator.analyzerContext
-            .getCandidateInfo()
-            .getWsdlDocument()
-            .getDefinitions());
-        TypesRegistry tReg =
-          new TypesRegistry(
-              validator.analyzerContext
-              .getCandidateInfo()
-              .getWsdlDocument()
-              .getDefinitions(),
-              validator);
-        m.put("TypesRegistry", tReg);
-        traversal.traverse(match.getOperation(), m);
-
-        if (isRequest == false)
-          if (existSOAPHeaderFault == true)
-            existSOAPHeader = true;
-
-        if (responseSig != null
-          && responseSig.isFault()
-          && visitFault == false)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail =
-            this.validator.createFailureDetail(
-              "\nMessage:\n" + entryContext.getMessageEntry().getMessage(),
-              entryContext);
-        }
-        if (existSOAPHeader == false)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail =
-            this.validator.createFailureDetail(
-              "\nMessage:\n" + entryContext.getMessageEntry().getMessage(),
-              entryContext);
-        }
-      }
-      else
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1109.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1109.java
deleted file mode 100644
index 8bf44cf..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1109.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * WSI1109.
- * Any conformance claims MUST be children of the soap:Header element.
- */
-public class WSI1109 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1109(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    if ((entryContext.getMessageEntry() != null)
-      && (!this.validator.isOneWayResponse(entryContext)))
-    {
-      try
-      {
-        // Parse message
-        Document doc = entryContext.getMessageEntryDocument();
-        Element root = doc.getDocumentElement();
-        // find "Header" element
-        NodeList headerList =
-          root.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Header");
-        Element headerElem = null;
-        if (headerList != null && headerList.getLength() != 0)
-          headerElem = (Element) headerList.item(0);
-
-        // find "Claim" element
-        NodeList claimList =
-          root.getElementsByTagNameNS(WSIConstants.NS_URI_CLAIM, "Claim");
-        if (claimList == null || claimList.getLength() == 0)
-        {
-          result = AssertionResult.RESULT_NOT_APPLICABLE;
-        }
-        else
-        {
-          for (int i = 0; i < claimList.getLength(); i++)
-          {
-            if (headerElem == null
-              || claimList.item(i).getParentNode() != headerElem)
-            {
-              result = AssertionResult.RESULT_FAILED;
-              failureDetail =
-                this.validator.createFailureDetail(
-                  "\nSOAP message:\n"
-                    + entryContext.getMessageEntry().getMessage(),
-                  entryContext);
-              break;
-            }
-          }
-        }
-      }
-      catch (Exception e)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-    }
-    else
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1110.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1110.java
deleted file mode 100644
index 8b3b9e2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1110.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * WSI1110.
- * Any conformance claims MUST adhere to the WS-I conformance 
- * claim schema defined in the Basic Profile.
- */
-public class WSI1110 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1110(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    Document doc;
-    if (entryContext.getMessageEntry() != null
-      && !this.validator.isOneWayResponse(entryContext)
-      && (doc = entryContext.getMessageEntryDocument()) != null)
-    {
-      Element root = doc.getDocumentElement();
-      // find "Claim" element
-      NodeList claimList =
-        root.getElementsByTagNameNS(WSIConstants.NS_URI_CLAIM, "Claim");
-      if (claimList == null || claimList.getLength() == 0)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        for (int i = 0; i < claimList.getLength(); i++)
-        {
-          Element elem = (Element) claimList.item(i);
-          // check "conformsTo" attribute
-          Node node = elem.getAttributeNode("conformsTo");
-          if (node == null)
-          {
-            result = AssertionResult.RESULT_FAILED;
-            failureDetail =
-              this.validator.createFailureDetail(
-                "\nSOAP message:\n"
-                  + entryContext.getMessageEntry().getMessage(),
-                entryContext);
-            break;
-          }
-          /* This is checked in WSI1111
-          // check "mustUnderstand" attribute
-          node = elem.getAttributeNodeNS(WSIConstants.NS_URI_SOAP, "mustUnderstand");
-          if (node != null)
-          {
-            result = AssertionResult.RESULT_FAILED;
-            failureDetail = createFailureDetail("\nSOAP message:\n" + entryContext.getMessageEntry().getMessage(), entryContext);
-            break;
-          }
-          */
-        }
-      }
-    }
-    else
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1111.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1111.java
deleted file mode 100644
index b84e3fb..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1111.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * WSI1111.
- * Any conformance claims MUST NOT use soap:mustUnderstand='1'.
- */
-public class WSI1111 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1111(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    Document doc;
-    if (entryContext.getMessageEntry() != null
-      && !this.validator.isOneWayResponse(entryContext)
-      && (doc = entryContext.getMessageEntryDocument()) != null)
-    {
-      Element root = doc.getDocumentElement();
-      // find "Claim" element
-      NodeList claimList =
-        root.getElementsByTagNameNS(WSIConstants.NS_URI_CLAIM, "Claim");
-      if (claimList != null && claimList.getLength() != 0)
-      {
-        // if contains "Claim" element find all "Header" elements
-        NodeList headerList =
-          root.getElementsByTagNameNS(WSIConstants.NS_URI_SOAP, "Header");
-        if (headerList != null && headerList.getLength() != 0)
-        {
-          for (int iHeader = 0; iHeader < headerList.getLength(); iHeader++)
-          {
-            // find all "Header" child elements
-            Node child = headerList.item(iHeader).getFirstChild();
-            while (child != null)
-            {
-              if (child.getNodeType() == Node.ELEMENT_NODE)
-              {
-                // if contains "mustUnderstand" -> fail
-                String attrVal =
-                  ((Element) child).getAttributeNS(
-                    WSIConstants.NS_URI_SOAP,
-                    "mustUnderstand");
-                if (attrVal != null && !"".equals(attrVal))
-                {
-                  result = AssertionResult.RESULT_FAILED;
-                  failureDetail =
-                    this.validator.createFailureDetail(
-                      "\nSOAP message:\n"
-                        + entryContext.getMessageEntry().getMessage(),
-                      entryContext);
-                  iHeader = headerList.getLength();
-                  break;
-                }
-              }
-              child = child.getNextSibling();
-            }
-          }
-        }
-      }
-      else
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-    }
-    else
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1116.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1116.java
deleted file mode 100644
index f289dd6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1116.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI1116
- */
-public class WSI1116 extends BP1116
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1116(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1121.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1121.java
deleted file mode 100644
index 3b3ebae..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1121.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * BPWSI4.
- */
-public class WSI1121 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1121(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    try
-    {
-      // GT: -- start: base on wsi1011 - should refactor this
-
-      Binding[] bindings = validator.analyzerContext.getCandidateInfo().getBindings();
-
-      // get soap message child name
-      // Get the DOM contents of the message soap:body (if non-empty)
-      Document messageDoc = null;
-
-      QName messagePartElementQName = null;
-      if (!entryContext.getMessageEntry().getMessage().equals(""))
-      {
-        messageDoc =
-          XMLUtils.parseXML(entryContext.getMessageEntry().getMessage());
-        // get soap operation name from the soap:body
-
-        // NOTE: getSoapBodyChild() may return null, if the soap:body did not contain any child elements
-        Element soapMessageElement = this.validator.getSoapBodyChild(messageDoc);
-
-        // for doc-lit... find the wsdl:part from one of the specified operations that has 
-        // the soap element used in the message.      
-        // we are looking for a part with an element attrib val matching the soap message element
-        if (soapMessageElement != null)
-        {
-          messagePartElementQName =
-            new QName(
-              soapMessageElement.getNamespaceURI(),
-              soapMessageElement.getLocalName());
-        }
-      }
-
-      if ((messageDoc == null) || this.validator.isFault(messageDoc))
-      {
-        // empty messages and messages containing soap:Faults do not qualify for this TA
-        throw new AssertionNotApplicableException();
-      }
-
-      BindingOperation[] docBindingOperations =
-        this.validator.getMatchingBindingOps(
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC,
-          bindings);
-      // list of operations that match the <wsdl:input> or <wsdl:output> (depending on entryType)
-      // for part element="..."
-      // (ISSUE: what about part type="..."?)
-      BindingOperation[] potentialDocLitOps =
-        this.validator.getDocLitOperations(
-          entryContext.getEntry().getEntryType(),
-          messagePartElementQName,
-          docBindingOperations);
-      // GT: --- end: base on wsi1011
-
-      //               
-      if (potentialDocLitOps.length == 0)
-      {
-        // not doc-lit so quit
-        throw new AssertionNotApplicableException();
-      }
-
-      // We know there is a doc-lit match, so now try to validate the soap message against the
-      // referenced schema
-
-      // GT - how to reference the schema document?? need to use the <wsdl:part>, or do it purely
-      // from the soap message elements?
-      // ie body, envelope or wsdl??
-
-      // <experiment>
-
-      boolean isSchemaValid;
-      
-      try {
-      		isSchemaValid = this.validator.messageIsDocLitSchemaValid(entryContext);         
-      	} catch (Exception e) {
-       		throw new AssertionFailException();
-      	}
-      // </experiment>
-      
-
-      //isSchemaValid = true; // for now, getting this far does it
-
-      if (isSchemaValid)
-      {
-        throw new AssertionPassException();
-      }
-      else
-      {
-        throw new AssertionFailException();
-      }
-
-    }
-    catch (AssertionPassException e)
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(e.getMessage(), entryContext);
-    }
-    catch (AssertionNotApplicableException e)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1201.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1201.java
deleted file mode 100644
index 0c6f087..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1201.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1201;
-
-/**
- * WSI1201
- */
-public class WSI1201 extends BP1201
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1201(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1202.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1202.java
deleted file mode 100644
index 7a31cd6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1202.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1202;
-
-/**
- * WSI1202
- */
-public class WSI1202 extends BP1202
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1202(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1203.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1203.java
deleted file mode 100644
index 363bcbf..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1203.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1203;
-
-/**
- * WSI1203
- */
-public class WSI1203 extends BP1203
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1203(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1204.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1204.java
deleted file mode 100644
index 16dda54..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1204.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1204;
-
-/**
- * WSI1204
- */
-public class WSI1204 extends BP1204
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1204(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1208.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1208.java
deleted file mode 100644
index 7b94963..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1208.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1208;
-
-/**
- * WSI1208
- */
-public class WSI1208 extends BP1208
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1208(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1211.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1211.java
deleted file mode 100644
index 63f57c5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1211.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1211;
-
-/**
- * WSI1211
- */
-public class WSI1211 extends BP1211
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1211(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1301.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1301.java
deleted file mode 100644
index 9f0eb82..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1301.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1301;
-
-/**
- * WSI1301
- */
-public class WSI1301 extends BP1301
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1301(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1302.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1302.java
deleted file mode 100644
index 6e976fe..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1302.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1302;
-
-/**
- * WSI1302
- */
-public class WSI1302 extends BP1302
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1302(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1305.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1305.java
deleted file mode 100644
index bb2e13a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1305.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1305;
-
-/**
- * WSI1305
- */
-public class WSI1305 extends BP1305
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1305(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1306.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1306.java
deleted file mode 100644
index b610628..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1306.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1306;
-
-/**
- * WSI1306
- */
-public class WSI1306 extends BP1306
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1306(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1307.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1307.java
deleted file mode 100644
index 8c705a8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1307.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1307;
-
-/**
- * WSI1307
- */
-public class WSI1307 extends BP1307
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1307(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1308.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1308.java
deleted file mode 100644
index e2271cf..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1308.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1308;
-
-/**
- * WSI1308
- */
-public class WSI1308 extends BP1308
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1308(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1309.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1309.java
deleted file mode 100644
index ee64357..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1309.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1309;
-
-/**
- * WSI1309
- */
-public class WSI1309 extends BP1309
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1309(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1311.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1311.java
deleted file mode 100644
index ea98faa..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1311.java
+++ /dev/null

@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionPassException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.HTTPUtils;
-import org.eclipse.wst.wsi.internal.core.util.OperationSignature;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-
-/**
- * BPWSI4.
- * The response (SOAP envelope) should be carried by an HTTP 
- * response, over same HTTP connection as the Request. 
- */
-public class WSI1311 extends AssertionProcess
-{
-  private final BaseMessageValidator validator;
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1311(BaseMessageValidator impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    result = AssertionResult.RESULT_PASSED;
-    boolean isOneWayResponse = this.validator.isOneWayResponse(entryContext);
-
-    Document docResponse = null;
-    if (!isOneWayResponse)
-      docResponse = entryContext.getResponseDocument();
-
-    //if fault
-    if (!isOneWayResponse && this.validator.isFault(docResponse))
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-    else
-    { // not fault
-      // 1. get an operation from request
-      // Parse request message
-      Document docRequest = entryContext.getRequestDocument();
-
-      // get SOAPAction
-      String headers = entryContext.getRequest().getHTTPHeaders();
-      String action = null;
-      if (headers != null)
-        action = (String) HTTPUtils.getHttpHeaderTokens(headers, ":").get("SOAPAction".toUpperCase());
-      Binding binding = validator.analyzerContext.getCandidateInfo().getBindings()[0];
-      TypesRegistry registry =
-        new TypesRegistry(
-          this.validator.getWSDLDocument().getDefinitions(),
-          validator);
-      OperationSignature.OperationMatch match =
-        OperationSignature.matchOperation(
-          docRequest,
-          action,
-          binding,
-          registry);
-
-      if (match == null)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-      else
-      {
-        try
-        {
-
-          BindingOperation bindingOperation = match.getOperation();
-          Operation operation = null;
-
-          //    Check whether the transport attribute has the value 
-          //  "http://schemas.xmlsoap.org/soap/http". 
-          List extElem = binding.getExtensibilityElements();
-          for (Iterator index = extElem.iterator(); index.hasNext();)
-          {
-            Object o = (Object) index.next();
-            if (o instanceof SOAPBinding)
-            {
-              SOAPBinding soapBinding = (SOAPBinding) o;
-              if (!WSIConstants
-                .NS_URI_SOAP_HTTP
-                .equals(soapBinding.getTransportURI()))
-              {
-                throw new AssertionFailException();
-              }
-
-            }
-          }
-
-          //find operation in port type
-          operation = bindingOperation.getOperation();
-          if (operation == null)
-          {
-            throw new AssertionFailException();
-          }
-
-          if (isOneWayResponse)
-          {
-            if (operation.getOutput() == null)
-              throw new AssertionPassException();
-            else
-              throw new AssertionFailException();
-          }
-
-          //    check whether the response message from the log 
-          //  contains the output message
-          NodeList soapBodyList =
-            docResponse.getElementsByTagNameNS(
-              WSIConstants.NS_URI_SOAP,
-              XMLUtils.SOAP_ELEM_BODY);
-          if ((soapBodyList == null) || (soapBodyList.getLength() == 0))
-          {
-            // Response does not contain any soap Body elements
-            throw new AssertionFailException();
-          }
-          for (int i = 0; i < soapBodyList.getLength(); i++)
-          {
-            Element nextBodyElem = (Element) soapBodyList.item(i);
-            Element soapMessageElement = XMLUtils.getFirstChild(nextBodyElem);
-            while (soapMessageElement != null)
-            {
-              // check whether the operation output has message from SOAP response
-              Message message = operation.getOutput().getMessage();
-              QName soapMessageQName =
-                new QName(
-                  soapMessageElement.getNamespaceURI(),
-                  soapMessageElement.getLocalName());
-
-              if (message != null
-                && soapMessageQName.equals(message.getQName()))
-              {
-                throw new AssertionPassException();
-              }
-
-              soapMessageElement =
-                XMLUtils.getNextSibling(soapMessageElement);
-            }
-          }
-
-        }
-        catch (AssertionPassException e)
-        {
-          result = AssertionResult.RESULT_PASSED;
-        }
-        catch (AssertionFailException e)
-        {
-          result = AssertionResult.RESULT_FAILED;
-        }
-
-      }
-    }
-
-    if (result == AssertionResult.RESULT_FAILED)
-    {
-      failureDetail = this.validator.createFailureDetail(null, entryContext);
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1316.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1316.java
deleted file mode 100644
index 3fd3168..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1316.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1316;
-
-/**
- * WSI1316
- */
-public class WSI1316 extends BP1316
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1316(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1318.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1318.java
deleted file mode 100644
index ea3cd99..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1318.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1318;
-
-/**
- * WSI1318
- */
-public class WSI1318 extends BP1318
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1318(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1601.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1601.java
deleted file mode 100644
index f5920f7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1601.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1601;
-
-/**
- * WSI1601
- */
-public class WSI1601 extends BP1601
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1601(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1701.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1701.java
deleted file mode 100644
index 8a7befb..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1701.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP1701;
-
-/**
- * WSI1701
- */
-public class WSI1701 extends BP1701
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI1701(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4100.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4100.java
deleted file mode 100644
index 81c1a10..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4100.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP4100;
-
-/**
- * WSI4100
- */
-public class WSI4100 extends BP4100
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI4100(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4101.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4101.java
deleted file mode 100644
index 950165a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4101.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP4101;
-
-/**
- * WSI4101
- */
-public class WSI4101 extends BP4101
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI4101(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4102.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4102.java
deleted file mode 100644
index d25ffaf..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4102.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.envelope.BP4102;
-
-/**
- * WSI4102
- */
-public class WSI4102 extends BP4102
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI4102(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4103.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4103.java
deleted file mode 100644
index 6a61d04..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4103.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI4103
- */
-public class WSI4103 extends BP4103
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI4103(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4104.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4104.java
deleted file mode 100644
index a6176d2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4104.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI4104
- */
-public class WSI4104 extends BP4104
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI4104(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4105.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4105.java
deleted file mode 100644
index c6ff8d0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4105.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI4105
- */
-public class WSI4105 extends BP4105
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI4105(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4106.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4106.java
deleted file mode 100644
index 97a44ae..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4106.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI4106
- */
-public class WSI4106 extends BP4106
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI4106(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4107.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4107.java
deleted file mode 100644
index 4ad5242..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4107.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.message;
-
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseMessageValidator;
-
-/**
- * WSI4107
- */
-public class WSI4107 extends BP4107
-{
-
-  /**
-   * @param BaseMessageValidator
-   */
-  public WSI4107(BaseMessageValidator impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3001.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3001.java
deleted file mode 100644
index b206cd0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3001.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.uddi4j.datatype.OverviewDoc;
-import org.uddi4j.datatype.tmodel.TModel;
-
-
-/**
- * BP3001 - The tModel element uses WSDL as the description language:
- * the uddi:overviewDoc/uddi:overviewURL element contains a reference
- * to a WSDL definition, which uses a namespace
- * of http://schemas.xmlsoap.org/wsdl/.
- * The uddi:overviewURL may use the fragment notation to resolve
- * to a wsdl:binding.
- */
-public class BP3001 extends AssertionProcess
-{
-  private final UDDIValidatorImpl validator;
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public BP3001(UDDIValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * Sets the result variable to AssertionResult.RESULT_FAILED value and
-   * places a tModel key in the fault detail message.
-   * @param tModelKey
-   */
-  private void setFaultMessage(String tModelKey)
-  {
-    result = AssertionResult.RESULT_FAILED;
-    failureDetailMessage = "The tModel key is: [" + tModelKey + "].";
-  }
-
-  /**
-   * Validates the test assertion.
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    Binding binding = null;
-
-    // Get the tModel from the entryContext
-    TModel tModel = (TModel) entryContext.getEntry().getEntryDetail();
-
-    // If the tModel does not exist, then fail
-    if (tModel == null)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetailMessage = "Could not locate a tModel.";
-      return validator.createAssertionResult(
-        testAssertion,
-        result,
-        failureDetailMessage);
-    }
-
-    String key = tModel.getTModelKey();
-
-    OverviewDoc doc = tModel.getOverviewDoc();
-    if (doc != null)
-    {
-      String urlText = doc.getOverviewURLString();
-
-      // Try to resolve the URL & check the WSDL
-      try
-      {
-        WSDLDocument wsdlDocument = new WSDLDocument(urlText);
-        Definition definition = wsdlDocument.getDefinitions();
-        Map namespaces = definition.getNamespaces();
-        if (!namespaces.containsValue(WSIConstants.NS_URI_WSDL))
-        {
-          urlText = null;
-        }
-
-        // Get binding
-        binding = validator.getBinding(urlText, wsdlDocument);
-
-        // See if the binding is in the WSDL document
-        if (binding == null
-          || definition.getBinding(binding.getQName()) == null)
-        {
-          urlText = null;
-        }
-      }
-
-      catch (Exception e)
-      {
-        urlText = null;
-      }
-
-      if (urlText != null)
-      {
-        String fragmentID = null;
-        int index = urlText.indexOf("#");
-        if (index > -1)
-        {
-          fragmentID = urlText.substring(index + 1);
-        }
-
-        if ((fragmentID != null)
-          && (fragmentID.length() != 0)
-          && (fragmentID.toUpperCase().indexOf("xpointer(".toUpperCase()) == -1
-            || fragmentID.lastIndexOf(")") != fragmentID.length() - 1))
-        {
-          setFaultMessage(key);
-        }
-      }
-
-      else
-      {
-        setFaultMessage(key);
-      }
-    }
-
-    else
-    {
-      setFaultMessage(key);
-    }
-
-    if (result == AssertionResult.RESULT_PASSED)
-    {
-      // Set the binding that will be used
-      validator.setWSDLBinding(binding);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetailMessage);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3002.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3002.java
deleted file mode 100644
index 572cde4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3002.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.uddi4j.datatype.binding.BindingTemplate;
-
-
-/**
- * BP3002 - The uddi:bindingTemplate element contains a uddi:accessPoint element,
- * with a non-empty value.
- */
-public class BP3002 extends AssertionProcess
-{
-  private final UDDIValidatorImpl validator;
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public BP3002(UDDIValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * Validates the test assertion.
-  * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    String serviceLocation = null;
-
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the bindingTemplate from the entryContext
-    BindingTemplate bindingTemplate =
-      (BindingTemplate) entryContext.getEntry().getEntryDetail();
-
-    // If the bindingTemplate does not contain an accessPoint, then fail
-    if ((bindingTemplate.getAccessPoint() == null)
-      || ((serviceLocation = bindingTemplate.getAccessPoint().getText())
-        == null))
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetailMessage =
-        "The bindingTempate key is: ["
-          + bindingTemplate.getBindingKey()
-          + "].";
-    }
-
-    // Else save the service location in the assertion result
-    else
-    {
-      // Save service location in analyzer context
-      entryContext
-        .getAnalyzerContext()
-        .getServiceReference()
-        .setServiceLocation(
-        serviceLocation);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetailMessage);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3003.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3003.java
deleted file mode 100644
index c0e04f0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3003.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.uddi4j.datatype.tmodel.TModel;
-
-
-/**
- * BP3003 - The uddi:tModel is categorized using the uddi:types taxonomy,
- * as "wsdlSpec": the uddi:keyedReference element has an attribute keyValue
- * equal to "wsdlSpec", and keyName equal to "uddi-org:types" or "types".
- */
-public class BP3003 extends AssertionProcess
-{
-  private final UDDIValidatorImpl validator;
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public BP3003(UDDIValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * Validates the test assertion.
-  * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the tModel from the entryContext
-    TModel tModel = (TModel) entryContext.getEntry().getEntryDetail();
-
-    // If the tModel does not exist, then fail
-    if (tModel == null)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetailMessage =
-        "Could not locate a tModel with a categorization of 'wsdlSpec'.";
-    }
-
-    // If there is a tModel and it is not categorized as "wsdlSpec", then fail
-    else if (!(validator.isWsdlSpec(tModel)))
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetailMessage =
-        "The tModel key is: ["
-          + tModel.getTModelKey()
-          + "]\n"
-          + "The categoryBag is: ["
-          + this.validator.categoryBagToString(tModel.getCategoryBag())
-          + "]";
-    }
-
-    // Else get the WSDL document location and set it and the binding element in analyzer context
-    else
-    {
-      // set WSDL location in analyzer context
-      validator.setWSDLLocation(validator.getWSDLLocation(validator.getOverviewURL(tModel)));
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetailMessage);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java
deleted file mode 100644
index 0ffdce8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java
+++ /dev/null

@@ -1,590 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.Iterator;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.WSDLException;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.analyzer.ServiceReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.UDDIReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLElementImpl;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.UDDIValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.util.UDDIUtils;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.binding.TModelInstanceInfo;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BindingDetail;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-import com.ibm.wsdl.util.StringUtils;
-
-/**
- * The UDDI validator will verify that a web service description was published correctly in a UDDI registry.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class UDDIValidatorImpl
-  extends BaseValidatorImpl
-  implements UDDIValidator
-{
-  /**
-   * UDDI reference.
-   */
-  protected UDDIReference uddiReference;
-  /**
-   * UDDI proxy.
-   */
-  protected UDDIProxy uddiProxy;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.UDDIValidator#init(org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext, org.wsi.test.profile.ProfileArtifact, org.wsi.test.report.ReportArtifact, org.wsi.test.analyzer.config.UDDIReference, org.wsi.test.report.Reporter)
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact profileArtifact,
-    ReportArtifact reportArtifact,
-    UDDIReference uddiReference,
-    Reporter reporter)
-    throws WSIException
-  {
-    // BaseValidatorImpl
-    super.init(analyzerContext, profileArtifact, reportArtifact, reporter);
-
-    // Save input references
-    this.uddiReference = uddiReference;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.UDDIValidator#validate()
-   */
-  public String validate() throws WSIException
-  {
-    String wsdlURL = null;
-    Entry entry = null;
-
-    BindingTemplate bindingTemplate = null;
-    TModel tModel = null;
-
-    // it depricated after refactoring 
-    // now the inner classes moved out from validator
-    //String classPrefix = this.getClass().getName() + "$";
-    String classPrefix = this.getClass().getPackage().getName()+".";
-
-    try
-    {
-      // Set up a reference to the UDDI registry
-      uddiProxy = new UDDIProxy();
-
-      //new Socket(new InetAddress(uddiReference.getInquiryURL()));
-      uddiProxy.setInquiryURL(uddiReference.getInquiryURL());
-      boolean wasEx = false;
-      InputStream stream;
-      try
-      {
-        URL url = StringUtils.getURL(null, uddiReference.getInquiryURL());
-        stream = url.openStream();
-        stream.close();
-      }
-
-      catch (UnknownHostException ex)
-      {
-        wasEx = true;
-      }
-
-      catch (IOException ex)
-      {
-      }
-
-      if (!wasEx)
-      {
-
-        // If the UDDI reference is to a bindingTemplate then get it
-        if (uddiReference.getKeyType().equals(UDDIReference.BINDING_KEY))
-        {
-          // Get binding detail which will contain the bindingTemplate
-          BindingDetail bindingDetail =
-            uddiProxy.get_bindingDetail(uddiReference.getKey());
-
-          // Get bindingTemplate
-          bindingTemplate =
-            (BindingTemplate) bindingDetail
-              .getBindingTemplateVector()
-              .elementAt(
-              0);
-
-          if (verboseOption)
-          {
-            System.err.println(
-              "    BindingTemplate - "
-                + UDDIUtils.bindingTemplateToString(bindingTemplate));
-          }
-
-          // Get the wsdlSpec tModel
-          tModel = findTModel(uddiProxy, bindingTemplate);
-        }
-
-        // Else it has to be a tModel
-        else
-        {
-          TModelDetail tModelDetail =
-            uddiProxy.get_tModelDetail(uddiReference.getKey());
-          tModel = (TModel) tModelDetail.getTModelVector().elementAt(0);
-        }
-
-        if (verboseOption)
-        {
-          System.err.println(
-            "    TModel specified or found in bindingTemplate - "
-              + UDDIUtils.tModelToString(tModel));
-        }
-      }
-
-      if (bindingTemplate == null)
-      {
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DISCOVERY_BINDINGTEMPLATE));
-      }
-
-      // If there is a bindingTemplate, then process test assertions for it
-      else
-      {
-        // Create entry
-        entry = this.reporter.getReport().createEntry();
-        entry.setEntryType(
-          EntryType.getEntryType(EntryType.TYPE_DISCOVERY_BINDINGTEMPLATE));
-        entry.setReferenceID(bindingTemplate.getBindingKey());
-        entry.setEntryDetail(bindingTemplate);
-
-        // Process test assertions
-        processAssertions(
-          classPrefix,
-          new EntryContext(entry, this.analyzerContext));
-      }
-
-      // NOTE: From this point forward, if a bindingTemplate does NOT have a wsdlSpec tModel,
-      //       the tModel will be NULL.
-
-      //Parse WSDL document, and get WSDL document url, binding name and namespace
-      try
-      {
-        String overviewURL = getOverviewURL(tModel);
-        wsdlURL = getWSDLLocation(overviewURL);
-        WSDLDocument wsdlDocument = getWSDLDocument(wsdlURL);
-
-        // ADD: The WSDL binding is used in WSI3001 and should be moved to the entryContext
-        getBinding(overviewURL, wsdlDocument);
-      }
-
-      catch (Exception e)
-      {
-        // ADD:
-        if (verboseOption)
-        {
-          System.err.println("    EXCEPTION: " + e.toString());
-        }
-      }
-
-      // Create entry
-      entry = this.reporter.getReport().createEntry();
-      entry.setEntryType(
-        EntryType.getEntryType(EntryType.TYPE_DISCOVERY_TMODEL));
-      entry.setReferenceID(
-        (tModel == null ? "[tModel]" : tModel.getTModelKey()));
-      entry.setEntryDetail(tModel);
-
-      // Process test assertions
-      processAssertions(
-        classPrefix,
-        new EntryContext(entry, this.analyzerContext));
-    }
-
-    catch (Exception e)
-    {
-      // Throw WSIException
-      if (e instanceof WSIException)
-        throw (WSIException) e;
-      else
-        throw new WSIException(
-          "An exception occurred while processing the discovery test assertions.",
-          e);
-    }
-
-    // Cleanup
-    cleanup();
-
-    // Get WSDL location
-    wsdlURL = this.analyzerContext.getServiceReference().getWSDLLocation();
-
-    // Return WSDL URL
-    return wsdlURL;
-  }
-
-  /**
-   * Set WSDL binding in the service reference portion of the analyzer context.
-   */
-  protected void setWSDLBinding(Binding binding)
-  {
-    String bindingName =
-      binding == null ? null : binding.getQName().getLocalPart();
-    String namespace =
-      binding == null ? null : binding.getQName().getNamespaceURI();
-
-    // Set the WSDL document location in analyzerContext
-    ServiceReference serviceReference =
-      this.analyzerContext.getServiceReference();
-
-    // If the wsdlElement does not exist, then set it
-    WSDLElement wsdlElement;
-    if ((wsdlElement = serviceReference.getWSDLElement()) == null)
-    {
-      // Get the WSDL binding from the overviewURL and set in analyzerContext
-      wsdlElement = new WSDLElementImpl();
-      wsdlElement.setName(bindingName);
-      wsdlElement.setNamespace(namespace);
-      wsdlElement.setType(EntryType.TYPE_DESCRIPTION_BINDING);
-    }
-
-    // Set the wsdlElement in the service reference
-    serviceReference.setWSDLElement(wsdlElement);
-
-    // Set the service reference back into the analyzerContext
-    analyzerContext.setServiceReference(serviceReference);
-  }
-
-  /**
-   * Set the WSDL location in the service reference portion of the analyzer context.
-   */
-  protected void setWSDLLocation(String wsdlURL)
-  {
-    // Set the WSDL document location in analyzerContext
-    ServiceReference serviceReference =
-      this.analyzerContext.getServiceReference();
-    serviceReference.setWSDLLocation(wsdlURL);
-
-    // Set the service reference back into the analyzerContext
-    analyzerContext.setServiceReference(serviceReference);
-  }
-
-  /**
-   * Find the wsdlSpec tModel associated with a binding.
-   */
-  private TModel findTModel(
-    UDDIProxy uddiProxy,
-    BindingTemplate bindingTemplate)
-    throws WSIException
-  {
-    TModel tModel = null;
-
-    // Get the list of tModel references associated with this bindingTemplate
-    Iterator iterator =
-      bindingTemplate
-        .getTModelInstanceDetails()
-        .getTModelInstanceInfoVector()
-        .iterator();
-
-    // Process each tModel reference
-    Vector tModelKeyList = new Vector();
-    while (iterator.hasNext())
-    {
-      // Get tModelInstanceInfo
-      TModelInstanceInfo tModelInstanceInfo =
-        (TModelInstanceInfo) iterator.next();
-
-      // Add key to list
-      tModelKeyList.add(tModelInstanceInfo.getTModelKey());
-    }
-
-    // Get the tModels associated with the bindingTemplate
-    if (tModelKeyList.size() > 0)
-    {
-      try
-      {
-        // Get the tModel details
-        TModelDetail tModelDetail = uddiProxy.get_tModelDetail(tModelKeyList);
-
-        // Get the list of tModels
-        Iterator tModelIterator = tModelDetail.getTModelVector().iterator();
-
-        //boolean tModelFound = false;
-        TModel nextTModel = null;
-
-        // Go through the list of tModels
-        while ((tModelIterator.hasNext()) && (tModel == null))
-        {
-          // Get next tModel in list
-          nextTModel = (TModel) tModelIterator.next();
-
-          if (verboseOption)
-          {
-            System.err.println(
-              "      TModel referenced from bindingTemplate - "
-                + UDDIUtils.tModelToString(nextTModel));
-          }
-
-          // If this is a wsdlSpec tModel, then this is the tModel we want
-          if (isWsdlSpec(nextTModel))
-            tModel = nextTModel;
-        }
-      }
-
-      catch (Exception e)
-      {
-        // Throw WSIException
-        throw new WSIException("Could not get tModel details.", e);
-      }
-    }
-
-    else
-    {
-      // Throw exception
-      //throw new WSIException("UDDI bindingTemplate did not contain any tModel references.");
-    }
-
-    return tModel;
-  }
-
-  /**
-   * Determine if this is a wsdlSpec tModel.
-   */
-  protected boolean isWsdlSpec(TModel tModel)
-  {
-    boolean tModelFound = false;
-    CategoryBag categoryBag = null;
-    Iterator categoryBagIterator = null;
-
-    // Determine if the catetgoryBag contains wsdlSpec
-    if ((categoryBag = tModel.getCategoryBag()) != null)
-    {
-      // Get the list of keyed references
-      categoryBagIterator = categoryBag.getKeyedReferenceVector().iterator();
-
-      KeyedReference keyedReference = null;
-
-      // Go through the list of keyed references
-      while (categoryBagIterator.hasNext() && !(tModelFound))
-      {
-        // Get next keyed reference
-        keyedReference = (KeyedReference) categoryBagIterator.next();
-
-        // If this is a types taxonomy tModel and the value is wsdlSpec, then this is the tModel we want
-        // REMOVE: It is not necessary to check the key name
-        //if (keyedReference.getTModelKey().equalsIgnoreCase(TModel.TYPES_TMODEL_KEY) &&
-        //   "wsdlSpec".equals(keyedReference.getKeyValue()) &&
-        //   ("types".equals(keyedReference.getKeyName()) ||
-        //    "uddi-org:types".equals(keyedReference.getKeyName()))) {
-        //  tModelFound = true;
-        //}
-        if (keyedReference
-          .getTModelKey()
-          .equalsIgnoreCase(TModel.TYPES_TMODEL_KEY)
-          && "wsdlSpec".equals(keyedReference.getKeyValue()))
-        {
-          tModelFound = true;
-        }
-      }
-    }
-
-    return tModelFound;
-  }
-
-  /**
-   * Get an OverviewURL from tModel.
-   */
-  protected String getOverviewURL(TModel tModel)
-  {
-    if (tModel != null
-      && tModel.getOverviewDoc() != null
-      && tModel.getOverviewDoc().getOverviewURL() != null)
-    {
-      return tModel.getOverviewDoc().getOverviewURL().getText();
-    }
-    return null;
-  }
-
-  /**
-   * Get WSDL document.
-   */
-  protected String getWSDLLocation(String wsdlLocation)
-  {
-    int index;
-
-    // Check if the overviewURL contains a fragment identifier
-    if ((index = wsdlLocation.indexOf("#")) > -1)
-    {
-      wsdlLocation = wsdlLocation.substring(0, index);
-    }
-    return wsdlLocation;
-  }
-
-  /**
-   * Get WSDL document.
-   */
-  protected WSDLDocument getWSDLDocument(String wsdlLocation)
-    throws MalformedURLException, WSDLException
-  {
-    return new WSDLDocument(getWSDLLocation(wsdlLocation));
-  }
-
-  /**
-   * Get WSDL binding from the overviewURL in the tModel.
-   */
-  protected Binding getBinding(String overviewURL, WSDLDocument wsdlDocument)
-  {
-    int index;
-    int nameIndex;
-
-    Binding[] bindings = wsdlDocument.getBindings();
-    if (bindings == null || bindings.length == 0)
-      return null;
-
-    if (overviewURL != null)
-    {
-      // Check if the overviewURL contains a fragment identifier
-      if ((index = overviewURL.indexOf("#")) > -1)
-      {
-        // TEMP: Need to use a real XPath evaluator like Xalan
-        String nameAttribute = "@name=";
-
-        // Locate name reference
-        if ((nameIndex =
-          overviewURL.substring(index + 1).indexOf(nameAttribute))
-          > -1)
-        {
-          // Get the next character which should be a quote
-          int firstQuoteIndex = index + 1 + nameIndex + nameAttribute.length();
-          String quote =
-            overviewURL.substring(firstQuoteIndex, firstQuoteIndex + 1);
-
-          // Get the part of the URL which should contain the binding name
-          String urlPart = overviewURL.substring(firstQuoteIndex + 1);
-
-          // Find the next quote
-          int nextQuoteIndex;
-          if ((nextQuoteIndex = urlPart.indexOf(quote)) > -1)
-          {
-            String bindingName = urlPart.substring(0, nextQuoteIndex);
-            //look for binding with the specified name
-            for (int i = 0; i < bindings.length; i++)
-            {
-              if (bindingName.equals(bindings[i].getQName().getLocalPart()))
-                return bindings[i];
-            }
-          }
-        }
-      }
-    }
-
-    return bindings[0];
-  }
-
-  /**
-   * Get string representation of categoryBag.
-   * @param categoryBag a CategoryBag object.
-   * @return string representation of categoryBag.
-   */
-  protected String categoryBagToString(CategoryBag categoryBag)
-  {
-    String toString = "";
-
-    if (categoryBag != null)
-    {
-      Vector keyedReferenceList = null;
-      if (((keyedReferenceList = categoryBag.getKeyedReferenceVector())
-        == null)
-        || (keyedReferenceList.size() == 0))
-      {
-        toString += "No KeyedReferences";
-      }
-
-      else
-      {
-        int count = 1;
-        KeyedReference keyedReference;
-        Iterator iterator = keyedReferenceList.iterator();
-        while (iterator.hasNext())
-        {
-          keyedReference = (KeyedReference) iterator.next();
-          toString += "\n  ["
-            + count++
-            + "] tModelKey: "
-            + keyedReference.getTModelKey()
-            + ", keyName: "
-            + keyedReference.getKeyName()
-            + ", keyValue: "
-            + keyedReference.getKeyValue();
-        }
-      }
-    }
-    else
-    {
-      toString = "null";
-    }
-
-    return toString;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isPrimaryEntryTypeMatch(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  protected boolean isPrimaryEntryTypeMatch(
-    TestAssertion testAssertion,
-    EntryContext targetContext)
-  {
-    boolean match = false;
-
-    // If the test assertion entry type matches the target context entry type, then contine
-    if (testAssertion
-      .getEntryTypeName()
-      .equals(targetContext.getEntry().getEntryType().getTypeName()))
-    {
-      match = true;
-    }
-
-    return match;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isNotApplicable(org.wsi.test.profile.TestAssertion)
-   */
-  protected boolean isNotApplicable(TestAssertion testAssertion)
-  {
-    boolean notApplicable = false;
-
-    // ADD:
-
-    return notApplicable;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3001.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3001.java
deleted file mode 100644
index de684b0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3001.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-/**
- * WSI3001
- */
-public class WSI3001 extends BP3001
-{
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public WSI3001(UDDIValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3002.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3002.java
deleted file mode 100644
index c08dd2e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3002.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-/**
- * WSI3002
- */
-public class WSI3002 extends BP3002
-{
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public WSI3002(UDDIValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3003.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3003.java
deleted file mode 100644
index deb0176..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3003.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-/**
- * WSI3003
- */
-public class WSI3003 extends BP3003
-{
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public WSI3003(UDDIValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3004.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3004.java
deleted file mode 100644
index 065480e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3004.java
+++ /dev/null

@@ -1,290 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Port;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.UDDIUtils;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-import org.w3c.dom.Element;
-
-
-/**
- * WSI3004 - The conformance claims in the uddi:tModel are the same
- * as those in the wsdl:binding which is referenced by the uddi:tModel.
- */
-public class WSI3004 extends AssertionProcessVisitor implements WSITag
-{
-  private final UDDIValidatorImpl validator;
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public WSI3004(UDDIValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private static final String PORTS_PARAM = "ports";
-  private static final String BINDING_PARAM = "binding";
-
-  /**
-   * Gets WSI conformance claims from a tModel.
-   * @param tModel
-   * @return HashSet
-   * @throws WSIException
-   */
-  private HashSet getConformanceClaimsFromUDDI(TModel tModel)
-    throws WSIException
-  {
-    String conformanceKey = UDDIUtils.getWSIConformanceTModelKey(validator.uddiProxy);
-
-    HashSet result = new HashSet();
-
-    CategoryBag bag = tModel.getCategoryBag();
-    if (bag != null)
-    {
-      Vector references = bag.getKeyedReferenceVector();
-      for (int i = 0; i < references.size(); i++)
-      {
-        KeyedReference ref = (KeyedReference) references.get(i);
-
-        if (ref.getTModelKey().equalsIgnoreCase(conformanceKey))
-        {
-          result.add(ref.getKeyValue());
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * Gets WSI conformance claims from WSDL binding
-   * that references specified tModel. Additionally,
-   * WSDL ports, which uses the binding, are processed.
-   *
-   * @param tModel
-   * @return HashSet
-   */
-  private HashSet getConformanceClaimsFromWSDL(TModel tModel)
-  {
-    HashSet result = new HashSet();
-
-    try
-    {
-      // Read the WSDL document
-      String overviewURL = validator.getOverviewURL(tModel);
-      WSDLDocument wsdlDocument = validator.getWSDLDocument(overviewURL);
-
-      // Get binding
-      Binding binding = validator.getBinding(overviewURL, wsdlDocument);
-      String bindingName = binding.getQName().getLocalPart();
-
-      // Get claims
-      result =
-        getClaimsFromElement(binding.getDocumentationElement(), result);
-
-      // Get ports, which reference this binding, because:
-      // "A claim on a wsdl:port is inherited by the referenced wsdl:bindings."
-      Vector ports = getPorts(wsdlDocument, bindingName);
-      for (int i = 0; i < ports.size(); i++)
-      {
-        Port port = (Port) ports.get(i);
-
-        result = getClaimsFromElement(port.getDocumentationElement(), result);
-      }
-    }
-    catch (Exception e)
-    {
-      // ADD:
-    }
-
-    return result;
-  }
-
-  /**
-   * Gets WSI conformance claims from the 'documentation' XML element
-   * and puts them into the HashSet.
-   * @param docElement
-   * @param result
-   * @return HashSet
-   */
-  private HashSet getClaimsFromElement(Element docElement, HashSet result)
-  {
-    if (result == null)
-    {
-      result = new HashSet();
-    }
-
-    if (docElement != null)
-    {
-      Element claimElement = XMLUtils.findChildElement(docElement, WSI_CLAIM);
-      while (claimElement != null)
-      {
-        /*
-        Node attr = XMLUtils.getAttribute(claimElement, ATTR_CLAIM_CONFORMSTO);
-        if (attr != null)
-        	result.add(attr.getNodeValue());
-        */
-        String value =
-          claimElement.getAttribute(ATTR_CLAIM_CONFORMSTO.getLocalPart());
-        if (value != null)
-          result.add(value);
-
-        claimElement = XMLUtils.findElement(claimElement, WSI_CLAIM);
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * Gets wsdl:ports, which use specified binding.
-   * @param wsdlDocument
-   * @param bindingName
-   * @return Vector
-   */
-  private Vector getPorts(WSDLDocument wsdlDocument, String bindingName)
-  {
-    Vector ports = new Vector();
-
-    Map params = new HashMap();
-    params.put(PORTS_PARAM, ports);
-    params.put(BINDING_PARAM, bindingName);
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitPort(true);
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-    traversal.traverse(wsdlDocument.getDefinitions(), params);
-
-    return ports;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Port, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Port port, Object parent, WSDLTraversalContext ctx)
-  {
-    if (port
-      .getBinding()
-      .getQName()
-      .getLocalPart()
-      .equals(ctx.getParameter(BINDING_PARAM).toString()))
-    {
-      ((Vector) ctx.getParameter(PORTS_PARAM)).add(port);
-    }
-  }
-
-  /* (non-Javadoc)
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the tModel from the entryContext
-    TModel tModel = (TModel) entryContext.getEntry().getEntryDetail();
-
-    // If the tModel does not exist, then fail
-    if (tModel == null)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetailMessage = "Could not locate a tModel.";
-    }
-
-    // If there is a tModel
-    else
-    {
-      try
-      {
-        HashSet claimsFromUDDI = getConformanceClaimsFromUDDI(tModel);
-        HashSet claimsFromWSDL = getConformanceClaimsFromWSDL(tModel);
-
-        if (claimsFromUDDI.size() == 0)
-        {
-          result = AssertionResult.RESULT_PASSED;
-        }
-        else if (claimsFromUDDI.size() == claimsFromWSDL.size())
-        {
-          int counter = 0;
-          for (Iterator iter = claimsFromWSDL.iterator(); iter.hasNext();)
-          {
-            String claim = (String) iter.next();
-
-            for (Iterator iter2 = claimsFromUDDI.iterator();
-              iter2.hasNext();
-              )
-            {
-              String uddiClaim = (String) iter2.next();
-              if (claim.equalsIgnoreCase(uddiClaim))
-              {
-                counter++;
-                break;
-              }
-            }
-          }
-
-          if (counter != claimsFromWSDL.size())
-          {
-            // failed
-            result = AssertionResult.RESULT_FAILED;
-            failureDetailMessage =
-              "The tModel key is: [" + tModel.getTModelKey() + "].";
-          }
-        }
-        else
-        {
-          // failed
-          result = AssertionResult.RESULT_FAILED;
-          failureDetailMessage =
-            "The tModel key is: [" + tModel.getTModelKey() + "].";
-        }
-      }
-      catch (IllegalStateException e)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetailMessage =
-          "The tModel key is: [" + tModel.getTModelKey() + "].";
-      }
-
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetailMessage);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3005_OBSOLETE.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3005_OBSOLETE.java
deleted file mode 100644
index fc6f5a4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3005_OBSOLETE.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.UDDIUtils;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-
-/**
- * WSI3005_OBSOLETE - A uddi:tModel which claims conformance with a WS-I profile
- * must be categorized using the ws-i-org:conformsTo taxonomy.
- */
-public class WSI3005_OBSOLETE extends AssertionProcess
-{
-  private final UDDIValidatorImpl validator;
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public WSI3005_OBSOLETE(UDDIValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * Validates the test assertion.
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the tModel from the entryContext
-    TModel tModel = (TModel) entryContext.getEntry().getEntryDetail();
-
-    // If the tModel does not exist, then fail
-    if (tModel == null)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetailMessage = "Could not locate a tModel.";
-    }
-
-    // If there is a tModel
-    else
-    {
-      CategoryBag bag = tModel.getCategoryBag();
-
-      try
-      {
-        if (!checkCategoryBag(this.validator.uddiProxy, bag))
-        {
-          // failed
-          result = AssertionResult.RESULT_FAILED;
-          failureDetailMessage =
-            "The tModel key is: [" + tModel.getTModelKey() + "].";
-        }
-      }
-      catch (IllegalStateException e)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetailMessage =
-          "The UDDI registry does not contain WSI conformance taxonomy"
-            + " tModel (\"ws-i-org:conformsTo:2002_12\").";
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetailMessage);
-  }
-
-  /**
-   * Checks a category bag.
-   * @param proxy
-   * @param bag
-   * @return boolean
-   */
-  private boolean checkCategoryBag(UDDIProxy proxy, CategoryBag bag)
-  {
-    String conformanceKey = UDDIUtils.getWSIConformanceTModelKey(proxy);
-
-    boolean result = false;
-
-    if (bag != null)
-    {
-      Vector references = bag.getKeyedReferenceVector();
-      for (int i = 0; i < references.size() && !result; i++)
-      {
-        KeyedReference ref = (KeyedReference) references.get(i);
-
-        result = ref.getTModelKey().equalsIgnoreCase(conformanceKey);
-      }
-    }
-
-    return result;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3006.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3006.java
deleted file mode 100644
index aa8c003..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3006.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionResultException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.UDDIUtils;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-
-/**
- * WSI3006 - The uddi:tModel uses the ws-i-org:conformsTo:2002_12 categorization
- * value of "http://ws-i.org/profiles/base/1.0". The categoryBag in the tModel
- * contains a keyedReference with a tModelKey that contains the key value
- * uuid:65719168-72c6-3f29-8c20-62defb0961c0 for the ws-i-org:conformsTo:2002_12
- * tModel.
- */
-public class WSI3006 extends AssertionProcess
-{
-  private final UDDIValidatorImpl validator;
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public WSI3006(UDDIValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * Validates the test assertion.
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    result = AssertionResult.RESULT_PASSED;
-    failureDetailMessage = null;
-    KeyedReference claimKeyedRef = null;
-
-    // check whether a UDDI conformance claim is being made...
-
-    // Get the tModel from the entryContext
-    TModel tModel = (TModel) entryContext.getEntry().getEntryDetail();
-    try
-    {
-      if ((claimKeyedRef = conformanceClaimMade(tModel)) == null)
-      {
-        throw new AssertionResultException(
-          AssertionResult.RESULT_NOT_APPLICABLE);
-      }
-
-      // we have a conformance claim, so check the keyedReference keyValue
-      if (!claimKeyedRef
-        .getKeyValue()
-        .equals(WSIConstants.ATTRVAL_UDDI_CLAIM_KEYVALUE))
-      {
-        throw new AssertionResultException(
-          AssertionResult.RESULT_FAILED,
-          "The tModel key is: ["
-            + tModel.getTModelKey()
-            + "].\nThe categoryBag is: ["
-            + tModel.getCategoryBag()
-            + "].");
-      }
-    }
-    catch (AssertionResultException e)
-    {
-      result = e.getMessage();
-      failureDetailMessage = e.getDetailMessage();
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetailMessage);
-  }
-
-  /**
-   * Checks a category bag and extracts KeyedReference containing
-   * the conformance claim.
-   * @param proxy
-   * @param bag
-   * @return boolean
-   */
-  private KeyedReference checkCategoryBag(UDDIProxy proxy, CategoryBag bag)
-  {
-    String conformanceKey = null;
-    try
-    {
-      conformanceKey = UDDIUtils.getWSIConformanceTModelKey(proxy);
-    }
-    catch (IllegalStateException ex)
-    {
-      return null;
-    }
-
-    boolean result = true;
-    KeyedReference conformanceRef = null;
-
-    if (bag != null)
-    {
-      Vector references = bag.getKeyedReferenceVector();
-      for (int i = 0; i < references.size() && result; i++)
-      {
-        KeyedReference ref = (KeyedReference) references.get(i);
-
-        if (ref
-          .getTModelKey()
-          .equalsIgnoreCase(conformanceKey) //&& ref.getKeyValue().equals(WSIConstants.ATTRVAL_UDDI_CLAIM_KEYVALUE)
-        // we need only tModel key
-        )
-        {
-          result = true;
-          conformanceRef = ref;
-        }
-      }
-    }
-
-    return conformanceRef;
-  }
-  /**
-   * Gets KeyedReference containing the conformance claim.
-   * @param tModel
-   * @return
-   * @throws WSIException
-   */
-  private KeyedReference conformanceClaimMade(TModel tModel)
-    throws WSIException
-  {
-
-    // If the tModel does not exist, then fail
-    if (tModel == null)
-    {
-      throw new IllegalArgumentException("tModel cannot be null");
-    }
-
-    // If there is a tModel
-    else
-    {
-      CategoryBag bag = tModel.getCategoryBag();
-      return checkCategoryBag(this.validator.uddiProxy, bag);
-    }
-
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3007.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3007.java
deleted file mode 100644
index 06674dd..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3007.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.UDDIUtils;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-
-/**
- * WSI3007 - A uddi:businessEntity or uddi:businessService associated
- * with this uddi:bindingTemplate is not categorized using
- * the ws-i-org:conformsTo:2002_12 taxonomy.
- */
-public class WSI3007 extends AssertionProcess
-{
-  private final UDDIValidatorImpl validator;
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public WSI3007(UDDIValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * Validates the test assertion.
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the bindingTemplate from the entryContext
-    BindingTemplate bindingTemplate =
-      (BindingTemplate) entryContext.getEntry().getEntryDetail();
-
-    boolean validService = false;
-    boolean validBusiness = false;
-
-    String serviceKey = null;
-    String businessKey = null;
-    try
-    {
-      serviceKey = bindingTemplate.getServiceKey();
-      BusinessService service =
-        UDDIUtils.getBusinessServiceByKey(this.validator.uddiProxy, serviceKey);
-
-      businessKey = service.getBusinessKey();
-      BusinessEntity business =
-        UDDIUtils.getBusinessByKey(this.validator.uddiProxy, businessKey);
-
-      validService = checkCategoryBag(this.validator.uddiProxy, service.getCategoryBag());
-      validBusiness = checkCategoryBag(this.validator.uddiProxy, business.getCategoryBag());
-
-      if (!validBusiness || !validService)
-      {
-        result = AssertionResult.RESULT_FAILED;
-
-        if (!validBusiness)
-        {
-          failureDetailMessage =
-            "The businessEntity key is: [" + businessKey + "].";
-        }
-
-        if (!validService)
-        {
-          if (!validBusiness)
-            failureDetailMessage += " ";
-          else
-            failureDetailMessage = "";
-
-          failureDetailMessage += "The businessService key is: ["
-            + serviceKey
-            + "].";
-        }
-      }
-    }
-    catch (IllegalStateException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetailMessage =
-        "The UDDI registry does not contain WSI conformance taxonomy"
-          + " tModel (\"ws-i-org:conformsTo:2002_12\").";
-    }
-    catch (Throwable e)
-    {
-      throw new WSIException(
-        "An exception occurred while processing the discovery test assertions.",
-        e);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetailMessage);
-  }
-
-  /**
-   * Checks whether the category bag contains the conformance claim.
-   * Returns <b>true</b> if the bag does not contain the conformance claim.
-   * @param proxy
-   * @param bag
-   * @return boolean
-   */
-  private boolean checkCategoryBag(UDDIProxy proxy, CategoryBag bag)
-  {
-    String conformanceKey = null;
-    try
-    {
-      conformanceKey = UDDIUtils.getWSIConformanceTModelKey(proxy);
-    }
-    catch (IllegalStateException ex)
-    {
-      return false;
-    }
-
-    boolean result = true;
-
-    if (bag != null)
-    {
-      Vector references = bag.getKeyedReferenceVector();
-      for (int i = 0; i < references.size() && result; i++)
-      {
-        KeyedReference ref = (KeyedReference) references.get(i);
-
-        result = !ref.getTModelKey().equalsIgnoreCase(conformanceKey);
-      }
-    }
-
-    return result;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3021.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3021.java
deleted file mode 100644
index 085352d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3021.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.uddi;
-
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.UDDIUtils;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-
-/**
-* WSI3021 - The uddi:tModel has a "name" element of value "ws-i-org:conformsTo:2002_12" ,
-* has an overviewURL value of "http://ws-i.org/schemas/conformanceClaim/", and has
-* a keyedReference element with keyName attribute value of "uddi-org:types:categorization".
-*/
-public class WSI3021 extends AssertionProcess
-{
-  private final UDDIValidatorImpl validator;
-
-  /**
-   * @param UDDIValidatorImpl
-   */
-  public WSI3021(UDDIValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * Validates the test assertion.
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    TModel tModel =
-      UDDIUtils.getTModelByKey(
-        this.validator.uddiProxy,
-        UDDIUtils.getWSIConformanceTModelKey(this.validator.uddiProxy));
-
-    // If the tModel does not exist, then fail
-    if (tModel == null)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetailMessage = "Could not locate a tModel.";
-    }
-    else
-    {
-      boolean validURL =
-        tModel.getOverviewDoc() != null
-          && "http://ws-i.org/schemas/conformanceClaim/".equals(
-            tModel.getOverviewDoc().getOverviewURLString());
-      boolean validCategory = checkCategoryBag(tModel.getCategoryBag());
-
-      if (validURL && validCategory)
-      {
-        result = AssertionResult.RESULT_PASSED;
-      }
-      else
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetailMessage = this.validator.uddiReference.getInquiryURL();
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetailMessage);
-  }
-
-  /**
-   * Checks whether the category bag meets the WSI's requirements.
-   * @param bag
-   * @return
-   */
-  private boolean checkCategoryBag(CategoryBag bag)
-  {
-    boolean result = false;
-
-    if (bag != null)
-    {
-      Vector references = bag.getKeyedReferenceVector();
-      for (int i = 0; i < references.size() && !result; i++)
-      {
-        KeyedReference ref = (KeyedReference) references.get(i);
-
-        result =
-          "uddi-org:types:categorization".equals(ref.getKeyName())
-            && "categorization".equals(ref.getKeyValue())
-            && "uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4".equals(
-              ref.getTModelKey());
-      }
-    }
-
-    return result;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2901.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2901.java
deleted file mode 100644
index 42e561f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2901.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2901
- *
- * <context>For a candidate wsdl:binding element</context>
- * <assertionDescription>A description uses either the WSDL MIME Binding as described in WSDL 1.1 Section 5
- * or WSDL SOAP binding as described in WSDL 1.1 Section 3
- * on each of the wsdl:input or wsdl:output elements of a wsdl:binding. </assertionDescription>
- */
-public class AP2901 extends AssertionProcess implements WSITag
-{
-  /**
-   * WSDLValidator
-   */
-  private final WSDLValidatorImpl validator;
-
-  private Collection mimeElements;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2901(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-
-    mimeElements = new HashSet();
-    mimeElements.add(WSDL_MIME_CONTENT);
-    mimeElements.add(WSDL_MIME_XML);
-    mimeElements.add(WSDL_MIME_MULTIPART);
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-
-        // Getting wsdl:input and wsdl:output elements of an operation
-        BindingInput bindingInput = bindingOperation.getBindingInput();
-        BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-
-        QName inapplicableElement = null;
-        // Getting an inapplicable extensibility element of wsdl:input
-        // If such element exists, the assertion failed
-        if (bindingInput != null)
-        {
-          // Getting an inapplicable extensibility element of wsdl:input
-          // If such element exists, the assertion failed
-          inapplicableElement = getInapplicableElement(bindingInput.getExtensibilityElements());
-
-          if (inapplicableElement != null)
-            throw new AssertionFailException(inapplicableElement.toString());
-        }
-        
-        // Getting an inapplicable extensibility element of wsdl:output
-        // If such element exists, the assertion failed
-        if (bindingOutput != null)
-        {
-          inapplicableElement =
-            getInapplicableElement(bindingOutput.getExtensibilityElements());
-          if (inapplicableElement != null)
-            throw new AssertionFailException(inapplicableElement.toString());
-        }
-      }
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Looks for any extensibility element of wsdl:input or wsdl:output
-   * that does not conform to the SOAP binding or the MIME binding.
-   * @param extElems a list of extensibility elements
-   * @return the QName of an inapplicable element
-   */
-  private QName getInapplicableElement(List extElems)
-  {
-    for (int i = 0; i < extElems.size(); i++)
-    {
-      QName elementName =
-        ((ExtensibilityElement) extElems.get(i)).getElementType();
-
-      if (!mimeElements.contains(elementName) &&
-          !elementName.equals(WSDL_SOAP_BODY) &&
-          !elementName.equals(WSDL_SOAP_HEADER))
-      {
-        return elementName;
-      }
-    }
-
-    return null;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2903.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2903.java
deleted file mode 100644
index 02bc313..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2903.java
+++ /dev/null

@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Output;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEContent;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2903
- *
- * <context>For a candidate wsdl:binding with at least one mime:content element</context>
- * <assertionDescription>The part attribute of each mime:content element in a wsdl:binding references
- * a wsdl:part element of a wsdl:message that is present in the respective wsdl:input or wsdl:output of the
- * corresponding wsdl:operation of the corresponding wsdl:portType.</assertionDescription>
- */
-public class AP2903 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2903(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // A variable that indicates a binding contains at least one
-      // mime:content element
-      boolean mimeContentsFound = false;
-
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-
-        // Getting wsdl:input and wsdl:output elements of an operation
-        BindingInput bindingInput = bindingOperation.getBindingInput();
-        BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-
-        // Collecting all the mime:content elements from wsdl:input and wsdl:output
-        List inputMimeContents = getMimeContentElements(
-          bindingInput == null ? null : bindingInput.getExtensibilityElements());
-        List outputMimeContents = getMimeContentElements(
-          bindingOutput == null ? null : bindingOutput.getExtensibilityElements());
-
-        // If the wsdl:input contains mime:content elements
-        if (!inputMimeContents.isEmpty())
-        {
-          mimeContentsFound = true;
-          Input portTypeInput = bindingOperation.getOperation().getInput();
-          // If there is no the corresponding wsdl:input in wsdl:portType,
-          // the assertion failed
-          if (portTypeInput == null)
-            throw new AssertionFailException(
-              "There is no the corresponging wsdl:input in the wsdl:portType"
-              + " operation for the wsdl:input of the \""
-              + bindingOperation.getName() + "\" binding operation.");
-
-          // If the wsdl:portType input does not reference any wsdl:message,
-          // the assertion failed
-          if (portTypeInput.getMessage() == null)
-            throw new AssertionFailException("The wsdl:input of the \""
-              + bindingOperation.getOperation().getName() + "\" wsdl:portType "
-              + "operation does not reference any wsdl:message.");
-
-          // Getting the part name that is not specified in the wsdl:message
-          // the input of wsdl:portType refers to
-          String part = getInvalidMimeContentPart(
-            inputMimeContents, portTypeInput.getMessage());
-
-          // If such part is found, the assertion failed
-          if (part != null)
-            throw new AssertionFailException("part=\"" + part +
-              "\", the input of the binding operation \""
-              + bindingOperation.getName() + "\"");
-        }
-
-        // If the wsdl:output contains mime:content elements
-        if (!outputMimeContents.isEmpty())
-        {
-          mimeContentsFound = true;
-          Output portTypeOutput = bindingOperation.getOperation().getOutput();
-          // If there is no the corresponding wsdl:input in wsdl:portType,
-          // the assertion failed
-          if (portTypeOutput == null)
-            throw new AssertionFailException(
-              "There is no the corresponging wsdl:output in the wsdl:portType"
-              + " operation for the wsdl:output of the \""
-              + bindingOperation.getName() + "\" binding operation.");
-
-          // If the wsdl:portType output does not reference any wsdl:message,
-          // the assertion failed
-          if (portTypeOutput.getMessage() == null)
-            throw new AssertionFailException("The wsdl:output of the \""
-              + bindingOperation.getOperation().getName() + "\" wsdl:portType "
-              + "operation does not reference any wsdl:message.");
-
-          // Getting the part name that is not specified in the wsdl:message
-          // the output of wsdl:portType refers to
-          String part = getInvalidMimeContentPart(
-              outputMimeContents, portTypeOutput.getMessage());
-
-          // If such part is found, the assertion failed
-          if (part != null)
-            throw new AssertionFailException("part=\"" + part +
-                "\", the output of the binding operation \""
-                + bindingOperation.getName() + "\"");
-        }
-      }
-
-      // If the binding contains no mime:content elements,
-      // the assertion is not applicable
-      if (!mimeContentsFound)
-        throw new AssertionNotApplicableException();
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Collects all mime:content elements.
-   * @param extElems a list of extensibility elements that can contain mime:contentS.
-   * @return the list of mime:content elements found.
-   */
-  private List getMimeContentElements(List extElems)
-  {
-    List mimeContentElements = new ArrayList();
-
-    if (extElems != null)
-    {
-      // Going through all the extensibility elements
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(i);
-        // If the element is mime:multipartRelated
-        if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-        {
-          // Getting the mime:part elements of the mime:multipartRelated
-          List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-          // Going through all the mime:part elements
-          for (int j = 0; j < mimeParts.size(); j++)
-          {
-            // Collecting all the mime:content elements of this mime:part
-            List elems = getMimeContentElements(
-              ((MIMEPart) mimeParts.get(j)).getExtensibilityElements());
-            // Adding the elements to the list being returned
-            mimeContentElements.addAll(elems);
-          }
-        }
-        // Else if the element is mime:content
-        else if (extElem.getElementType().equals(WSDL_MIME_CONTENT))
-        {
-          // Adding the element to the list being returned
-          mimeContentElements.add(extElem);
-        }
-      }
-    }
-
-    return mimeContentElements;
-  }
-
-  /**
-   * Returns part name specified in mime:content element that is not presented in wsdl:message
-   * @param mimeContents a list of mime:content elements which part attributes are validated
-   * @param message a wsdl:message
-   * @return a part name
-   */
-  private String getInvalidMimeContentPart(List mimeContents, Message message)
-  {
-    // Going throug all the mime:content elements
-    for (int i = 0; i < mimeContents.size(); i++)
-    {
-      // Getting the part name of a mime:element
-      String part = ((MIMEContent) mimeContents.get(i)).getPart();
-      // If the wsdl:message does not contain such part, return the part
-      if (!message.getParts().keySet().contains(part))
-        return part;
-    }
-    // Return null if no one part is found
-    return null;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2904.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2904.java
deleted file mode 100644
index c5a9716..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2904.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2904
- * <context>For a candidate wsdl:binding with at least one mime:content element</context>
- * <assertionDescription>The part attribute of each mime:content element in a wsdl:binding
- * does not reference a sub-component of a wsdl:part of the wsdl:message that is present in the
- * respective wsdl:input or wsdl:output of the corresponding wsdl:operation of the corresponding
- * wsdl:portType.</assertionDescription>
- */
-public class AP2904 extends AP2903
-{
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2904(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Return assertion result
-    return super.validate(testAssertion, entryContext);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2906.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2906.java
deleted file mode 100644
index 2c9c7cd..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2906.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2906
- *
- * <context>For a candidate wsdl:binding containing a mime:multipartRelated element</context>
- * <assertionDescription>A non-root MIME part in a wsdl:binding does not contain a soapbind:header element.</assertionDescription>
- */
-public class AP2906 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2906(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // A variable that indicates a binding contains at least one
-      // mime:multipartRelated element
-      boolean multipartsFound = false;
-
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-
-        // Getting wsdl:input and wsdl:output elements of an operation
-        BindingInput bindingInput = bindingOperation.getBindingInput();
-        BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-
-        // Collecting all the mime:multipartRelated elements from wsdl:input and wsdl:output
-        List inputMultiparts = getMimeMultipartElements(
-          bindingInput == null ? null : bindingInput.getExtensibilityElements());
-        List outputMultiparts = getMimeMultipartElements(
-          bindingOutput == null ? null : bindingOutput.getExtensibilityElements());
-
-        // If the wsdl:input contains mime:multipartRelated elements
-        if (!inputMultiparts.isEmpty())
-        {
-          multipartsFound = true;
-
-          // If there is a soap:header in the non-root mime:part,
-          // the assertion failed
-          if (containsInvalidMimePart(inputMultiparts))
-          {
-            throw new AssertionFailException("The invalid mime:part element "
-              + "is in the wsdl:input of the \"" + bindingOperation.getName()
-              + "\" binding operation.");
-          }
-        }
-
-        // If the wsdl:output contains mime:multipartRelated elements
-        if (!outputMultiparts.isEmpty())
-        {
-          multipartsFound = true;
-
-          // If there is a soap:header in the non-root mime:part,
-          // the assertion failed
-          if (containsInvalidMimePart(outputMultiparts))
-          {
-            throw new AssertionFailException("The invalid mime:part element "
-                + "is in the wsdl:output of the \"" + bindingOperation.getName()
-                + "\" binding operation.");
-          }
-        }
-      }
-      // If the binding contains no one mime:multipartRelated element,
-      // the assertion is not applicable
-      if (!multipartsFound)
-        throw new AssertionNotApplicableException();
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Looks for such non-root mime:part element from a list of mime:multipartRelated elements
-   * that contains a soap:header element.
-   * @param multiparts a list of mime:multipartRelated elements
-   * @return true, if such element is found, false otherwise
-   */
-  private boolean containsInvalidMimePart(List multiparts)
-  {
-    // Going through a list of mime:multipartRelated elements
-    for (int i = 0; i < multiparts.size(); i++)
-    {
-      // Getting a list of mime:part elements
-      List mimeParts =
-        ((MIMEMultipartRelated) multiparts.get(i)).getMIMEParts();
-
-      // Looking for non-root mime:partS
-      if (mimeParts.size() > 1)
-      {
-        for (int j = 1; j < mimeParts.size(); j++)
-        {
-          // Getting a list of extensibility elements of a mime:part
-          List extElems =
-            ((MIMEPart) mimeParts.get(j)).getExtensibilityElements();
-          // Going through the extensibility elements
-          for (int k = 0; k < extElems.size(); k++)
-          {
-            // If an extensibility element is a soap:header,
-            // return true
-            if (((ExtensibilityElement)extElems.get(k))
-              .getElementType().equals(WSDL_SOAP_HEADER))
-            {
-              return true;
-            }
-          }
-        }
-      }
-    }
-    // return false, if the element is not found
-    return false;
-  }
-
-  /**
-   * Collects all mime:multipartRelated elements.
-   * @param extElems a list of extensibility elements that can contain mime:multipartRelated elements.
-   * @return the list of mime:multipartRelated elements found.
-   */
-  private List getMimeMultipartElements(List extElems)
-  {
-    List mimeMultipartElements = new ArrayList();
-
-    if (extElems != null)
-    {
-      // Going through all the extensibility elements
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(i);
-        // If the element is mime:multipartRelated
-        if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-        {
-          // Adding the element to the list being returned
-          mimeMultipartElements.add(extElem);
-          // Getting the mime:part elements of the mime:multipartRelated
-          List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-          // Going through all the mime:part elements
-          for (int j = 0; j < mimeParts.size(); j++)
-          {
-            // Collecting all the mime:multipartRelated elements of this mime:part
-            List elems = getMimeMultipartElements(
-              ((MIMEPart) mimeParts.get(j)).getExtensibilityElements());
-            // Adding the elements to the list being returned
-            mimeMultipartElements.addAll(elems);
-          }
-        }
-      }
-    }
-
-    return mimeMultipartElements;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2907.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2907.java
deleted file mode 100644
index 494445f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2907.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2907
- *
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>Each MIME part in a description is defined using
- * an element with a local name of part in the namespace of the
- * WSDL MIME Binding extension.</assertionDescription>
- */
-public class AP2907 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2907(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2908.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2908.java
deleted file mode 100644
index 5208c8a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2908.java
+++ /dev/null

@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * AP2908
- *
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>The mime:part element in a DESCRIPTION does not have a name attribute.</assertionDescription>
- */
-public class AP2908 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2908(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // Getting a wsdl:binding
-      Binding wsdlBinding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Since WSDL4J 1.4 ignores any attributes of mime:part, use Xerces 2.6.2 instead
-      Document doc = XMLUtils.parseXMLDocument(validator.wsdlURL);
-
-      // Finding the wsdl:binding element being processed
-      Element binding = getBindingElement(
-        doc.getDocumentElement(), wsdlBinding.getQName().getLocalPart());
-
-      List ops = getChildElements(binding, WSDL_OPERATION);
-
-      // A variable that indicates a binding contains at least one
-      // mime:multipartRelated element
-      boolean multipartsFound = false;
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        Element bindingOperation = (Element) ops.get(i);
-
-        // Getting wsdl:input and wsdl:output elements of an operation
-        Element bindingInput = getChildElement(bindingOperation, WSDL_INPUT);
-        Element bindingOutput = getChildElement(bindingOperation, WSDL_OUTPUT);
-
-        // Collecting all the mime:multipartRelated elements from wsdl:input and wsdl:output
-        List inputMultiparts = getMimeMultipartElements(bindingInput);
-        List outputMultiparts = getMimeMultipartElements(bindingOutput);
-
-        // If the wsdl:input contains mime:multipartRelated elements
-        if (!inputMultiparts.isEmpty())
-        {
-          multipartsFound = true;
-
-          // If there is a mime:part element containing a name attribute,
-          // the assertion failed
-          if (containsInvalidMimePart(inputMultiparts))
-          {
-            throw new AssertionFailException("The invalid "
-                + "mime:part element is in the wsdl:input of the \""
-                + bindingOperation.getAttribute(WSIConstants.ATTR_NAME)
-                + "\" binding operation.");
-          }
-        }
-
-        // If the wsdl:output contains mime:multipartRelated elements
-        if (!outputMultiparts.isEmpty())
-        {
-          multipartsFound = true;
-
-          // If there is a mime:part element containing a name attribute,
-          // the assertion failed
-          if (containsInvalidMimePart(outputMultiparts))
-          {
-            throw new AssertionFailException("The invalid "
-                + "mime:part element is in the wsdl:output of the \""
-                + bindingOperation.getAttribute(WSIConstants.ATTR_NAME)
-                + "\" binding operation.");
-          }
-        }
-      }
-      // If the binding contains no one mime:multipartRelated element,
-      // the assertion is not applicable
-      if (!multipartsFound)
-        throw new AssertionNotApplicableException();
-    }
-    catch (IOException ioe)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Validates mime:part elements for each of mime:multipartRelated element.
-   * @param multiparts a list of mime:multipartRelated elements.
-   * @return true, if any mime:part contains a name attribute, false otherwise.
-   */
-  private boolean containsInvalidMimePart(List multiparts) {
-    // Going through a list of mime:multipartRelated elements
-    for (int i = 0; i < multiparts.size(); i++)
-    {
-      // Getting a list of mime:part elements
-      List mimeParts =
-        getChildElements((Element) multiparts.get(i), WSDL_MIME_PART);
-      // Going through all the mime:part elements
-      for (int j = 0; j < mimeParts.size(); j++)
-      {
-        Element mimePart = (Element) mimeParts.get(j);
-        // If the mime:part element contains a name attribute,
-        // return true
-        if (mimePart.getAttributeNode(WSIConstants.ATTR_NAME) != null)
-        {
-          return true;
-        }
-      }
-    }
-    // No one invalid mime:part element is found, return false
-    return false;
-  }
-
-  /**
-   * Collects all mime:multipartRelated elements.
-   * @param parent an element which the child elements are gathered from.
-   * @return the list of mime:multipartRelated elements found.
-   */
-  private List getMimeMultipartElements(Element parent)
-  {
-    List mimeMultipartElements = new ArrayList();
-    // If the parent is not null
-    if (parent != null)
-    {
-      // Getting the first parent's child
-      Element child = XMLUtils.getFirstChild(parent);
-      while (child != null)
-      {
-        // If the child is a mime:multipartRelated element
-        if (child.getNamespaceURI().equals(WSDL_MIME_MULTIPART.getNamespaceURI())
-          && child.getLocalName().equals(WSDL_MIME_MULTIPART.getLocalPart()))
-        {
-          // Adding the element to the list being returned
-          mimeMultipartElements.add(child);
-
-          // Getting mime:partS from the element
-          List mimeParts = getChildElements(child, WSDL_MIME_PART);
-          // Going through all the mime:part elements
-          for (int i = 0; i < mimeParts.size(); i++)
-          {
-            // Collecting all the mime:multipartRelated elements of this mime:part
-            List elems = getMimeMultipartElements((Element) mimeParts.get(i));
-            // Adding the elements to the list being returned
-            mimeMultipartElements.addAll(elems);
-          }
-        }
-        // Getting the next child
-        child = XMLUtils.getNextSibling(child);
-      }
-    }
-
-    return mimeMultipartElements;
-  }
-
-  /**
-   * Looks for an element's child element.
-   * @param parent a parent element.
-   * @param childName a qualified element name being found.
-   * @return an element or null if it is not found.
-   */
-  private Element getChildElement(Element parent, QName childName)
-  {
-    // Getting the first parent's child
-    Element child = XMLUtils.getFirstChild(parent);
-    while (child != null)
-    {
-      // If the child has the required qualified name
-      if (child.getNamespaceURI().equals(childName.getNamespaceURI())
-        && child.getLocalName().equals(childName.getLocalPart()))
-      {
-        // return the child
-        return child;
-      }
-      // Getting the next child
-      child = XMLUtils.getNextSibling(child);
-    }
-    return null;
-  }
-
-  /**
-   * Collects element's child elements.
-   * @param parent a parent element.
-   * @param childName a qualified element name being found.
-   * @return a list of elements found.
-   */
-  private List getChildElements(Element parent, QName childName)
-  {
-    List children = new ArrayList();
-    if (parent != null)
-    {
-      // Getting the first parent's child
-      Element child = XMLUtils.getFirstChild(parent);
-      while (child != null)
-      {
-        // If the child has the required qualified name
-        if (child.getNamespaceURI().equals(childName.getNamespaceURI())
-          && child.getLocalName().equals(childName.getLocalPart()))
-        {
-          // Adding the child to the list
-          children.add(child);
-        }
-        // Getting the next binding's child
-        child = XMLUtils.getNextSibling(child);
-      }
-    }
-    return children;
-  }
-
-  /**
-   * Looks for wsdl:binding element.
-   * @param definitions a wsdl:definitions element.
-   * @param bindingName a name of wsdl:binding element.
-   * @return a wsdl:binding element or null if it is not found.
-   */
-  private Element getBindingElement(Element definitions, String bindingName)
-  {
-    // Getting the first definitions' child
-    Element child = XMLUtils.getFirstChild(definitions);
-    while (child != null)
-    {
-      // If definitions' child is wsdl:binding element
-      // and is the same that is being processed by WSDLValidator
-      if (child.getNamespaceURI().equals(WSDL_BINDING.getNamespaceURI())
-        && child.getLocalName().equals(WSDL_BINDING.getLocalPart())
-        && child.getAttribute(WSIConstants.ATTR_NAME).equals(bindingName))
-      {
-        // return the wsdl:binding element
-        return child;
-      }
-      // Getting the next definitions' child
-      child = XMLUtils.getNextSibling(child);
-    }
-    // return null, is there is no such wsdl:binding
-    return null;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2909.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2909.java
deleted file mode 100644
index 86681ba..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2909.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEContent;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2909
- *
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>Multiple mime:content child elements of a mime:part element
- * in a desciption reference the same wsdl:part.</assertionDescription>
- */
-public class AP2909 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  // A variable that indicates a binding contains
-  // multiple mime:content elements
-  private boolean multipleContentFound;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2909(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Resetting the variable
-    multipleContentFound = false;
-
-    try
-    {
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-
-        // Getting wsdl:input and wsdl:output elements of an operation
-        BindingInput bindingInput = bindingOperation.getBindingInput();
-        BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-
-        // Collecting all the mime:part elements from wsdl:input and wsdl:output
-        List inputMimeParts = getMimeParts(
-          bindingInput == null ? null : bindingInput.getExtensibilityElements());
-        List outputMimeParts = getMimeParts(
-          bindingOutput == null ? null : bindingOutput.getExtensibilityElements());
-
-        // If there is a mime:part containing multiple mime:contentS
-        // which reference different wsdl:partS, the assertion failed
-        if (containsInvalidMimePart(inputMimeParts))
-        {
-          throw new AssertionFailException("The invalid mime:part element "
-            + "is in the wsdl:input of the \"" + bindingOperation.getName()
-            + "\" binding operation.");
-        }
-
-        // If there is a mime:part containing multiple mime:contentS
-        // which reference different wsdl:partS, the assertion failed
-        if (containsInvalidMimePart(outputMimeParts))
-        {
-          throw new AssertionFailException("The invalid mime:part element "
-            + "is in the wsdl:output of the \"" + bindingOperation.getName()
-            + "\" binding operation.");
-        }
-
-      }
-      // If the binding does not contain a mime:part with multiple
-      // mime:content elements, the assertion is not applicable
-      if (!multipleContentFound)
-        throw new AssertionNotApplicableException();
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Validates mime:part elements.
-   * @param mimeParts a list of mime:part elements.
-   * @return true if multiple mime:contentS of a mime:part
-   * reference different wsdl:partS, false otherwise.
-   */
-  private boolean containsInvalidMimePart(List mimeParts)
-  {
-    // Going through a list of mime:part elements
-    for (int i = 0; i < mimeParts.size(); i++)
-    {
-      // A variable that indicates the mime:part contains
-      // at least one mime:content element
-      boolean mimeContentFound = false;
-      String mimeContentPart = null;
-
-      // Going through mime:part extensibility elements
-      List extElems = ((MIMEPart) mimeParts.get(i)).getExtensibilityElements();
-      for (int j = 0; j < extElems.size(); j++)
-      {
-        // If an extensibility element is mime:content
-        if (((ExtensibilityElement)extElems.get(j))
-          .getElementType().equals(WSDL_MIME_CONTENT))
-        {
-          MIMEContent mimeContent  = (MIMEContent) extElems.get(j);
-          // If a mime:content element was already found in this mime:part
-          if (mimeContentFound)
-          {
-            multipleContentFound = true;
-            // If a mime:content references other wsdl:part than the
-            // previous mime:content do, return true
-            if (mimeContent.getPart() == null
-              || !mimeContent.getPart().equals(mimeContentPart))
-            {
-              return true;
-            }
-          }
-          // This is the first mime:content element of mime:part
-          else
-          {
-            mimeContentFound = true;
-            mimeContentPart = mimeContent.getPart();
-          }
-        }
-      }
-    }
-    // There are no invalid mime:part elements, return false
-    return false;
-  }
-
-  /**
-   * Collects all mime:part elements.
-   * @param extElems a list of extensibility elements that can contain mime:part elements.
-   * @return the list of mime:part elements found.
-   */
-  private List getMimeParts(List extElems)
-  {
-    List mimeParts = new ArrayList();
-
-    if (extElems != null)
-    {
-      // Going through all the extensibility elements
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(i);
-        // If the element is mime:multipartRelated
-        if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-        {
-          // Getting the mime:part elements of the mime:multipartRelated
-          List mParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-          mimeParts.addAll(mParts);
-          // Going through all the mime:part elements
-          for (int j = 0; j < mParts.size(); j++)
-          {
-            List elems = getMimeParts(
-                ((MIMEPart) mParts.get(j)).getExtensibilityElements());
-              // Adding the elements to the list being returned
-              mimeParts.addAll(elems);
-          }
-        }
-      }
-    }
-    return mimeParts;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2910.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2910.java
deleted file mode 100644
index a42d335..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2910.java
+++ /dev/null

@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEContent;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2910
- *
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>A mime:content in a DESCRIPTION references
- * a wsdl:part that is defined using either the type attribute
- * or the element attribute.</assertionDescription>
- */
-public class AP2910 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2910(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // A variable that indicates a binding contains at least one
-      // mime:content element
-      boolean mimeContentsFound = false;
-
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-
-        // Getting wsdl:input and wsdl:output elements of an operation
-        BindingInput bindingInput = bindingOperation.getBindingInput();
-        BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-
-        // Collecting all the mime:content elements from wsdl:input and wsdl:output
-        List inputMimeContents = getMimeContentElements(
-          bindingInput == null ? null : bindingInput.getExtensibilityElements());
-        List outputMimeContents = getMimeContentElements(
-          bindingOutput == null ? null : bindingOutput.getExtensibilityElements());
-
-        // If the wsdl:input contains mime:content elements
-        if (!inputMimeContents.isEmpty())
-        {
-          mimeContentsFound = true;
-          Input portTypeInput = bindingOperation.getOperation().getInput();
-          // If there is no the corresponding wsdl:input in wsdl:portType
-          // or the wsdl:input does not specify a message attribute,
-          // the assertion failed
-          if (portTypeInput == null || portTypeInput.getMessage() == null)
-            throw new AssertionFailException(
-              "The corresponging operation in the wsdl:portType for the \""
-              + bindingOperation.getName() + "\" binding operation is invalid.");
-          // Getting a mime:content referencing an invalid wsdl:part 
-          String part = getInvalidMimeContentPart(
-            inputMimeContents, portTypeInput.getMessage());
-          // If such part is found, the assertion failed
-          if (part != null)
-            throw new AssertionFailException("part=\"" + part +
-              "\", the input of the binding operation \""
-              + bindingOperation.getName() + "\"");
-        }
-
-        // If the wsdl:output contains mime:content elements
-        if (!outputMimeContents.isEmpty())
-        {
-          mimeContentsFound = true;
-          Output portTypeOutput = bindingOperation.getOperation().getOutput();
-          // If there is no the corresponding wsdl:output in wsdl:portType
-          // or the wsdl:output does not specify a message attribute,
-          // the assertion failed
-          if (portTypeOutput == null || portTypeOutput.getMessage() == null)
-            throw new AssertionFailException(
-              "The corresponging operation in the wsdl:portType for the \""
-              + bindingOperation.getName() + "\" binding operation is invalid.");
-          // Getting a mime:content referencing an invalid wsdl:part
-          String part = getInvalidMimeContentPart(
-              outputMimeContents, portTypeOutput.getMessage());
-          // If such part is found, the assertion failed
-          if (part != null)
-            throw new AssertionFailException("part=\"" + part +
-                "\", the output of the binding operation \""
-                + bindingOperation.getName() + "\"");
-        }
-      }
-
-      // If the binding does not contain mime:content elements,
-      // the assertion is not applicable
-      if (!mimeContentsFound)
-        throw new AssertionNotApplicableException();
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Validates every mime:content element. If it references a wsdl:part that
-   * is defined using neither the type attribute nor the element attribute
-   * or using them together, it is invalid.
-   * @param mimeContents a list of mime:content elements.
-   * @param message the corresponding wsdl:message element for mime:contentS.
-   * @return a value of the part attribute of an invalid mime:content
-   * or null if all the mime:content elements are valid.
-   */
-  private String getInvalidMimeContentPart(List mimeContents, Message message) {
-    // Going throug all the mime:content elements
-    for (int i = 0; i < mimeContents.size(); i++)
-    {
-      // Getting a value of the part attribute from a mime:element
-      String partName = ((MIMEContent) mimeContents.get(i)).getPart();
-      // Getting the corresponging wsdl:part
-      Part part = message.getPart(partName);
-      // if it is defined and use neither the type attribute
-      // nor the element attribute or use them together, return part value
-      if (part != null
-        && ((part.getTypeName() == null && part.getElementName() == null)
-        || (part.getTypeName() != null && part.getElementName() != null)))
-      {
-        return partName;
-      }
-    }
-    // Return null if no one part is found
-    return null;
-  }
-
-  /**
-   * Collects all mime:content elements.
-   * @param extElems a list of extensibility elements that can contain mime:contentS.
-   * @return the list of mime:content elements found.
-   */
-  private List getMimeContentElements(List extElems)
-  {
-    List mimeContentElements = new ArrayList();
-
-    if (extElems != null)
-    {
-      // Going through all the extensibility elements
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(i);
-        // If the element is mime:multipartRelated
-        if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-        {
-          // Getting the mime:part elements of the mime:multipartRelated
-          List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-          // Going through all the mime:part elements
-          for (int j = 0; j < mimeParts.size(); j++)
-          {
-            // Collecting all the mime:content elements of this mime:part
-            List elems = getMimeContentElements(
-              ((MIMEPart) mimeParts.get(j)).getExtensibilityElements());
-            // Adding the elements to the list being returned
-            mimeContentElements.addAll(elems);
-          }
-        }
-        // Else if the element is mime:content
-        else if (extElem.getElementType().equals(WSDL_MIME_CONTENT))
-        {
-          // Adding the element to the list being returned
-          mimeContentElements.add(extElem);
-        }
-      }
-    }
-
-    return mimeContentElements;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2911.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2911.java
deleted file mode 100644
index 943383b..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2911.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2911
- *
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>The mime:multipartRelated elements in wsdl:input and wsdl:ouput elements
- * of operations in a wsdl:binding, contain exactly one mime:part child element that contains
- * a soapbind:body child element.</assertionDescription>
- */
-public class AP2911 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2911(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // A variable that indicates a binding contains at least one
-      // mime:multipartRelated element
-      boolean multipartsFound = false;
-
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-
-        // Getting wsdl:input and wsdl:output elements of an operation
-        BindingInput bindingInput = bindingOperation.getBindingInput();
-        BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-
-        // Collecting all the mime:multipartRelated elements from wsdl:input and wsdl:output
-        List inputMultiparts = getMimeMultipartElements(
-          bindingInput == null ? null : bindingInput.getExtensibilityElements());
-        List outputMultiparts = getMimeMultipartElements(
-          bindingOutput == null ? null : bindingOutput.getExtensibilityElements());
-
-        // If the wsdl:input contains mime:multipartRelated elements
-        if (!inputMultiparts.isEmpty())
-        {
-          multipartsFound = true;
-
-          // If there is not exactly one mime:part element containing
-          // a soapbind:body child, the assertion failed
-          if (!containsOneSoapBody(inputMultiparts))
-          {
-            throw new AssertionFailException("The invalid "
-                + "mime:multipartRelated element is in the wsdl:input of the \""
-                + bindingOperation.getName() + "\" binding operation.");
-          }
-        }
-
-        // If the wsdl:output contains mime:multipartRelated elements
-        if (!outputMultiparts.isEmpty())
-        {
-          multipartsFound = true;
-
-          // If there is not exactly one mime:part element containing
-          // a soapbind:body child, the assertion failed
-          if (!containsOneSoapBody(outputMultiparts))
-          {
-            throw new AssertionFailException("The invalid "
-                + "mime:multipartRelated element is in the wsdl:output of the \""
-                + bindingOperation.getName() + "\" binding operation.");
-          }
-        }
-
-      }
-      // If the binding contains no one mime:multipartRelated element,
-      // the assertion is not applicable
-      if (!multipartsFound)
-        throw new AssertionNotApplicableException();
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Looks for mime:part elements containing a soap:body child
-   * for each of mime:multipartRelated element.
-   * @param multiparts a list of mime:multipartRelated elements.
-   * @return true if there is exactly one mime:part containing a soap:body
-   * child, false otherwise.
-   */
-  private boolean containsOneSoapBody(List multiparts)
-  {
-    // A variable indicates that a soap:body element is found
-    boolean soapBodyFound = false;
-
-    // Going through a list of mime:multipartRelated elements
-    for (int i = 0; i < multiparts.size(); i++)
-    {
-      // Getting a list of mime:part elements
-      List mimeParts =
-        ((MIMEMultipartRelated) multiparts.get(i)).getMIMEParts();
-
-      // Going through all the mime:part elements
-      for (int j = 0; j < mimeParts.size(); j++)
-      {
-        // Getting a list of extensibility elements of a mime:part
-        List extElems =
-          ((MIMEPart) mimeParts.get(j)).getExtensibilityElements();
-        // Going through the extensibility elements
-        for (int k = 0; k < extElems.size(); k++)
-        {
-          // If an extensibility element is a soap:body
-          if (((ExtensibilityElement)extElems.get(k))
-            .getElementType().equals(WSDL_SOAP_BODY))
-          {
-            // If a soap:body element was already found,
-            // return true
-            if (soapBodyFound)
-            {
-              return false;
-            }
-            // else set the variable to the true value
-            else
-            {
-              soapBodyFound = true;
-            }
-          }
-        }
-      }
-    }
-
-    return soapBodyFound;
-  }
-
-  /**
-   * Collects all mime:multipartRelated elements.
-   * @param extElems a list of extensibility elements that can contain mime:multipartRelated elements.
-   * @return the list of mime:multipartRelated elements found.
-   */
-  private List getMimeMultipartElements(List extElems)
-  {
-    List mimeMultipartElements = new ArrayList();
-
-    if (extElems != null)
-    {
-      // Going through all the extensibility elements
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(i);
-        // If the element is mime:multipartRelated
-        if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-        {
-          // Adding the element to the list being returned
-          mimeMultipartElements.add(extElem);
-          // Getting the mime:part elements of the mime:multipartRelated
-          List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-          // Going through all the mime:part elements
-          for (int j = 0; j < mimeParts.size(); j++)
-          {
-            // Collecting all the mime:multipartRelated elements of this mime:part
-            List elems = getMimeMultipartElements(
-              ((MIMEPart) mimeParts.get(j)).getExtensibilityElements());
-            // Adding the elements to the list being returned
-            mimeMultipartElements.addAll(elems);
-          }
-        }
-      }
-    }
-
-    return mimeMultipartElements;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2930.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2930.java
deleted file mode 100644
index 01734f8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2930.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2930
- *
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>A wsdl:fault element in a description does not have
- * mime:multipartRelated element as its child element.</assertionDescription>
- */
-public class AP2930 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2930(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // A variable that indicates a binding contains at least one
-      // wsdl:fault element
-      boolean faultsFound = false;
-
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-
-        // Getting wsdl:fault elements
-        Collection faults = bindingOperation.getBindingFaults().values();
-        if (!faults.isEmpty())
-        {
-          faultsFound = true;
-          // If there is at least one mime:multipartRelated element,
-          // the assertion failed
-          if (containsMimeMultiparts(faults))
-            throw new AssertionFailException("The binding operation is \""
-              + bindingOperation.getName() + "\".");
-        }
-      }
-
-      // If the binding does not contain wsdl:fault elements,
-      // the assertion is not applicable
-      if (!faultsFound)
-        throw new AssertionNotApplicableException();
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Validates wsdl:fault elements.
-   * @param faults a collection of wsdl:fault elements.
-   * @return true if any wsdl:fault has a mime:multipartRelated child
-   * element, false otherwise.
-   */
-  private boolean containsMimeMultiparts(Collection faults)
-  {
-    // Going through all the wsdl:faultS
-    Iterator i = faults.iterator();
-    while (i.hasNext())
-    {
-      // Getting wsdl:fault's extensibility elements
-      List extElems = ((BindingFault) i.next()).getExtensibilityElements();
-      for (int j = 0; j < extElems.size(); j++)
-      {
-        // If there is a mime:multipartRelated element, return true
-        if (((ExtensibilityElement)extElems.get(j))
-          .getElementType().equals(WSDL_MIME_MULTIPART))
-        {
-          return true;
-        }
-      }
-    }
-    // There are no mime:multipartRelated elements, return false
-    return false;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2940.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2940.java
deleted file mode 100644
index 6392a1d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2940.java
+++ /dev/null

@@ -1,450 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.xml.namespace.QName;
-
-import org.apache.xerces.impl.dv.XSSimpleType;
-import org.apache.xerces.xs.XSAttributeUse;
-import org.apache.xerces.xs.XSComplexTypeDefinition;
-import org.apache.xerces.xs.XSConstants;
-import org.apache.xerces.xs.XSElementDeclaration;
-import org.apache.xerces.xs.XSModel;
-import org.apache.xerces.xs.XSModelGroup;
-import org.apache.xerces.xs.XSObjectList;
-import org.apache.xerces.xs.XSParticle;
-import org.apache.xerces.xs.XSTerm;
-import org.apache.xerces.xs.XSTypeDefinition;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.w3c.dom.Element;
-
-/**
- * AP2940
- *
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>In a description, a wsdl:part defined with the
- * ref:swaRef schema type is bound to a soapbind:body, or a soapbind:header
- * in a MIME binding.</assertionDescription>
- */
-public class AP2940 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2940(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // A variable that indicates wsdl:portType references at least one
-      // wsdl:part defined with the ref:swaRef schema type
-      boolean swaRefFound = false;
-
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-
-        // Getting wsdl:input and wsdl:output elements of an operation
-        BindingInput bindingInput = bindingOperation.getBindingInput();
-        BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-
-        Input portTypeInput = bindingOperation.getOperation().getInput();
-        Output portTypeOutput = bindingOperation.getOperation().getOutput();
-        // If the corresponding wsdl:input exists in wsdl:portType
-        // and includes the message attribute
-        if (portTypeInput != null && portTypeInput.getMessage() != null)
-        {
-          // Collecting all the message's parts defined with ref:swaRef
-          List swaRefParts = getSwaRefParts(portTypeInput.getMessage());
-          if (!swaRefParts.isEmpty())
-          {
-            swaRefFound = true;
-            // Getting a wsdl:part that is unbound
-            String unboundPart = getUnboundPart(swaRefParts,
-              portTypeInput.getMessage().getQName(),
-              bindingInput == null ? null : bindingInput.getExtensibilityElements());
-            // If such wsdl:part exists, assertion failed
-            if (unboundPart != null)
-              throw new AssertionFailException("The part \"" + unboundPart
-                + "\" is not bound properly to the wsdl:input of the \""
-                + bindingOperation.getName() + "\" binding operation.");
-          }
-        }
-
-        // If the corresponding wsdl:output exists in wsdl:portType
-        // and includes the message attribute
-        if (portTypeOutput != null && portTypeOutput.getMessage() != null)
-        {
-          // Collecting all the message's parts defined with ref:swaRef
-          List swaRefParts = getSwaRefParts(portTypeOutput.getMessage());
-          if (!swaRefParts.isEmpty())
-          {
-            swaRefFound = true;
-            // Getting a wsdl:part that is unbound
-            String unboundPart = getUnboundPart(swaRefParts,
-              portTypeOutput.getMessage().getQName(),
-              bindingOutput == null ? null : bindingOutput.getExtensibilityElements());
-            // If such wsdl:part exists, assertion failed
-            if (unboundPart != null)
-              throw new AssertionFailException("The part \"" + unboundPart
-                + "\" is not bound properly to the wsdl:input of the \""
-                + bindingOperation.getName() + "\" binding operation.");
-          }
-        }
-      }
-
-      // If there is no wsdl:partS defined with the ref:swaRef
-      // schema type, the assertion is not applicable
-      if (!swaRefFound)
-        throw new AssertionNotApplicableException();
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      // The assertion is "recommended", using the "warning" result
-      result = AssertionResult.RESULT_WARNING;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Looks for a wsdl:part that is not bound to either soap:body or soap:header
-   * in a MIME binding.
-   * @param swaRefParts a list of wsdl:part names that are defined with the
-   * ref:swaRef schema type.
-   * @param messageName the qualified name of the wsdl:message being validated.
-   * @param extElems a list of extensibility elements of either wsdl:input or
-   * wsdl:output of the corresponding binding operation.
-   * @return a wsdl:part name that is not bound properly, or null.
-   */
-  private String getUnboundPart(List swaRefParts, QName messageName, List extElems) {
-    // Going through wsdl:part names
-    for (int i = 0; i < swaRefParts.size(); i++)
-    {
-      String part = (String) swaRefParts.get(i);
-      boolean boundProperly = false;
-      if (extElems != null)
-      {
-        // Going through extensibility elements
-        for (int j = 0; j < extElems.size() && !boundProperly; j++)
-        {
-          ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(j);
-          // If the element is mime:multipartRelated
-          if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-          {
-            // Getting the mime:part elements of the mime:multipartRelated
-            List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-            // Getting the first mime:part element where soap:body
-            // and soap:header could appear
-            if (mimeParts.size() > 0)
-            {
-              List elems = ((MIMEPart) mimeParts.get(0)).getExtensibilityElements();
-              // Going through all the MIME part's extensibility elements
-              for (int k = 0; k < elems.size(); k ++)
-              {
-                ExtensibilityElement elem = (ExtensibilityElement) elems.get(k);
-                // If that is a soap:body
-                if (elem.getElementType().equals(WSDL_SOAP_BODY))
-                {
-                  List pts = ((SOAPBody) elem).getParts();
-                  // If the part is bound by this element
-                  if (pts == null || pts.contains(part))
-                  {
-                    boundProperly = true;
-                    break;
-                  }
-                }
-                // else if that is a soap:header
-                else if (elem.getElementType().equals(WSDL_SOAP_HEADER))
-                {
-                  if (elem instanceof SOAPHeader)
-                  {
-                    SOAPHeader header = (SOAPHeader) elem;
-                    // If the part is bound by this element
-                    if (messageName.equals(header.getMessage())
-                      && header.getPart() != null
-                      && header.getPart().equals(part))
-                    {
-                      boundProperly = true;
-                      break;
-                    }
-                  }
-                  // WSDL4J 1.4 does not recognize soap:header elements that
-                  // are enclosed in mime:multipartRelated, so using a workaround
-                  else
-                  {
-                    Element header =
-                      ((UnknownExtensibilityElement) elem).getElement();
-                    // If a header references the corresponding message
-                    // and the part is bound by this element
-                    if (referencesMessage(header, messageName)
-                      && header.getAttribute("part").equals(part))
-                    {
-                      boundProperly = true;
-                      break;
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      // If this part is unbound properly, return it
-      if (!boundProperly)
-        return part;
-    }
-    // All the parts are bound properly, return null
-    return null;
-  }
-
-  /**
-   * Validates whether an element contains a message attribute that references
-   * a message that have the qualified name specified.
-   * @param elem an element to be validated.
-   * @param messageName the qualified name of a message.
-   * @return true if an element is valid, false otherwise.
-   */
-  private boolean referencesMessage(Element elem, QName messageName)
-  {
-    // Getting the element's message attribute
-    String message = elem.getAttribute("message");
-    // finding the colon delimiter
-    int colonPos = message.indexOf(":");
-    String ns = null;
-    // Getting a local part
-    String lp = colonPos > -1 ? message.substring(colonPos + 1) : message;
-    // If the delimiter is found
-    if (colonPos > -1)
-    {
-      // Retrieving a namespace URI
-      ns = validator.wsdlDocument.getDefinitions()
-        .getNamespace(message.substring(0, colonPos));
-    }
-    // If the local part and the namespace URI are the same as a message have
-    if (messageName.getLocalPart().equals(lp)
-      && messageName.getNamespaceURI().equals(ns))
-    {
-      // element is valid, return true
-      return true;
-    }
-    // element is not valid, return false
-    return false;
-  }
-
-  /**
-   * Collects all the wsdl:part defined with the ref:swaRef schema type.
-   * @param message a message containig wsdl:part elements.
-   * @return a list of wsdl:part names.
-   */
-  private List getSwaRefParts(Message message)
-  {
-    List swaRefParts = new ArrayList();
-
-    // Going through message's parts
-    Iterator it = message.getParts().values().iterator();
-    while (it.hasNext())
-    {
-      Part part = (Part) it.next();
-      QName ref;
-      short type;
-      // Getting either part's element reference or type reference
-      if ((ref = part.getTypeName()) != null)
-      {
-        type = XSConstants.TYPE_DEFINITION;
-      }
-      else if ((ref = part.getElementName()) != null)
-      {
-        type = XSConstants.ELEMENT_DECLARATION;
-      }
-      // The part does conatins neither element nor type attribute,
-      // proceeding with the next part
-      else
-      {
-        continue;
-      }
-      // Getting a list of schemas defined
-      Map schemas = validator.wsdlDocument.getSchemas();
-      // Going through the schemas
-      Iterator it2 = schemas.values().iterator();
-      while (it2.hasNext())
-      {
-        XSModel xsModel = (XSModel) it2.next();
-        XSTypeDefinition partType = null;
-        // Getting the corresponding part type
-        if (type == XSConstants.ELEMENT_DECLARATION)
-        {
-          XSElementDeclaration elem = xsModel.getElementDeclaration(
-            ref.getLocalPart(), ref.getNamespaceURI());
-          if (elem != null)
-            partType = elem.getTypeDefinition();
-        }
-        else
-        {
-          partType = xsModel.getTypeDefinition(
-            ref.getLocalPart(), ref.getNamespaceURI());
-        }
-        // If the part type is defined using the ref:swaRef schema type
-        if (referencesSwaRef(partType, new ArrayList()))
-        {
-          // Adding the part's name to the list being returned
-          swaRefParts.add(part.getName());
-        }
-      }
-    }
-    // Return the list
-    return swaRefParts;
-  }
-
-  /**
-   * Check schema type whether it contains ref:swaRef simple schema type
-   * or has an attribute of this schema type.
-   * @param xsType a schema type definition element
-   * @return true, if schema type contains ref:swaRef, false otherwise.
-   */
-  private boolean referencesSwaRef(XSTypeDefinition xsType, List types)
-  {
-    if ((xsType != null) && (!types.contains(xsType)))
-    {
-      types.add(xsType);
-      // If this is a complex type
-      if (xsType.getTypeCategory() == XSTypeDefinition.COMPLEX_TYPE)
-      {
-        XSComplexTypeDefinition xsComplexType =
-          (XSComplexTypeDefinition) xsType;
-        // If it contains mixed context
-        // check whether the context contains ref:swaRef
-        if (xsComplexType.getParticle() != null
-          && referencesSwaRef(xsComplexType.getParticle().getTerm(), types))
-        {
-          return true;
-        }
-        // Getting the type's attributes
-        XSObjectList attrList = xsComplexType.getAttributeUses();
-        for (int i = 0; i < attrList.getLength(); i++)
-        {
-          XSAttributeUse xsAttrUse = (XSAttributeUse) attrList.item(i);
-          // If an attribute is defined using ref:swaRef, return true
-          if (referencesSwaRef(
-            xsAttrUse.getAttrDeclaration().getTypeDefinition(), types))
-          {
-            return true;
-          }
-        }
-      }
-      // else if this is a simple type
-      else if (xsType.getTypeCategory() == XSTypeDefinition.SIMPLE_TYPE)
-      {
-        XSSimpleType xsSimpleType = (XSSimpleType) xsType;
-        // If this type is ref:swaRef, return true
-        if (xsSimpleType.getNamespace().equals(WSIConstants.NS_URI_SWA_REF)
-          && xsSimpleType.getName().equals(WSIConstants.SCHEMA_TYPE_SWA_REF))
-        {
-          return true;
-        }
-      }
-    }
-    // The schema type does not contain any element defined with the ref:swaRef
-    // return false
-    return false;
-  }
-
-  /**
-   * Checks a term whether it is defined with ref:swaRef.
-   * @param term a term that can be one of a model group or an
-   * element declaration.
-   * @return true if a term is defined with ref:swaRef, false otherwise.
-   */
-  private boolean referencesSwaRef(XSTerm term, List types)
-  {
-    // If a term is an element declaration
-    if (term.getType() == XSConstants.ELEMENT_DECLARATION)
-    {
-      // If element's type is defined with the ref:swaRef, return true
-      if (referencesSwaRef(
-        ((XSElementDeclaration) term).getTypeDefinition(), types))
-      {
-          return true;
-      }
-    }
-    // else if a term is a model group
-    else if(term.getType() == XSConstants.MODEL_GROUP)
-    {
-      // Getting a list of Particle schema components
-      XSObjectList list = ((XSModelGroup) term).getParticles();
-      for (int i = 0; i < list.getLength(); i++)
-      {
-        // If the term of a particle is defined with the ref:swaRef,
-        // return true
-        if (referencesSwaRef(((XSParticle) list.item(i)).getTerm(), types))
-        {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2941.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2941.java
deleted file mode 100644
index bb3a7a3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2941.java
+++ /dev/null

@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Output;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEContent;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Element;
-
-/**
- * AP2941
- *
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>A wsdl:binding in a description binds every wsdl:part
- * of a wsdl:message in the wsdl:portType to which it refers to one of
- * soapbind:body, soapbind:header, soapbind:fault , soapbind:headerfault,
- * or mime:content.</assertionDescription>
- */
-public class AP2941 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2941(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-        Input portTypeInput = bindingOperation.getOperation().getInput();
-        Output portTypeOutput = bindingOperation.getOperation().getOutput();
-        // If the corresponding wsdl:input exists in wsdl:portType
-        // and includes the message attribute
-        if (portTypeInput != null && portTypeInput.getMessage() != null)
-        {
-          // Getting the list of all the parts bound by wsdl:input's child elements
-          List inputParts = getBindingParts(
-            bindingOperation.getBindingInput().getExtensibilityElements(),
-            portTypeInput.getMessage());
-          // If not true that all the wsdl:partS are bound,
-          // the assertion failed
-          if (!inputParts
-            .containsAll(portTypeInput.getMessage().getParts().keySet()))
-          {
-            throw new AssertionFailException("The wsdl:input of the \""
-              + bindingOperation.getName() + "\" binding operation does not "
-              + "bind all the corresponding wsdl:partS.");
-          }
-        }
-
-        // If the corresponding wsdl:output exists in wsdl:portType
-        // and includes the message attribute
-        if (portTypeOutput != null && portTypeOutput.getMessage() != null)
-        {
-          // Getting the list of all the parts bound by wsdl:output's child elements
-          List outputParts = getBindingParts(
-            bindingOperation.getBindingOutput().getExtensibilityElements(),
-            portTypeOutput.getMessage());
-          // If not true that all the wsdl:partS are bound,
-          // the assertion failed
-          if (!outputParts
-            .containsAll(portTypeOutput.getMessage().getParts().keySet()))
-          {
-            throw new AssertionFailException("The wsdl:output of the \""
-              + bindingOperation.getName() + "\" binding operation does not "
-              + "bind all the corresponding wsdl:partS.");
-          }
-        }
-
-        // IF there are wsdl:faultS in the wsdl:portType operation
-        if (!bindingOperation.getOperation().getFaults().isEmpty())
-        {
-          // Collecting all the soap:fault names
-          List faultNames = new ArrayList();
-          Collection faults = bindingOperation.getBindingFaults().values();
-          // Going through all the wsdl:faultS
-          Iterator it = faults.iterator();
-          while (it.hasNext())
-          {
-            // Getting wsdl:fault's extensibility elements
-            List extElems = ((BindingFault) it.next()).getExtensibilityElements();
-            for (int j = 0; j < extElems.size(); j++)
-            {
-              if (((ExtensibilityElement)extElems.get(j))
-                .getElementType().equals(WSDL_SOAP_FAULT))
-              {
-                faultNames.add(((SOAPFault)extElems.get(j)).getName());
-              }
-            }
-          }
-          // If not true that all the wsdl:faultS are bound,
-          // the assertion failed
-          if (!faultNames.containsAll(
-            bindingOperation.getOperation().getFaults().keySet()))
-          {
-              throw new AssertionFailException("The binding operation \""
-                  + bindingOperation.getName() + "\" does not "
-                  + "bind all the corresponding wsdl:faultS.");
-          }
-        }
-      }
-    }
-    catch (AssertionFailException afe)
-    {
-      // The assertion is "recommended", using the "warning" result
-      result = AssertionResult.RESULT_WARNING;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Collects all the parts bound by extensibility elements.
-   * @param extElems a lit of extensibility elements.
-   * @param message the wsdl:message element corresponging
-   * to the extensibility elements.
-   * @return a list of wsdl:part names bound.
-   */
-  private List getBindingParts(List extElems, Message message)
-  {
-    List parts = new ArrayList();
-    if (extElems != null)
-    {
-      // Going through the extensibility elements
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(i);
-        // If that is a soap:body
-        if (extElem.getElementType().equals(WSDL_SOAP_BODY))
-        {
-          // Adding all the parts bound to the list
-          List pts = ((SOAPBody) extElem).getParts();
-          if (pts != null)
-          {
-            parts.addAll(pts);
-          }
-          // else the parts attribute is omitted,
-          // all parts defined by the message are assumed to be included
-          // in the SOAP Body portion.
-          else
-          {
-            parts.addAll(message.getParts().keySet());
-          }
-        }
-        // else if that is a soap:header
-        else if (extElem.getElementType().equals(WSDL_SOAP_HEADER))
-        {
-          List headerFaults = null;
-          if (extElem instanceof SOAPHeader)
-          {
-            SOAPHeader header = (SOAPHeader) extElem;
-            // If a header references the corresponding message,
-            // adding part name to the list 
-            if (message.getQName().equals(header.getMessage()))
-              parts.add(header.getPart());
-
-            headerFaults = header.getSOAPHeaderFaults();
-          }
-          // WSDL4J 1.4 does not recognize soap:header elements that are enclosed
-          // in mime:multipartRelated, so using a workaround
-          else
-          {
-            Element header =
-              ((UnknownExtensibilityElement) extElem).getElement();
-            // If a header references the corresponding message,
-            // adding part name to the list
-            if (referencesMessage(header, message.getQName()))
-              parts.add(header.getAttribute("part"));
-            // Collecting soap:headerfault elements for the header
-            headerFaults = getHeaderFaults(header);
-          }
-          // Going through the soap:headerfaultS
-          for (int j = 0; j < headerFaults.size(); j++)
-          {
-            if (headerFaults.get(j) instanceof SOAPHeaderFault)
-            {
-              SOAPHeaderFault shf = (SOAPHeaderFault) headerFaults.get(j);
-              // If a soap:headerfault references the corresponding
-              // message, adding part name to the list
-              if (message.equals(shf.getMessage()))
-                parts.add(shf.getPart());
-            }
-            // the same workaround...
-            else
-            {
-              Element shf = (Element) headerFaults.get(j);
-              // If a soap:headerfault references the corresponding
-              // message, adding part name to the list
-              if (referencesMessage(shf, message.getQName()))
-                parts.add(shf.getAttribute("part"));
-            }
-          }
-        }
-        // else if that is a mime:content
-        else if (extElem.getElementType().equals(WSDL_MIME_CONTENT))
-        {
-          // adding part name to the list
-          parts.add(((MIMEContent) extElem).getPart());
-        }
-        // else if that is a mime:multipartRelated
-        else if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-        {
-          // Getting the mime:part elements of the mime:multipartRelated
-          List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-          // Going through all the mime:part elements
-          for (int j = 0; j < mimeParts.size(); j++)
-          {
-            // Collecting all the values of part attributes
-            // of mime:part's extensibility elements
-            parts.addAll(getBindingParts(
-              ((MIMEPart) mimeParts.get(j)).getExtensibilityElements(),
-              message));
-          }
-        }
-      }
-    }
-    return parts;
-  }
-
-  /**
-   * Validates whether an element contains a message attribute that references
-   * a message that have the qualified name specified.
-   * @param elem an element to be validated.
-   * @param messageName the qualified name of a message.
-   * @return true if an element is valid, false otherwise.
-   */
-  private boolean referencesMessage(Element elem, QName messageName)
-  {
-    // Getting the element's message attribute
-    String message = elem.getAttribute("message");
-    // finding the colon delimiter
-    int colonPos = message.indexOf(":");
-    String ns = null;
-    // Getting a local part
-    String lp = colonPos > -1 ? message.substring(colonPos + 1) : message;
-    // If the delimiter is found
-    if (colonPos > -1)
-    {
-      // Retrieving a namespace URI
-      ns = validator.wsdlDocument.getDefinitions()
-        .getNamespace(message.substring(0, colonPos));
-    }
-    // If the local part and the namespace URI are the same as a message have
-    if (messageName.getLocalPart().equals(lp)
-      && messageName.getNamespaceURI().equals(ns))
-    {
-      // element is valid, return true
-      return true;
-    }
-    // element is not valid, return false
-    return false;
-  }
-
-  /**
-   * Collects all the element's child elements of the soap:headerfault type.
-   * @param element an element that can have soap:headerfault elements.
-   * @return the list of soap:headerfault elements found.
-   */
-  private List getHeaderFaults(Element element)
-  {
-    List headerFaults = new ArrayList();
-    if (element != null)
-    {
-      // Getting the first header's child
-      Element child = XMLUtils.getFirstChild(element);
-      while (child != null)
-      {
-        // If the child is soap:headerfault
-        if (child.getNamespaceURI().equals(WSDL_SOAP_HEADERFAULT.getNamespaceURI())
-          && child.getLocalName().equals(WSDL_SOAP_HEADERFAULT.getLocalPart()))
-        {
-          // Adding the child to the list
-          headerFaults.add(child);
-        }
-        // Getting the next header's child
-        child = XMLUtils.getNextSibling(child);
-      }
-    }
-    return headerFaults;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2944.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2944.java
deleted file mode 100644
index ca93a7b..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2944.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEContent;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2944
- *
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>In a DESCRIPTION, if a wsdl:part element refers to a
- * global element declaration (via the element attribute of the wsdl:part element)
- * then the value of the type attribute of a mime:content element that binds that part
- * is a content type suitable for carrying an XML serialization.</assertionDescription>
- */
-public class AP2944 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  // A variable that indicates a binding contains mime:content elements
-  // that bind wsdl:partS defined with the element attribute
-  private boolean mimeContentFound;
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2944(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Resetting the variable
-    mimeContentFound = false;
-
-    try
-    {
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-
-        // Getting wsdl:input and wsdl:output elements of an operation
-        BindingInput bindingInput = bindingOperation.getBindingInput();
-        BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-
-        // Collecting all the mime:content elements from wsdl:input and wsdl:output
-        List inputMimeContents = getMimeContentElements(
-          bindingInput == null ? null : bindingInput.getExtensibilityElements());
-        List outputMimeContents = getMimeContentElements(
-          bindingOutput == null ? null : bindingOutput.getExtensibilityElements());
-
-        // If the wsdl:input contains mime:content elements
-        if (!inputMimeContents.isEmpty())
-        {
-          Input portTypeInput = bindingOperation.getOperation().getInput();
-          // If the corresponding wsdl:input exists in wsdl:portType
-          // and includes the message attribute
-          if (portTypeInput != null && portTypeInput.getMessage() != null)
-          {
-            // If there is an invalid mime:content element
-            MIMEContent imc = getInvalidMimeContent(
-                inputMimeContents, portTypeInput.getMessage());
-            if (imc != null)
-            {
-              throw new AssertionFailException("The mime:content element in "
-                + "the wsdl:input of the \"" + bindingOperation.getName()
-                + "\" that binds the \"" + imc.getPart()
-                + "\" wsdl:part uses the invalid content type \""
-                + imc.getType() + "\". ");
-            }
-          }
-        }
-
-        // If the wsdl:output contains mime:content elements
-        if (!outputMimeContents.isEmpty())
-        {
-          Output portTypeOutput = bindingOperation.getOperation().getOutput();
-          // If the corresponding wsdl:output exists in wsdl:portType
-          // and includes the message attribute
-          if (portTypeOutput != null && portTypeOutput.getMessage() != null)
-          {
-            // If there is an invalid mime:content element
-            MIMEContent imc = getInvalidMimeContent(
-              outputMimeContents, portTypeOutput.getMessage());
-            if (imc != null)
-            {
-              throw new AssertionFailException("The mime:content element in "
-                + "the wsdl:output of the \"" + bindingOperation.getName()
-                + "\" that binds the \"" + imc.getPart()
-                + "\" wsdl:part uses the invalid content type \""
-                + imc.getType() + "\". ");
-            }
-          }
-        }
-      }
-      // If mime:content elements are not found,
-      // the assertion is not applicable
-      if (!mimeContentFound)
-        throw new AssertionNotApplicableException();
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Checks whether any mime:content element binds wsdl:part that is defined
-   * with the element attribute and uses the content type "text/xml".
-   * @param mimeContents a list of mime:content elements of binding operation.
-   * @param message the corresponding wsdl:message element.
-   * @return a mime:content element that uses a content type other than
-   * "text/xml", null if no one such element is found.
-   */
-  private MIMEContent getInvalidMimeContent(List mimeContents, Message message)
-  {
-    // Going through a list of mime:content elements
-    for (int i = 0; i < mimeContents.size(); i++)
-    {
-      MIMEContent mimeContent = (MIMEContent) mimeContents.get(i);
-      // Getting the corresponding wsdl:part
-      Part part = message.getPart(mimeContent.getPart());
-      // If the part is defined with the element attribute
-      if (part != null && part.getElementName() != null)
-      {
-        mimeContentFound = true;
-        // If the type attribute value is other than "text/xml"
-        if (!WSIConstants.CONTENT_TYPE_TEXT_XML.equals(mimeContent.getType()))
-        {
-          // return the invalid element
-          return mimeContent;
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Collects all mime:content elements.
-   * @param extElems a list of extensibility elements that can contain mime:contentS.
-   * @return the list of mime:content elements found.
-   */
-  private List getMimeContentElements(List extElems)
-  {
-    List mimeContentElements = new ArrayList();
-
-    if (extElems != null)
-    {
-      // Going through all the extensibility elements
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(i);
-        // If the element is mime:multipartRelated
-        if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-        {
-          // Getting the mime:part elements of the mime:multipartRelated
-          List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-          // Going through all the mime:part elements
-          for (int j = 0; j < mimeParts.size(); j++)
-          {
-            // Collecting all the mime:content elements of this mime:part
-            List elems = getMimeContentElements(
-              ((MIMEPart) mimeParts.get(j)).getExtensibilityElements());
-            // Adding the elements to the list being returned
-            mimeContentElements.addAll(elems);
-          }
-        }
-        // Else if the element is mime:content
-        else if (extElem.getElementType().equals(WSDL_MIME_CONTENT))
-        {
-          // Adding the element to the list being returned
-          mimeContentElements.add(extElem);
-        }
-      }
-    }
-
-    return mimeContentElements;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2946.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2946.java
deleted file mode 100644
index 4555739..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2946.java
+++ /dev/null

@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.mime.MIMEContent;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.mime.MIMEPart;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * AP2946
- *
- * <context>For a candidate wsdl:binding  with at least one mime:content element</context>
- * <assertionDescription>In a DESCRIPTION, a mime:content element
- * includes the part attribute.</assertionDescription>
- */
-public class AP2946 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public AP2946(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    try
-    {
-      // A variable that indicates a binding contains at least one
-      // mime:content element
-      boolean mimeContentsFound = false;
-
-      // Getting a wsdl:binding
-      Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-      // Getting its wsdl:operation elements
-      List ops = binding.getBindingOperations();
-
-      // Going through the operation elements
-      for (int i = 0; i < ops.size(); i++)
-      {
-        BindingOperation bindingOperation = (BindingOperation) ops.get(i);
-
-        // Getting wsdl:input and wsdl:output elements of an operation
-        BindingInput bindingInput = bindingOperation.getBindingInput();
-        BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-
-        // Collecting all the mime:content elements from wsdl:input and wsdl:output
-        List inputMimeContents = getMimeContentElements(
-          bindingInput == null ? null : bindingInput.getExtensibilityElements());
-        List outputMimeContents = getMimeContentElements(
-          bindingOutput == null ? null : bindingOutput.getExtensibilityElements());
-
-        // If the wsdl:input contains mime:content elements
-        if (!inputMimeContents.isEmpty())
-        {
-          mimeContentsFound = true;
-          // If there is a mime:content that does not include
-          // the part attribute, the assertion failed
-          if (hasInvalidMimeContent(inputMimeContents))
-            throw new AssertionFailException("The invalid mime:content element"
-              + " is in the wsdl:input of the \"" + bindingOperation.getName()
-              + "\" binding operation.");
-        }
-
-        // If the wsdl:output contains mime:content elements
-        if (!outputMimeContents.isEmpty())
-        {
-          mimeContentsFound = true;
-          // If there is a mime:content that does not include
-          // the part attribute, the assertion failed
-          if (hasInvalidMimeContent(outputMimeContents))
-            throw new AssertionFailException("The invalid mime:content element"
-              + " is in the wsdl:output of the \"" + bindingOperation.getName()
-              + "\" binding operation.");
-        }
-      }
-
-      // If the binding contains no mime:content elements,
-      // the assertion is not applicable
-      if (!mimeContentsFound)
-        throw new AssertionNotApplicableException();
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException afe)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        afe.getMessage(), entryContext);
-    }
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Collects all mime:content elements.
-   * @param extElems a list of extensibility elements that can contain mime:contentS.
-   * @return the list of mime:content elements found.
-   */
-  private List getMimeContentElements(List extElems)
-  {
-    List mimeContentElements = new ArrayList();
-
-    if (extElems != null)
-    {
-      // Going through all the extensibility elements
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        ExtensibilityElement extElem = (ExtensibilityElement) extElems.get(i);
-        // If the element is mime:multipartRelated
-        if (extElem.getElementType().equals(WSDL_MIME_MULTIPART))
-        {
-          // Getting the mime:part elements of the mime:multipartRelated
-          List mimeParts = ((MIMEMultipartRelated) extElem).getMIMEParts();
-          // Going through all the mime:part elements
-          for (int j = 0; j < mimeParts.size(); j++)
-          {
-            // Collecting all the mime:content elements of this mime:part
-            List elems = getMimeContentElements(
-              ((MIMEPart) mimeParts.get(j)).getExtensibilityElements());
-            // Adding the elements to the list being returned
-            mimeContentElements.addAll(elems);
-          }
-        }
-        // Else if the element is mime:content
-        else if (extElem.getElementType().equals(WSDL_MIME_CONTENT))
-        {
-          // Adding the element to the list being returned
-          mimeContentElements.add(extElem);
-        }
-      }
-    }
-
-    return mimeContentElements;
-  }
-
-  /**
-   * Validates mime:content elements.
-   * @param mimeContents a list of mime:content elements.
-   * @return true if any mime:content does not include the part attribute,
-   * false otherwise
-   */
-  private boolean hasInvalidMimeContent(List mimeContents)
-  {
-    // Going through a list of mime:content elements
-    for (int i = 0; i < mimeContents.size(); i++)
-    {
-      // If a mime:content does not include the part attribute, return true
-      if (((MIMEContent) mimeContents.get(i)).getPart() == null)
-        return true;
-    }
-    // There are no invalid mime:contentS, return false
-    return false;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2010.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2010.java
deleted file mode 100644
index e15193e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2010.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
-* BP2010.
-* "Name" attributes of Operations are unique across the wsdl:portType definition 
-*
-* @version 1.0.1 27.06.2003
-* @author Vitali Fedosenko
-**/
-public class BP2010 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2010(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    // Get the portType from the entry context
-    PortType portType = (PortType) entryContext.getEntry().getEntryDetail();
-
-    // Check the operations names for uniqueness within the candidate Port Type in the WSDL 
-    Iterator ops;
-    HashSet namesSeen = new HashSet();
-    HashSet duplicates = new HashSet();
-    try
-    {
-      List opsList = portType.getOperations();
-      if (opsList == null)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-        // no operations found in portType
-      }
-      else
-      {
-        ops = opsList.iterator(); // will use Candidate.getOperations()
-        while (ops.hasNext())
-        {
-          Operation op = (Operation) ops.next();
-          String opName = op.getName();
-          if (namesSeen.contains(opName))
-          {
-            duplicates.add(opName);
-          }
-          else
-          {
-            namesSeen.add(opName);
-          }
-        }
-      }
-
-      if (!duplicates.isEmpty())
-      {
-        StringBuffer failInfo =
-          new StringBuffer(
-            "Duplicate operation names in portType "
-              + portType.getQName()
-              + ": ");
-        Iterator i = duplicates.iterator();
-        while (i.hasNext())
-        {
-          failInfo.append((String) i.next() + "; ");
-        }
-        throw new AssertionFailException(failInfo.toString());
-      }
-    }
-    catch (NullPointerException e)
-    { // ?? no operations found, but does not fail the assertion.
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail =
-        this.validator.createFailureDetail(e.getMessage(), entryContext, portType);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java
deleted file mode 100644
index 2d5fd18..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java
+++ /dev/null

@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.StringTokenizer;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * BP2011.
- * The imported XML schema is a well-formed XML 1.0 document and if it contains an 
- * XML declaration, it is version 1.0. 
- *
- * @version 1.0.1 27.06.2003
- * @author Vitali Fedosenko
-**/
-public class BP2011 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2011(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  private final char[] OMMITED_XML_DECLARATION_DELIMITERS =
-    new char[] { 0x20, 0x9, 0xD, 0xA, '\'', '\"' };
-  private final char[] XML_DECLARATION_DELIMITERS = new char[] { '=' };
-  private final String VERSION_TOKEN = "version";
-  private final String VERSION = "1.0";
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    //Definition def = (Definition) entryContext.getEntry().getEntryDetail();
-    Types types = (Types) entryContext.getEntry().getEntryDetail();
-
-    List exts = null;
-    //if (def.getTypes()!=null)
-    if (types != null)
-    {
-      exts = types.getExtensibilityElements();
-    }
-    if (exts != null)
-    {
-      Definition definition = null;
-      if ((definition =
-        validator.analyzerContext.getCandidateInfo().getDefinition(types))
-        == null)
-      {
-        throw new WSIException("Could not find types definition in any WSDL document.");
-      }
-
-      Iterator it = exts.iterator();
-      while (it.hasNext())
-      {
-        ExtensibilityElement el = (ExtensibilityElement) it.next();
-        if (el instanceof UnknownExtensibilityElement)
-          searchForSchema(((UnknownExtensibilityElement) el).getElement(),
-              definition.getDocumentBaseURI());
-      }
-    }
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    } /*else
-         			result = AssertionResult.RESULT_PASSED;*/
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /* Search xsd schema or xsd import from node. If node is xsd import it's loading schema.
-   * @param n - UnknownExtencibilityElement
-  */
-  private void searchForSchema(Node n, String context)
-  {
-    while (n != null)
-    {
-      // searches for xsd:import element
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        // if xsd:schema element is found -> process schema
-        if (XMLUtils.equals(n, ELEM_XSD_SCHEMA))
-          processSchema(n, context);
-        else
-          // if xsd:import element is found -> load schema and process schema
-          // FIXED: if xsd:import is found and parent element is xsd:schema
-          if (XMLUtils.equals(n, ELEM_XSD_IMPORT)
-            && XMLUtils.equals(n.getParentNode(), ELEM_XSD_SCHEMA))
-            loadSchema(n, context);
-          else
-            // else iterate element recursively
-            searchForSchema(n.getFirstChild(), context);
-      }
-      n = n.getNextSibling();
-    }
-  }
-
-  /*
-   * It loads xsd schema and then check the version 1.0 and looking for xsd:schema element for next process.
-   * @param importNode xsd schema
-  */
-  private void loadSchema(Node importNode, String context)
-  {
-    Element im = (Element) importNode;
-    Attr schemaLocation = XMLUtils.getAttribute(im, ATTR_XSD_SCHEMALOCATION);
-    // try to parse imported XSD
-    if (schemaLocation != null && schemaLocation.getValue() != null)
-    {
-      try
-      {
-        // if any error or root element is not XSD schema -> error
-        String decl =
-          readXMLDeclarationStatement(schemaLocation.getValue(), context);
-        if (!validVersion(decl))
-        {
-          Attr a = XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE);
-          errors.add((a != null) ? a.getValue() : "");
-        }
-        Document schema =
-          validator.parseXMLDocumentURL(schemaLocation.getValue(), context);
-        if (XMLUtils.equals(schema.getDocumentElement(), ELEM_XSD_SCHEMA))
-        {
-          processSchema(schema.getDocumentElement(),
-            XMLUtils.createURLString(schemaLocation.getValue(), context));
-        }
-        result = AssertionResult.RESULT_PASSED;
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    // else if there is only the namespace attribute, the import relates to inline schema
-    else if (XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE) != null)
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-  }
-
-  /**
-  * Reads an XML declaration statement.
-  * @param location
-  * @return String
-  */
-  private String readXMLDeclarationStatement(String location, String baseURI)
-  {
-    String result = null;
-    try
-    {
-      new URL(location);
-    }
-    catch (Throwable t)
-    {
-      // nothing
-      int i = baseURI.lastIndexOf('/');
-      int j = baseURI.lastIndexOf('\\');
-      if (j > i)
-        i = j;
-      location = baseURI.substring(0, i + 1) + location;
-    }
-
-    if (location != null)
-    {
-      URL url = null;
-      Reader reader = null;
-
-      try
-      {
-        try
-        {
-          url = new URL(location);
-        }
-        catch (MalformedURLException e)
-        {
-          // we should try to access location as file
-        }
-
-        if (url != null)
-        {
-          reader = new InputStreamReader(url.openStream());
-        }
-        else
-        {
-          reader = new InputStreamReader(new FileInputStream(location));
-        }
-
-        int charCode;
-        boolean end = false;
-        if (reader.ready())
-        {
-          charCode = reader.read();
-
-          while (reader.ready() && !(charCode == '<'))
-          {
-            charCode = reader.read();
-          }
-
-          StringBuffer buf = new StringBuffer();
-          if (charCode == '<')
-          {
-            buf.append((char) charCode);
-            while (reader.ready() && !end)
-            {
-              charCode = reader.read();
-              buf.append((char) charCode);
-
-              end = charCode == '>';
-            }
-          }
-          else
-          {
-            // NOTE: This result does not get propogated back!
-            result = AssertionResult.RESULT_FAILED;
-            failureDetailMessage =
-              "Cannot read the XML declaration statement.";
-          }
-
-          result = buf.toString();
-        }
-      }
-      catch (Exception e)
-      {
-      }
-      finally
-      {
-        if (reader != null)
-        {
-          try
-          {
-            reader.close();
-          }
-          catch (Throwable e)
-          {
-          }
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /*
-   * @param xmlDecl - xml declaration
-   * @return if xml declaration contains version="1.0" it retirns true. 
-  */
-  private boolean validVersion(String xmlDecl)
-  {
-    //boolean result = false;
-    boolean result = true;
-    if (xmlDecl != null)
-    {
-      StringTokenizer st =
-        new StringTokenizer(
-          OMMITED_XML_DECLARATION_DELIMITERS,
-          XML_DECLARATION_DELIMITERS);
-      Enumeration tokens = st.parse(xmlDecl);
-      boolean found = false;
-      while (tokens.hasMoreElements() && !found)
-      {
-        String token = (String) tokens.nextElement();
-
-        if (token.equalsIgnoreCase(VERSION_TOKEN))
-        {
-          found = true;
-
-          tokens.nextElement();
-          String ver = (String) tokens.nextElement();
-
-          result = VERSION.equals(ver);
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /*
-   * It's loking for xsd import and load it if find.
-   * @param schema xsd schema
-  */
-  private void processSchema(Node schema, String context)
-  {
-    Node n = schema.getFirstChild();
-    while (n != null)
-    {
-      if (Node.ELEMENT_NODE == n.getNodeType()
-        && XMLUtils.equals(n, ELEM_XSD_IMPORT))
-        loadSchema(n, context);
-
-      n = n.getNextSibling();
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2012.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2012.java
deleted file mode 100644
index fa33c1b..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2012.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.WSDLValidatorImpl.BindingMatch;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
-  * BP2012.
-  * Example:
-  * 
-  * <message name="getConfigurationOptionsRequest">
-  * 	<part name="refresh" element="cfg:refresh" /> 
-  * </message>
-  * <portType name="ConfiguratorPortType">
-  * 	<operation name="getConfigurationOptions">
-  * 		<input message="tns:getConfigurationOptionsRequest" /> 
-  * 		<output ..... /> 
-  * 		<fault ..... /> 
-  * 	</operation>
-  * </portType>
-  * <binding name="ConfiguratorBinding" type="tns:ConfiguratorPortType">
-  * 	<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> 
-  * 	<operation name="getConfigurationOptions">
-  *		<soap:operation soapAction="http://www.zzz.com/zzz.wsdl/getConfigurationOptions" /> 
-  * 		<input>
-  * 			<soap:body use="literal" namespace="http://www.zzz.com/zzz.wsdl" /> 
-  * 		</input>
-  * 		<output>.....</output>
-  *		<fault>......</fault>
-  * 	</operation>
-  * </binding>
-  * 
-  * Above, the test for this assertion might be that the element attribute is specified in the "refresh" 
-  * part of the getConfigurationOptionsRequest message. 
-  * 
-  * Context : for <binding> "ConfiguratorBinding", <soap:binding> style=document; <soap:body> use=literal
-  * for the <input> of binding operation "getConfigurationOptions". 
-  * (<input> is an example. Could be <output> or <fault> equally).
-  * Action: check the part(s) of the message specified in the <input> element (in example) of the <portType>,
-  * namely tns:getConfigurationOptionsRequest, that the element attribute is specified. In this case we have
-  * <part name="refresh" element="cfg:refresh" />, so the test passes.
-  * All such parts associated with the assertion candidate binding(s) must be similarly checked for this assertion
-  * to pass.
-  */
-public class BP2012 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2012(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* 
-   * Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Get binding from entry context
-
-    // Oleg's & Graham's version:
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // to use original version require a binding array
-    //Binding[] binding = {(Binding) entryContext.getEntry().getEntryDetail()};
-
-    // get list of candidate matches
-    BindingMatch[] bindingMatch =
-      this.validator.getBindingMatches(
-        binding,
-        WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC,
-        WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT);
-    if (bindingMatch.length == 0)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-      try
-      {
-        if (!this.validator.checkPartAttributes(bindingMatch, "useInput", "useElement")
-          || !this.validator.checkPartAttributes(bindingMatch, "useOutput", "useElement"))
-        {
-          // this should never happen
-          throw new AssertionFailException("diagnostic: internal processing error!");
-        }
-      }
-      catch (AssertionFailException e)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail =
-          this.validator.createFailureDetail(e.getMessage(), entryContext, binding);
-      }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2013.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2013.java
deleted file mode 100644
index b93a378..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2013.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.WSDLValidatorImpl.BindingMatch;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP2013.
- * The binding (in soapbind:body elements) only refers to part elements that have been defined using the "type" attribute.
- *
- * @version 1.0.1 27.06.2003
- * @author Vitali Fedosenko
- */
-public class BP2013 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2013(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Get binding from entry context
-
-    // Oleg's & Graham's version:
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // to use original version require a binding array
-    //Binding[] binding = {(Binding) entryContext.getEntry().getEntryDetail()};
-
-    // get list of candidate matches
-    BindingMatch[] bindingMatch =
-      this.validator.getBindingMatches(
-        binding,
-        WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC,
-        WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT);
-    if (bindingMatch.length == 0)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-      try
-      {
-        if (!this.validator.checkPartAttributes(bindingMatch, "useInput", "useType")
-          || !this.validator.checkPartAttributes(bindingMatch, "useOutput", "useType"))
-        {
-          // this should never happen
-          throw new AssertionFailException("diagnostic: internal processing error!");
-        }
-      }
-      catch (AssertionFailException e)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail =
-          this.validator.createFailureDetail(e.getMessage(), entryContext, binding);
-      }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2014.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2014.java
deleted file mode 100644
index e310889..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2014.java
+++ /dev/null

@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2014.
- * Context:
- * For a candidate wsdl:operation, if referred to by a candidate rpc-literal wsdl:binding element
- * If the parameterOrder attribute is present, it omits at most 1 part from output wsdl:message.
- **/
-public class BP2014 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2014(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  /*
-   * @param binding - binding
-   * @return It returns style of soap binding of binding. If style omitted returns "document" style.   
-   */
-  private String getSOAPBindingStyle(Binding binding)
-  {
-    String style = null;
-    List list = binding.getExtensibilityElements();
-    for (int i = 0; i < list.size(); i++)
-    {
-      if (list.get(i) instanceof SOAPBinding)
-      {
-        style = ((SOAPBinding) list.get(i)).getStyle();
-        break;
-      }
-    }
-    if (style == null)
-      style = WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC;
-    return style;
-  }
-
-  /*
-   * @param list - List of extencibility elements from binding output
-   * @return first soap body in list.
-   */
-  private SOAPBody getSOAPBody(List list)
-  {
-    for (int i = 0; i < list.size(); i++)
-      if (list.get(i) instanceof SOAPBody)
-        return (SOAPBody) list.get(i);
-    return null;
-  }
-
-  /*
-   * @param list - List of extencibility elements of binding operation
-   * @return First soap operation in list.
-   */
-  private SOAPOperation getSOAPOperation(List list)
-  {
-    for (int i = 0; i < list.size(); i++)
-      if (list.get(i) instanceof SOAPOperation)
-        return (SOAPOperation) list.get(i);
-    return null;
-  }
-
-  /*          
-   * @param oper - operation
-   * @param binding - binding
-   * @return if style of soap binding of binding is rpc and use of soap body of binding output of binding operation is literal then it returns true. 
-  */
-  private boolean checkRpcLiteral(BindingOperation oper, Binding binding)
-  {
-    List list = oper.getExtensibilityElements();
-    SOAPOperation sop = getSOAPOperation(list);
-    if (sop == null)
-      return false;
-    String style =
-      (sop.getStyle() == null
-        ? getSOAPBindingStyle(binding)
-        : sop.getStyle());
-    if (!style.equals(WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC))
-      return false;
-    list = oper.getBindingOutput().getExtensibilityElements();
-    SOAPBody body = getSOAPBody(list);
-    if (body == null)
-      return false;
-    String use = body.getUse();
-    if (use == null)
-      return false;
-
-    return use.equals(WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT);
-  }
-
-  /* It checks operation contains more than one part in parameter order 
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Operation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Operation obj, Object parent, WSDLTraversalContext ctx)
-  {
-    Binding[] bindings = validator.analyzerContext.getCandidateInfo().getBindings();
-    if (obj.getParameterOrdering() == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-      return;
-    }
-
-    if (bindings == null || obj == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-      return;
-    }
-
-    if (obj.getOutput() == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-      return;
-    }
-
-    if (obj.getOutput().getMessage() == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-      return;
-    }
-
-    // For each binding
-    for (int i = 0; i < bindings.length; i++)
-    {
-      List list = bindings[i].getBindingOperations();
-      // For each binding operation
-      for (int j = 0; j < list.size(); j++)
-      {
-        BindingOperation oper = (BindingOperation) list.get(j);
-
-        // If the input operation name and binding operatino name are not null
-        if (obj.getName() != null && oper.getName() != null)
-        {
-          // If the operation names are equal
-          if (obj.getName().equals(oper.getName()))
-          {
-            // If the operation is RPC literal
-            if (checkRpcLiteral(oper, bindings[i]))
-            {
-              // Get the list of parts in the parameterOrder attribute				
-              List parts = obj.getParameterOrdering();
-
-              Output output = null;
-              Message message = null;
-              Map messageParts = null;
-
-              // Get the list of parts for the output message
-              if ((output = obj.getOutput()) != null)
-              {
-                if ((message = output.getMessage()) != null)
-                {
-                  messageParts = message.getParts();
-                }
-              }
-
-              // If there are parts in the parameterOrder attribute 
-              // and there are output message parts, then process assertion
-              if (parts != null && messageParts != null)
-              {
-                int partCount = 0;
-
-                String partName;
-                Iterator iterator = parts.iterator();
-                while (iterator.hasNext())
-                {
-                  // Get part name from parameterOrder list
-                  partName = (String) iterator.next();
-
-                  // Check each output message part to see if there is a match
-                  if (messageParts.containsKey(partName))
-                    partCount++;
-                }
-
-                if ((partCount == messageParts.size())
-                  || (partCount == messageParts.size() - 1))
-                  result = AssertionResult.RESULT_PASSED;
-                else
-                {
-                  errors.add(obj.getName());
-                  ctx.cancelOperationProcessing();
-                }
-                return;
-              }
-
-              else
-              {
-                if (parts == null)
-                  result = AssertionResult.RESULT_NOT_APPLICABLE;
-                else
-                  result = AssertionResult.RESULT_PASSED;
-                return;
-              }
-            }
-
-            else
-            {
-              result = AssertionResult.RESULT_NOT_APPLICABLE;
-              return;
-            }
-          }
-        }
-
-        else
-        {
-          result = AssertionResult.RESULT_NOT_APPLICABLE;
-          return;
-        }
-      }
-    }
-    result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-  }
-
-  /**
-   * Validates the test assertion.
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitOperation(true);
-    traversal.ignoreImport();
-    traversal.traverse((Operation) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail =
-        this.validator.createFailureDetail(
-          errors.toString(),
-          entryContext,
-          entryContext.getEntry().getEntryDetail());
-    }
-    //else
-    //  result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2017.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2017.java
deleted file mode 100644
index 64f4590..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2017.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP2017.
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>The "style" attribute of each operation in the contained soap:binding has the same value of "document" or "rpc", for all operations of the wsdl:binding.</assertionDescription>
- */
-public class BP2017 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2017(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    //String firstStyle = null; // GT: is this needed??
-    Vector failureDetailList = new Vector();
-
-    // Get the binding from the entry context
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-    if (binding == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-      return validator.createAssertionResult(testAssertion, result, failureDetailList);
-    }
-    SOAPBinding soapB = WSDLValidatorImpl.getSoapBinding(binding);
-    if (soapB == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-      return validator.createAssertionResult(testAssertion, result, failureDetailList);
-    }
-    String styleB =
-      (soapB.getStyle() == null
-        ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-        : soapB.getStyle());
-
-    // Try to get the SOAP operations
-    HashMap soapOperationList = validator.getSoapOperations(binding);
-
-    if (soapOperationList.isEmpty())
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // check that they all have the same style element value
-      String style = null;
-      String checkStyle;
-      SOAPOperation soapOperation;
-      Iterator iterator = soapOperationList.keySet().iterator();
-      while (iterator.hasNext())
-      {
-        soapOperation = (SOAPOperation) iterator.next();
-        checkStyle = soapOperation.getStyle();
-        if (checkStyle == null)
-          checkStyle = styleB;
-        if (checkStyle != null
-          && !checkStyle.equals(WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC)
-          && !checkStyle.equals(WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC))
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetailList.add(
-            this.validator.createFailureDetail(
-              "Operation Name: "
-                + soapOperationList.get(soapOperation)
-                + "\nSOAP Operation: "
-                + soapOperation.toString(),
-              entryContext,
-              soapOperation));
-          // REMOVE: Need to process all operations
-          //break;
-        }
-
-        if (style == null)
-        {
-          style = checkStyle;
-        }
-        else if (!style.equals(checkStyle) || !style.equals(styleB))
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetailList.add(
-            this.validator.createFailureDetail(
-              "Operation Name: "
-                + soapOperationList.get(soapOperation)
-                + "\nSOAP Operation: "
-                + soapOperation.toString(),
-              entryContext,
-              soapOperation));
-          // REMOVE: Need to process all operations
-          //break;
-        }
-      }
-
-      if (style == null)
-      {
-        // no style attribute was found in the SOAP operation(s) of the binding.
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-    }
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetailList);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java
deleted file mode 100644
index dd467cd..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * BP2018. 
- * <context>For a candidate Web service definition</context>
- * <assertionDescription>The wsdl:types element occurs either as the first child in the WSDL namespace of the wsdl:definitions element if no wsdl:documentation or wsdl:import element is present; or immediately following the wsdl:documentation element(s) if they are present but wsdl:import(s) are not, or immediately following both the wsdl:documentation and wsdl:import elemen(s) if present.</assertionDescription>
- */
-public class BP2018 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2018(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /*
-   * @param el - xml element
-   * @return if element is extensibility element returns true.
-   */
-  private boolean isExtensibilityElement(Element el)
-  {
-    boolean isEx = true;
-    isEx = isEx && !XMLUtils.equals(el, WSDL_BINDING);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_DEFINITIONS);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_DOCUMENTATION);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_FAULT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_IMPORT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_INPUT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_MESSAGE);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_OPERATION);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_OUTPUT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_PART);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_PORT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_PORTTYPE);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_SERVICE);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_TYPES);
-
-    return isEx;
-  }
-
-  /**
-   * Validates the test assertion.
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the location of the WSDL document
-    Definition definition =
-      (Definition) entryContext.getEntry().getEntryDetail();
-    try
-    {
-      // Parse the WSDL document as an XML file
-      Document doc =
-        validator.parseXMLDocumentURL(definition.getDocumentBaseURI(), null);
-
-      Element root = doc.getDocumentElement(); // get definition
-
-      Element types = XMLUtils.findChildElement((Element) root, WSDL_TYPES);
-
-      if (types != null)
-      {
-        Element el = XMLUtils.findPreviousSibling(types);
-        while (el != null)
-		{
-          if (!isExtensibilityElement(el) &&
-			   ((!XMLUtils.equals(el, WSDL_IMPORT)) &&
-			    (!XMLUtils.equals(el, WSDL_DOCUMENTATION))))
-		  {
-		    result = AssertionResult.RESULT_FAILED;
-			String message = "The " + el.getLocalName() + " element must not precede the types element.";
-		    failureDetail = this.validator.createFailureDetail(message, entryContext);
-  		    break;
-		  }
-          el = XMLUtils.findPreviousSibling(el);
-		}
-      }
-    }
-
-    catch (Throwable t)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-      failureDetail =
-        this.validator.createFailureDetail(
-          "An error occurred while processing the document at "
-            + definition.getDocumentBaseURI()
-            + ".\n\n"
-            + Utils.getExceptionDetails(t),
-          entryContext);
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2019.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2019.java
deleted file mode 100644
index 5a670bf..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2019.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-
-/**
- * BP2019.
- * <context>For a candidate wsdl:binding element, if the contained soap:binding element has a "style" attribute equal to "document" and soap:operations have "use" attribute equal to "literal":</context>
- * <assertionDescription>The "namespace" attribute is not specified in any contained soapbind:body, soapbind:header, soapbind::headerfault, soapbind:fault elements </assertionDescription>
- * @version 1.0.1 27.06.2003
- * @author Vitali Fedosenko
- */
-public class BP2019 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2019(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    boolean docLitFound = false;
-    String errantElements = new String("");
-    // Get the binding from the entry context
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // Try to get the SOAP binding
-    SOAPBinding soapBinding = WSDLValidatorImpl.getSoapBinding(binding);
-
-    if (soapBinding != null)
-    {
-      String style =
-        (soapBinding.getStyle() == null)
-          ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-          : soapBinding.getStyle();
-      if (style.equals(WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC))
-      {
-        Vector soapElements = Utils.arrayToVector(this.validator.getSoapBodies(binding));
-        soapElements.addAll(Utils.arrayToVector(this.validator.getSoapFaults(binding)));
-        soapElements.addAll(Utils.arrayToVector(this.validator.getSoapHeaders(binding)));
-        soapElements.addAll(
-          Utils.arrayToVector(this.validator.getSoapHeaderFaults(binding)));
-
-        Iterator i = soapElements.iterator();
-        while (i.hasNext())
-        {
-          ExtensibilityElement soapElement =
-            (ExtensibilityElement) (i.next());
-          try
-          {
-            if (this.validator.isLiteral(soapElement))
-            {
-              docLitFound = true;
-              if (this.validator.namespaceFoundInSoapLiteral(soapElement))
-              {
-                errantElements += "\n--- " + (soapElement.toString());
-              }
-            }
-          }
-          catch (Exception e)
-          {
-          } // continue with clenched teeth
-        }
-      }
-    }
-
-    if (!docLitFound)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // If a namespace was not found then test assertion passed
-      if (errantElements.length() != 0)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail =
-          this.validator.createFailureDetail(
-            "Failing elements:" + errantElements,
-            entryContext);
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2020.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2020.java
deleted file mode 100644
index 428bf92..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2020.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-
-import org.apache.xerces.util.URI;
-import org.apache.xerces.util.URI.MalformedURIException;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
-* BP2020.
-*    <context>For a candidate wsdl:binding element, if the style attribute of the contained soapbind:binding is "rpc" 
-*       and the use attribute is "literal".</context>
-*    <assertionDescription>The namespace attribute is specified on all soapbind:body elements and the value of the 
-* namespace attribute is an absolute URI. </assertionDescription>
-* @version 1.0.1 27.06.2003
-* @author Vitali Fedosenko
-**/
-public class BP2020 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2020(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-    boolean rpcLitFound = false;
-
-    // Get the binding from the entry context
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // Try to get the SOAP binding
-    SOAPBinding soapBinding = WSDLValidatorImpl.getSoapBinding(binding);
-
-    // Test the assertion 
-    // Check style to make sure that it is rpc - the subject of the assertion
-    String style = WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC;
-    if (soapBinding != null)
-      style =
-        (soapBinding.getStyle() == null
-          ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-          : soapBinding.getStyle());
-
-    if ((soapBinding != null)
-      && (style.equals(WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC)))
-    {
-      // Get the list of SOAP body elements
-      SOAPBody[] soapBodies = this.validator.getSoapBodies(binding);
-
-      // Check for Soap operation namespace
-      boolean assertionFailure = false;
-      String namespaceURI = null;
-      for (int i = 0; i < soapBodies.length && !(assertionFailure); i++)
-      {
-        SOAPBody soapBody = soapBodies[i];
-        // Added check for null use value, since the default value is literal
-        if (soapBody.getUse() == null
-          || soapBody.getUse().equals(WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-        {
-          rpcLitFound = true;
-          // If there is no namespace, then flag as a failure
-          if ((namespaceURI = soapBody.getNamespaceURI()) == null)
-          {
-            assertionFailure = true;
-            failureDetail =
-              this.validator.createFailureDetail(
-                "--- SOAP BODY:\n"
-                  + soapBody.toString()
-                  + "\n--- BINDING QNAME:\n"
-                  + binding.getQName(),
-                entryContext);
-          }
-
-          // Else, verify that the namespace is an absolute URI
-          else
-          {
-            try
-            {
-              //URL url = new URL(namespaceURI);
-              URI uri = new URI(namespaceURI);
-              if (uri.getScheme() == null)
-              {
-                // no scheme implies not an absolute URI
-                assertionFailure = true;
-                failureDetail =
-                  this.validator.createFailureDetail(
-                    "--- SOAP BODY:\n"
-                      + soapBody.toString()
-                      + "\n--- BINDING QNAME:\n"
-                      + binding.getQName(),
-                    entryContext);
-              }
-            }
-            catch (MalformedURIException mue)
-            {
-              assertionFailure = true;
-              failureDetail =
-                this.validator.createFailureDetail(
-                  "--- SOAP BODY:\n"
-                    + soapBody.toString()
-                    + "\n--- BINDING QNAME:\n"
-                    + binding.getQName(),
-                  entryContext);
-            }
-
-          }
-        }
-      }
-      if (!rpcLitFound)
-      {
-        // style is rpc but no document use elements
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-        failureDetail = null;
-      }
-      else if (!assertionFailure)
-      { // If no assertion failure, then set result to passed
-        result = AssertionResult.RESULT_PASSED;
-        failureDetail = null;
-      }
-    }
-    else
-    {
-      // style is not rpc
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-      failureDetail = null;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2021.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2021.java
deleted file mode 100644
index 105086e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2021.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
-
-/**
-*  BP2021.
-*     <context>For a candidate wsdl:binding element</context>
-*     <assertionDescription>The wsdl:input element and wsdl:output element of each operation uses the attribute name "part" with a Schema type of "NMTOKEN" and does not use "parts", for both soapbind:header elements and soapbind:headerfault elements. </assertionDescription>
-*
-* @version 1.0.1 27.06.2003
-* @author Vitali Fedosenko
-**/
-public class BP2021 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2021(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    //Operation operation = null;
-
-    // Get the binding from the entry context
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // Get SOAP headers for this binding
-    SOAPHeader[] soapHeaders = this.validator.getSoapHeaders(binding);
-
-    if (soapHeaders.length == 0)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-    {
-      // Check each header to see if it has part element with NMTOKEN type
-      for (int header = 0;
-        header < soapHeaders.length
-          && result.equals(AssertionResult.RESULT_PASSED);
-        header++)
-      {
-        if ((soapHeaders[header].getPart() == null)
-          || (!XMLUtils.isNmtoken(soapHeaders[header].getPart())))
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail =
-            this.validator.createFailureDetail(soapHeaders[header].toString(), entryContext);
-        }
-        // Else, check the headerfault if there is one
-        else
-        {
-          List soapHeaderFaultList =
-            soapHeaders[header].getSOAPHeaderFaults();
-          Iterator iterator = soapHeaderFaultList.iterator();
-
-          // Check each header fault to see if it has part element with NMTOKEN type
-          while (iterator.hasNext()
-            && result.equals(AssertionResult.RESULT_PASSED))
-          {
-            SOAPHeaderFault soapHeaderFault =
-              (SOAPHeaderFault) iterator.next();
-            if ((soapHeaderFault.getPart() == null)
-              || (!XMLUtils.isNmtoken(soapHeaderFault.getPart())))
-            {
-              result = AssertionResult.RESULT_FAILED;
-              failureDetail =
-                this.validator.createFailureDetail(soapHeaderFault.toString(), entryContext);
-            }
-          }
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2022.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2022.java
deleted file mode 100644
index 1145d7f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2022.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.soap.SOAPFault;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
-  * BP2022.
-  *    <context>For a candidate wsdl:binding element</context>
-  *  <assertionDescription>the name attribute is specified on the soapbind:fault element.</assertionDescription>
-**/
-public class BP2022 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2022(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Get the binding from the entry context
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // Get list of SOAP faults for the binding
-    SOAPFault[] soapFaults = this.validator.getSoapFaults(binding);
-
-    if (soapFaults == null || soapFaults.length == 0)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    else
-    {
-      // check all soap:faults. 
-      // MUST have a name attribute
-      for (int i = 0; i < soapFaults.length; i++)
-      {
-        SOAPFault soapFault = soapFaults[i];
-        if (soapFault.getName() == null)
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetail =
-            this.validator.createFailureDetail(
-              "soapbind:fault element : " + soapFault.toString(),
-              entryContext);
-          break;
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2023.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2023.java
deleted file mode 100644
index 20360ae..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2023.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.soap.SOAPFault;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP2023.
- *   <context>For a candidate wsdl:binding element, with the "use" attribute present on the soapbind:fault element</context>
- *   <assertionDescription>The value of the attribute is "literal".</assertionDescription>
- */
-public class BP2023 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2023(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Get the binding from the entry context
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // Get list of SOAP faults for the binding
-    SOAPFault[] soapFaults = this.validator.getSoapFaults(binding);
-
-    if (soapFaults == null || soapFaults.length == 0)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    else
-    {
-      // check all soap:faults. 
-      // MUST have a name attribute, and if a use attribute is specified, it MUST be value "literal"
-      for (int i = 0; i < soapFaults.length; i++)
-      {
-        SOAPFault soapFault = soapFaults[i];
-        if ((soapFault.getUse() != null)
-          && (!soapFault
-            .getUse()
-            .equals(WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT)))
-        {
-          result = AssertionResult.RESULT_FAILED;
-
-          failureDetail =
-            this.validator.createFailureDetail(soapFault.toString(), entryContext);
-          break;
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2032.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2032.java
deleted file mode 100644
index afd96db..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2032.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.extensions.soap.SOAPFault;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP2032.
- *   <context>For a candidate wsdl:binding element</context>
- *   <assertionDescription>the name attribute that is specified on the soapbind:fault element matches the value specified on the parent element wsdl:fault.</assertionDescription>
- */
-public class BP2032 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2032(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Get the binding from the entry context
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // Get list of Binding faults for the binding
-    BindingFault[] bindingFaults = this.validator.getAllBindingFaults(binding);
-
-    if (bindingFaults == null || bindingFaults.length == 0)
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-
-    else
-    {
-      // for each binding fault, compare the child soap:fault name with the binding fault name 
-
-      for (int i = 0; i < bindingFaults.length; i++)
-      {
-        BindingFault bindingFault = bindingFaults[i];
-        SOAPFault soapFault = this.validator.getSoapFault(bindingFault);
-        if (soapFault == null
-          || soapFault.getName() == null
-          || bindingFault.getName() == null
-          || !bindingFault.getName().equals(soapFault.getName()))
-        {
-          result = AssertionResult.RESULT_FAILED;
-
-          failureDetail = this.validator.createFailureDetail(
-            soapFault == null ? null : soapFault.toString(), entryContext);
-          break;
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java
deleted file mode 100644
index c8e61e8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-/**
- * BP2034
- *
- * <context>For a candidate description within a WSDL document</context>
- * <assertionDescription>The candidate description does not contain the namespace declaration xmlns:xml="http://www.w3.org/XML/1998/namespace".</assertionDescription> 
- */
-public class BP2034 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2034(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    // Getting wsdl:definition element
-    Definition def = (Definition) entryContext.getEntry().getEntryDetail();
-    Types types;
-    // Getting the namespace declaration xmlns:xml
-    String xmlNs = (String) def.getNamespaces().get("xml");
-    // If it exists and equals to "http://www.w3.org/XML/1998/namespace"
-    if (xmlNs != null && xmlNs.equals(WSIConstants.NS_URI_XML))
-    {
-      // setting assertion result to warning
-      result = AssertionResult.RESULT_WARNING;
-    }
-    // there is no namespace declaration xmlns:xml in the wsdl:definition
-    // element, checking whether the definition has wsdl:type element
-    else if ((types = def.getTypes()) != null)
-    {
-      // Getting the list of wsdl:schemaS
-      List extElems = types.getExtensibilityElements();
-      for (int i = 0; i < extElems.size(); i++)
-      {
-        // Getting wsdl:schema element
-        UnknownExtensibilityElement schema =
-          (UnknownExtensibilityElement) extElems.get(i);
-        // Getting a value of the attribute xmlns:xml
-        String attrValue = schema.getElement().getAttributeNS(
-          WSIConstants.NS_URI_XMLNS, "xml");
-        // If it equals to "http://www.w3.org/XML/1998/namespace",
-        if (WSIConstants.NS_URI_XML.equals(attrValue))
-        {
-          // setting assertion result to warning
-          result = AssertionResult.RESULT_WARNING;
-          failureDetail = validator.createFailureDetail("The namespace "
-            + "declaration nested in wsdl:schema element.", entryContext);
-          break;
-        }
-      }
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2098.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2098.java
deleted file mode 100644
index 6db653e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2098.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Import;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-
-
-/**
- * BP2098.
- * <context>For a candidate wsdl:import element</context>
- * <assertionDescription>The "location" attribute is specified for the wsdl:import element, and has a non-empty value.</assertionDescription>
- */
-public class BP2098 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2098(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    Import im = (Import) entryContext.getEntry().getEntryDetail();
-    // suppose that if location is invalid, the definition equals to null
-    if (im.getLocationURI() == null || im.getLocationURI() == "")
-      errors.add(im.getNamespaceURI(), im.getLocationURI());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2101.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2101.java
deleted file mode 100644
index f9a73ef..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2101.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2101.
-   * <context>For a candidate wsdl:definition, if it contains wsdl:import statements</context>
-   * <assertionDescription>Each wsdl:import statement is only used to import another WSDL description.</assertionDescription>
- */
-public class BP2101 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2101(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  boolean importFound = false;
-
-  /* Create falure report if import contains reference to non WSDL description. 
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Import, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Import im, Object parent, WSDLTraversalContext ctx)
-  {
-    importFound = true;
-
-    // by the way : WSDL4J throws Exception if imported WSDL is not resolved
-    // but documentation says that im.getDefinition() will be equal to null
-    if (im.getDefinition() == null)
-      errors.add(
-        im.getNamespaceURI()
-          + ":"
-          + im.getLocationURI()
-          + "\nImport element does not reference a WSDL definition.");
-    else
-      try
-      {
-        // try to parse WSDL according to the WSDL schema
-        validator.parseXMLDocumentURL(
-           im.getLocationURI(),
-           ((Definition)parent).getDocumentBaseURI(),
-           TestUtils.getWSDLSchemaLocation());
-      }
-      catch (Throwable t)
-      {
-        errors.add(
-          im.getNamespaceURI()
-            + ":"
-            + im.getLocationURI()
-            + "\n"
-            + Utils.getExceptionDetails(t));
-      }
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitImport(true);
-    traversal.ignoreReferences();
-    traversal.traverse((Definition) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!importFound)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java
deleted file mode 100644
index d272b9d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java
+++ /dev/null

@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * BP2102.
- * <context>For a candidate wsdl:types element, with XML schema import elements</context>
- * <assertionDescription>Each XML schema import statement (xsd:import) is only used to directly reference an XML schema definition, which has "schema" from XML namespace "http://www.w3.org/2001/XMLSchema" as root element.  It does not contain a reference to another document embedding the XML schema definition (e.g. WSDL).</assertionDescription>
- */
-public class BP2102 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2102(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private boolean importFound = false;
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // parse WSDL as XML
-    try
-    {
-      Types t = (Types) entryContext.getEntry().getEntryDetail();
-      List exts = t.getExtensibilityElements();
-
-      Definition definition = null;
-      if ((definition = validator.analyzerContext.getCandidateInfo().getDefinition(t))
-        == null)
-      {
-        throw new WSIException("Could not find types definition in any WSDL document.");
-      }
-
-      if (exts != null)
-      {
-        Iterator it = exts.iterator();
-        while (it.hasNext())
-        {
-          ExtensibilityElement el = (ExtensibilityElement) it.next();
-          if (el instanceof UnknownExtensibilityElement
-            && el.getElementType().equals(ELEM_XSD_SCHEMA))
-            testNode(((UnknownExtensibilityElement) el).getElement(),
-              definition.getDocumentBaseURI());
-
-          if (result.equals(AssertionResult.RESULT_FAILED))
-          {
-            failureDetail =
-              this.validator.createFailureDetail(failureDetailMessage, entryContext);
-          }
-        }
-      }
-
-      if (!importFound)
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    catch (Throwable tt)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-      failureDetail =
-        this.validator.createFailureDetail(
-          "WSDL document can not be processed",
-          entryContext);
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /*
-   * Check node is xsd import and it is 
-   * only used to directly reference an XML schema definition, which has "schema" 
-   * from XML namespace "http://www.w3.org/2001/XMLSchema" as root element.  
-   * And it does not contain a reference to another document embedding the XML schema 
-   * definition (e.g. WSDL).
-  * @param n - Unknown extensibility element
-  */
-  private void testNode(Node n, String context)
-  {
-    while (n != null)
-    {
-      // searches for xsd:import element
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        if (XMLUtils.equals(n, ELEM_XSD_IMPORT))
-        {
-          importFound = true;
-
-          Element im = (Element) n;
-          // Getting the schemaLocation and the namespace attributes
-          Attr schemaLocation =
-            XMLUtils.getAttribute(im, ATTR_XSD_SCHEMALOCATION);
-          Attr namespace = XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE);
-          // If there is only the namespace attribute of import element
-          if (schemaLocation == null && namespace != null)
-          {
-            // Getting all the inline schemas of the wsdl definition
-            Map schemasMap = validator.wsdlDocument.getSchemas();
-            // If an inline schema imported is defined
-            if (schemasMap.keySet().contains(namespace.getValue()))
-            {
-              // If an inline schema imported is defined
-              // (that means the schema is valid),
-              // continue with the next element
-              n = n.getNextSibling();
-              continue;
-            }
-
-            // no schemaLocation so try the namespace 
-            schemaLocation = namespace;
-          }
-
-          // try to parse imported XSD
-          if (schemaLocation != null && schemaLocation.getValue() != null)
-          {
-            try
-            {
-              // if any error or root element is not XSD schema -> error
-              // !! ATTENTION
-              // root XSD SCHEMA SCHEMA is not valid                            
-              //Document schema = XMLUtils.parseXMLDocumentURL(schemaLocation.getValue(), XSD_SCHEMALOCATION, context);
-              Document schema =
-                validator.parseXMLDocumentURL(schemaLocation.getValue(), context);
-
-              // If the import is valid, then check its contents
-              if (XMLUtils
-                .equals(schema.getDocumentElement(), ELEM_XSD_SCHEMA))
-              {
-                // Check content of imported document
-                testNode(schema.getDocumentElement().getFirstChild(),
-                  XMLUtils.createURLString(schemaLocation.getValue(), context));
-              }
-
-              else
-              {
-                throw new Exception();
-              }
-            }
-            catch (Throwable t)
-            {
-              result = AssertionResult.RESULT_FAILED;
-              failureDetailMessage = schemaLocation.getValue();
-              break;
-            }
-          }
-          else
-          {
-            //result = AssertionResult.RESULT_FAILED;
-            result = AssertionResult.RESULT_NOT_APPLICABLE;
-            failureDetailMessage =
-              "schemaLocation == null and namespace == null";
-            break;
-          }
-        }
-        testNode(n.getFirstChild(), context);
-      }
-      n = n.getNextSibling();
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java
deleted file mode 100644
index 4fda970..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Definition;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * BP2103.
-   * <context>For each a candidate wsdl:definitions</context>
-   * <assertionDescription>For the referenced definitions as well as all imported 
-   * descriptions, The XML schema import statement is only used within an xsd:schema 
-   * element.</assertionDescription>
- */
-public class BP2103 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2103(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  /* Check all unknown extensibility elements it is not xsd import.
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.ExtensibilityElement, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    ExtensibilityElement el,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    if (el instanceof UnknownExtensibilityElement)
-      searchForImport(((UnknownExtensibilityElement) el).getElement());
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    //processWSDL(entryContext.getWSDLDocument().getFilename());
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.ignoreImport();
-    traversal.visitExtensibilityElement(true);
-
-    traversal.ignoreReferences();
-    traversal.traverse((Definition) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /*
-   * Create falure report if node is xsd import. 
-   * @param n - node
-   */
-  private void searchForImport(Node n)
-  {
-    while (n != null)
-    {
-      // searches for xsd:import element
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        if (XMLUtils.equals(n, ELEM_XSD_IMPORT))
-        {
-          Attr a =
-            XMLUtils.getAttribute((Element) n, ATTR_XSD_SCHEMALOCATION);
-          String schemaLocation = (a != null) ? a.getValue() : "";
-          a = XMLUtils.getAttribute((Element) n, ATTR_XSD_NAMESPACE);
-          String namespace = (a != null) ? a.getValue() : "";
-          errors.add(new QName(namespace, schemaLocation));
-        }
-
-        else
-        {
-          // if xsd:schema element is found -> process schema
-          if (!XMLUtils.equals(n, ELEM_XSD_SCHEMA))
-            searchForImport(n.getFirstChild());
-        }
-      }
-
-      n = n.getNextSibling();
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2104.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2104.java
deleted file mode 100644
index 792f365..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2104.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.NullUtil;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2104.
-   * <context>For a candidate wsdl:import</context>
-   * <assertionDescription>The targetNamespace attribute on the wsdl:definitions element for the imported WSDL description has the same value as the namespace attribute on the wsdl:import element that imported the WSDL description.</assertionDescription>
- */
-public class BP2104 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2104(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  private boolean importFound = false;
-
-  /* Create falure report if namespace of wsdl:import does not equal targetnamespace in referenced wsdl.  
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Import, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Import im, Object parent, WSDLTraversalContext ctx)
-  {
-    importFound = true;
-    Definition def = im.getDefinition();
-    if (def != null)
-    {
-      if (!NullUtil.equals(im.getNamespaceURI(), def.getTargetNamespace()))
-        errors.add(
-          new QName(im.getNamespaceURI(), im.getLocationURI()),
-          new QName(def.getTargetNamespace(), def.getDocumentBaseURI()));
-    }
-  }
-
-  /* 
-   * Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitImport(true);
-    traversal.ignoreReferences();
-    traversal.traverse((Definition) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!importFound)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2105.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2105.java
deleted file mode 100644
index b104c6d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2105.java
+++ /dev/null

@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
-  * BP2105.
-  * <context>For a candidate wsdl:definitions</context>
-  * <assertionDescription>For the referenced definitions, as well as all imported descriptions, in the WSDL namespace under the wsdl:defintitions element, the wsdl:import element is either directly after the wsdl:documentation element or is the first child element if the wsdl:documentation element is not present.</assertionDescription>
-  */
-public class BP2105 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2105(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  private boolean importFound = false;
-
-  /* 
-   * Check wsld import element is either directly after the wsdl:documentation element 
-   * or is the first child element if the wsdl:documentation element is not present.
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Import, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Import im, Object parent, WSDLTraversalContext ctx)
-  {
-    importFound = true;
-    if (im.getDefinition() != null && im.getLocationURI() != null)
-      processWSDL(im.getDefinition().getDocumentBaseURI());
-  }
-
-  /*
-   * Check element is extensibility.
-   * @param el - xml element
-   * @return boolean
-  */
-  private boolean isExtensibilityElement(Element el)
-  {
-    boolean isEx = true;
-    isEx = isEx && !XMLUtils.equals(el, WSDL_BINDING);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_DEFINITIONS);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_DOCUMENTATION);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_FAULT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_IMPORT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_INPUT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_MESSAGE);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_OPERATION);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_OUTPUT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_PART);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_PORT);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_PORTTYPE);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_SERVICE);
-    isEx = isEx && !XMLUtils.equals(el, WSDL_TYPES);
-
-    return isEx;
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    // Get the definition element that will be analyzed       
-    Definition definition =
-      (Definition) entryContext.getEntry().getEntryDetail();
-
-    // If it doesn't contain any imports, then the result is notApplicable
-    if ((definition.getImports() == null)
-      || (definition.getImports().size() == 0))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Else analyze the 
-    else
-    {
-      processWSDL(definition.getDocumentBaseURI());
-
-      WSDLTraversal traversal = new WSDLTraversal();
-      //VisitorAdaptor.adapt(this);
-      traversal.setVisitor(this);
-      traversal.visitImport(true);
-
-      traversal.ignoreReferences();
-      traversal.ignoreImport();
-      traversal.traverse(
-        (Definition) entryContext.getEntry().getEntryDetail());
-
-      if (!errors.isEmpty())
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-      }
-
-      else if (!importFound)
-      {
-        result = AssertionResult.RESULT_NOT_APPLICABLE;
-      }
-
-      else
-      {
-        result = AssertionResult.RESULT_PASSED;
-      }
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /*
-   * the method loads WSDL and check structure
-   * @param location
-   */
-  private void processWSDL(String location)
-  {
-    try
-    {
-      // parses WSDL
-      Document doc = validator.parseXMLDocumentURL(location, null);
-      checkWSDL(doc.getDocumentElement()); // get definition
-    }
-    catch (Throwable t)
-    {
-      // ADD: add exception handling
-      //System.err.println("2105 - WSDL load failed");
-      errors.add(t.toString());
-    }
-  }
-
-  /*
-   * Create falure report contains information of node.
-   * @param root
-   */
-  private void createFailed(Node root)
-  {
-    Attr a = XMLUtils.getAttribute((Element) root, ATTR_WSDL_LOCATION);
-    String schemaLocation = (a != null) ? a.getValue() : "";
-    a = XMLUtils.getAttribute((Element) root, ATTR_WSDL_NAMESPACE);
-    String namespace = (a != null) ? a.getValue() : "";
-    errors.add(new QName(namespace, schemaLocation));
-  }
-
-  /*
-   * Check wsdl correspons assertion description.
-  * @param root - definition
-   */
-  private void checkWSDL(Node root)
-  {
-    if (root != null)
-    {
-      // Find the first import element
-      Element im = XMLUtils.findChildElement((Element) root, WSDL_IMPORT);
-
-      // Determine if a documentation element is present in the WSDL document
-      boolean documentIsPresent =
-        (XMLUtils.findChildElement((Element) root, WSDL_DOCUMENTATION)
-          != null);
-
-      // Verify that all import elements occur after a documentation element
-      while (im != null)
-      {
-        // Find elements that are previous to the import element
-        Element el = XMLUtils.findPreviousSibling(im);
-        if (el != null)
-          while (isExtensibilityElement(el) && el != null)
-            if (el != null)
-              el = XMLUtils.findPreviousSibling(el);
-
-        // If the wsdl:document elemnt is present
-        if (documentIsPresent && el != null)
-        {
-          if (!XMLUtils.equals(el, WSDL_DOCUMENTATION) && !XMLUtils.equals(el, WSDL_IMPORT))
-            createFailed(root);
-        }
-
-        // Else check if it is another wsdl: element
-        else if (el != null)
-        {
-          // If not the definitions element, then check for other wsdl: element
-          if (!XMLUtils.equals(el, WSDL_DEFINITIONS) && !XMLUtils.equals(el, WSDL_IMPORT))
-          {
-            if (el.getNamespaceURI().equals(WSIConstants.NS_URI_WSDL))
-              createFailed(root);
-          }
-        }
-
-        // Get the next import element
-        im = XMLUtils.findElement(im, WSDL_IMPORT);
-      }
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java
deleted file mode 100644
index 7fffb02..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java
+++ /dev/null

@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * BP2107.
- * <context>For a candidate wsdl:types element containing an xsd:schema element</context>
- * <assertionDescription>The xsd:schema element contains a targetNamespace attribute with a valid and non-null value unless the xsd:schema element has xsd:import and/or xsd:annotation as its only child element(s).</assertionDescription>
- */
-public class BP2107 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2107(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private boolean schemaFound = false;
-  private ErrorList errors = new ErrorList();
-  //private String context;
-
-  /* 
-   * Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    Types t = (Types) entryContext.getEntry().getEntryDetail();
-    List exts = t.getExtensibilityElements();
-    if (exts != null)
-    {
-      //context = entryContext.getWSDLDocument().getDefinitions().getDocumentBaseURI();
-      Iterator it = exts.iterator();
-      while (it.hasNext())
-      {
-        ExtensibilityElement el = (ExtensibilityElement) it.next();
-        if (el instanceof UnknownExtensibilityElement)
-          searchForSchema(((UnknownExtensibilityElement) el).getElement());
-      }
-    }
-
-    //			  context = entryContext.getWSDLDocument().getDefinitions().getDocumentBaseURI();
-    //			  processWSDL(entryContext.getWSDLDocument().getFilename());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!schemaFound)
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /*
-   * Check node schema or load schema from inmport if it exists and process it. 
-   * @param n - node
-  */
-  private void searchForSchema(Node n)
-  {
-    while (n != null)
-    {
-      // searches for xsd:import element
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        // if xsd:schema element is found -> process schema
-        if (XMLUtils.equals(n, ELEM_XSD_SCHEMA))
-        {
-          schemaFound = true;
-          processSchema(n, null);
-        }
-
-        else
-        {
-          // if xsd:import element is found -> load schema and process schema
-          //if (XMLUtils.equals(n, ELEM_XSD_IMPORT))
-          //  loadSchema(n);
-          //else
-          // else iterate element recursively
-          searchForSchema(n.getFirstChild());
-        }
-      }
-
-      n = n.getNextSibling();
-    }
-  }
-
-  /*
-   * Load schema and process it.
-   * @param importNode - xsd:import element
-  */
-  //private void loadSchema(Node importNode)
-  //{
-  //  Element im = (Element) importNode;
-  //  Attr schemaLocation = XMLUtils.getAttribute(im, ATTR_XSD_SCHEMALOCATION);
-  //  // try to parse imported XSD
-  //  if (schemaLocation != null && schemaLocation.getValue() != null)
-  //    try
-  //    {
-  //      // if any error or root element is not XSD schema -> error
-  //      Document schema =
-  //        validator.parseXMLDocumentURL(schemaLocation.getValue(), context);
-  //      if (XMLUtils.equals(schema.getDocumentElement(), ELEM_XSD_SCHEMA))
-  //      {
-  //        Attr a = XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE);
-  //        String namespace = (a != null) ? a.getValue() : "";
-  //        processSchema(schema.getDocumentElement(), namespace);
-  //      }
-  //    }
-  //    catch (Throwable t)
-  //    {
-  //      // nothing. it's not a schema
-  //    }
-  //}
-
-  /*
-   * Create falure report if it's not correspons assertion description.
-   * @param schema - xsd:schema
-   * @param namespace - namespace of schema
-  */
-  private void processSchema(Node schema, String namespace)
-  {
-    Attr a =
-      XMLUtils.getAttribute((Element) schema, ATTR_XSD_TARGETNAMESPACE);
-    String targetNamespace = (a != null) ? a.getValue() : null;
-
-    Node n = schema.getFirstChild();
-    //	   !! we suppose that xsd:import element is occured only within xsd:schema element
-    boolean containsOnlyImportAndAnnotation = true;
-    while (n != null)
-    {
-      if (n.getNodeType() == Node.ELEMENT_NODE)
-      {
-        containsOnlyImportAndAnnotation
-          &= (XMLUtils.equals(n, ELEM_XSD_IMPORT)
-            || XMLUtils.equals(n, ELEM_XSD_ANNOTATION));
-      }
-
-      //if (Node.ELEMENT_NODE == n.getNodeType() && XMLUtils.equals(n, ELEM_XSD_IMPORT))
-      //	loadSchema(n);
-
-      n = n.getNextSibling();
-    }
-
-    // If the target namespace is not set and there are elements in addition to import and annotation, then error
-    if ((targetNamespace == null || targetNamespace.length() == 0)
-      && (!containsOnlyImportAndAnnotation))
-    {
-      errors.add(targetNamespace, XMLUtils.serialize((Element) schema));
-    }
-
-    if (namespace != null && !namespace.equals(targetNamespace))
-    {
-      errors.add(namespace, XMLUtils.serialize((Element) schema));
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2108.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2108.java
deleted file mode 100644
index bf733f5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2108.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-
-
-/**
-	 * BP2108.
-     * <context>For a candidate wsdl:types, with Array declarations either locally defined or from an imported description</context>
-     * <assertionDescription>The type soapenc:Array does not appear in these declarations, and the wsdl:arrayType attribute is not used in the type declaration.</assertionDescription>
-	 */
-public class BP2108 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2108(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  /* 
-   * Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    Types t = (Types) entryContext.getEntry().getEntryDetail();
-
-    // Search the definitions in CandidateInfo to locate the definition element that contains the specified types element
-    Definition definition = null;
-    if ((definition = validator.analyzerContext.getCandidateInfo().getDefinition(t))
-      == null)
-    {
-      // This should never happen, but if it does then throw an execption
-      throw new WSIException("Could not locate types element definition.");
-    }
-
-    else
-    {
-      TypesRegistry registry =
-        new TypesRegistry(
-          t,
-          definition.getDocumentBaseURI(),
-          validator);
-
-      Iterator it = registry.getArrayTypes().iterator();
-      while (it.hasNext())
-        errors.add((QName) it.next());
-
-      if (!errors.isEmpty())
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-      }
-      else
-        result = AssertionResult.RESULT_PASSED;
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2110.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2110.java
deleted file mode 100644
index 519b6f0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2110.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-
-
-/**
- * BP2110.
-   * <context>For a candidate wsdl:types</context>
-   * <assertionDescription>Array declaration wrapper elements does not use the naming convention ArrayOfXXX.</assertionDescription>
- */
-public class BP2110 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2110(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_WARNING;
-
-    Types t = (Types) entryContext.getEntry().getEntryDetail();
-
-    // Search the definitions in CandidateInfo to locate the definition element that contains the specified types element
-    Definition definition = null;
-    if ((definition = validator.analyzerContext.getCandidateInfo().getDefinition(t))
-      == null)
-    {
-      // This should never happen, but if it does then throw an execption
-      throw new WSIException("Could not locate types element definition.");
-    }
-
-    else
-    {
-      TypesRegistry registry =
-        new TypesRegistry(
-          t,
-          definition.getDocumentBaseURI(),
-          validator);
-
-      Iterator it = registry.getElementList().iterator();
-      while (it.hasNext())
-      {
-        QName type = (QName) it.next();
-        if (type.getLocalPart().startsWith("ArrayOf"))
-          errors.add(type);
-      }
-
-      if (!errors.isEmpty())
-      {
-        result = AssertionResult.RESULT_WARNING;
-        failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-      }
-
-      else
-        result = AssertionResult.RESULT_PASSED;
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2111.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2111.java
deleted file mode 100644
index b9d942d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2111.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2111.
-   * <context>For a candidate wsdl:binding, which contains a document-literal soap:binding</context>
-   * 
-   * <assertionDescription>If the "parts" attribute is present, then the soapbind:body element(s) have at most one part listed in the parts attribute.</assertionDescription>
- */
-public class BP2111 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2111(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private boolean docLiteralFound = false;
-  private ErrorList errors = new ErrorList();
-
-  /* 
-   * Put in context soap binding's style
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBinding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-
-  public void visit(
-    SOAPBinding binding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style =
-      (binding.getStyle() == null)
-        ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-        : binding.getStyle();
-    ctx.addParameter("style", style);
-  }
-
-  /* 
-   * Verify style of soap operation is "document" if not then it's canceled process. 
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPOperation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style = operation.getStyle();
-    if (style == null)
-      style = (String) ctx.getParameter("style");
-    // assert style != null
-    if (!WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC.equals(style))
-      ctx.cancelBindingOperationProcessing();
-  }
-
-  /* 
-   * If use of soap body is "literal" and parts of soap body is more than one it creates falure report. 
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBody, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-  {
-    // assert style == "document"
-    if (WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT.equals(body.getUse()))
-    {
-      docLiteralFound = true;
-
-      List parts = body.getParts();
-      if (parts != null && parts.size() > 1)
-        //how to pick out one body from another one ?						
-        errors.add(body.getElementType(), body.getNamespaceURI());
-    }
-  }
-
-  /* 
-   * Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);;
-    traversal.setVisitor(this);
-    traversal.visitSOAPBinding(true);
-    traversal.visitSOAPBody(true);
-    traversal.visitSOAPOperation(true);
-
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-    traversal.traverse((Binding) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!docLiteralFound)
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2112.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2112.java
deleted file mode 100644
index 262bc9f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2112.java
+++ /dev/null

@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.WSDLUtil;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2112.
-   * <context>For a candidate wsdl:binding, with a style "rpc" attribute and containing at least a soapbind:body element</context>
-   * <assertionDescription>No wsdl:part referred by such a soapbind:body element is defined using the "element" attribute.</assertionDescription>
- */
-public class BP2112 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2112(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private boolean rpcLiteralFound = false;
-  private ErrorList errors = new ErrorList();
-
-  /* 
-   * Put in context soap binding's style
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBinding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-
-  public void visit(
-    SOAPBinding binding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style =
-      (binding.getStyle() == null)
-        ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-        : binding.getStyle();
-    ctx.addParameter("bindingStyle", style);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.BindingOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    BindingOperation op,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.removeParameter("operationStyle");
-  }
-
-  /* 
-   * Verify style of soap operation is "rpc" if not then it's canceled process. 
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPOperation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.addParameter("operationStyle", operation.getStyle());
-  }
-
-  /* 
-   * If use of soap body is "literal" and if at least one part is define using "element" attribute it creates falure report.    
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBody, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-  {
-    String opStyle = (String) ctx.getParameter("operationStyle");
-    String bStyle = (String) ctx.getParameter("bindingStyle");
-
-    if ((opStyle == null
-        && !WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC.equals(bStyle))
-      || (opStyle != null 
-      	&& !WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC.equals(opStyle)))
-    {
-      ctx.cancelBindingOperationProcessing();
-      return;
-    }
-    // assert use == "literal"
-    if (WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT.equals(body.getUse()))
-    {
-      rpcLiteralFound = true;
-
-      // find corresponding message
-      Operation op = ctx.getBindingOperation().getOperation();
-      // if some links are broken, cancel processing
-      if (op == null
-        || (parent instanceof BindingInput && op.getInput() == null)
-        || (parent instanceof BindingOutput && op.getOutput() == null))
-        return;
-
-      Message m =
-        (parent instanceof BindingInput)
-          ? op.getInput().getMessage()
-          : op.getOutput().getMessage();
-      // REMOVE: current message should equals to message given as entry
-      //if (m == null || message != m)
-      if (m == null)
-        return;
-
-      List parts =
-        WSDLUtil.getParts(
-          op,
-          m,
-          body,
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC);
-      if (parts == null)
-        return;
-
-      /* check whether parts list contains a parts which uses
-       * element attribute. If so, part name will be added into
-       * errors set.
-       */
-      Iterator it = parts.iterator();
-      while (it.hasNext())
-      {
-        Part part = (Part) it.next();
-        if (part.getElementName() != null)
-          errors.add(part.getName());
-      }
-    }
-  }
-
-  /* 
-   * Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-    // save message 
-    //message = (Message)entryContext.getEntry().getEntryDetail();
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);;
-    traversal.setVisitor(this);
-    traversal.visitSOAPBinding(true);
-    traversal.visitBindingOperation(true);
-    traversal.visitSOAPOperation(true);
-    traversal.visitSOAPBody(true);
-
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-
-    traversal.traverse((Binding) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!rpcLiteralFound)
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2113.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2113.java
deleted file mode 100644
index bd31cdc..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2113.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.WSDLUtil;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2113.
-   * <context>For a candidate wsdl:binding element</context>
-   * <assertionDescription>The soapbind:header, soapbind:headerfault and soapbind:fault elements only refer to wsdl:part element(s) that have been defined using the "element" attribute.</assertionDescription>
- */
-public class BP2113 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2113(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  /* 
-   * Verify soap header uses part is define using "element" attribute   
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPHeader, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPHeader header,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    Definition d = (Definition) ctx.getParameter("definition");
-    Message m = d.getMessage(header.getMessage());
-    if (m != null)
-      checkPart(m.getPart(header.getPart()), ctx.getBinding());
-  }
-
-  /* 
-   * Verify soap headerfault uses part is define using "element" attribute
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPHeaderFault, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPHeaderFault fault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    Definition d = (Definition) ctx.getParameter("definition");
-    Message m = d.getMessage(fault.getMessage());
-    // if message or part is not found - NOT_APPLICABLE ????
-    if (m != null)
-      checkPart(m.getPart(fault.getPart()), ctx.getBinding());
-  }
-
-  /* 
-   * Verify soap fault uses part is define using "element" attribute
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPFault, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPFault fault, Object parent, WSDLTraversalContext ctx)
-  {
-    String faultName = fault.getName();
-    if (faultName == null)
-      faultName = ctx.getBindingFault().getName();
-    Operation op = ctx.getBindingOperation().getOperation();
-    if (op == null /* || faultName == null*/
-      ) // may be it's possible to have legal fault with null name
-      return;
-    // we suppose that SOAPFault.getName() corresponds to the abstract operation's fault name			
-    Fault f = op.getFault(faultName);
-    if (f == null)
-      return;
-    Message m = f.getMessage();
-    // message should have only one part
-    if (m == null || m.getParts() == null || m.getParts().size() != 1)
-      return;
-    checkPart((Part) m.getOrderedParts(null).get(0), ctx.getBinding());
-  }
-
-  /*
-   * Verify part is define using "element" attribute.
-   * @param p - part
-   * @param b - binding
-  */
-  // refactoring
-  private void checkPart(Part p, Binding b)
-  {
-    if (p != null && p.getElementName() == null)
-      errors.add(b.getQName(), p.getName());
-  }
-
-  /* 
-   * Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);;
-    traversal.setVisitor(this);
-    traversal.visitSOAPHeader(true);
-    traversal.visitSOAPHeaderFault(true);
-    traversal.visitSOAPFault(true);
-
-    Map m = new HashMap();
-    Definition def = entryContext.getWSDLDocument().getDefinitions();
-    WSDLUtil.expandDefinition(def);
-    m.put("definition", def);
-    traversal.traverse((Binding) entryContext.getEntry().getEntryDetail(), m);
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2114.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2114.java
deleted file mode 100644
index 4b549d1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2114.java
+++ /dev/null

@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Fault;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.WSDLUtil;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2114.
- * <context>For a candidate wsdl:binding element</context>
- * 
- * 
- * <assertionDescription>Every wsdl:part from each wsdl:message in the associated 
- * wsdl:portType is referenced either by the soapbind:body, soapbind:header, 
- * soapbind:fault, or soapbind:headerfault.</assertionDescription>
- */
-public class BP2114 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2114(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-  // map Message QName -> set(Part name)
-  public Map messages = new HashMap();
-
-  /* 
-   * Add to Map parts which used by message
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Message, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Message m, Object parent, WSDLTraversalContext ctx)
-  {
-    if (m != null
-      && !messages.containsKey(m)
-      && m.getOrderedParts(null) != null)
-    {
-      Set s = new HashSet();
-      Iterator it = m.getOrderedParts(null).iterator();
-      while (it.hasNext())
-        s.add(((Part) it.next()).getName());
-
-      //messages.put(m.getQName(), s);
-      if (s.size() > 0)
-      {
-        messages.put(m.getQName(), s);
-      }
-    }
-  }
-
-  /* 
-   * Put in context style of soap binding
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBinding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPBinding binding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style =
-      (binding.getStyle() == null)
-        ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-        : binding.getStyle();
-    ctx.addParameter("style", style);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPOperation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style = operation.getStyle();
-    if (style != null)
-      ctx.addParameter("style", style);
-  }
-
-  /* 
-   * Remove parts of soap body from Map.  
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBody, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-  {
-    // String style = (String)ctx.getParameter("style");
-
-    // find corresponding message
-    Operation op = ctx.getBindingOperation().getOperation();
-    // if some links are broken, cancel processing
-    if (op == null)
-      return;
-    Message m = null;
-    if (parent instanceof BindingInput)
-    {
-      if (op.getInput() == null)
-        return;
-      m = op.getInput().getMessage();
-    }
-    else if (parent instanceof BindingOutput)
-    {
-      if (op.getOutput() == null)
-        return;
-      m = op.getOutput().getMessage();
-    }
-    if (m == null)
-      return;
-
-    // get parts
-    List parts = WSDLUtil.getParts(op, m, body, null);
-    if (parts == null)
-      return;
-
-    // iterate all parts and check
-    Iterator it = parts.iterator();
-    while (it.hasNext())
-      removePart(m.getQName(), ((Part) it.next()).getName());
-  }
-
-  /* 
-   * Remove parts of soap header from Map.
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPHeader, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPHeader header,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    // we suppose that it possible to have legal message and part with null names
-    // ATTENTION
-    // should we add message which is referenced by header or headerfault to messages ?
-    removePart(header.getMessage(), header.getPart());
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPHeaderFault, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPHeaderFault fault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    // we suppose that it possible to have legal message and patr with null names
-    QName messageName = fault.getMessage();
-    if (messageName == null)
-      messageName = ctx.getSOAPHeader().getMessage();
-    removePart(messageName, fault.getPart());
-  }
-
-  /* 
-   * Remove parts of soap fault from Map.
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPFault, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPFault fault, Object parent, WSDLTraversalContext ctx)
-  {
-    String faultName = fault.getName();
-    if (faultName == null)
-      faultName = ctx.getBindingFault().getName();
-    Operation op = ctx.getBindingOperation().getOperation();
-    if (op == null)
-      return;
-
-    // we suppose that SOAPFault.getName() corresponds to the abstract operation's fault name           
-    Fault f = op.getFault(faultName);
-
-    // fault message should have 1 part
-    if (f == null
-      || f.getMessage() == null
-      || f.getMessage().getParts().size() != 1)
-      return;
-
-    Part p = (Part) f.getMessage().getOrderedParts(null).get(0);
-    removePart(f.getMessage().getQName(), p.getName());
-  }
-
-  /*
-   * Remove part from Map. 
-  * @param messageName - message
-  * @param partName - part
-  */
-  // refatoring
-  private void removePart(QName messageName, String partName)
-  {
-    Set parts = (Set) messages.get(messageName);
-    if (parts != null)
-    {
-      parts.remove(partName);
-      if (parts.size() == 0)
-        messages.remove(messageName);
-    }
-  }
-
-  /* 
-   * Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_WARNING;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitMessage(true);
-    traversal.visitSOAPBinding(true);
-    traversal.visitSOAPBody(true);
-    traversal.visitSOAPHeader(true);
-    traversal.visitSOAPHeaderFault(true);
-    traversal.visitSOAPFault(true);
-    traversal.visitSOAPOperation(true);
-
-    Binding b = (Binding) entryContext.getEntry().getEntryDetail();
-    traversal.traverse(b);
-
-    if (messages.size() > 0)
-      errors.add(b.getQName());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_WARNING;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2115.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2115.java
deleted file mode 100644
index be98298..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2115.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2115.
- * <context>For a candidate wsdl:message</context>
- * <assertionDescription>An "element" attribute on any wsdl:part element refers to a global element declaration.</assertionDescription>
- */
-public class BP2115 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2115(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-  private TypesRegistry registry = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Part, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Part part, Object parent, WSDLTraversalContext ctx)
-  {
-    if (part.getElementName() != null
-      && registry.getType(part.getElementName()) == null)
-    {
-      errors.add(ctx.getMessage().getQName());
-      ctx.cancelMessageProcessing();
-    }
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    registry =
-      new TypesRegistry(
-        entryContext.getWSDLDocument().getDefinitions(),
-        validator);
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitPart(true);
-
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-    traversal.traverse((Message) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2116.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2116.java
deleted file mode 100644
index f19ff09..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2116.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2116.
- * <context>For a candidate wsdl:message element</context>
- * <assertionDescription>The wsdl:message element does not contain part elements that use both "type" and "element" attributes.</assertionDescription>
- */
-public class BP2116 extends AssertionProcessVisitor implements WSITag
-{
-
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2116(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  /* (non-Javadoc)
-  * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Part, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-  */
-  public void visit(Part part, Object parent, WSDLTraversalContext ctx)
-  {
-    if (part.getElementName() != null && part.getTypeName() != null)
-    {
-      errors.add(ctx.getMessage().getQName());
-      ctx.cancelMessageProcessing();
-    }
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitPart(true);
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-    traversal.traverse((Message) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2117.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2117.java
deleted file mode 100644
index 6709fa7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2117.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2117.
-   * <context>For a candidate wsdl:binding element, referred to by an rpc-literal soap:binding</context>
-   * <assertionDescription>The rpc-literal binding does not have a namespace attribute specified on a contained soapbind:header, soapbind:headerfault, and soapbind:fault element.</assertionDescription>
- */
-public class BP2117 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2117(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private boolean rpcLiteralFound = false;
-  private ErrorList errors = new ErrorList();
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBinding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPBinding binding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style =
-      (binding.getStyle() == null)
-        ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-        : binding.getStyle();
-    ctx.addParameter("style", style);
-  }
-
-  /* 
-   * If use of soap body is "literal" and if at least one part is define using "element" attribute it creates falure report.    
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBody, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-  {
-    // assert use == "literal"
-    if (WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT.equals(body.getUse())
-      && ((String) ctx.getParameter("style")).equals(
-        WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC))
-    {
-      rpcLiteralFound = true;
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPOperation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style = operation.getStyle();
-    if (style == null)
-      style = (String) ctx.getParameter("style");
-
-    // assert style != null
-    if (!WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC.equals(style))
-      ctx.cancelBindingOperationProcessing();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPHeader, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPHeader header,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    check(header.getUse(), header.getNamespaceURI(), ctx);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPHeaderFault, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPHeaderFault fault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    check(fault.getUse(), fault.getNamespaceURI(), ctx);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPFault, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPFault fault, Object parent, WSDLTraversalContext ctx)
-  {
-    check(fault.getUse(), fault.getNamespaceURI(), ctx);
-  }
-
-  // refactoring
-  // check LITERAL use and != namespace
-  // canceling further processing
-  private void check(String use, String namespace, WSDLTraversalContext ctx)
-  {
-    if (WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT.equals(use)
-      && namespace != null)
-    {
-      errors.add(ctx.getBinding().getQName());
-      //              suppresses subsequent processing, because error list contains only failed binding
-      ctx.cancelProcessing();
-    }
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitSOAPBinding(true);
-    traversal.visitSOAPBody(true);
-    traversal.visitSOAPHeader(true);
-    traversal.visitSOAPHeaderFault(true);
-    traversal.visitSOAPFault(true);
-    traversal.visitSOAPOperation(true);
-
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-    traversal.traverse((Binding) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!rpcLiteralFound)
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2118.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2118.java
deleted file mode 100644
index 6a4a733..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2118.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Operation;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2118.
-   * <context>For a candidate wsdl:binding element</context>
-   * <assertionDescription>The list (or set) of wsdl:operation elements for the contained wsdl:binding is the same as the list of wsdl:operations for the referred wsdl:portType.</assertionDescription>
- */
-public class BP2118 extends AssertionProcessVisitor implements WSITag
-{
-
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2118(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Operation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Operation op, Object parent, WSDLTraversalContext ctx)
-  {
-    // assert parent instanceof BindingOperation
-    if (op == null)
-    {
-      errors.add(ctx.getBinding().getQName());
-      //				suppresses subsequent processing, because error list contains only failed binding
-      ctx.cancelBindingProcessing();
-      ctx.cancelBindingOperationProcessing();
-    }
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    Binding b = (Binding) entryContext.getEntry().getEntryDetail();
-    // if operations count in port type and binding is differ -> error
-    if (b.getPortType() == null
-      || b.getPortType().getOperations().size()
-        != b.getBindingOperations().size())
-      errors.add(b.getQName());
-    else
-    {
-      WSDLTraversal traversal = new WSDLTraversal();
-      //VisitorAdaptor.adapt(this);
-      traversal.setVisitor(this);
-      traversal.visitOperation(true);
-      traversal.traverse(b);
-    }
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2119.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2119.java
deleted file mode 100644
index 3de1a83..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2119.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Operation;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2119.
-   * <context>For a candidate wsdl:binding, which is of type document-literal</context>
-   * <assertionDescription>If it does not specify the parts attribute on a soapbind:body element, the corresponding abstract wsdl:message defines zero or one wsdl:part.</assertionDescription>
- */
-public class BP2119 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2119(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private boolean docLiteralFound = false;
-  private ErrorList errors = new ErrorList();
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBinding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPBinding binding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style =
-      (binding.getStyle() == null)
-        ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-        : binding.getStyle();
-    ctx.addParameter("style", style);
-  }
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPOperation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style = operation.getStyle();
-    if (style == null)
-      style = (String) ctx.getParameter("style");
-    // assert style != null
-    if (!WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC.equals(style))
-      ctx.cancelBindingOperationProcessing();
-  }
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBody, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-  {
-    String use =
-      (body.getUse() == null)
-        ? WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT
-        : body.getUse();
-
-    // assert style == "document"
-    if (WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT.equals(use))
-    {
-      docLiteralFound = true;
-      if (body.getParts() == null)
-      {
-        Operation op = ctx.getBindingOperation().getOperation();
-        if (op == null)
-          return;
-
-        Map parts = null;
-        if (parent instanceof BindingInput)
-        {
-          if (op.getInput() == null || op.getInput().getMessage() == null)
-            return;
-          parts = op.getInput().getMessage().getParts();
-        }
-        else if (parent instanceof BindingOutput)
-        {
-          if (op.getOutput() == null || op.getOutput().getMessage() == null)
-            return;
-          parts = op.getOutput().getMessage().getParts();
-        }
-
-        if (parts != null && parts.size() > 1)
-        {
-          errors.add(ctx.getBinding().getQName());
-          //						suppresses subsequent processing, because error list contains only failed binding
-          ctx.cancelBindingProcessing();
-          ctx.cancelBindingOperationProcessing();
-          ctx.cancelBindingInputProcessing();
-          ctx.cancelBindingOutputProcessing();
-        }
-      }
-    }
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitSOAPBinding(true);
-    traversal.visitSOAPBody(true);
-    traversal.visitSOAPOperation(true);
-    traversal.ignoreImport();
-    traversal.traverse((Binding) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!docLiteralFound)
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2120.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2120.java
deleted file mode 100644
index 6927283..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2120.java
+++ /dev/null

@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.WSDLUtil;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2120.
- * <context>For a candidate wsdl:binding</context>
- * <assertionDescription>Each operation referenced by the binding results in a unique wire signature.</assertionDescription>
- */
-public class BP2120 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2120(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-  private Set wares = new HashSet();
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBinding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPBinding binding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style =
-      (binding.getStyle() == null)
-        ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-        : binding.getStyle();
-    ctx.addParameter("style", style);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPOperation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style = operation.getStyle();
-    if (style != null)
-      ctx.addParameter("style", style);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.soap.SOAPBody, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-  {
-    List signature = new LinkedList();
-
-    String style = (String) ctx.getParameter("style");
-
-    // find corresponding message
-    Operation op = ctx.getBindingOperation().getOperation();
-
-    // if some links are broken, cancel processing
-    if (op == null
-      || op.getInput() == null
-      || op.getInput().getMessage() == null)
-      return;
-    Message m = op.getInput().getMessage();
-
-    List parts = WSDLUtil.getParts(op, m, body, style);
-    if (parts == null)
-      return;
-    // !! ATTENTION
-    // may be required to add types instead of part into signature ?
-
-    // create signature
-    signature.addAll(parts);
-
-    // suppose that wire signature for
-    // - rpc style = operation name + parts' qname
-    // - document style = parts' qname
-    if (WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC.equals(style))
-      signature.add(0, op.getName());
-
-    if (sameSignature(wares, signature))
-      errors.add(op.getName());
-    else
-      wares.add(signature);
-  }
-
-  /**
-   * Check if the signature is in the set match.
-   */
-  private boolean sameSignature(Set signatureSet, List signature)
-  {
-    boolean same = false;
-
-    // Get iterator for set
-    Iterator set = signatureSet.iterator();
-    while (set.hasNext() && !same)
-    {
-      // Get next signature from the set
-      List nextSignature = (List) set.next();
-
-      // Only continue if the signatures are the same size
-      if (nextSignature.size() == signature.size())
-      {
-        Iterator iterator1 = nextSignature.iterator();
-        Iterator iterator2 = signature.iterator();
-
-        // Assume same until a difference is found
-        same = true;
-
-        // Process each list until a difference is found
-        while (iterator1.hasNext() && iterator2.hasNext() && same)
-        {
-          // Get the next elements
-          Object element1 = iterator1.next();
-          Object element2 = iterator2.next();
-
-          // If the element is a string, then if equal check parts
-          if ((element1 instanceof String)
-            && (element2 instanceof String)
-            && (((String) element1).equals((String) element2)))
-          {
-            same = true;
-          }
-
-          // If the elements are parts, then check if they are equal
-          else if ((element1 instanceof Part) && (element2 instanceof Part))
-          {
-            same = sameParts((Part) element1, (Part) element2);
-          }
-
-          else
-          {
-            same = false;
-          }
-        }
-      }
-    }
-
-    return same;
-  }
-
-  /**
-   * Check if two parts are the same.
-   */
-  private boolean sameParts(Part part1, Part part2)
-  {
-    boolean same = false;
-
-    // If the part has an element then see if they are the same
-    if (part1.getElementName() != null
-      && part2.getElementName() != null
-      && part1.getElementName().equals(part2.getElementName()))
-    {
-      same = true;
-    }
-
-    // If the part has an type then see if they are the same
-    else if (
-      part1.getTypeName() != null
-        && part2.getTypeName() != null
-        && part1.getTypeName().equals(part2.getTypeName()))
-    {
-      same = true;
-    }
-
-    else
-    {
-      same = false;
-    }
-
-    return same;
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitSOAPBinding(true);
-    traversal.visitSOAPBody(true);
-    traversal.visitSOAPOperation(true);
-    traversal.ignoreBindingOutput();
-    traversal.traverse((Binding) entryContext.getEntry().getEntryDetail());
-
-    // !! ATTENTION
-    // Analyze soapbind:body:namespace and service targetNamespace            
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2121.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2121.java
deleted file mode 100644
index 6ad594a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2121.java
+++ /dev/null

@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.TypesRegistry;
-import org.eclipse.wst.wsi.internal.core.util.WSDLUtil;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2121.
- * Context:
- * For  a wsdl:binding element which is referenced directly or associated
- * with a specified wsdl:port.
- * 
- * Assertion Description:
- * Each  operation referenced by a document-literal binding must have a
- * message definition where the wsdl:part references a global element
- * definition.
- */
-public class BP2121 extends AssertionProcessVisitor implements WSITag
-{
-
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2121(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-  private TypesRegistry registry = null;
-
-  public void visit(
-    SOAPBinding binding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style =
-      (binding.getStyle() == null)
-        ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-        : binding.getStyle();
-    ctx.addParameter("style", style);
-  }
-  public void visit(
-    SOAPOperation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    String style = operation.getStyle();
-    if (style == null)
-      style = (String) ctx.getParameter("style");
-    // assert style != null
-    if (!WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC.equals(style))
-      ctx.cancelBindingOperationProcessing();
-  }
-
-  public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-  {
-    // !! ATTENTION
-    // we suppose that soapbody child elements is its parts.
-    // assert style == "document"
-    if (WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT.equals(body.getUse()))
-    {
-      // find corresponding message
-      Operation op = ctx.getBindingOperation().getOperation();
-      // if some links are broken, cancel processing
-      if (op == null
-        || (parent instanceof BindingInput && op.getInput() == null)
-        || (parent instanceof BindingOutput && op.getOutput() == null))
-        return;
-
-      Message m =
-        (parent instanceof BindingInput)
-          ? op.getInput().getMessage()
-          : op.getOutput().getMessage();
-      if (m == null)
-        return;
-
-      // find parts which are involved in the given body
-      List parts =
-        WSDLUtil.getParts(
-          op,
-          m,
-          body,
-          WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC);
-      if (parts == null)
-        return;
-
-      // check parts
-      Iterator it = parts.iterator();
-      while (it.hasNext())
-      {
-        Part p = (Part) it.next();
-        // check whether p declared as global element
-        if (p.getElementName() == null
-          || registry.getType(p.getElementName()) == null)
-        {
-          errors.add(op.getName());
-          //						suppresses subsequent processing, because error list contains only failed operation
-          ctx.cancelBindingOperationProcessing();
-        }
-      }
-    }
-  }
-
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    registry =
-      new TypesRegistry(
-        entryContext.getWSDLDocument().getDefinitions(),
-        validator);
-
-    // collect all types from messages to checkedParts map
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitSOAPBinding(true);
-    traversal.visitSOAPBody(true);
-    traversal.visitSOAPOperation(true);
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-    traversal.traverse((Binding) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java
deleted file mode 100644
index f6caf11..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.List;
-
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-
-
-/**
- * BP2122. 
- *    <context>For a candidate wsdl:types element</context>
- *    <assertionDescription>The data type definition if any within the wsdl:types element is an XML schema definition defined in the XML Schema 1.0 Recommendation with the namespace URI "http://www.w3.org/2001/XMLSchema".</assertionDescription>
- */
-public class BP2122 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2122(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-    ErrorList errorList = new ErrorList();
-
-    // Get the types from the entry context
-    Types types = (Types) entryContext.getEntry().getEntryDetail();
-
-    if (types != null)
-    {
-      ExtensibilityElement extElement;
-      List extElements = types.getExtensibilityElements();
-
-      // Process each ext. element
-      for (int i = 0; i < extElements.size(); i++)
-      {
-        // If it is an unknown ext. element and it is a schema, then check it
-        if ((extElement = (ExtensibilityElement) extElements.get(i))
-          instanceof UnknownExtensibilityElement)
-        {
-          if (!extElement.getElementType().equals(WSITag.ELEM_XSD_SCHEMA))
-          {
-            // If it is not a schema definition, then it is an error
-            errorList.add(
-              extElement.getElementType().toString()
-                + " can not be a child of the wsdl:types element.");
-          }
-        }
-      }
-    }
-
-    // If XMLSchemaValidator could not find any errors, check errors from the inline schema validator
-    if (errorList.isEmpty())
-      errorList.add(validator.wsdlDocument.getSchemasValidationErrors());
-
-    if (!errorList.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errorList.toString(), entryContext);
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2123.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2123.java
deleted file mode 100644
index af5f833..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2123.java
+++ /dev/null

@@ -1,357 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Element;
-
-
-/**
- * BP2123. 
- * <context>For a candidate wsdl:definitions, if it contains a wsdl:port, wsdl:binding, wsdl:portType, wsdl:operation, or wsdl:message</context>
- * <assertionDescription>Contained WSDL extension elements do not use the wsdl:required attribute value of "true".</assertionDescription>
- */
-public class BP2123 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2123(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private boolean claimFound = false;
-
-  private static final String PORT_KEY = "port";
-  private static final String BINDING_KEY = "binding";
-  private static final String PORT_TYPE_KEY = "port type";
-  private static final String OPERATION_KEY = "operation";
-  private static final String MESSAGE_KEY = "message";
-
-  /* (non-Javadoc)
-  * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Port, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-  */
-  public void visit(Port port, Object parent, WSDLTraversalContext ctx)
-  {
-    if (port != null)
-    {
-      if (containsLegalClaim(port.getDocumentationElement()))
-      {
-        claimFound = true;
-        ctx.addParameter(PORT_KEY, Boolean.TRUE);
-      }
-      else
-      {
-        ctx.addParameter(PORT_KEY, Boolean.FALSE);
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Binding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Binding binding, Object parent, WSDLTraversalContext ctx)
-  {
-    if (binding != null)
-    {
-      Boolean port = (Boolean) ctx.getParameter(PORT_KEY);
-
-      if (port.booleanValue())
-      {
-        ctx.addParameter(BINDING_KEY, Boolean.TRUE);
-      }
-      else
-      {
-        claimFound = containsClaim(binding.getDocumentationElement());
-        ctx.addParameter(
-          BINDING_KEY,
-          new Boolean(containsLegalClaim(binding.getDocumentationElement())));
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.PortType, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(PortType type, Object parent, WSDLTraversalContext ctx)
-  {
-    if (type != null)
-    {
-      Boolean binding = (Boolean) ctx.getParameter(BINDING_KEY);
-
-      if (binding.booleanValue())
-      {
-        ctx.addParameter(PORT_TYPE_KEY, Boolean.TRUE);
-      }
-      else
-      {
-        claimFound = containsClaim(type.getDocumentationElement());
-        ctx.addParameter(
-          PORT_TYPE_KEY,
-          new Boolean(containsLegalClaim(type.getDocumentationElement())));
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Operation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    Operation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    if (operation != null)
-    {
-      Boolean type = (Boolean) ctx.getParameter(PORT_TYPE_KEY);
-
-      if (type.booleanValue())
-      {
-        ctx.addParameter(OPERATION_KEY, Boolean.TRUE);
-      }
-      else
-      {
-        claimFound = containsClaim(operation.getDocumentationElement());
-        ctx.addParameter(
-          OPERATION_KEY,
-          new Boolean(
-            containsLegalClaim(operation.getDocumentationElement())));
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Message, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Message message, Object parent, WSDLTraversalContext ctx)
-  {
-    if (message != null)
-    {
-      Boolean operation = (Boolean) ctx.getParameter(OPERATION_KEY);
-
-      if (operation.booleanValue())
-      {
-        ctx.addParameter(MESSAGE_KEY, Boolean.TRUE);
-      }
-      else
-      {
-        claimFound = containsClaim(message.getDocumentationElement());
-        ctx.addParameter(
-          MESSAGE_KEY,
-          new Boolean(containsLegalClaim(message.getDocumentationElement())));
-      }
-    }
-  }
-
-  /*
-  public void visit(BindingOperation operation, Object parent, WSDLTraversalContext ctx) {
-  	if (operation != null) {
-  		if (containsLegalClaim(operation.getDocumentationElement())) {
-  			System.out.println("binding operation found");
-  		} else {
-  			
-  		}
-  	}
-  }
-  */
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.ExtensibilityElement, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-
-  public void visit(
-    ExtensibilityElement el,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    boolean required =
-      el != null
-        && el.getRequired() != null
-        && el.getRequired().booleanValue();
-
-    if (isParentConforms(parent, ctx))
-    {
-      if (required)
-      {
-        result = AssertionResult.RESULT_WARNING;
-        failureDetailMessage = el.toString();
-      }
-    }
-  }
-
-  /**
-   * Indicates whether the parent element conforms to the basic profile.
-   * @param parent
-   * @param ctx
-   * @return boolean
-   */
-  private boolean isParentConforms(Object parent, WSDLTraversalContext ctx)
-  {
-    boolean result = false;
-
-    if (parent instanceof Port)
-    {
-      result = ((Boolean) ctx.getParameter(PORT_KEY)).booleanValue();
-    }
-    else if (
-      parent instanceof Binding
-        || parent instanceof BindingOperation
-        || parent instanceof BindingInput
-        || parent instanceof BindingOutput
-        || parent instanceof BindingFault)
-    {
-      result = ((Boolean) ctx.getParameter(BINDING_KEY)).booleanValue();
-    }
-    else if (parent instanceof PortType)
-    {
-      result = ((Boolean) ctx.getParameter(PORT_TYPE_KEY)).booleanValue();
-    }
-    else if (
-      parent instanceof Operation
-        || parent instanceof Input
-        || parent instanceof Output
-        || parent instanceof Fault)
-    {
-      result = ((Boolean) ctx.getParameter(OPERATION_KEY)).booleanValue();
-    }
-    else if (parent instanceof Message || parent instanceof Part)
-    {
-      result = ((Boolean) ctx.getParameter(MESSAGE_KEY)).booleanValue();
-    }
-
-    return result;
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(TestAssertion, EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // Expect wsdl:defintions
-    Definition def = (Definition) entryContext.getEntry().getEntryDetail();
-    //((Service)def.getServices().values().toArray()[0]).getPorts()
-    // Traverse WSDL
-    WSDLTraversal traversal = new WSDLTraversal();
-    // VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitOperation(true);
-    traversal.visitBinding(true);
-    traversal.visitMessage(true);
-    traversal.visitPort(true);
-    traversal.visitPortType(true);
-    traversal.visitExtensibilityElement(true);
-
-    traversal.ignoreImport();
-    traversal.ignoreDefinition2Binding();
-    traversal.ignoreDefinition2Element();
-    traversal.ignoreDefinition2ExtensibilityElement();
-    traversal.ignoreDefinition2Message();
-    traversal.ignoreDefinition2PortType();
-    traversal.ignoreDefinition2Types();
-
-    traversal.traverse(def);
-
-    if (!claimFound)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    else if (result.equals(AssertionResult.RESULT_WARNING))
-    {
-      failureDetail = this.validator.createFailureDetail(failureDetailMessage, entryContext);
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Check the documentation element whether contains conformance claims.
-   * Returns true if documentation element contains conformance claim with
-   * legal schema definition URI. 
-   * legal is 'http://ws-i.org/schemas/conformanceClaim/'
-   * @param el
-   * @return boolean
-   */
-  private boolean containsClaim(Element el)
-  {
-    if (el == null)
-      return false;
-    // find claim
-    el = XMLUtils.findChildElement(el, WSI_CLAIM);
-    if (el != null)
-    {
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Check the documentation element whether contains conformance claims.
-   * Returns true if documentation element contains conformance claim with
-   * legal schema definition URI. 
-   * legal is 'http://ws-i.org/schemas/conformanceClaim/'
-   * @param el
-   * @return boolean
-   */
-  private boolean containsLegalClaim(Element el)
-  {
-    if (el == null)
-      return false;
-    // find claim
-    el = XMLUtils.findChildElement(el, WSI_CLAIM);
-    while (el != null)
-    {
-      String value = el.getAttribute(ATTR_CLAIM_CONFORMSTO.getLocalPart());
-      if (value != null
-        && value.equalsIgnoreCase(WSIConstants.ATTRVAL_UDDI_CLAIM_KEYVALUE))
-      {
-        return true;
-      }
-
-      el = XMLUtils.findElement(el, WSI_CLAIM);
-    }
-    return false;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2201.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2201.java
deleted file mode 100644
index 324ddfc..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2201.java
+++ /dev/null

@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.StringTokenizer;
-
-/**
- * BP2201. 
- * <context>For a candidate Web service definition within a WSDL document with a XML declaration statement. </context>
- * <assertionDescription>The XML declaration statement uses UTF-8 or UTF-16 for the encoding. </assertionDescription>
- */
-public class BP2201 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2201(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private final char[] OMMITED_XML_DECLARATION_DELIMITERS = new char[]{0x20,
-      0x9, 0xD, 0xA, '\'', '\"'};
-  private final char[] XML_DECLARATION_DELIMITERS = new char[]{'='};
-  private final String UTF_8_ENCODING = "UTF-8";
-  private final String UTF_16_ENCODING = "UTF-16";
-  private final String ENCODING_TOKEN = "encoding";
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion,
-   *      org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(TestAssertion testAssertion,
-      EntryContext entryContext) throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-    Definition definition = (Definition) entryContext.getEntry()
-        .getEntryDetail();
-    String location = definition.getDocumentBaseURI();
-    String xmlDecl = readXMLDeclarationStatement(location);
-    if (xmlDecl == null)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    } else
-    {
-      if (!validEncoding(xmlDecl))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail = validator.createFailureDetail(xmlDecl, entryContext);
-      }
-    }
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-  /**
-   * Reads an XML declaration statement.
-   * 
-   * @param location
-   * @return String
-   */
-  private String readXMLDeclarationStatement(String location)
-  {
-    String result = null;
-    if (location != null)
-    {
-      URL url = null;
-      Reader reader = null;
-      try
-      {
-        try
-        {
-          url = new URL(location);
-        } catch (MalformedURLException e)
-        {
-          // we should try to access location as file
-        }
-        if (url != null)
-        {
-          reader = new InputStreamReader(url.openStream());
-        } else
-        {
-          reader = new InputStreamReader(new FileInputStream(location));
-        }
-        int charCode;
-        boolean end = false;
-        if (reader.ready())
-        {
-          charCode = reader.read();
-          while (reader.ready() && !(charCode == '<'))
-          {
-            charCode = reader.read();
-          }
-          char[] c = new char[4];
-          reader.read(c);
-          StringBuffer buf = new StringBuffer();
-          if (new String(c).toLowerCase().equals("?xml"))
-          {
-            buf.append("<?xml");
-            while (reader.ready() && !end)
-            {
-              charCode = reader.read();
-              buf.append((char) charCode);
-              end = charCode == '>';
-            }
-          } else
-          {
-            // NOTE: This result does not get propogated back!
-            this.result = AssertionResult.RESULT_NOT_APPLICABLE;
-            return null;
-          }
-          result = buf.toString();
-        }
-      } catch (Exception e)
-      {
-        //VERBOSE
-        if (validator.verboseOption)
-        {
-          System.err.println("  [WSI2201] Exception: " + e.getMessage());
-        }
-      } finally
-      {
-        if (reader != null)
-        {
-          try
-          {
-            reader.close();
-          } catch (Throwable e)
-          {
-          }
-        }
-      }
-    }
-    return result;
-  }
-  /*
-   * Verify xml declaration contains utf-16 or utf-8 encoding. @param xmlDecl -
-   * xml declaration @return
-   */
-  private boolean validEncoding(String xmlDecl)
-  {
-    //boolean result = false;
-    boolean result = true;
-    if (xmlDecl != null)
-    {
-      StringTokenizer st = new StringTokenizer(
-          OMMITED_XML_DECLARATION_DELIMITERS, XML_DECLARATION_DELIMITERS);
-      Enumeration tokens = st.parse(xmlDecl);
-      boolean found = false;
-      while (tokens.hasMoreElements() && !found)
-      {
-        String token = (String) tokens.nextElement();
-        if (token.equals(ENCODING_TOKEN))
-        {
-          found = true;
-          tokens.nextElement();
-          String enc = (String) tokens.nextElement();
-          result = UTF_8_ENCODING.equalsIgnoreCase(enc)
-              || UTF_16_ENCODING.equalsIgnoreCase(enc);
-        }
-      }
-    }
-    return result;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java
deleted file mode 100644
index 64c7934..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java
+++ /dev/null

@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.util.StringTokenizer;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * BP2202.
- *  <context>For a candidate wsdl:types element within a WSDL document which imports an XML schema directly or indirectly.</context>
- * <assertionDescription>The imported schema uses UTF-8 or UTF-16 for the encoding.</assertionDescription>
- */
-public class BP2202 extends AssertionProcess implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2202(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-  private boolean importFound = false;
-
-  private final char[] OMMITED_XML_DECLARATION_DELIMITERS =
-    new char[] { 0x20, 0x9, 0xD, 0xA, '\'', '\"' };
-  private final char[] XML_DECLARATION_DELIMITERS = new char[] { '=' };
-  private final String UTF_8_ENCODING = "UTF-8";
-  private final String UTF_16_ENCODING = "UTF-16";
-
-  private final String ENCODING_TOKEN = "encoding";
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    //Definition def = (Definition) entryContext.getEntry().getEntryDetail();
-    Types types = (Types) entryContext.getEntry().getEntryDetail();
-    List exts = null;
-    //if (def.getTypes() != null)
-    if (types != null)
-      //exts = def.getTypes().getExtensibilityElements();
-      exts = types.getExtensibilityElements();
-    if (exts != null)
-    {
-      Definition definition = null;
-      if ((definition =
-        validator.analyzerContext.getCandidateInfo().getDefinition(types))
-        == null)
-      {
-        throw new WSIException("Could not find types definition in any WSDL document.");
-      }
-
-      Iterator it = exts.iterator();
-      while (it.hasNext())
-      {
-        ExtensibilityElement el = (ExtensibilityElement) it.next();
-        if (el instanceof UnknownExtensibilityElement
-          && el.getElementType().equals(ELEM_XSD_SCHEMA))
-          searchForSchema(((UnknownExtensibilityElement) el).getElement(),
-              definition.getDocumentBaseURI());
-      }
-    }
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else if (!importFound)
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /*
-   * Search xsd schema or xsd import from node. If node is xsd import it's loading schema.
-   * @param n - node
-  */
-  private void searchForSchema(Node n, String context)
-  {
-    while (n != null)
-    {
-      // searches for xsd:import element
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        // if xsd:schema element is found -> process schema
-        if (XMLUtils.equals(n, ELEM_XSD_SCHEMA))
-        {
-          processSchema(n, context);
-        }
-        else
-        {
-          // if xsd:import element is found -> load schema and process schema
-          if (XMLUtils.equals(n, ELEM_XSD_IMPORT))
-          {
-            importFound = true;
-            loadSchema(n, context);
-          }
-          else
-            // else iterate element recursively
-            searchForSchema(n.getFirstChild(), context);
-        }
-      }
-      n = n.getNextSibling();
-    }
-  }
-
-  /*
-   * It loads xsd schema and then check valid encoding and looking for xsd:schema element for next process. 
-   * @param importNode - xsd schema
-  */
-  private void loadSchema(Node importNode, String context)
-  {
-    Element im = (Element) importNode;
-    Attr schemaLocation = XMLUtils.getAttribute(im, ATTR_XSD_SCHEMALOCATION);
-    // try to parse imported XSD
-    if (schemaLocation != null && schemaLocation.getValue() != null)
-      try
-      {
-        // if any error or root element is not XSD schema -> error
-        String decl =
-          readXMLDeclarationStatement(schemaLocation.getValue(), context);
-        if (!validDeclaration(decl,
-          ENCODING_TOKEN,
-          new String[] { UTF_8_ENCODING, UTF_16_ENCODING }))
-        {
-          Attr a = XMLUtils.getAttribute(im, ATTR_XSD_NAMESPACE);
-          errors.add((a != null) ? a.getValue() : "");
-        }
-
-        if (!validDeclaration(decl, "version", new String[] { "1.0" }))
-        {
-          errors.add(
-            "Version number in XML declaration is not 1.0.  XML schema file: "
-              + schemaLocation.getValue());
-        }
-
-        // DEBUG:
-        // System.out.println(schemaLocation.getValue() + ":" + context);
-
-        Document schema =
-          validator.parseXMLDocumentURL(schemaLocation.getValue(), context);
-
-        if (XMLUtils.equals(schema.getDocumentElement(), ELEM_XSD_SCHEMA))
-        {
-           processSchema(schema.getDocumentElement(),
-              XMLUtils.createURLString(schemaLocation.getValue(), context));
-        }
-        result = result = AssertionResult.RESULT_PASSED;
-      }
-      catch (Throwable t)
-      {
-      }
-  }
-
-  /**
-  * Reads an XML declaration statement.
-  * @param location
-  * @return String
-  */
-  private String readXMLDeclarationStatement(String location, String baseURI)
-  {
-    String result = null;
-    try
-    {
-      new URL(location);
-    }
-    catch (Throwable t)
-    {
-      // nothing
-      int i = baseURI.lastIndexOf('/');
-      int j = baseURI.lastIndexOf('\\');
-      if (j > i)
-        i = j;
-      location = baseURI.substring(0, i + 1) + location;
-    }
-
-    if (location != null)
-    {
-      URL url = null;
-      Reader reader = null;
-
-      try
-      {
-        try
-        {
-          url = new URL(location);
-        }
-        catch (MalformedURLException e)
-        {
-          // we should try to access location as file
-        }
-
-        if (url != null)
-        {
-          reader = new InputStreamReader(url.openStream());
-        }
-        else
-        {
-          reader = new InputStreamReader(new FileInputStream(location));
-        }
-
-        int charCode;
-        boolean end = false;
-        if (reader.ready())
-        {
-          charCode = reader.read();
-
-          while (reader.ready() && !(charCode == '<'))
-          {
-            charCode = reader.read();
-          }
-
-          StringBuffer buf = new StringBuffer();
-          if (charCode == '<')
-          {
-            buf.append((char) charCode);
-            while (reader.ready() && !end)
-            {
-              charCode = reader.read();
-              buf.append((char) charCode);
-
-              end = charCode == '>';
-            }
-          }
-          else
-          {
-            // NOTE: This result does not get propogated back!
-            result = AssertionResult.RESULT_FAILED;
-            failureDetailMessage =
-              "Cannot read the XML declaration statement.";
-          }
-
-          result = buf.toString();
-        }
-      }
-      catch (Exception e)
-      {
-        errors.add(e.getMessage());
-      }
-      finally
-      {
-        if (reader != null)
-        {
-          try
-          {
-            reader.close();
-          }
-          catch (Throwable e)
-          {
-          }
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /*
-   * @param xmlDecl - xml declaration
-   * @return if xml declaration contains encoding="utf-16" or encoding="utf-8" it retirns true. 
-  */
-
-  //private boolean validEncoding(String xmlDecl)
-  //{
-  //  //boolean result = false;
-  //  boolean result = true;
-  //  if (xmlDecl != null)
-  //  {
-  //    StringTokenizer st =
-  //      new StringTokenizer(
-  //        OMMITED_XML_DECLARATION_DELIMITERS,
-  //        XML_DECLARATION_DELIMITERS);
-  //    Enumeration tokens = st.parse(xmlDecl);
-  //   boolean found = false;
-  //    while (tokens.hasMoreElements() && !found)
-  //    {
-  //      String token = (String) tokens.nextElement();
-  //
-  //      if (token.equals(ENCODING_TOKEN))
-  //      {
-  //        found = true;
-  //
-  //        tokens.nextElement();
-  //        String enc = (String) tokens.nextElement();
-  //
-  //        result =
-  //         UTF_8_ENCODING.equalsIgnoreCase(enc)
-  //            || UTF_16_ENCODING.equalsIgnoreCase(enc);
-  //      }
-  //    }
-  //  }
-  //
-  //  return result;
-  //}
-
-  /**
-   * @param xmlDecl - xml declaration
-   * @return if xml declaration contains valid version number then true is returned. 
-  */
-  private boolean validDeclaration(
-    String xmlDecl,
-    String tokenName,
-    String[] checkValueList)
-  {
-    //boolean result = false;
-    boolean result = true;
-    if (xmlDecl != null)
-    {
-      StringTokenizer st =
-        new StringTokenizer(
-          OMMITED_XML_DECLARATION_DELIMITERS,
-          XML_DECLARATION_DELIMITERS);
-      Enumeration tokens = st.parse(xmlDecl);
-
-      if (tokens.hasMoreElements())
-      {
-        boolean found = false;
-        while (tokens.hasMoreElements() && !found)
-        {
-          String token = (String) tokens.nextElement();
-
-          if (token.equals(tokenName))
-          {
-            found = true;
-            result = false;
-
-            tokens.nextElement();
-            String tokenValue = (String) tokens.nextElement();
-
-            for (int i = 0; i < checkValueList.length && !result; i++)
-            {
-              if (checkValueList[i].equalsIgnoreCase(tokenValue))
-                result = true;
-            }
-          }
-        }
-      }
-
-      // If there are no tokens then it is not a valid declaraction
-      else
-      {
-        result = false;
-      }
-    }
-
-    return result;
-  }
-
-  /*
-   * It's looking for xsd import and load it if find.
-   * @param schema - xsd schema
-   * @param namespace - namespace of schema
-   */
-  private void processSchema(Node schema, String context)
-  {
-    Node n = schema.getFirstChild();
-    while (n != null)
-    {
-      if (Node.ELEMENT_NODE == n.getNodeType()
-        && XMLUtils.equals(n, ELEM_XSD_IMPORT))
-      {
-        importFound = true;
-        loadSchema(n, context);
-      }
-
-      n = n.getNextSibling();
-    }
-  }
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2208.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2208.java
deleted file mode 100644
index c359633..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2208.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Operation;
-import javax.wsdl.OperationType;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP2208.
- * <context>For a candidate wsdl:operation in a wsdl:portType definition</context>
- * <assertionDescription>The wsdl:operation element is either a WSDL request/response or a one-way operation (no Notification or Sollicit-Response).</assertionDescription>
- */
-public class BP2208 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2208(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* (non-Javadoc)
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    Operation operation =
-      (Operation) entryContext.getEntry().getEntryDetail();
-    OperationType opType = operation.getStyle();
-    if ((opType == null)
-      || (!opType.equals(OperationType.ONE_WAY)
-        && !opType.equals(OperationType.REQUEST_RESPONSE)))
-    {
-      result = AssertionResult.RESULT_FAILED;
-      if (opType == null)
-        failureDetail =
-          this.validator.createFailureDetail(
-            "Could not determine the operation type for "
-              + operation.getName()
-              + ".",
-            entryContext);
-      else
-        failureDetail = null; // none defined in TAD at present 
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2402.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2402.java
deleted file mode 100644
index 74f3da4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2402.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.soap.SOAPBinding;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP2402.
- * <context>For a candidate wsdl:binding element</context>
- * <assertionDescription>The wsdl:binding element has a soapbind:binding child element.</assertionDescription>
- */
-public class BP2402 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2402(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* (non-Javadoc)
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    // Get the port from the entry context
-    //Port port = (Port) entryContext.getEntry().getEntryDetail();
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // Try to get the SOAP binding
-    SOAPBinding soapBinding = WSDLValidatorImpl.getSoapBinding(binding);
-
-    // Test the assertion 
-    // Check that there is at least one SOAP Binding
-    if (soapBinding != null)
-    {
-      result = AssertionResult.RESULT_PASSED;
-      failureDetail = null;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2404.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2404.java
deleted file mode 100644
index 688e8d5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2404.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.soap.SOAPBinding;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP2404.
- * <context>For a candidate wsdl:binding element</context>
- * <assertionDescription>The contained soap:binding element has a "transport" attribute, which has value: http://schemas.xmlsoap.org/soap/http.</assertionDescription>
- */
-public class BP2404 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2404(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* (non-Javadoc)
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the binding from the entry context
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // Try to get the SOAP binding
-    SOAPBinding soapBinding = WSDLValidatorImpl.getSoapBinding(binding);
-
-    // Test the assertion 
-    // Check for Soap binding namespace 
-    if ((soapBinding == null)
-      || (soapBinding.getTransportURI() == null)
-      || !soapBinding.getTransportURI().equals(WSIConstants.NS_URI_SOAP_HTTP))
-    {
-      result = AssertionResult.RESULT_FAILED;
-      this.validator.createFailureDetail(
-        soapBinding == null
-          ? "WSDL document does not contain SOAP binding element."
-          : soapBinding.toString(),
-        entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2406.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2406.java
deleted file mode 100644
index 9d5d8ed..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2406.java
+++ /dev/null

@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP2406.
- * <context>For a candidate wsdl:binding element, if the use attribute is specified on the soapbind:body, soapbind:fault, soapbind:header, or soapbind:headerfault elements.</context>
- * <assertionDescription>The use attribute has a value of "literal".</assertionDescription>
- */
-public class BP2406 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2406(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* (non-Javadoc)
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    // Get the binding from the entry context
-    Binding binding = (Binding) entryContext.getEntry().getEntryDetail();
-
-    // Get SOAP body elements      
-    SOAPBody[] soapBodies = this.validator.getSoapBodies(binding);
-
-    // ADD: What happens if there are no soap body elements?  Right now the TA result is NA.      
-
-    // Test the assertion 
-    // Check for correct use value 
-    for (int i = 0; i < soapBodies.length; i++)
-    {
-      SOAPBody soapBody = soapBodies[i];
-      if (soapBody.getUse() != null
-        && !soapBody.getUse().equals(WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail =
-          this.validator.createFailureDetail(soapBody.toString(), entryContext);
-        break;
-      }
-    }
-
-    // Get SOAP fault elements      
-    SOAPFault[] soapFaults = this.validator.getSoapFaults(binding);
-
-    // Test the assertion 
-    // Check for correct use value 
-    for (int i = 0; i < soapFaults.length; i++)
-    {
-      SOAPFault soapFault = soapFaults[i];
-      if (soapFault.getUse() != null
-        && !soapFault.getUse().equals(WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetailMessage =
-          (failureDetailMessage == null
-            ? soapFault.toString()
-            : failureDetailMessage + "\n\n" + soapFault.toString());
-        if (failureDetail == null)
-          failureDetail =
-            this.validator.createFailureDetail(failureDetailMessage, entryContext);
-        else
-          failureDetail.setFailureMessage(failureDetailMessage);
-        break;
-      }
-    }
-
-    // Get SOAP header elements      
-    SOAPHeader[] soapHeaders = this.validator.getSoapHeaders(binding);
-
-    // Test the assertion 
-    // Check for correct use value 
-    for (int i = 0; i < soapHeaders.length; i++)
-    {
-      SOAPHeader soapHeader = soapHeaders[i];
-      if (soapHeader.getUse() != null
-        && !soapHeader.getUse().equals(WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetailMessage =
-          (failureDetailMessage == null
-            ? soapHeader.toString()
-            : failureDetailMessage + "\n\n" + soapHeader.toString());
-        if (failureDetail == null)
-          failureDetail =
-            this.validator.createFailureDetail(failureDetailMessage, entryContext);
-        else
-          failureDetail.setFailureMessage(failureDetailMessage);
-        break;
-      }
-    }
-
-    // Get SOAP header fault elements      
-    SOAPHeaderFault[] soapHeaderFaults = this.validator.getSoapHeaderFaults(binding);
-
-    // Test the assertion 
-    // Check for correct use value 
-    for (int i = 0; i < soapHeaderFaults.length; i++)
-    {
-      SOAPHeaderFault soapHeaderFault = soapHeaderFaults[i];
-      if (soapHeaderFault.getUse() != null
-        && !soapHeaderFault.getUse().equals(
-          WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetailMessage =
-          (failureDetailMessage == null
-            ? soapHeaderFault.toString()
-            : failureDetailMessage + "\n\n" + soapHeaderFault.toString());
-        if (failureDetail == null)
-          failureDetail =
-            this.validator.createFailureDetail(failureDetailMessage, entryContext);
-        else
-          failureDetail.setFailureMessage(failureDetailMessage);
-        break;
-      }
-    }
-
-    // If the result is passed, but there was nothing to check then set to notApplicable
-    if (result == AssertionResult.RESULT_PASSED
-      && (soapBodies == null || soapBodies.length == 0)
-      && (soapFaults == null || soapFaults.length == 0)
-      && (soapHeaders == null || soapHeaders.length == 0)
-      && (soapHeaderFaults == null || soapHeaderFaults.length == 0))
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2416.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2416.java
deleted file mode 100644
index 1a1eba3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2416.java
+++ /dev/null

@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
-* BP2416. 
-*   <context>For a candidate wsdl:definitions</context>
-*   <assertionDescription>Every QName in the WSDL document and its imports, is referencing an element in a namespace that has either been imported or defined in the WSDL document that contains the reference.</assertionDescription>
-*/
-public class BP2416 extends AssertionProcessVisitor
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2416(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private static final String NS_LIST_KEY = "namespaces";
-
-  /**
-   * Checks whether the namespace is defined or imported in the definition.
-   * @param qname
-   * @param ctx
-   */
-  private void checkNamespace(QName qname, WSDLTraversalContext ctx)
-  {
-    if (qname != null)
-    {
-      String namespace = qname.getNamespaceURI();
-
-      if (namespace != null)
-      {
-        List namespaces = (List) ctx.getParameter(NS_LIST_KEY);
-
-        if (!namespaces.contains(namespace))
-        {
-          result = AssertionResult.RESULT_FAILED;
-          failureDetailMessage = namespace;
-
-          ctx.cancelProcessing();
-        }
-      } // ??? should we do something otherwise  
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Port, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Port port, Object parent, WSDLTraversalContext ctx)
-  {
-    if (port != null)
-    {
-      Binding binding = port.getBinding();
-      if (binding != null)
-      {
-        checkNamespace(binding.getQName(), ctx);
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Binding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Binding binding, Object parent, WSDLTraversalContext ctx)
-  {
-    if (binding != null)
-    {
-      PortType pType = binding.getPortType();
-      if (pType != null)
-      {
-        checkNamespace(pType.getQName(), ctx);
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Operation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    Operation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    if (operation != null)
-    {
-      Input input = operation.getInput();
-      if (input != null && input.getMessage() != null)
-      {
-        checkNamespace(input.getMessage().getQName(), ctx);
-      }
-
-      Output output = operation.getOutput();
-      if (output != null && output.getMessage() != null)
-      {
-        checkNamespace(output.getMessage().getQName(), ctx);
-      }
-
-      Map faults = operation.getFaults();
-      for (Iterator iter = faults.values().iterator(); iter.hasNext();)
-      {
-        Fault fault = (Fault) iter.next();
-
-        if (fault.getMessage() != null)
-        {
-          checkNamespace(fault.getMessage().getQName(), ctx);
-        }
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Message, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  /* REMOVE: This is already done in WSI2417
-  public void visit(Message message, Object parent, WSDLTraversalContext ctx) {
-   if (message != null) {
-     Map parts = message.getParts();
-     for (Iterator iter = parts.values().iterator(); iter.hasNext();) {
-       Part part = (Part) iter.next();
-       
-       checkNamespace(part.getElementName(), ctx);                
-       checkNamespace(part.getTypeName(), ctx);
-     }
-   }
-  }
-  */
-
-  /* (non-Javadoc)
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the definition from the entry context
-    Definition definition =
-      (Definition) entryContext.getEntry().getEntryDetail();
-
-    // get list of namespaces imported and defined in the definition
-    List namespaces = this.validator.getWSDLTargetNamespaceList(definition);
-
-    // REMOVE:
-    //Map namespaces = definition.getNamespaces();
-
-    // traverse definition to check namespaces
-    Map params = new HashMap();
-    params.put(NS_LIST_KEY, namespaces);
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    // VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitOperation(true);
-    traversal.visitBinding(true);
-    traversal.visitMessage(true);
-    traversal.visitPort(true);
-
-    traversal.ignoreImport();
-    traversal.ignoreReferences();
-    traversal.traverse(definition, params);
-
-    if (result.equals(AssertionResult.RESULT_FAILED))
-    {
-      this.validator.createFailureDetail(failureDetailMessage, entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2417.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2417.java
deleted file mode 100644
index 1743d49..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2417.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
- * BP2417. 
- *   <context>For a candidate wsdl:definitions</context>
- *   <assertionDescription>Every QName in the WSDL document and its imports and that 
- *      is referring to a schema component, uses the namespace defined in the targetNamespace 
- *      attribute on the xs:schema element, or a namespace defined in the namespace attribute 
- *      on an xs:import element within the xs:schema element.</assertionDescription>
- */
-public class BP2417 extends AssertionProcessVisitor
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2417(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errorList = new ErrorList();
-  private static final String NS_LIST_KEY = "namespaces";
-
-  /**
-   * Checks whether the namespace is defined or imported in the definition.
-   * @param qname
-   * @param ctx
-   */
-  private void checkNamespace(QName qname, WSDLTraversalContext ctx)
-  {
-    if (qname != null)
-    {
-      String namespace = qname.getNamespaceURI();
-
-      if (namespace != null)
-      {
-        List namespaceList = (List) ctx.getParameter(NS_LIST_KEY);
-
-        if ((namespaceList != null) && !namespaceList.contains(namespace))
-        {
-          errorList.add(qname);
-        }
-      }
-    }
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Message, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Message message, Object parent, WSDLTraversalContext ctx)
-  {
-    if (message != null)
-    {
-      Map parts = message.getParts();
-
-      for (Iterator iter = parts.values().iterator(); iter.hasNext();)
-      {
-        Part part = (Part) iter.next();
-
-        checkNamespace(part.getElementName(), ctx);
-        checkNamespace(part.getTypeName(), ctx);
-      }
-    }
-  }
-
-  /**
-   * @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the definition from the entry context
-    Definition definition =
-      (Definition) entryContext.getEntry().getEntryDetail();
-
-    // Get a list of all schema targetNamespaces
-    List tnsList = null;
-    try
-    {
-      if ((tnsList = this.validator.getSchemaNamespaceList(definition)) == null)
-        tnsList = new Vector();
-    }
-
-    catch (WSIException e)
-    {
-      // This exception would indicate that the schema definition had a problem
-      tnsList = new Vector();
-    }
-
-    // Always add XML schema namespace to cover built-in types
-    tnsList.add(WSIConstants.NS_URI_XSD);
-
-    // Traverse definition to check schema namespaces
-    Map params = new HashMap();
-    params.put(NS_LIST_KEY, tnsList);
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    traversal.setVisitor(this);
-    traversal.visitMessage(true);
-
-    traversal.ignoreImport();
-    traversal.ignoreReferences();
-    traversal.traverse(definition, params);
-
-    // If there were no errors, then the assertion passed
-    if (errorList.isEmpty())
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-
-    // Otherwise it failed / create the failure detail using the QNames that were in error
-    else
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errorList.toString(), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2700.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2700.java
deleted file mode 100644
index bbf2312..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2700.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.xml.sax.SAXException;
-
-/**
-  * BP2700.
-  *   <context>For a candidate wsdl:definitions element within a WSDL document.</context>
-  *   <assertionDescription>The wsdl:definitions is a well-formed XML 1.0 document.</assertionDescription>
-  */
-public class BP2700 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2700(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* (non-Javadoc)
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    result = AssertionResult.RESULT_PASSED;
-
-    try
-    {
-      //String wsdlURI = entryContext.getWSDLDocument().getDefinitions().getDocumentBaseURI();  
-      // TEMP: Need to define a better way to get the WSDL URI
-      String wsdlURI = entryContext.getEntry().getReferenceID();
-      // non-validating parse
-      XMLUtils.parseXMLDocument(wsdlURI);
-    }
-
-    catch (WSIException e)
-    {
-      if (e.getTargetException() instanceof SAXException)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail =
-          this.validator.createFailureDetail(
-            Utils.getExceptionDetails(e.getTargetException()),
-            entryContext);
-      }
-    }
-
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail =
-        this.validator.createFailureDetail(Utils.getExceptionDetails(e), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2701.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2701.java
deleted file mode 100644
index 124c1f9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2701.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
-  * BP2701.
-  *   <context>For a candidate wsdl:definitions element within a WSDL document.</context>
-  *   <assertionDescription>The wsdl:definitions namespace has value: http://schemas.xmlsoap.org/wsdl/.</assertionDescription>
-  */
-public class BP2701 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2701(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* (non-Javadoc)
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    Definition def = (Definition) entryContext.getEntry().getEntryDetail();
-
-    /*
-    if (def != null) {
-    	QName qname = def.getQName();
-    				
-    	if (qname != null) {	
-    		//if (def.getNamespace("").equals(WSIConstants.NS_URI_WSDL) {
-    		if (qname.getNamespaceURI().equals(WSIConstants.NS_URI_WSDL)) {
-    			result = AssertionResult.RESULT_PASSED;
-    		}
-    	}
-    }
-    */
-
-    try
-    {
-      String schemaUsed = this.validator.getSchemaUsed(def);
-      if (schemaUsed.equals(WSIConstants.NS_URI_WSDL))
-      {
-        result = AssertionResult.RESULT_PASSED;
-      }
-
-      else
-      {
-        result = AssertionResult.RESULT_FAILED;
-      }
-    }
-
-    catch (AssertionFailException e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      //ADD: failure description?
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2703.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2703.java
deleted file mode 100644
index e23a69c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2703.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.xml.sax.SAXException;
-
-
-/**
- * BP2703.
- *   <context>For a candidate description within a WSDL document, if it uses the WSDL namespace</context>
- *   <assertionDescription>The definition conforms to the WSDL schema located at http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd</assertionDescription>
- */
-public class BP2703 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2703(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    result = AssertionResult.RESULT_PASSED;
-
-    try
-    {
-      Definition def = (Definition) entryContext.getEntry().getEntryDetail();
-
-      if (def == null)
-      {
-        throw new AssertionFailException("Definition null");
-      }
-
-      String wsdlURI = entryContext.getEntry().getReferenceID();
-
-      Map namespaces = def.getNamespaces();
-      for (Iterator iter = namespaces.values().iterator(); iter.hasNext();)
-      {
-        String ns = (String) iter.next();
-
-        if (WSIConstants.NS_URI_WSDL.equalsIgnoreCase(ns))
-        {
-        	XMLUtils.parseXMLDocument(wsdlURI, TestUtils.getWSDLSchemaLocation());
-        }
-
-        if (WSIConstants.NS_URI_WSDL_SOAP.equalsIgnoreCase(ns))
-        {
-        	XMLUtils.parseXMLDocument(wsdlURI, TestUtils.getWSDLSOAPSchemaLocation());
-        }
-      }
-    }
-
-    catch (WSIException e)
-    {
-      if (e.getTargetException() instanceof SAXException)
-      {
-        result = AssertionResult.RESULT_FAILED;
-        failureDetail =
-          this.validator.createFailureDetail(
-            Utils.getExceptionDetails(e.getTargetException()),
-            entryContext);
-      }
-    }
-
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail =
-        this.validator.createFailureDetail(Utils.getExceptionDetails(e), entryContext);
-    }
-
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2803.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2803.java
deleted file mode 100644
index a2602a2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2803.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.net.URI;
-
-import javax.wsdl.Import;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionNotApplicableException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcess;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-
-
-/**
- * BP2803
- * <context>For a candidate wsdl:import element</context>
- * <assertionDescription>The "namespace" attribute is specified for the wsdl:import element, and the attribute's value is not a relative URI.</assertionDescription>
- */
-public class BP2803 extends AssertionProcess
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP2803(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* Validates the test assertion.
-  * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-
-    // Getting wsdl:import
-    Import im = (Import) entryContext.getEntry().getEntryDetail();
-
-    try
-    {
-      // If there is no the "namespace" attribute in the import,
-      // the assertion is not applicable
-      if (im.getNamespaceURI() == null)
-      {
-        throw new AssertionNotApplicableException();
-      }
-
-      // If a namespace URI is relative or invalid, the assertion failed
-      URI uri = new URI(im.getNamespaceURI());
-      if (!uri.isAbsolute())
-      {
-        throw new AssertionFailException(
-          im.getNamespaceURI() + " is relative URI.");
-      }
-    }
-    catch (AssertionNotApplicableException anae)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    catch (Exception e)
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = validator.createFailureDetail(
-        e.getMessage(), entryContext);
-    }
-
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4200.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4200.java
deleted file mode 100644
index f2c7335..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4200.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-/**
- * BP4200. 
- * <context>For a candidate wsdl:definitions that contains a wsdl extension element or attribute from a namespace other than "http://schemas.xmlsoap.org/wsdl/soap/".</context>
- * <assertionDescription>Contained WSDL extension elements that do not belong to the "http://schemas.xmlsoap.org/wsdl/soap/" namespaces may require out of band negotiation.</assertionDescription>
-*/
-public class BP4200 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-  private ErrorList errorList = new ErrorList();
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP4200(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.ExtensibilityElement, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(ExtensibilityElement obj, Object parent,
-    WSDLTraversalContext ctx)
-  {
-    // If a child element of wsdl:types is from a namespace other than
-    // "http://www.w3.org/2001/XMLSchema"
-    if (parent instanceof Types)
-    {
-      //if (!obj.getElementType().getNamespaceURI().equals(
-      //  WSIConstants.NS_URI_XSD))
-      //{
-      //  Add element name to error list
-      //  errorList.add(obj.getElementType());
-      //}
-    }
-    // or any other ext element coming from a namespace other than
-    // "http://schemas.xmlsoap.org/wsdl/soap/"
-    else if (!obj.getElementType().getNamespaceURI().equals(WSIConstants.NS_URI_WSDL_SOAP)
-    	  && !obj.getElementType().getNamespaceURI().equals(WSIConstants.NS_URI_WSDL))
-    {
-      // Add element name to error list
-      errorList.add(obj.getElementType()); 
-    }
-  }
-
-   /**
-  *  (non-Javadoc)
-  *  @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-  */
-  public AssertionResult validate(TestAssertion testAssertion,
-    EntryContext entryContext) throws WSIException
-  {
-    // Get the definition from the entry context
-    Definition definition =
-      (Definition) entryContext.getEntry().getEntryDetail();
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    traversal.setVisitor(this);
-
-    traversal.visitExtensibilityElement(true);
-    traversal.visitElement(true);
-
-    traversal.ignoreImport();
-    traversal.ignoreReferences();
-    traversal.traverse(definition);
-
-    try
-	{
-      // getting WSDL document.
-      Document doc = XMLUtils.parseXMLDocument(definition.getDocumentBaseURI());
-      if (doc != null)
-      {   
-        checkElement(doc.getDocumentElement());
-
-        if (errorList.isEmpty())
-        {
-          result = AssertionResult.RESULT_NOT_APPLICABLE;
-        }
-        else
-        {
-          failureDetail = validator.createFailureDetail(
-          testAssertion.getDetailDescription() + "\n\n" + errorList.toString(),
-          entryContext);
-        }
-      }
-	}   
-    catch (Throwable t)
-    {
-	}
-    // Return assertion result
-    return validator.createAssertionResult(
-      testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Checking on wsdl elements recursively whether they contain extension attributes.
-   * @param elem Element.
-   */
-  private void checkElement(Element elem)
-  {
-    while (elem != null)
-    {
-      String elemNS = elem.getNamespaceURI();
-      NamedNodeMap attrs = elem.getAttributes();
-      if (attrs != null)
-      {
-        for (int i = 0; i < attrs.getLength(); i++)
-        {
-          Attr attr = (Attr) attrs.item(i);
-          String attrNS = attr.getNamespaceURI();
-          if (attrNS != null
-            && !attrNS.equals(WSIConstants.NS_URI_XMLNS)
-            && !attrNS.equals(WSIConstants.NS_URI_WSDL)
-			&& !attrNS.equals(WSIConstants.NS_URI_WSDL_SOAP))
-          {
-            errorList.add("Extensibility attribute " + attr.getName()
-              + "for the " + elem.getNodeName() + " element is found.");
-          }
-        }
-      }
-
-      if (!elemNS.equals(WSIConstants.NS_URI_XSD))
-      {
-        checkElement(XMLUtils.getFirstChild(elem));
-      }
-      elem = XMLUtils.getNextSibling(elem);
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4201.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4201.java
deleted file mode 100644
index 21f131f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4201.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.net.URISyntaxException;
-import java.util.Iterator;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-
-
-/**
-* BP4201. 
-* <context>For a candidate wsdl:import element, where the location attribute or the namespace attribute has a value that is a relative URI, or a for soap:address element where the location attribute is a relative URI.</context>
-* <assertionDescription>The use of a relative URI as the value for a wsdl:import location or namespace attribute, or for a soap:address location attribute may require out of band coordination.</assertionDescription>
-*/
-public class BP4201 extends AssertionProcessVisitor
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP4201(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-  private ErrorList errorList = new ErrorList();
-
-  /** 
-   * (non-Javadoc)
-   * @see org.eclipse.wst.wsi.wsdl.traversal.WSDLVisitor#visit(Import, Object, WSDLTraversalContext)
-   */
-  public void visit(Import obj, Object parent, WSDLTraversalContext ctx)
-  {
-    if(obj != null)
-    {
-      if(isRelativeURI(obj.getNamespaceURI()) || 
-          isRelativeURI(obj.getLocationURI()))
-      {
-        errorList.add(obj.getNamespaceURI(), obj.getLocationURI());
-      }
-    }
-  }
-
-  /** 
-   * (non-Javadoc)
-   * @see org.eclipse.wst.wsi.wsdl.traversal.WSDLVisitor#visit(Port, Object, WSDLTraversalContext)
-   */
-  public void visit(Port obj, Object parent, WSDLTraversalContext ctx)
-  {
-    if(obj != null)
-    {
-      Iterator it = obj.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-         Object e = (Object) it.next();
-         // for each SOAPAddress elements check LocationURI 
-         if(e instanceof SOAPAddress) {
-           if(isRelativeURI(((SOAPAddress) e).getLocationURI()))
-           {
-             errorList.add(((SOAPAddress) e).getElementType() + 
-                 ":" + ((SOAPAddress) e).getLocationURI());
-           }
-         }
-      }
-    }
-  }
-
-  /**
-   *  (non-Javadoc)
-   *  @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_PASSED;
-
-    // Get the definition from the entry context
-    Definition definition =
-      (Definition) entryContext.getEntry().getEntryDetail();
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    traversal.setVisitor(this);
-    traversal.visitImport(true);
-    traversal.visitPort(true);
-    traversal.ignoreReferences();
-    traversal.traverse(definition);
-
-    if (errorList.isEmpty()) 
-    {
-       return validator.createAssertionResult(testAssertion, 
-             AssertionResult.RESULT_NOT_APPLICABLE, (String) null);
-    }
-    
-    failureDetail = this.validator.createFailureDetail(testAssertion.getFailureMessage() + 
-        "\n\n" + errorList.toString(), entryContext);
-    // Return assertion result
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-  /**
-   * Returns true if URI is relative 
-   * @param s - URI
-   * @return true - if URI is relative, false - in other case  
-   */
-  private boolean isRelativeURI(String s)
-  {
-    if(s == null)
-      return false;
-    try
-    {
-      if(new java.net.URI(s).isAbsolute())
-      {
-        return false;
-      }
-    } catch (URISyntaxException e)
-    {
-      return false;
-    }
-    return true;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java
deleted file mode 100644
index 63791e0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.schema.XMLSchemaProcessor;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * BP4202. 
- * <context>For an XML schema definition defined in the wsdl:types element, or imported directly or indirectly by a schema definition defined in the wsdl:types element, which contains any schema annotation elements.</context>
- * <assertionDescription>An XML schema definition defined in the wsdl:types element, or imported directly or indirectly by a schema definition defined in the wsdl:types element, may use schema annotation elements as an extensibility mechanism.</assertionDescription>
- */
- public class BP4202 extends AssertionProcessVisitor implements WSITag 
- {
-   private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public BP4202(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private static final String ANNOTATION_KEY = "annotation";
-   
-   private ErrorList errorList = new ErrorList();
-   private AnnotationProcessor processor;
-
-   /** 
-    * (non-Javadoc)
-    * @see org.eclipse.wst.wsi.wsdl.traversal.WSDLVisitor#visit(Message, Object, WSDLTraversalContext)
-    */
-   public void visit(ExtensibilityElement obj, Object parent, WSDLTraversalContext ctx)
-   {
-     if((obj != null) && (obj instanceof UnknownExtensibilityElement))
-     {
-       UnknownExtensibilityElement el = (UnknownExtensibilityElement) obj;
-       try {
-         processor.processAllSchema(el.getElement());
-       } catch (WSIException e) {}
-     }
-   }
-
-   /**
-    *  (non-Javadoc)
-    *  @see org.eclipse.wst.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-    */
-   public AssertionResult validate(
-     TestAssertion testAssertion,
-     EntryContext entryContext)
-     throws WSIException
-   {
-     result = AssertionResult.RESULT_PASSED;
-
-     // Get the types from the entry context
-     Types types =
-       (Types) entryContext.getEntry().getEntryDetail();
-     
-     processor = new AnnotationProcessor(
-           entryContext.getWSDLDocument().getDefinitions().getDocumentBaseURI());
-     
-     WSDLTraversal traversal = new WSDLTraversal();
-     traversal.setVisitor(this);
-     traversal.visitExtensibilityElement(true);
-     traversal.ignoreReferences();
-     traversal.traverse(types);
-     
-     if (errorList.isEmpty()) 
-     {
-        return validator.createAssertionResult(testAssertion, 
-              AssertionResult.RESULT_NOT_APPLICABLE, (String) null);
-     }
-     
-     failureDetail = this.validator.createFailureDetail(testAssertion.getFailureMessage() + 
-         "\n\n" + errorList.toString(), entryContext);
-     // Return assertion result
-     return validator.createAssertionResult(testAssertion, result, failureDetail);
-   }
-   
-   /**
-    * Class for parse schema and search annotation elements 
-    */
-   class AnnotationProcessor extends XMLSchemaProcessor
-   {
-     public AnnotationProcessor(String context)
-     {
-       super(context, false);
-     }
-
-     protected void processSchema(Element element)
-     {
-       checkForAnnotation(element);
-     }
-     
-     private void checkForAnnotation(Node node) 
-     {
-       if((node.getLocalName() != null) && (node.getLocalName().equals(ANNOTATION_KEY))) {
-         errorList.add(node.toString());
-       }
-       for (int i = 0; i < node.getChildNodes().getLength(); i++)
-       {
-         checkForAnnotation(node.getChildNodes().item(i));
-       }
-     }
-   }
- }
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2209.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2209.java
deleted file mode 100644
index 4c4dd0f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2209.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-
-/**
- * SSBP2209
- *
- * <context>For a candidate wsdl:binding element</context>
- * <assertionDescription>The wsdl:binding binds every wsdl:part of a wsdl:message in the wsdl:portType to which it refers to one of soapbind:body, soapbind:header, soapbind:fault or soapbind:headerfault.</assertionDescription>
- */
-public class SSBP2209 extends BP2114
-{
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public SSBP2209(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2402.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2402.java
deleted file mode 100644
index 9291f36..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2402.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * SSBP2402
- */
-public class SSBP2402 extends BP2402
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public SSBP2402(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2403.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2403.java
deleted file mode 100644
index 041320f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2403.java
+++ /dev/null

@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.XMLTraversal;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * SSBP2403.
- * <context>For a candidate wsdl:binding element</context>
- * <assertionDescription>Descendant elements and attributes in the wsdl:binding are not from the namespaces for the WSDL MIME, HTTP GET/POST or DIME binding extensions.</assertionDescription>
- */
-public class SSBP2403 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public SSBP2403(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-
-  private ErrorList errors = new ErrorList();
-
-  /**
-   * Returns true if the the namespace specifies any WSDL MIME,
-   * HTTP GET/POST or DIME binding extensions.
-   * @param namespace a namespace.
-   * @return true if the the namespace specifies any WSDL MIME,
-   *         HTTP GET/POST or DIME binding extensions.
-   */
-  private boolean isNonConformantBindingExtension(String namespace)
-  {
-    boolean result = false;
-    if (namespace != null)
-    {
-      if (namespace.equals(WSIConstants.NS_NAME_WSDL_MIME)
-        || namespace.equals(WSIConstants.NS_NAME_WSDL_HTTP)
-        || namespace.equals(WSIConstants.NS_NAME_WSDL_DIME))
-        result = true;
-    }
-    return result;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.extensions.ExtensibilityElement, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    ExtensibilityElement exel,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    if (isNonConformantBindingExtension(exel
-      .getElementType()
-      .getNamespaceURI()))
-      errors.add(exel.getElementType());
-    else
-    {
-    	// extensibility element is ok, check the descendants
-      if (exel instanceof UnknownExtensibilityElement)
-      {
-        Element el = ((UnknownExtensibilityElement) exel).getElement();
-
-        // traverse all of the descendants and check for non compliant binding extensions
-        XMLTraversalCheckingExtensions traversal =
-          new XMLTraversalCheckingExtensions();
-        traversal.visit(el);
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    traversal.setVisitor(this);
-    traversal.visitElement(true);
-    traversal.visitExtensibilityElement(true);
-
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-    traversal.traverse((Binding) entryContext.getEntry().getEntryDetail());
-
-    if (!errors.isEmpty())
-    {
-      result = AssertionResult.RESULT_FAILED;
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-    }
-
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-
-  /**
-   * A specialized XMLTraversal class to check if the wsdl:binding element has any 
-   * descendant elements/attributes from the namespaces for the WSDL MIME, 
-   * HTTP GET/POST or DIME binding extensions.
-   */
-  private class XMLTraversalCheckingExtensions extends XMLTraversal
-  {
-    boolean nonConformantExtensionFound = false;
-
-    /* (non-Javadoc)
-     * @see org.wsi.xml.XMLTraversal#action(org.w3c.dom.Node)
-     */
-    public boolean action(Node n)
-    {
-      return !nonConformantExtensionFound;
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.xml.XMLVisitor#visit(org.w3c.dom.Attr)
-     */
-    public void visit(Attr node)
-    {
-      if (action(node))
-      {
-        if (isNonConformantBindingExtension(node.getNamespaceURI()))
-        {
-          errors.add(node.getName());
-          nonConformantExtensionFound = true;
-        }
-      }
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.xml.XMLVisitor#visit(org.w3c.dom.Element)
-     */
-    public void visit(Element node)
-    {
-      if (action(node))
-      {
-        if (isNonConformantBindingExtension(node.getNamespaceURI()))
-        {
-          errors.add(node.getNodeName());
-          nonConformantExtensionFound = true;
-        }
-        else
-        {
-          // element is compliant, check attributes and descendants
-          visit(node.getAttributes());
-          for (Node n = node.getFirstChild();
-            n != null;
-            n = n.getNextSibling())
-          {
-            doVisit(n);
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java
deleted file mode 100644
index 0ecafd7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java
+++ /dev/null

@@ -1,2314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSIRuntimeException;
-import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
-import org.eclipse.wst.wsi.internal.core.analyzer.AssertionFailException;
-import org.eclipse.wst.wsi.internal.core.analyzer.CandidateInfo;
-import org.eclipse.wst.wsi.internal.core.analyzer.ServiceReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.WSDLValidator;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.EntryContainer;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLElementList;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-import org.eclipse.wst.wsi.internal.core.xml.schema.TargetNamespaceProcessor;
-import org.eclipse.wst.wsi.internal.core.xml.schema.XMLSchemaValidator;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * The WSDL validator will verify that the WSDL and associated XML schema definitions
- * are in conformance with the profile.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @author Graham Turrell 	(gturrell@uk.ibm.com)
- */
-public class WSDLValidatorImpl
-  extends BaseValidatorImpl
-  implements WSDLValidator
-{
-  /**
-   * WSDL URL.
-   */
-  protected String wsdlURL;
-
-  /**
-   * WSDL document.
-   */
-  protected WSDLDocument wsdlDocument = null;
-
-  /**
-   * Entry container map.
-   */
-  protected HashMap containerMap = new HashMap();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.WSDLValidator#init(org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext, org.wsi.test.profile.ProfileArtifact, org.wsi.test.report.ReportArtifact, java.lang.String, org.wsi.wsdl.WSDLDocument, org.wsi.test.report.Reporter)
-   */
-  public void init(
-    AnalyzerContext analyzerContext,
-    ProfileArtifact profileArtifact,
-    ReportArtifact reportArtifact,
-    String wsdlURL,
-    WSDLDocument wsdlDocument,
-    Reporter reporter)
-    throws WSIException
-  {
-    // BaseValidatorImpl
-    super.init(analyzerContext, profileArtifact, reportArtifact, reporter);
-    this.wsdlDocument = wsdlDocument;
-    if (wsdlDocument != null)
-      this.wsdlURL = wsdlDocument.getLocation();
-
-    if (wsdlURL != null)
-      this.wsdlURL = wsdlURL;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.WSDLValidator#validate()
-   */
-  public WSDLDocument validate() throws WSIException
-  {
-    //WSDLDocument wsdlDocument = null;
-    Service service = null;
-    Port port = null;
-    Binding binding = null;
-    PortType portType = null;
-    Operation operation = null;
-    Message message = null;
-
-    // it depricated after refactoring 
-    // now the inner classes moved out from validator
-    //String classPrefix = this.getClass().getName() + "$";
-    String classPrefix = this.getClass().getPackage().getName()+".";
-
-    try
-    {
-      // Validate the WSDL service description
-      if (this.wsdlDocument == null)
-        this.wsdlDocument = new WSDLDocument(wsdlURL);
-    }
-
-    catch (Exception e)
-    {
-      // ADD: Certain exceptions should result in validation errors
-
-      throw new WSIException(e.getMessage(), e);
-    }
-
-    // Get the definition element
-    Definition definition = wsdlDocument.getDefinitions();
-
-    // Get service reference from analyzer context
-    ServiceReference serviceReference = analyzerContext.getServiceReference();
-
-    // Create normalized data about the service under test.
-    CandidateInfo candidate = new CandidateInfo(serviceReference, wsdlDocument);
-
-    analyzerContext.setCandidateInfo(candidate);
-
-    // Set prereq type to entry container
-    reporter.setPrereqType(Reporter.PREREQ_TYPE_ENTRY_CONTAINER);
-
-    // always process Import, Definitions & Types assertions 
-    // TEMP:
-    processDefinitionAssertions(classPrefix, candidate);
-    processTypesAssertions(classPrefix, candidate);
-    processImportAssertions(classPrefix, candidate);
-
-    // Process the element hierarchy in the WSDL document starting with the one that was specified  
-    // FIX: Element finding already completed by CandidateInfo constructor - so use that rather than retest here  
-
-    // ---------------------------
-    // wsdl:port
-    // ---------------------------
-    if (serviceReference.getWSDLElement().isPort())
-    {
-      // Find the service element
-      if ((service =
-        definition.getService(
-          serviceReference.getWSDLElement().getParentElementQName()))
-        == null)
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL service: "
-            + serviceReference.getWSDLElement().getParentElementName());
-      }
-
-      // Find the port element
-      if ((port = service.getPort(serviceReference.getWSDLElement().getName()))
-        == null)
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL port: "
-            + serviceReference.getWSDLElement().getName());
-      }
-
-      // TEMP: Remove until there are port test assertions      
-      //processPortAssertions(port, serviceReference, classPrefix, wsdlDocument);	     
-
-      // Next, process the binding
-      if (((binding = port.getBinding()) == null) || (binding.isUndefined()))
-      {
-        //throw new WSIRuntimeException("Could not locate WSDL binding for port: " + port.getName());  
-        // Set missingInput for all binding, portType, operation and message test assertions 
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-      }
-
-      else
-      {
-        processBindingAssertions(
-          binding,
-          serviceReference,
-          classPrefix,
-          wsdlDocument);
-
-        // Next, process the portType
-        if (((portType = binding.getPortType()) == null)
-          || (portType.isUndefined()))
-        {
-          //throw new WSIRuntimeException("Could not locate WSDL portType for binding: " + binding.getQName().getLocalPart());
-          // Set missingInput for all portType, operation and message test assertions 
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-        }
-
-        else
-        {
-          processMessageAssertions(
-            binding,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-          processPortTypeAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-          processOperationAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-          processMessageAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-        }
-      }
-
-    }
-
-    // ---------------------------
-    // wsdl:binding
-    // ---------------------------
-    else if (serviceReference.getWSDLElement().isBinding())
-    {
-      WSDLElement wsdlElement = serviceReference.getWSDLElement();
-      // Find the binding element
-      if (wsdlElement.getQName() != null
-        && wsdlElement.getQName().getLocalPart() != null
-        && wsdlElement.getQName().getLocalPart().length() > 0)
-      {
-        if (((binding =
-          definition.getBinding(serviceReference.getWSDLElement().getQName()))
-          == null)
-          || (binding.isUndefined()))
-        {
-          throw new WSIRuntimeException(
-            "Could not locate WSDL binding: "
-              + serviceReference.getWSDLElement().getName());
-        }
-
-        processBindingAssertions(
-          binding,
-          serviceReference,
-          classPrefix,
-          wsdlDocument);
-        processMessageAssertions(
-          binding,
-          serviceReference,
-          classPrefix,
-          wsdlDocument);
-
-        // Next, process the portType
-        if (((portType = binding.getPortType()) == null)
-          || (portType.isUndefined()))
-        {
-          //throw new WSIRuntimeException("Could not locate WSDL PortType for Binding: " + binding.getQName().getLocalPart());
-
-          // Set missingInput for all portType, operation and message test assertions 
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-        }
-
-        else
-        {
-          processPortTypeAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-          processOperationAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-
-          // Process each message within each operation of the portType associated with the binding
-          processMessageAssertions(
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-        }
-      }
-
-      // There was a problem with the binding element specification.  This can 
-      // happen when a UDDI tModel did not have a valid binding reference.
-      else
-      {
-        // Set missingInput for all binding, portType, operation and message test assertions 
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-      }
-    }
-
-    // ---------------------------
-    // wsdl:portType
-    // ---------------------------
-    else if (serviceReference.getWSDLElement().isPortType())
-    {
-      // Find the PortType element
-      if (((portType =
-        definition.getPortType(serviceReference.getWSDLElement().getQName()))
-        == null)
-        || (portType.isUndefined()))
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL PortType: "
-            + serviceReference.getWSDLElement().getName());
-      }
-
-      // Set missingInput for all binding test assertions 
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-
-      processPortTypeAssertions(
-        portType,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-      processOperationAssertions(
-        portType,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-
-      // Process each message within each operation of the portType
-      processMessageAssertions(
-        portType,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-    }
-
-    // ---------------------------
-    // wsdl:operation
-    // ---------------------------
-    else if (serviceReference.getWSDLElement().isOperation())
-    {
-      // Find the operation
-      // get portType from config parent element
-      if (((portType =
-        definition.getPortType(
-          serviceReference.getWSDLElement().getParentElementQName()))
-        == null)
-        || (portType.isUndefined()))
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL portType: "
-            + serviceReference.getWSDLElement().getParentElementQName());
-      }
-
-      if (((operation =
-        getOperationFromPortType(
-          portType,
-          serviceReference.getWSDLElement().getName()))
-        == null)
-        || (operation.isUndefined()))
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL Operation: "
-            + serviceReference.getWSDLElement().getName()
-            + "in portType: "
-            + portType.getQName());
-      }
-
-      // Set missingInput for all binding and portType test assertions 
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-
-      processOperationAssertions(
-        operation,
-        portType,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-      processMessageAssertions(
-        operation,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-    }
-
-    // ---------------------------
-    // wsdl:message
-    // ---------------------------
-    else if (serviceReference.getWSDLElement().isMessage())
-    {
-      // Find the message
-      if (((message =
-        definition.getMessage(serviceReference.getWSDLElement().getQName()))
-        == null)
-        || (message.isUndefined()))
-      {
-        throw new WSIRuntimeException(
-          "Could not locate WSDL Message: "
-            + serviceReference.getWSDLElement().getName());
-      }
-
-      // Set missingInput for all binding, portType, and operation test assertions 
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-
-      processMessageAssertions(
-        message,
-        serviceReference,
-        classPrefix,
-        wsdlDocument);
-    }
-
-    else
-    {
-      throw new WSIRuntimeException(
-        "The following WSDL type is not supported: "
-          + serviceReference.getWSDLElement().getType());
-    }
-
-    // Cleanup
-    cleanup();
-
-    // Return WSDL document
-    return this.wsdlDocument;
-  }
-
-  /**
-   * Get entry container using the filename for WSDL document.
-   * @param filename a file name.
-   * @return entry container using the filename for WSDL document.
-   */
-  protected EntryContainer getEntryContainer(String filename)
-  {
-    EntryContainer entryContainer = null;
-
-    // If the entry container already exists, then use it
-    if ((entryContainer = (EntryContainer) containerMap.get(filename)) == null)
-    {
-      // Create new entry container
-      entryContainer = this.reporter.createEntryContainer();
-
-      // Set container id using the filename for the WSDL document
-      entryContainer.setId(filename);
-
-      // Put the new entry container into the container map
-      containerMap.put(filename, entryContainer);
-    }
-
-    return entryContainer;
-  }
-
-  /**
-   * Get operation from port type.
-   * @param portType port type.
-   * @param operationName operation name.
-   * @return operation from port type.
-   */
-  protected Operation getOperationFromPortType(
-    PortType portType,
-    String operationName)
-  {
-    // FIX: wsdl4j available method call below implies that only 
-    // name+inputname+outputname uniquely defines operation 
-    // Use this instead for now: - get the first operation we find...
-    Operation op = null;
-    if (portType.getOperations() != null)
-    {
-      Iterator opIt = portType.getOperations().iterator();
-
-      while (opIt.hasNext())
-      {
-        op = (Operation) opIt.next();
-        if (operationName.equals(op.getName()))
-        {
-          return op;
-        }
-      }
-    }
-
-    return null; // no matching operation found
-  }
-
-  /**
-   * Process definition assertions.
-   * @param classPrefix class prefix.
-   * @param candidate candidate.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected void processDefinitionAssertions(
-    String classPrefix,
-    CandidateInfo candidate)
-    throws WSIException
-  {
-
-    Entry entry = null;
-
-    Definition[] wsdlDefinitions = candidate.getDefinitions();
-
-    for (int i = 0; i < wsdlDefinitions.length; i++)
-    {
-      Definition definition = wsdlDefinitions[i];
-      if (definition == null)
-        continue;
-      // Create entry 
-      entry = this.reporter.getReport().createEntry();
-      entry.setEntryType(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_DEFINITIONS));
-      entry.setReferenceID(definition.getDocumentBaseURI());
-      entry.setEntryDetail(definition);
-
-      // Set entry container
-      entry.setEntryContainer(
-        getEntryContainer(definition.getDocumentBaseURI()));
-
-      // Process all of the definition related test assertions
-      processAssertions(
-        classPrefix,
-        new EntryContext(entry, candidate.getWsdlDocument()));
-      // ADD: need to use here the specific document corresponding to the definition??
-
-    }
-  }
-
-  /**
-   * Process types assertions.
-   * @param classPrefix class prefix.
-   * @param candidate candidate.
-   * @throws WSIException if problem occurs during processing 
-   *         type assertions.
-   */
-  protected void processTypesAssertions(
-    String classPrefix,
-    CandidateInfo candidate)
-    throws WSIException
-  {
-    Entry entry = null;
-
-    Types[] wsdlTypes = candidate.getTypes();
-    Definition[] wsdlDefinitions = candidate.getDefinitions();
-
-    // If there are no types elements, then set all results to missingInput   
-    if (wsdlTypes == null || wsdlTypes.length == 0)
-    {
-      // Set missingInput for all test assertions with this entry type
-      setMissingInput(EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_TYPES));
-    }
-
-    else
-    {
-      for (int i = 0; i < wsdlTypes.length; i++)
-      {
-        Types types = wsdlTypes[i];
-        if (types == null)
-        {
-          // no Types element in i-th document
-          continue;
-        }
-
-        // Create entry 
-        entry = this.reporter.getReport().createEntry();
-        entry.setEntryType(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_TYPES));
-        entry.setReferenceID(
-          candidate.getDefinition(types).getDocumentBaseURI() + "-Types");
-        entry.setEntryDetail(types);
-
-        // Set entry container
-        entry.setEntryContainer(
-          getEntryContainer(wsdlDefinitions[i].getDocumentBaseURI()));
-
-        // Process all of the Types related test assertions
-        processAssertions(
-          classPrefix,
-          new EntryContext(entry, candidate.getWsdlDocument()));
-      }
-    }
-  }
-
-  /**
-   * Process import assertions. 
-   * @param classPrefix class prefix.
-   * @param candidate candidate.
-   * @throws WSIException if problem occurs during processing 
-   *         import assertions.
-   */
-  protected void processImportAssertions(
-    String classPrefix,
-    CandidateInfo candidate)
-    throws WSIException
-  {
-
-    Entry entry = null;
-
-    Import[] wsdlImports = candidate.getImports();
-
-    // If there are no import elements, then set all results to missingInput   
-    if (wsdlImports == null || wsdlImports.length == 0)
-    {
-      // Set missingInput for all test assertions with this entry type
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_IMPORT));
-    }
-
-    else
-    {
-      for (int i = 0; i < wsdlImports.length; i++)
-      {
-        Import wsdlImport = wsdlImports[i];
-        // Create entry 
-        entry = this.reporter.getReport().createEntry();
-        entry.setEntryType(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_IMPORT));
-        entry.setReferenceID(wsdlImport.getNamespaceURI());
-        entry.setEntryDetail(wsdlImport);
-
-        // Set entry container
-        entry.setEntryContainer(getEntryContainer(wsdlImport.getLocationURI()));
-
-        // Process all of the import related test assertions
-        processAssertions(
-          classPrefix,
-          new EntryContext(entry, candidate.getWsdlDocument()));
-        // ADD: need to use here the specific document corresponding to the import!!
-      }
-    }
-  }
-
-  /**
-   * Process port assertions.
-   * @param port a port.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         port assertions.
-   */
-  protected void processPortAssertions(
-    Port port,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-    Entry entry = null;
-
-    // Create entry 	  
-    entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORT));
-    entry.setReferenceID(port.getName());
-    entry.setParentElementName(
-      serviceReference.getWSDLElement().getParentElementName());
-    entry.setEntryDetail(port);
-
-    // Process assertions for this artifact against the target context
-    processAssertions(classPrefix, new EntryContext(entry, wsdlDocument));
-  }
-
-  /**
-   * Process binding assertions.
-   * @param binding binding.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         binding assertions.
-   */
-  protected void processBindingAssertions(
-    Binding binding,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-    Entry entry = null;
-    QName bindingQName = binding.getQName();
-
-    // Create entry 
-    entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(
-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_BINDING));
-    entry.setReferenceID(bindingQName.toString());
-    entry.setEntryDetail(binding);
-
-    // Set entry container
-    Definition definition =
-      analyzerContext.getCandidateInfo().getDefinition(binding);
-    entry.setEntryContainer(
-      getEntryContainer(
-        (definition == null ? null : definition.getDocumentBaseURI())));
-
-    // Process binding test assertions
-    processAssertions(classPrefix, new EntryContext(entry, wsdlDocument));
-  }
-
-  /**
-   * Process port type assertions.
-   * @param portType port type.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         port type assertions.
-  */
-  protected void processPortTypeAssertions(
-    PortType portType,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-
-    Entry entry = null;
-    QName portTypeQName = portType.getQName();
-
-    // Create entry 
-    entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(
-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_PORTTYPE));
-    entry.setReferenceID(portTypeQName.toString());
-    entry.setEntryDetail(portType);
-
-    // Set entry container
-    Definition definition =
-      analyzerContext.getCandidateInfo().getDefinition(portType);
-    entry.setEntryContainer(
-      getEntryContainer(
-        (definition == null ? null : definition.getDocumentBaseURI())));
-
-    // Process test assertions
-    processAssertions(classPrefix, new EntryContext(entry, wsdlDocument));
-  }
-
-  /**
-   * Process operation assertions.
-   * @param operation an operation.
-   * @param portType port type.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         operation assertions.
-  */
-  protected void processOperationAssertions(
-    Operation operation,
-    PortType portType,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-    // qualify operation with service location from config.	
-    Entry entry = null;
-
-    // Create entry 
-    entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(
-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-    entry.setReferenceID(operation.getName());
-    entry.setParentElementName(portType.getQName().getLocalPart());
-    entry.setEntryDetail(operation);
-
-    // Set entry container
-    Definition definition =
-      analyzerContext.getCandidateInfo().getDefinition(portType);
-    entry.setEntryContainer(
-      getEntryContainer(
-        (definition == null ? null : definition.getDocumentBaseURI())));
-
-    // Process test assertions
-    processAssertions(classPrefix, new EntryContext(entry, wsdlDocument));
-  }
-
-  /**
-   * Process operation assertions.
-   * @param portType port type.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         operation assertions.
-   */
-  protected void processOperationAssertions(
-    PortType portType,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-    // For each operation, 
-    if (portType.getOperations() == null)
-    {
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-    }
-
-    else
-    {
-      Operation operation;
-      Iterator opIt = portType.getOperations().iterator();
-      while (opIt.hasNext())
-      {
-        operation = (Operation) opIt.next();
-        if (operation == null || operation.isUndefined())
-          setMissingInput(
-            EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_OPERATION));
-        else
-          processOperationAssertions(
-            operation,
-            portType,
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-      }
-    }
-  }
-
-  /**
-   * Process message assertions.
-   * @param message a message.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         message assertions.
-   */
-  protected void processMessageAssertions(
-    Message message,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-
-    Entry entry = null;
-    QName messageQName = message.getQName();
-
-    // Create entry 
-    entry = this.reporter.getReport().createEntry();
-    entry.setEntryType(
-      EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-    entry.setReferenceID(messageQName.toString());
-    entry.setEntryDetail(message);
-
-    // Set entry container
-    Definition definition =
-      analyzerContext.getCandidateInfo().getDefinition(message);
-    entry.setEntryContainer(
-      getEntryContainer(
-        (definition == null ? null : definition.getDocumentBaseURI())));
-
-    // Process binding test assertions
-    processAssertions(classPrefix, new EntryContext(entry, wsdlDocument));
-  }
-
-  /**
-   * Process message assertions.
-   * @param binding a binding.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         message assertions.
-   */
-  protected void processMessageAssertions(
-    Binding binding,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-    HashSet messageSet;
-
-    if (binding.getBindingOperations() != null)
-    { // can do nothing if have no operations defined
-      messageSet =
-        WSDLUtils.findMessages(wsdlDocument.getDefinitions(), binding);
-
-      // Process any messages that were found    
-      if (messageSet.size() > 0)
-      {
-        Iterator messageIt = messageSet.iterator();
-        while (messageIt.hasNext())
-        {
-          Message message = (Message) messageIt.next();
-          if (!message.isUndefined())
-            processMessageAssertions(
-              message,
-              serviceReference,
-              classPrefix,
-              wsdlDocument);
-        }
-      }
-    }
-  }
-
-  /**
-   * Process message assertions.
-   * @param portType port type.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         message assertions.
-   */
-  protected void processMessageAssertions(
-    PortType portType,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-
-    HashSet messageSet = new HashSet();
-
-    if (portType.getOperations() != null)
-    {
-      // can do nothing if have no operations defined
-
-      Iterator opIt = portType.getOperations().iterator();
-
-      while (opIt.hasNext())
-      {
-        Operation op = (Operation) opIt.next();
-
-        // Since there is no guarantee that we have both and input and output message, 
-        // check for its existence before adding it
-        if (op.getInput() != null && !op.getInput().getMessage().isUndefined())
-          messageSet.add(op.getInput().getMessage());
-
-        if (op.getOutput() != null
-          && !op.getOutput().getMessage().isUndefined())
-          messageSet.add(op.getOutput().getMessage());
-
-        // also messages from any Faults defined within the operation
-        if (op.getFaults() != null)
-        {
-          Iterator faultIt = op.getFaults().values().iterator();
-          Message message;
-          while (faultIt.hasNext())
-          {
-            message = ((Fault) faultIt.next()).getMessage();
-            if (!message.isUndefined())
-              messageSet.add(message);
-          }
-        }
-      }
-
-      if (messageSet.size() == 0)
-      {
-        // Set all message test assertion results to missingInput
-        setMissingInput(
-          EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-      }
-
-      else
-      {
-        // now step through each derived Message
-        Iterator messageIt = messageSet.iterator();
-        while (messageIt.hasNext())
-        {
-          processMessageAssertions(
-            (Message) (messageIt.next()),
-            serviceReference,
-            classPrefix,
-            wsdlDocument);
-        }
-      }
-    }
-  }
-
-  /**
-   * Process message assertions.
-   * @param op - operation.
-   * @param serviceReference service reference.
-   * @param classPrefix class prefix.
-   * @param wsdlDocument WSDL document.
-   * @throws WSIException if problem occurs during processing 
-   *         message assertions.
-   */
-  protected void processMessageAssertions(
-    Operation op,
-    ServiceReference serviceReference,
-    String classPrefix,
-    WSDLDocument wsdlDocument)
-    throws WSIException
-  {
-
-    HashSet messageSet = new HashSet();
-    if (op.getInput() != null && !op.getInput().getMessage().isUndefined())
-      messageSet.add(op.getInput().getMessage());
-
-    if (op.getOutput() != null && !op.getOutput().getMessage().isUndefined())
-      messageSet.add(op.getOutput().getMessage());
-
-    // also messages from any Faults defined within the operation
-    Iterator faultIt = op.getFaults().values().iterator();
-    Message message;
-    while (faultIt.hasNext())
-    {
-      message = ((Fault) faultIt.next()).getMessage();
-      if (!message.isUndefined())
-        messageSet.add(message);
-    }
-
-    if (messageSet.size() == 0)
-    {
-      // Set all message test assertion results to missingInput
-      setMissingInput(
-        EntryType.getEntryType(EntryType.TYPE_DESCRIPTION_MESSAGE));
-    }
-
-    else
-    {
-      // now step through each derived Message
-      Iterator messageIt = messageSet.iterator();
-      while (messageIt.hasNext())
-      {
-        processMessageAssertions(
-          (Message) (messageIt.next()),
-          serviceReference,
-          classPrefix,
-          wsdlDocument);
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isPrimaryEntryTypeMatch(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  protected boolean isPrimaryEntryTypeMatch(
-    TestAssertion testAssertion,
-    EntryContext targetContext)
-  {
-    boolean match = false;
-
-    // If the test assertion entry type matches the target context entry type, then contine
-    if (testAssertion
-      .getEntryTypeName()
-      .equals(targetContext.getEntry().getEntryType().getTypeName()))
-    {
-      match = true;
-    }
-
-    return match;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl#isNotApplicable(org.wsi.test.profile.TestAssertion)
-   */
-  protected boolean isNotApplicable(TestAssertion testAssertion)
-  {
-    boolean notApplicable = false;
-
-    // ADD:
-
-    return notApplicable;
-  }
-
-  /**
-   * Method getSoapFaults.
-   * 
-   * @param inBinding in binding.
-   * @return soap faults.
-   * @throws WSIException if problems occur while processing binding faults.
-   */
-  protected SOAPFault[] getSoapFaults(Binding inBinding) throws WSIException
-  {
-
-    Vector soapFaults = new Vector();
-
-    // Go through each bindingFault one at a time
-    BindingFault[] bindingFaults = getAllBindingFaults(inBinding);
-    for (int fault = 0; fault < bindingFaults.length; fault++)
-    {
-      SOAPFault soapFault = getSoapFault(bindingFaults[fault]);
-      if (soapFault != null)
-      {
-        soapFaults.add(soapFault);
-      }
-    }
-
-    SOAPFault[] soapFaultArray = new SOAPFault[soapFaults.size()];
-    soapFaults.copyInto(soapFaultArray);
-
-    return soapFaultArray;
-  }
-
-  /**
-  * Method getAllBindingFaults.
-  * 
-  * @param inBinding binding.
-  * @return all binding faults.
-  * @throws WSIException if problems occur during processing.
-  */
-  protected BindingFault[] getAllBindingFaults(Binding inBinding)
-    throws WSIException
-  {
-
-    Vector faults = new Vector();
-
-    try
-    {
-
-      Iterator bindingOperations = inBinding.getBindingOperations().iterator();
-
-      while (bindingOperations.hasNext())
-      {
-
-        try
-        {
-          BindingOperation bo = (BindingOperation) bindingOperations.next();
-          Iterator bindingFaults = bo.getBindingFaults().values().iterator();
-          while (bindingFaults.hasNext())
-          {
-
-            faults.add((BindingFault) bindingFaults.next());
-          }
-        }
-        catch (NullPointerException e)
-        {
-
-        }
-      }
-    }
-    catch (NullPointerException e)
-    {
-      // no binding operations in this binding - ignore & continue
-    }
-
-    BindingFault[] faultArray = new BindingFault[faults.size()];
-    faults.copyInto(faultArray);
-
-    return faultArray;
-  }
-
-  /**
-   * Method getWSDLFaults.
-   * 
-   * @param bindingFault a binding fault.
-   * @return WSDL faults.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected SOAPFault getSoapFault(BindingFault bindingFault)
-    throws WSIException
-  {
-
-    SOAPFault soapFault = null;
-    try
-    {
-      Iterator faultExtensibles =
-        bindingFault.getExtensibilityElements().iterator();
-
-      while (faultExtensibles.hasNext() && soapFault == null)
-      {
-        try
-        {
-          soapFault = (SOAPFault) faultExtensibles.next();
-        }
-        catch (ClassCastException e)
-        { // ignore everything but SOAP Fault elements.
-        }
-      }
-    }
-    catch (NullPointerException e)
-    {
-    }
-
-    return soapFault;
-  }
-
-  /**
-   * Method getSoapHeader.
-   * 
-   * @param inBinding a binding.
-   * @return SOAP headers.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected SOAPHeader[] getSoapHeaders(Binding inBinding) throws WSIException
-  {
-    // Get all bindings
-    Binding[] bindingList = new Binding[1];
-    bindingList[0] = inBinding;
-
-    Vector soapHeaderList = new Vector();
-
-    // Go through each binding one at a time
-    for (int binding = 0; binding < bindingList.length; binding++)
-    {
-      try
-      {
-        // get the list of binding Operations
-        BindingOperation[] bindingOperations =
-          (BindingOperation[]) bindingList[binding]
-            .getBindingOperations()
-            .toArray(
-            new BindingOperation[0]);
-
-        // get references to the extensible elements within the <input> and <output> elements of this binding <operation>. 
-        for (int bo = 0; bo < bindingOperations.length; bo++)
-        {
-
-          // Iterate over all input/output extensibles, looking for <SOAP:Body> elements.
-          try
-          {
-            BindingInput bindingInput = bindingOperations[bo].getBindingInput();
-            BindingOutput bindingOutput =
-              bindingOperations[bo].getBindingOutput();
-
-            Iterator extElements =
-              bindingInput.getExtensibilityElements().iterator();
-            while (extElements.hasNext())
-            {
-              try
-              {
-                soapHeaderList.add((SOAPHeader) extElements.next());
-              }
-              catch (ClassCastException e)
-              { // ignore everything but SOAP Header.
-              }
-            }
-
-            extElements = bindingOutput.getExtensibilityElements().iterator();
-            while (extElements.hasNext())
-            {
-              try
-              {
-                soapHeaderList.add((SOAPHeader) extElements.next());
-              }
-              catch (ClassCastException e)
-              { // ignore everything but SOAP Header.
-              }
-            }
-          }
-          catch (NullPointerException e)
-          { // no extensibility elements for <input> or <output> - ignore : not checking this here.
-          }
-        }
-      }
-      catch (NullPointerException e)
-      {
-        // no binding operations in this binding - ignore & continue
-      }
-    }
-
-    SOAPHeader[] soapHeaderArray = new SOAPHeader[soapHeaderList.size()];
-    soapHeaderList.copyInto(soapHeaderArray);
-
-    return soapHeaderArray;
-  }
-
-  /**
-   * Method getSoapHeaderFaults.
-   * 
-   * WSDLDocument getter method - maybe better off in class WSDLDocument...
-   * 
-   * @param inBinding a binding.
-   * @return SOAP header faults.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected SOAPHeaderFault[] getSoapHeaderFaults(Binding inBinding)
-    throws WSIException
-  {
-    Vector soapHeaderFaultList = new Vector();
-
-    // Get the list of SOAP headers
-    SOAPHeader[] soapHeaderArray = getSoapHeaders(inBinding);
-
-    // Go through the list and get the header faults
-    List list = null;
-    for (int header = 0; header < soapHeaderArray.length; header++)
-    {
-      // Get list for this header
-      if ((list = soapHeaderArray[header].getSOAPHeaderFaults()) != null)
-      {
-        // Add to primary list      
-        soapHeaderFaultList.addAll(list);
-      }
-    }
-
-    SOAPHeaderFault[] soapHeaderFaultArray =
-      new SOAPHeaderFault[soapHeaderFaultList.size()];
-    soapHeaderFaultList.copyInto(soapHeaderFaultArray);
-
-    return soapHeaderFaultArray;
-  }
-
-  /**
-   * Method getSoapBodies.
-   * 
-   * WSDLDocument getter method - maybe better off in class WSDLDocument...
-   * 
-   * @param inBinding a binding.
-   * @return SOAP bodies.
-   * @throws WSIException if if problems occur during processing.
-   */
-  protected SOAPBody[] getSoapBodies(Binding inBinding) throws WSIException
-  {
-    // REMOVE: Get all bindings
-    //Binding[] bindingList = wsdlDocument.getBindings();
-    Binding[] bindingList = new Binding[1];
-    bindingList[0] = inBinding;
-
-    Vector soapBodies = new Vector();
-
-    // Go through each binding one at a time
-    for (int binding = 0; binding < bindingList.length; binding++)
-    {
-      // get the list of binding Operations
-      BindingOperation[] bindingOperations =
-        (BindingOperation[]) bindingList[binding]
-          .getBindingOperations()
-          .toArray(
-          new BindingOperation[0]);
-
-      // get references to the extensible elements within the <input> and <output> elements of this binding <operation>. 
-      for (int bo = 0; bo < bindingOperations.length; bo++)
-      {
-
-        // Iterate over all input/output extensibles, looking for <SOAP:Body> elements.
-        try
-        {
-          Iterator inputExtensibles =
-            bindingOperations[bo]
-              .getBindingInput()
-              .getExtensibilityElements()
-              .iterator();
-          while (inputExtensibles.hasNext())
-          {
-            try
-            {
-              soapBodies.add((SOAPBody) inputExtensibles.next());
-            }
-            catch (ClassCastException e)
-            { // ignore everything but SOAP Body elements.
-            }
-          }
-        }
-        catch (NullPointerException e)
-        { // no extensibility elements for <input> - ignore : not checking this here.
-        }
-
-        try
-        {
-          Iterator outputExtensibles =
-            bindingOperations[bo]
-              .getBindingOutput()
-              .getExtensibilityElements()
-              .iterator();
-          while (outputExtensibles.hasNext())
-          {
-            try
-            {
-              soapBodies.add((SOAPBody) outputExtensibles.next());
-            }
-            catch (ClassCastException e)
-            { // ignore everything but SOAP Body elements.
-            }
-          }
-        }
-        catch (NullPointerException e)
-        { // no extensibility elements for <output>.
-        }
-      }
-    }
-
-    SOAPBody[] soapBodyArray = new SOAPBody[soapBodies.size()];
-    soapBodies.copyInto(soapBodyArray);
-
-    return soapBodyArray;
-  }
-
-  /**
-   * Method getSoapBody.
-   * 
-   * @param bindingInput a BindingInput object.
-   * @return  body.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected SOAPBody getSoapBody(BindingInput bindingInput) throws WSIException
-  {
-
-    SOAPBody soapBody = null;
-
-    Iterator extensibles = bindingInput.getExtensibilityElements().iterator();
-    while (extensibles.hasNext())
-    {
-      Object extensible = extensibles.next();
-      if (extensible instanceof SOAPBody)
-      {
-        soapBody = (SOAPBody) extensible;
-        break;
-      }
-    }
-    return soapBody;
-  }
-
-  /**
-   * Method getSoapBody.
-   * 
-   * @param bindingOutput a BindingOutput object.
-   * @return SOAP body.
-   * @throws WSIException if problems occur during processing.
-   */
-  protected SOAPBody getSoapBody(BindingOutput bindingOutput)
-    throws WSIException
-  {
-
-    SOAPBody soapBody = null;
-
-    Iterator extensibles = bindingOutput.getExtensibilityElements().iterator();
-    while (extensibles.hasNext())
-    {
-      Object extensible = extensibles.next();
-      if (extensible instanceof SOAPBody)
-      {
-        soapBody = (SOAPBody) extensible;
-        break;
-      }
-    }
-    return soapBody;
-  }
-
-  /**
-   * Get schema used.
-   * @param def definition.
-   * @return Schema used.
-   * @throws AssertionFailException if problem getting WSDL defintions 
-   *         namespace.
-   */
-  protected String getSchemaUsed(Definition def) throws AssertionFailException
-  {
-    String schemaUsed = "";
-
-    try
-    {
-      // Need to read the file directly, since WSDL4J always puts in the default WSDL namespace
-      Document document = parseXMLDocumentURL(def.getDocumentBaseURI(), null);
-
-      if (document != null)
-      {
-        // Get the root element
-        Element element = document.getDocumentElement();
-
-        // Get the namespace for this element
-        if (element != null)
-          schemaUsed = element.getNamespaceURI();
-      }
-    }
-
-    catch (WSIException we)
-    {
-      throw new AssertionFailException("problem getting WSDL defintions namespace");
-    }
-
-    /*
-    // Get the default namespace
-    String schemaUsed = def.getNamespace("");
-    
-    // If the default was set, then process it to get the namespace
-    if (schemaUsed == null) {
-      // do it the hard way (still better than another DOM parse)... 				
-      //WSDLWriter w = new WSDLWriterImpl();
-      try {
-        WSDLWriter w = WSDLFactory.newInstance().newWSDLWriter();
-      	Document doc = w.getDocument(def);
-      	Element e = doc.getDocumentElement();
-      	schemaUsed = e.getNamespaceURI();
-      } 
-      catch (NullPointerException e) {
-      	throw new AssertionFailException("problem getting WSDL defintions namespace");
-      } 
-      catch (WSDLException e) {
-      	throw new AssertionFailException("problem getting document defintion");
-      }      	
-    }
-    */
-
-    return schemaUsed;
-  }
-
-  /**
-   * Method getSoapBinding.
-   * 
-   * Get the SOAP binding for a Binding.
-    * 
-   * @param binding a binding.
-   * @return a SOAP binding.
-   * @throws WSIException if problems occur during processing.
-   */
-  public static SOAPBinding getSoapBinding(Binding binding) throws WSIException
-  {
-    SOAPBinding soapBinding = null;
-
-    // Get the list of extensibility elements
-    List exElements = binding.getExtensibilityElements();
-    if (exElements != null)
-    {
-      Iterator iterator = binding.getExtensibilityElements().iterator();
-
-      //  Check for <soap:binding> element
-      while ((iterator.hasNext()) && (soapBinding == null))
-      {
-        try
-        {
-          soapBinding = (SOAPBinding) iterator.next();
-        }
-        catch (ClassCastException e)
-        { // ignore everything but SOAP Binding element
-        }
-      }
-    }
-
-    return soapBinding;
-  }
-
-  /** 
-   * Create XML schema validator.  This is done here because some compilers do not allow
-   * the documentList field to be accessed from within an inner class.
-   * @param documentBaseURI the base URL.
-   * @return newly created XML schema validator.
-   */
-  protected XMLSchemaValidator createXMLSchemaValidator(String documentBaseURI)
-  {
-    // Create XML schema validator
-    return new XMLSchemaValidator(documentBaseURI);
-  }
-
-  /**
-   * Search xsd schema or xsd import from node. If node is xsd import it's loading schema.
-   * @param definition a Definition object.
-   * @return a list of schema target namespaces.
-   * @throws WSIException if problem during processing method.
-   */
-  protected List getSchemaTargetNamespaceList(Definition definition)
-    throws WSIException
-  {
-    List list = null, nextList = null;
-
-    // Get list of extension elements within the types element
-    Types types = null;
-    if ((types = definition.getTypes()) != null)
-    {
-      Iterator iterator = types.getExtensibilityElements().iterator();
-
-      ExtensibilityElement extElement = null;
-      while (iterator.hasNext())
-      {
-        // Get next ext. element
-        extElement = (ExtensibilityElement) iterator.next();
-        // If this is an unknown ext. element, then see if it is a schema element
-        TargetNamespaceProcessor tnsProcessor = null;
-        if (extElement instanceof UnknownExtensibilityElement)
-        {
-          tnsProcessor = new TargetNamespaceProcessor(definition.getDocumentBaseURI());
-
-
-          if ((nextList =
-            tnsProcessor.processAllSchema(
-              ((UnknownExtensibilityElement) extElement).getElement()))
-            != null)
-            if (list == null)
-              list = new Vector();
-          list.addAll(nextList);
-        }
-      }
-    }
-
-    return list;
-  }
- /**
-   * Search xsd schema or xsd import from node. If node is xsd import it's loading schema.
-   * @param definition a Definition object.
-   * @return a list of schema target namespaces.
-   * @throws WSIException if problem during processing method.
-   */
-  protected List getSchemaNamespaceList(Definition definition)
-    throws WSIException
-  {
-    List list = new Vector();
-    
-    // Always add current document targetNamespace
-    List targetNamespaceList = getSchemaTargetNamespaceList(definition);
-    
-    if ((targetNamespaceList != null) && !targetNamespaceList.isEmpty())
-      list.addAll(targetNamespaceList);
-    
-    // Get list of imported WSDL documents
-    Map importMap = definition.getImports();
-
-    Import imp;
-
-    // Add each imports targetNamespace to the list
-    if (importMap != null && !importMap.isEmpty())
-    {
-      Iterator values = importMap.values().iterator();
-      List importList;
-      while (values.hasNext())
-      {
-        importList = (List) values.next();
-        Iterator imports = importList.iterator();
-        while (imports.hasNext())
-        {
-          imp = (Import) imports.next();
-          if (imp != null && imp.getDefinition() != null)
-          	list.addAll(getSchemaNamespaceList(imp.getDefinition()));
-        }
-      }
-    }
-
-    return list;
-  }
-
-  /**
-   * Build list of WSDL targetNamespaces.
-   * @param definition a Definition object.
-   * @return list of WSDL targetNamespaces.
-   */
-  protected List getWSDLTargetNamespaceList(Definition definition)
-  {
-    List list = new Vector();
-
-    // Always add current document targetNamespace
-    if (definition.getTargetNamespace() != null)
-      list.add(definition.getTargetNamespace());
-
-    // Get list of imported WSDL documents
-    Map importMap = definition.getImports();
-
-    Import imp;
-
-    // Add each imports targetNamespace to the list
-    if (importMap != null && !importMap.isEmpty())
-    {
-      Iterator values = importMap.values().iterator();
-      List importList;
-      while (values.hasNext())
-      {
-        importList = (List) values.next();
-        Iterator imports = importList.iterator();
-        while (imports.hasNext())
-        {
-          imp = (Import) imports.next();
-          if (imp != null && imp.getDefinition() != null)
-          list.addAll(getWSDLTargetNamespaceList(imp.getDefinition()));
-            // list.add(imp.getDefinition().getTargetNamespace());
-        }
-      }
-    }
-
-    return list;
-  }
-
-  protected class BindingMatch
-  {
-    private Binding binding;
-    private BindingOperation bindingOperation;
-    private SOAPBinding soapBinding;
-    //private Vector bindingArgs; // set of BindingInputs and BindingOutputs
-    private BindingInput bindingInput;
-    private BindingOutput bindingOutput;
-
-    // ADD: need to include BindingFault support...
-    public BindingMatch(
-      Binding b,
-      BindingOperation bo,
-      SOAPBinding sb,
-      BindingInput bin,
-      BindingOutput bout)
-    {
-      binding = b;
-      bindingOperation = bo;
-      soapBinding = sb;
-      //bindingArgs = new Vector();
-      //if (bin  != null) { bindingArgs.add(bin);  }
-      //if (bout != null) { bindingArgs.add(bout); }
-      bindingInput = bin;
-      bindingOutput = bout;
-    }
-
-    public BindingMatch(
-      Binding b,
-      BindingOperation bo,
-      SOAPBinding sb,
-      BindingInput bin)
-    {
-      this(b, bo, sb, bin, null);
-    }
-
-    public BindingMatch(
-      Binding b,
-      BindingOperation bo,
-      SOAPBinding sb,
-      BindingOutput bout)
-    {
-      this(b, bo, sb, null, bout);
-    }
-
-    /**
-     * Returns the soapBinding.
-     * @return SOAPBinding
-     */
-    public SOAPBinding getSoapBinding()
-    {
-      return soapBinding;
-    }
-
-    /**
-     * Returns the bindingOperation.
-     * @return BindingOperation
-     */
-    public BindingOperation getBindingOperation()
-    {
-      return bindingOperation;
-    }
-
-    /**
-     * Returns the bindingInput.
-     * @return BindingInput
-     */
-    public BindingInput getBindingInput()
-    {
-      return bindingInput;
-    }
-
-    /**
-     * Returns the bindingOutput.
-     * @return BindingOutput
-     */
-    public BindingOutput getBindingOutput()
-    {
-      return bindingOutput;
-    }
-
-    public boolean hasBindingInput()
-    {
-      return (this.bindingInput != null);
-    }
-
-    public boolean hasBindingOutput()
-    {
-      return (this.bindingOutput != null);
-    }
-
-    /**
-     * Returns the binding.
-     * @return Binding
-     */
-    public Binding getBinding()
-    {
-      return binding;
-    }
-
-  }
-
-  /**
-   * Get binding matches.
-  * @param binding a binding.
-  * @param soapBindingStyle soap binding style.
-  * @param soapBodyUse soap body use.
-  * @return binding matches.
-  * @throws WSIException if problems occur during processing.
-  */
-  public BindingMatch[] getBindingMatches(
-    Binding binding,
-    String soapBindingStyle,
-    String soapBodyUse)
-    throws WSIException
-  {
-
-    Vector bindingMatches = new Vector();
-
-    // Check binding
-    SOAPBinding soapBinding = getSoapBinding(binding);
-
-    // check that the soap:binding for this WSDL binding is the specified style
-    // ADD: check for null pointer
-    if (soapBinding != null)
-    {
-      String defaultStyle = soapBinding.getStyle();
-
-      if (defaultStyle == null)
-      {
-        defaultStyle = WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC;
-      }
-
-      // Get the set of operations for this WSDL binding
-      List bindingOpsList = binding.getBindingOperations();
-      if (bindingOpsList != null)
-      {
-        Iterator bindingOps = bindingOpsList.iterator();
-        // for each binding operation:
-        while (bindingOps.hasNext())
-        {
-          BindingOperation bindingOp = (BindingOperation) bindingOps.next();
-
-          SOAPOperation soapOp = getSoapOperation(bindingOp);
-
-          if ((soapOp == null && defaultStyle.equals(soapBindingStyle))
-            || (soapOp != null
-              && soapOp.getStyle() == null
-              && defaultStyle.equals(soapBindingStyle))
-            || (soapOp != null
-              && soapOp.getStyle() != null
-              && soapOp.getStyle().equals(soapBindingStyle)))
-          {
-            // check binding input & output
-            BindingInput bInput = bindingOp.getBindingInput();
-            if (bInput != null)
-            {
-              SOAPBody inputSoapBody = getSoapBody(bInput);
-              if (inputSoapBody == null
-                || (inputSoapBody.getUse() != null
-                  && !inputSoapBody.getUse().equals(soapBodyUse)))
-              {
-                bInput = null;
-              }
-            }
-
-            BindingOutput bOutput = bindingOp.getBindingOutput();
-            if (bOutput != null)
-            {
-              SOAPBody outputSoapBody = getSoapBody(bOutput);
-
-              if (outputSoapBody == null
-                || (outputSoapBody.getUse() != null
-                  && !outputSoapBody.getUse().equals(soapBodyUse)))
-              {
-                bOutput = null;
-              }
-            }
-
-            if ((bOutput != null) || (bInput != null))
-            {
-              // we have a match, add to the vector
-              bindingMatches.add(
-                new BindingMatch(
-                  binding,
-                  bindingOp,
-                  soapBinding,
-                  bInput,
-                  bOutput));
-            }
-          }
-        }
-      }
-    }
-
-    BindingMatch[] BindingMatchArray = new BindingMatch[bindingMatches.size()];
-    bindingMatches.copyInto(BindingMatchArray);
-    return BindingMatchArray;
-  }
-
-  /**
-   * Method getSoapOperation.
-   *
-   * @param bindingOperation a binding operation.
-   * @return a soap operation.
-   * @throws WSIException if problems while processing.
-   */
-  public static SOAPOperation getSoapOperation(BindingOperation bindingOperation)
-    throws WSIException
-  {
-
-    if (bindingOperation.getExtensibilityElements() == null)
-    {
-      return null;
-    }
-
-    Iterator extensibles =
-      bindingOperation.getExtensibilityElements().iterator();
-    while (extensibles.hasNext())
-    {
-      Object extensible = extensibles.next();
-      if (extensible instanceof SOAPOperation)
-      {
-        return (SOAPOperation) extensible;
-      }
-    }
-    return null;
-  }
-
-  /* 
-   * Returns an array of SOAPOperations corresponding to the wsdl:binding supplied.
-   */
-  protected HashMap getSoapOperations(Binding binding) throws WSIException
-  {
-    HashMap soapOperationList = new HashMap();
-
-    if (binding.getBindingOperations() == null)
-    {
-      return null;
-    }
-
-    //Vector soapOpVector = new Vector();
-
-    // Get the list of binding operations
-    Iterator operations = binding.getBindingOperations().iterator();
-
-    // Check each binding operation to see if it has a soap operation element
-    BindingOperation bindingOperation = null;
-    while (operations.hasNext())
-    {
-      bindingOperation = (BindingOperation) operations.next();
-      Iterator extensibles =
-        bindingOperation.getExtensibilityElements().iterator();
-      while (extensibles.hasNext())
-      {
-        Object extensible = extensibles.next();
-        if (extensible instanceof SOAPOperation)
-        {
-          soapOperationList.put(extensible, bindingOperation.getName());
-        }
-      }
-    }
-
-    //return (SOAPOperation[])soapOpVector.toArray(new SOAPOperation[] {});
-    return soapOperationList;
-  }
-
-  /**
-   * Check part attributes.
-   * @param bindingMatch an array of BindingMatch objects.
-   * @param inOrOut a String object.
-   * @param attrib attribute.
-   * @return a boolean.
-   * @throws AssertionFailException if the part is not compliant.
-   */
-  // GT - rework this method with a better way of parameterizing the getters required for the invocation.
-  protected boolean checkPartAttributes(
-    BindingMatch[] bindingMatch,
-    String inOrOut,
-    String attrib)
-    throws AssertionFailException
-  {
-
-    if (!(inOrOut.equals("useInput") || inOrOut.equals("useOutput"))
-      || !(attrib.equals("useType") || attrib.equals("useElement")))
-    {
-      // invalid argument value supplied by calling method - "internal error"
-      return false;
-    }
-
-    for (int i = 0; i < bindingMatch.length; i++)
-    {
-      BindingMatch nextMatch = bindingMatch[i];
-
-      // check the associated parts
-      Message msg;
-      Map parts;
-      Iterator partIteration;
-
-      BindingOperation bindingOp = nextMatch.getBindingOperation();
-      if (bindingOp == null)
-      {
-        continue; // no Binding Operation for some reason
-      }
-
-      Operation op = bindingOp.getOperation();
-
-      /*	ADD: handle soap:faults in similar way	   		
-      try {
-      // check faults - remarkably similar.... (need to retain operation id for failuredetail msg)
-      	if (nextMatch.hasBindingFault()) {
-      				
-      		msg = op.getFault().getMessage();
-      		parts = msg.getParts();
-      				    					     			
-      		//check that each part has an element attribute    			
-      		partIteration = parts.values().iterator();
-      		while (partIteration.hasNext()) {
-      			Part part = (Part)partIteration.next();
-      			if (part.getElementName() == null) {
-      				throw new AssertionFailException("OPERATION: " + op + "MESSAGE: " + msg);
-      			}
-      		}	 			
-      	}
-      }
-      catch (NullPointerException n) {
-      	// no parts found - this qualifies an assertion failure
-      	throw new AssertionFailException(n.getMessage());
-      }
-      */
-
-      try
-      {
-
-        QName attributeName;
-
-        //GT: Do we need to check BindingInput / Output here ??
-
-        if (inOrOut.equals("useInput"))
-        {
-          if (op.getInput() == null || !nextMatch.hasBindingInput())
-          {
-            // No Input so nothing to check
-            continue;
-          }
-
-          msg = op.getInput().getMessage();
-
-        }
-        else
-        { // Looking for Output
-          if (op.getOutput() == null || !nextMatch.hasBindingOutput())
-          {
-            // No Output so nothing to check
-            continue;
-          }
-
-          msg = op.getOutput().getMessage();
-        }
-
-        if (msg == null)
-        {
-          continue; // nothing to check from this Binding Match (?)
-        }
-
-        // Get the list of parts 
-        parts = msg.getParts();
-
-        // If there is a parts attribute, then only process those parts
-        List partsNameList = null;
-        if ((partsNameList = getPartsList(nextMatch, inOrOut)) != null)
-        {
-          Vector partsList = new Vector();
-          Iterator partsNameIterator = partsNameList.iterator();
-          while (partsNameIterator.hasNext())
-          {
-            partsList.add(parts.get((String) partsNameIterator.next()));
-          }
-          partIteration = partsList.iterator();
-        }
-
-        // Otherwise use the complete list of parts
-        else
-        {
-          partIteration = parts.values().iterator();
-        }
-
-        //check that each part has an element or type attribute    			
-        while (partIteration.hasNext())
-        {
-          Part part = (Part) partIteration.next();
-          if (attrib.equals("useElement"))
-          {
-            attributeName = part.getElementName();
-          }
-          else
-          { // "useType"
-            attributeName = part.getTypeName();
-          }
-
-          if (attributeName == null)
-          {
-            throw new AssertionFailException(
-              "Name of operation that failed: "
-                + op.getName()
-                + "\n"
-                + op.toString()
-                + "\n"
-                + "\nName of message that failed: "
-                + msg.getQName()
-                + "\n"
-                + msg.toString());
-          }
-        }
-      }
-      catch (NullPointerException n)
-      {
-        // no parts found - this qualifies an assertion failure
-        throw new AssertionFailException(n.toString());
-      }
-    }
-    return true; // tests successful
-  }
-
-  /**
-   * Get parts list from a soapbind:body element.
-   */
-  private List getPartsList(BindingMatch bindingMatch, String type)
-  {
-    List partsList = null;
-    Iterator iterator = null;
-
-    BindingOperation bindingOp;
-
-    try
-    {
-      // Get the binding operation
-      bindingOp = bindingMatch.getBindingOperation();
-
-      // Determine if the binding operation contains a soapbind:body with a parts attribute
-      if (type.equals("useInput"))
-      {
-        iterator =
-          bindingOp.getBindingInput().getExtensibilityElements().iterator();
-      }
-      else
-      {
-        iterator =
-          bindingOp.getBindingOutput().getExtensibilityElements().iterator();
-      }
-    }
-    catch (NullPointerException e)
-    {
-      return null;
-      // either no binding operation, binding input/output, or SOAP element
-    }
-
-    // Determine if the binding operation contains a soapbind:body with a parts attribute
-    while ((iterator.hasNext()) && (partsList == null))
-    {
-      try
-      {
-        SOAPBody soapBody = (SOAPBody) iterator.next();
-        partsList = soapBody.getParts();
-      }
-      catch (ClassCastException cce)
-      { // not a SOAPBody extensibility element so ignore
-      }
-    }
-
-    return partsList;
-  }
-
-  /**
-   * Get element location.
-   * @param wsdlDocument WSDL document.
-   * @param wsdlElement WSDL element.
-   * @return element location.
-   */
-  protected ElementLocation getElementLocation(
-    WSDLDocument wsdlDocument,
-    Object wsdlElement)
-  {
-    ElementLocation elementLocation = null;
-    WSDLElementList wsdlElementList;
-
-    if ((wsdlElementList = wsdlDocument.getElementList()) != null)
-    {
-      elementLocation = wsdlElementList.getElementLocation(wsdlElement);
-    }
-
-    return elementLocation;
-  }
-
-  /**
-   * Create failure detail.
-   * @param message a message.
-   * @param entryContext entry context.
-   * @return failure detail.
-   */
-  protected FailureDetail createFailureDetail(
-    String message,
-    EntryContext entryContext)
-  {
-    return createFailureDetail(
-      message,
-      entryContext,
-      entryContext.getEntry().getEntryDetail());
-  }
-
-  /**
-   * Create failure detail.
-   * @param message a message.
-   * @param entryContext entry context.
-   * @param wsdlElement WSDL element.
-   * @return failure detail.
-   */
-  protected FailureDetail createFailureDetail(
-    String message,
-    EntryContext entryContext,
-    Object wsdlElement)
-  {
-    FailureDetail failureDetail = reporter.createFailureDetail();
-    failureDetail.setFailureMessage(message);
-    failureDetail.setElementLocation(
-      getElementLocation(entryContext.getWSDLDocument(), wsdlElement));
-    return failureDetail;
-  }
-
-  /** 
-   * SOAPBody, SOAPFault, SOAPHeader and SOAPHeaderFault class 
-   * interfaces have compatible getUse() and getNamespaceURI() 
-   * methods, but wsdl4j does not declare them at the parent interface. 
-   * Therefore use reflection to access these common methods.
-   * 
-   * @param extElement extensibility element.
-   * @return true if namespace is found in SOAP literal.
-   * @throws NoSuchMethodException if this method cannot be found.
-   * @throws InvocationTargetException if problems occur in an invoked method or constructor
-   * @throws IllegalAccessException if there is am attempt to load a
-   *         class that it does not have access to.
-   */
-  protected boolean namespaceFoundInSoapLiteral(ExtensibilityElement extElement)
-    throws NoSuchMethodException, InvocationTargetException, IllegalAccessException
-  {
-    Class c = extElement.getClass();
-    Method getUseMethod = c.getMethod("getUse", new Class[0]);
-    Method getNamespaceURIMethod = c.getMethod("getNamespaceURI", new Class[0]);
-
-    // (use attribute is mandatory but the null case is checked for since a missing use is not
-    // checked with this TA. If its missing its invalid but we don't know whether we have doc-lit).     		
-    if (getUseMethod.invoke(extElement, null) == null
-      || !getUseMethod.invoke(extElement, null).equals(
-        WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-    {
-      return false;
-    }
-
-    // return true if namespace found
-    boolean namespaceFound =
-      (getNamespaceURIMethod.invoke(extElement, null) != null);
-
-    // return true if namespace found
-    return namespaceFound;
-
-  }
-
-  /**
-   * Verify extensibility element uses literal.
-   * @param extensible - extensibility element
-   * @return boolean
-   * @throws NoSuchMethodException if this method cannot be found.
-   * @throws InvocationTargetException if problems occur in an invoked method or constructor
-   * @throws IllegalAccessException if there is am attempt to load a
-   *         class that it does not have access to.
-   */
-  protected boolean isLiteral(ExtensibilityElement extensible)
-    throws NoSuchMethodException, InvocationTargetException, IllegalAccessException
-  {
-
-    Class c = extensible.getClass();
-    Method getUseMethod = c.getMethod("getUse", new Class[0]);
-
-    // (use attribute is mandatory but the null case is checked for since a missing use is not
-    // checked with this TA. If its missing its invalid but we don't know whether we have doc-lit).     		
-    if (getUseMethod.invoke(extensible, null) == null
-      || !getUseMethod.invoke(extensible, null).equals(
-        WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-    {
-      return false;
-    }
-
-    // return true if shown to have use="literal"
-    return true;
-
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2010.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2010.java
deleted file mode 100644
index 4b39b5d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2010.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2010
- */
-public class WSI2010 extends BP2010
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2010(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2011.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2011.java
deleted file mode 100644
index 61d5da7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2011.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2011
- */
-public class WSI2011 extends BP2011
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2011(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2012.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2012.java
deleted file mode 100644
index 21d9ef2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2012.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2012
- */
-public class WSI2012 extends BP2012
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2012(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2013.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2013.java
deleted file mode 100644
index d4f01cf..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2013.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2013
- */
-public class WSI2013 extends BP2013
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2013(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2014.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2014.java
deleted file mode 100644
index fbb6a6a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2014.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2014
- */
-public class WSI2014 extends BP2014
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2014(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2017.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2017.java
deleted file mode 100644
index 93e9820..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2017.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2017
- */
-public class WSI2017 extends BP2017
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2017(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2018.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2018.java
deleted file mode 100644
index 3845e31..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2018.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2018
- */
-public class WSI2018 extends BP2018
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2018(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2019.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2019.java
deleted file mode 100644
index fb197f2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2019.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2019
- */
-public class WSI2019 extends BP2019
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2019(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2020.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2020.java
deleted file mode 100644
index 25f0206..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2020.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2020
- */
-public class WSI2020 extends BP2020
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2020(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2021.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2021.java
deleted file mode 100644
index 437f1bc..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2021.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2021
- */
-public class WSI2021 extends BP2021
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2021(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2022.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2022.java
deleted file mode 100644
index 8269965..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2022.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2022
- */
-public class WSI2022 extends BP2022
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2022(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2032.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2032.java
deleted file mode 100644
index 6c07ac1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2032.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2032
- */
-public class WSI2032 extends BP2032
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2032(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2098.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2098.java
deleted file mode 100644
index 82a905c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2098.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2098
- */
-public class WSI2098 extends BP2098
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2098(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2099.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2099.java
deleted file mode 100644
index 514b52c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2099.java
+++ /dev/null

@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Element;
-
-
-/**
- * WSI2099.
-   * <context>For a candidate wsdl:definitions, </context>
-   * <assertionDescription>A WS-I conformance annotation does not appear outside a wsdl:port, wsdl:binding, wsdl:portType, wsdl:operation, or wsdl:message element.</assertionDescription>
- */
-public class WSI2099 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2099(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private ErrorList errors = new ErrorList();
-  private boolean containsClaims = false;
-
-  /**
-   *  Check a WS-I conformance annotation does not appear outside a wsdl:port, wsdl:binding, wsdl:portType, wsdl:operation, or wsdl:message element if not it creates failure report.
-   * @see org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLVisitor#visit(org.w3c.dom.Element, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Element el, Object parent, WSDLTraversalContext ctx)
-  {
-    // conformance claim should be within : port, binding, porttype, operation, message
-    if (containsConformanceClaim(el))
-    {
-      containsClaims = true;
-
-      if (parent instanceof BindingFault)
-        errors.add(WSDL_FAULT, ((BindingFault) parent).getName());
-      else if (parent instanceof BindingInput)
-        errors.add(WSDL_INPUT, ((BindingInput) parent).getName());
-      else if (parent instanceof BindingOperation)
-        errors.add(WSDL_OPERATION, ((BindingOperation) parent).getName());
-      else if (parent instanceof BindingOutput)
-        errors.add(WSDL_OUTPUT, ((BindingOutput) parent).getName());
-      else if (parent instanceof Definition)
-        errors.add(WSDL_DEFINITIONS, ((Definition) parent).getQName());
-      else if (parent instanceof Service)
-        errors.add(WSDL_SERVICE, ((Service) parent).getQName());
-      else if (parent instanceof Fault)
-        errors.add(WSDL_FAULT, ((Fault) parent).getName());
-      else if (parent instanceof Output)
-        errors.add(WSDL_INPUT, ((Output) parent).getName());
-      else if (parent instanceof Import)
-        errors.add(WSDL_IMPORT, ((Import) parent).getNamespaceURI());
-      else if (parent instanceof Input)
-        errors.add(WSDL_INPUT, ((Input) parent).getName());
-      else if (parent instanceof Part)
-        errors.add(WSDL_PART, ((Part) parent).getName());
-      else if (parent instanceof Types)
-        errors.add(WSDL_TYPES);
-    }
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitElement(true);
-    /*
-    traversal.
-    	ignorePort2Element().
-    	ignoreMessage2Element().
-    	ignoreBinding2Element().
-    	ignorePortType2Element().
-    	ignoreOperation2Element();		
-      */
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-    traversal.traverse((Definition) entryContext.getEntry().getEntryDetail());
-
-    // create detail message with the list of error elements
-    if (!errors.isEmpty())
-    {
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-      result = AssertionResult.RESULT_FAILED;
-    }
-
-    else if (!containsClaims)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-
-    else
-    {
-      result = AssertionResult.RESULT_PASSED;
-    }
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Check the documentation element whether contains conformance claims. 
-   * Returns true if documentation element contains conformance claim. 
-   * @param el
-   * @return boolean
-   */
-  private boolean containsConformanceClaim(Element el)
-  {
-    if (el == null)
-      return false;
-    el = XMLUtils.findChildElement(el, WSI_CLAIM);
-    return (el != null);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2100.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2100.java
deleted file mode 100644
index da15585..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2100.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.AssertionProcessVisitor;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.util.ErrorList;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Element;
-
-
-/**
- * WSI2100.
-   * <context>For a candidate wsdl:definitions, if it contains a wsdl:port, wsdl:binding, wsdl:portType, wsdl:operation, or wsdl:message, which in turn contains a conformance annotation</context>
-   * <assertionDescription>The conformance annotation of the wsdl:port, wsdl:binding, wsdl:portType, wsdl:operation, or wsdl:message, validates to the schema defined in the Basic Profile, and is direct child of the documentation element for the WSDL element. The schema definition uses "http://ws-i.org/schemas/conformanceClaim/" as the targetNamespace. </assertionDescription>
- */
-public class WSI2100 extends AssertionProcessVisitor implements WSITag
-{
-  private final WSDLValidatorImpl validator;
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2100(WSDLValidatorImpl impl)
-  {
-    super(impl);
-    this.validator = impl;
-  }
-
-  private boolean containsClaims = false;
-  private ErrorList errors = new ErrorList();
-
-  /* Create falure report if port contains illegal claim.
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Port, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Port port, Object parent, WSDLTraversalContext ctx)
-  {
-    if (port != null && !containsLegalClaim(port.getDocumentationElement()))
-      errors.add(WSDL_PORT, port.getName());
-  }
-
-  /* Create falure report if binding contains illegal claim.
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Binding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Binding binding, Object parent, WSDLTraversalContext ctx)
-  {
-    if (binding != null
-      && !containsLegalClaim(binding.getDocumentationElement()))
-      errors.add(WSDL_BINDING, binding.getQName());
-  }
-
-  /* Create falure report if port type contains illegal claim.
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.PortType, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(PortType type, Object parent, WSDLTraversalContext ctx)
-  {
-    if (type != null && !containsLegalClaim(type.getDocumentationElement()))
-      errors.add(WSDL_PORTTYPE, type.getQName());
-  }
-
-  /* Create falure report if operation contains illegal claim.
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Operation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(
-    Operation operation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    if (operation != null
-      && !containsLegalClaim(operation.getDocumentationElement()))
-      errors.add(WSDL_OPERATION, operation.getName());
-  }
-
-  /* Create falure report if message contains illegal claim.
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Message, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Message message, Object parent, WSDLTraversalContext ctx)
-  {
-    if (message != null
-      && !containsLegalClaim(message.getDocumentationElement()))
-      errors.add(WSDL_MESSAGE, message.getQName());
-  }
-
-  /* Validates the test assertion.
-   * @see org.wsi.test.profile.validator.impl.BaseValidatorImpl.AssertionProcess#validate(org.wsi.test.profile.TestAssertion, org.wsi.test.profile.validator.EntryContext)
-   */
-  public AssertionResult validate(
-    TestAssertion testAssertion,
-    EntryContext entryContext)
-    throws WSIException
-  {
-    result = AssertionResult.RESULT_FAILED;
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitOperation(true);
-    traversal.visitBinding(true);
-    traversal.visitMessage(true);
-    traversal.visitPort(true);
-    traversal.visitPortType(true);
-    traversal.ignoreReferences();
-    traversal.ignoreImport();
-    traversal.traverse((Definition) entryContext.getEntry().getEntryDetail());
-
-    // create detail message with the list of error elements
-    if (!errors.isEmpty())
-    {
-      failureDetail = this.validator.createFailureDetail(errors.toString(), entryContext);
-      result = AssertionResult.RESULT_FAILED;
-    }
-
-    else if (!containsClaims)
-    {
-      result = AssertionResult.RESULT_NOT_APPLICABLE;
-    }
-    else
-      result = AssertionResult.RESULT_PASSED;
-
-    return validator.createAssertionResult(testAssertion, result, failureDetail);
-  }
-
-  /**
-   * Check the documentation element whether contains conformance claims.
-   * Returns true if documentation element contains conformance claim with
-   * illegal schema definition URI. 
-   * legal is 'http://ws-i.org/schemas/conformanceClaim/'
-   * @param el
-   * @return boolean
-   */
-  private boolean containsLegalClaim(Element el)
-  {
-    if (el == null)
-      return true;
-    // find claim
-    el = XMLUtils.findChildElement(el, WSI_CLAIM);
-
-    if (el != null)
-      containsClaims = true;
-
-    while (el != null)
-    {
-      if (XMLUtils.getAttribute(el, ATTR_CLAIM_CONFORMSTO) == null
-        || XMLUtils.getAttribute(el, ATTR_SOAP_MUSTUNDERSTAND) != null)
-        return false;
-      el = XMLUtils.findElement(el, WSI_CLAIM);
-    }
-    return true;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2101.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2101.java
deleted file mode 100644
index 68f09db..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2101.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2101
- */
-public class WSI2101 extends BP2101
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2101(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2102.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2102.java
deleted file mode 100644
index 63627d0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2102.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2102
- */
-public class WSI2102 extends BP2102
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2102(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2103.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2103.java
deleted file mode 100644
index bb75f19..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2103.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2103
- */
-public class WSI2103 extends BP2103
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2103(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2104.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2104.java
deleted file mode 100644
index b742779..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2104.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2104
- */
-public class WSI2104 extends BP2104
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2104(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2105.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2105.java
deleted file mode 100644
index bbbddfe..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2105.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2105
- */
-public class WSI2105 extends BP2105
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2105(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2107.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2107.java
deleted file mode 100644
index dc5742f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2107.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2107
- */
-public class WSI2107 extends BP2107
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2107(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2108.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2108.java
deleted file mode 100644
index 746beaa..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2108.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2108
- */
-public class WSI2108 extends BP2108
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2108(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2110.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2110.java
deleted file mode 100644
index e70cc4d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2110.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2110
- */
-public class WSI2110 extends BP2110
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2110(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2111.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2111.java
deleted file mode 100644
index ef9286f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2111.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2111
- */
-public class WSI2111 extends BP2111
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2111(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2112.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2112.java
deleted file mode 100644
index ed40abe..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2112.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2112
- */
-public class WSI2112 extends BP2112
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2112(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2113.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2113.java
deleted file mode 100644
index 0c11897..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2113.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2113
- */
-public class WSI2113 extends BP2113
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2113(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2114.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2114.java
deleted file mode 100644
index ef55a24..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2114.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2114
- */
-public class WSI2114 extends BP2114
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2114(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2115.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2115.java
deleted file mode 100644
index 916ef7a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2115.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2115
- */
-public class WSI2115 extends BP2115
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2115(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2116.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2116.java
deleted file mode 100644
index 03358e7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2116.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2116
- */
-public class WSI2116 extends BP2116
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2116(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2117.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2117.java
deleted file mode 100644
index 87b377c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2117.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2117
- */
-public class WSI2117 extends BP2117
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2117(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2118.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2118.java
deleted file mode 100644
index d6d3307..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2118.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2118
- */
-public class WSI2118 extends BP2118
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2118(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2119.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2119.java
deleted file mode 100644
index 1416ce3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2119.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2119
- */
-public class WSI2119 extends BP2119
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2119(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2120.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2120.java
deleted file mode 100644
index 4f2e205..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2120.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2120
- */
-public class WSI2120 extends BP2120
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2120(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2122.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2122.java
deleted file mode 100644
index 22994ec..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2122.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2122
- */
-public class WSI2122 extends BP2122
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2122(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2123.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2123.java
deleted file mode 100644
index 44f05a6..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2123.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2123
- */
-public class WSI2123 extends BP2123
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2123(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2201.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2201.java
deleted file mode 100644
index 696457c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2201.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2201
- */
-public class WSI2201 extends BP2201
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2201(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2202.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2202.java
deleted file mode 100644
index ebb59f3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2202.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2202
- */
-public class WSI2202 extends BP2202
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2202(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2208.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2208.java
deleted file mode 100644
index 4ed7130..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2208.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2208
- */
-public class WSI2208 extends BP2208
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2208(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2402.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2402.java
deleted file mode 100644
index 10c5785..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2402.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2402
- */
-public class WSI2402 extends BP2402
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2402(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2403.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2403.java
deleted file mode 100644
index 8facd42..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2403.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2403
- */
-public class WSI2403 extends SSBP2403
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2403(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2404.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2404.java
deleted file mode 100644
index 9dfa8e9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2404.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2404
- */
-public class WSI2404 extends BP2404
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2404(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2406.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2406.java
deleted file mode 100644
index c6d420a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2406.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2406
- */
-public class WSI2406 extends BP2406
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2406(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2416.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2416.java
deleted file mode 100644
index 770bf3f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2416.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2416
- */
-public class WSI2416 extends BP2416
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2416(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2417.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2417.java
deleted file mode 100644
index 7c23836..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2417.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2417
- */
-public class WSI2417 extends BP2417
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2417(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2700.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2700.java
deleted file mode 100644
index 39bbb36..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2700.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2700
- */
-public class WSI2700 extends BP2700
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2700(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2701.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2701.java
deleted file mode 100644
index 4337f53..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2701.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2701
- */
-public class WSI2701 extends BP2701
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2701(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2703.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2703.java
deleted file mode 100644
index 5463708..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2703.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI2703
- */
-public class WSI2703 extends BP2703
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI2703(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4200.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4200.java
deleted file mode 100644
index ed43a7c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4200.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI4200
- */
-public class WSI4200 extends BP4200
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI4200(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4201.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4201.java
deleted file mode 100644
index f7233d9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4201.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI4201
- */
-public class WSI4201 extends BP4201
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI4201(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4202.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4202.java
deleted file mode 100644
index 92d9bae..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4202.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
-
-/**
- * WSI4202
- */
-public class WSI4202 extends BP4202
-{
-
-  /**
-   * @param WSDLValidatorImpl
-   */
-  public WSI4202(WSDLValidatorImpl impl)
-  {
-    super(impl);
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java
deleted file mode 100644
index 89899de..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * An artifact reference.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface ArtifactReference extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_ARTIFACT_REFERENCE;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_REPORT, ELEM_NAME);
-
-  /**
-   * Get timestamp.
-   * @return timestamp.
-   * @see #setTimestamp
-   */
-  public String getTimestamp();
-
-  /**
-   * Set timestamp.
-   * @param timestamp a timestamp.
-   * @see #getTimestamp
-   */
-  public void setTimestamp(String timestamp);
-
-  /**
-   * Get document element.
-   * @return document element.
-   * @see #setDocumentElement
-   */
-  public DocumentElement getDocumentElement();
-
-  /**
-   * Set document element.
-   * @param documentElement document element.
-   * @param namespaceName   namespace prefix.
-   * @see #getDocumentElement
-   */
-  public void setDocumentElement(
-    DocumentElement documentElement,
-    String namespaceName);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/AssertionResult.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/AssertionResult.java
deleted file mode 100644
index c5113e8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/AssertionResult.java
+++ /dev/null

@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-
-/**
- * Test assertion result.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface AssertionResult extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_ASSERTION_RESULT;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_REPORT, ELEM_NAME);
-
-  /**
-   * Result values.
-   */
-  public static final String RESULT_PASSED = "passed";
-  public static final String RESULT_FAILED = "failed";
-  public static final String RESULT_PREREQ_FAILED = "prereqFailed";
-  public static final String RESULT_MISSING_INPUT = "missingInput";
-  public static final String RESULT_WARNING = "warning";
-  public static final String RESULT_NOT_APPLICABLE = "notApplicable";
-
-  /**
-   * Get result.
-   * @return result.
-   * @see #setResult
-   */
-  public String getResult();
-
-  /**
-   * Set result.
-   * @param result the result value.
-   * @see #getResult
-   */
-  public void setResult(String result);
-
-  /**
-   * Get assertion.
-   * @return profile test assertion.
-   * @see #setAssertion
-   */
-  public TestAssertion getAssertion();
-
-  /**
-   * Set assertion.
-   * @param profileAssertion profile test assertion.
-   * @see #getAssertion
-   */
-  public void setAssertion(TestAssertion profileAssertion);
-
-  /**
-   * Get entry.
-   * @return entry.
-   * @see #setEntry
-   */
-  public Entry getEntry();
-
-  /**
-   * Set entry.
-   * @param entry an entry.
-   * @see #getEntry
-   */
-  public void setEntry(Entry entry);
-
-  /**
-   * Get failure detail messages.
-   * @return failure detail messages.
-   * @see #setFailureDetailList
-   */
-  public Vector getFailureDetailList();
-
-  /**
-   * Set failure detail messages.
-   * @param failureDetailList failure detail messages.
-   * @see #getFailureDetailList
-   */
-  public void setFailureDetailList(Vector failureDetailList);
-
-  /**
-   * Get warning messages.
-   * @return warning messages.
-   * @see #setWarningMessages
-   */
-  //public Vector getWarningMessages();
-
-  /**
-   * Set warning messages.
-   * @param warningMessages warning messages.
-   * @see #getWarningMessages
-   */
-  //public void setWarningMessages(Vector warningMessages);
-
-  /**
-   * Get assertion results option.
-   * @return ssertion results option.
-   * @see #setAssertionResultsOption
-   */
-  public AssertionResultsOption getAssertionResultsOption();
-
-  /**
-   * Set assertion results option.
-   * @param assertionResultsOption assertion results option.
-   * @see #getAssertionResultsOption
-   */
-  public void setAssertionResultsOption(AssertionResultsOption assertionResultsOption);
-
-  /**
-   * Get prereq failed list.
-   * @return prereq failed list.
-   * @see #setPrereqFailedList
-   */
-  public PrereqFailedList getPrereqFailedList();
-
-  /**
-   * Set prereq failed list.
-   * @param prereqFailedList prereq failed list.
-   * @see #getPrereqFailedList
-   */
-  public void setPrereqFailedList(PrereqFailedList prereqFailedList);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/BuildReport.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/BuildReport.java
deleted file mode 100644
index 09dbc2f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/BuildReport.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-
-/**
- * This interface is used to build the Profile report.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface BuildReport
-{
-  /**
-   * Prereq type - entry.
-   */
-  public static final String PREREQ_TYPE_ENTRY = "entry";
-
-  /**
-   * Prereq type - entry container.
-   */
-  public static final String PREREQ_TYPE_ENTRY_CONTAINER = "entryContainer";
-
-  /**
-   * Start current artifact.
-   * @param reportArtifact current report artifact.
-   * @throws WSIException the base WS-I exception.
-   */
-  public void setCurrentArtifact(ReportArtifact reportArtifact)
-    throws WSIException;
-
-  /**
-   * Add artifact refererence.
-   * @param artifactReference artifact reference.
-   * @throws WSIException the base WS-I exception.
-   */
-  public void addArtifactReference(ArtifactReference artifactReference)
-    throws WSIException;
-
-  /**
-   * End current artifact.
-   * @throws WSIException the base WS-I exception.
-   */
-  public void endCurrentArtifact() throws WSIException;
-
-  /**
-   * Start current entry.
-   * @param entry the current entry.
-   * @throws WSIException the base WS-I exception.
-   */
-  public void setCurrentEntry(Entry entry) throws WSIException;
-
-  /**
-   * Start current entry.
-   * @param entry the current entry.
-   * @throws WSIException the base WS-I exception.
-   */
-  public void setCurrentEnvelopeEntry(Entry entry) throws WSIException;
-  /**
-   * End current entry.
-   * @throws WSIException the base WS-I exception.
-   */
-  public void endCurrentEntry() throws WSIException;
-
-  /**
-   * Add test assertion result.
-   * @param assertionResult test assertion result.
-   * @throws WSIException the base WS-I exception.
-   */
-  public void addAssertionResult(AssertionResult assertionResult)
-    throws WSIException;
-
-  /**
-   * Get the assertion result for a specific test assertion.
-   * @param assertionId the test assertion ID.
-   * @return  the assertion result for the specified test assertion ID.
-   *          If an assertion result was not found, then null is returned.
-   */
-  public AssertionResult getAssertionResult(String assertionId);
-
-  /**
-   * Create assertion result.
-   * @return newly created assertion result.
-   */
-  public AssertionResult createAssertionResult();
-
-  /**
-   * Create entry.
-   * @return newly created entry.
-   */
-  public Entry createEntry();
-
-  /**
-   * Create entry container.
-   * @return newly created entry container.
-   */
-  public EntryContainer createEntryContainer();
-
-  /**
-   * Create artifact.
-   * @return newly created artifact.
-   */
-  public ReportArtifact createArtifact();
-
-  /**
-   * Create failure detail.
-   * @return newly created failure detail.
-   */
-  public FailureDetail createFailureDetail();
-
-  /**
-   * Set type of prereq processing - either entry or document.
-   * @param prereqType type of prereq processing - either entry or document.
-   */
-  public void setPrereqType(String prereqType);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Entry.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Entry.java
deleted file mode 100644
index e9cd89a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Entry.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-
-/**
- * Test assertion target.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface Entry extends EntryResult, DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_ENTRY;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_REPORT, ELEM_NAME);
-
-  /**
-   * Get assertion results option.
-   */
-  //public AssertionResultsOption getAssertionResultsOption();
-
-  /**
-   * Set assertion results option.
-   */
-  //public void setAssertionResultsOption(AssertionResultsOption assertionResultsOption);
-
-  /**
-   * Get entry type.
-   * @return entry type.
-   * @see #setEntryType
-   */
-  public EntryType getEntryType();
-
-  /**
-   * Set entry type.
-   * @param entryType entry type.
-   * @see #getEntryType
-   */
-  public void setEntryType(EntryType entryType);
-
-  /**
-   * Get artifact name.
-   * @return artifact name.
-   * @see #setArtifactName
-   */
-  public String getArtifactName();
-
-  /**
-   * Set artifact name.
-   * @param artifactName artifact name.
-   * @see #getArtifactName
-   */
-  public void setArtifactName(String artifactName);
-
-  /**
-   * Get reference ID.
-   * @return reference ID.
-   * @see #setReferenceID
-   */
-  public String getReferenceID();
-
-  /**
-   * Set reference ID.
-   * @param referenceID referenceID.
-   * @see #getReferenceID
-   */
-  public void setReferenceID(String referenceID);
-
-  /**
-   * Get parent element name.
-   * @return parent element name.
-   * @see #setParentElementName
-   */
-  public String getParentElementName();
-
-  /**
-   * Set parent element name.
-   * @param parentElementName parent element name.
-   * @see #getParentElementName
-   */
-  public void setParentElementName(String parentElementName);
-
-  /**
-   * Get entry detail.
-   * @return entry detail.
-   * @see #setEntryDetail
-   */
-  public Object getEntryDetail();
-
-  /**
-   * Set entry detail.
-   * @param detail entry detail.
-   * @see #getEntryDetail
-   */
-  public void setEntryDetail(Object detail);
-
-  /**
-   * Get entry container.
-   * @return entry container.
-   * @see #setEntryContainer
-   */
-  public EntryContainer getEntryContainer();
-
-  /**
-   * Set entry container.
-   * @param entryContainer entry container.
-   * @see #getEntryContainer
-   */
-  public void setEntryContainer(EntryContainer entryContainer);
-
-  /**
-   * Get start element string.
-   * @param namespaceName namespace prefix.
-   * @param showLogEntry show log entry option.
-   * @return start XML element string.
-   */
-  public String getStartXMLString(String namespaceName, boolean showLogEntry);
-
-  /**
-   * Get start element string.
-   * @param namespaceName namespace prefix.
-   * @param showLogEntry show log entry option.
-   * @return start XML element string.
-   */
-  public String getStartXMLString(String namespaceName, boolean showLogEntry, boolean envelopeArtifactType);
-  /**
-   * Get end element string.
-   * @param namespaceName namespace prefix.
-   * @return end XML element string.
-   */
-  public String getEndXMLString(String namespaceName);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/EntryContainer.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/EntryContainer.java
deleted file mode 100644
index 9991e15..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/EntryContainer.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-/**
- * This class represents a container which has one or more entries.
- * For example, a WSDL document contains one or more elements.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public interface EntryContainer extends EntryResult
-{
-  /**
-   * Get container id.
-   * @return container id.
-   * @see #setId
-   */
-  public String getId();
-
-  /**
-   * Set container id.
-   * @param id container id.
-   * @see #getId
-   */
-  public void setId(String id);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/EntryResult.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/EntryResult.java
deleted file mode 100644
index 77a4f57..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/EntryResult.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import java.util.TreeMap;
-
-/**
- * Result for a specific test assertion.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public interface EntryResult
-{
-  /**
-   * Add assertion result.
-   * @param assertionResult assertion result.
-   */
-  public void addAssertionResult(AssertionResult assertionResult);
-
-  /**
-   * Get assertion results.
-   * @return assertion results.
-   */
-  public TreeMap getAssertionResultList();
-
-  /**
-   * Get the assertion result for a specific test assertion.
-   * @param assertionId test assertion id.
-   * @return the assertion result for the specified test assertion ID.
-   *         If an assertion result was not found, then null is returned.
-   */
-  public AssertionResult getAssertionResult(String assertionId);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java
deleted file mode 100644
index 4c8acb3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-/**
- * Failure detail.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public interface FailureDetail extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_FAILURE_DETAIL;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_REPORT, ELEM_NAME);
-
-  /**
-   * Get failure detail message.
-   * @return failure detail message.
-   * @see #setFailureMessage
-   */
-  public String getFailureMessage();
-
-  /**
-   * Set failure detail message.
-   * @param failureMessage failure detail message.
-   * @see #getFailureMessage
-   */
-  public void setFailureMessage(String failureMessage);
-
-  /**
-   * Get reference type.
-   * @return reference type.
-   * @see #setReferenceType
-   */
-  public String getReferenceType();
-
-  /**
-   * Set reference type.
-   * @param referenceType reference type.
-   * @see #getReferenceType
-   */
-  public void setReferenceType(String referenceType);
-
-  /**
-   * Get reference ID.
-   * @return reference ID.
-   * @see #setReferenceIDn
-   */
-  public String getReferenceID();
-
-  /**
-   * Set reference ID.
-   * @param referenceID reference ID.
-   * @see #getReferenceID
-   */
-  public void setReferenceIDn(String referenceID);
-
-  /**
-   * Get element location.
-   * @return element location.
-   * @see #setElementLocation
-   */
-  public ElementLocation getElementLocation();
-
-  /**
-   * Set element location.
-   * @param elementLocation element location.
-   * @see #getElementLocation
-   */
-  public void setElementLocation(ElementLocation elementLocation);
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java
deleted file mode 100644
index 81059d3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-
-/**
- * This interface is used to maintain and access the Prerequisite Failed List.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface PrereqFailedList extends DocumentElement
-{
-  /**
-    * Element name.
-    */
-  public static final String ELEM_NAME = WSIConstants.ELEM_PREREQ_FAILED_LIST;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_REPORT, ELEM_NAME);
-
-  /**
-   * Add test assertion ID.
-   * @param assertionID test assertion ID.
-   */
-  public void addTestAssertionID(String assertionID);
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Report.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Report.java
deleted file mode 100644
index 1f0ad51..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Report.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
-
-/**
- * Conformance test report.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface Report extends WSIDocument, BuildReport
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_REPORT;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_REPORT, ELEM_NAME);
-
-  /**
-   * Get report context.
-   * @return report context.
-   * @see #setReportContext
-   */
-  public ReportContext getReportContext();
-
-  /**
-   * Set report context.
-   * @param reportContext report context.
-   * @see #getReportContext
-   */
-  public void setReportContext(ReportContext reportContext);
-
-  /**
-   * Get current artifact.
-   * @return current artifact.
-   */
-  public ReportArtifact getCurrentArtifact();
-
-  /**
-   * Get current entry.
-   * @return current entry.
-   */
-  public Entry getCurrentEntry();
-
-  /**
-   * Method getEntries.
-   * @return entry list.
-   */
-  public List getEntries();
-
-  /**
-   * Method getArtifacts.
-   * @return artifacts.
-   */
-  public List getArtifacts();
-
-  /**
-   * Get start element string.
-   * @param namespaceName namespace prefix
-   * @return start element string.
-   */
-  public String getStartXMLString(String namespaceName);
-
-  /**
-   * Get end element string.
-   * @param namespaceName namespace prefix
-   * @return end element string. 
-   */
-  public String getEndXMLString(String namespaceName);
-
-  /**
-   * Get error XML string.
-   * @param namespaceName namespace prefix.
-   * @param errorDetail an error detail.
-   * @return error XML string. 
-   */
-  public String getErrorXMLString(String namespaceName, String errorDetail);
-
-  /**
-   * Get summary result. 
-   * @return summary result.
-   */
-  public String getSummaryResult();
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportArtifact.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportArtifact.java
deleted file mode 100644
index 4a1fb9c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportArtifact.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import java.util.TreeMap;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-
-/**
- * Report artifact.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface ReportArtifact extends DocumentElement
-{
-  /**
-   * Element name.
-   */
-  public static final String ELEM_NAME = WSIConstants.ELEM_ARTIFACT;
-
-  /**
-   * QName.
-   */
-  public static final QName QNAME =
-    new QName(WSIConstants.NS_URI_WSI_REPORT, ELEM_NAME);
-
-  /**
-   * Get artifact type.
-   * @return artifact type.
-   * @see #setType
-   */
-  public ArtifactType getType();
-
-  /**
-   * Set artifact type.
-   * @param artifactType artifact type.
-   * @see #getType
-   */
-  public void setType(ArtifactType artifactType);
-
-  /**
-   * Add entry.
-   * @param entry an entry.
-   */
-  public void addEntry(Entry entry);
-
-  /**
-   * Get entry list.
-   * @return entry list.
-   */
-  public TreeMap getEntryList();
-
-  /**
-   * Get start element string.
-   * @param namespaceName namespace prefix.
-   * @return start element string.
-   */
-  public String getStartXMLString(String namespaceName);
-
-  /**
-   * Get end element string. 
-   * @param namespaceName namespace prefix.
-   * @return end element string.
-   */
-  public String getEndXMLString(String namespaceName);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportContext.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportContext.java
deleted file mode 100644
index 06507b0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportContext.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.Analyzer;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-
-/**
- * Report context.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class ReportContext
-{
-  /**
-   * Report title.
-   */
-  protected String reportTitle = WSIConstants.DEFAULT_REPORT_TITLE;
-
-  /**
-   * Profile definition.
-   */
-  protected ProfileAssertions profileAssertions;
-
-  /**
-   * Analyzer.
-   */
-  protected Analyzer analyzer;
-
-  /**
-   * Create report context.
-   * @param reportTitle report title.
-   * @param profileAssertions profile test assertions.
-   * @param analyzer an Analyzer object.
-  */
-  public ReportContext(
-    String reportTitle,
-    ProfileAssertions profileAssertions,
-    Analyzer analyzer)
-  {
-    this.reportTitle = reportTitle;
-    this.profileAssertions = profileAssertions;
-    this.analyzer = analyzer;
-  }
-
-  /**
-   * Get report title.
-   * @return report title.
-   * @see #setReportTitle
-   */
-  public String getReportTitle()
-  {
-    return this.reportTitle;
-  }
-
-  /**
-   * Set report title.
-   * @param reportTitle report title.
-   * @see #getReportTitle
-   */
-  public void setReportTitle(String reportTitle)
-  {
-    this.reportTitle = reportTitle;
-  }
-
-  /**
-   * Get profile definition.
-   * @return profile definition.
-   * @see #setProfileAssertions
-   */
-  public ProfileAssertions getProfileAssertions()
-  {
-    return this.profileAssertions;
-  }
-
-  /**
-   * Set profile definition.
-   * @param profileAssertions profile definition.
-   * @see #getProfileAssertions
-   */
-  public void setProfileAssertions(ProfileAssertions profileAssertions)
-  {
-    this.profileAssertions = profileAssertions;
-  }
-
-  /**
-   * Get analyzer.
-   * @return analyzer.
-   * @see #setAnalyzer
-   */
-  public Analyzer getAnalyzer()
-  {
-    return this.analyzer;
-  }
-
-  /**
-   * Set analyzer.
-   * @param analyzer an Analyzer object.
-   * @see #getAnalyzer
-   * 
-   */
-  public void setAnalyzer(Analyzer analyzer)
-  {
-    this.analyzer = analyzer;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportWriter.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportWriter.java
deleted file mode 100644
index ae7fc66..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ReportWriter.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.document.DocumentWriter;
-
-/**
- * Defines the interface used to write the report documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface ReportWriter extends DocumentWriter
-{
-  /**
-   * Write the entire contents of the document using the location
-   * that was previously set using the setLocation method.
-   * @param report a report.
-   * @throws IllegalStateException if this operation has been invoked 
-   *         at an illegal or inappropriate time
-   */
-  public void write(Report report) throws IllegalStateException;
-
-  /**
-   * Write the entire contents of the document.
-   * @param report a report.
-   * @param writer a Writer object.
-   */
-  public void write(Report report, Writer writer);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Reporter.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Reporter.java
deleted file mode 100644
index 1ea7843..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/Reporter.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-/**
- * Conformance test reporter interface.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface Reporter extends BuildReport, WriteReport
-{
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/WriteReport.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/WriteReport.java
deleted file mode 100644
index 8c70d9a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/WriteReport.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-
-/**
- * This class ..
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public interface WriteReport
-{
-  /**
-   * Start conformance report.
-   * @throws WSIException the base WS-I exception.
-   */
-  public void startReport() throws WSIException;
-
-  /**
-   * Finish the conformance report by adding the summary and test coverage information.
-   * @throws WSIException the base WS-I exception.
-   */
-  public void finishReport() throws WSIException;
-
-  /**
-   * Finish the conformance report because of an analyzer error.
-   * @param errorDetail analyzer error.
-   * @throws WSIException the base WS-I exception.
-   */
-  public void finishReportWithError(String errorDetail) throws WSIException;
-
-  /**
-   * Get report.
-   * @return report.
-   */
-  public Report getReport();
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java
deleted file mode 100644
index d4b46ba..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
-
-/**
- * An artifact reference.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ArtifactReferenceImpl implements ArtifactReference
-{
-  /**
-   * Timestamp.
-   */
-  protected String timestamp = null;
-
-  /**
-   * Optional document element.
-   */
-  protected DocumentElement documentElement = null;
-
-  /**
-   * Optional document element namespace name.
-   */
-  protected String elementNamespaceName = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ArtifactReference#getTimestamp()
-   */
-  public String getTimestamp()
-  {
-    return this.timestamp;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ArtifactReference#setTimestamp(String)
-   */
-  public void setTimestamp(String timestamp)
-  {
-    this.timestamp = timestamp;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ArtifactReference#getDocumentElement()
-   */
-  public DocumentElement getDocumentElement()
-  {
-    return this.documentElement;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ArtifactReference#setDocumentElement(DocumentElement, String)
-   */
-  public void setDocumentElement(
-    DocumentElement documentElement,
-    String namespaceName)
-  {
-    this.documentElement = documentElement;
-    this.elementNamespaceName = namespaceName;
-  }
-
-  /* (non-Javadoc)
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("  Artifact Reference: ");
-    pw.println("    timestamp ........... " + this.timestamp);
-
-    if (this.documentElement != null)
-      pw.println(
-        "    documentElement ..... "
-          + this.documentElement.toXMLString(this.elementNamespaceName));
-
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Create element 
-    pw.print("    <" + nsName + ELEM_NAME + " ");
-    pw.println(WSIConstants.ATTR_TIMESTAMP + "=\"" + getTimestamp() + "\">");
-
-    // If there is a document element, then add it
-    if (this.documentElement != null)
-    {
-      pw.print(documentElement.toXMLString(this.elementNamespaceName));
-    }
-
-    // End element
-    pw.println("    </" + nsName + ELEM_NAME + ">");
-
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/AssertionResultImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/AssertionResultImpl.java
deleted file mode 100644
index 5b2d8ce..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/AssertionResultImpl.java
+++ /dev/null

@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.AssertionResultsOptionImpl;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.report.PrereqFailedList;
-
-import com.ibm.wsdl.util.xml.DOMUtils;
-
-/**
- * Test assertion result.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class AssertionResultImpl implements AssertionResult
-{
-  /**
-   * Assertion result.
-   */
-  protected String result = null;
-
-  /**
-   * Entry.
-   */
-  protected Entry entry = null;
-
-  /**
-   * Profile test assertion.
-   */
-  protected TestAssertion testAssertion = null;
-
-  /**
-   * Failure detail messages.
-   */
-  protected Vector failureDetailList = null;
-
-  /**
-   * Assertion results option.
-   */
-  protected AssertionResultsOption assertionResultsOption =
-    new AssertionResultsOptionImpl();
-
-  /**
-   * Prereq failed list.
-   */
-  protected PrereqFailedList prereqFailedList = null;
-
-  /**
-   * Create a new assertion result.
-   */
-  public AssertionResultImpl()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#getResult()
-   */
-  public String getResult()
-  {
-    return this.result;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#setResult(java.lang.String)
-   */
-  public void setResult(String result)
-  {
-    this.result = result;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#getAssertion()
-   */
-  public TestAssertion getAssertion()
-  {
-    return this.testAssertion;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#setAssertion(org.wsi.test.profile.TestAssertion)
-   */
-  public void setAssertion(TestAssertion testAssertion)
-  {
-    this.testAssertion = testAssertion;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#getEntry()
-   */
-  public Entry getEntry()
-  {
-    return this.entry;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#setEntry(org.wsi.test.report.Entry)
-   */
-  public void setEntry(Entry entry)
-  {
-    this.entry = entry;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#getFailureDetailList()
-   */
-  public Vector getFailureDetailList()
-  {
-    return this.failureDetailList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#setFailureDetailList(java.util.Vector)
-   */
-  public void setFailureDetailList(Vector failureDetailList)
-  {
-    this.failureDetailList = failureDetailList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#getAssertionResultsOption()
-   */
-  public AssertionResultsOption getAssertionResultsOption()
-  {
-    return this.assertionResultsOption;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#setAssertionResultsOption(org.wsi.test.analyzer.config.AssertionResultsOption)
-   */
-  public void setAssertionResultsOption(AssertionResultsOption assertionResultsOption)
-  {
-    this.assertionResultsOption = assertionResultsOption;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#getPrereqFailedList()
-   */
-  public PrereqFailedList getPrereqFailedList()
-  {
-    return this.prereqFailedList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.AssertionResult#setPrereqFailedList(org.wsi.test.report.PrereqFailedList)
-   */
-  public void setPrereqFailedList(PrereqFailedList prereqFailedList)
-  {
-    this.prereqFailedList = prereqFailedList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(java.lang.String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Create element 
-    pw.print("      <" + nsName + ELEM_NAME + " ");
-    pw.print(WSIConstants.ATTR_ID + "=\"" + this.testAssertion.getId() + "\" ");
-    pw.println(WSIConstants.ATTR_RESULT + "=\"" + this.result + "\">");
-
-    // ADD: Add support for additional targets
-
-    // Add prereq failed list
-    if (this.prereqFailedList != null)
-    {
-      pw.print(prereqFailedList.toXMLString(nsName));
-    }
-
-    // ADD: Add support for multiple languages
-    // If result is failed or warning, then add failure message
-    if ((result.equals(RESULT_FAILED) || result.equals(RESULT_WARNING))
-      && (assertionResultsOption.getShowFailureMessage()))
-    {
-      pw.print(
-        "        <"
-          + nsName
-          + WSIConstants.ELEM_FAILURE_MESSAGE
-          + " xml:lang=\"en\">");
-      pw.print(DOMUtils.cleanString(this.testAssertion.getFailureMessage()));
-      pw.println("</" + nsName + WSIConstants.ELEM_FAILURE_MESSAGE + ">");
-    }
-
-    // ADD: Add support for multiple languages
-    // If any failure detail messages were specified, then add them
-    if ((failureDetailList != null)
-      && (assertionResultsOption.getShowFailureDetail()))
-    {
-      Iterator iterator = failureDetailList.iterator();
-      while (iterator.hasNext())
-      {
-        pw.print(((FailureDetail) iterator.next()).toXMLString(nsName));
-      }
-    }
-
-    // End the element
-    pw.println("      </" + nsName + ELEM_NAME + ">");
-
-    // Return string
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see java.lang.Object#toString()
-   */
-  public String toString()
-  {
-    return result;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/DefaultReporter.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/DefaultReporter.java
deleted file mode 100644
index bffdc33..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/DefaultReporter.java
+++ /dev/null

@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.StringReader;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.EntryContainer;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.ReportWriter;
-import org.eclipse.wst.wsi.internal.core.report.Reporter;
-
-/**
- * Base class for reporting errors from the analyzer.
- * Extend this class for specific types of reporting, such as reporting
- * in different formats, reporting to files, reporting to a GUI.
- *
- * @version 1.0.1
- * @author Jim Clune
- * @author Peter Brittenham
- */
-public class DefaultReporter implements Reporter
-{
-  /**
-   * Conformance report.
-   */
-  protected Report report;
-
-  /**
-   * Document writer.
-   */
-  protected ReportWriter reportWriter;
-
-  /**
-   * Analyzer config.
-   */
-  protected AnalyzerConfig analyzerConfig;
-
-  /**
-   * Assertoin result type.
-   */
-  protected AssertionResultType assertionResultType;
-
-  /**
-   * Do not allow the reporter to be created with null constructor.
-   */
-  private DefaultReporter()
-  {
-  }
-
-  /**
-   * Create result reporter.
-   * @param report a Report object.
-   * @param reportWriter a ReportWriterObject.
-   */
-  public DefaultReporter(Report report, ReportWriter reportWriter)
-  {
-    this.report = report;
-    this.reportWriter = reportWriter;
-
-    // ADD: Verify that writer set in reportWriter
-
-    // Get report context
-    this.analyzerConfig =
-      report.getReportContext().getAnalyzer().getAnalyzerConfig();
-    this.assertionResultType =
-      this.analyzerConfig.getAssertionResultsOption().getAssertionResultType();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#setCurrentArtifact(org.wsi.test.report.ReportArtifact)
-   */
-  public void setCurrentArtifact(ReportArtifact reportArtifact)
-    throws WSIException
-  {
-    report.setCurrentArtifact(reportArtifact);
-    reportWriter.write(new StringReader(reportArtifact.getStartXMLString("")));
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#endCurrentArtifact()
-   */
-  public void endCurrentArtifact() throws WSIException
-  {
-    reportWriter.write(
-      new StringReader(report.getCurrentArtifact().getEndXMLString("")));
-    report.endCurrentArtifact();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#addArtifactReference(org.wsi.test.report.ArtifactReference)
-   */
-  public void addArtifactReference(ArtifactReference artifactReference)
-    throws WSIException
-  {
-    reportWriter.write(new StringReader(artifactReference.toXMLString("")));
-
-    // Add artifact reference to report
-    report.addArtifactReference(artifactReference);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#setCurrentEntry(org.wsi.test.report.Entry)
-   */
-  public void setCurrentEntry(Entry entry) throws WSIException
-  {
-    report.setCurrentEntry(entry);
-    reportWriter.write(
-      new StringReader(
-        entry.getStartXMLString(
-          "",
-          this
-            .report
-            .getReportContext()
-            .getAnalyzer()
-            .getAnalyzerConfig()
-            .getAssertionResultsOption()
-            .getShowMessageEntry())));
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#setCurrentEntry(org.wsi.test.report.Entry)
-   */
-  public void setCurrentEnvelopeEntry(Entry entry) throws WSIException
-  {
-    report.setCurrentEntry(entry);
-    reportWriter.write(
-      new StringReader(
-        entry.getStartXMLString(
-          "",
-          this
-            .report
-            .getReportContext()
-            .getAnalyzer()
-            .getAnalyzerConfig()
-            .getAssertionResultsOption()
-            .getShowMessageEntry(),
-		  true)));
-  }
-/* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#endCurrentEntry()
-   */
-  public void endCurrentEntry() throws WSIException
-  {
-    reportWriter.write(
-      new StringReader(report.getCurrentEntry().getEndXMLString("")));
-    report.endCurrentEntry();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#addAssertionResult(org.wsi.test.report.AssertionResult)
-   */
-  public void addAssertionResult(AssertionResult assertionResult)
-    throws WSIException
-  {
-    // Based on the config options, write out assertion result
-    if ((assertionResultType.isAll())
-      || ((assertionResultType.isFailedOnly())
-        && (assertionResult.getResult().equals(AssertionResult.RESULT_FAILED)))
-      || ((assertionResultType.isNotPassed())
-        && (!assertionResult.getResult().equals(AssertionResult.RESULT_PASSED)))
-	      || ((assertionResultType.isNotInfo())
-	            && (!assertionResult.getAssertion().getType().equals(TestAssertion.TYPE_INFORMATIONAL))))
-    {
-      reportWriter.write(new StringReader(assertionResult.toXMLString("")));
-    }
-
-    // Add assertion to report
-    report.addAssertionResult(assertionResult);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#getAssertionResult(java.lang.String)
-   */
-  public AssertionResult getAssertionResult(String assertionId)
-  {
-    // Get the assertion result from the current assertion target
-    return report.getAssertionResult(assertionId);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.WriteReport#startReport()
-   */
-  public void startReport() throws WSIException
-  {
-    // Write out start of report
-    reportWriter.write(new StringReader(report.getStartXMLString("")));
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.WriteReport#finishReport()
-   */
-  public void finishReport() throws WSIException
-  {
-    // End the report file
-    reportWriter.write(new StringReader(report.getEndXMLString("")));
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.WriteReport#finishReportWithError(java.lang.String)
-   */
-  public void finishReportWithError(String errorDetail) throws WSIException
-  {
-    // Check if entry or artifact need to be closed
-    if (this.report.getCurrentEntry() != null)
-      endCurrentEntry();
-    if (this.report.getCurrentArtifact() != null)
-      endCurrentArtifact();
-
-    // End the report file
-    reportWriter.write(
-      new StringReader(report.getErrorXMLString("", errorDetail)));
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#createAssertionResult()
-   */
-  public AssertionResult createAssertionResult()
-  {
-    return report.createAssertionResult();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#createArtifact()
-   */
-  public ReportArtifact createArtifact()
-  {
-    return report.createArtifact();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#createEntry()
-   */
-  public Entry createEntry()
-  {
-    return report.createEntry();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#createEntryContainer()
-   */
-  public EntryContainer createEntryContainer()
-  {
-    return report.createEntryContainer();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#createFailureDetail()
-   */
-  public FailureDetail createFailureDetail()
-  {
-    return report.createFailureDetail();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.WriteReport#getReport()
-   */
-  public Report getReport()
-  {
-    return this.report;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#setPrereqType(java.lang.String)
-   */
-  public void setPrereqType(String prereqType)
-  {
-    this.report.setPrereqType(prereqType);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryContainerImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryContainerImpl.java
deleted file mode 100644
index 956d086..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryContainerImpl.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2003 IBM Corporation, Parasoft and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   Parasoft - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import org.eclipse.wst.wsi.internal.core.report.EntryContainer;
-
-/**
- * This class represents a container for one or more entries.  
- * An example would be a WSDL document.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class EntryContainerImpl
-  extends EntryResultImpl
-  implements EntryContainer
-{
-  /**
-   * Container ID.
-   */
-  protected String id;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.EntryContainer#getId()
-   */
-  public String getId()
-  {
-    return this.id;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.EntryContainer#setId(String)
-   */
-  public void setId(String id)
-  {
-    this.id = id;
-  }
-
-  /**
-   * Return string representation of this object.
-   */
-  public String toString()
-  {
-    return "[" + this.id + "] " + this.assertionResultList;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java
deleted file mode 100644
index e91a1b7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java
+++ /dev/null

@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.EntryContainer;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
-/**
- * This class represents an entry in a report.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class EntryImpl extends EntryResultImpl implements Entry
-{
-  /**
-   * Entry type.
-   */
-  protected EntryType entryType = null;
-
-  /**
-   * Artifact name (optional).
-   */
-  protected String artifactName = null;
-
-  /**
-   * Reference ID.
-   */
-  protected String referenceID = null;
-
-  /**
-   * Parent element name (only used when entry type is "port" or "operation").
-   */
-  protected String parentElementName = null;
-
-  /**
-   * Entry detail object.
-   */
-  protected Object entryDetail = null;
-
-  /**
-   * Entry container.
-   */
-  protected EntryContainer entryContainer = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#getEntryType()
-   */
-  public EntryType getEntryType()
-  {
-    return this.entryType;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#setEntryType(EntryType)
-   */
-  public void setEntryType(EntryType entryType)
-  {
-    this.entryType = entryType;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#getArtifactName()
-   */
-  public String getArtifactName()
-  {
-    return this.artifactName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#setArtifactName(java.lang.String)
-   */
-  public void setArtifactName(String artifactName)
-  {
-    this.artifactName = artifactName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#getReferenceID()
-   */
-  public String getReferenceID()
-  {
-    return this.referenceID;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#setReferenceID(String)
-   */
-  public void setReferenceID(String referenceID)
-  {
-    this.referenceID = referenceID;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#getParentElementName()
-   */
-  public String getParentElementName()
-  {
-    return this.parentElementName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#setParentElementName(String)
-   */
-  public void setParentElementName(String parentElementName)
-  {
-    this.parentElementName = parentElementName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#getEntryDetail()
-   */
-  public Object getEntryDetail()
-  {
-    return this.entryDetail;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#setEntryDetail(Object)
-   */
-  public void setEntryDetail(Object entryDetail)
-  {
-    this.entryDetail = entryDetail;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#getEntryContainer()
-   */
-  public EntryContainer getEntryContainer()
-  {
-    return this.entryContainer;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#setEntryContainer(org.wsi.test.report.EntryContainer)
-   */
-  public void setEntryContainer(EntryContainer entryContainer)
-  {
-    this.entryContainer = entryContainer;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.EntryResult#addAssertionResult(AssertionResult)
-   */
-  public void addAssertionResult(AssertionResult assertionResult)
-  {
-    super.addAssertionResult(assertionResult);
-
-    if (this.entryContainer != null)
-      this.entryContainer.addAssertionResult(assertionResult);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#getStartXMLString(String)
-   */
-  public String getStartXMLString(String namespaceName, boolean showLogEntry, boolean envelopeArtifactType)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Create element 
-    pw.print("    <" + nsName + ELEM_NAME + " ");
-
-    if (this.entryType != null)
-    {
-      if (envelopeArtifactType)
-	  {
-      	// we use the same actual entry for both message and envelope artifacts
-      	// we now need to output entry type names that actually pertain to the artifact type
-      	pw.print(
-                WSIConstants.ATTR_TYPE + "=\"" + getCorrespondingEnvelopeEntryTypeName(this.entryType.getTypeName()) + "\" ");
-	  }
-	  else
-	  {
-        pw.print(
-          WSIConstants.ATTR_TYPE + "=\"" + this.entryType.getTypeName() + "\" ");
-	  }
-    }
-
-    else if (this.artifactName != null)
-    {
-      pw.print(WSIConstants.ATTR_TYPE + "=\"[" + this.artifactName + "]\" ");
-    }
-
-    if (this.referenceID != null)
-      pw.print(
-        WSIConstants.ATTR_REFERENCE_ID + "=\"" + XMLUtils.xmlEscapedString(this.referenceID) + "\"");
-
-    // If service name was set then add it
-    //if (parentElementName != null) {
-    //  pw.print(" " + WSIConstants.ATTR_PARENT_ELEMENT_NAME + "=\"" + this.parentElementName + "\"");
-    //}
-
-    // End element
-    pw.println(">");
-
-    // ADD: Need to check for config option that specifies 
-    //      that log entries should be added
-
-    // If target is a log entry, then add reference to it
-    if ((entryType != null)
-      && (entryType.getArtifactType().isMessages())
-      && (showLogEntry))
-    {
-      MessageEntry logEntry = (MessageEntry) entryDetail;
-      pw.println(logEntry.toXMLString(WSIConstants.NS_NAME_WSI_LOG));
-    }
-
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#getStartXMLString(String)
-   */
-  public String getStartXMLString(String namespaceName, boolean showLogEntry)
-  {
-  	return getStartXMLString(namespaceName, showLogEntry, false);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Entry#getEndXMLString(String)
-   */
-  public String getEndXMLString(String namespaceName)
-  {
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    return "    </" + nsName + ELEM_NAME + ">";
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    // Return string
-    return getStartXMLString("", false) + getEndXMLString("");
-  }
-
-  public String getCorrespondingEnvelopeEntryTypeName(String messageEntryTypeName)
-  {
-  	String envelopeEntryTypeName = messageEntryTypeName;
-  	if (messageEntryTypeName != null)
-  	{
-  	if (messageEntryTypeName.equals(EntryType.TYPE_MESSAGE_ANY))
-  		envelopeEntryTypeName = EntryType.TYPE_ENVELOPE_ANY;
-  	else if (messageEntryTypeName.equals(EntryType.TYPE_MESSAGE_REQUEST))
-  		envelopeEntryTypeName = EntryType.TYPE_ENVELOPE_REQUEST;
-  	else if (messageEntryTypeName.equals(EntryType.TYPE_MESSAGE_RESPONSE))
-  		envelopeEntryTypeName = EntryType.TYPE_ENVELOPE_RESPONSE;
-  	}
-
-  	return envelopeEntryTypeName;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java
deleted file mode 100644
index 61ffb72..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.util.TreeMap;
-
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.EntryResult;
-
-/**
- * Result for a specific test assertion.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public abstract class EntryResultImpl implements EntryResult
-{
-  /**
-   * Assertion result list.
-   */
-  protected TreeMap assertionResultList = new TreeMap();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.EntryResult#addAssertionResult(org.wsi.test.report.AssertionResult)
-   */
-  public void addAssertionResult(AssertionResult assertionResult)
-  {
-    this.assertionResultList.put(
-      assertionResult.getAssertion().getId(),
-      assertionResult);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.EntryResult#getAssertionResultList()
-   */
-  public TreeMap getAssertionResultList()
-  {
-    return assertionResultList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.EntryResult#getAssertionResult(String)
-   */
-  public AssertionResult getAssertionResult(String assertionId)
-  {
-    return (AssertionResult) assertionResultList.get(assertionId);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java
deleted file mode 100644
index dc7dc51..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-import com.ibm.wsdl.util.xml.DOMUtils;
-
-/**
- * This class will ...
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class FailureDetailImpl implements FailureDetail
-{
-  protected String failureMessage = null;
-  protected String referenceType = null;
-  protected String referenceID = null;
-  protected ElementLocation elementLocation = null;
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#getFailureMessage()
-   */
-  public String getFailureMessage()
-  {
-    return this.failureMessage;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#setFailureMessage(String)
-   */
-  public void setFailureMessage(String failureMessage)
-  {
-    this.failureMessage = failureMessage;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#getReferenceType()
-   */
-  public String getReferenceType()
-  {
-    return this.referenceType;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#setReferenceType(String)
-   */
-  public void setReferenceType(String referenceType)
-  {
-    this.referenceType = referenceType;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#getReferenceID()
-   */
-  public String getReferenceID()
-  {
-    return this.referenceID;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#setReferenceIDn(String)
-   */
-  public void setReferenceIDn(String referenceID)
-  {
-    this.referenceID = referenceID;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#getElementLocation()
-   */
-  public ElementLocation getElementLocation()
-  {
-    return this.elementLocation;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.FailureDetail#setElementLocation(ElementLocation)
-   */
-  public void setElementLocation(ElementLocation elementLocation)
-  {
-    this.elementLocation = elementLocation;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Create element 
-    pw.print("      <" + nsName + ELEM_NAME + " xml:lang=\"en\" ");
-
-    if (this.referenceType != null)
-      pw.print(
-        WSIConstants.ATTR_REFERENCE_TYPE + "=\"" + this.referenceType + "\" ");
-
-    if (this.referenceID != null)
-      pw.print(
-        WSIConstants.ATTR_REFERENCE_ID + "=\"" + this.referenceID + "\" ");
-
-    // ADD: Need to use a different namespace
-    /*
-    if (this.elementLocation != null) {
-      String nsNameExt = "reportext";
-      pw.print("xmlns:" + nsNameExt + "=\"" + WSIConstants.NS_URI_WSI_REPORT + "/ext/\"");
-      pw.print(nsNameExt + ":" + WSIConstants.ATTR_LINE_NUMBER + "=\"" + this.elementLocation.getLineNumber() + "\" ");
-      pw.print(nsNameExt + ":" + WSIConstants.ATTR_COLUMN_NUMBER + "=\"" + this.elementLocation.getColumnNumber() + "\" ");
-    }
-    */
-
-    // Close start element
-    pw.print(">");
-
-    if (this.failureMessage != null)
-      pw.println(DOMUtils.cleanString(this.failureMessage));
-
-    if (this.elementLocation != null)
-    {
-      pw.println(" ");
-      pw.print(this.elementLocation.toString());
-    }
-
-    // End the element
-    pw.println("      </" + nsName + ELEM_NAME + ">");
-
-    // Return string
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java
deleted file mode 100644
index eb1de20..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.report.PrereqFailedList;
-
-/**
- * This interface is used to maintain and access the Prerequisite Failed List.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class PrereqFailedListImpl implements PrereqFailedList
-{
-  /**
-   * List of test assertion IDs.
-   */
-  protected Vector idList = new Vector();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.PrereqFailedList#addTestAssertionID(java.lang.String)
-   */
-  public void addTestAssertionID(String assertionID)
-  {
-    idList.add(assertionID);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    if (this.idList.size() > 0)
-    {
-      // Create element 
-      pw.println("        <" + nsName + ELEM_NAME + ">");
-
-      // Include each test assertion ID
-      Iterator iterator = idList.iterator();
-      while (iterator.hasNext())
-      {
-        pw.print(
-          "          <" + nsName + WSIConstants.ELEM_TEST_ASSERTION_ID + ">");
-        pw.print((String) iterator.next());
-        pw.println("</" + nsName + WSIConstants.ELEM_TEST_ASSERTION_ID + ">");
-      }
-
-      // End element
-      pw.println("        </" + nsName + ELEM_NAME + ">");
-    }
-
-    return sw.toString();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportArtifactImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportArtifactImpl.java
deleted file mode 100644
index 44299b8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportArtifactImpl.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.TreeMap;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-
-/**
- * This class contains a report artifact.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ReportArtifactImpl implements ReportArtifact
-{
-  /**
-   * Artifact type.
-   */
-  protected ArtifactType artifactType = null;
-
-  /**
-   * Entries.
-   */
-  protected TreeMap entryList = new TreeMap();
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ReportArtifact#getType()
-   */
-  public ArtifactType getType()
-  {
-    return this.artifactType;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ReportArtifact#setType(ArtifactType)
-   */
-  public void setType(ArtifactType artifactType)
-  {
-    this.artifactType = artifactType;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ReportArtifact#addEntry(Entry)
-   */
-  public void addEntry(Entry entry)
-  {
-    // Add entry
-    if (entry.getEntryType() != null)
-      this.entryList.put(entry.getEntryType().getTypeName(), entry);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ReportArtifact#getEntryList()
-   */
-  public TreeMap getEntryList()
-  {
-    return this.entryList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ReportArtifact#getStartXMLString(String)
-   */
-  public String getStartXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Create element 
-    pw.print("  <" + nsName + ELEM_NAME + " ");
-    pw.print(
-      WSIConstants.ATTR_TYPE + "=\"" + this.artifactType.getTypeName() + "\">");
-
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ReportArtifact#getEndXMLString(String)
-   */
-  public String getEndXMLString(String namespaceName)
-  {
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    return "  </" + nsName + ELEM_NAME + ">";
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(String)
-   */
-  public String toXMLString(String namespaceName)
-  {
-    // Return string
-    return getStartXMLString("") + getEndXMLString("");
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportImpl.java
deleted file mode 100644
index 7db12f0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportImpl.java
+++ /dev/null

@@ -1,514 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.EntryContainer;
-import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
-import org.eclipse.wst.wsi.internal.core.report.ReportContext;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
-/**
- * WS-I conformance test report.
- *
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class ReportImpl implements Report
-{
-  /**
-   * Report filename.
-   */
-  protected String filename = null;
-
-  /**
-   * Report context.
-   */
-  protected ReportContext reportContext = null;
-
-  /**
-   * Log file.
-   */
-  protected Log log = null;
-
-  /**
-   * Summary all passed flag.
-   */
-  protected boolean allPassed = true;
-
-  /**
-   * Test coverage.
-   */
-  //protected TestCoverage testCoverage;
-
-  /**
-   * Artifact list.
-   */
-  protected Vector artifactList = new Vector();
-
-  /**
-   * Entry list.
-   */
-  protected Vector entryList = new Vector();
-
-  /**
-   * Current artifact.
-   */
-  protected ReportArtifact currentArtifact = null;
-
-  /**
-   * Current entry.
-   */
-  protected Entry currentEntry = null;
-
-  /**
-   * Prereq type.
-   */
-  protected String prereqType;
-
-  /**
-   * Create a new conformance report.
-   */
-  public ReportImpl()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.WSIDocument#getLocation()
-   */
-  public String getLocation()
-  {
-    // Get report URI
-    //return reportURI;
-    return this.filename;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.WSIDocument#setLocation(java.lang.String)
-   */
-  public void setLocation(String reportURI)
-  {
-    this.filename = reportURI;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Report#getReportContext()
-   */
-  public ReportContext getReportContext()
-  {
-    return this.reportContext;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Report#setReportContext(org.wsi.test.report.ReportContext)
-   */
-  public void setReportContext(ReportContext reportContext)
-  {
-    // Save input references
-    this.reportContext = reportContext;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Report#getCurrentArtifact()
-   */
-  public ReportArtifact getCurrentArtifact()
-  {
-    // Return artifact
-    return this.currentArtifact;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#setCurrentArtifact(org.wsi.test.report.ReportArtifact)
-   */
-  public void setCurrentArtifact(ReportArtifact artifact) throws WSIException
-  {
-    // Save reference to artifact
-    artifactList.add(artifact);
-
-    // Set as current artifact
-    this.currentArtifact = artifact;
-
-    // Set default prereq processing
-    this.prereqType = PREREQ_TYPE_ENTRY;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#endCurrentArtifact()
-   */
-  public void endCurrentArtifact() throws WSIException
-  {
-    // Remove current artifact
-    this.currentArtifact = null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#addArtifactReference(org.wsi.test.report.ArtifactReference)
-   */
-  public void addArtifactReference(ArtifactReference artifactReference)
-    throws WSIException
-  {
-    // ADD: How should this be saved?  Should it be added to the current artifact?
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Report#getCurrentEntry()
-   */
-  public Entry getCurrentEntry()
-  {
-    // Return entry
-    return this.currentEntry;
-  }
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Report#getCurrentEntry()
-   */
-  public void setCurrentEnvelopeEntry(Entry entry) throws WSIException
-  {
-    
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#setCurrentEntry(org.wsi.test.report.Entry)
-   */
-  public void setCurrentEntry(Entry entry) throws WSIException
-  {
-    // Save reference to entry
-    entryList.add(entry);
-
-    // Set as current entry
-    this.currentEntry = entry;
-  }
-
-  /**
-   * Method getEntries.
-   * @return entry list.
-   */
-  public List getEntries()
-  {
-    return entryList;
-  }
-
-  /**
-   * Method getArtifacts.
-   * @return artifacts.
-   */
-  public List getArtifacts()
-  {
-    return artifactList;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#endCurrentEntry()
-   */
-  public void endCurrentEntry() throws WSIException
-  {
-    // Remove current entry
-    this.currentEntry = null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#addAssertionResult(org.wsi.test.report.AssertionResult)
-   */
-  public void addAssertionResult(AssertionResult assertionResult)
-  {
-    // ADD: Need to keep just a summary 
-
-    // Add result to current entry
-    if (currentEntry != null)
-    {
-      currentEntry.addAssertionResult(assertionResult);
-    }
-
-    // If the result was not passed, then set summary flag
-    if (assertionResult.getResult().equals(AssertionResult.RESULT_FAILED))
-    {
-      allPassed = false;
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#getAssertionResult(java.lang.String)
-   */
-  public AssertionResult getAssertionResult(String assertionId)
-  {
-    AssertionResult result = null;
-
-    // Determine where to get the assertion result from 
-    if (this.prereqType.equals(PREREQ_TYPE_ENTRY))
-      result = currentEntry.getAssertionResult(assertionId);
-    else
-      result = currentEntry.getEntryContainer().getAssertionResult(assertionId);
-
-    // the assertion result is not found at the current entry, going through all the entries
-    if (result == null)
-    {
-      for (int i = 0; i < entryList.size(); i ++)
-      {
-        Entry entry = (Entry) entryList.get(i);
-        if ((result = entry.getAssertionResult(assertionId)) != null)
-          break;
-      }
-    }
-    return result;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#createAssertionResult()
-   */
-  public AssertionResult createAssertionResult()
-  {
-    AssertionResult assertionResult = new AssertionResultImpl();
-    assertionResult.setAssertionResultsOption(
-      reportContext
-        .getAnalyzer()
-        .getAnalyzerConfig()
-        .getAssertionResultsOption());
-    return assertionResult;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#createEntry()
-   */
-  public Entry createEntry()
-  {
-    Entry entry = new EntryImpl();
-    //entry.setAssertionResultsOption(reportContext.getAnalyzer().getAnalyzerConfig().getAssertionResultsOption());
-    return entry;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#createEntryContainer()
-   */
-  public EntryContainer createEntryContainer()
-  {
-    EntryContainer entryContainer = new EntryContainerImpl();
-    return entryContainer;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#createArtifact()
-   */
-  public ReportArtifact createArtifact()
-  {
-    ReportArtifact reportArtifact = new ReportArtifactImpl();
-    return reportArtifact;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#createFailureDetail()
-   */
-  public FailureDetail createFailureDetail()
-  {
-    FailureDetail failureDetail = new FailureDetailImpl();
-    return failureDetail;
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Report#getSummaryResult()
-   */
-  public String getSummaryResult()
-  {
-    return (
-      allPassed
-        ? AssertionResult.RESULT_PASSED
-        : AssertionResult.RESULT_FAILED);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.BuildReport#setPrereqType(java.lang.String)
-   */
-  public void setPrereqType(String prereqType)
-  {
-    this.prereqType = prereqType;
-  }
-
-  /* (non-Javadoc)
-   * @see java.lang.Object#toString()
-   */
-  public String toString()
-  {
-    // ADD: 
-    return "Report:  ";
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Report#getStartXMLString(java.lang.String)
-   */
-  public String getStartXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Create report element 
-    pw.println(WSIConstants.XML_DECL);
-    pw.println(
-      reportContext
-        .getAnalyzer()
-        .getAnalyzerConfig()
-        .getAddStyleSheet()
-        .getStyleSheetString());
-
-    // Add XML comment
-    String comment;
-    if ((comment = TestUtils.getXMLComment()) != null)
-      pw.print(comment);
-
-    // report
-    pw.print(
-      "<"
-        + nsName
-        + ELEM_NAME
-        + " "
-        + WSIConstants.ATTR_NAME
-        + "=\""
-        + reportContext.getReportTitle()
-        + "\"");
-    pw.println(
-      "    "
-        + WSIConstants.ATTR_TIMESTAMP
-        + "=\""
-        + Utils.getTimestamp()
-        + "\"");
-    pw.println("    xmlns=\"" + WSIConstants.NS_URI_WSI_REPORT + "\"");
-    pw.println(
-      "    xmlns:"
-        + WSIConstants.NS_NAME_WSI_REPORT
-        + "=\""
-        + WSIConstants.NS_URI_WSI_REPORT
-        + "\"");
-    pw.println(
-      "    xmlns:"
-        + WSIConstants.NS_NAME_WSI_LOG
-        + "=\""
-        + WSIConstants.NS_URI_WSI_LOG
-        + "\"");
-    //pw.println("    xmlns:" + WSIConstants.NS_NAME_WSI_COMMON + "=\"" + WSIConstants.NS_URI_WSI_COMMON + "\"");
-    pw.println(
-      "    xmlns:"
-        + WSIConstants.NS_NAME_WSI_ANALYZER_CONFIG
-        + "=\""
-        + WSIConstants.NS_URI_WSI_ANALYZER_CONFIG
-        + "\"");
-    pw.println(
-      "    xmlns:"
-        + WSIConstants.NS_NAME_WSI_MONITOR_CONFIG
-        + "=\""
-        + WSIConstants.NS_URI_WSI_MONITOR_CONFIG
-        + "\"");
-    pw.println(
-      "    xmlns:"
-        + WSIConstants.NS_NAME_WSI_ASSERTIONS
-        + "=\""
-        + WSIConstants.NS_URI_WSI_ASSERTIONS
-        + "\"");
-    pw.println(
-      "    xmlns:"
-        + WSIConstants.NS_NAME_XSI
-        + "=\""
-        + WSIConstants.NS_URI_XSI
-        + "\">");
-
-    // Add  analyzer tool info
-    pw.print(reportContext.getAnalyzer().toXMLString(nsName));
-
-    // Return XML string
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Report#getEndXMLString(java.lang.String)
-   */
-  public String getEndXMLString(String namespaceName)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Build summary
-    pw.print("  <" + nsName + WSIConstants.ELEM_SUMMARY + " ");
-    pw.println(WSIConstants.ATTR_RESULT + "=\"" + getSummaryResult() + "\">");
-
-    // ADD:  Detail summary
-    /*
-    pw.print("    <" + nsName + WSIConstants.ELEM_ARTIFACT_SUMMARY + " ");
-    pw.println(WSIConstants.ATTR_RESULT + "=\"xxxx\">");
-    
-    pw.println("    </" + nsName + WSIConstants.ELEM_ARTIFACT_SUMMARY + ">");
-    */
-
-    // End element 
-    pw.println("  </" + nsName + WSIConstants.ELEM_SUMMARY + ">");
-
-    // End report element 
-    pw.println("</" + nsName + ELEM_NAME + ">");
-
-    // Return XML string
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.Report#getErrorXMLString(java.lang.String, java.lang.String)
-   */
-  public String getErrorXMLString(String namespaceName, String errorDetail)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    String nsName = namespaceName;
-    if ((!nsName.equals("") && (!nsName.endsWith(":"))))
-      nsName += ":";
-
-    // Build analyzer failure
-    pw.println("  <" + nsName + WSIConstants.ELEM_ANALYZER_FAILURE + ">");
-
-    // Add error detail
-    pw.print("    <" + nsName + WSIConstants.ELEM_FAILURE_DETAIL + ">");
-    pw.print(XMLUtils.xmlEscapedString(errorDetail));
-    pw.println("    </" + nsName + WSIConstants.ELEM_FAILURE_DETAIL + ">");
-
-    // End report element 
-    pw.println("</" + nsName + WSIConstants.ELEM_ANALYZER_FAILURE + ">");
-
-    // End report element 
-    pw.println("</" + nsName + ELEM_NAME + ">");
-
-    // Return XML string
-    return sw.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentElement#toXMLString(java.lang.String)
-   */
- public String toXMLString(String namespaceName)
-  {
-    return getStartXMLString(namespaceName) + getEndXMLString(namespaceName);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportWriterImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportWriterImpl.java
deleted file mode 100644
index 73eeb35..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ReportWriterImpl.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.report.impl;
-
-import java.io.PrintWriter;
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.document.impl.DocumentWriterImpl;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.report.ReportWriter;
-
-/**
- * Defines the interface used to write the Conformance XML documents.
- * 
- * @version 1.0.1
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class ReportWriterImpl
-  extends DocumentWriterImpl
-  implements ReportWriter
-{
-  /**
-   * Report writer.
-   */
-  public ReportWriterImpl()
-  {
-  }
-
-  /**
-   * Write the entire contents of the document using the writer
-   * that was previously set using the setWriter method.
-   */
-  public void write(Report report) throws IllegalStateException
-  {
-    // If writer was not set previously, then throw exception
-    if (writer == null)
-    {
-      throw new IllegalStateException("Report writer must be set before writing report.");
-    }
-
-    // Write report
-    write(report, this.writer);
-  }
-
-  /**
-   * Write the entire contents of the document.
-   */
-  public void write(Report report, Writer writer)
-  {
-    // Create print writer
-    new PrintWriter(writer);
-
-    // ADD: Write out complete report
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/toolinfo.properties b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/toolinfo.properties
deleted file mode 100644
index a1304c5..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/toolinfo.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-# /**
-#  * <copyright>
-#  *
-#  * Copyright (c) 2002-2003  IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM      - Initial API and implementation
-#  * </copyright>
-#  */
-
-wsi.tool.version=1.0.0
-wsi.tool.release.date=2005-04-15
-wsi.tool.implementer=Eclipse.org Organization
-wsi.tool.location=http://www.eclipse.org/wst

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java
deleted file mode 100644
index 80bdd4c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-/**
- * This class ...
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ArtifactType
-{
-  /**
-   * This type.
-   */
-  private String type;
-
-  /**
-   * ReportArtifact types.
-   */
-  public static final String TYPE_ENVELOPE = "envelope";
-  public static final String TYPE_MESSAGE = "message";
-  public static final String TYPE_DESCRIPTION = "description";
-  public static final String TYPE_DISCOVERY = "discovery";
-
-  /**
-   * ReportArtifact types.
-   */
-  public static final ArtifactType ARTIFACT_TYPE_ENVELOPE =
-    new ArtifactType(TYPE_ENVELOPE);
-  public static final ArtifactType ARTIFACT_TYPE_MESSAGE =
-    new ArtifactType(TYPE_MESSAGE);
-  public static final ArtifactType ARTIFACT_TYPE_DESCRIPTION =
-    new ArtifactType(TYPE_DESCRIPTION);
-  public static final ArtifactType ARTIFACT_TYPE_DISCOVERY =
-    new ArtifactType(TYPE_DISCOVERY);
-
-  /**
-   * Create artifact type.
-   */
-  private ArtifactType(String type)
-  {
-    this.type = type;
-  }
-
-  /**
-   * Is artifact type envelope.
-   * @return true if artifact type envelope.
-   */
-  public boolean isEnvelope()
-  {
-    return type.equals(TYPE_ENVELOPE);
-  }
-
-  /**
-   * Is artifact type messages.
-   * @return true if artifact type messages.
-   */
-  public boolean isMessages()
-  {
-    return type.equals(TYPE_MESSAGE);
-  }
-
-  /**
-   * Is artifact type description.
-   * @return true if artifact type description.
-   */
-  public boolean isDescription()
-  {
-    return type.equals(TYPE_DESCRIPTION);
-  }
-
-  /**
-   * Is artifact type discovery.
-   * @return true if artifact type discovery.
-   */
-  public boolean isDiscovery()
-  {
-    return type.equals(TYPE_DISCOVERY);
-  }
-
-  /**
-   * Get artifact type.
-   * @return artifact type.
-   */
-  public String getTypeName()
-  {
-    return type;
-  }
-
-  /**
-   * Create artifact type.
-   * @param typeName artifact type name.
-   * @return newly created artifact type.
-   * @throws RuntimeException if artifact type name is invalid or inappropriate.
-   */
-  public static final ArtifactType newArtifactType(String typeName)
-    throws RuntimeException
-  {
-    ArtifactType artifactType = null;
-
-    if (typeName.equals(TYPE_DESCRIPTION))
-    {
-      artifactType = ARTIFACT_TYPE_DESCRIPTION;
-    }
-
-    else if (typeName.equals(TYPE_MESSAGE))
-    {
-      artifactType = ARTIFACT_TYPE_MESSAGE;
-    }
-
-    else if (typeName.equals(TYPE_ENVELOPE))
-    {
-      artifactType = ARTIFACT_TYPE_ENVELOPE;
-    }
-
-    else if (typeName.equals(TYPE_DISCOVERY))
-    {
-      artifactType = ARTIFACT_TYPE_DISCOVERY;
-    }
-
-    else
-    {
-      throw new RuntimeException(
-        "Could not create new artifact type using invalid type name: "
-          + typeName
-          + ".");
-    }
-
-    return artifactType;
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/BasicRules.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/BasicRules.java
deleted file mode 100644
index d232b0e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/BasicRules.java
+++ /dev/null

@@ -1,477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-/**
- * This class validates basic constructs of RFC 2616.
- * 
- * @author Volodin
- */
-public class BasicRules
-{
-
-  public static final char CR = 13;
-  public static final char LF = 10;
-  public static final char SP = 32;
-  public static final char HT = 9;
-  public static final char DQ = 34;
-  public static final String CRLF = "" + CR + LF;
-
-  public static final char[] SEPARATORS =
-    {
-      '(',
-      ')',
-      '<',
-      '>',
-      '@',
-      ',',
-      ';',
-      ':',
-      '\\',
-      '\"',
-      '/',
-      '[',
-      ']',
-      '?',
-      '=',
-      '{',
-      '}',
-      SP,
-      HT };
-
-  /**
-   * Checking rule.
-   * 		OCTET = &lt;any 8-bit sequence of data&gt;
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isOCTET(char ch)
-  {
-    return true;
-  }
-
-  /**
-   * Checking rule:
-   * 		CHAR = &lt;any US-ASCII character (octets 0 - 127)&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isCHAR(char ch)
-  {
-    return (ch >= 0 && ch <= 127) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		UPALPHA = &lt;any US-ASCII uppercase letter "A".."Z"&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isUPALPHA(char ch)
-  {
-    return (ch >= 'A' && ch <= 'Z') ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		LOALPHA = &lt;any US-ASCII lowercase letter "a".."z"&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isLOALPHA(char ch)
-  {
-    return (ch >= 'a' && ch <= 'z') ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		ALPHA = UPALPHA | LOALPHA.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isALPHA(char ch)
-  {
-    return (isLOALPHA(ch) || isUPALPHA(ch)) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		DIGIT = &lt;any US-ASCII digit "0".."9"&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isDIGIT(char ch)
-  {
-    return (ch >= '0' && ch <= '9') ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		CTL = &lt;any US-ASCII control character (octets 0 - 31) and DEL (127)&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isCTL(char ch)
-  {
-    return ((ch >= 0 && ch <= 31) || ch == 127) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		CR = &lt;US-ASCII CR, carriage return (13)&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isCR(char ch)
-  {
-    return (ch == CR) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		LF = &lt;US-ASCII LF, linefeed (10)&gt;.
-   * @param ch character
-   * @return boolean true if ch is conform to rule, false otherwise
-   */
-  public static boolean isLF(char ch)
-  {
-    return (ch == LF) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		SP = &lt;US-ASCII SP, space (32)&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isSP(char ch)
-  {
-    return (ch == SP) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		HT = &lt;US-ASCII HT, horizontal-tab (9)&gt;.
-   * @param ch character
-   * @return boolean true if ch is conform to rule, false otherwise
-   */
-  public static boolean isHT(char ch)
-  {
-    return (ch == HT) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		&lt;"&gt; = &lt;US-ASCII double-quote mark (34)&gt;.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isDoubleQuote(char ch)
-  {
-    return (ch == DQ) ? true : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		CRLF = CR LF.
-   * @param str string.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isCRLF(String str)
-  {
-    return CRLF.equals(str);
-  }
-
-  /**
-   * Checking rule:
-   * 		LWS = [CRLF] 1*( SP | HT ).
-   * @param str string.
-   * @return boolean true if str is conform to rule, false otherwise.
-   */
-  public static boolean isLWS(String str)
-  {
-
-    int index = getLastIndexLWS(str, 0);
-    if (index == -1 || index != str.length())
-      return false;
-
-    return true;
-  }
-
-  /**
-   * Gets last index of the LWS string.
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't LWS.
-   */
-  public static int getLastIndexLWS(String str, int startIndex)
-  {
-    int index = str.indexOf(CRLF, startIndex);
-    if (index == -1)
-      index = startIndex;
-    else if (index == startIndex)
-      index += CRLF.length();
-    else
-      return -1;
-
-    if (!isSP(str.charAt(index)) && isHT(str.charAt(index)))
-      return -1;
-
-    index++;
-    for (; index < str.length(); index++)
-      if (!isSP(str.charAt(index)) && isHT(str.charAt(index)))
-        return index;
-    return index;
-  }
-
-  /**
-   * Gets last index of the TEXT string.
-   * TEXT = &lt;any OCTET except CTLs, but including LWS&gt;
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't TEXT.
-   */
-  public static int getLastTEXT(String str, int startIndex)
-  {
-    int index;
-    for (index = startIndex; index < str.length(); index++)
-    {
-      if (!isOCTET(str.charAt(index)))
-        return index;
-      if (isCTL(str.charAt(index)))
-      {
-        int lastLWS = getLastIndexLWS(str, index);
-        if (lastLWS == -1)
-          return index;
-        index = lastLWS - 1;
-      }
-    }
-    return index;
-  }
-
-  /**
-   * Checking rule:
-   * 		HEX = "A" | "B" | "C" | "D" | "E" | "F" | "a" | "b" | "c" | "d" | "e" | "f" | DIGIT.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isHEX(char ch)
-  {
-    return (
-      (ch >= 'A' && ch <= 'F') || (ch >= 'a' && ch <= 'f') || isDIGIT(ch))
-      ? true
-      : false;
-  }
-
-  /**
-   * Checking rule:
-   * 		token = 1*&lt;any CHAR except CTLs or separators&gt;.
-   * @param str string.
-   * @return boolean true if str is conform to rule, false otherwise.
-   */
-  public static boolean isToken(String str)
-  {
-    if (str.length() == 0)
-      return false;
-
-    for (int index = 0; index < str.length(); index++)
-    {
-      char ch = str.charAt(index);
-      if (!isCHAR(ch) || isSEPARATOR(ch) || isCTL(ch))
-        return false;
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Gets last index of the "token" string.
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't "token".
-   */
-  public static int getLastToken(String str, int startIndex)
-  {
-    int index = startIndex;
-    for (; index < str.length(); index++)
-    {
-      char ch = str.charAt(index);
-      if (!isCHAR(ch) || isSEPARATOR(ch) || isCTL(ch))
-        return index;
-
-    }
-    return index;
-  }
-
-  /**
-   * Checking rule:
-   * 		separators = "(" | ")" | "<" | ">" | "@"
-     *                 | "," | ";" | ":" | "\" | <">
-     *                 | "/" | "[" | "]" | "?" | "="
-     *                 | "{" | "}" | SP | HT.
-   * @param ch character.
-   * @return boolean true if ch is conform to rule, false otherwise.
-   */
-  public static boolean isSEPARATOR(char ch)
-  {
-    for (int index = 0; index < SEPARATORS.length; index++)
-    {
-      if (ch == SEPARATORS[index])
-        return true;
-    }
-    return false;
-  }
-
-  /**
-   * Gets last index of the "comment" string.
-   * 		comment = "(" *( ctext | quoted-pair | comment ) ")".
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't "comment".
-   */
-  public static int getLastComment(String str, int startIndex)
-  {
-
-    int index = startIndex;
-    if (str.length() <= startIndex)
-      return startIndex;
-    if (str.charAt(index) != '(')
-      return startIndex;
-
-    boolean bExit = false;
-    boolean bQuotedPair = false;
-    int idx = startIndex + 1;
-    while (bExit == false)
-    {
-      while (bQuotedPair == false)
-      {
-        idx = getLastCtext(str, idx);
-        if (idx == str.length())
-          return idx;
-        if (!isQuotedPair(str, idx - 1))
-          bQuotedPair = true;
-        else
-          idx++;
-      }
-      if (str.charAt(idx) == '(')
-      {
-        getLastComment(str, idx);
-      }
-      else if (str.charAt(idx) == ')')
-      {
-        return idx + 1;
-      }
-    }
-
-    return idx;
-  }
-
-  /**
-   * Gets last index of the "ctext" string.
-   * 		ctext = &lt;any TEXT excluding "(" and ")"&gt;
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't "ctext".
-   */
-  private static int getLastCtext(String str, int startIndex)
-  {
-    int idx = getLastTEXT(str, startIndex);
-    int iBracket = startIndex;
-    for (; iBracket < idx; iBracket++)
-    {
-      if (str.charAt(iBracket) == '(' || str.charAt(iBracket) == ')')
-        break;
-    }
-    if (iBracket < idx)
-      idx = iBracket;
-    return idx;
-  }
-
-  /**
-   * Gets last index of the "qdtext" string.
-   * 		qdtext = &lt;any TEXT except &lt;"&gt;&gt;
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't "qdtext".
-   */
-  private static int getLastQdtext(String str, int startIndex)
-  {
-    int idx = getLastTEXT(str, startIndex);
-    int iBracket = startIndex;
-    for (; iBracket < idx; iBracket++)
-    {
-      if (str.charAt(iBracket) == '\"')
-        break;
-    }
-    if (iBracket < idx)
-      idx = iBracket;
-    return idx;
-  }
-
-  /**
-   * Checking rule:
-   * 		quoted-pair = "\" CHAR.
-   * @param str string.
-   * @param startIndex start index.
-   * @return boolean true if str is conform to rule, false otherwise.
-   */
-  public static boolean isQuotedPair(String str, int startIndex)
-  {
-    if (str.length() >= startIndex + 2
-      && str.charAt(startIndex) == '\\'
-      && isCHAR(str.charAt(startIndex + 1)))
-      return true;
-    else
-      return false;
-  }
-
-  /**
-   * Gets last index of the "quoted-string" string.
-   * 		quoted-string  = ( &lt;"&gt; *(qdtext | quoted-pair ) &lt;"&gt; )
-   * @param str string.
-   * @param startIndex start index.
-   * @return int an index of the first symbol which isn't "quoted-string".
-   */
-  public static int getLastQuotedString(String str, int startIndex)
-  {
-    int index = startIndex;
-
-    // if end if the string
-    if (startIndex == str.length())
-      return startIndex;
-    // if the begin is not '"'
-    if (str.charAt(index) != DQ)
-      return startIndex;
-
-    index++;
-    while (true)
-    {
-      index = getLastQdtext(str, index);
-      if (index == str.length())
-        return startIndex;
-      if (isQuotedPair(str, index - 1))
-      {
-        index++;
-        if (index == str.length())
-          return startIndex;
-      }
-      else
-        break;
-    }
-    // if the end is not '"'
-    if (str.charAt(index) != DQ)
-      return startIndex;
-
-    index++;
-    return index;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/EntryType.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/EntryType.java
deleted file mode 100644
index 3b27731..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/EntryType.java
+++ /dev/null

@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.TreeMap;
-import java.util.Vector;
-
-/**
- * This class ...
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class EntryType
-{
-  /**
-   * ReportArtifact type.
-   */
-  private ArtifactType artifactType;
-
-  /**
-   * This type.
-   */
-  private String typeName;
-
-  /**
-   * Entry types accessible by type name.
-   */
-  protected static final TreeMap entryTypeMap = new TreeMap();
-
-  /**
-   * Entry type names accessible by artifact.
-   */
-  protected static final TreeMap entryTypeNameMap = new TreeMap();
-  static {
-    entryTypeNameMap.put(ArtifactType.TYPE_ENVELOPE, new Vector());
-    entryTypeNameMap.put(ArtifactType.TYPE_MESSAGE, new Vector());
-    entryTypeNameMap.put(ArtifactType.TYPE_DESCRIPTION, new Vector());
-    entryTypeNameMap.put(ArtifactType.TYPE_DISCOVERY, new Vector());
-  }
-
-  /**
-   * Envelope entry types.
-   */
-  public static final String TYPE_ENVELOPE_REQUEST = "requestEnvelope";
-  public static final String TYPE_ENVELOPE_RESPONSE = "responseEnvelope";
-  public static final String TYPE_ENVELOPE_ANY = "anyEnvelope";
-
-  /**
-   * Message entry types.
-   */
-  public static final String TYPE_MESSAGE_REQUEST = "requestMessage";
-  public static final String TYPE_MESSAGE_RESPONSE = "responseMessage";
-  public static final String TYPE_MESSAGE_ANY = "anyMessage";
-
-  /**
-   * MIME entry types.
-   */
-  public static final String TYPE_MIME_PART = "part";
-  public static final String TYPE_MIME_ROOT_PART = "root-part";
-
-  /**
-   * Description entry types.
-   */
-  public static final String TYPE_DESCRIPTION_DEFINITIONS = "definitions";
-  public static final String TYPE_DESCRIPTION_IMPORT = "import";
-  public static final String TYPE_DESCRIPTION_TYPES = "types";
-  public static final String TYPE_DESCRIPTION_MESSAGE = "message";
-  public static final String TYPE_DESCRIPTION_OPERATION = "operation";
-  public static final String TYPE_DESCRIPTION_PORTTYPE = "portType";
-  public static final String TYPE_DESCRIPTION_BINDING = "binding";
-  public static final String TYPE_DESCRIPTION_PORT = "port";
-
-  /**
-   * Discovery entry types.
-   */
-  public static final String TYPE_DISCOVERY_BINDINGTEMPLATE = "bindingTemplate";
-  public static final String TYPE_DISCOVERY_TMODEL = "tModel";
-
-  /**
-   * Envelope entry types.
-   */
-  public static final EntryType ENTRY_TYPE_REQUESTENV =
-    newEntryType(ArtifactType.ARTIFACT_TYPE_ENVELOPE, TYPE_ENVELOPE_REQUEST);
-  public static final EntryType ENTRY_TYPE_RESPONSEENV =
-    newEntryType(ArtifactType.ARTIFACT_TYPE_ENVELOPE, TYPE_ENVELOPE_RESPONSE);
-
-  /**
-   * Message entry types.
-   */
-  public static final EntryType ENTRY_TYPE_REQUEST =
-    newEntryType(ArtifactType.ARTIFACT_TYPE_MESSAGE, TYPE_MESSAGE_REQUEST);
-  public static final EntryType ENTRY_TYPE_RESPONSE =
-    newEntryType(ArtifactType.ARTIFACT_TYPE_MESSAGE, TYPE_MESSAGE_RESPONSE);
-  //  public static final EntryType ENTRY_TYPE_ANYENTRY = 
-  //        new EntryType(ArtifactType.ARTIFACT_TYPE_MESSAGES, TYPE_MESSAGE_ANYENTRY);
-
-  /**
-   * Description entry types.
-   */
-  public static final EntryType ENTRY_TYPE_DEFINITIONS =
-    newEntryType(
-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
-      TYPE_DESCRIPTION_DEFINITIONS);
-  public static final EntryType ENTRY_TYPE_IMPORT =
-    newEntryType(
-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
-      TYPE_DESCRIPTION_IMPORT);
-  public static final EntryType ENTRY_TYPE_TYPES =
-    newEntryType(
-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
-      TYPE_DESCRIPTION_TYPES);
-  public static final EntryType ENTRY_TYPE_MESSAGE =
-    newEntryType(
-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
-      TYPE_DESCRIPTION_MESSAGE);
-  public static final EntryType ENTRY_TYPE_OPERATION =
-    newEntryType(
-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
-      TYPE_DESCRIPTION_OPERATION);
-  public static final EntryType ENTRY_TYPE_PORTTYPE =
-    newEntryType(
-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
-      TYPE_DESCRIPTION_PORTTYPE);
-  public static final EntryType ENTRY_TYPE_BINDING =
-    newEntryType(
-      ArtifactType.ARTIFACT_TYPE_DESCRIPTION,
-      TYPE_DESCRIPTION_BINDING);
-  public static final EntryType ENTRY_TYPE_PORT =
-    newEntryType(ArtifactType.ARTIFACT_TYPE_DESCRIPTION, TYPE_DESCRIPTION_PORT);
-
-  /**
-   * Discovery entry types.
-   */
-  public static final EntryType ENTRY_TYPE_BINDINGTEMPLATE =
-    newEntryType(
-      ArtifactType.ARTIFACT_TYPE_DISCOVERY,
-      TYPE_DISCOVERY_BINDINGTEMPLATE);
-  public static final EntryType ENTRY_TYPE_TMODEL =
-    newEntryType(ArtifactType.ARTIFACT_TYPE_DISCOVERY, TYPE_DISCOVERY_TMODEL);
-
-  /**
-   * Create entry type.
-   */
-  private EntryType(ArtifactType artifactType, String typeName)
-  {
-    this.artifactType = artifactType;
-    this.typeName = typeName;
-  }
-
-  /**
-   * Is entry type equal to specified type.
-   * @param typeName entry type name.
-   * @return true if entry type equal to specified type.
-   */
-  public boolean isType(String typeName)
-  {
-    return this.typeName.equals(typeName);
-  }
-
-  /**
-   * Is entry type equal to specified type.
-   * @param entryType entry type.
-   * @return true if entry type equal to specified type.
-   */
-  public boolean isType(EntryType entryType)
-  {
-    return typeName.equals(entryType.getTypeName());
-  }
-
-  /**
-   * Get artifact type.
-   * @return artifact type.
-   */
-  public ArtifactType getArtifactType()
-  {
-    return artifactType;
-  }
-
-  /**
-   * Get entry type name.
-   * @return entry type name.
-   */
-  public String getTypeName()
-  {
-    return typeName;
-  }
-
-  /**
-   * Is valid entry type.
-   * @param typeName entry type name.
-   * @return true if entry type name is valid.
-   */
-  public static final boolean isValidEntryType(String typeName)
-  {
-    return (entryTypeMap.get(typeName) == null ? false : true);
-  }
-
-  /**
-   * Create entry type.
-   * @param typeName entry type name.
-   * @return entry type.
-   * @throws RuntimeException if entry type name is invalid or inappropriate.
-   */
-  public static final EntryType getEntryType(String typeName)
-    throws RuntimeException
-  {
-    // Get the entry type by type name
-    EntryType entryType = (EntryType) entryTypeMap.get(typeName);
-
-    if (entryType == null)
-    {
-      throw new RuntimeException(
-        "Could not get entry type because type name is invalid: "
-          + typeName
-          + ".");
-    }
-
-    return entryType;
-  }
-
-  /**
-   * Get list of entry type names for a specified artifact type name.
-   * @param artifactTypeName artifact type name.
-   * @return list of entry type names for a specified artifact type name.
-   * @throws RuntimeException if entry type name is invalid or inappropriate.
-   */
-  public static final Vector getEntryTypeNameList(String artifactTypeName)
-    throws RuntimeException
-  {
-    // Get list
-    Vector entryTypeNameList = (Vector) entryTypeNameMap.get(artifactTypeName);
-
-    // If the list was not found, then throw an exception
-    if (entryTypeNameList == null)
-    {
-      throw new RuntimeException(
-        "Could not get entry type name list because artifact type name is invalid: "
-          + artifactTypeName
-          + ".");
-    }
-
-    return entryTypeNameList;
-  }
-
-  /**
-   * Get list of type names for a specified artifact type name.
-   */
-  private static final EntryType newEntryType(
-    ArtifactType artifactType,
-    String typeName)
-  {
-    EntryType entryType = null;
-
-    // Create entry type
-    entryType = new EntryType(artifactType, typeName);
-
-    // Add to entry type map
-    entryTypeMap.put(typeName, entryType);
-
-    // Get the entry type name vector for the artifact type
-    Vector entryTypeNameList =
-      (Vector) entryTypeNameMap.get(artifactType.getTypeName());
-
-    // Add the type name to the list
-    entryTypeNameList.add(typeName);
-
-    return entryType;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/ErrorList.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/ErrorList.java
deleted file mode 100644
index e9597f4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/ErrorList.java
+++ /dev/null

@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.text.FieldPosition;
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-/**
- * The class accumulates all error strings into string buffer.
- * 
- * @author Kulik
- */
-public final class ErrorList
-{
-  private Set errors = new HashSet();
-  private MessageFormat format = new MessageFormat("{0}:{1}");
-  private FieldPosition pos = new FieldPosition(0);
-
-  /**
-   * Default constructor.
-   * @see java.lang.Object#Object()
-   */
-  public ErrorList()
-  {
-  }
-
-  /**
-   * Construct error list using contents of a list.
-   * @param list a List object.
-   * @see java.lang.Object#Object()
-   */
-  public ErrorList(List list)
-  {
-    add(list);
-  }
-
-  /**
-   * Constructor with the specified message format.
-   * @param f a message format.
-   */
-  public ErrorList(MessageFormat f)
-  {
-    if (f != null)
-      format = f;
-  }
-
-  /**
-   * Add list. 
-   * @param list list of errors.
-   */
-  public void add(List list)
-  {
-    Iterator iterator = list.iterator();
-    while (iterator.hasNext())
-    {
-      add((String) iterator.next());
-    }
-  }
-
-  /**
-   * Adds error description into the list. 
-   * @param s1 a string.
-   * @param s2 a string.
-   */
-  public void add(String s1, String s2)
-  {
-    errors.add(new Pair(s1, s2));
-  }
-
-  /**
-   * Adds error description into the list.
-   * @param q a QName object.
-   * @param s a string.
-   */
-  public void add(QName q, String s)
-  {
-    errors.add(new Pair(NullUtil.toString(q), s));
-  }
-
-  /**
-   * Adds error description into the list.
-   * @param q1 a QName object.
-   * @param q2 a string.
-   */
-  public void add(QName q1, QName q2)
-  {
-    errors.add(new Pair(NullUtil.toString(q1), NullUtil.toString(q2)));
-  }
-
-  /**
-   * Adds error description into the list...
-   * @param q a QName object.
-   */
-  public void add(QName q)
-  {
-    errors.add(new Pair(NullUtil.toString(q), null));
-  }
-
-  /**
-   * Adds error description into the list.
-   * @param s a string.
-   */
-  public void add(String s)
-  {
-    errors.add(new Pair(s, null));
-  }
-
-  /**
-   * Returns the error list string representation. 
-   * @return the error list string representation. 
-   * @see java.lang.Object#toString()
-   */
-  public String toString()
-  {
-    StringBuffer buf = new StringBuffer();
-
-    Iterator it = errors.iterator();
-    while (it.hasNext())
-    {
-      Pair p = (Pair) it.next();
-      if (p.getFirst() != null && p.getSecond() != null)
-        format.format(new Object[] { p.getFirst(), p.getSecond()}, buf, pos);
-      else if (p.getFirst() != null)
-        buf.append(p.getFirst());
-      else
-        buf.append(p.getSecond());
-      if (it.hasNext())
-        buf.append(",\n");
-    }
-
-    return buf.toString();
-  }
-
-  /**
-   * Indicates whether error list is empty or not.
-   * @return true if error list is empty.
-   */
-  public boolean isEmpty()
-  {
-    return errors.size() == 0;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HTTPConstants.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HTTPConstants.java
deleted file mode 100644
index 34b0533..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HTTPConstants.java
+++ /dev/null

@@ -1,600 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * A set of HTTP values that are defined by Network Working Group.
- * http://www.ietf.org/
- *
- * @version 1.0
- * @author Ilya Kanonirov (kio@isg.axmor.com)
- */
-public class HTTPConstants {
-  // The standardized HTTP Header field-names
-  // http://www.mnot.net/drafts/draft-nottingham-http-header-reg-00.txt
-
-  // Hypertext Transfer Protocol -- HTTP/1.1 (obsoletes RFC2068)
-  public static final String HEADER_ACCEPT = "Accept";
-  public static final String HEADER_ACCEPT_CHARSET = "Accept-Charset";
-  public static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding";
-  public static final String HEADER_ACCEPT_LANGUAGE = "Accept-Language";
-  public static final String HEADER_ACCEPT_RANGES = "Accept-Ranges";
-  public static final String HEADER_AGE = "Age";
-  public static final String HEADER_ALLOW = "Allow";
-  public static final String HEADER_AUTHORIZATION = "Authorization";
-  public static final String HEADER_CACHE_CONTROL = "Cache-Control";
-  public static final String HEADER_CONNECT = "Connect";
-  public static final String HEADER_CONTENT_ENCODING = "Content-Encoding";
-  public static final String HEADER_CONTENT_LANGUAGE = "Content-Language";
-  public static final String HEADER_CONTENT_LENGTH = "Content-Length";
-  public static final String HEADER_CONTENT_LOCATION = "Content-Location";
-  public static final String HEADER_CONTENT_MD5 = "Content-MD5";
-  public static final String HEADER_CONTENT_RANGE = "Content-Range";
-  public static final String HEADER_CONTENT_TYPE = "Content-Type";
-  public static final String HEADER_DATE = "Date";
-  public static final String HEADER_ETAG = "ETag";
-  public static final String HEADER_EXPECT = "Expect";
-  public static final String HEADER_EXPIRES = "Expires";
-  public static final String HEADER_FROM = "From";
-  public static final String HEADER_HOST = "Host";
-  public static final String HEADER_IF_MATCH = "If-Match";
-  public static final String HEADER_IF_MODIFIED_SINCE = "If-Modified-Since";
-  public static final String HEADER_IF_NONE_MATCH = "If-None-Match";
-  public static final String HEADER_IF_RANGE = "If-Range";
-  public static final String HEADER_IF_UNMODIFIED_SINCE = "If-Unmodified-Since";
-  public static final String HEADER_LAST_MODIFIED = "Last-Modified";
-  public static final String HEADER_LOCATION = "Location";
-  public static final String HEADER_MAX_FORWARDS = "Max-Forwards";
-  public static final String HEADER_PRAGMA = "Pragma";
-  public static final String HEADER_PROXY_AUTHENTICATE = "Proxy-Authenticate";
-  public static final String HEADER_PROXY_AUTHORIZATION = "Proxy-Authorization";
-  public static final String HEADER_RANGE = "Range";
-  public static final String HEADER_REFERER = "Referer";
-  public static final String HEADER_RETRY_AFTER = "Retry-After";
-  public static final String HEADER_SERVER = "Server";
-  public static final String HEADER_TE = "TE";
-  public static final String HEADER_TRAILER = "Trailer";
-  public static final String HEADER_TRANSFER_ENCODING = "Transfer-Encoding";
-  public static final String HEADER_UPGRADE = "Upgrade";
-  public static final String HEADER_USER_AGENT = "User-Agent";
-  public static final String HEADER_VARY = "Vary";
-  public static final String HEADER_VIA = "Via";
-  public static final String HEADER_WARNING = "Warning";
-  public static final String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
-  public static final String HEADER_MIME_VERSION = "MIME-Version";
-  public static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition";  
-
-  // HTTP Authentication: Basic and Digest Access Authentication
-  public static final String HEADER_AUTHENTICATION_INFO = "Authentication-Info";
-
-  // HTTP State Management Mechanism
-  public static final String HEADER_SET_COOKIE = "Set-Cookie";
-
-  // HTTP State Management Mechanism (obsoletes RFC2109)
-  public static final String HEADER_COOKIE = "Cookie";
-  public static final String HEADER_COOKIE2 = "Cookie2";
-  public static final String HEADER_SET_COOKIE2 = "Set-Cookie2";
-
-  // Web Distributed Authoring and Versioning
-  public static final String HEADER_DAV = "DAV";
-  public static final String HEADER_DEPTH = "Depth";
-  public static final String HEADER_DESTINATION = "Destination";
-  public static final String HEADER_IF = "If";
-  public static final String HEADER_LOCK_TOKEN = "Lock-Token";
-  public static final String HEADER_OVERWRITE = "Overwrite";
-  public static final String HEADER_STATUS_URI = "Status-URI";
-  public static final String HEADER_TIMEOUT = "Timeout";
-
-  // Hypertext Transfer Protocol -- HTTP/1.1 (Proposed Standard - these field-names are now considered obsolete)
-  public static final String HEADER_CONTENT_BASE = "Content-Base";
-  public static final String HEADER_PUBLIC = "Public";
-  public static final String HEADER_CONTENT_VERSION = "Content-Version";
-  public static final String HEADER_DERIVED_FROM = "Derived-From";
-  public static final String HEADER_LINK = "Link";
-  public static final String HEADER_URI = "URI";
-  public static final String HEADER_KEEP_ALIVE = "Keep-Alive";
-
-  // Delta Encoding in HTTP
-  public static final String HEADER_A_IM = "A-IM";
-  public static final String HEADER_DELTA_BASE = "Delta-Base";
-  public static final String HEADER_IM = "IM";
-
-  // Instance Digests in HTTP
-  public static final String HEADER_DIGEST = "Digest";
-  public static final String HEADER_WANT_DIGEST = "Want-Digest";
-
-  // Simple Hit-Metering and Usage-Limiting for HTTP
-  public static final String HEADER_METER = "Meter";
-
-  // The Known Non-Standardized HTTP Header field-names
-
-  // Transparent Content Negotiation in HTTP
-  public static final String HEADER_ACCEPT_FEATURES = "Accept-Features";
-  public static final String HEADER_ALTERNATES = "Alternates";
-  public static final String HEADER_NEGOTIATE = "Negotiate";
-  public static final String HEADER_TCN = "TCN";
-  public static final String HEADER_VARIANT_VARY = "Variant-Vary";
-
-  // The Safe Response Header Field
-  public static final String HEADER_SAFE = "Safe";
-
-  // Hyper Text Coffee Pot Control Protocol (HTCPCP/1.0)
-  public static final String HEADER_ACCEPT_ADDITIONS = "Accept-Additions";
-
-  // The Secure HyperText Transfer Protocol
-  public static final String HEADER_CONTENT_PRIVACY_DOMAIN = "Content-Privacy-Domain";
-  public static final String HEADER_MAC_INFO = "MAC-Info";
-  public static final String HEADER_PREARRANGED_KEY_INFO = "Prearranged-Key-Info";
-
-  // An HTTP Extension Framework
-  public static final String HEADER_C_EXT = "C-Ext";
-  public static final String HEADER_C_MAN = "C-Man";
-  public static final String HEADER_C_OPT = "C-Opt";
-  public static final String HEADER_EXT = "Ext";
-  public static final String HEADER_MAN = "Man";
-  public static final String HEADER_OPT = "Opt";
-
-  // PICS Label Distribution Label Syntax and Communication Protocols
-  public static final String HEADER_PICS_LABEL = "PICS-Label";
-
-  // Platform For Privacy Preferences 1.0
-  public static final String HEADER_P3P = "P3P";
-
-  // PEP - an Extension Mechanism for HTTP
-  public static final String HEADER_C_PEP = "C-PEP";
-  public static final String HEADER_C_PEP_INFO = "C-PEP-Info";
-  public static final String HEADER_PEP = "PEP";
-  public static final String HEADER_PEP_INFO = "Pep-Info";
-
-  // The HTTP Distribution and Replication Protocol
-  public static final String HEADER_CONTENT_ID = "Content-ID";
-  public static final String HEADER_DIFFERENTIAL_ID = "Differential-ID";
-
-  // ESI Architecture
-  public static final String HEADER_SURROGATE_CAPABILITY = "Surrogate-Capability";
-  public static final String HEADER_SURROGATE_CONTROL = "Surrogate-Control";
-
-  // Selecting Payment Mechanisms Over HTTP
-  public static final String HEADER_PROTOCOL = "Protocol";
-  public static final String HEADER_PROTOCOL_INFO = "Protocol-Info";
-  public static final String HEADER_PROTOCOL_QUERY = "Protocol-Query";
-  public static final String HEADER_PROTOCOL_REQUEST = "Protocol-Request";
-
-  // Implementation of OPS Over HTTP
-  public static final String HEADER_GETPROFILE = "GetProfile";
-  public static final String HEADER_PROFILEOBJECT = "ProfileObject";
-  public static final String HEADER_SETPROFILE = "SetProfile";
-
-  // Notification for Proxy Caches
-  public static final String HEADER_PROXY_FEATURES = "Proxy-Features";
-  public static final String HEADER_PROXY_INSTRUCTION = "Proxy-Instruction";
-
-  // Object Header lines in HTTP
-  public static final String HEADER_CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
-  public static final String HEADER_COST = "Cost";
-  public static final String HEADER_MESSAGE_ID = "Message-ID";
-  public static final String HEADER_TITLE = "Title";
-  public static final String HEADER_VERSION = "Version";
-
-  // A Proposed Extension Mechanism for HTTP
-  public static final String HEADER_EXTENSION = "Extension";
-
-  // WIRE - W3 Identifier Resolution Extensions
-  public static final String HEADER_OPTIONAL = "Optional";
-  public static final String HEADER_RESOLUTION_HINT = "Resolution-Hint";
-
-  // Duplicate Suppression in HTTP
-  public static final String HEADER_SUBOK = "SubOK";
-  public static final String HEADER_SUBST = "Subst";
-
-  // Specification of HTTP/1.1 OPTIONS messages
-  public static final String HEADER_COMPLIANCE = "Compliance";
-  public static final String HEADER_NON_COMPLIANCE = "Non-Compliance";
-
-  // Widely-used undocumented headers
-  public static final String HEADER_REQUEST_RANGE = "Request-Range";
-  public static final String HEADER_UA_COLOR = "UA-Color";
-  public static final String HEADER_UA_CPU = "UA-CPU";
-  public static final String HEADER_UA_OS = "UA-OS";
-  public static final String HEADER_UA_PIXELS = "UA-Pixels";
-
-  // Implementation errors
-  public static final String HEADER_REFERRER = "Referrer";
-
-  // Private features
-  public static final String HEADER_COPYRIGHT = "Copyright";
-  public static final String HEADER_CONTENT = "Content";
-  public static final String HEADER_AUTHOR = "Author";
-  public static final String HEADER_CONTACT = "Contact";
-  public static final String HEADER_KEYWORDS = "Keywords";
-  public static final String HEADER_GENERATOR = "Generator";
-  public static final String HEADER_DESCRIPTION = "Description";
-  public static final String HEADER_COMMAND = "Command";
-  public static final String HEADER_SESSION = "Session";
-  public static final String HEADER_TYPE = "Type";
-  public static final String HEADER_MESSAGE = "Message";
-
-  // Abandoned proposals
-  public static final String HEADER_UNLESS_MODIFIED_SINCE = "Unless-Modified-Since";
-
-  /**
-   * Returns all the standardized HTTP header names presented as List
-   * @return The list of standardized HTTP header names
-   */
-  public static List getStandardizedHeaderNames() {
-    return Arrays.asList(new Object[] {
-      HEADER_ACCEPT.toUpperCase(),
-      HEADER_ACCEPT_CHARSET.toUpperCase(),
-      HEADER_ACCEPT_ENCODING.toUpperCase(),
-      HEADER_ACCEPT_LANGUAGE.toUpperCase(),
-      HEADER_ACCEPT_RANGES.toUpperCase(),
-      HEADER_AGE.toUpperCase(),
-      HEADER_ALLOW.toUpperCase(),
-      HEADER_AUTHORIZATION.toUpperCase(),
-      HEADER_CACHE_CONTROL.toUpperCase(),
-      HEADER_CONNECT.toUpperCase(),
-      HEADER_CONTENT_ENCODING.toUpperCase(),
-      HEADER_CONTENT_LANGUAGE.toUpperCase(),
-      HEADER_CONTENT_LENGTH.toUpperCase(),
-      HEADER_CONTENT_LOCATION.toUpperCase(),
-      HEADER_CONTENT_MD5.toUpperCase(),
-      HEADER_CONTENT_RANGE.toUpperCase(),
-      HEADER_CONTENT_TYPE.toUpperCase(),
-      HEADER_DATE.toUpperCase(),
-      HEADER_ETAG.toUpperCase(),
-      HEADER_EXPECT.toUpperCase(),
-      HEADER_EXPIRES.toUpperCase(),
-      HEADER_FROM.toUpperCase(),
-      HEADER_HOST.toUpperCase(),
-      HEADER_IF_MATCH.toUpperCase(),
-      HEADER_IF_MODIFIED_SINCE.toUpperCase(),
-      HEADER_IF_NONE_MATCH.toUpperCase(),
-      HEADER_IF_RANGE.toUpperCase(),
-      HEADER_IF_UNMODIFIED_SINCE.toUpperCase(),
-      HEADER_LAST_MODIFIED.toUpperCase(),
-      HEADER_LOCATION.toUpperCase(),
-      HEADER_MAX_FORWARDS.toUpperCase(),
-      HEADER_PRAGMA.toUpperCase(),
-      HEADER_PROXY_AUTHENTICATE.toUpperCase(),
-      HEADER_PROXY_AUTHORIZATION.toUpperCase(),
-      HEADER_RANGE.toUpperCase(),
-      HEADER_REFERER.toUpperCase(),
-      HEADER_RETRY_AFTER.toUpperCase(),
-      HEADER_SERVER.toUpperCase(),
-      HEADER_TE.toUpperCase(),
-      HEADER_TRAILER.toUpperCase(),
-      HEADER_TRANSFER_ENCODING.toUpperCase(),
-      HEADER_UPGRADE.toUpperCase(),
-      HEADER_USER_AGENT.toUpperCase(),
-      HEADER_VARY.toUpperCase(),
-      HEADER_VIA.toUpperCase(),
-      HEADER_WARNING.toUpperCase(),
-      HEADER_WWW_AUTHENTICATE.toUpperCase(),
-      HEADER_MIME_VERSION.toUpperCase(),
-      HEADER_CONTENT_DISPOSITION.toUpperCase(),
-
-      HEADER_AUTHENTICATION_INFO.toUpperCase(),
-
-      HEADER_SET_COOKIE.toUpperCase(),
-
-      HEADER_COOKIE.toUpperCase(),
-      HEADER_COOKIE2.toUpperCase(),
-      HEADER_SET_COOKIE2.toUpperCase(),
-
-      HEADER_DAV.toUpperCase(),
-      HEADER_DEPTH.toUpperCase(),
-      HEADER_DESTINATION.toUpperCase(),
-      HEADER_IF.toUpperCase(),
-      HEADER_LOCK_TOKEN.toUpperCase(),
-      HEADER_OVERWRITE.toUpperCase(),
-      HEADER_STATUS_URI.toUpperCase(),
-      HEADER_TIMEOUT.toUpperCase(),
-
-      HEADER_CONTENT_BASE.toUpperCase(),
-      HEADER_PUBLIC.toUpperCase(),
-      HEADER_CONTENT_VERSION.toUpperCase(),
-      HEADER_DERIVED_FROM.toUpperCase(),
-      HEADER_LINK.toUpperCase(),
-      HEADER_URI.toUpperCase(),
-      HEADER_KEEP_ALIVE.toUpperCase(),
-
-      HEADER_A_IM.toUpperCase(),
-      HEADER_DELTA_BASE.toUpperCase(),
-      HEADER_IM.toUpperCase(),
-
-      HEADER_DIGEST.toUpperCase(),
-      HEADER_WANT_DIGEST.toUpperCase(),
-
-      HEADER_METER.toUpperCase()
-    });
-  }
-
-  /**
-   * Returns all the non-standardized HTTP header names presented as List
-   * @return The list of non-standardized HTTP header names
-   */
-  public static List getNonStandardizedHeaderNames() {
-    return Arrays.asList(new Object[] {
-      HEADER_ACCEPT_FEATURES.toUpperCase(),
-      HEADER_ALTERNATES.toUpperCase(),
-      HEADER_NEGOTIATE.toUpperCase(),
-      HEADER_TCN.toUpperCase(),
-      HEADER_VARIANT_VARY.toUpperCase(),
-
-      HEADER_SAFE.toUpperCase(),
-
-      HEADER_ACCEPT_ADDITIONS.toUpperCase(),
-
-      HEADER_CONTENT_PRIVACY_DOMAIN.toUpperCase(),
-      HEADER_MAC_INFO.toUpperCase(),
-      HEADER_PREARRANGED_KEY_INFO.toUpperCase(),
-
-      HEADER_C_EXT.toUpperCase(),
-      HEADER_C_MAN.toUpperCase(),
-      HEADER_C_OPT.toUpperCase(),
-      HEADER_EXT.toUpperCase(),
-      HEADER_MAN.toUpperCase(),
-      HEADER_OPT.toUpperCase(),
-
-      HEADER_PICS_LABEL.toUpperCase(),
-      HEADER_PROTOCOL.toUpperCase(),
-      HEADER_PROTOCOL_REQUEST.toUpperCase(),
-
-      HEADER_P3P.toUpperCase(),
-
-      HEADER_C_PEP.toUpperCase(),
-      HEADER_C_PEP_INFO.toUpperCase(),
-      HEADER_PEP.toUpperCase(),
-      HEADER_PEP_INFO.toUpperCase(),
-
-      HEADER_CONTENT_ID.toUpperCase(),
-      HEADER_DIFFERENTIAL_ID.toUpperCase(),
-
-      HEADER_SURROGATE_CAPABILITY.toUpperCase(),
-      HEADER_SURROGATE_CONTROL.toUpperCase(),
-
-      HEADER_PROTOCOL.toUpperCase(),
-      HEADER_PROTOCOL_INFO.toUpperCase(),
-      HEADER_PROTOCOL_QUERY.toUpperCase(),
-      HEADER_PROTOCOL_REQUEST.toUpperCase(),
-
-      HEADER_GETPROFILE.toUpperCase(),
-      HEADER_PROFILEOBJECT.toUpperCase(),
-      HEADER_SETPROFILE.toUpperCase(),
-
-      HEADER_PROXY_FEATURES.toUpperCase(),
-      HEADER_PROXY_INSTRUCTION.toUpperCase(),
-
-      HEADER_CONTENT_TRANSFER_ENCODING.toUpperCase(),
-      HEADER_COST.toUpperCase(),
-      HEADER_MESSAGE_ID.toUpperCase(),
-      HEADER_TITLE.toUpperCase(),
-      HEADER_VERSION.toUpperCase(),
-
-      HEADER_EXTENSION.toUpperCase(),
-
-      HEADER_OPTIONAL.toUpperCase(),
-      HEADER_RESOLUTION_HINT.toUpperCase(),
-
-      HEADER_SUBOK.toUpperCase(),
-      HEADER_SUBST.toUpperCase(),
-
-      HEADER_COMPLIANCE.toUpperCase(),
-      HEADER_NON_COMPLIANCE.toUpperCase(),
-
-      HEADER_REQUEST_RANGE.toUpperCase(),
-      HEADER_UA_COLOR.toUpperCase(),
-      HEADER_UA_CPU.toUpperCase(),
-      HEADER_UA_OS.toUpperCase(),
-      HEADER_UA_PIXELS.toUpperCase(),
-
-      HEADER_REFERRER.toUpperCase(),
-
-      HEADER_COPYRIGHT.toUpperCase(),
-      HEADER_CONTENT.toUpperCase(),
-      HEADER_AUTHOR.toUpperCase(),
-      HEADER_CONTACT.toUpperCase(),
-      HEADER_KEYWORDS.toUpperCase(),
-      HEADER_GENERATOR.toUpperCase(),
-      HEADER_DESCRIPTION.toUpperCase(),
-      HEADER_COMMAND.toUpperCase(),
-      HEADER_SESSION.toUpperCase(),
-      HEADER_TYPE.toUpperCase(),
-      HEADER_MESSAGE.toUpperCase(),
-
-      HEADER_UNLESS_MODIFIED_SINCE.toUpperCase()
-    });
-  }
-
-  /**
-   * Returns all known HTTP header names presented as List
-   * @return The list of all known HTTP header names
-   */
-  public static List getAllKnownHeaderNames() {
-    return Arrays.asList(new Object[] {
-      HEADER_ACCEPT.toUpperCase(),
-      HEADER_ACCEPT_CHARSET.toUpperCase(),
-      HEADER_ACCEPT_ENCODING.toUpperCase(),
-      HEADER_ACCEPT_LANGUAGE.toUpperCase(),
-      HEADER_ACCEPT_RANGES.toUpperCase(),
-      HEADER_AGE.toUpperCase(),
-      HEADER_ALLOW.toUpperCase(),
-      HEADER_AUTHORIZATION.toUpperCase(),
-      HEADER_CACHE_CONTROL.toUpperCase(),
-      HEADER_CONNECT.toUpperCase(),
-      HEADER_CONTENT_ENCODING.toUpperCase(),
-      HEADER_CONTENT_LANGUAGE.toUpperCase(),
-      HEADER_CONTENT_LENGTH.toUpperCase(),
-      HEADER_CONTENT_LOCATION.toUpperCase(),
-      HEADER_CONTENT_MD5.toUpperCase(),
-      HEADER_CONTENT_RANGE.toUpperCase(),
-      HEADER_CONTENT_TYPE.toUpperCase(),
-      HEADER_DATE.toUpperCase(),
-      HEADER_ETAG.toUpperCase(),
-      HEADER_EXPECT.toUpperCase(),
-      HEADER_EXPIRES.toUpperCase(),
-      HEADER_FROM.toUpperCase(),
-      HEADER_HOST.toUpperCase(),
-      HEADER_IF_MATCH.toUpperCase(),
-      HEADER_IF_MODIFIED_SINCE.toUpperCase(),
-      HEADER_IF_NONE_MATCH.toUpperCase(),
-      HEADER_IF_RANGE.toUpperCase(),
-      HEADER_IF_UNMODIFIED_SINCE.toUpperCase(),
-      HEADER_LAST_MODIFIED.toUpperCase(),
-      HEADER_LOCATION.toUpperCase(),
-      HEADER_MAX_FORWARDS.toUpperCase(),
-      HEADER_PRAGMA.toUpperCase(),
-      HEADER_PROXY_AUTHENTICATE.toUpperCase(),
-      HEADER_PROXY_AUTHORIZATION.toUpperCase(),
-      HEADER_RANGE.toUpperCase(),
-      HEADER_REFERER.toUpperCase(),
-      HEADER_RETRY_AFTER.toUpperCase(),
-      HEADER_SERVER.toUpperCase(),
-      HEADER_TE.toUpperCase(),
-      HEADER_TRAILER.toUpperCase(),
-      HEADER_TRANSFER_ENCODING.toUpperCase(),
-      HEADER_UPGRADE.toUpperCase(),
-      HEADER_USER_AGENT.toUpperCase(),
-      HEADER_VARY.toUpperCase(),
-      HEADER_VIA.toUpperCase(),
-      HEADER_WARNING.toUpperCase(),
-      HEADER_WWW_AUTHENTICATE.toUpperCase(),
-      HEADER_MIME_VERSION.toUpperCase(),
-      HEADER_CONTENT_DISPOSITION.toUpperCase(),
-
-      HEADER_AUTHENTICATION_INFO.toUpperCase(),
-
-      HEADER_SET_COOKIE.toUpperCase(),
-
-      HEADER_COOKIE.toUpperCase(),
-      HEADER_COOKIE2.toUpperCase(),
-      HEADER_SET_COOKIE2.toUpperCase(),
-
-      HEADER_DAV.toUpperCase(),
-      HEADER_DEPTH.toUpperCase(),
-      HEADER_DESTINATION.toUpperCase(),
-      HEADER_IF.toUpperCase(),
-      HEADER_LOCK_TOKEN.toUpperCase(),
-      HEADER_OVERWRITE.toUpperCase(),
-      HEADER_STATUS_URI.toUpperCase(),
-      HEADER_TIMEOUT.toUpperCase(),
-
-      HEADER_CONTENT_BASE.toUpperCase(),
-      HEADER_PUBLIC.toUpperCase(),
-      HEADER_CONTENT_VERSION.toUpperCase(),
-      HEADER_DERIVED_FROM.toUpperCase(),
-      HEADER_LINK.toUpperCase(),
-      HEADER_URI.toUpperCase(),
-      HEADER_KEEP_ALIVE.toUpperCase(),
-
-      HEADER_A_IM.toUpperCase(),
-      HEADER_DELTA_BASE.toUpperCase(),
-      HEADER_IM.toUpperCase(),
-
-      HEADER_DIGEST.toUpperCase(),
-      HEADER_WANT_DIGEST.toUpperCase(),
-
-      HEADER_METER.toUpperCase(),
-
-      HEADER_ACCEPT_FEATURES.toUpperCase(),
-      HEADER_ALTERNATES.toUpperCase(),
-      HEADER_NEGOTIATE.toUpperCase(),
-      HEADER_TCN.toUpperCase(),
-      HEADER_VARIANT_VARY.toUpperCase(),
-
-      HEADER_SAFE.toUpperCase(),
-
-      HEADER_ACCEPT_ADDITIONS.toUpperCase(),
-
-      HEADER_CONTENT_PRIVACY_DOMAIN.toUpperCase(),
-      HEADER_MAC_INFO.toUpperCase(),
-      HEADER_PREARRANGED_KEY_INFO.toUpperCase(),
-
-      HEADER_C_EXT.toUpperCase(),
-      HEADER_C_MAN.toUpperCase(),
-      HEADER_C_OPT.toUpperCase(),
-      HEADER_EXT.toUpperCase(),
-      HEADER_MAN.toUpperCase(),
-      HEADER_OPT.toUpperCase(),
-
-      HEADER_PICS_LABEL.toUpperCase(),
-      HEADER_PROTOCOL.toUpperCase(),
-      HEADER_PROTOCOL_REQUEST.toUpperCase(),
-
-      HEADER_P3P.toUpperCase(),
-
-      HEADER_C_PEP.toUpperCase(),
-      HEADER_C_PEP_INFO.toUpperCase(),
-      HEADER_PEP.toUpperCase(),
-      HEADER_PEP_INFO.toUpperCase(),
-
-      HEADER_CONTENT_ID.toUpperCase(),
-      HEADER_DIFFERENTIAL_ID.toUpperCase(),
-
-      HEADER_SURROGATE_CAPABILITY.toUpperCase(),
-      HEADER_SURROGATE_CONTROL.toUpperCase(),
-
-      HEADER_PROTOCOL.toUpperCase(),
-      HEADER_PROTOCOL_INFO.toUpperCase(),
-      HEADER_PROTOCOL_QUERY.toUpperCase(),
-      HEADER_PROTOCOL_REQUEST.toUpperCase(),
-
-      HEADER_GETPROFILE.toUpperCase(),
-      HEADER_PROFILEOBJECT.toUpperCase(),
-      HEADER_SETPROFILE.toUpperCase(),
-
-      HEADER_PROXY_FEATURES.toUpperCase(),
-      HEADER_PROXY_INSTRUCTION.toUpperCase(),
-
-      HEADER_CONTENT_TRANSFER_ENCODING.toUpperCase(),
-      HEADER_COST.toUpperCase(),
-      HEADER_MESSAGE_ID.toUpperCase(),
-      HEADER_TITLE.toUpperCase(),
-      HEADER_VERSION.toUpperCase(),
-
-      HEADER_EXTENSION.toUpperCase(),
-
-      HEADER_OPTIONAL.toUpperCase(),
-      HEADER_RESOLUTION_HINT.toUpperCase(),
-
-      HEADER_SUBOK.toUpperCase(),
-      HEADER_SUBST.toUpperCase(),
-
-      HEADER_COMPLIANCE.toUpperCase(),
-      HEADER_NON_COMPLIANCE.toUpperCase(),
-
-      HEADER_REQUEST_RANGE.toUpperCase(),
-      HEADER_UA_COLOR.toUpperCase(),
-      HEADER_UA_CPU.toUpperCase(),
-      HEADER_UA_OS.toUpperCase(),
-      HEADER_UA_PIXELS.toUpperCase(),
-
-      HEADER_REFERRER.toUpperCase(),
-
-      HEADER_COPYRIGHT.toUpperCase(),
-      HEADER_CONTENT.toUpperCase(),
-      HEADER_AUTHOR.toUpperCase(),
-      HEADER_CONTACT.toUpperCase(),
-      HEADER_KEYWORDS.toUpperCase(),
-      HEADER_GENERATOR.toUpperCase(),
-      HEADER_DESCRIPTION.toUpperCase(),
-      HEADER_COMMAND.toUpperCase(),
-      HEADER_SESSION.toUpperCase(),
-      HEADER_TYPE.toUpperCase(),
-      HEADER_MESSAGE.toUpperCase(),
-
-      HEADER_UNLESS_MODIFIED_SINCE.toUpperCase()
-    });
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HTTPUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HTTPUtils.java
deleted file mode 100644
index 735e435..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HTTPUtils.java
+++ /dev/null

@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-
-/**
- * Set of HTTPL related utilities.
- *
- * @version 1.0.1
- * @author Peter Brittenham
- */
-
-public final class HTTPUtils
-{
-
-  /**
-   * Find the URL string in a HTTP POST header.
-   * @param httpPostHeader  a HTTP POST header. 
-   * @return the URL string in a HTTP POST header.
-   */
-  public static String getURLString(String httpPostHeader)
-  {
-    String urlString = null;
-    int start, end;
-
-    // If POST, then continue
-    if (httpPostHeader.startsWith("POST") || httpPostHeader.startsWith("GET"))
-    {
-      // Start after first space
-      start = httpPostHeader.indexOf(' ') + 1;
-
-      // Look for next non-space character
-      while (httpPostHeader.charAt(start) == ' ')
-        start++;
-
-      // Find next space character
-      end = httpPostHeader.indexOf(' ', start);
-
-      // Get URL string which is located in between start and end
-      urlString = httpPostHeader.substring(start, end);
-    }
-
-    // Else throw exception
-    else
-    {
-      throw new IllegalArgumentException(
-        "HTTP header does not contain POST data (was: " + httpPostHeader + ")");
-    }
-
-    // Return URL string
-    return urlString;
-  }
-  /**
-   * Utility to present HTTP header information as attribute-value pairs, 
-   * based on ':' as attribute-value separator.
-   * @param httpHeaderString an HTTP header string.
-   * @param separators attribute-value separator list.
-   * @return HTTP header information as attribute-value pairs.
-   * @throws WSIException if unable to create HTTP header information 
-   *         as attribute-value pairs.
-   */
-  public static Map getHttpHeaderTokens(String httpHeaderString, String separators)
-    throws WSIException
-  {
-    StringTokenizer tokenizer = new StringTokenizer(httpHeaderString, "\n\r\f");
-    Map map = new HashMap();
-    String name = null;
-    while (tokenizer.hasMoreTokens())
-    {
-      String line = tokenizer.nextToken();
-      int index = line.indexOf(separators);
-      if (index > 0 && index < line.length() - 1)
-      {
-      	name = line.substring(0, index).toUpperCase();
-        map.put(name, line.substring(index + 1).trim());
-      }
-      else
-      {
-        if ((name != null) && (line.length()>0) && Character.isWhitespace(line.charAt(0)))
-           map.put(name, map.get(name) + " " + line.trim());
-      }
-    }
-    return map;
-  }
-  
-  /**
-   * Utility to take sub attribute value from HTTP header
-   * @param httpHeaderString an HTTP header string.
-   * @param attributeName attribute name.
-   * @param subAttributeName sub attribute name.
-   * @return sub attribute value from HTTP header.
-   * @throws WSIException if unable to get sub attribute value from HTTP header. 
-   */
-  public static String getHttpHeaderSubAttribute(String httpHeaderString, 
-      String attributeName, String subAttributeName)
-    throws WSIException
-  {
-    // get attribute value
-    String value = 
-      (String) getHttpHeaderTokens(httpHeaderString,":").get(attributeName.toUpperCase());
-    if(value != null)
-    {
-      // search sub attribute token
-      int idxQ = value.toUpperCase().indexOf(subAttributeName.toUpperCase()+"=\"");
-      int idx = value.toUpperCase().indexOf(subAttributeName.toUpperCase()+"=");
-      // if attribute is quoted
-      if (idxQ != -1) 
-      {
-        idxQ += (subAttributeName+"=\"").length();
-        int eIdxQ = value.indexOf("\"", idxQ);
-        if (eIdxQ != -1)
-        {
-          return value.substring(idxQ, eIdxQ);
-        }
-        else 
-        {
-          return null;
-        }
-      }
-      // if attribute do not quoted
-      else if (idx != -1)
-      {
-        idx += (subAttributeName+"=").length();
-        int eIdx = -1;
-        // find end space separator
-        if ((eIdx = value.indexOf(" ", idx)) != -1)
-        {
-          return value.substring(idx, eIdx);
-        }
-        // find coma separator
-        else if ((eIdx = value.indexOf(";", idx)) != -1)
-        {
-          return value.substring(idx, eIdx);
-        }
-        // this is last attribute
-        else 
-        {
-          return value.substring(idx);
-        }
-      }
-      // if attribute do not found
-      else 
-      {
-        return null;
-      }
-    }
-    return value;
-  }
-
-  /**
-   * Utility to take attribute value from HTTP header
-   * @param httpHeaderString an HTTP header string.
-   * @param attributeName attribute name.
-   * @return attribute value from HTTP header.
-   * @throws WSIException if unable to get attribute value from HTTP header. 
-   */
-  public static String getHttpHeaderAttribute(String httpHeaderString, 
-      String attributeName)
-    throws WSIException
-  {
-    String attributeValue = 
-        (String) getHttpHeaderTokens(httpHeaderString,":").get(attributeName.toUpperCase());
-    // get first token
-    if((attributeValue != null) && (attributeValue.indexOf(";") != -1)) {
-      attributeValue = attributeValue.substring(0, attributeValue.indexOf(";"));
-    }
-    return attributeValue;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HttpHeadersValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HttpHeadersValidator.java
deleted file mode 100644
index 3c68a88..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/HttpHeadersValidator.java
+++ /dev/null

@@ -1,1720 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-import sun.net.www.MessageHeader;
-
-/**
- * This class checks HTTP request headers about RFC 2616.
- *
- * @author Volodin 
- */
-public class HttpHeadersValidator
-{
-
-  private static final String HEADER_ALLOW = "Allow";
-  private static final String HEADER_CONTENT_TYPE = "Content-Type";
-  private static final String HEADER_CONTENT_ENCODING = "Content-Encoding";
-  private static final String HEADER_CONTENT_LANGUAGE = "Content-Language";
-  private static final String HEADER_CONTENT_LENGHT = "Content-Length";
-  private static final String HEADER_CONTENT_LOCATION = "Content-Location";
-  private static final String HEADER_CONTENT_RANGE = "Content-Range";
-  private static final String HEADER_EXPIRES = "Expires";
-  private static final String HEADER_LAST_MODIFIED = "Last-Modified";
-  private static final String HEADER_CACHE_CONTROL = "Cache-Control";
-  private static final String HEADER_CONNECTION = "Connection";
-  private static final String HEADER_DATE = "Date";
-  private static final String HEADER_PRAGMA = "Pragma";
-  private static final String HEADER_TRAILER = "Trailer";
-  private static final String HEADER_TRANSFER_ENCODING = "Transfer-Encoding";
-
-  private static final String HEADER_UPGRADE = "Upgrade";
-  private static final String HEADER_VIA = "Via";
-  private static final String HEADER_WARNING = "Warning";
-
-  private static final String HEADER_ACCEPT = "Accept";
-  private static final String HEADER_ACCEPT_CHARSET = "Accept-Charset";
-  private static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding";
-  private static final String HEADER_ACCEPT_LANGUAGE = "Accept-Language";
-  private static final String HEADER_AUTHORIZATION = "Authorization";
-  private static final String HEADER_EXPECT = "Expect";
-  private static final String HEADER_FROM = "From";
-  private static final String HEADER_HOST = "Host";
-  private static final String HEADER_IF_MATCH = "If-Match";
-  private static final String HEADER_IF_MODIFIED_SINCE = "If-Modified-Since";
-  private static final String HEADER_IF_NONE_MATCH = "If-None-Match";
-  private static final String HEADER_IF_RANGE = "If-Range";
-  private static final String HEADER_IF_UNMODIFIED_SINCE =
-    "If-Unmodified-Since";
-  private static final String HEADER_MAX_FORWARDS = "Max-Forwards";
-  private static final String HEADER_PROXY_AUTHORIZATION =
-    "Proxy-Authorization";
-  private static final String HEADER_RANGE = "Range";
-  private static final String HEADER_REFERER = "Referer";
-  private static final String HEADER_TE = "TE";
-  private static final String HEADER_USER_AGENT = "User-Agent";
-
-  /**
-   * This class checks e-mail string about RFC 822.
-   */
-  public static class MailboxValidator
-  {
-    private static final char[] SPECIAL =
-      { '(', ')', '<', '>', '@', ',', ';', ':', '\\', '\"', '.', '[', ']' };
-
-    /**
-    	* Validates e-mail string.
-    * @param mailbox e-mail string
-    * @return boolean  true if e-mail string is conform to RFC 822, false otherwise.
-    */
-
-    public static boolean validateMailbox(String mailbox)
-    {
-
-      if (!isFullAddr(mailbox) && !isShortAddr(mailbox))
-        return false;
-
-      return true;
-    }
-
-    /**
-     * Method isSimpleAddr.
-     * @param mailbox
-     * @return boolean
-     */
-    private static boolean isShortAddr(String mailbox)
-    {
-      int indexAt = mailbox.indexOf('@');
-      if (indexAt == -1)
-        return false;
-
-      if (!isLocalPart(mailbox.substring(0, indexAt))
-        || !isDomain(mailbox.substring(indexAt + 1)))
-        return false;
-
-      return true;
-    }
-
-    /**
-     * Method isDomaim.
-     * @param string
-     * return boolean
-     */
-    private static boolean isDomain(String string)
-    {
-      if (string.trim().length() == 0)
-        return false;
-      StringTokenizer st = new StringTokenizer(string, ".");
-      while (st.hasMoreTokens())
-      {
-        String subDomain = st.nextToken();
-        if (!isAtom(subDomain) && !isDomainLiteral(subDomain))
-          return false;
-
-      }
-      return true;
-    }
-
-    /**
-     * Method isDomainLiteral.
-     * @param subDomain
-     * @return boolean
-     */
-    private static boolean isDomainLiteral(String subDomain)
-    {
-      if (getLastDomainLiteral(subDomain, 0) == subDomain.length())
-      {
-        return true;
-      }
-      else
-      {
-        return false;
-      }
-    }
-
-    private static int getLastDomainLiteral(String str, int startIndex)
-    {
-
-      int index = startIndex;
-      //int newIndex = 0;
-
-      // if end if the string
-      if (startIndex == str.length())
-        return startIndex;
-      // if the begin is not '['
-      if (str.charAt(index) != '[')
-        return startIndex;
-
-      index++;
-      while (true)
-      {
-        index = getLastDtext(str, index);
-        if (index == str.length())
-          return startIndex;
-        if (BasicRules.isQuotedPair(str, index - 1))
-        {
-          index++;
-          if (index == str.length())
-            return startIndex;
-        }
-        else
-          break;
-      }
-      // if the end is not ']'
-      if (str.charAt(index) != ']')
-        return startIndex;
-
-      index++;
-      return index;
-    }
-
-    private static int getLastDtext(String str, int startIndex)
-    {
-      if (str.length() == startIndex)
-        return startIndex;
-      int i = 0;
-      for (; i < str.length(); i++)
-      {
-        char ch = str.charAt(i);
-        i = BasicRules.getLastIndexLWS(str, i);
-        if (!BasicRules.isCHAR(ch)
-          || str.charAt(i) == '['
-          || str.charAt(i) == ']'
-          || str.charAt(i) == '\\'
-          || str.charAt(i) == BasicRules.CR)
-        {
-          return i + 1;
-        }
-      }
-      return i + 1;
-    }
-
-    /**
-     * Method isLocalPart.
-     * @param string
-     * @return boolean
-     */
-    private static boolean isLocalPart(String string)
-    {
-      if (string.trim().length() == 0)
-        return false;
-      StringTokenizer st = new StringTokenizer(string, ".");
-      while (st.hasMoreTokens())
-      {
-        if (!isWord(st.nextToken()))
-          return false;
-      }
-      return true;
-    }
-
-    /**
-     * Method isWord.
-     * @param string
-     * @return boolean
-     */
-    private static boolean isWord(String string)
-    {
-      if (!isAtom(string) && !isQuotedString(string))
-        return false;
-      return true;
-    }
-
-    /**
-     * Method isAtom.
-     * @param string
-     * @return boolean
-     */
-    private static boolean isAtom(String string)
-    {
-      if (string.length() == 0)
-        return false;
-      for (int i = 0; i < string.length(); i++)
-      {
-        if (!BasicRules.isCHAR(string.charAt(i))
-          || isSpecial(string.charAt(i))
-          || string.charAt(i) == ' '
-          || BasicRules.isCTL(string.charAt(i)))
-        {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    /**
-     * Method isSpecial.
-     * @param c
-     * @return boolean
-     */
-    private static boolean isSpecial(char ch)
-    {
-      for (int index = 0; index < SPECIAL.length; index++)
-      {
-        if (ch == SPECIAL[index])
-          return true;
-      }
-      return false;
-    }
-
-    /**
-     * Method isFullAddr.
-     * @param mailbox
-     * @return boolean
-     */
-    private static boolean isFullAddr(String mailbox)
-    {
-      if (mailbox.length() == 0)
-        return false;
-      int idxLT = mailbox.indexOf('<');
-      if (idxLT == -1)
-        return false;
-
-      //is phrase
-      String phrase = mailbox.substring(0, idxLT);
-      StringTokenizer st = new StringTokenizer(phrase, " ");
-      if (st.countTokens() == 0)
-        return false;
-      while (st.hasMoreTokens())
-      {
-        if (!isWord(st.nextToken()))
-          return false;
-      }
-      if (phrase.charAt(phrase.length() - 1) != BasicRules.SP)
-      {
-        return false;
-      }
-
-      //is route-addr
-      String routeAddr = mailbox.substring(idxLT + 1);
-      // is route
-      int idxTwoSpot = routeAddr.indexOf(':');
-      if (idxTwoSpot != -1)
-      {
-        StringTokenizer stRouteAddr =
-          new StringTokenizer(routeAddr.substring(0, idxTwoSpot), ",");
-        if (!stRouteAddr.hasMoreTokens())
-          return false;
-        while (stRouteAddr.hasMoreTokens())
-        {
-          if (!isDomain(stRouteAddr.nextToken()))
-            return false;
-        }
-      }
-
-      //is addr spec
-      int idxGT = routeAddr.indexOf('>');
-      if (idxGT == -1 || idxGT != (routeAddr.length() - 1))
-        return false;
-
-      if (!isShortAddr(routeAddr.substring(idxTwoSpot + 1, idxGT)))
-        return false;
-
-      return true;
-    }
-
-  }
-
-  /**
-   * Validates HTTP request headers.
-   * @param headers HTTP request headers
-   * @return boolean  true if all HTTP headers string is conform to RFC 2616, false otherwise.
-   */
-
-  public static boolean validateHttpRequestHeaders(String headers)
-  {
-
-    MessageHeader mh = new MessageHeader();
-    try
-    {
-      mh.parseHeader(new ByteArrayInputStream(headers.getBytes()));
-    }
-    catch (IOException e)
-    {
-      return false;
-    }
-
-    String header = null;
-    String value = null;
-
-    header = mh.getKey(0);
-    if (header != null)
-      return false;
-
-    value = mh.getValue(0);
-    if (value == null)
-      return false;
-
-    //method
-    StringTokenizer st = new StringTokenizer(value, " ");
-    if (!st.hasMoreElements())
-      return false;
-    String str = st.nextToken();
-    if (!isToken(str))
-      return false;
-
-    if (!st.hasMoreElements())
-      return false;
-    str = st.nextToken();
-    if (!isURI(str) && !str.equals("*"))
-      return false;
-
-    if (!st.hasMoreElements())
-      return false;
-    str = st.nextToken();
-    if (!isHTTPVersion(str))
-      return false;
-
-    int i = 1;
-    try
-    {
-      while ((header = mh.getKey(i)) != null)
-      {
-        value = mh.getValue(i);
-        i++;
-
-        // is message-header token
-        if (!isToken(header))
-          return false;
-
-        //---- entity-headers
-
-        if (header.equals(HEADER_ALLOW))
-        {
-          if (!isValidAllow(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_CONTENT_TYPE))
-        {
-          if (!isMediaType(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_CONTENT_ENCODING))
-        {
-          if (!isToken(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_CONTENT_LANGUAGE))
-        {
-          if (!isLanguageTag(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_CONTENT_LENGHT))
-        {
-          if (!isDidgit(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_CONTENT_LOCATION))
-        {
-          if (!isURI(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_CONTENT_RANGE))
-        {
-          if (!isValidContentRange(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_EXPIRES)
-          || header.equals(HEADER_LAST_MODIFIED))
-        {
-          if (!isHTTPDate(value))
-            return false;
-          else
-            continue;
-        }
-
-        //---- general-headers
-        if (header.equals(HEADER_CACHE_CONTROL))
-        {
-          if (!isValidCacheControl(value))
-            return false;
-
-          continue;
-          //return true;
-        }
-
-        if (header.equals(HEADER_CONNECTION))
-        {
-          if (!isToken(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_DATE))
-        {
-          if (!isHTTPDate(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_PRAGMA))
-        {
-          if (!isPragmaDerective(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_TRAILER))
-        {
-          if (!isToken(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_TRANSFER_ENCODING))
-        {
-          if (!isTransferCoding(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_UPGRADE))
-        {
-          if (!isValidUpgrade(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_VIA))
-        {
-          if (!isValidVia(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_WARNING))
-        {
-          if (!isValidWarning(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_ACCEPT))
-        {
-          if (!isValidAccept(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_ACCEPT_CHARSET))
-        {
-          if (!isValidAcceptCharSet(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_ACCEPT_ENCODING))
-        {
-          if (!isValidAcceptEncoding(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_ACCEPT_LANGUAGE))
-        {
-          if (!isValidAcceptLanguage(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_AUTHORIZATION)
-          || header.equals(HEADER_PROXY_AUTHORIZATION))
-        {
-          if (!isCredentials(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_EXPECT))
-        {
-          if (!isExpectation(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_FROM))
-        {
-          if (!MailboxValidator.validateMailbox(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_IF_MATCH)
-          || header.equals(HEADER_IF_NONE_MATCH))
-        {
-          if (!isValidIfMatch(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_IF_RANGE))
-        {
-          if (!isEntityTag(value) && !isHTTPDate(value))
-            return false;
-          else
-            continue;
-        }
-
-        //---			
-        if (header.equals(HEADER_IF_MODIFIED_SINCE))
-        {
-          if (!isHTTPDate(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_IF_UNMODIFIED_SINCE))
-        {
-          if (!isHTTPDate(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_MAX_FORWARDS))
-        {
-          if (!isDidgit(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_USER_AGENT))
-        {
-          if (!isValidUserAgent(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_TE))
-        {
-          if (!isValidTE(value))
-            return false;
-          else
-            continue;
-        }
-
-        if (header.equals(HEADER_RANGE))
-        {
-          if (!isRange(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_HOST))
-        {
-          if (!isHost(value))
-            return false;
-          else
-            continue;
-        }
-        if (header.equals(HEADER_REFERER))
-        {
-          if (!isURI(value))
-            return false;
-          else
-            continue;
-        }
-
-      }
-    }
-    catch (Exception e)
-    {
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidIfMatch.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidIfMatch(String value)
-  {
-    if (value.trim().length() == 0)
-      return true;
-    if ("*".equals(value.trim()))
-      return true;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      if (!isEntityTag(str))
-        return false;
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isValidUpgrade.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidUpgrade(String value)
-  {
-    if (value.trim().length() == 0)
-      return false;
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      if (!isProduct(str))
-        return false;
-
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidCacheControl.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidCacheControl(String value)
-  {
-
-    if (value.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      int index = str.indexOf('=');
-      if (index == -1)
-      {
-
-      }
-      else
-      {
-        if (!isToken(str.substring(0, index)))
-          return false;
-        String strAfterEq = str.substring(index + 1);
-        if (!isToken(strAfterEq) && !isQuotedString(strAfterEq))
-        {
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isHTTPVersion.
-   * @param str
-   * @return boolean
-   */
-  private static boolean isHTTPVersion(String str)
-  {
-    if (!str.startsWith("HTTP/"))
-      return false;
-    int idx = "HTTP/".length();
-
-    int idx2 = str.indexOf(".");
-
-    // 1*DIGIT
-    String s = str.substring(idx, idx2);
-    if (!isDidgit(s))
-      return false;
-
-    s = str.substring(idx2 + 1);
-    if (!isDidgit(s))
-      return false;
-
-    return true;
-  }
-
-  /**
-   * Method isValidWarning.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidWarning(String value)
-  {
-    if (value.length() == 0)
-      return false;
-    value = value.trim();
-    StringTokenizer st = new StringTokenizer(value, " ");
-    String str = st.nextToken();
-
-    if (str.length() > 3 || !isDidgit(str))
-      return false;
-
-    if (!st.hasMoreTokens())
-      return false;
-    str = st.nextToken();
-    if (!isHost(str) && !isToken(str))
-      return false;
-
-    //if(!st.hasMoreTokens()) return false;
-    str = st.nextToken("").trim();
-    //???
-
-    int lastQuotedString = BasicRules.getLastQuotedString(str, 0);
-    if (lastQuotedString == str.length())
-    {
-      return true;
-    }
-    else
-    {
-      String data = str.substring(lastQuotedString);
-      if (data.charAt(data.length()) != '\"')
-        return false;
-      if (str.charAt(0) != '\"')
-        return false;
-      if (!isHTTPDate(str.substring(1, data.length() - 1)))
-        return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isValidVia.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidVia(String value)
-  {
-    if (value.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-
-      String str = st.nextToken().trim();
-
-      StringTokenizer st2 = new StringTokenizer(str, " ");
-
-      // protocol/version
-      str = st2.nextToken();
-      int idx = str.indexOf("/");
-      if (idx == -1)
-      {
-        if (!isToken(str))
-          return false;
-      }
-      else
-      {
-        if (!isToken(str.substring(0, idx))
-          || !isToken(str.substring(idx + 1)))
-          return false;
-      }
-
-      //host
-      str = st2.nextToken();
-      if (!isHost(str) && !isToken(str))
-        return false;
-
-      //comment
-      if (st2.hasMoreTokens())
-      {
-        str = st2.nextToken("");
-        if (!isComment(str.trim()))
-          return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Method isHost.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isHost(String value)
-  {
-
-    try
-    {
-      new URL("http://" + value);
-    }
-    catch (MalformedURLException e)
-    {
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidAllow.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidAllow(String value)
-  {
-    if (value.trim().length() == 0)
-      return true;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      if (!isToken(str))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidContentRange.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidContentRange(String value)
-  {
-    if (value.length() == 0)
-      return false;
-    if (!value.startsWith("bytes"))
-      return false;
-    String str = value.substring("bytes".length()).trim();
-
-    int idx = str.indexOf("/");
-    if (idx == -1)
-      return false;
-
-    String byteRange = str.substring(0, idx);
-    int idx2 = byteRange.indexOf("-");
-    if (idx2 == -1)
-    {
-      if (!byteRange.equals("*"))
-        return false;
-    }
-    else
-    {
-      if (!isDidgit(byteRange.substring(0, idx2))
-        || !isDidgit(byteRange.substring(idx2 + 1)))
-        return false;
-    }
-
-    if (!isDidgit(str.substring(idx + 1))
-      && !str.substring(idx + 1).equals("*"))
-      return false;
-
-    return true;
-  }
-
-  /**
-   * Method isRange.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isRange(String value)
-  {
-    if (value.length() == 0)
-      return false;
-    if (!value.startsWith("bytes="))
-      return false;
-    String strByteRange = value.substring("bytes=".length());
-
-    StringTokenizer st = new StringTokenizer(strByteRange, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken();
-      int idx = str.indexOf("-");
-      if (idx == -1)
-        return false;
-      if (idx == 0)
-      {
-        if (!isDidgit(str.substring(1)))
-          return false;
-      }
-      else
-      {
-        if (idx == (str.length() - 1))
-        {
-          if (!isDidgit(str.substring(0, str.length() - 1)))
-            return false;
-        }
-        else
-        {
-          if (!isDidgit(str.substring(0, idx))
-            || !isDidgit(str.substring(idx + 1)))
-            return false;
-        }
-
-      }
-
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidTE.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidTE(String value)
-  {
-    if (value.trim().length() == 0)
-      return true;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      if (st.equals("trailers"))
-        return true;
-
-      int idx = str.indexOf(";");
-      if (idx == -1)
-      {
-        if (!isLanguageRange(str))
-          return false;
-      }
-      else
-      {
-        String _1 = str.substring(0, idx).trim();
-        String _2 = str.substring(idx + 1).trim();
-        if (!isLanguageRange(_1))
-          return false;
-        if (!isQAndQValue(_2))
-          return false;
-      }
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isValidUserAgent.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidUserAgent(String value)
-  {
-    if (value.length() == 0)
-      return false;
-    StringTokenizer st = new StringTokenizer(value, " ");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken();
-      if (!isProduct(str) && !isComment(str))
-        return false;
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isComment.
-   * @param str
-   * @return boolean
-   */
-  private static boolean isComment(String str)
-  {
-    if (BasicRules.getLastComment(str, 0) != str.length())
-      return false;
-    return true;
-  }
-
-  /**
-   * Method isValidAcceptLanguage.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidAcceptLanguage(String value)
-  {
-    if (value.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      int idx = str.indexOf(";");
-      if (idx == -1)
-      {
-        if (!isToken(str))
-          return false;
-      }
-      else
-      {
-        String _1 = str.substring(0, idx).trim();
-        String _2 = str.substring(idx + 1).trim();
-        if (!isToken(_1))
-          return false;
-        if (!isAcceptParams(_2))
-          return false;
-      }
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isLanguageRange.
-   * @param str
-   * @return boolean
-   */
-  private static boolean isLanguageRange(String str)
-  {
-    if (str.trim().equals("*"))
-      return true;
-    StringTokenizer st = new StringTokenizer(str, "-");
-    while (st.hasMoreElements())
-    {
-      if (!is8ALPHA(st.nextToken()))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isValidAcceptEncoding.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidAcceptEncoding(String value)
-  {
-    if (value.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      int idx = str.indexOf(";");
-      if (idx == -1)
-      {
-        if (!isToken(str) && !str.equals("*"))
-          return false;
-      }
-      else
-      {
-        String _1 = str.substring(0, idx).trim();
-        String _2 = str.substring(idx + 1).trim();
-
-        if ((!isToken(_1) && !_1.equals("*")))
-          return false;
-        if (!isQAndQValue(_2))
-          return false;
-      }
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isValidAcceptCharSet.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidAcceptCharSet(String value)
-  {
-    if (value.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      int idx = str.indexOf(";");
-      if (idx == -1)
-      {
-        if (!isToken(str) && !str.equals("*"))
-          return false;
-      }
-      else
-      {
-        String _1 = str.substring(0, idx).trim();
-        String _2 = str.substring(idx + 1).trim();
-
-        if ((!isToken(_1) && !_1.equals("*")))
-          return false;
-        if (!isQAndQValue(_2))
-          return false;
-      }
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isValidAccept.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isValidAccept(String value)
-  {
-    if (value.trim().length() == 0)
-      return true;
-
-    StringTokenizer st = new StringTokenizer(value, ",");
-    while (st.hasMoreElements())
-    {
-      String str = st.nextToken().trim();
-      int idx = str.indexOf(";");
-      if (idx == -1)
-      {
-        if (!isMediaRange(str))
-          return false;
-      }
-      else
-      {
-        if (!isMediaRange(str.substring(0, idx).trim())
-          || !isAcceptParams(str.substring(idx + 1).trim()))
-          return false;
-
-      }
-
-    }
-    return true;
-  }
-
-  /**
-   * Method isAcceptParams.
-   * @param string
-   * @return boolean
-   */
-  private static boolean isAcceptParams(String string)
-  {
-    if (string.trim().length() == 0)
-      return false;
-
-    StringTokenizer st = new StringTokenizer(string, ";");
-    String str = st.nextToken();
-
-    int idx = str.indexOf("=");
-    if (idx == -1)
-    {
-      if (str.equals("q") || !isToken(str))
-        return false;
-    }
-    else
-    {
-      if (str.substring(0, idx).equals("q"))
-      {
-        if (!isQValue(str.substring(idx + 1)))
-          return false;
-      }
-      else
-      {
-        if (!isParameterWithoutValue(str))
-          return false;
-      }
-    }
-
-    while (st.hasMoreElements())
-    {
-      str = st.nextToken();
-      if (!isParameterWithoutValue(str))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isQAndQValue.
-   * @param str
-   * @return boolean
-   */
-  private static boolean isQAndQValue(String str)
-  {
-    str = str.trim();
-    if (!str.trim().startsWith("q="))
-      return false;
-    if (!isQValue(str.substring("q=".length())))
-      return false;
-    return true;
-  }
-
-  /**
-   * Method isQValue.
-   * @param string
-   * @return boolean
-   */
-  private static boolean isQValue(String string)
-  {
-    if (string.trim().length() == 0)
-      return false;
-
-    int idx = string.indexOf(".");
-    if (idx == -1)
-    {
-      if (!"0".equals(string) && !"1".equals(string))
-        return false;
-    }
-    else
-    {
-      String strDig = string.substring(idx + 1);
-      if (strDig.length() > 3)
-        return false;
-
-      if (string.substring(0, idx).equals("0"))
-      {
-        if (!isDidgit(strDig))
-          return false;
-
-      }
-      else
-      {
-        if (!string.substring(0, idx).equals("1"))
-          return false;
-
-        for (int i = 0; i < strDig.length(); i++)
-        {
-          if (strDig.charAt(i) != '0')
-            return false;
-        }
-      }
-
-    }
-    return true;
-  }
-
-  /**
-   * Method isMediaRange.
-   * @param str
-   * @return boolean
-   */
-  private static boolean isMediaRange(String str)
-  {
-    if (str.trim().length() == 0)
-      return false;
-
-    int idx = str.indexOf("/");
-    if (idx == -1)
-      return false;
-
-    if (!isToken(str.substring(0, idx)) && !str.substring(0, idx).equals("*"))
-      return false;
-    if (!isToken(str.substring(idx + 1))
-      && !str.substring(idx + 1).equals("*"))
-      return false;
-
-    return true;
-  }
-
-  /**
-   * Method isEntityTag.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isEntityTag(String value)
-  {
-
-    int idx = 0;
-    if (value.startsWith("W/"))
-      idx = 2;
-    if (!isQuotedString(value.substring(idx)))
-      return false;
-    return true;
-  }
-
-  /**
-   * Method isExpectation.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isExpectation(String value)
-  {
-    if (value.equals("100-continue"))
-      return true;
-
-    StringTokenizer st = new StringTokenizer(value, ";");
-    while (st.hasMoreElements())
-    {
-      if (!isParameterWithoutValue(st.nextToken()))
-        return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isCredentials.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isCredentials(String value)
-  {
-    StringTokenizer st = new StringTokenizer(value, " ");
-    if (!isToken(st.nextToken()))
-      return false;
-
-    while (st.hasMoreElements())
-    {
-      String param = st.nextToken(",");
-      if (!isParameter(param))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isProduct.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isProduct(String value)
-  {
-    int idx = value.indexOf("/");
-    if (idx == -1)
-    {
-      if (!isToken(value))
-        return false;
-    }
-    else
-    {
-      if (!isToken(value.substring(0, idx))
-        || !isToken(value.substring(idx + 1)))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isTransferCoding.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isTransferCoding(String value)
-  {
-    if (value.equals("chunked"))
-    {
-      return true;
-    }
-    else
-    {
-      StringTokenizer st = new StringTokenizer(value, ";");
-      if (!isToken(st.nextToken()))
-        return false;
-
-      while (st.hasMoreElements())
-      {
-        if (!isParameter(st.nextToken()))
-          return false;
-      }
-
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isParameter.
-   * @param string
-   * @return boolean
-   */
-  private static boolean isParameter(String string)
-  {
-
-    // check parameter	
-    int idx = string.indexOf("=");
-    if (!isToken(string.substring(0, idx)))
-      return false;
-
-    String parValue = string.substring(idx + 1);
-    if (!isToken(parValue) && !isQuotedString(parValue))
-      return false;
-
-    return true;
-  }
-
-  /**
-   * Method isParameterWithoutValue.
-   * @param string
-   * @return boolean
-   */
-  private static boolean isParameterWithoutValue(String string)
-  {
-
-    // check parameter	
-    int idx = string.indexOf("=");
-    if (idx != -1)
-    {
-      if (!isToken(string.substring(0, idx)))
-        return false;
-      String parValue = string.substring(idx + 1);
-      if (!isToken(parValue) && !isQuotedString(parValue))
-        return false;
-
-    }
-    else
-    {
-      if (!isToken(string))
-        return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isPragmaDerective.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isPragmaDerective(String value)
-  {
-    if (value.equals("no-cache"))
-      return true;
-    else
-    {
-      int idx = value.indexOf("=");
-      if (idx == -1)
-      {
-        if (isToken(value))
-          return true;
-      }
-      else
-      {
-        String str = value.substring(idx + 1);
-        if (isToken(value.substring(0, idx))
-          && (isToken(str) || isQuotedString(str)))
-          return true;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Method isHTTPDate.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isHTTPDate(String value)
-  {
-
-    String rfc1123_date = "EEE, dd MMM yyyy hh:mm:ss 'GMT'";
-    String rfc850_date = "EEEE, dd-MMM-yy hh:mm:ss 'GMT'";
-    String asctime_date = "EEE MMM d hh:mm:ss yyyy";
-
-    try
-    {
-      SimpleDateFormat sdf = new SimpleDateFormat(rfc1123_date, Locale.US);
-      if (sdf.parse(value) != null)
-        return true;
-    }
-    catch (ParseException e)
-    {
-    }
-
-    try
-    {
-      SimpleDateFormat sdf = new SimpleDateFormat(rfc850_date, Locale.US);
-      if (sdf.parse(value) != null)
-        return true;
-    }
-    catch (ParseException e)
-    {
-    }
-
-    try
-    {
-      SimpleDateFormat sdf = new SimpleDateFormat(asctime_date, Locale.US);
-      if (sdf.parse(value) != null)
-        return true;
-    }
-    catch (ParseException e)
-    {
-    }
-
-    return false;
-
-  }
-
-  /**
-   * Method isURI.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isURI(String value)
-  {
-    try
-    {
-      new URL(value);
-    }
-    catch (MalformedURLException e)
-    {
-      try
-      {
-        new URL("http://localhost" + value);
-      }
-      catch (MalformedURLException e2)
-      {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isLanguageTag.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isLanguageTag(String value)
-  {
-    int idx = value.indexOf("-");
-    if (idx == -1)
-    {
-      return is8ALPHA(value);
-    }
-    else
-    {
-      if (!is8ALPHA(value.substring(0, idx))
-        || !is8ALPHA(value.substring(idx + 1)))
-        return false;
-      else
-        return true;
-
-    }
-  }
-
-  /**
-   * Method is8ALPHA.
-   * @param string
-   * @return boolean
-   */
-  private static boolean is8ALPHA(String string)
-  {
-    if (string.length() > 8 || !isALPHA(string))
-      return false;
-    else
-      return true;
-  }
-
-  /**
-   * Method isALPHA.
-   * @param string
-   * @return boolean
-   */
-  private static boolean isALPHA(String string)
-  {
-    for (int i = 0; i < string.length(); i++)
-    {
-      if (!BasicRules.isCHAR(string.charAt(i)))
-        return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isDidgit.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isDidgit(String value)
-  {
-    if (value.length() == 0)
-      return false;
-    char[] chs = value.toCharArray();
-    for (int i = 0; i < chs.length; i++)
-    {
-      if (chs[i] < '0' || chs[i] > '9')
-        return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Method isMediaType.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isMediaType(String value)
-  {
-    StringTokenizer st = new StringTokenizer(value, ";");
-    String mediaType = st.nextToken();
-
-    int idx = mediaType.indexOf("/");
-    if (!isToken(mediaType.substring(0, idx))
-      || !isToken(mediaType.substring(idx + 1)))
-    {
-      return false;
-    }
-
-    while (st.hasMoreElements())
-    {
-      if (!isParameter(st.nextToken(";").trim()))
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isQuotedString.
-   * @param parValue
-   * @return boolean
-   */
-  private static boolean isQuotedString(String parValue)
-  {
-    if (BasicRules.getLastQuotedString(parValue, 0) != parValue.length())
-    {
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Method isToken.
-   * @param value
-   * @return boolean
-   */
-  private static boolean isToken(String value)
-  {
-    return BasicRules.isToken(value);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/JavaEncoding.properties b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/JavaEncoding.properties
deleted file mode 100644
index 4293536..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/JavaEncoding.properties
+++ /dev/null

@@ -1,31 +0,0 @@
-# /**
-#  * <copyright>
-#  *
-#  * Copyright (c) 2002-2003  IBM Corporation, Beacon Information Technology Inc. and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM      - Initial API and implementation
-#  *   BeaconIT - Initial API and implementation
-#  * </copyright>
-#  */
-## I18N: 2003.02.26 modified by K.Nakagome@BeaconIT 
-## Property file used to get JavaVM supported character encoding.
-
-ISO8859_1=ISO8859_1 
-ISO8859-1=ISO8859_1 
-utf8=UTF8 
-utf-8=UTF8 
-UTF-8=UTF8 
-utf16=UTF-16 
-utf-16=UTF-16 
-UTF16=UTF-16 
-
-## 
-Shift_JIS=Windows-31J
-
-MS932=Windows-31J
-#SJIS=Shift_JIS
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MIMEConstants.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MIMEConstants.java
deleted file mode 100644
index e94b4b4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MIMEConstants.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-/**
- * A set of HTTP values that are defined by Network Working Group.
- * http://www.ietf.org/
- *
- * @version 1.0
- * @author Ilya Kanonirov (kio@isg.axmor.com)
- */
-public class MIMEConstants {
-  public static final String HEADER_CONTENT_ID = "Content-ID";
-  public static final String HEADER_CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
-  public static final String HEADER_CONTENT_TYPE = "Content-Type";
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MIMEUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MIMEUtils.java
deleted file mode 100644
index 76fd947..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MIMEUtils.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-
-/**
- * Set of HTTPL related utilities.
- *
- * @version 1.0.1
- * @author Peter Brittenham
- */
-
-public final class MIMEUtils
-{
-
-  /**
-   * Utility to present MIME header information as attribute-value pairs, 
-   * based on ':' as attribute-value separator.
-   * @param mimeHeaderString an MIME header string.
-   * @param separators attribute-value separator list.
-   * @return MIME header information as attribute-value pairs.
-   * @throws WSIException if unable to create MIME header information 
-   *         as attribute-value pairs.
-   */
-  public static Map getMimeHeaderTokens(String mimeHeaderString, String separators)
-    throws WSIException
-  {
-    StringTokenizer tokenizer = new StringTokenizer(mimeHeaderString, "\n\r\f");
-    Map map = new HashMap();
-    while (tokenizer.hasMoreTokens())
-    {
-      String line = tokenizer.nextToken();
-      int index = line.indexOf(separators);
-      if (index > 0 && index < line.length() - 1)
-      {
-        map.put(line.substring(0, index).toUpperCase(), line.substring(index + 1).trim());
-      }
-    }
-    return map;
-  }
-  
-  /**
-   * Utility to take sub attribute value from MIME header
-   * @param mimeHeaderString an MIME header string.
-   * @param attributeName attribute name.
-   * @param subAttributeName sub attribute name.
-   * @return sub attribute value from MIME header.
-   * @throws WSIException if unable to get sub attribute value from MIME header. 
-   */
-  public static String getMimeHeaderSubAttribute(String mimeHeaderString, 
-      String attributeName, String subAttributeName)
-    throws WSIException
-  {
-    // get attribute value
-    String value = 
-      (String) getMimeHeaderTokens(mimeHeaderString,":").get(attributeName.toUpperCase());
-    if(value != null)
-    {
-      // search sub attribute token
-      int idxQ = value.toUpperCase().indexOf(subAttributeName.toUpperCase()+"=\"");
-      int idx = value.toUpperCase().indexOf(subAttributeName.toUpperCase()+"=");
-      // if attribute is quoted
-      if (idxQ != -1) 
-      {
-        idxQ += (subAttributeName+"=\"").length();
-        int eIdxQ = value.indexOf("\"", idxQ);
-        if (eIdxQ != -1)
-        {
-          return value.substring(idxQ, eIdxQ);
-        }
-        else 
-        {
-          return null;
-        }
-      }
-      // if attribute is not quoted
-      else if (idx != -1)
-      {
-        idx += (subAttributeName+"=").length();
-        int eIdx = -1;
-        // find end space separator
-        if ((eIdx = value.indexOf(" ", idx)) != -1)
-        {
-          return value.substring(idx, eIdx);
-        }
-        // find coma separator
-        else if ((eIdx = value.indexOf(";", idx)) != -1)
-        {
-          return value.substring(idx, eIdx);
-        }
-        // this is last attribute
-        else 
-        {
-          return value.substring(idx);
-        }
-      }
-      // if attribute do not found
-      else 
-      {
-        return null;
-      }
-    }
-    return value;
-  }
-
-  /**
-   * Utility to take attribute value from MIME header
-   * @param mimeHeaderString an MIME header string.
-   * @param attributeName attribute name.
-   * @return attribute value from MIME header.
-   * @throws WSIException if unable to get attribute value from MIME header. 
-   */
-  public static String getMimeHeaderAttribute(String mimeHeaderString, 
-      String attributeName)
-    throws WSIException
-  {
-    String attributeValue = 
-        (String) getMimeHeaderTokens(mimeHeaderString,":").get(attributeName.toUpperCase());
-    // get first token
-    if((attributeValue != null) && (attributeValue.indexOf(";") != -1)) {
-      attributeValue = attributeValue.substring(0, attributeValue.indexOf(";"));
-    }
-    return attributeValue;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MessageList.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MessageList.java
deleted file mode 100644
index c04f091..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/MessageList.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.ResourceBundle;
-
-/**
- * This class creates and maintains a message list.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class MessageList
-{
-  /**
-   * Message resource bundle.
-   */
-  private ResourceBundle messageResourceBundle = null;
-
-  /**
-   * Do not allow this object to be created with null constructor.
-   */
-  private MessageList()
-  {
-  }
-
-  /**
-   * Constructor for MessageList.
-   * @param resourceBundleName  a resource bundle name.
-   */
-  public MessageList(String resourceBundleName)
-  {
-    this.messageResourceBundle = ResourceBundle.getBundle(resourceBundleName);
-  }
-
-  /**
-   * Get a message from the resource bundle.
-   * @param key                 a key.
-   * @param defaultMessage      a default message.
-   * @return message from the resource bundle.
-   */
-  public String getMessage(String key, String defaultMessage)
-  {
-    return getMessage(key, null, defaultMessage);
-  }
-
-  /**
-   * Get a message from the resource bundle.
-   * @param key                 a key.
-   * @param messageData         message data.
-   * @param defaultMessage      a default message.
-   * @return message from the resource bundle.
-   */
-  public String getMessage(
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    String message = defaultMessage;
-
-    try
-    {
-      // Get message
-      message = messageResourceBundle.getString(key);
-    }
-
-    catch (Exception e)
-    {
-      // Ignore and just use default message
-    }
-
-    if (messageData != null)
-      message += " " + messageData;
-
-    // Return message
-    return message;
-  }
-
-  /**
-   * Print a message from the resource bundle.
-   * @param key                 a key.
-   * @param defaultMessage      a default message.
-   */
-  public void printMessage(String key, String defaultMessage)
-  {
-    printMessage(key, null, defaultMessage);
-  }
-
-  /**
-   * Print a message from the resource bundle.
-   * @param key                 a key.
-   * @param messageData         message data.
-   * @param defaultMessage      a default message.
-   */
-  public void printMessage(
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    // Print message
-    System.out.println(getMessage(key, messageData, defaultMessage));
-  }
-
-  /**
-   * Static get message.
-   * @param resourceBundleName  resource bundle name.
-   * @param key                 a key.
-   * @param messageData         message data.
-   * @param defaultMessage      a default message.
-   * @return message.
-   */
-  public static String getMessage(
-    String resourceBundleName,
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    String message = defaultMessage;
-    ResourceBundle messageResourceBundle = null;
-
-    try
-    {
-      // Get resource bundle
-      messageResourceBundle = ResourceBundle.getBundle(resourceBundleName);
-
-      // Get message
-      message = messageResourceBundle.getString(key);
-    }
-
-    catch (Exception e)
-    {
-      // Ignore and just use default message
-    }
-
-    if (messageData != null)
-      message += " " + messageData;
-
-    if (!message.endsWith("."))
-      message += ".";
-
-    // Return message
-    return message;
-  }
-
-  /**
-   * Print message.
-   * @param resourceBundleName  resource bundle name.
-   * @param key                 a key.
-   * @param messageData         message data.
-   * @param defaultMessage      a default message.
-   */
-  public static void printMessage(
-    String resourceBundleName,
-    String key,
-    String messageData,
-    String defaultMessage)
-  {
-    // Print message
-    System.out.println(
-      getMessage(resourceBundleName, key, messageData, defaultMessage));
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/NullUtil.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/NullUtil.java
deleted file mode 100644
index 487cca3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/NullUtil.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-/**
- * The utility class to automate null checking.
- * 
- * @author Kulik
- */
-public final class NullUtil
-{
-  /**
-   * The method checks objects on existence and compare with <code>equals</code> method.
-   * @param o1 first object.
-   * @param o2 second object.
-   * @return true if first object is equal to the second object.
-   */
-  public static boolean equals(Object o1, Object o2)
-  {
-    return ((o1 == null && o2 == null) || (o1 != null && o1.equals(o2)));
-  }
-
-  /**
-   * The method checks object on existence and returns its string representation with <code>toString()</code> method.
-   * @param o source object.
-   * @return string representation of object.
-   */
-  public static String toString(Object o)
-  {
-    return (o == null) ? null : o.toString();
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java
deleted file mode 100644
index 639a3f2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java
+++ /dev/null

@@ -1,788 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLVisitor;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * The class implements mechanism for creating unique signature of operation.
- * 
- * @author Kulik
- */
-public final class OperationSignature
-{
-  // the flag indicates whether the messages is represented as document style
-  // vice versa is not generally true
-  private boolean isDocumentStyle = false;
-  private boolean isCreated = false;
-  private boolean isFault = false;
-
-  protected List signature = new LinkedList();
-  private Element firstBody = null;
-
-  /**
-   * Class operates as container for matched operation.
-  * @author Kulik
-   */
-  public final static class OperationMatch
-  {
-    final private String style;
-    final private BindingOperation operation;
-    final private List signature;
-
-    /**
-     * Constructor.
-     * @param style operation style.
-     * @param signature a signature.
-     * @param operation a binding operation.
-     */
-    protected OperationMatch(
-      String style,
-      List signature,
-      BindingOperation operation)
-    {
-      this.style = style;
-      this.signature = signature;
-      this.operation = operation;
-    }
-    /**
-     * Gets operation style.
-     * @return operation style.
-     */
-    public String getOperationStyle()
-    {
-      return style;
-    }
-    /**
-     * Gets WSDL binding operation object.
-     * @return WSDL binding operation object.
-     */
-    public BindingOperation getOperation()
-    {
-      return operation;
-    }
-
-    /**
-     * Gets operation signature as list.
-     * @return operation signature as list.
-     */
-    public List getSignature()
-    {
-      return signature;
-    }
-  }
-
-  /**
-   * The class searches BindingOperation by the given OperationSigbnature. 
-  * @author Kulik
-   */
-  public final class Visitor implements WSDLVisitor
-  {
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Part, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Part obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Service, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Service obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Types, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Types obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Operation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Operation obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Input, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Input obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Output, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Output obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Fault, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Fault obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Binding, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(Binding obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.BindingOperation, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(
-      BindingOperation obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.BindingInput, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(
-      BindingInput obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.BindingOutput, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-     */
-    public void visit(
-      BindingOutput obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(BindingFault, Object, WSDLTraversalContext)
-     */
-    public void visit(
-      BindingFault obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Import, Object, WSDLTraversalContext)
-     */
-    public void visit(Import obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Element, Object, WSDLTraversalContext)
-     */
-    public void visit(Element obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Message, Object, WSDLTraversalContext)
-     */
-    public void visit(Message obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Port, Object, WSDLTraversalContext)
-     */
-    public void visit(Port obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(PortType, Object, WSDLTraversalContext)
-     */
-    public void visit(PortType obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Definition, Object, WSDLTraversalContext)
-     */
-    public void visit(Definition obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(ExtensibilityElement, Object, WSDLTraversalContext)
-     */
-    public void visit(
-      ExtensibilityElement obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPHeader, Object, WSDLTraversalContext)
-     */
-    public void visit(SOAPHeader obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPHeaderFault, Object, WSDLTraversalContext)
-     */
-    public void visit(
-      SOAPHeaderFault obj,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-    }
-
-    /* (non-Javadoc) 
-     * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPFault, Object, WSDLTraversalContext)
-     */
-    public void visit(SOAPFault obj, Object parent, WSDLTraversalContext ctx)
-    {
-    }
-
-    private String requiredStyle = null;
-    private String soapAction = null;
-    private BindingOperation operation = null;
-    private TypesRegistry registry = null;
-    private boolean isSOAPActionRequired = false;
-
-    /**
-    * Constructor.
-    */
-    public Visitor()
-    {
-      super();
-      // TODO Auto-generated constructor stub
-    }
-
-    /**
-     * Constructor.
-     * @param requiredStyle required style.
-     * @param registry types registry.
-     */
-    public Visitor(String requiredStyle, TypesRegistry registry)
-    {
-      this.requiredStyle = requiredStyle;
-      this.registry = registry;
-    }
-
-    /**
-     * The method returns matched binding operation.
-     * @return BindingOperation
-     */
-    public BindingOperation getMatchedOperation()
-    {
-      return operation;
-    }
-
-    /**
-     * The method sets up required operation to be found.
-     * The possible values is rpc and document.
-     * @param requiredStyle operation style.
-     */
-    public void setRequiredStyle(String requiredStyle)
-    {
-      this.requiredStyle = requiredStyle;
-    }
-
-    /**
-     * The method indicates whether SOAP Action be included into operation.
-     * signature.
-     * @return true if SOAP Action isd required.
-     */
-    public boolean isSOAPActionRequired()
-    {
-      return isSOAPActionRequired;
-    }
-
-    /**
-     * Sets SOAP action to be included into signature.
-     */
-    public void setSOAPActionRequired()
-    {
-      isSOAPActionRequired = true;
-    }
-
-    /**
-     * internal method.
-     */
-    public void visit(
-      SOAPBinding binding,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-      String style =
-        (binding.getStyle() == null)
-          ? WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC
-          : binding.getStyle();
-      ctx.addParameter("style", style);
-    }
-
-    /**
-     * internal method.
-     */
-    public void visit(
-      SOAPOperation operation,
-      Object parent,
-      WSDLTraversalContext ctx)
-    {
-      soapAction = null;
-      String style = operation.getStyle();
-      if (style == null)
-        style = (String) ctx.getParameter("style");
-      if (!requiredStyle.equals(style))
-        ctx.cancelBindingOperationProcessing();
-      else
-        //if (isSOAPActionRequired)
-        soapAction = operation.getSoapActionURI();
-    }
-
-    /**
-     * internal method.
-     */
-    public void visit(SOAPBody body, Object parent, WSDLTraversalContext ctx)
-    {
-      // assert parent instanceof BindingInput
-      BindingOperation bop = ctx.getBindingOperation();
-      if (bop.getOperation() == null
-        || bop.getOperation().getInput() == null
-        || bop.getOperation().getInput().getMessage() == null)
-        return;
-
-      Message msg = bop.getOperation().getInput().getMessage();
-      List parts =
-        WSDLUtil.getParts(bop.getOperation(), msg, body, requiredStyle);
-
-      QName additionalName = null;
-      // if operation is rpc, add to parts qname qith function name
-      if (WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC.equals(requiredStyle))
-      {
-        // found out target namespace
-        String namespace = body.getNamespaceURI();
-        if (namespace == null || namespace.length() == 0)
-          // !! ATTENTION
-          // namespace should be retrieved from service target nameapce            
-          namespace = ctx.getBinding().getQName().getNamespaceURI();
-
-        // insert operation name as first signature part
-        additionalName =
-          new QName(namespace, ctx.getBindingOperation().getName());
-      }
-
-      OperationSignature op =
-        new OperationSignature(parts, null, registry, false);
-
-      if (additionalName != null)
-        op.getSignature().add(0, additionalName);
-      //if (isSOAPActionRequired)
-      //if (soapAction != null)
-      if (isSOAPActionRequired && soapAction != null)
-        op.getSignature().add(0, soapAction);
-      if (op.getSignature().equals(signature))
-      {
-        // required operation is found
-        operation = ctx.getBindingOperation();
-        ctx.cancelBindingOperationProcessing();
-        ctx.cancelBindingProcessing();
-      }
-
-      else
-      {
-        op = new OperationSignature(parts, null, registry, true);
-        if (additionalName != null)
-          op.getSignature().add(0, additionalName);
-
-        //if (isSOAPActionRequired)
-        //if (soapAction != null)
-        if (isSOAPActionRequired && soapAction != null)
-          op.getSignature().add(0, soapAction);
-
-        if (op.getSignature().equals(signature))
-        {
-          // required operation is found
-          operation = ctx.getBindingOperation();
-          ctx.cancelBindingOperationProcessing();
-          ctx.cancelBindingProcessing();
-        }
-      }
-    }
-  }
-
-  /**
-   * The constructor creates OperationSignature for SOAP message.
-   * @param doc a Document object.
-   */
-  public OperationSignature(Document doc)
-  {
-    Element body =
-      XMLUtils.findChildElement(
-        doc.getDocumentElement(),
-        WSITag.ELEM_SOAP_BODY);
-    processParts(body, false);
-    isDocumentStyle |= (signature.size() > 1);
-  }
-
-  /**
-   * The constructor creates OperationSIgnature for 
-   * list of <code>Part</code> objects and given WSDL document within these
-   * parts are defined.
-   * 
-   * @param parts a list of Part objects.
-   * @param wsdlDocument a WSDL document.
-   * @param registry a types registry.
-   * @param partial a partial status.
-   */
-  public OperationSignature(
-    List parts,
-    Document wsdlDocument,
-    TypesRegistry registry,
-    boolean partial)
-  {
-    if (parts != null)
-    {
-      Iterator it = parts.iterator();
-
-      while (it.hasNext())
-      {
-        Part part = (Part) it.next();
-        String localName = (partial) ? part.getName() : null;
-        QName typeName = part.getTypeName();
-        QName elementName = part.getElementName();
-
-        String namespace = "";
-
-        // If type name is not null, then a type element was used so it should be an RPC style signature 
-        if (typeName != null)
-        {
-          // Part wrappers do not have namespaces 
-          namespace = "";
-
-          if (localName == null)
-            localName = typeName.getLocalPart();
-        }
-
-        // If element name is not null, then it should be a document style signature
-        else if (elementName != null)
-        {
-          namespace = elementName.getNamespaceURI();
-
-          if (localName == null)
-            localName = elementName.getLocalPart();
-        }
-
-        signature.add(new QName(namespace, localName));
-      }
-    }
-
-    isCreated = true;
-  }
-
-  /**
-   * The method recreates OperationSignature with assumption that operation is
-   * RPC.
-   */
-  public void createRPCSignature()
-  {
-    isCreated = false;
-    if (firstBody == null)
-      return;
-    processParts(firstBody, true);
-    isDocumentStyle = false;
-  }
-
-  /**
-   * Internal method processes WSDL parts and creates operation signature.
-   * @param parent
-   */
-  private void processParts(Node parent, boolean processWrapper)
-  {
-    if (parent != null)
-    {
-      Node n = parent.getFirstChild();
-
-      // variable indicates that first tag is processed
-      boolean isFirst = true;
-      // iterate all bodies
-      while (n != null)
-      {
-        if (Node.ELEMENT_NODE == n.getNodeType())
-        {
-          if (isFirst && firstBody == null)
-          {
-            isFirst = false;
-            firstBody = (Element) n;
-            // check soapenv:fault
-            if (XMLUtils.equals(n, WSITag.ELEM_SOAP_FAULT))
-            {
-              isFault = true;
-              isCreated = false;
-              return;
-            }
-          }
-
-          String namespace = n.getNamespaceURI();
-          String localName = n.getLocalName();
-
-          /*I have no idea why this code is in here since it makes no sense at all, so I am commenting it out
-          // try to get xsi:tag
-          if (XMLUtils.getAttribute((Element) n, WSITag.ATTR_XSI_TYPE) != null) {
-              // we suppose that RPC style does not use xsi:type attribute
-              isDocumentStyle = true;
-              Attr xsiType = XMLUtils.getAttribute((Element) n, WSITag.ATTR_XSI_TYPE);
-              
-              String xsiValue = xsiType.getNodeValue();
-              int i = xsiValue.indexOf(':');
-              if (i != -1)
-              {
-                  namespace = XMLUtils.findNamespaceURI(n, xsiValue.substring(0, i));
-                  localName = xsiValue.substring(i+1);
-              } 
-          }
-          */
-
-          // If this is rpc-literal and processing a part (not the wrapper), then the part should not have a namespace
-          // And if it does, then one of the test assertions will detect it
-          if (!isDocumentStyle && processWrapper)
-          {
-            namespace = "";
-          }
-
-          if (namespace == null || namespace.length() == 0)
-          {
-            if (isDocumentStyle)
-            {
-              //Element firstChild  = null;
-              Node it = n.getFirstChild();
-              while (it != null && !(it instanceof Element))
-                it = it.getNextSibling();
-              if (it != null)
-                namespace = it.getNamespaceURI();
-            }
-          }
-
-          // normalize namespaces. All empty namespaces -> null 
-          if (namespace != null && namespace.length() == 0)
-            namespace = null;
-
-          // put part into signature
-          signature.add(new QName(namespace, localName));
-        }
-
-        n = n.getNextSibling();
-      }
-    }
-    else
-    {
-      isCreated = false; // not found ?
-      return;
-    }
-
-    isCreated = true;
-  }
-
-  /**
-   * Indicates whether operation has document style or RPC. 
-   * @return true if operation has document style.
-   */
-  public boolean isDocumentStyle()
-  {
-    return isDocumentStyle;
-  }
-
-  /**
-   * Indicates whether WSDL fault parts should be included into signature or
-   * not.
-   * @return true if WSDL fault parts should be included into signature.
-   */
-  public boolean isFault()
-  {
-    return isFault;
-  }
-
-  /**
-   * Indicates that operation signature was created.
-   * @return true if operation signature was created.
-   */
-  public boolean isCreated()
-  {
-    return isCreated;
-  }
-
-  /**
-   * Gets operation signature created for SOAP message.
-   * @return operation signature created for SOAP message.
-   */
-  public List getSignature()
-  {
-    return signature;
-  }
-
-  /**
-   * @see java.lang.Object#hashCode()
-   */
-  public int hashCode()
-  {
-    return signature.hashCode();
-  }
-
-  /**
-   * @see java.lang.Object#equals(Object)
-   */
-  public boolean equals(Object o)
-  {
-    if (o instanceof OperationSignature)
-      return signature.equals(((OperationSignature) o).getSignature());
-    return false;
-  }
-
-  /**
-   * The method matches operation based on the given SOAP message request,
-   * WSDL binding, and soapAction.
-   * 
-   * @param inputMessage an SOAP message request.
-   * @param soapAction a soap action.
-   * @param binding a WSDL binding.
-   * @param registry a types registry.
-   * @return OperationMatch object.
-   */
-  public static OperationMatch matchOperation(
-    Document inputMessage,
-    String soapAction,
-    Binding binding,
-    TypesRegistry registry)
-  {
-    return matchOperation(inputMessage, soapAction, binding, registry, true);
-  }
-
-  /**
-     * The method matches operation based on the given SOAP message request,
-     * WSDL binding, and soapAction.
-     * 
-     * @param inputMessage SOAP message request.
-     * @param soapAction a soap action.
-     * @param binding a WSDL binding.
-     * @param registry a types registry.
-     * @param soapActionRequired must process the soapAction value even if it is null 
-     * @return OperationMatch object.
-     */
-  public static OperationMatch matchOperation(
-    Document inputMessage,
-    String soapAction,
-    Binding binding,
-    TypesRegistry registry,
-    boolean soapActionRequired)
-  {
-    // Parse request message
-    OperationSignature signature = new OperationSignature(inputMessage);
-    if (!signature.isCreated())
-      return null;
-
-    // first of all looking for document style
-    // because rpc style is subset of document style  
-    OperationSignature.Visitor resolver =
-      signature.new Visitor(WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC, registry);
-
-    // normalize SOAPAction
-    if (soapAction != null
-      && soapAction.length() > 1
-      && soapAction.charAt(0) == '"'
-      && soapAction.charAt(soapAction.length() - 1) == '"')
-      soapAction = soapAction.substring(1, soapAction.length() - 1);
-
-    //      if soap action URI processing required
-    // if soap action URI processing required 
-    // analyze SOAPAction after parts being processed
-    // put SOAPAction into signature
-    //if (soapAction != null && soapAction.length() > 0) {
-    if (soapAction != null)
-    {
-      signature.getSignature().add(0, soapAction);
-    }
-
-    if (soapActionRequired)
-      resolver.setSOAPActionRequired();
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(resolver);
-    traversal.setVisitor(resolver);
-    traversal.visitSOAPBinding(true);
-    traversal.visitSOAPBody(true);
-    traversal.visitSOAPOperation(true);
-
-    traversal.ignoreReferences();
-    traversal.ignoreBindingOutput();
-    traversal.traverse(binding);
-
-    BindingOperation operation = resolver.getMatchedOperation();
-    if (operation == null && !signature.isDocumentStyle())
-    {
-      resolver.setRequiredStyle(WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC);
-      signature.createRPCSignature();
-      traversal.traverse(binding);
-      operation = resolver.getMatchedOperation();
-      if (operation == null)
-        return null;
-    }
-
-    return new OperationMatch(
-      resolver.requiredStyle,
-      signature.getSignature(),
-      resolver.getMatchedOperation());
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Pair.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Pair.java
deleted file mode 100644
index 471a192..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Pair.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-/**
- * The class represents pair of values.
- * 
- * @author Kulik
- */
-public final class Pair
-{
-  final private Object first;
-  final private Object second;
-
-  /**
-   * Constructor.
-   * @param first object
-   * @param second object.
-   */
-  public Pair(Object first, Object second)
-  {
-    this.first = first;
-    this.second = second;
-  }
-
-  /**
-   * Gets first object.
-   * @return Object
-   */
-  public Object getFirst()
-  {
-    return first;
-  }
-
-  /**
-   * Gets second object.
-   * @return Object
-   */
-  public Object getSecond()
-  {
-    return second;
-  }
-
-  /**
-   * @see java.lang.Object#equals(Object)
-   */
-  public boolean equals(Object o)
-  {
-    if (o == null || !(o instanceof Pair))
-      return false;
-    Pair p = (Pair) o;
-    return (
-      NullUtil.equals(p.getFirst(), first)
-        && NullUtil.equals(p.getSecond(), second));
-  }
-
-  /**
-   * @see java.lang.Object#hashCode()
-   */
-  public int hashCode()
-  {
-    int code = 0;
-    if (first != null)
-      code += first.hashCode();
-    if (second != null)
-      code += second.hashCode();
-    return code;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/SetCookie2Validator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/SetCookie2Validator.java
deleted file mode 100644
index 5982e3a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/SetCookie2Validator.java
+++ /dev/null

@@ -1,629 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Vector;
-
-/**
- * This class checks the cookies conform to RFC2965.
- * 
- * @author Baltak
- */
-public class SetCookie2Validator
-{
-
-  private Vector commentVect = new Vector();
-  private Vector commentURLVect = new Vector();
-  private Vector domainVect = new Vector();
-  private Vector max_AgeVect = new Vector();
-  private Vector pathVect = new Vector();
-  private Vector portVect = new Vector();
-  private Vector versionVect = new Vector();
-
-  private boolean path = false;
-
-  /**
-   * Method resetFlags.
-   */
-  private void resetPath()
-  {
-    path = false;
-  }
-
-  /**
-   * Check if the string satisfy the "Set-Cookie2" header value.
-   * @param str String 
-   * @return boolean
-   */
-  public boolean isSetCookie2(String str)
-  {
-
-    try
-    {
-      int index = 0;
-      int newIndex = 0;
-      while (true)
-      {
-        newIndex = getLastCookie(str, index);
-        if (index == newIndex)
-          return false;
-        // skip spaces
-        index = newIndex;
-        index = skipSpaces(str, index);
-        if (index == str.length())
-        {
-          return true;
-        }
-        else
-        {
-          if (str.charAt(index) != ',')
-            return false;
-          index++;
-          // skip spaces
-          index = skipSpaces(str, index);
-        }
-
-      }
-    }
-    catch (Throwable th)
-    {
-      return false;
-    }
-
-  }
-
-  /**
-   * Method getLastCookie.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastCookie(String str, int startIndex)
-  {
-
-    resetPath();
-
-    int index = startIndex;
-    // find token
-    int newIndex = BasicRules.getLastToken(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    index = newIndex;
-    if (index == str.length())
-      return startIndex;
-
-    // if not '=' - error
-    if (str.charAt(index) != '=')
-      return startIndex;
-
-    index++;
-    if (index == str.length())
-      return startIndex;
-
-    // get value
-    newIndex = getLastValue(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    while (true)
-    {
-      index = newIndex;
-      if (index == str.length())
-        return index;
-
-      if (str.charAt(index) != ';')
-        return index;
-      index++;
-      // skip spaces
-      index = skipSpaces(str, index);
-
-      if (index == str.length())
-        return startIndex;
-      newIndex = getLastSetCookieAv(str, index);
-      if (index == newIndex)
-        return startIndex;
-    }
-  }
-
-  /**
-   * Method getLastValue.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastValue(String str, int startIndex)
-  {
-
-    int index = BasicRules.getLastToken(str, startIndex);
-    if (index != startIndex)
-      return index;
-    index = BasicRules.getLastQuotedString(str, startIndex);
-    if (index != startIndex)
-      return index;
-
-    return startIndex;
-  }
-
-  /**
-   * Method getLastSetCookieAv.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastSetCookieAv(String str, int startIndex)
-  {
-
-    int index = startIndex;
-    int newIndex = 0;
-
-    if (str.startsWith("Comment=", index))
-    {
-      index += "Comment=".length();
-      newIndex = getLastValue(str, index);
-      if (index == newIndex)
-        return startIndex;
-      // debug ->
-      String qqq = getValue(str, index, newIndex);
-      commentVect.add(qqq);
-      // debug <-
-      return newIndex;
-    }
-    else if (str.startsWith("CommentURL=", index))
-    {
-      index += "CommentURL=".length();
-
-      if (str.charAt(index) != '\"')
-        return startIndex;
-
-      newIndex = str.indexOf('\"', index + 1);
-      if (newIndex == -1)
-        return startIndex;
-      try
-      {
-        new URL(str.substring(index + 1, newIndex));
-      }
-      catch (MalformedURLException mue)
-      {
-        return startIndex;
-      }
-      // debug ->
-      String qqq = getValue(str, index + 1, newIndex);
-      commentURLVect.add(qqq);
-      // debug <-
-      newIndex++;
-      return newIndex;
-    }
-    else if (str.startsWith("Discard", index))
-    {
-      return startIndex + "Discard".length();
-    }
-    else if (str.startsWith("Domain=", index))
-    {
-      index += "Domain=".length();
-
-      newIndex = getLastValue(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      // debug ->
-      String qqq = getValue(str, index, newIndex);
-      domainVect.add(qqq);
-      // debug <-
-      return newIndex;
-    }
-    else if (str.startsWith("Max-Age=", index))
-    {
-      index += "Max-Age=".length();
-
-      newIndex = getLastValue(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      String qqq = getValue(str, index, newIndex);
-      try
-      {
-        Integer.parseInt(qqq);
-      }
-      catch (NumberFormatException nfe)
-      {
-        return startIndex;
-      }
-      // debug ->
-      max_AgeVect.add(qqq);
-      // debug <-
-      return newIndex;
-    }
-    else if (str.startsWith("Path=", index))
-    {
-      index += "Path=".length();
-
-      newIndex = getLastValue(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      String qqq = getValue(str, index, newIndex);
-      if (path == false)
-        pathVect.add(qqq);
-      path = true;
-      return newIndex;
-    }
-    else if (str.startsWith("Port", index))
-    {
-      index += "Port".length();
-      if (str.charAt(index) != '=')
-        return index;
-
-      index++;
-      if (str.charAt(index) != '\"')
-        return startIndex;
-
-      index++;
-      newIndex = getLastPortList(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      // debug ->
-      String qqq = getValue(str, index, newIndex);
-      portVect.add(qqq);
-      // debug <-
-
-      index = newIndex;
-      if (str.charAt(index) != '\"')
-        return startIndex;
-      index++;
-      return index;
-
-    }
-    else if (str.startsWith("Secure", index))
-    {
-      return startIndex + "Secure".length();
-    }
-    else if (str.startsWith("Version=", index))
-    {
-      index += "Version=".length();
-
-      newIndex = getLastDIGIT(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      // debug ->
-      String qqq = getValue(str, index, newIndex);
-      versionVect.add(qqq);
-      // debug <-
-      return newIndex;
-    }
-    else
-    {
-      return startIndex;
-    }
-  }
-
-  /**
-   * Method getLastPortList.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastPortList(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-
-    while (true)
-    {
-      newIndex = getLastDIGIT(str, index);
-      if (index == newIndex)
-        return startIndex;
-
-      index = newIndex;
-      if (str.charAt(index) != ',')
-        return index;
-      index++;
-    }
-  }
-
-  /**
-   * Method getLastDIGIT.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastDIGIT(String str, int startIndex)
-  {
-    int index = startIndex;
-    for (; index < str.length(); index++)
-    {
-      if (!BasicRules.isDIGIT(str.charAt(index)))
-        return index;
-    }
-    return index;
-  }
-
-  /**
-   * Check if the string satisfy the "Cookie" header value.
-   * @param str String
-   * @return boolean
-   */
-  public boolean isCookie(String str)
-  {
-    int index = 0;
-    int newIndex = 0;
-
-    try
-    {
-      newIndex = getLastVersion(str, index);
-      if (index == newIndex)
-        return false;
-
-      index = newIndex;
-      index = skipSpaces(str, index);
-      if (str.charAt(index) != ';' && str.charAt(index) != ',')
-        return false;
-
-      index++;
-      index = skipSpaces(str, index);
-
-      while (true)
-      {
-        newIndex = getLastCookiesValue(str, index);
-        if (index == newIndex)
-          return false;
-
-        index = newIndex;
-        if (index == str.length())
-          return true;
-
-        if (str.charAt(index) != ';' && str.charAt(index) != ',')
-          return false;
-        index++;
-        index = skipSpaces(str, index);
-      }
-    }
-    catch (Throwable th)
-    {
-      return false;
-    }
-  }
-
-  /**
-   * Method getLastVersion.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastVersion(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-    if (!str.startsWith("$Version="))
-      return startIndex;
-    index += "$Version=".length();
-    newIndex = getLastValue(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    return newIndex;
-  }
-
-  /**
-   * Method getLastCookiesValue.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastCookiesValue(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-    int oldIndex = 0;
-
-    // find token
-    newIndex = BasicRules.getLastToken(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    index = newIndex;
-    if (index == str.length())
-      return startIndex;
-
-    // if not '=' - error
-    if (str.charAt(index) != '=')
-      return startIndex;
-
-    index++;
-    if (index == str.length())
-      return startIndex;
-
-    // get value
-    newIndex = getLastValue(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    index = newIndex;
-    if (index == str.length())
-      return index;
-
-    if (str.charAt(index) != ';')
-      return index;
-
-    // process [";" path] [";" domain] [";" port] 
-    oldIndex = index;
-    index++;
-    if (index == str.length())
-      return startIndex;
-
-    index = skipSpaces(str, index);
-    if (index == str.length())
-      return startIndex;
-
-    // process path
-    newIndex = getLastPath(str, index);
-    if (index != newIndex)
-    {
-      index = newIndex;
-      if (index == str.length())
-        return index;
-
-      if (str.charAt(index) != ';')
-        return index;
-
-      oldIndex = index;
-      index++;
-      if (index == str.length())
-        return startIndex;
-
-      index = skipSpaces(str, index);
-      if (index == str.length())
-        return startIndex;
-
-    }
-
-    // process domain
-    newIndex = getLastDomain(str, index);
-    if (index != newIndex)
-    {
-      index = newIndex;
-      if (index == str.length())
-        return index;
-
-      if (str.charAt(index) != ';')
-        return index;
-
-      oldIndex = index;
-      index++;
-      if (index == str.length())
-        return startIndex;
-
-      index = skipSpaces(str, index);
-      if (index == str.length())
-        return startIndex;
-
-    }
-
-    // process port
-    newIndex = getLastPort(str, index);
-    if (index != newIndex)
-      return newIndex;
-    else
-      return oldIndex;
-  }
-
-  /**
-   * Method getLastPath.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastPath(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-
-    if (!str.startsWith("$Path=", index))
-      return startIndex;
-    index += "$Path=".length();
-    newIndex = getLastValue(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    return newIndex;
-  }
-
-  /**
-   * Method getLastDomain.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastDomain(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-
-    if (!str.startsWith("$Domain=", index))
-      return startIndex;
-    index += "$Domain=".length();
-    newIndex = getLastValue(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    return newIndex;
-  }
-
-  /**
-   * Method getLastPort.
-   * @param str
-   * @param startIndex
-   * @return int
-   */
-  private int getLastPort(String str, int startIndex)
-  {
-    int index = startIndex;
-    int newIndex = 0;
-
-    if (!str.startsWith("$Port", index))
-      return startIndex;
-
-    index += "$Port".length();
-    if (str.charAt(index) != '=')
-      return index;
-
-    index++;
-    if (str.charAt(index) != '\"')
-      return startIndex;
-
-    index++;
-    newIndex = getLastPortList(str, index);
-    if (index == newIndex)
-      return startIndex;
-
-    index = newIndex;
-    if (str.charAt(index) != '\"')
-      return startIndex;
-    index++;
-    return index;
-  }
-
-  /**
-   * Method skipSpaces.
-   * @param str
-   * @param index
-   * @return int
-   */
-  private int skipSpaces(String str, int index)
-  {
-    for (; index < str.length(); index++)
-      if (!BasicRules.isSP(str.charAt(index)))
-        break;
-    return index;
-  }
-
-  /**
-   * Method getValue.
-   * @param str
-   * @param beg
-   * @param end
-   * @return String
-   */
-  private String getValue(String str, int beg, int end)
-  {
-    String qqq = null;
-    if (str.charAt(beg) == '\"')
-      qqq = str.substring(beg + 1, end - 1);
-    else
-      qqq = str.substring(beg, end);
-    return qqq;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/StringTokenizer.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/StringTokenizer.java
deleted file mode 100644
index 5c95398..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/StringTokenizer.java
+++ /dev/null

@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- ********************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-/**
- * String tokenizer.
- * 
- * @author: Kulik
- */
-final public class StringTokenizer
-{
-  private char[] spaceDel;
-  private char[] del;
-  private char[] allDel;
-
-  /**
-   * Enumeration of strings.
-  * @author Kulik
-   */
-  private class StringTokenizerEnumeration implements java.util.Enumeration
-  {
-    private final char[] str;
-    private final int size;
-    private int index;
-
-    /**
-     * Constructor.
-     * @param s
-     */
-    StringTokenizerEnumeration(char[] s)
-    {
-      str = s;
-      size = str.length;
-      index = 0;
-
-      // skip space delimiters
-      while (index < size && contain(str[index], spaceDel))
-        index++;
-    }
-
-    /**
-     * @see java.util.Enumeration#hasMoreElements()
-     */
-    public boolean hasMoreElements()
-    {
-      return (index < size);
-    }
-
-    /**
-     * @see java.util.Enumeration#nextElement()
-     */
-    public Object nextElement()
-    {
-      if (index >= size)
-        throw new java.util.NoSuchElementException(
-          "StringTokenizer enumeration");
-
-      // skip delimiters
-      int begStr = index;
-      if (index < size && contain(str[index], del))
-        index++;
-
-      // skip word
-      if (begStr == index)
-        while (index < size && !contain(str[index], allDel))
-          index++;
-
-      int endStr = index;
-
-      // skip space delimiters
-      while (index < size && contain(str[index], spaceDel))
-        index++;
-
-      return String.copyValueOf(str, begStr, endStr - begStr);
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-      int i = index;
-      String s = (String) nextElement();
-      index = i;
-      return s;
-    }
-  }
-
-  /**
-   * StringTokenizer constructor.
-     * @param spaceDelimiters the set of delimiters to be ignored
-     * @param delimiters the set of delimiters to be remained.
-   */
-  public StringTokenizer(char[] spaceDelimiters, char[] delimiters)
-  {
-    super();
-
-    if (spaceDelimiters != null)
-    {
-      spaceDel = new char[spaceDelimiters.length];
-      System.arraycopy(spaceDelimiters, 0, spaceDel, 0, spaceDelimiters.length);
-      sort(spaceDel);
-    }
-    else
-      spaceDel = null;
-
-    if (delimiters != null)
-    {
-      del = new char[delimiters.length];
-      System.arraycopy(delimiters, 0, del, 0, delimiters.length);
-      sort(del);
-    }
-    else
-      del = null;
-
-    if (del != null && spaceDel != null)
-    {
-      allDel = new char[del.length + spaceDel.length];
-      System.arraycopy(del, 0, allDel, 0, del.length);
-      System.arraycopy(spaceDel, 0, allDel, del.length, spaceDel.length);
-    }
-    else if (del != null)
-      allDel = del;
-    else
-      allDel = spaceDel;
-
-    sort(allDel);
-  }
-  /**
-   * Parses string.
-   * @return java.util.Enumeration
-   * @param s java.lang.String
-   */
-  public java.util.Enumeration parse(String s)
-  {
-    if (s == null)
-      throw new IllegalArgumentException("StringTokenizer : String cannot be NULL");
-
-    return new StringTokenizerEnumeration(s.toCharArray());
-  }
-
-  /**
-   * Binary search.
-   * @return boolean
-   * @param c char
-   */
-  private static boolean contain(char c, char[] a)
-  {
-    if (a == null)
-      return false;
-
-    int l = 0, r = a.length - 1, center;
-    while (l < r)
-    {
-      center = (l + r) / 2;
-      if (c > a[center])
-        l = center + 1;
-      else
-        r = center;
-    }
-
-    return a[l] == c;
-  }
-  /**
-   * Heap sort
-   * @param c char[]
-   */
-  static private void sort(char[] c)
-  {
-    if (c != null)
-    {
-      int j, k;
-      char ci;
-
-      // push heap
-      for (int i = 1; i < c.length; i++)
-      {
-        j = ((k = i) - 1) / 2;
-        ci = c[i];
-        while (k > 0 && c[j] < ci)
-        {
-          c[k] = c[j];
-          j = ((k = j) - 1) / 2;
-        }
-        c[k] = ci;
-      }
-
-      // pop heap
-      for (int i = c.length - 1; i > 0; i--)
-      {
-        j = 2;
-        k = 0;
-        ci = c[0];
-        while (j <= i)
-        {
-          c[k] = (c[j - 1] > c[j]) ? c[--j] : c[j];
-          j = ((k = j) + 1) * 2;
-        }
-        c[k] = c[i];
-        c[i] = ci;
-      }
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java
deleted file mode 100644
index c0ae945..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java
+++ /dev/null

@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Element;
-
-/**
- * Test Utility class.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public final class TestUtils
-{
-  /**
-   * Format a style sheet declaration from the addStyleSheet element.
-   * @param element an Element object.
-   * @param addStyleSheet an addStyleSheet element.
-   * @param defaultHref default href.
-   */
-  public static final void parseAddStyleSheet(
-    Element element,
-    AddStyleSheet addStyleSheet,
-    String defaultHref)
-  {
-    addStyleSheet.setHref(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_HREF, defaultHref));
-    addStyleSheet.setType(
-      XMLUtils.getAttributeValue(
-        element,
-        WSIConstants.ATTR_TYPE,
-        WSIConstants.DEFAULT_XSL_TYPE));
-    addStyleSheet.setTitle(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_TITLE));
-    addStyleSheet.setMedia(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_MEDIA));
-    addStyleSheet.setCharset(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_CHARSET));
-    addStyleSheet.setAlternate(
-      XMLUtils.getAttributeValue(element, WSIConstants.ATTR_ALTERNATE));
-  }
-
-  /**
-   * Display tool name and copyright notice.
-   * @param toolInfo a ToolInfo object.
-   */
-  public static void printToolInfo(ToolInfo toolInfo)
-  {
-    System.out.println(
-      "Conformance "
-        + toolInfo.getName()
-        + " Tool"
-        + ", Version: "
-        + toolInfo.getVersion()
-        + ", Release Date: "
-        + toolInfo.getReleaseDate());
-    System.out.println(WSIConstants.COPYRIGHT);
-    System.out.println(" ");
-  }
-
-  /** 
-   * Get XML comment used in log and report file.
-   * @return XML comment used in log and report file.
-   */
-  public static String getXMLComment()
-  {
-    String comment = null;
-    String readLine = null;
-
-    try
-    {
-      // Add required comments (copyright, etc.)
-      BufferedReader bufferedReader =
-        new BufferedReader(
-          new InputStreamReader(
-            Utils.getInputStream(WSIConstants.COMMENTS_FILE)));
-
-      // Initialize string to empty string
-      comment = "";
-
-      while (bufferedReader.ready())
-      {
-        if ((readLine = bufferedReader.readLine()) != null)
-          comment += readLine + WSIConstants.LINE_SEPARATOR;
-      }
-    }
-
-    catch (Exception e)
-    {
-      // Ignore exception and just return null
-    }
-
-    return comment;
-  }
-
-  /**
-   * Get schema location for XML schema.
-   * @return schema location for XML schema.
-   */
-  public static String getXMLSchemaLocation()
-  {
-    return getSchemaLocation(
-      WSIProperties.PROP_XML_SCHEMA,
-      WSIProperties.DEF_XML_SCHEMA);
-  }
-
-  /**
-   * Get SOAP schema location.
-   * @return SOAP schema location.
-   */
-  public static String getSOAPSchemaLocation()
-  {
-    return getSchemaLocation(
-      WSIProperties.PROP_SOAP_SCHEMA,
-      WSIProperties.DEF_SOAP_SCHEMA);
-  }
-
-  /**
-   * Get WSDL schema location.
-   * @return WSDL schema location.
-   */
-  public static String getWSDLSchemaLocation()
-  {
-    return getSchemaLocation(
-      WSIProperties.PROP_WSDL_SCHEMA,
-      WSIProperties.DEF_WSDL_SCHEMA);
-  }
-
-  /**
-  * Get WSDL SOAP schema location.
-  * @return WSDL SOAP schema location.
-  */
-  public static String getWSDLSOAPSchemaLocation()
-  {
-    return getSchemaLocation(
-      WSIProperties.PROP_WSDL_SOAP_SCHEMA,
-      WSIProperties.DEF_WSDL_SOAP_SCHEMA);
-  }
-  /**
-   * Get WSDL schema location.
-   * @return WSDL schema location.
-   */
-  private static String getSchemaLocation(
-    String propertyName,
-    String defaultValue)
-  {
-    //String schemaLocation = null;
-
-    // Get the wsi.home system property
-    //String wsiHome = System.getProperty(WSIProperties.PROP_WSI_HOME);
-    //String fileLocation = WSIProperties.getProperty(propertyName, defaultValue);
-    //
-    // If the file location is specified in the wsi.properties file then build location
-    //if (fileLocation != null)
-    //{
-    // If wsi.home is set, then use it
-    //  if (wsiHome != null)
-    //  {
-    //     schemaLocation = wsiHome;
-    //   }
-    //   if (schemaLocation == null)
-    //   {
-    //    schemaLocation = fileLocation;
-    //  }
-    //  else
-    //  {
-    //   if (!schemaLocation.endsWith("/"))
-    //    {
-    //     schemaLocation += "/";
-    //   }
-    //
-    //    schemaLocation += fileLocation;
-    //  }
-    // }
-    return defaultValue;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java
deleted file mode 100644
index 6c12b28..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java
+++ /dev/null

@@ -1,577 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.profile.validator.BaseValidator;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversal;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLTraversalContext;
-import org.eclipse.wst.wsi.internal.core.wsdl.traversal.WSDLVisitor;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * The class extracts XSD schema information from the given WSDL.
- * 
- * @author Kulik
- */
-public final class TypesRegistry implements WSITag, WSDLVisitor
-{
-  List schemaProcessedList = new ArrayList();
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Part, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Part obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Service, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Service obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Types, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Types obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Operation, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Operation obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Input, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Input obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Output, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Output obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Fault, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Fault obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Binding, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Binding obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(BindingOperation, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(
-    BindingOperation obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(BindingInput, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(BindingInput obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(BindingOutput, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(BindingOutput obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(BindingFault, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(BindingFault obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Element, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Element obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Message, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Message obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Port, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Port obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(PortType, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(PortType obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(Definition, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(Definition obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(ExtensibilityElement,
-   * Object, WSDLTraversalContext)
-   */
-  public void visit(
-    ExtensibilityElement obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPBinding, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(SOAPBinding obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPBody, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(SOAPBody obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPHeader, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(SOAPHeader obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPHeaderFault, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(
-    SOAPHeaderFault obj,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPFault, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(SOAPFault obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(SOAPOperation, Object,
-   * WSDLTraversalContext)
-   */
-  public void visit(SOAPOperation obj, Object parent, WSDLTraversalContext ctx)
-  {
-  }
-
-  private Map element2Type = new HashMap();
-  private Set extendsArray = new HashSet();
-  private Set usesWsdlArrayType = new HashSet();
-
-  protected BaseValidator baseValidator = null;
- 
-  /**
-   * Constructor creates the types registry. by the given WSDL definition
-   * object.
-   * 
-   * @param def a WSDL definition.
-   * @param baseValidator a base validator.
-   */
-  public TypesRegistry(Definition def, BaseValidator baseValidator)
-  {
-    this.baseValidator = baseValidator;
-    if (def == null)
-      throw new IllegalArgumentException("Definition can not be null");
-
-    WSDLTraversal traversal = new WSDLTraversal();
-    //VisitorAdaptor.adapt(this);
-    traversal.setVisitor(this);
-    traversal.visitImport(true);
-    
-    processTypes(def.getTypes(), def.getDocumentBaseURI());
-    traversal.traverse(def);
-  }
-
-  /**
-   * Constructor creates the types registry by given WSDL types object and
-   * location context URI.
-   * @param types WSDL types object.
-   * @param context location context URI.
-   * @param baseValidator a base validator.
-   */
-  public TypesRegistry(
-    Types types,
-    String context,
-    BaseValidator baseValidator)
-  {
-    this.baseValidator = baseValidator;
-    processTypes(types, context);
-  }
-
-  /**
-   * The method returns type's qname by given element's qname.
-   * @param elementName a qualified element name.
-   * @return type's qname by given element's qname.
-   */
-  public QName getType(QName elementName)
-  {
-    return (QName) element2Type.get(elementName);
-  }
-
-  /**
-   * The method returns set of types which is array attribute.
-   * @return set of types which is array attribute.
-   */
-  public Set getArrayTypes()
-  {
-    Set s = new HashSet();
-    s.addAll((Collection) usesWsdlArrayType);
-    s.addAll((Collection) extendsArray);
-    return s;
-  }
-
-  /**
-   * The method returns set of elements defined in types element.
-   * @return set of elements defined in types element.
-   */
-  public Set getElementList()
-  {
-    return this.element2Type.keySet();
-  }
-
-  /**
-   * The method returns true if the given type declares wsdl:arrayType
-   * attribute within declaration.
-   * @param type a type.
-   * @return true if the given type declares wsdl:arrayType
-   * attribute within declaration.
-   */
-  public boolean isUsesWSDLArrayType(QName type)
-  {
-    return usesWsdlArrayType.contains(type);
-  }
-
-  /**
-   * The method returns true if given type extends soapenc:Array type.
-   * @param type a type.
-   * @return true if given type extends soapenc:Array type.
-   */
-  public boolean isExtendsArray(QName type)
-  {
-    return extendsArray.contains(type);
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.wsdl.traversal.WSDLVisitor#visit(javax.wsdl.Import, java.lang.Object, org.wsi.wsdl.traversal.WSDLTraversalContext)
-   */
-  public void visit(Import im, Object parent, WSDLTraversalContext ctx)
-  {
-    if (im.getDefinition() != null)
-      processWSDL(im.getDefinition());
-  }
-
-  /**
-   * Internal method processes WSDL definition.
-   * @param def a WSDL definition.
-   */
-  private void processWSDL(Definition def)
-  {
-    if (def.getTypes() != null)
-      processTypes(def.getTypes(), def.getDocumentBaseURI());
-  }
-
-  /**
-   * Internal method processes WSDL types.
-   * @param types WSDL types.
-   * @param context a context.
-   */
-  private void processTypes(Types types, String context)
-  {
-    if (types == null)
-      return;
-    List exts = types.getExtensibilityElements();
-    if (exts != null)
-    {
-      Iterator it = exts.iterator();
-      while (it.hasNext())
-      {
-        ExtensibilityElement el = (ExtensibilityElement) it.next();
-        if (el instanceof UnknownExtensibilityElement)
-          searchForSchema(
-            ((UnknownExtensibilityElement) el).getElement(),
-            context);
-      }
-    }
-  }
-
-  /**
-   * Internal method searches XSD schema declaration and XSD import
-   * statements.
-   * @param n
-   * @param context
-   */
-  private void searchForSchema(Node n, String context)
-  {
-    while (n != null)
-    {
-      // searches for xsd:import element
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        // if xsd:schema element is found -> process schema
-        if (XMLUtils.equals(n, ELEM_XSD_SCHEMA))
-          processSchema(n, context);
-      }
-      n = n.getNextSibling();
-    }
-  }
-
-  /**
-   * Internal method loads XSD schema by using schema location and
-   * location context.
-   * @param importNode
-   * @param context
-   */
-  private void loadSchema(Node importNode, String context)
-  {
-    Element im = (Element) importNode;
-    Attr schemaLocation = XMLUtils.getAttribute(im, ATTR_XSD_SCHEMALOCATION);
-	
-    // try to parse imported XSD
-    if (schemaLocation != null && schemaLocation.getValue() != null)
-      try
-      {
-    	String urlString = XMLUtils.createURLString(schemaLocation.getValue(), context);
-    	if (!schemaProcessedList.contains(urlString))
-    	{
-          // if any error or root element is not XSD schema -> error
-          Document schema =
-            baseValidator.parseXMLDocumentURL(
-              schemaLocation.getValue(),
-              context,
-              null);
-          schemaProcessedList.add(urlString);
-          if (XMLUtils.equals(schema.getDocumentElement(), ELEM_XSD_SCHEMA))
-            processSchema(
-              schema.getDocumentElement(),
-              urlString);
-    	}
-      }
-      catch (Throwable t)
-      {
-        //t.printStackTrace();
-        // nothing. it's not a schema
-      }
-  }
-
-  /**
-   * Internal method processes XSD schema and retrieves types declaration from
-   * it.
-   * @param schema
-   * @param context
-   */
-  private void processSchema(Node schema, String context)
-  {
-    Attr a = XMLUtils.getAttribute((Element) schema, ATTR_XSD_TARGETNAMESPACE);
-    String targetNamespace = (a != null) ? a.getValue() : "";
-    // iterate schema
-    Node n = schema.getFirstChild();
-    // !! we suppose that xsd:import element is occured only within xsd:schema element        
-    while (n != null)
-    {
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        if (XMLUtils.equals(n, ELEM_XSD_ELEMENT))
-        {
-          Element el = (Element) n;
-          a = XMLUtils.getAttribute(el, ATTR_XSD_NAME);
-          QName element =
-            new QName(targetNamespace, (a != null) ? a.getValue() : "");
-
-          a = XMLUtils.getAttribute(el, ATTR_XSD_TYPE);
-          QName type = null;
-          if (a != null)
-          {
-            String t = a.getValue();
-            // if type contains ':', it means that it contains qname
-            int i = t.indexOf(':');
-            if (i != -1)
-            {
-              String prefix = t.substring(0, i);
-              String nsURI = XMLUtils.findNamespaceURI(n, prefix);
-              type = new QName(nsURI, t.substring(i + 1));
-            }
-            else
-              type = new QName(targetNamespace, t);
-          }
-          else
-          {
-            // suppose that element directly contains type declaration
-            type = element;
-            checkType(n, type);
-          }
-
-          element2Type.put(element, type);
-        }
-        else if (XMLUtils.equals(n, ELEM_XSD_IMPORT))
-          loadSchema(n, context);
-        else if (XMLUtils.equals(n, ELEM_XSD_INCLUDE))
-            loadSchema(n, context);
-        else if (XMLUtils.equals(n, ELEM_XSD_COMPLEXTYPE))
-        {
-          Element el = (Element) n;
-          a = XMLUtils.getAttribute(el, ATTR_XSD_NAME);
-          QName type =
-            new QName(targetNamespace, (a != null) ? a.getValue() : "");
-          checkType(n, type);
-        }
-
-      }
-
-      n = n.getNextSibling();
-    }
-  }
-
-  /**
-   * Internal method checks whether specified type has WSDL array type
-   * attribute in the XSD declaration.
-   * @param n
-   * @param name
-   */
-  private void checkType(Node n, QName name)
-  {
-    while (n != null)
-    {
-      if (Node.ELEMENT_NODE == n.getNodeType())
-      {
-        // check such sentence
-        //              xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="tns:MyArray2Type[]"/>
-        if (XMLUtils.equals(n, ELEM_XSD_ATTRIBUTE))
-        {
-          Attr a = XMLUtils.getAttribute((Element) n, ATTR_WSDL_ARRAYTYPE);
-          if (a != null)
-            usesWsdlArrayType.add(name);
-        }
-
-        // retrieve base attribute may be from restriction or extension
-        Attr a = XMLUtils.getAttribute((Element) n, ATTR_XSD_BASE);
-        if (a != null)
-        {
-          String base = a.getValue();
-          int i = base.indexOf(":");
-          if (i != -1)
-          {
-            String prefix = base.substring(0, i);
-            String local = base.substring(i + 1);
-            String namespace = XMLUtils.findNamespaceURI(n, prefix);
-            if (SOAPENC_ARRAY.equals(new QName(namespace, local)))
-              extendsArray.add(name);
-          }
-        }
-        checkType(n.getFirstChild(), name);
-      }
-      n = n.getNextSibling();
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/UDDIUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/UDDIUtils.java
deleted file mode 100644
index c572363..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/UDDIUtils.java
+++ /dev/null

@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.binding.TModelInstanceInfo;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BusinessDetail;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelList;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.FindQualifier;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.KeyedReference;
-
-/**
- * This class provide some service functions used by UDDIValidator.
- *
- * @version 1.0.1
- * @author Peter Brittenham
- */
-public final class UDDIUtils
-{
-  static public final FindQualifiers EXACT_NAME_MATCH_QUALIFIER;
-  static {
-    Vector vector = new Vector();
-    EXACT_NAME_MATCH_QUALIFIER = new FindQualifiers();
-    vector.add(new FindQualifier(FindQualifier.exactNameMatch));
-    vector.add(new FindQualifier(FindQualifier.sortByNameAsc));
-    EXACT_NAME_MATCH_QUALIFIER.setFindQualifierVector(vector);
-  }
-
-  static final String WS_I_CONFORMANCE_TMODEL_NAME =
-    "ws-i-org:conformsTo:2002_12";
-
-  static private Hashtable wsiConformanceTable = new Hashtable();
-
-  /**
-   * Gets a business service by key.
-   * @param proxy  a UDDI proxy.
-   * @param key    a key to a business service.
-   * @return a business service specified by the given key.
-   * @throws TransportException if error originating within the SOAP transport.
-   * @throws UDDIException if the return value of a UDDI API cannot indicate an error condition.
-   */
-  public static BusinessService getBusinessServiceByKey(
-    UDDIProxy proxy,
-    String key)
-    throws TransportException, UDDIException
-  {
-    BusinessService result = null;
-
-    ServiceDetail sd = proxy.get_serviceDetail(key);
-
-    if (sd != null)
-    {
-      Vector v = sd.getBusinessServiceVector();
-
-      if (v != null && v.size() > 0)
-      {
-        result = (BusinessService) v.firstElement();
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * Gets business entity by key.
-   * @param proxy  a UDDI proxy.
-   * @param key    a key to a business entiy.
-   * @return a business entity specified by the given key.
-   * @throws TransportException if error originating within the SOAP transport.
-   * @throws UDDIException if the return value of a UDDI API cannot indicate 
-   *         an error condition.
-   */
-  public static BusinessEntity getBusinessByKey(UDDIProxy proxy, String key)
-    throws TransportException, UDDIException
-  {
-    BusinessEntity result = null;
-
-    BusinessDetail bd = proxy.get_businessDetail(key);
-
-    if (bd != null)
-    {
-      Vector v = bd.getBusinessEntityVector();
-
-      if (v != null && v.size() > 0)
-      {
-        result = (BusinessEntity) v.firstElement();
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * Gets a tModel by key.
-   * @param proxy  a UDDI proxy.
-   * @param key    a key to a tModel.
-   * @return a tModel specified by the given key.
-   * @throws TransportException if error originating within the SOAP transport.
-   * @throws UDDIException if the return value of a UDDI API cannot indicate 
-   *         an error condition.
-   */
-  public static TModel getTModelByKey(UDDIProxy proxy, String key)
-  {
-    TModel result = null;
-
-    try
-    {
-      TModelDetail bd = proxy.get_tModelDetail(key);
-
-      if (bd != null)
-      {
-        Vector v = bd.getTModelVector();
-
-        if (v != null && v.size() > 0)
-        {
-          result = (TModel) v.firstElement();
-        }
-      }
-    }
-    catch (Throwable e)
-    {
-    }
-
-    return result;
-  }
-
-  /**
-   * Gets key of the WSI Conformance tModel.
-   * @param proxy  a UDDI proxy.
-   * @return the key of the WSI Conformance tModel.
-   */
-  public static String getWSIConformanceTModelKey(UDDIProxy proxy)
-  {
-    if (proxy == null)
-      throw new IllegalArgumentException("UDDI proxy cannot be null.");
-
-    String result = null;
-
-    if (wsiConformanceTable.containsKey(proxy))
-    {
-      result = wsiConformanceTable.get(proxy).toString();
-    }
-    else
-    {
-      result = getTModelKeyByName(proxy, WS_I_CONFORMANCE_TMODEL_NAME);
-
-      if (result == null)
-      {
-        throw new IllegalStateException("WS-I conformance taxonomy tModel was not found");
-      }
-
-      wsiConformanceTable.put(proxy, result);
-    }
-
-    return result;
-  }
-
-  /**
-   * Gets a tModel key by tModel name.
-   * @param proxy  a UDDI proxy.
-   * @param name   a tModel name.
-   * @return a tModel key specified by the given tModel name.
-   */
-  public static String getTModelKeyByName(UDDIProxy proxy, String name)
-  {
-    String result = null;
-    try
-    {
-      TModelList list =
-        proxy.find_tModel(name, null, null, EXACT_NAME_MATCH_QUALIFIER, 1);
-      TModelInfo info =
-        (TModelInfo) list.getTModelInfos().getTModelInfoVector().firstElement();
-      result = info.getTModelKey();
-    }
-    catch (Throwable e)
-    {
-    }
-
-    return result;
-  }
-
-  /**
-   * Get string representation of bindingTemplate.
-   * @param bindingTemplate  a BindingTemplate object.
-   * @return a string representation of bindingTemplate.
-   */
-  public static String bindingTemplateToString(BindingTemplate bindingTemplate)
-  {
-    String returnString = "";
-
-    if (bindingTemplate == null)
-      returnString = "null";
-
-    else
-    {
-      returnString =
-        "accessPoint: "
-          + (bindingTemplate.getAccessPoint() == null
-            ? "null"
-            : bindingTemplate.getAccessPoint().getText());
-
-      if (bindingTemplate.getTModelInstanceDetails() == null
-        || bindingTemplate
-          .getTModelInstanceDetails()
-          .getTModelInstanceInfoVector()
-          == null)
-      {
-        returnString += ", [no tModel reference]";
-      }
-
-      else
-      {
-        Iterator iterator =
-          bindingTemplate
-            .getTModelInstanceDetails()
-            .getTModelInstanceInfoVector()
-            .iterator();
-
-        int infoCount = 1;
-        TModelInstanceInfo info;
-        while (iterator.hasNext())
-        {
-          info = (TModelInstanceInfo) iterator.next();
-          returnString += ", ["
-            + infoCount++
-            + "] tModelKey: "
-            + info.getTModelKey();
-        }
-      }
-    }
-
-    return returnString;
-  }
-
-  /**
-   * Get string representation of tModel.
-   * @param tModel  a TModel object.
-   * @return a string representation of tModel.
-   */
-  public static String tModelToString(TModel tModel)
-  {
-    String returnString = "";
-
-    if (tModel == null)
-      returnString = "null";
-
-    else
-    {
-      returnString =
-        "name: "
-          + tModel.getNameString()
-          + ", categoryBag: "
-          + (tModel.getCategoryBag() == null
-            ? "null"
-            : categoryBagToString(tModel.getCategoryBag()))
-          + ", overviewURL: "
-          + (tModel.getOverviewDoc() == null
-            ? "null"
-            : tModel.getOverviewDoc().getOverviewURLString());
-    }
-
-    return returnString;
-  }
-
-  /**
-   * Get string representation of categoryBag.
-   * @param categoryBag  a CategoryBag object.
-   * @return a tring representation of categoryBag.
-   */
-  public static String categoryBagToString(CategoryBag categoryBag)
-  {
-    String returnString = "";
-
-    if (categoryBag == null)
-    {
-      returnString += "null";
-    }
-
-    else
-    {
-      returnString += "KeyedReferenceList: ";
-
-      Vector krList = null;
-      if ((krList = categoryBag.getKeyedReferenceVector()) == null)
-      {
-        returnString += "null";
-      }
-
-      else if (krList.size() == 0)
-      {
-        returnString += "empty";
-      }
-
-      else
-      {
-        KeyedReference kr = null;
-        Iterator iterator = krList.iterator();
-        while (iterator.hasNext())
-        {
-          kr = (KeyedReference) iterator.next();
-          returnString += "tModelKey: "
-            + kr.getTModelKey()
-            + ", keyName: "
-            + kr.getKeyName()
-            + ", keyValue: "
-            + kr.getKeyValue();
-        }
-      }
-    }
-
-    return returnString;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java
deleted file mode 100644
index 4540725..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java
+++ /dev/null

@@ -1,1415 +0,0 @@
-/*******************************************************************************
- *
- * Copyright (c) 2002-2003 IBM Corporation, Beacon Information Technology Inc. and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM      - Initial API and implementation
- *   BeaconIT - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.ResourceBundle;
-import java.util.StringTokenizer;
-import java.util.TimeZone;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MimePart;
-import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.log.impl.MimePartImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.MimePartsImpl;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
-/**
- * General set of utilities.
- */
-public final class Utils
-{
-  public static final byte CR = (byte) '\r';
-  public static final byte LF = (byte) '\n';
-
-  /**
-   * Common timestamp format.
-   */
-  //	public static final SimpleDateFormat timestampFormat = new SimpleDateFormat ("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-  public static final SimpleDateFormat timestampFormat =
-    new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
-
-  /**
-   * Basic date format.
-   */
-  public static final SimpleDateFormat dateFormat =
-    new SimpleDateFormat("yyyy-MM-dd");
-
-  /**
-   * Wrapper method for error logging;
-   * for now it just goes to stderr.
-   * @param inError  an error message.
-   */
-  public final static void logError(String inError)
-  {
-    System.err.println("Error: " + inError);
-  }
-
-  /** 
-   * Get exception information as a string.
-   * @param throwable  a Throwable object.
-   * @return exception information as a string.
-   */
-  public final static String getExceptionDetails(Throwable throwable)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    pw.println("Exception: ");
-    throwable.printStackTrace(pw);
-
-    return sw.toString();
-  }
-
-  /**
-   * Get current date and time as a timestamp.
-   * @return urrent date and time as a timestamp.
-   */
-  public static String getTimestamp()
-  {
-    // Use GMT timezone
-    //timestampFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
-    timestampFormat.setTimeZone(TimeZone.getDefault());
-
-    // Return timestamp
-    return timestampFormat.format(new Date());
-  }
-
-  /**
-   * Get current date for default time zone.
-   * @return current date for default time zone.
-   */
-  public static String getDate()
-  {
-    // Use GMT timezone
-    dateFormat.setTimeZone(TimeZone.getDefault());
-
-    // Return date
-    return dateFormat.format(new Date());
-  }
-
-  /**
-   * Get HTTP status code.
-   * @param httpHeaders  HTTP headers.
-   * @return HTTP status code.
-   * @throws WSIException if the status code in http headers was not found.
-   */
-  public static String getHTTPStatusCode(String httpHeaders)
-    throws WSIException
-  {
-    String statusCode = null;
-
-    if (httpHeaders.startsWith("HTTP"))
-    {
-      // Get location of status code
-      int index = httpHeaders.indexOf(" ");
-      int index2 = httpHeaders.indexOf(" ", index + 1);
-
-      if ((index == -1) || (index2 == -1))
-      {
-        throw new WSIException(
-          "Could not find status code in http headers: [" + httpHeaders + "].");
-      }
-
-      else
-      {
-        statusCode = httpHeaders.substring(index + 1, index2);
-      }
-    }
-
-    else
-    {
-      throw new WSIException(
-        "Could not find status code in http headers: [" + httpHeaders + "].");
-    }
-
-    // Return status code
-    return statusCode;
-  }
-
-  /**
-   * Get HTTP headers from a full message.
-   * @param fullMessage  a message.
-   * @return HTTP headers from a full message.
-   */
-  public static String getHTTPHeaders(String fullMessage)
-  {
-    //String httpHeaders = null;
-
-    // Try looking for the double newline
-    int index = fullMessage.indexOf("\r\n\r\n");
-    if (index != -1)
-    {
-      index += 4;
-    }
-    else
-    {
-      // check for case "\r\r...\r\n\r\r...\n"
-      // Note the index that is returned points to the first character 
-      // immediatedly following the first occurence of the CRLFCRLF. 
-      index = getFirstCRLFCRLF(fullMessage);
-      if (index == -1)
-      {
-        logError(
-          "Unable to parse HTTP message to find headers.  Full message: "
-          + fullMessage);
-        return "x-WSI-Test-Tool-Error: Couldn't find headers.  Full message: ["
-          + fullMessage
-          + "].";
-      }
-    }
-
-    // Return HTTP headers
-    return fullMessage.substring(0, index);
-  }
-
-  /**
-   * Get SOAP message from a full message.
-   * @param fullMessage  a message.
-   * @return SOAP message from a full message.
-   */
-  public static String getContent(String fullMessage)
-  {
-    String message = "";
-
-    // Find start of message
-    int index = fullMessage.indexOf("\r\n\r\n");
-    if (index != -1)
-    {
-      index += 4;
-    }
-    else
-    {
-      // check for case "\r\r...\r\n\r\r...\n"
-      // Note the index that is returned points to the first character 
-      // immediatedly following the first occurence of the CRLFCRLF. 
-      index = getFirstCRLFCRLF(fullMessage);
-    }    	
-
-    if (index < 0)
-    {
-    	// If we couldn't find the end of the HTTP headers or the start of the message, then show error
-      logError(
-        "Unable to parse message to get content.  Full message: "
-          + fullMessage);
-      message =
-        "x-WSI-Test-Tool-Error: Couldn't find message content.  Full message: ["
-          + fullMessage
-          + "].";
-    }
-    // If the index is greater than the length, then there is no message content
-    else if (index >= fullMessage.length())
-    {
-      message = "";
-    }
-
-    // Else get the message content
-    else
-    {
-      message = fullMessage.substring(index);
-    }
-
-    // Return SOAP message
-    return message;
-  }
- 
-  /**
-   * Get HTTP headers from a full message.
-   * @param fullMessage  a message.
-   * @return HTTP headers from a full message.
-   */
-  public static byte[] getHTTPHeaders(byte[] fullMessage)
-  {
-    //String httpHeaders = null;
-    int index = getFirstCRLFCRLF(fullMessage, 0);
-    if (index == -1)
-    {
-      logError(
-        "Unable to parse HTTP message to find headers.  Full message: "
-          + fullMessage);
-      return ("x-WSI-Test-Tool-Error: Couldn't find headers.  Full message: ["
-        + fullMessage + "].").getBytes();
-    }
-
-    // Return HTTP headers
-	byte[] b = new byte[index];
-	System.arraycopy(fullMessage, 0, b, 0, index);
-
-    return b;
-  }
-
-  /**
-   * Get HTTP headers from a full message.
-   * @param fullMessage  a message.
-   * @return HTTP headers from a full message.
-   */
-  public static String getHTTPHeadersAsString(byte[] fullMessage, String encoding)
-  {
-    //String httpHeaders = null;
-    int index = getFirstCRLFCRLF(fullMessage, 0);
-    if (index == -1)
-    {
-      logError(
-        "Unable to parse HTTP message to find headers.  Full message: "
-          + fullMessage);
-      return "x-WSI-Test-Tool-Error: Couldn't find headers.  Full message: ["
-        + fullMessage + "].";
-    }
-
-    // Return HTTP headers
-    try
-    {
-      return new String(fullMessage, 0, index, encoding);
-    }
-    catch (UnsupportedEncodingException e)
-    {
-        logError(
-                "Unsupported Encoding: " + encoding + ".  Full message: "
-                  + fullMessage);
-              return "x-WSI-Test-Tool-Error: Unsupported Encoding \"" + encoding + "\".  Full message: ["
-                + fullMessage + "].";
-    }
-  }
-
-  /**
-   * Get SOAP message from a full message.
-   * @param fullMessage  a message.
-   * @return SOAP message from a full message.
-   */
-  public static String getContentAsString(byte[] message)
-  {
-  	String content = "";
-    //String httpHeaders = null;
-    int index = getFirstCRLFCRLF(message, 0);
-
-    // If we couldn't find the end of the HTTP headers or the start of the message, then show error
-    if (index < 0)
-    {
-      logError(
-        "Unable to parse message to get content.  Full message: "
-          + message);
-      content =
-        "x-WSI-Test-Tool-Error: Couldn't find message content.  Full message: ["
-          + message.toString()
-          + "].";
-    }
-
-    // Else get the message content
-    else if (index < message.length)
-    {
-      try
-      {
-        content = new String(message, index, message.length - index);
-       }
-      catch (Exception e)
-      {
-      	logError(
-      	        "Unable to parse message to get content.  Full message: "
-      	          + message);
-      	content =
-      	        "x-WSI-Test-Tool-Error: Couldn't find message content.  Full message: ["
-      	          + message.toString()
-      	          + "].";
-      }
-    }
-
-    // Return SOAP message
-    return content;
-  }
-
-  /**
-   * Get SOAP message from a full message.
-   * @param fullMessage  a message.
-   * @return SOAP message from a full message.
-   */
-  public static byte[] getContent(byte[] message)
-  {
-    byte[] content = new byte [0];
-
-    //String httpHeaders = null;
-    int index = getFirstCRLFCRLF(message, 0);
- 
-    // If we couldn't find the end of the HTTP headers or the start of the message, then show error
-    if (index < 0)
-    {
-      logError(
-        "Unable to parse message to get content.  Full message: "
-          + message);
-      message =
-        ("x-WSI-Test-Tool-Error: Couldn't find message content.  Full message: ["
-          + message.toString()
-          + "].").getBytes();
-    }
-
-    // If the index is greater than the length, then there is no message content
-    //else if (index >= fullMessage.length())
-    //{
-    //  message = "";
-    //}
-
-    // Else get the message content
-    else if (index < message.length)
-    {
-    	byte[] b = new byte[message.length - index];
-    	System.arraycopy(message, index, b, 0, message.length - index);
-
-        content = b;
-    }
-
-    // Return SOAP message
-    return content;
-  }
-
-  
-  /**
-	 * Returns the first location of a CRLF.
-	 *
-	 * @return int
-	 */
-	public static int getFirstCRLF(byte[] buffer, int index) 
-	{
-		int size = buffer.length;
-		int i = index;
-		while (i < size - 1) {
-			if (buffer[i] == CR && buffer[i+1] == LF)
-				return i;
-			i++;
-		}
-		return -1;
-	}
-
-	/**
-	 * Returns the first location of a CRLF followed imediately by another CRLF.
-	 *
-	 * @return int
-	 */
-	public static int getFirstCRLFCRLF(byte[] buffer, int index) 
-	{
-		int size = buffer.length;
-		int i = index;
-		while (i < size - 3) 
-		{
-		  if (buffer[i] == CR && buffer[i+1] == LF && buffer[i+2] == CR)
-		  {
-			if (buffer[i+3] == LF)
-			{
-			  return i+4;
-			}
-			else
-			{
-			  int j = i + 3;
-			  while (j < buffer.length && buffer[j] == CR)
-			  {
-				j++;
-			  }
-			  if (j < buffer.length && buffer[j] == LF)
-			  {
-			  	return j + 1;
-			  }
-			}
-		  }
-		  i++;
-		}
-		return -1;
-	}
-
-	/**
-	 * Returns the first location of a CRLF followed imediately by another CRLF.
-	 *
-	 * @return int
-	 */
-	public static int getFirstCRLFCRLF(String buffer) 
-	{
-		int index = buffer.indexOf("\r\n\r");
-		if (index != -1)
-		{
-		  int i = index +3;
-		  while (i < buffer.length() && buffer.startsWith("\r", i))
-		     i++;
-		
-		  if (i < buffer.length() && buffer.startsWith("\n", i))
-			return i+1;
-		  else
-			return getFirstCRLFCRLF(buffer.substring(index + 3));
-		}
-		else
-		{
-		  return -1;
-		}
-	}
-
-	/**
-     * Returns the list of indices which marks the separation of parts.
-     */
-	public static int[] getBoundaryIndices(byte[] message, String boundaryStr)
-	{
-	  int[] indices = new int[256];
-	  int indicesIndex = 0;
-	  try
-	  {
-	    byte[] boundary = ("\r\n--" + boundaryStr).getBytes("US-ASCII");
-
-	    int index = 0;
-	    int start = 0;
-	    while (index != -1)
-	    {
-	      index = indexOf(message, boundary, start);
-	      
-	      if (index != -1) 
-	      {
-		    start = index + boundary.length;
-	    	indices[indicesIndex] = index;
-	    	indicesIndex++;
-	      }
-	    }
-      	int[] b = new int[indicesIndex];
-    	System.arraycopy(indices, 0, b, 0, indicesIndex);
-    	indices = b;
-	  }
-	  catch (Exception e)
-	  {}
-	  return indices;
-	}
- 
-    /**
-     * Returns the index of the first occurrence of key in the buffer.
-     */
-	public static int indexOf(byte[] buffer, byte[] key, int start)
-	{
-		int bufferLen = buffer.length;
-		int keyLen = key.length;
-		int i,j,k = 0;
-		
-		if (keyLen > bufferLen - start)
-		{
-			return -1;
-		}
-	
-		for (k = start + keyLen - 1; k < bufferLen; k++)
-		{
-           for (j = keyLen - 1, i = k; (j >= 0) && (buffer[i] == key[j]); j--) 
-           {
-               i--;
-           }
-
-           if (j == (-1)) {
-               return i + 1;
-           }
-		}
-
-		return -1;
-	}
-	/**
-   * Get contents of a resource and return as a input stream.
-   *
-   * @param resourceName the name of the resource to get and return as
-   *                      an input stream.
-   * @return contents of a resource as an input stream.
-   * @throws IOException if the resource could not be located.
-   */
-  public static InputStream getInputStream(String resourceName)
-    throws IOException
-  {
-    InputStream is = null;
-
-    // If resource reference is a URL, then input stream from URL
-    try
-    {
-      // Try to create URL
-      URL urlResource = new URL(resourceName);
-
-      // If successful, then get URL input stream
-      is = getInputStream(urlResource);
-    }
-
-    // Else try to read resource directly
-    catch (MalformedURLException mue)
-    {
-      boolean bTryClassLoader = false;
-
-      try
-      {
-        // Open file input stream
-        is = new BufferedInputStream(new FileInputStream(resourceName));
-      }
-      catch (FileNotFoundException fnfe)
-      {
-        // Set try class loader flag
-        bTryClassLoader = true;
-      }
-      catch (SecurityException se)
-      {
-        // Set try class loader flag
-        bTryClassLoader = true;
-      }
-      catch (Exception e)
-      {
-        // DEBUG:
-        System.out.println("Exception in getInputStream :" + e.toString());
-      }
-
-      // If try class loader, then use it to get input stream
-      if (bTryClassLoader)
-      {
-        // Use class loader to load resource
-        is = ClassLoader.getSystemResourceAsStream(resourceName);
-      }
-    }
-
-    // If the input stream is null, then throw FileNotFoundException
-    if (is == null)
-    {
-      //try this
-      is =
-        Thread.currentThread().getContextClassLoader().getResourceAsStream(
-          resourceName);
-    }
-
-    // If the input stream is null, then throw FileNotFoundException
-    if (is == null)
-    {
-      //try this
-      URL aURL =
-        Thread.currentThread().getContextClassLoader().getResource(
-          resourceName);
-      if (aURL != null)
-        is = getInputStream(aURL);
-    }
-
-    if (is == null)
-      // Throw execption
-      throw new FileNotFoundException(
-        "Could not locate resource file: " + resourceName);
-
-    // Return input stream
-    return is;
-  }
-
-  /**
-   * Get the input stream from a URL.
-   * @param urlFile the URL to get the input stream from.
-   * @return the input stream corresponding to the given URL.
-   * @throws IOException if attempt to open the file denoted by URL has failed.
-   * @throws ConnectException if trouble connecting to URL.
-   */
-  public static InputStream getInputStream(URL urlFile)
-    throws IOException, ConnectException
-  {
-    InputStream is = null;
-
-    // ADD: how are URLs that are password protected handled????
-
-    try
-    {
-      // Open file input stream
-      is = new BufferedInputStream(urlFile.openStream());
-    }
-
-    catch (ConnectException e)
-    {
-      // Re-throw this excpetion with additional information
-      throw new java.net.ConnectException(
-        "Could not connect to URL: " + urlFile.toExternalForm() + ".");
-    }
-
-    // Return input stream
-    return is;
-  }
-
-  /**
-   * Get contents of a resource and return as a input stream.
-   * @param fileLocation the location of the file.
-   * @return contents of a resource as a input stream.
-   */
-  public static boolean fileExists(String fileLocation)
-  {
-    boolean fileExists = false;
-
-    // If resource reference is a URL, then input stream from URL
-    try
-    {
-      // Try to create URL
-      URL url = new URL(fileLocation);
-
-      // If successful, then try to open connection
-      url.openStream();
-      fileExists = true;
-    }
-
-    // Else try to read resource directly
-    catch (MalformedURLException mue)
-    {
-      try
-      {
-        File file = new File(fileLocation);
-
-        fileExists = file.exists();
-      }
-
-      catch (Exception e2)
-      {
-        fileExists = false;
-      }
-    }
-
-    catch (FileNotFoundException fnfe)
-    {
-      fileExists = false;
-    }
-
-    catch (Exception e)
-    {
-      fileExists = false;
-    }
-
-    // Return file exists indicator
-    return fileExists;
-  }
-
-  /**
-   * Get local host name.
-   * @return the local host name.
-   */
-  public static String getLocalHostName()
-  {
-    String sLocalHostName;
-
-    try
-    {
-      // Get local host name
-      sLocalHostName = InetAddress.getLocalHost().getHostName();
-    }
-    catch (Exception e)
-    {
-      // Set default local host name
-      sLocalHostName = "127.0.0.1";
-    }
-
-    // Return local host name
-    return sLocalHostName;
-  }
-
-  /**
-   * Build a URL string from hostname, port and URN.
-   *
-   * @param hostname the hostname.
-   * @param port the port.
-   * @param urn the URN.
-   * @return formatted URL string.
-   */
-  public static String formatURL(String hostname, String port, String urn)
-  {
-    // Build URN
-    String formatURN = urn;
-
-    // If URN doesn't start with "/", then add it
-    if (!(formatURN.startsWith("/")))
-    {
-      // Add "/" to beginning of the string
-      formatURN = "/" + urn;
-    }
-
-    // Return URL string
-    return "http://" + hostname + ":" + port + formatURN;
-  }
-
-  /**
-   * This method will replace all of the occurances of a string
-   * with a substitution string.
-   *
-   * @param sText String to udpate.
-   * @param sFind String to find.
-   * @param sReplace String to use for substitution.
-   * @return updated string.
-   */
-  public static String replaceString(
-    String sText,
-    String sFind,
-    String sReplace)
-  {
-    int iPrevIndex = 0;
-
-    int iFindLen = sFind.length();
-    int iReplaceLen = sReplace.length();
-
-    String sUpdatedText = sText;
-
-    // Replace all occurances of the find string
-    for (int iIndex = sUpdatedText.indexOf(sFind);
-      iIndex < (sUpdatedText.length() - 1) && iIndex != -1;
-      iIndex = sUpdatedText.indexOf(sFind, iPrevIndex + iReplaceLen))
-    {
-      // Set updated text from the front portion + replacement text + back portion
-      sUpdatedText =
-        sUpdatedText.substring(0, iIndex)
-          + sReplace
-          + sUpdatedText.substring(iIndex + iFindLen);
-
-      // Set the previous index field
-      iPrevIndex = iIndex;
-    }
-
-    // Return updated text string
-    return sUpdatedText;
-  }
-
-  /**
-   * Convert string to hex string.
-   * @param data  a String object.
-   * @return hex string.
-   */
-  public static String toHexString(String data)
-  {
-    char[] HEX_CHARS =
-      {
-        '0',
-        '1',
-        '2',
-        '3',
-        '4',
-        '5',
-        '6',
-        '7',
-        '8',
-        '9',
-        'A',
-        'B',
-        'C',
-        'D',
-        'E',
-        'F' };
-
-    // Get string as byte array
-    byte[] byteData = data.getBytes();
-
-    // Get length
-    int length = byteData.length;
-
-    // Create Char buffer
-    char[] charBuffer = new char[length * 2];
-
-    int next;
-    for (int byteCnt = 0, charCnt = 0; byteCnt < length;)
-    {
-      next = byteData[byteCnt++];
-      charBuffer[charCnt++] = HEX_CHARS[(next >>> 4) & 0x0F];
-      charBuffer[charCnt++] = HEX_CHARS[next & 0x0F];
-    }
-
-    return new String(charBuffer);
-  }
-
-  /**
-   * Convert byte buffer to hex string.
-   * @param data  a byte array.
-   * @return hex string.
-   */
-  public static String toHexString(byte[] byteData)
-  {
-    char[] HEX_CHARS =
-      {
-        '0',
-        '1',
-        '2',
-        '3',
-        '4',
-        '5',
-        '6',
-        '7',
-        '8',
-        '9',
-        'A',
-        'B',
-        'C',
-        'D',
-        'E',
-        'F' };
-
-
-    // Get length
-    int length = byteData.length;
-
-    // Create Char buffer
-    char[] charBuffer = new char[length * 2];
-
-    int next;
-    for (int byteCnt = 0, charCnt = 0; byteCnt < length;)
-    {
-      next = byteData[byteCnt++];
-      charBuffer[charCnt++] = HEX_CHARS[(next >>> 4) & 0x0F];
-      charBuffer[charCnt++] = HEX_CHARS[next & 0x0F];
-    }
-
-    return new String(charBuffer);
-  }
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  /**
-   * Get MIME charset from a HTTP headers.
-   * @param httpHeaders String of HTTP header.
-   * @return the MIME charset string.
-   * @author K.Nakagome@BeaconIT Japan SIG 
-   */
-  public static String getHTTPCharset(String httpHeaders)
-  {
-    String mimeCharset = null;
-
-    mimeCharset = httpHeaders.toUpperCase();
-    int[] index = { -1, -1, -1 };
-    int indexS = mimeCharset.indexOf("CHARSET");
-    int indexE = Integer.MAX_VALUE;
-    if (indexS < 17)
-    {
-      return "";
-    }
-    indexS = mimeCharset.indexOf("=", indexS + 7);
-    if (indexS == -1)
-    {
-      return "";
-    }
-    indexS++;
-    index[0] = mimeCharset.indexOf("'", indexS);
-    index[1] = mimeCharset.indexOf("\r\n", indexS);
-    index[2] = mimeCharset.indexOf("\"", indexS);
-    for (int i = 0; i < 3; i++)
-    {
-      if (index[i] != -1 & indexE > index[i])
-      {
-        indexE = index[i];
-      }
-    }
-
-    if (indexE != Integer.MAX_VALUE)
-    {
-      mimeCharset = httpHeaders.substring(indexS, indexE);
-      mimeCharset.trim();
-    }
-    else
-    {
-      mimeCharset = "";
-    }
-    return mimeCharset;
-  }
-
-  /**
-   * Checks to see if the message is a simple SOAP message or whether it is a SOAP messagwe with attachments.
-   */
-  public static boolean isMultipartRelatedMessage(String httpHeaders)
-  {
-  	boolean result = false;
-    try 
-    {
-      // check header for mime version and boundary
-      String contentType = HTTPUtils.getHttpHeaderAttribute(httpHeaders, HTTPConstants.HEADER_CONTENT_TYPE);
-      if (contentType == null)
-      {
-        // there is no contentType, check if there is a boundary attribute
-        String boundary = Utils.getHttpHeaderSubAttribute(httpHeaders, HTTPConstants.HEADER_CONTENT_TYPE, "boundary");
-        if ((boundary != null) && (!boundary.equals("")))
-           result = true;
-      }
-      else
-      {
-        result = contentType.equalsIgnoreCase("multipart/related");
-      }
-    } 
-    catch (WSIException e)
-	{ 
-    	result = false; 
-    }
-    return result;
-  }
-
-  public static String getHttpHeaderAttribute(String httpHeaders, String attributeName)
-  { String result = null;
-  	try
-  	{
-     result = HTTPUtils.getHttpHeaderAttribute(httpHeaders, attributeName);
-  	}
-    catch (WSIException e)
-	{ 
-    	result = null; 
-    }
-    return result;
- }
-
-  public static String getHttpHeaderSubAttribute(String httpHeaders, String attributeName, String subAttributeName)
-  { String result = null;
-  	try
-  	{
-     result = HTTPUtils.getHttpHeaderSubAttribute(httpHeaders, attributeName, subAttributeName);
-  	}
-    catch (WSIException e)
-	{ 
-    	result = null; 
-    }
-    return result;
- }
-
-  public static String getMimeHeaderAttribute(String mimeHeaders, String attributeName)
-  { String result = null;
-  	try
-  	{
-     result = MIMEUtils.getMimeHeaderAttribute(mimeHeaders, attributeName);
-  	}
-    catch (WSIException e)
-	{ 
-    	result = null; 
-    }
-    return result;
- }
-
-  public static String getMimeHeaderSubAttribute(String mimeHeaders, String attributeName, String subAttributeName)
-  { String result = null;
-  	try
-  	{
-     result = MIMEUtils.getMimeHeaderSubAttribute(mimeHeaders, attributeName, subAttributeName);
-  	}
-    catch (WSIException e)
-	{ 
-    	result = null; 
-    }
-    return result;
- }
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  /**
-   * Get XML encoding from a SOAP Messages.
-   * @param message  SOAP Message String. 
-   * @return character encoding of XML.
-   * @author K.Nakagome@BeaconIT Japan SIG 
-   */
-  public static String getXMLEncoding(String message)
-  {
-    String xmlDef = null;
-
-    int indexS = message.indexOf("<?xml");
-    int indexE = -1;
-    if (indexS != -1)
-    {
-      indexE = message.indexOf("?>", indexS);
-      if (indexE > indexS)
-      {
-        xmlDef = message.substring(indexS, indexE);
-      }
-    }
-
-    if (xmlDef != null)
-    {
-      indexS = xmlDef.indexOf("encoding");
-      if (indexS == -1)
-      {
-        xmlDef = "";
-      }
-      else
-      {
-        xmlDef = xmlDef.substring(indexS + 8);
-        xmlDef = xmlDef.trim();
-      }
-    }
-    else
-    {
-      return "";
-    }
-
-    if (xmlDef.length() > 3)
-    {
-      indexS = xmlDef.indexOf("=");
-      if (indexS == 0)
-      {
-        xmlDef = xmlDef.substring(1);
-      }
-      else
-      {
-        return "";
-      }
-    }
-
-    if (xmlDef.length() > 3)
-    {
-      String end = "\"";
-      indexS = xmlDef.indexOf(end);
-      if (indexS != 0)
-      {
-        indexS = xmlDef.indexOf((end = "'"));
-      }
-      if (indexS == 0)
-      {
-        indexE = xmlDef.indexOf(end, 3);
-        if (indexE != -1)
-        {
-          xmlDef = xmlDef.substring(1, indexE);
-        }
-        else
-        {
-          xmlDef = "";
-        }
-      }
-      else
-      {
-        xmlDef = "";
-      }
-    }
-    return xmlDef;
-  }
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  private static ResourceBundle javaEncodingResource = null;
-  private static final String JAVA_ENCODING_RESOURCE =
-    "org.wsi.test.util.JavaEncoding";
-  private static final String JAVA_ENCODING_DEFAULT = "UTF-8";
-
-  // I18N: 2003.02.26 modified by K.Nakagome@BeaconIT
-  /**
-   * Get Java VM supported character encoding.
-   * 
-   * @param mimeEncoding  string of MIME(IANA) character encoding. 
-   * @return string of character encoding supported by Java VM.
-   * @author K.Nakagome@BeaconIT Japan SIG 
-   */
-  public static String getJavaEncoding(String mimeEncoding)
-  {
-    if (mimeEncoding == null || mimeEncoding.length() == 0)
-    {
-      return JAVA_ENCODING_DEFAULT;
-    }
-    try
-    {
-      if (javaEncodingResource == null)
-      {
-        javaEncodingResource = ResourceBundle.getBundle(JAVA_ENCODING_RESOURCE);
-      }
-      return javaEncodingResource.getString(mimeEncoding);
-    }
-    catch (Throwable t)
-    {
-      return mimeEncoding;
-    }
-  }
-
-  /**
-   * Convert an array to a Vector.
-   * 
-   * @param array  the array to be converted .
-   * @return converted Vector (null if array is null, empty if empty).
-   * @author Graham Turrell IBM
-   */
-  public static Vector arrayToVector(Object[] array)
-  {
-    if (array == null)
-      return null;
-    Vector v = new Vector(array.length);
-    for (int i = 0; i < array.length; i++)
-      v.add(array[i]);
-    return v;
-  }
-  /**
-   * Checks to ensure that version of the profile test assertion 
-   * document is supported in this version of the test tools.
-   * @param profileAssertions - a profile TAD.
-   * @return true if the version of the profile test assertion
-   *         docuement is supported in this version of the test tools.
-   */
-  public static boolean isValidProfileTADVersion(ProfileAssertions profileAssertions)
-  {
-    boolean result = false;
-
-    String name = profileAssertions.getTADName();
-    String version = profileAssertions.getTADVersion();
-
-    if (WSIConstants.BASIC_PROFILE_TAD_NAME.equals(name))
-    {
-      result =
-        checkVersionNumber(WSIConstants.BASIC_PROFILE_TAD_VERSION, version);
-    } else if (WSIConstants.BASIC_PROFILE_1_1_TAD_NAME.equals(name))
-    {  
-      result =
-        checkVersionNumber(WSIConstants.BASIC_PROFILE_1_1_TAD_VERSION, version);
-    } else if (WSIConstants.SIMPLE_SOAP_BINDINGS_PROFILE_TAD_NAME.equals(name))
-    {
-      result =
-        checkVersionNumber(WSIConstants.SIMPLE_SOAP_BINDINGS_PROFILE_TAD_VERSION, version);
-    } else if (WSIConstants.ATTACHMENTS_PROFILE_TAD_NAME.equals(name))
-    {
-      result =
-        checkVersionNumber(WSIConstants.ATTACHMENTS_PROFILE_TAD_VERSION, version);
-    }
-    return result;
-  }
-
-  /**
-   * Checks to ensure that version number of the actual profile test assertion 
-   * document is supported in this version of the test tools.
-   * @param supportedVersion - supported version number of profile TAD.
-   * @param actualVersion    - actual version number of profile TAD. 
-   * @return true if the version number of the actual profile test assertion
-   *         document is supported in this version of the test tools.
-   */
-  private static boolean checkVersionNumber(
-    String supportedVersion,
-    String actualVersion)
-  {
-    boolean validVersion = true;
-
-    try
-    {
-      StringTokenizer supportedVersionTokenizer =
-        new StringTokenizer(supportedVersion, ".");
-      StringTokenizer actualVersionTokenizer =
-        new StringTokenizer(actualVersion, ".");
-
-      while (supportedVersionTokenizer.hasMoreTokens() && validVersion)
-      {
-        int supportedVersionToken =
-          Integer.parseInt(supportedVersionTokenizer.nextToken());
-        if (actualVersionTokenizer.hasMoreTokens())
-        {
-          int actualVersionToken =
-            Integer.parseInt(actualVersionTokenizer.nextToken());
-          if (supportedVersionToken > actualVersionToken) break;
-          else validVersion = (supportedVersionToken >= actualVersionToken);
-        }
-      }
-    }
-    catch (Exception e)
-    {
-      validVersion = false;
-    }
-    return validVersion;
-  }
-  
-  /**
-   * Identifies the root part in the list using the "start" attribute.
-   * If the "start" attribute does not exist then the first part is designated the root.
-   */
-  public static MimePart findRootPart(String httpHeaders, Collection parts)
-  {
-  	MimePart root = null;
-    String start = Utils.getHttpHeaderSubAttribute(httpHeaders, HTTPConstants.HEADER_CONTENT_TYPE, "start");
-    if (!parts.isEmpty())
-    {
-      // default to the first part in the collection
-      root = (MimePart)parts.iterator().next();
-    	
-      if ((start != null) && (!start.equals("")))
-      {
-    	Iterator i = parts.iterator();
-    	boolean rootNotFound = true;
-    	while (i.hasNext() && rootNotFound)
-    	{
-    	  MimePart part = (MimePart)i.next();
-    	  String headers = part.getHeaders();
-    	  if (headers != null)
-    	  {
-            String contentId = Utils.getMimeHeaderAttribute(headers, MIMEConstants.HEADER_CONTENT_ID);
-            if (start.equals(contentId))
-            {
-              root = part;
-			  rootNotFound = false;
-            }
-    	  }
-    	}
-      }
-    }
-  	return root;
-  }
-  
-  /**
-   * Decodes the given encoded string.
-   */
-  public static byte[] decodeBase64(String str)
-  {
-  	try
-  	{
-    	sun.misc.BASE64Decoder decoder =  new sun.misc.BASE64Decoder();
-  	    return decoder.decodeBuffer(str);
-  	}
-  	catch (Exception e)
-  	{
-  		return new byte[0];
-  	}
-  }
-
-  /**
-   * Encodes the given byte array.
-   */
-  public static String encodeBase64(byte[] buffer)
-  {    
-  	sun.misc.BASE64Encoder encoder =  new sun.misc.BASE64Encoder();
-  	return encoder.encodeBuffer(buffer);  
-  }
-
-  public static MimeParts parseMultipartRelatedMessage(String message, String httpHeaders, String encoding)
-  {
-  	byte[] buffer = null;
-  	try
-	{ 
-  	  buffer = message.getBytes(encoding);
-	}
-  	catch (Exception e)
-	{
-  		return null;
-	}
-  	return parseMultipartRelatedMessage(buffer, httpHeaders, encoding);
-  }
-  public static MimeParts parseMultipartRelatedMessage(byte[] message, String httpHeaders, String encoding)
-  {
-    MimeParts mimeParts = new MimePartsImpl();
-    String boundary = Utils.getHttpHeaderSubAttribute(httpHeaders, HTTPConstants.HEADER_CONTENT_TYPE, "boundary");
-    ArrayList parts = new ArrayList();
-    
-    if (boundary == null)
-    {
-    	// assume it is a simple SOAP message
-    	return null;
-    }
-    else
-    {
-      String start = Utils.getHttpHeaderSubAttribute(httpHeaders, HTTPConstants.HEADER_CONTENT_TYPE, "start");
-      int[] indices = Utils.getBoundaryIndices(message, boundary);
-      boolean rootNotFound = true;
-      
-      for (int i= indices.length - 2; i>=0; i--)
-      {
-        try
-    	{
-          MimePart part = new MimePartImpl();
-          int index = Utils.getFirstCRLFCRLF(message, indices[i]);
-          if ((index > indices[i]) && (index < indices[i+1]))
-          {
-            // the boundary string & mime headers (include the trailing CRLF CRLF)
-        	String str = new String(message, indices[i], (index - indices[i]), "US-ASCII");
-        	String delimiter = str.substring(0, str.indexOf("\r\n", 2) + 2);
-
-        	if (i == indices.length -2)
-        	{
-        	  String endDelimiter = new String(message, indices[i + 1], message.length - indices[i + 1], "US-ASCII");
-        	  int j = str.indexOf("\r\n", 2);
-        	  if (j != -1)
-        	    endDelimiter = str.substring(0, str.indexOf("\r\n", 2) + 2);
-              part.setBoundaryStrings(new String[]{delimiter, endDelimiter});
-            }
-        	else
-        	  part.setBoundaryStrings(new String[]{delimiter});
-       
-        	// the headers
-        	String headers = str.substring(delimiter.length());
-            if (headers.startsWith("\r\n"))
-            {
-          	  // no headers present
-          	  part.setHeaders("");
-            }
-            else
-            {
-          	  part.setHeaders(headers);
-            }
-            
-            // the content
-            String contentId = Utils.getMimeHeaderAttribute(headers, MIMEConstants.HEADER_CONTENT_ID);
-            int size = indices[i+1] - (index);
-         	byte[] content = new byte[size];
-      	    System.arraycopy(message, index, content, 0, size);
-      	  
-            if ((rootNotFound && (i == 0)) ||
-            	((start != null) && (!start.equals("")) && (start.equals(contentId))))
-            {
-              // root part -- do not encode
-              part.setContent(new String(content, encoding));
-              mimeParts.setRootPart(part);
-            }
-            else
-            {
-              String transferEncoding =  Utils.getMimeHeaderAttribute(headers, MIMEConstants.HEADER_CONTENT_TRANSFER_ENCODING);
-   
-              if ((transferEncoding != null) && transferEncoding.equalsIgnoreCase("base64"))
-              	part.setContent(new String(content, encoding));
-              else
-                part.setContent(Utils.encodeBase64(content));
-            }
-           parts.add(part);
-         }
-    	}
-    	catch (Exception e)
-    	{
-    	  return null;
-    	}
-      }
-      int size = parts.size();
-      for (int i = size-1; i>=0; i--)
-         mimeParts.addPart((MimePart)parts.get(i));
-    }
-    return mimeParts;
-  }
-
-  public static String toXMLString(MimeParts mimeParts)
-  {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
-
-    // Add message content with attachments element
-    pw.print("<" + WSIConstants.ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS);
-    pw.print(">");
-
-    Collection partList = mimeParts.getParts();
-    if (!partList.isEmpty())
-        {
-         	Iterator iMimeParts = partList.iterator();
-        	while (iMimeParts.hasNext())
-            {
-        	  MimePart mimePart = (MimePart)iMimeParts.next();
-         	  pw.print(mimePart.toXMLString(""));
-            }
-        }
-
-        // Add end message element
-        pw.println("</" + WSIConstants.ELEM_MESSAGE_CONTENT_WITH_ATTACHMENTS + ">");
-    // Return string
-    return sw.toString();
-  }
-
-  public static void main (String[] args)
-  {
-  	try
-	{
-  	  FileInputStream inputStream = new FileInputStream("d:\\b.xml");
-  	  int i = inputStream.available();
-  	  byte[] buffer = new byte[i];
-  	  inputStream.read(buffer);
-  	  String message = new String(buffer);
-  	  message = XMLUtils.xmlRemoveEscapedString(message);
-  	  String headers = Utils.getHTTPHeaders(message);
-  	  MimeParts parts = Utils.parseMultipartRelatedMessage(message, headers, Utils.JAVA_ENCODING_DEFAULT);
-  	  System.out.println(Utils.toXMLString(parts));
-	}
-  	catch (Exception e){}
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSDLUtil.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSDLUtil.java
deleted file mode 100644
index 1adcf00..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSDLUtil.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPBody;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-
-/**
- * The utility class to automate WSDL processing.
- * 
- * @author Kulik
- */
-public final class WSDLUtil
-{
-
-  /**
-   * The method extracts list of parts for the given soapbind:body,
-   * binding operation, message, and style.
-   * 
-   * @param op an operation.
-   * @param m  a message.
-   * @param body a SOAP body.
-   * @param style an operation style.
-   * @return list of parts for the given soapbind:body,
-   *         binding operation, message, and style.
-   */
-  static public List getParts(
-    Operation op,
-    Message m,
-    SOAPBody body,
-    String style)
-  {
-    //		if null, get parts from message 
-    if (body.getParts() == null)
-      // if rpc style is used, try to use partOrder attribute from operation
-      if (WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC.equals(style))
-        return m.getOrderedParts(op.getParameterOrdering());
-      else
-        return m.getOrderedParts(null);
-    else
-      // converse parts name to parts objects
-      return m.getOrderedParts(body.getParts());
-  }
-
-  /**
-   * The method iterates all imports from the given definition and expands all
-   * imported messages, service, portTypes, and bindings to the definition.
-   * 
-   * @param def a WSDL definition.
-   */
-  static public void expandDefinition(Definition def)
-  {
-    if (def != null && def.getImports() != null)
-    {
-      Iterator it = def.getImports().values().iterator();
-      while (it.hasNext())
-      {
-        List v = (List) it.next();
-        if (v != null)
-        {
-          Iterator it2 = v.iterator();
-          while (it2.hasNext())
-            expandDefinition(def, (Import) it2.next());
-        }
-      }
-    }
-  }
-
-  /**
-   * The internal method to expand definition.
-   * @param target WSDL definition.
-   * @param im internal method.
-   */
-  static private void expandDefinition(Definition target, Import im)
-  {
-    if (im != null && im.getDefinition() != null)
-    {
-      Definition d = im.getDefinition();
-      if (d.getMessages() != null)
-      {
-        Iterator it = d.getMessages().values().iterator();
-        while (it.hasNext())
-          target.addMessage((Message) it.next());
-      }
-      if (d.getPortTypes() != null)
-      {
-        Iterator it = d.getPortTypes().values().iterator();
-        while (it.hasNext())
-          target.addPortType((PortType) it.next());
-      }
-      if (d.getBindings() != null)
-      {
-        Iterator it = d.getBindings().values().iterator();
-        while (it.hasNext())
-          target.addBinding((Binding) it.next());
-      }
-      if (d.getServices() != null)
-      {
-        Iterator it = d.getServices().values().iterator();
-        while (it.hasNext())
-          target.addService((Service) it.next());
-      }
-
-      Iterator it = d.getImports().values().iterator();
-      while (it.hasNext())
-      {
-        List v = (List) it.next();
-        if (v != null)
-        {
-          Iterator it2 = v.iterator();
-          while (it2.hasNext())
-            expandDefinition(target, (Import) it2.next());
-        }
-      }
-    }
-  }
-
-  /**
-   * The method extracts part from the message.
-   * 
-   * @param message a SOAP message.
-   * @param part a part name.
-   * @return part from the specified message.
-   */
-  static public Part getPart(Message message, String part)
-  {
-    Part mesPart = null;
-    if (part == null)
-      mesPart = (Part) message.getOrderedParts(null).get(0);
-    else
-      mesPart = message.getPart(part);
-    return mesPart;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java
deleted file mode 100644
index ba14033..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java
+++ /dev/null

@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-import java.util.Enumeration;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-import org.uddi4j.transport.TransportFactory;
-
-/**
- * The WSI properties can be defined in one of three locations.  
- *
- *   1. The wsi.properties file which can be located anywhere in the classpath.
- *   2. The system property settings.
- *   3. The thread local property settings.
- * 
- * The properties are set based on this ordering.  For example, the properties 
- * from the wsi.properties file will be replaced by properties from the system 
- * property settings, which will be replaced by the thread local property settings.
- *
- * The properties that are used to define the implementation classes can be
- * specified as system properties or as properties that are set in a thread 
- * local variable.  System properties should be used if only one implementation
- * is needed per JVM.  If two or more implementations are needed per JVM, then
- * the properties should be set using the thread local variable.
- *
- * @version 1.0.1
- * @author: Peter Brittenham
- */
-public final class WSIProperties
-{
-  /**
-   * Properties object.
-   */
-  protected static Properties wsiProperties = new Properties();
-
-  /**
-   * Default ProfileValidatorFactory class name.
-   */
-  public static final String DEF_VALIDATOR_FACTORY =
-    "org.eclipse.wst.wsi.internal.core.profile.validator.impl.ProfileValidatorFactoryImpl";
-
-  /**
-   * Property that contains ProfileValidatorFactory class name.
-   */
-  public static final String PROP_VALIDATOR_FACTORY =
-    "wsi.profile.validator.factory";
-
-  /**
-   * Default document factory class name.
-   */
-  public static final String DEF_DOCUMENT_FACTORY =
-    "org.eclipse.wst.wsi.internal.core.document.impl.DocumentFactoryImpl";
-
-  /**
-   * Property that contains document factory class name.
-   */
-  public static final String PROP_DOCUMENT_FACTORY = "wsi.document.factory";
-
-  /**
-   * Default JAXP XML parser document factory builder.
-   */
-  public static final String DEF_JAXP_DOCUMENT_FACTORY =
-    "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl";
-
-  /**
-   * Property that contains JAXP XML parser document factory builder.
-   */
-  public static final String PROP_JAXP_DOCUMENT_FACTORY =
-    "javax.xml.parsers.DocumentBuilderFactory";
-
-  /**
-   * Default WSDL schema location.
-   */
-  public static final String DEF_WSDL_SCHEMA = "http://schemas.xmlsoap.org/wsdl/";
-
-  /**
-   * Property that contains WSDL schema location.
-   */
-  public static final String PROP_WSDL_SCHEMA = "wsi.analyzer.wsdl.schema";
-
-  /**
-   * Default WSDL SOAP schema location.
-   */
-  public static final String DEF_WSDL_SOAP_SCHEMA =
-    "http://schemas.xmlsoap.org/wsdl/soap/";
-
-  /**
-   * Property that contains WSDL SOAP schema location.
-   */
-  public static final String PROP_WSDL_SOAP_SCHEMA =
-    "wsi.analyzer.wsdlsoap.schema";
-
-  /**
-   * Default WSDL MIME schema location.
-   */
-  public static final String DEF_WSDL_MIME_SCHEMA =
-    "http://schemas.xmlsoap.org/wsdl/mime/";
-
-  /**
-   * Property that contains WSDL SOAP schema location.
-   */
-  public static final String PROP_WSDL_MIME_SCHEMA =
-    "wsi.analyzer.wsdlmime.schema";
-
-  /**
-   * Default SOAP schema location.
-   */
-  public static final String DEF_SOAP_SCHEMA =
-    "http://schemas.xmlsoap.org/soap/envelope/";
-
-  /**
-   * Property that contains SOAP schema location.
-   */
-  public static final String PROP_SOAP_SCHEMA = "wsi.analyzer.soap.schema";
-
-  /**
-   * Default SOAP schema location.
-   */
-  public static final String DEF_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema.xsd";
-
-  /**
-   * Property that contains SOAP schema location.
-   */
-  public static final String PROP_XML_SCHEMA = "wsi.analyzer.xmlschema.schema";
-
-  /**
-   * Property which contains WSI_HOME value.
-   */
-  public static final String PROP_WSI_HOME = "wsi.home";
-
-  /**
-   * Property file name.
-   */
-  protected static final String PROP_FILENAME = "org.eclipse.wst.wsi.internal.core.util.wsi";
-
-  /**
-  * Thread local variable.
-  */
-  private static ThreadLocal threadLocal = new ThreadLocal();
-
-  // Load profiles file
-  static {
-    loadPropertiesFile();
-  }
-
-  /**
-   * Load properties from wsi.properties file.
-   */
-  private static void loadPropertiesFile()
-  {
-    try
-    {
-      // Try to load properties from wsi.properties
-      //InputStream is = Utils.getInputStream(PROP_FILENAME);
-
-      // Load properties from file
-      //wsiPropertiesFile.load(is);
-
-      ResourceBundle resourceBundle = ResourceBundle.getBundle(PROP_FILENAME);
-
-      String nextKey;
-      Enumeration enumeration = resourceBundle.getKeys();
-      while (enumeration.hasMoreElements())
-      {
-        nextKey = (String) enumeration.nextElement();
-        wsiProperties.put(nextKey, resourceBundle.getString(nextKey));
-      }
-    }
-
-    catch (MissingResourceException mre)
-    {
-      // DEBUG:
-      System.err.println(
-        "WARNING:  Could not read "
-          + PROP_FILENAME
-          + ".  "
-          + "Verify that it is in the CLASSPATH.");
-
-      // Set up default values
-      wsiProperties.put(PROP_VALIDATOR_FACTORY, DEF_VALIDATOR_FACTORY);
-      wsiProperties.put(PROP_DOCUMENT_FACTORY, DEF_DOCUMENT_FACTORY);
-      wsiProperties.put(PROP_JAXP_DOCUMENT_FACTORY, DEF_JAXP_DOCUMENT_FACTORY);
-      wsiProperties.put(
-        TransportFactory.PROPERTY_NAME,
-        "org.uddi4j.transport.ApacheAxisTransport");
-    }
-  }
-
-  /** 
-   * Do not allow this object to be instantiated.
-   */
-  private WSIProperties()
-  {
-  }
-
-  /** 
-    * Get properties that were set for this thread only.
-    * @return the properties that were set for this thread only.
-    *
-    * @see #setThreadLocalProperties
-    */
-  public static Properties getThreadLocalProperties()
-  {
-    // Return properties
-    return (Properties) threadLocal.get();
-  }
-
-  /** 
-   * Set properties for this thread only.
-   * @param props  a Properties object.
-   *
-   * @see #getThreadLocalProperties
-   */
-  public static void setThreadLocalProperties(Properties props)
-  {
-    // Save the properties as thread local variables
-    threadLocal.set(props);
-  }
-
-  /** 
-   * Get the property value given the property name.
-   * @param propertyName  a property name.
-   * @return the corresponding property value. If not found return null.
-   */
-  public static String getProperty(String propertyName)
-  {
-    String propertyValue = null;
-    Properties threadLocalProps = null;
-
-    // 1. Look in thread local properties first
-    if ((threadLocalProps = getThreadLocalProperties()) != null)
-    {
-      propertyValue = threadLocalProps.getProperty(propertyName);
-    }
-
-    // 2. Next look in system properties 
-    if (propertyValue == null)
-    {
-      propertyValue = System.getProperty(propertyName);
-    }
-
-    // 3. Last look in the properties file
-    if (propertyValue == null)
-    {
-      propertyValue = wsiProperties.getProperty(propertyName);
-    }
-
-    // Return property value
-    return propertyValue;
-  }
-
-  /** 
-   * Get the property value given the property name.
-   * @param propertyName  a property name.
-   * @param defaultValue  a default value for the property.
-   * @return the corresponding property value. If not found return the default value.
-   */
-  public static String getProperty(String propertyName, String defaultValue)
-  {
-    String propertyValue = null;
-
-    // If the propertyValue was not found, then return default value
-    if ((propertyValue = getProperty(propertyName)) == null)
-    {
-      propertyValue = defaultValue;
-    }
-
-    // Return property value
-    return propertyValue;
-  }
-
-  /**
-   * This method is used to unit test this class.
-   * @param args  the arguments for main.
-   */
-  public static void main(String[] args)
-  {
-    try
-    {
-      // Set property for this thread
-      Properties props = new Properties();
-      props.setProperty(PROP_VALIDATOR_FACTORY, "main");
-      WSIProperties.setThreadLocalProperties(props);
-
-      // Start four threads to verify that the multithreaded use of tread local vars works
-      for (int i = 0; i < 5; i++)
-      {
-        // Create new thread
-         (new Thread(new ThreadTest("test" + i))).start();
-
-        try
-        {
-          // Sleep
-          Thread.sleep(200);
-
-          // Display properties, which should be main
-          System.out.println(
-            "PROP_VALIDATOR_FACTORY:  "
-              + WSIProperties.getProperty(PROP_VALIDATOR_FACTORY));
-        }
-
-        catch (Exception e)
-        {
-        }
-      }
-    }
-
-    catch (Exception e)
-    {
-      // e.printStackTrace();
-    }
-  }
-
-  /**
-   * Inner class used for unit test.
-   */
-  static private class ThreadTest extends Thread
-  {
-    String name;
-
-    ThreadTest(String name)
-    {
-      this.name = name;
-    }
-
-    public void run()
-    {
-      Properties props = new Properties();
-      props.setProperty(PROP_VALIDATOR_FACTORY, name);
-      WSIProperties.setThreadLocalProperties(props);
-      System.out.println(
-        "PROP_VALIDATOR_FACTORY:  "
-          + WSIProperties.getProperty(PROP_VALIDATOR_FACTORY));
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/XMLInfo.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/XMLInfo.java
deleted file mode 100644
index b921199..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/XMLInfo.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.util;
-
-/**
- * This class ...
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public interface XMLInfo
-{
-  /**
-   * Get addtional tool environment information as an XML string.
-   * @param namespaceName a namespace prefix.
-   * @return addtional tool environment information as an XML string.
-   */
-  public String toXMLString(String namespaceName);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/wsi.properties b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/wsi.properties
deleted file mode 100644
index bfe48da..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/wsi.properties
+++ /dev/null

@@ -1,46 +0,0 @@
-# /**
-#  * <copyright>
-#  *
-#  * Copyright (c) 2002-2003  IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM      - Initial API and implementation
-#  * </copyright>
-#  */
-#
-# Property file used to set parameters for Conformance Tools
-
-# -----------------------------------------------------------------------
-# Document factory.
-# -----------------------------------------------------------------------
-wsi.document.factory=org.eclipse.wst.wsi.internal.core.document.impl.DocumentFactoryImpl
-
-# -----------------------------------------------------------------------
-# Profile validation factory.
-# -----------------------------------------------------------------------
-wsi.profile.validator.factory=org.eclipse.wst.wsi.internal.core.profile.validator.impl.ProfileValidatorFactoryImpl
-
-# -----------------------------------------------------------------------
-# Reference to JAXP document builder
-# -----------------------------------------------------------------------
-javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-#javax.xml.parsers.DocumentBuilderFactory=org.eclipe.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl
-
-# -----------------------------------------------------------------------
-# Transport class used by UDDI4J
-# -----------------------------------------------------------------------
-org.uddi4j.TransportClassName=org.uddi4j.transport.ApacheAxisTransport
-
-
-# -----------------------------------------------------------------------
-# Location of XML schema documents relative to the plugin directory
-# -----------------------------------------------------------------------
-wsi.analyzer.xmlschema.schema=http://www.w3.org/2001/XMLSchema.xsd
-wsi.analyzer.soap.schema=http://schemas.xmlsoap.org/soap/envelope/
-wsi.analyzer.wsdl.schema=http://schemas.xmlsoap.org/wsdl/
-wsi.analyzer.wsdlsoap.schema=wsi.analyzer.wsdlsoap.schema
-wsi.analyzer.wsdlmime.schema=http://schemas.xmlsoap.org/wsdl/mime/

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLDocument.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLDocument.java
deleted file mode 100644
index 507f983..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLDocument.java
+++ /dev/null

@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.xml.WSDLReader;
-
-import org.eclipse.wst.wsi.internal.core.wsdl.xsd.InlineSchemaValidator;
-import org.eclipse.wst.wsi.internal.core.xml.XMLTags;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Document;
-
-/**
- * This class provides a interface to a single WSDL document.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class WSDLDocument
-{
-  /**
-   * WSDL document location.
-   */
-  protected String fileName = null;
-
-  /**
-   * Definition element.
-   */
-  protected Definition definitions = null;
-
-  /**
-   * WSDL element list with line and column numbers.
-   */
-  protected WSDLElementList wsdlElementList = null;
-
-  /**
-   * Map of targetNamespaces to the corresponding org.apache.xerces.xs.XSModel of schema elements.
-   */
-  private Map schemas = new HashMap();
-
-  /**
-   * List of schemas validation errors.
-   */
-  private List schemasValidationErrors = new ArrayList();
-
-  /**
-   * Read WSDL document from the specified file.
-   * @param fileName WSDL document location.
-   * @throws WSDLException if problem reading WSDL document.
-   */
-  public WSDLDocument(String fileName) throws WSDLException
-  {
-    this.fileName = fileName;
-    ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-
-    try
-    {                         
-      Thread.currentThread().setContextClassLoader(WSDLDocument.class.getClassLoader());    
-
-      // Get the WSDLReader
-      WSDLReader wsdlReader = new WSDLReaderImpl();
-
-      // Set features
-      wsdlReader.setFeature(com.ibm.wsdl.Constants.FEATURE_VERBOSE, false);
-      // DEBUG:
-      //wsdlReader.setFeature(com.ibm.wsdl.Constants.FEATURE_VERBOSE, true);
-      wsdlReader.setFeature(
-        com.ibm.wsdl.Constants.FEATURE_IMPORT_DOCUMENTS,
-        true);
-      // DEBUG:
-      //wsdlReader.setFeature(com.ibm.wsdl.Constants.FEATURE_IMPORT_DOCUMENTS,true);
-
-      // Parse the WSDL document
-      Document document = XMLUtils.parseXMLDocument(fileName);
-      this.definitions = wsdlReader.readWSDL(fileName, document);
-
-      // Since inline schema validator is used by several assertions, validate all
-      // schemas right after WSDL validation
-      validateSchemas();
-
-      // Get the line and column number references
-      this.wsdlElementList = ((WSDLReaderImpl) wsdlReader).getElementList();
-
-      // DEBUG:
-      //System.err.println(wsdlElementList.toString());
-    }
-    catch (Exception cce)
-    {
-      // Set element list to null
-      this.wsdlElementList = null;
-    }
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }    
-  }
-
-  /**
-   * Create WSDL document from existing Definition object.
-   * 
-   * @param fileName WSDL document location.
-   * @param definitions Definition object.
-   */
-  public WSDLDocument(String fileName, Definition definitions)
-  {
-    this.fileName = fileName;
-    this.definitions = definitions;
-    schemas.clear();
-    schemasValidationErrors.clear();
-  }
-
-  /**
-   * Get the WSDL document location.
-   * @return he WSDL document location.
-   */
-  public String getLocation()
-  {
-    // Return the document location
-    return this.fileName;
-  }
-
-  /**
-   * Get the definition element of the WSDL document.
-   * @return the definition element
-   */
-  public Definition getDefinitions()
-  {
-    // Return the definition element
-    return definitions;
-  }
-
-  /**
-   * Get all the portType elements from the WSDL document.
-   * @return the list of portType elements.
-   */
-  public PortType[] getPortTypes()
-  {
-    // Generate an array of PortTypes from the PortType map for this Definition
-    return (PortType[]) definitions.getPortTypes().values().toArray(
-      new PortType[0]);
-  }
-
-  /**
-   * Get all the binding elements from the WSDL document.
-   * @return the list of binding elements.
-   */
-  public Binding[] getBindings()
-  {
-    // Generate an array of Bindings from the Binding map for this Definition
-    return (Binding[]) definitions.getBindings().values().toArray(
-      new Binding[0]);
-  }
-
-  /**
-   * Get all the service elements from the WSDL document.
-   * @return the list of service elements.
-   */
-  public Service[] getServices()
-  {
-    // Generate an array of Services from the Service map for this Definition
-    return (Service[]) definitions.getServices().values().toArray(
-      new Service[0]);
-  }
-
-  /* Return string representation of this object.
-   * @see java.lang.Object#toString()
-   */
-  public String toString()
-  {
-    // Return string
-    return (definitions == null)
-      ? "WSDL definition element not found."
-      : definitions.toString();
-  }
-
-  /**
-   * Get the element list.
-   * @return the element list.
-   */
-  public WSDLElementList getElementList()
-  {
-    return this.wsdlElementList;
-  }
-
-  /**
-   * Returns a schemas map.
-   * @return a map of targetNamespace attribute values of the schema elements
-   * to the corresponding org.apache.xerces.xs.XSModel object of that schema.
-   */
-  public Map getSchemas()
-  {
-    return schemas;
-  }
-
-  /**
-   * Returns a list of schemas validation errors caused by the validateSchemas() procedure.
-   * @return a list of schemas validation errors.
-   */
-  public List getSchemasValidationErrors()
-  {
-    return schemasValidationErrors; 
-  }
-
-  /**
-   * The method invokes the inline schema validator which validates every schema element of the WSDL.
-   */
-  private void validateSchemas()
-  {
-    schemas.clear();
-    schemasValidationErrors.clear();
-
-    /* INLINE SCHEMA VALIDATOR */
-    if (definitions != null
-      && definitions.getTypes() != null
-      && definitions.getTypes().getExtensibilityElements() != null)
-    {
-      InlineSchemaValidator schemaValidator = new InlineSchemaValidator();
-
-      // Collecting schema's parent elements
-      List parents = new ArrayList(2);
-      parents.add(definitions.getTypes());
-      parents.add(definitions);
-      // Going through all the ExtensibilityElementS of wsdl:types
-      // since they are potential schemas
-      // See Java APIs for WSDL V1.0 (JSR110), section 4
-      Iterator i = this.definitions.getTypes().getExtensibilityElements().iterator();
-      while (i.hasNext())
-      {
-        ExtensibilityElement extEl = (ExtensibilityElement) i.next();
-        if (extEl.getElementType().equals(XMLTags.ELEM_XSD_SCHEMA))
-        {
-          Map map = null;
-          try
-          {
-            // Validating schema element
-            map = schemaValidator.validate(extEl, parents, fileName);
-          }
-          catch (Exception e)
-          {
-            // Adding an exception to the errors list
-            schemasValidationErrors.add(e.getMessage());
-          }
-
-          if (map != null)
-          {
-            // Adding returned XSModel to schemas map
-            schemas.putAll(map);
-          }
-        }
-      }
-    }    
-  }
-
-  /**
-   * Command line interface.
-   * @param args from command line.
-   */
-  public static void main(String[] args)
-  {
-    try
-    {
-      WSDLDocument wsdlDocument = new WSDLDocument(args[0]);
-      System.out.println(wsdlDocument.toString());
-    }
-
-    catch (Exception e)
-    {
-      e.toString();
-      e.printStackTrace();
-    }
-
-    System.exit(0);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java
deleted file mode 100644
index 75a77d8..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-/**
- * This class maintains a WSDL element list.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class WSDLElementList
-{
-  /**
-   * List of WSDL elements with their location.
-   */
-  HashMap wsdlElementList = new HashMap();
-
-  /**
-   * WSDL element locator.
-   */
-  public WSDLElementList()
-  {
-  }
-
-  /**
-   * Add element with location information.
-   * @param wsdlElement      a WSDL element artifact.
-   * @param elementLocation  the location information for the element.
-   */
-  public void addElement(Object wsdlElement, ElementLocation elementLocation)
-  {
-    this.wsdlElementList.put(wsdlElement, elementLocation);
-  }
-
-  /**
-   * Get element location.
-   * @param wsdlElement  a WSDL element artifact.
-   * @return the location information for the element.
-   */
-  public ElementLocation getElementLocation(Object wsdlElement)
-  {
-    return (ElementLocation) this.wsdlElementList.get(wsdlElement);
-  }
-
-  /* Return string representation of this object.
-   * @see java.lang.Object#toString()
-   */
-  public String toString()
-  {
-    String string = "WSDLElementList: \n";
-
-    // Get list entries (values?)
-    Iterator iterator = this.wsdlElementList.keySet().iterator();
-
-    // Add each entry in the list to the string
-    ElementLocation wsdlElementLocation;
-    while (iterator.hasNext())
-    {
-      Object wsdlElement = iterator.next();
-
-      if (wsdlElement != null)
-      {
-        string += "  " + wsdlElement.getClass().getName() + ": ";
-        if ((wsdlElementLocation =
-          (ElementLocation) wsdlElementList.get(wsdlElement))
-          == null)
-        {
-          string += "null\n";
-        }
-
-        else
-        {
-          string += "  "
-            + wsdlElement.getClass().getName()
-            + ": "
-            + wsdlElementLocation.getLineNumber()
-            + ", "
-            + wsdlElementLocation.getColumnNumber()
-            + "\n";
-        }
-      }
-    }
-
-    return string;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
deleted file mode 100644
index a9f65ef..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
+++ /dev/null

@@ -1,801 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xerces.dom.ElementImpl;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.util.StringUtils;
-import com.ibm.wsdl.util.xml.DOMUtils;
-import com.ibm.wsdl.util.xml.QNameUtils;
-import com.ibm.wsdl.util.xml.XPathUtils;
-
-/**
- * This class is a specialization of com.ibm.wsdl.xml.WSDLReaderImpl in WSDL4J.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class WSDLReaderImpl extends com.ibm.wsdl.xml.WSDLReaderImpl
-{
-  // WSDL element list.
-  protected WSDLElementList wsdlElementList = new WSDLElementList();
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseDefinitions(java.lang.String, org.w3c.dom.Element, java.util.Map)
-   */
-  protected Definition parseDefinitions(
-    String documentBaseURI,
-    Element defEl,
-    Map importedDefs)
-    throws WSDLException
-  {
-	  Definition def = null;
-	ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-	try
-	{
-   	  Thread.currentThread().setContextClassLoader(WSDLReaderImpl.class.getClassLoader());   
-	
-      def =
-      super.parseDefinitions(documentBaseURI, defEl, importedDefs);
-
-    // Try to add element to list
-    addElementToList(defEl, def);
-
-
-	}
-catch (Exception e)
-	{
-	}
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }  
-    return def;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseImport(org.w3c.dom.Element, javax.wsdl.Definition, java.util.Map)
-   */
-  protected Import parseImport(Element element, Definition definition, Map map)
-    throws WSDLException
-  {
-    /*boolean wasEx = false;
-    if (def.getDocumentBaseURI()!=null){
-    	File f = new File(def.getDocumentBaseURI());
-    	if (f.getParent()!=null && importEl.getAttribute("location")!=null){		
-    	   f = new File(f.getParent()+"/"+importEl.getAttribute("location"));
-    	   
-    	}
-    } else wasEx = false;
-      
-    Import importDef = super.parseImport(importEl, def, importedDefs);
-    
-    // Try to add element to list
-    addElementToList(importEl, importDef);
-    
-    return importDef;*/
-
-    /*Import import1 = definition.createImport();
-    String s = DOMUtils.getAttribute(element, "namespace");
-    String s1 = DOMUtils.getAttribute(element, "location");
-    if (s != null)
-    	import1.setNamespaceURI(s);
-    if (s1 != null) {
-    	if (importDocuments) {
-    		String s2 = definition.getDocumentBaseURI();
-    		try {
-    
-    			URL url1 = s2 == null ? null : StringUtils.getURL(null, s2);
-    			URL url = StringUtils.getURL(url1, s1);
-    			InputStream inputstream =
-    				StringUtils.getContentAsInputStream(url);
-    			inputstream.close();
-    		} catch (IOException ex) {
-    			//import1.setLocationURI(null);
-    			addElementToList(element, import1);
-    			return import1;
-    		} catch (Throwable ex) {
-    			throw new WSDLException(
-    				"OTHER_ERROR",
-    				"Unable to resolve imported document at '" + s1 + "'.",
-    				ex);
-    		}
-    
-    	}
-    }
-    Import importDef = super.parseImport(element, definition, map);
-    addElementToList(element, importDef);*/
-    Import import1 = definition.createImport();
-    String s = DOMUtils.getAttribute(element, "namespace");
-    String s1 = DOMUtils.getAttribute(element, "location");
-    if (s != null)
-      import1.setNamespaceURI(s);
-    // ADD: check "location" attribute for empty 
-    // string to prevent self-defenition assigning
-    if ((s1 != null) && (s1.length() > 0))
-    {
-      import1.setLocationURI(s1);
-      if (importDocuments)
-        try
-        {
-          String s2 = definition.getDocumentBaseURI();
-          Definition definition1 = null;
-          InputStream inputstream = null;
-          InputSource inputsource = null;
-          URL url = null;
-          if (loc != null)
-          {
-            inputsource = loc.getImportInputSource(s2, s1);
-            String s3 = loc.getLatestImportURI();
-            definition1 = (Definition) map.get(s3);
-          }
-          else
-          {
-            URL url1 = s2 == null ? null : StringUtils.getURL(null, s2);
-            url = StringUtils.getURL(url1, s1);
-            definition1 = (Definition) map.get(url.toString());
-            if (definition1 == null)
-            {
-              try
-              {
-
-                inputstream = url.openStream();
-              }
-              catch (IOException ex)
-              {
-                //import1.setLocationURI(null);
-                addElementToList(element, import1);
-                return import1;
-              }
-              if (inputstream != null)
-                inputsource = new InputSource(inputstream);
-            }
-          }
-          if (definition1 == null)
-          {
-            if (inputsource == null)
-              throw new WSDLException(
-                "OTHER_ERROR",
-                "Unable to locate imported document at '"
-                  + s1
-                  + "'"
-                  + (s2 != null ? ", relative to '" + s2 + "'." : "."));
-            Document document = null;
-            try
-            {
-              document = getDocument(inputsource, s1);
-            }
-            catch (WSDLException ex)
-            {
-              addElementToList(element, import1);
-              return import1;
-            }
-            if (inputstream != null)
-              inputstream.close();
-            Element element2 = document.getDocumentElement();
-            if (QNameUtils.matches(Constants.Q_ELEM_DEFINITIONS, element2))
-            {
-              //if (verbose)
-              //  System.out.println(
-              //    "Retrieving document at '"
-              //      + s1
-              //      + "'"
-              //      + (s2 != null ? ", relative to '" + s2 + "'." : "."));
-              String s4 =
-                loc == null
-                  ? url == null
-                  ? s1
-                  : url.toString() : loc.getLatestImportURI();
-              definition1 = readWSDL(s4, element2, map);
-            }
-            else
-            {
-              QName qname = QNameUtils.newQName(element2);
-              if (Constants.XSD_QNAME_LIST.contains(qname))
-              {
-                WSDLFactory wsdlfactory =
-                  factoryImplName == null
-                    ? WSDLFactory.newInstance()
-                    : WSDLFactory.newInstance(factoryImplName);
-                definition1 = wsdlfactory.newDefinition();
-                if (extReg != null)
-                  definition1.setExtensionRegistry(extReg);
-                String s5 =
-                  loc == null
-                    ? url == null
-                    ? s1
-                    : url.toString() : loc.getLatestImportURI();
-                definition1.setDocumentBaseURI(s5);
-                /* Don't add types element since it doesn't exist.  Adding it causes problems
-                 * since it will add a types element for processing that does not exist.
-                Types types = definition1.createTypes();
-                UnknownExtensibilityElement unknownextensibilityelement =
-                	new UnknownExtensibilityElement();
-                unknownextensibilityelement.setElement(element2);
-                types.addExtensibilityElement(
-                	unknownextensibilityelement);
-                definition1.setTypes(types);
-                */
-              }
-            }
-          }
-          if (definition1 != null)
-            import1.setDefinition(definition1);
-        }
-        catch (WSDLException wsdlexception)
-        {
-          wsdlexception.setLocation(XPathUtils.getXPathExprFromNode(element));
-          throw wsdlexception;
-        }
-        catch (Throwable throwable)
-        {
-          throw new WSDLException(
-            "OTHER_ERROR",
-            "Unable to resolve imported document at '" + s1 + "'.",
-            throwable);
-        }
-    }
-    for (Element element1 = DOMUtils.getFirstChildElement(element);
-      element1 != null;
-      element1 = DOMUtils.getNextSiblingElement(element1))
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, element1))
-        import1.setDocumentationElement(element1);
-      else
-        DOMUtils.throwWSDLException(element1);
-
-    return import1;
-
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseTypes(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Types parseTypes(Element typesEl, Definition def)
-    throws WSDLException
-  {
-    Types types = super.parseTypes(typesEl, def);
-
-    // Try to add element to list
-    addElementToList(typesEl, types);
-
-    return types;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseBinding(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Binding parseBinding(Element bindingEl, Definition def)
-    throws WSDLException
-  {
-    Binding binding = super.parseBinding(bindingEl, def);
-
-    // Try to add element to list
-    addElementToList(bindingEl, binding);
-
-    return binding;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseBindingOperation(org.w3c.dom.Element, javax.wsdl.PortType, javax.wsdl.Definition)
-   */
-  protected BindingOperation parseBindingOperation(
-    Element bindingOperationEl,
-    PortType portType,
-    Definition def)
-    throws WSDLException
-  {
-    BindingOperation bindingOperation = null;
-
-    // The follow try-catch was added to detect when a duplicate operation name was detected
-    try
-    {
-      bindingOperation =
-        super.parseBindingOperation(bindingOperationEl, portType, def);
-    }
-
-    catch (IllegalArgumentException iae)
-    {
-      if (iae.getMessage().startsWith("Duplicate"))
-      {
-        bindingOperation =
-          parseBindingOperationWithDuplicateNames(
-            bindingOperationEl,
-            portType,
-            def);
-      }
-
-      else
-      {
-        throw iae;
-      }
-    }
-
-    // Try to add element to list
-    if (bindingOperation != null)
-    {
-      addElementToList(bindingOperationEl, bindingOperation);
-    }
-
-    return bindingOperation;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseBindingInput(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected BindingInput parseBindingInput(
-    Element bindingInputEl,
-    Definition def)
-    throws WSDLException
-  {
-    BindingInput bindingInput = super.parseBindingInput(bindingInputEl, def);
-
-    // Try to add element to list
-    addElementToList(bindingInputEl, bindingInput);
-
-    return bindingInput;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseBindingOutput(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected BindingOutput parseBindingOutput(
-    Element bindingOutputEl,
-    Definition def)
-    throws WSDLException
-  {
-    BindingOutput bindingOutput =
-      super.parseBindingOutput(bindingOutputEl, def);
-
-    // Try to add element to list
-    addElementToList(bindingOutputEl, bindingOutput);
-
-    return bindingOutput;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseBindingFault(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected BindingFault parseBindingFault(
-    Element bindingFaultEl,
-    Definition def)
-    throws WSDLException
-  {
-    BindingFault bindingFault = super.parseBindingFault(bindingFaultEl, def);
-
-    // Try to add element to list
-    addElementToList(bindingFaultEl, bindingFault);
-
-    return bindingFault;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseMessage(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Message parseMessage(Element msgEl, Definition def)
-    throws WSDLException
-  {
-    Message msg = super.parseMessage(msgEl, def);
-
-    // Try to add element to list
-    addElementToList(msgEl, msg);
-
-    return msg;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parsePart(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Part parsePart(Element partEl, Definition def) throws WSDLException
-  {
-    //Part part = super.parsePart(partEl, def);
-
-    Part part = def.createPart();
-    String name = DOMUtils.getAttribute(partEl, Constants.ATTR_NAME);
-
-    // WS-I: The try-catch was added for WSI2416
-    QName elementName;
-
-    try
-    {
-      elementName =
-        DOMUtils.getQualifiedAttributeValue(
-          partEl,
-          Constants.ATTR_ELEMENT,
-          Constants.ELEM_MESSAGE,
-          false);
-    }
-
-    catch (WSDLException we)
-    {
-      String prefixedValue =
-        DOMUtils.getAttribute(partEl, Constants.ATTR_ELEMENT);
-      int index = prefixedValue.indexOf(':');
-      String localPart = prefixedValue.substring(index + 1);
-
-      elementName = new QName(localPart);
-    }
-
-    QName typeName =
-      DOMUtils.getQualifiedAttributeValue(
-        partEl,
-        Constants.ATTR_TYPE,
-        Constants.ELEM_MESSAGE,
-        false);
-
-    if (name != null)
-    {
-      part.setName(name);
-    }
-
-    if (elementName != null)
-    {
-      part.setElementName(elementName);
-    }
-
-    if (typeName != null)
-    {
-      part.setTypeName(typeName);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(partEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        part.setDocumentationElement(tempEl);
-      }
-      else
-      {
-        DOMUtils.throwWSDLException(tempEl);
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    Map extensionAttributes = part.getExtensionAttributes();
-
-    extensionAttributes.putAll(getPartAttributes(partEl, def));
-
-    // Need to do something here to locate part definition.
-
-    // Try to add element to list
-    addElementToList(partEl, part);
-
-    return part;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parsePortType(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected PortType parsePortType(Element portTypeEl, Definition def)
-    throws WSDLException
-  {
-    PortType portType = super.parsePortType(portTypeEl, def);
-
-    // Try to add element to list
-    addElementToList(portTypeEl, portType);
-
-    return portType;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseOperation(org.w3c.dom.Element, javax.wsdl.PortType, javax.wsdl.Definition)
-   */
-  protected Operation parseOperation(
-    Element opEl,
-    PortType portType,
-    Definition def)
-    throws WSDLException
-  {
-    Operation op = super.parseOperation(opEl, portType, def);
-
-    // Try to add element to list
-    addElementToList(opEl, op);
-
-    return op;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseService(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Service parseService(Element serviceEl, Definition def)
-    throws WSDLException
-  {
-    Service service = super.parseService(serviceEl, def);
-
-    // Try to add element to list
-    addElementToList(serviceEl, service);
-
-    return service;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parsePort(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Port parsePort(Element portEl, Definition def) throws WSDLException
-  {
-    Port port = super.parsePort(portEl, def);
-
-    // Try to add element to list
-    addElementToList(portEl, port);
-
-    return port;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseExtensibilityElement(java.lang.Class, org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected ExtensibilityElement parseExtensibilityElement(
-    Class parentType,
-    Element el,
-    Definition def)
-    throws WSDLException
-  {
-    ExtensibilityElement extElement =
-      super.parseExtensibilityElement(parentType, el, def);
-
-    // Try to add element to list
-    addElementToList(el, extElement);
-
-    return extElement;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseInput(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Input parseInput(Element inputEl, Definition def)
-    throws WSDLException
-  {
-    Input input = super.parseInput(inputEl, def);
-
-    // Try to add element to list
-    addElementToList(inputEl, input);
-
-    return input;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseOutput(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Output parseOutput(Element outputEl, Definition def)
-    throws WSDLException
-  {
-    Output output = super.parseOutput(outputEl, def);
-
-    // Try to add element to list
-    addElementToList(outputEl, output);
-
-    return output;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#parseFault(org.w3c.dom.Element, javax.wsdl.Definition)
-   */
-  protected Fault parseFault(Element faultEl, Definition def)
-    throws WSDLException
-  {
-    Fault fault = super.parseFault(faultEl, def);
-
-    // Try to add element to list
-    addElementToList(faultEl, fault);
-
-    return fault;
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.wsdl.xml.WSDLReaderImpl#getDocument(org.xml.sax.InputSource, java.lang.String)
-   */
-  protected Document getDocument(InputSource inputSource, String desc)
-    throws WSDLException
-  {
-    ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();
-    try
-	{
-      Thread.currentThread().setContextClassLoader(WSDLReaderImpl.class.getClassLoader());   	
-	
-  	  //DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-      DocumentBuilderFactory factory =
-        new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-      factory.setNamespaceAware(true);
-      factory.setValidating(false);
-
-      DocumentBuilder builder = factory.newDocumentBuilder();
-      Document doc = builder.parse(inputSource);
-
-      return doc;
-    }
-    catch (Throwable t)
-    {
-      throw new WSDLException(
-        WSDLException.PARSER_ERROR,
-        "Problem parsing '" + desc + "'.",
-        t);
-    }
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }    
-  }
-
-  /**
-   * Get element list.
-   * @return the element list.
-   */
-  public WSDLElementList getElementList()
-  {
-    return this.wsdlElementList;
-  }
-
-  /** 
-   * Add WSDL element to element list.
-   */
-  private void addElementToList(Element element, Object wsdlElement)
-  {
-    ElementLocation elementLocation = null;
-
-    try
-    {
-      // See if the element object is an instanceof org.apache.xerces.dom.ElementImpl
-      ElementImpl elementImpl = (ElementImpl) element;
-
-      // If it is, then get the element location information
-      elementLocation =
-        (ElementLocation) elementImpl.getUserData();
-
-      // Add it to the list
-      this.wsdlElementList.addElement(wsdlElement, elementLocation);
-    }
-
-    catch (ClassCastException cce)
-    {
-      // ADD: Should we add the element with a null or zero location?
-    }
-  }
-
-  /**
-   * This method is used when a WSDL document contains duplicate operation names.
-   * It is the same as the original parseBindingOperation method, except that it will
-   * just find the first operation that matches instead of throwing an exception.
-   */
-  private BindingOperation parseBindingOperationWithDuplicateNames(
-    Element bindingOperationEl,
-    PortType portType,
-    Definition def)
-    throws WSDLException
-  {
-    BindingOperation bindingOperation = def.createBindingOperation();
-    String name =
-      DOMUtils.getAttribute(bindingOperationEl, Constants.ATTR_NAME);
-
-    if (name != null)
-    {
-      bindingOperation.setName(name);
-    }
-
-    Element tempEl = DOMUtils.getFirstChildElement(bindingOperationEl);
-
-    while (tempEl != null)
-    {
-      if (QNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION, tempEl))
-      {
-        bindingOperation.setDocumentationElement(tempEl);
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_INPUT, tempEl))
-      {
-        bindingOperation.setBindingInput(parseBindingInput(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_OUTPUT, tempEl))
-      {
-        bindingOperation.setBindingOutput(parseBindingOutput(tempEl, def));
-      }
-      else if (QNameUtils.matches(Constants.Q_ELEM_FAULT, tempEl))
-      {
-        bindingOperation.addBindingFault(parseBindingFault(tempEl, def));
-      }
-      else
-      {
-        bindingOperation.addExtensibilityElement(
-          parseExtensibilityElement(BindingOperation.class, tempEl, def));
-      }
-
-      tempEl = DOMUtils.getNextSiblingElement(tempEl);
-    }
-
-    if (portType != null)
-    {
-      BindingInput bindingInput = bindingOperation.getBindingInput();
-      BindingOutput bindingOutput = bindingOperation.getBindingOutput();
-      String inputName = (bindingInput != null ? bindingInput.getName() : null);
-      String outputName =
-        (bindingOutput != null ? bindingOutput.getName() : null);
-
-      //Operation op = portType.getOperation(name, inputName, outputName);
-      // Get all operations, and then find the first one that matches
-      Operation op = null, checkOperation;
-      Iterator iterator = portType.getOperations().iterator();
-      while (iterator.hasNext() && op == null)
-      {
-        // Get the next operation
-        checkOperation = (Operation) iterator.next();
-
-        // Get the operation name, input name, and output name
-        String checkName = checkOperation.getName();
-        String checkInputName =
-          (checkOperation.getInput() == null
-            ? null
-            : checkOperation.getInput().getName());
-        String checkOutputName =
-          (checkOperation.getOutput() == null
-            ? null
-            : checkOperation.getOutput().getName());
-
-        // If the names match, then that operation
-        if ((checkName != null && checkName.equals(name))
-          && ((checkInputName != null && checkInputName.equals(inputName))
-            || (checkInputName == null && inputName == null))
-          && ((checkOutputName != null && checkOutputName.equals(outputName))
-            || (checkOutputName == null && outputName == null)))
-        {
-          op = checkOperation;
-        }
-      }
-
-      if (op == null)
-      {
-        op = def.createOperation();
-        op.setName(name);
-        portType.addOperation(op);
-      }
-
-      bindingOperation.setOperation(op);
-    }
-
-    return bindingOperation;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java
deleted file mode 100644
index f175be3..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java
+++ /dev/null

@@ -1,384 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-
-/**
- * Set of XML related utilities.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public final class WSDLUtils
-{
-
-  /**
-   * Method isRpcLiteral.
-   * @param bindingStyle a binding style.
-   * @param operation a WSDL binding operation artifact.
-   * @return true if binding is rpc literal.
-   */
-  public static boolean isRpcLiteral(
-    String bindingStyle,
-    BindingOperation operation)
-  {
-    return checkStyleAndUse(
-      WSIConstants.ATTRVAL_SOAP_BIND_STYLE_RPC,
-      WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT,
-      bindingStyle,
-      operation);
-  }
-
-  /**
-   * Method isDocLiteral.
-   * @param bindingStyle  the binding style.
-   * @param operation a WSDL binding operation.
-   * @return true if binding is document literal. 
-   */
-  public static boolean isDocLiteral(
-    String bindingStyle,
-    BindingOperation operation)
-  {
-    return checkStyleAndUse(
-      WSIConstants.ATTRVAL_SOAP_BIND_STYLE_DOC,
-      WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT,
-      bindingStyle,
-      operation);
-  }
-
-  /**
-   * Method checkStyleAndUse.
-   */
-  private static boolean checkStyleAndUse(
-    String checkStyle,
-    String checkUse,
-    String bindingStyle,
-    BindingOperation bindingOperation)
-  {
-    boolean styleFound = false;
-    boolean styleAndUseFound = false;
-
-    // Find the soapbind:operation element
-    SOAPOperation soapOperation = getSoapOperation(bindingOperation);
-
-    // If there are no ext elements, then check against binding style
-    if ((soapOperation == null) || (soapOperation.getStyle() == null))
-    {
-      if (checkStyle.equals(bindingStyle))
-        styleFound = true;
-    }
-
-    else
-    {
-      if (checkStyle.equals(soapOperation.getStyle()))
-        styleFound = true;
-    }
-
-    // If style found then check use
-    if (styleFound)
-    {
-      // Find the soapbind:body element
-      SOAPBody soapBody = getInputSoapBody(bindingOperation);
-
-      // If there are no soapbind:body, then check against default use value
-      if ((soapBody == null) || (soapBody.getUse() == null))
-      {
-        if (checkUse.equals(WSIConstants.ATTRVAL_SOAP_BODY_USE_LIT))
-          styleAndUseFound = true;
-      }
-
-      else
-      {
-        if (checkUse.equals(soapBody.getUse()))
-          styleAndUseFound = true;
-      }
-    }
-
-    return styleAndUseFound;
-  }
-
-  /**
-   * Get soapbind:binding.
-   * @param binding  a Binding object.
-   * @return soapbind:binding.
-   */
-  public static SOAPBinding getSoapBinding(Binding binding)
-  {
-    SOAPBinding soapBinding = null;
-
-    List extElements = null;
-
-    // Find the soapbind:operation element
-    if ((extElements = binding.getExtensibilityElements()) != null)
-    {
-      for (Iterator iterator = extElements.iterator();
-        iterator.hasNext() && (soapBinding == null);
-        )
-      {
-        Object obj = iterator.next();
-
-        if (obj instanceof SOAPBinding)
-        {
-          soapBinding = (SOAPBinding) obj;
-        }
-      }
-    }
-
-    return soapBinding;
-  }
-
-  /**
-   * Get soapbind:operation.
-   * @param bindingOperation  a BindingOperation object.
-   * @return soapbind:operation.
-   */
-  public static SOAPOperation getSoapOperation(BindingOperation bindingOperation)
-  {
-    SOAPOperation soapOperation = null;
-
-    List extElements = null;
-
-    // Find the soapbind:operation element
-    if ((extElements = bindingOperation.getExtensibilityElements()) != null)
-    {
-      for (Iterator iterator = extElements.iterator();
-        iterator.hasNext() && (soapOperation == null);
-        )
-      {
-        Object obj = iterator.next();
-
-        if (obj instanceof SOAPOperation)
-        {
-          soapOperation = (SOAPOperation) obj;
-        }
-      }
-    }
-
-    return soapOperation;
-  }
-
-  /**
-   * Get soapbind:body from input element.
-   * @param bindingOperation  the BindingOperation object.
-   * @return soapbind:body from input element.
-   */
-  public static SOAPBody getInputSoapBody(BindingOperation bindingOperation)
-  {
-    SOAPBody soapBody = null;
-
-    List extElements = null;
-
-    // Find the soapbind:body element
-    if ((extElements =
-      bindingOperation.getBindingInput().getExtensibilityElements())
-      != null)
-    {
-      for (Iterator iterator = extElements.iterator();
-        iterator.hasNext() && (soapBody == null);
-        )
-      {
-        Object obj = iterator.next();
-
-        if (obj instanceof SOAPBody)
-        {
-          soapBody = (SOAPBody) obj;
-        }
-      }
-    }
-
-    return soapBody;
-  }
-
-  /**
-   * Find messages referenced by a header or headerfault.
-   * @param definition  a Definition object.
-   * @param binding  a Binding object.
-   * @return messages referenced by a header or headerfault.
-   */
-  public static HashSet findMessages(Definition definition, Binding binding)
-  {
-    BindingOperation bindingOperation;
-
-    HashSet tempMessages, bindingMessages = new HashSet();
-
-    HashSet portTypeMessages = findMessages(binding.getPortType());
-
-    // Process each operation
-    Iterator iterator = binding.getBindingOperations().iterator();
-    while (iterator.hasNext())
-    {
-      bindingOperation = (BindingOperation) iterator.next();
-
-      // Process the input and then the output
-      if (bindingOperation.getBindingInput() != null)
-      {
-        tempMessages =
-          findMessages(
-            bindingOperation
-              .getBindingInput()
-              .getExtensibilityElements()
-              .iterator(),
-            portTypeMessages,
-            definition);
-
-        // Add messages to binding message set
-        bindingMessages.addAll(tempMessages);
-      }
-
-      // Process output
-      if (bindingOperation.getBindingOutput() != null)
-      {
-        tempMessages =
-          findMessages(
-            bindingOperation
-              .getBindingOutput()
-              .getExtensibilityElements()
-              .iterator(),
-            portTypeMessages,
-            definition);
-
-        // Add messages to binding message set
-        bindingMessages.addAll(tempMessages);
-      }
-    }
-
-    return bindingMessages;
-  }
-
-  /**
-   * Find the messages that are referenced by a header or headerfault.
-   * @param portType a PortType object.
-   * @return he messages that are referenced by a header or headerfault.
-   */
-  public static HashSet findMessages(PortType portType)
-  {
-    HashSet messageSet = new HashSet();
-    Operation operation;
-
-    Iterator iterator = portType.getOperations().iterator();
-    while (iterator.hasNext())
-    {
-      // Get next operation to process
-      operation = (Operation) iterator.next();
-
-      // Get input and output message
-      if (operation.getInput() != null)
-        messageSet.add(operation.getInput().getMessage());
-      if (operation.getOutput() != null)
-        messageSet.add(operation.getOutput().getMessage());
-
-      // Process any faults
-      Iterator faults = operation.getFaults().values().iterator();
-      while (faults.hasNext())
-      {
-        messageSet.add(((Fault) faults.next()).getMessage());
-      }
-    }
-
-    return messageSet;
-  }
-
-  /**
-   * Find the messages that are referenced by a header or headerfault.
-   * @param extElementList a list of external elements.
-   * @param messageSet a set of messages.
-   * @param definition a Definition object.
-   * @return the messages that are referenced by a header or headerfault.
-   */
-  protected static HashSet findMessages(
-    Iterator extElementList,
-    HashSet messageSet,
-    Definition definition)
-  {
-    HashSet returnSet = new HashSet();
-    ExtensibilityElement extElement;
-    Message saveMessage = null;
-
-    while (extElementList.hasNext())
-    {
-      // Get ext. element
-      extElement = (ExtensibilityElement) extElementList.next();
-
-      QName messageQName;
-      Message message;
-
-      // If this is a soap:header element, then check for message reference
-      if (extElement instanceof SOAPHeader)
-      {
-        SOAPHeader soapHeader = (SOAPHeader) extElement;
-        if ((messageQName = soapHeader.getMessage()) != null)
-        {
-          // If message not found, then create a dummy message element
-          if ((message = definition.getMessage(messageQName)) == null)
-          {
-            message = definition.createMessage();
-            message.setQName(messageQName);
-            message.setUndefined(true);
-          }
-
-          if (!messageSet.contains(message))
-          {
-            returnSet.add(message);
-            saveMessage = message;
-          }
-        }
-
-        // Process any header faults within this header
-        Iterator headerFaultList = soapHeader.getSOAPHeaderFaults().iterator();
-        while (headerFaultList.hasNext())
-        {
-          // Get soap header fault
-          SOAPHeaderFault soapHeaderFault =
-            (SOAPHeaderFault) headerFaultList.next();
-          if ((messageQName = soapHeaderFault.getMessage()) != null)
-          {
-            // If message not found, then create a dummy message element
-            if ((message = definition.getMessage(messageQName)) == null)
-            {
-              message = definition.createMessage();
-              message.setQName(messageQName);
-              message.setUndefined(true);
-            }
-
-            // If message not in message set and return set, then add it  
-            if (!messageSet.contains(message)
-              && ((saveMessage == null)
-                || (saveMessage != null
-                  && !saveMessage.getQName().equals(message.getQName()))))
-              returnSet.add(message);
-          }
-        }
-      }
-    }
-
-    return returnSet;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/VisitorAdaptor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/VisitorAdaptor.java
deleted file mode 100644
index 8b90938..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/VisitorAdaptor.java
+++ /dev/null

@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.w3c.dom.Element;
-
-/**
- * The class adapts the given object with the implemented
- * <code>WSDLVisitor</code> methods.
- * 
- * @author Kulik
- */
-public class VisitorAdaptor implements InvocationHandler
-{
-
-  // optimization hint
-  static final private Class[] visitorClass = new Class[] { WSDLVisitor.class };
-
-  /**
-   * The array is used for determination of actual javax.wsdl class
-   */
-  private static Class[] wsdl =
-    new Class[] {
-      Part.class,
-      Service.class,
-      Types.class,
-      Operation.class,
-      Input.class,
-      Output.class,
-      Fault.class,
-      Binding.class,
-      BindingOperation.class,
-      BindingInput.class,
-      BindingOutput.class,
-      BindingFault.class,
-      Import.class,
-      Element.class,
-      Message.class,
-      Port.class,
-      PortType.class,
-      Definition.class,
-      ExtensibilityElement.class,
-      SOAPBinding.class,
-      SOAPBody.class,
-      SOAPHeader.class,
-      SOAPHeaderFault.class,
-      SOAPFault.class,
-      SOAPOperation.class };
-
-  final private Object visitor;
-
-  private Map methods = new HashMap();
-
-  /**
-   * Constructor.
-   * @param o  a visitor object.
-   */
-  private VisitorAdaptor(Object o)
-  {
-    this.visitor = o;
-  }
-
-  /**
-   * Adds method to method binding.
-   * @param wsdlMethod    a WSDL method.
-   * @param targetMethod  a  target method.
-   */
-  private void addMethodBinding(Method wsdlMethod, Method targetMethod)
-  {
-    methods.put(wsdlMethod, targetMethod);
-  }
-
-  /**
-   * The method proxies all "visit(XXX)" methods to the corresponding
-   * "visit(XXX)" methods of the target visitor object. 
-   * @see java.lang.reflect.InvocationHandler#invoke(Object, Method, Object[])
-   */
-  public Object invoke(Object proxy, Method m, Object[] params)
-  {
-    try
-    {
-      Method target = (Method) methods.get(m);
-      // assert target != null
-      return target.invoke(visitor, params);
-    }
-    catch (Throwable t)
-    {
-      t.printStackTrace();
-    }
-    return null;
-  }
-
-  /**
-   * The method extract the short class name. 
-   * @param c  a class.
-   * @return the short class name.
-   */
-  static private String getName(Class c)
-  {
-    if (c != null)
-    {
-      String name = c.getName();
-      return name.substring(name.lastIndexOf(".") + 1);
-    }
-    return null;
-  }
-
-  /**
-   * The method generates proxy for the given visitor.
-   * Proxy redirects all visit(XXX) callback to the implemented in visitor
-   * object.
-   * @param visitor  a vistor object.
-   * @return a proxy for the given visitor.
-   */
-  public static WSDLTraversal adapt(Object visitor)
-  {
-    WSDLTraversal traversal = new WSDLTraversal();
-
-    if (visitor == null)
-      throw new IllegalArgumentException("Visitor object can not be NULL");
-
-    VisitorAdaptor adaptor = new VisitorAdaptor(visitor);
-
-    // check whether methods are implemented
-    // get real class of the object
-    Class c = visitor.getClass();
-    // iterates through wsdl artifacts and looking for
-    // void visit(XXX) implemented methods.  
-    for (int i = 0; i < wsdl.length; i++)
-      try
-      {
-        // if method is not found the exception will be thrown
-        Method m =
-          c.getMethod(
-            "visit",
-            new Class[] { wsdl[i], Object.class, WSDLTraversalContext.class });
-        // register binding WSDLVisitor method -> target visitor method
-        adaptor.addMethodBinding(
-          WSDLVisitor.class.getMethod(
-            "visit",
-            new Class[] { wsdl[i], Object.class, WSDLTraversalContext.class }),
-          m);
-        // register visitXXX in WSDLTraversalBuilder
-        m =
-          WSDLTraversal.class.getMethod(
-            "visit" + getName(wsdl[i]),
-            new Class[] { boolean.class });
-        m.invoke(traversal, new Object[] { Boolean.TRUE });
-      }
-      catch (Exception e)
-      {
-      }
-
-    // construct the WSDLVisitor by using java.lang.reflect.Proxy
-    ClassLoader loader = Thread.currentThread().getContextClassLoader();
-    WSDLVisitor wsdlVisitor =
-      (WSDLVisitor) Proxy.newProxyInstance(loader, visitorClass, adaptor);
-    // traverse WSDL document
-    traversal.setVisitor(wsdlVisitor);
-    return traversal;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java
deleted file mode 100644
index 4a3569a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java
+++ /dev/null

@@ -1,3271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.w3c.dom.Element;
-
-/**
- * The class implements plain traverse over WSDL artifacts.
- * WSDLTraversal is context-driven traversal. 
- * 
- * @author Andrey Kulik
- */
-public class WSDLTraversal
-{
-
-  /**
-   * Current WSDL visitor (callback).
-   */
-  private WSDLVisitor visitor;
-
-  /**
-   * Flags which specify whether traversal will travers from one WSDL artifact
-   * to another.
-   */
-  private boolean traverseBinding2BindingOperation = true;
-  private boolean traverseBinding2Element = true;
-  private boolean traverseBinding2ExtensibilityElement = true;
-  private boolean traverseBinding2PortType = true; // reference
-  private boolean traverseBindingFault2Element = true;
-  private boolean traverseBindingFault2ExtensibilityElement = true;
-  private boolean traverseBindingInput2Element = true;
-  private boolean traverseBindingInput2ExtensibilityElement = true;
-  private boolean traverseBindingOperation2BindingFault = true;
-  private boolean traverseBindingOperation2BindingInput = true;
-  private boolean traverseBindingOperation2BindingOutput = true;
-  private boolean traverseBindingOperation2Element = true;
-  private boolean traverseBindingOperation2ExtensibilityElement = true;
-  private boolean traverseBindingOperation2Operation = true; // reference  
-  private boolean traverseBindingOutput2Element = true;
-  private boolean traverseBindingOutput2ExtensibilityElement = true;
-  private boolean traverseDefinition2Binding = true;
-  private boolean traverseDefinition2Element = true;
-  private boolean traverseDefinition2ExtensibilityElement = true;
-  private boolean traverseDefinition2Import = true;
-  private boolean traverseDefinition2Message = true;
-  private boolean traverseDefinition2PortType = true;
-  private boolean traverseDefinition2Service = true;
-  private boolean traverseDefinition2Types = true;
-  private boolean traverseFault2Element = true;
-  private boolean traverseFault2Message = true; // reference 
-  private boolean traverseImport2Definition = true;
-  private boolean traverseImport2Element = true;
-  private boolean traverseInput2Element = true;
-  private boolean traverseInput2Message = true; // reference 
-  private boolean traverseMessage2Element = true;
-  private boolean traverseMessage2Part = true;
-  private boolean traverseOperation2Element = true;
-  private boolean traverseOperation2Fault = true;
-  private boolean traverseOperation2Input = true;
-  private boolean traverseOperation2Output = true;
-  private boolean traverseOutput2Element = true;
-  private boolean traverseOutput2Message = true; // reference 
-  private boolean traversePart2Element = true;
-  private boolean traversePort2Binding = true; // reference 
-  private boolean traversePort2Element = true;
-  private boolean traversePort2ExtensibilityElement = true;
-  private boolean traversePortType2Element = true;
-  private boolean traversePortType2Operation = true;
-  private boolean traverseService2Element = true;
-  private boolean traverseService2ExtensibilityElement = true;
-  private boolean traverseService2Port = true;
-  private boolean traverseTypes2Element = true;
-  private boolean traverseTypes2ExtensibilityElement = true;
-  //private boolean traverseSOAPBody2Part = true;
-  private boolean traverseSOAPHeader2SOAPHeaderFault = true;
-  private boolean traverseBinding2SOAPBinding = true;
-  private boolean traverseBindingOperation2SOAPOperation = true;
-  private boolean traverseBindingInput2SOAPHeader = true;
-  private boolean traverseBindingInput2SOAPBody = true;
-  private boolean traverseBindingOutput2SOAPHeader = true;
-  private boolean traverseBindingOutput2SOAPBody = true;
-  private boolean traverseBindingFault2SOAPFault = true;
-
-  /**
-   * Flags which specify whether traversal will visit corresponding WSDL
-   * artifact.
-   */
-  private boolean visitBinding = false;
-  private boolean visitBindingFault = false;
-  private boolean visitBindingInput = false;
-  private boolean visitBindingOperation = false;
-  private boolean visitBindingOutput = false;
-  private boolean visitDefinition = false;
-  private boolean visitElement = false;
-  private boolean visitExtensibilityElement = false;
-  private boolean visitFault = false;
-  private boolean visitImport = false;
-  private boolean visitInput = false;
-  private boolean visitMessage = false;
-  private boolean visitOperation = false;
-  private boolean visitOutput = false;
-  private boolean visitPart = false;
-  private boolean visitPort = false;
-  private boolean visitPortType = false;
-  private boolean visitService = false;
-  private boolean visitTypes = false;
-  private boolean visitSOAPBinding = false;
-  private boolean visitSOAPBody = false;
-  private boolean visitSOAPFault = false;
-  private boolean visitSOAPHeader = false;
-  private boolean visitSOAPHeaderFault = false;
-  private boolean visitSOAPOperation = false;
-
-  /**
-   * Default constructor.
-   * @see java.lang.Object#Object()
-   */
-  public WSDLTraversal()
-  {
-  }
-
-  /**
-   * The method specifies that traversal will ignore indirect references between
-   * WSDL artifacts. For example:
-   * <ol>
-   *   <li>binding to port type</li>
-   *   <li>binding operation to operation</li>
-   *   <li>fault to message</li>
-   *   <li>input to message</li>
-   *   <li>output to message</li>
-   *   <li>port to binding</li>
-   * </ol>
-   */
-  public void ignoreReferences()
-  {
-    ignoreBinding2PortType();
-    ignoreBindingOperation2Operation();
-    ignoreFault2Message();
-    ignoreInput2Message();
-    ignoreOutput2Message();
-    ignorePort2Binding();
-    //ignoreSOAPBody2Part();
-  }
-
-  /**
-   * The method sets visitor.
-   * @param visitor  a WSDL visitor.
-   */
-  public void setVisitor(WSDLVisitor visitor)
-  {
-    this.visitor = visitor;
-  }
-
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return the traversal.
-   */
-  public WSDLTraversal ignoreBinding2SOAPBinding()
-  {
-    traverseBinding2SOAPBinding = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2SOAPOperation()
-  {
-    traverseBindingOperation2SOAPOperation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingInput2SOAPHeader()
-  {
-    traverseBindingInput2SOAPHeader = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingInput2SOAPBody()
-  {
-    traverseBindingInput2SOAPBody = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOutput2SOAPHeader()
-  {
-    traverseBindingOutput2SOAPHeader = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOutput2SOAPBody()
-  {
-    traverseBindingOutput2SOAPBody = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingFault2SOAPFault()
-  {
-    traverseBindingFault2SOAPFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPHeader2SOAPHeaderFault()
-  {
-    traverseSOAPHeader2SOAPHeaderFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBinding2BindingOperation()
-  {
-    traverseBinding2BindingOperation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBinding2Element()
-  {
-    traverseBinding2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBinding2ExtensibilityElement()
-  {
-    traverseBinding2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBinding2PortType()
-  {
-    traverseBinding2PortType = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingFault2Element()
-  {
-    traverseBindingFault2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingFault2ExtensibilityElement()
-  {
-    traverseBindingFault2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingInput2Element()
-  {
-    traverseBindingInput2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingInput2ExtensibilityElement()
-  {
-    traverseBindingInput2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2BindingFault()
-  {
-    traverseBindingOperation2BindingFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2BindingInput()
-  {
-    traverseBindingOperation2BindingInput = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2BindingOutput()
-  {
-    traverseBindingOperation2BindingOutput = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2Element()
-  {
-    traverseBindingOperation2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2ExtensibilityElement()
-  {
-    traverseBindingOperation2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation2Operation()
-  {
-    traverseBindingOperation2Operation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOutput2Element()
-  {
-    traverseBindingOutput2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOutput2ExtensibilityElement()
-  {
-    traverseBindingOutput2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Binding()
-  {
-    traverseDefinition2Binding = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Element()
-  {
-    traverseDefinition2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2ExtensibilityElement()
-  {
-    traverseDefinition2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Import()
-  {
-    traverseDefinition2Import = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Message()
-  {
-    traverseDefinition2Message = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2PortType()
-  {
-    traverseDefinition2PortType = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Service()
-  {
-    traverseDefinition2Service = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition2Types()
-  {
-    traverseDefinition2Types = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreFault2Element()
-  {
-    traverseFault2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreFault2Message()
-  {
-    traverseFault2Message = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreImport2Definition()
-  {
-    traverseImport2Definition = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreImport2Element()
-  {
-    traverseImport2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreInput2Element()
-  {
-    traverseInput2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreInput2Message()
-  {
-    traverseInput2Message = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreMessage2Element()
-  {
-    traverseMessage2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreMessage2Part()
-  {
-    traverseMessage2Part = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOperation2Element()
-  {
-    traverseOperation2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOperation2Fault()
-  {
-    traverseOperation2Fault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOperation2Input()
-  {
-    traverseOperation2Input = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOperation2Output()
-  {
-    traverseOperation2Output = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOutput2Element()
-  {
-    traverseOutput2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOutput2Message()
-  {
-    traverseOutput2Message = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePart2Element()
-  {
-    traversePart2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePort2Binding()
-  {
-    traversePort2Binding = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePort2Element()
-  {
-    traversePort2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePort2ExtensibilityElement()
-  {
-    traversePort2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePortType2Element()
-  {
-    traversePortType2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePortType2Operation()
-  {
-    traversePortType2Operation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreService2Element()
-  {
-    traverseService2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreService2ExtensibilityElement()
-  {
-    traverseService2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreService2Port()
-  {
-    traverseService2Port = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreTypes2Element()
-  {
-    traverseTypes2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore reference between WSDL elements...
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreTypes2ExtensibilityElement()
-  {
-    traverseTypes2ExtensibilityElement = false;
-    return this;
-  }
-
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPBinding(boolean value)
-  {
-    visitSOAPBinding = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPBody(boolean value)
-  {
-    visitSOAPBody = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPFault(boolean value)
-  {
-    visitSOAPFault = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPHeader(boolean value)
-  {
-    visitSOAPHeader = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPHeaderFault(boolean value)
-  {
-    visitSOAPHeaderFault = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitSOAPOperation(boolean value)
-  {
-    visitSOAPOperation = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitBinding(boolean value)
-  {
-    visitBinding = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitBindingFault(boolean value)
-  {
-    visitBindingFault = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitBindingInput(boolean value)
-  {
-    visitBindingInput = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitBindingOperation(boolean value)
-  {
-    visitBindingOperation = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitBindingOutput(boolean value)
-  {
-    visitBindingOutput = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitDefinition(boolean value)
-  {
-    visitDefinition = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitElement(boolean value)
-  {
-    visitElement = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitExtensibilityElement(boolean value)
-  {
-    visitExtensibilityElement = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitFault(boolean value)
-  {
-    visitFault = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitImport(boolean value)
-  {
-    visitImport = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitInput(boolean value)
-  {
-    visitInput = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitMessage(boolean value)
-  {
-    visitMessage = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitOperation(boolean value)
-  {
-    visitOperation = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitOutput(boolean value)
-  {
-    visitOutput = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitPart(boolean value)
-  {
-    visitPart = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitPort(boolean value)
-  {
-    visitPort = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitPortType(boolean value)
-  {
-    visitPortType = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitService(boolean value)
-  {
-    visitService = value;
-    return this;
-  }
-  /**
-   * Instructs traversal to visit or not the corresponding WSDL element.
-   * @param value true if the WSDL element should be visited, otherwise - false.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal visitTypes(boolean value)
-  {
-    visitTypes = value;
-    return this;
-  }
-
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBinding()
-  {
-    traverseDefinition2Binding = false;
-    traversePort2Binding = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingFault()
-  {
-    traverseBindingOperation2BindingFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingInput()
-  {
-    traverseBindingOperation2BindingInput = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOperation()
-  {
-    traverseBinding2BindingOperation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreBindingOutput()
-  {
-    traverseBindingOperation2BindingOutput = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreDefinition()
-  {
-    traverseImport2Definition = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreElement()
-  {
-    traverseBinding2Element = false;
-    traverseBindingFault2Element = false;
-    traverseBindingInput2Element = false;
-    traverseBindingOperation2Element = false;
-    traverseBindingOutput2Element = false;
-    traverseDefinition2Element = false;
-    traversePort2Element = false;
-    traverseService2Element = false;
-    traverseFault2Element = false;
-    traverseOutput2Element = false;
-    traverseImport2Element = false;
-    traverseInput2Element = false;
-    traverseOperation2Element = false;
-    traverseMessage2Element = false;
-    traversePart2Element = false;
-    traversePortType2Element = false;
-    traverseTypes2Element = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreExtensibilityElement()
-  {
-    traverseService2ExtensibilityElement = false;
-    traversePort2ExtensibilityElement = false;
-    traverseDefinition2ExtensibilityElement = false;
-    traverseBindingOutput2ExtensibilityElement = false;
-    traverseBinding2ExtensibilityElement = false;
-    traverseBindingFault2ExtensibilityElement = false;
-    traverseBindingInput2ExtensibilityElement = false;
-    traverseBindingOperation2ExtensibilityElement = false;
-    traverseTypes2ExtensibilityElement = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPBinding()
-  {
-    traverseBinding2SOAPBinding = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPOperation()
-  {
-    traverseBindingOperation2SOAPOperation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPBody()
-  {
-    traverseBindingInput2SOAPBody = false;
-    traverseBindingOutput2SOAPBody = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPHeader()
-  {
-    traverseBindingInput2SOAPHeader = false;
-    traverseBindingOutput2SOAPHeader = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPHeaderFault()
-  {
-    traverseSOAPHeader2SOAPHeaderFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreSOAPFault()
-  {
-    traverseBindingFault2SOAPFault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreFault()
-  {
-    traverseOperation2Fault = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreImport()
-  {
-    traverseImport2Definition = false; // fix
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreInput()
-  {
-    traverseOperation2Input = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreMessage()
-  {
-    traverseFault2Message = false;
-    traverseDefinition2Message = false;
-    traverseInput2Message = false;
-    traverseOutput2Message = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOperation()
-  {
-    traverseBindingOperation2Operation = false;
-    traversePortType2Operation = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreOutput()
-  {
-    traverseOperation2Output = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePart()
-  {
-    traverseMessage2Part = false;
-    //traverseSOAPBody2Part = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePort()
-  {
-    traverseService2Port = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignorePortType()
-  {
-    traverseBinding2PortType = false;
-    traverseDefinition2PortType = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreService()
-  {
-    traverseDefinition2Service = false;
-    return this;
-  }
-  /**
-   * Instructs traversal to ignore all references to the corresponding WSDL
-   * element.
-   * @return a WSDLTraversal object.
-   */
-  public WSDLTraversal ignoreTypes()
-  {
-    traverseDefinition2Types = false;
-    return this;
-  }
-
-  /**
-   * The method adjusts traveseXXX variables according to the visitXXX variables
-   */
-  private void adjust()
-  {
-    adjustPart();
-    adjustService();
-    adjustTypes();
-    adjustOperation();
-    adjustInput();
-    adjustOutput();
-    adjustFault();
-    adjustBinding();
-    adjustBindingOperation();
-    adjustBindingInput();
-    adjustBindingOutput();
-    adjustBindingFault();
-    adjustImport();
-    adjustElement();
-    adjustMessage();
-    adjustPort();
-    adjustPortType();
-    adjustDefinition();
-    adjustExtensibilityElement();
-    adjustSOAPBinding();
-    adjustSOAPBody();
-    adjustSOAPHeader();
-    adjustSOAPHeaderFault();
-    adjustSOAPFault();
-    adjustSOAPOperation();
-  }
-
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustExtensibilityElement()
-  {
-    boolean value = visitExtensibilityElement;
-    if (!value)
-      ignoreExtensibilityElement();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustPart()
-  {
-    boolean value = visitPart || (traversePart2Element && adjustElement());
-    if (!value)
-      ignorePart();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPHeader()
-  {
-    boolean value =
-      visitSOAPHeader
-        || (traverseSOAPHeader2SOAPHeaderFault && adjustSOAPHeaderFault());
-    if (!value)
-      ignoreSOAPHeader();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustBindingOutput()
-  {
-    boolean value =
-      visitBindingOutput
-        || (traverseBindingOutput2Element && adjustElement())
-        || (traverseBindingOutput2ExtensibilityElement
-          && adjustExtensibilityElement())
-        || (traverseBindingOutput2SOAPBody
-          && adjustSOAPBody()
-          || (traverseBindingOutput2SOAPHeader && adjustSOAPHeader()));
-    if (!value)
-      ignoreBindingOutput();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustElement()
-  {
-    boolean value = visitElement;
-    if (!value)
-      ignoreElement();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustTypes()
-  {
-    boolean value =
-      visitTypes
-        || (traverseTypes2Element && adjustElement())
-        || (traverseTypes2ExtensibilityElement && adjustExtensibilityElement());
-    if (!value)
-      ignoreTypes();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPBinding()
-  {
-    boolean value = visitSOAPBinding;
-    if (!value)
-      ignoreSOAPBinding();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustPort()
-  {
-    boolean value =
-      visitPort
-        || (traversePort2Element && adjustElement())
-        || (traversePort2ExtensibilityElement && adjustExtensibilityElement())
-        || (traversePort2Binding && adjustBinding());
-    if (!value)
-      ignorePort();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustOperation()
-  {
-    boolean value =
-      visitOperation
-        || (traverseOperation2Element && adjustElement())
-        || (traverseOperation2Input && adjustInput())
-        || (traverseOperation2Output && adjustOutput())
-        || (traverseOperation2Fault && adjustFault());
-    if (!value)
-      ignoreOperation();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustBindingOperation()
-  {
-    boolean value =
-      visitBindingOperation
-        || (traverseBindingOperation2Element && adjustElement())
-        || (traverseBindingOperation2BindingFault && adjustBindingFault())
-        || (traverseBindingOperation2BindingOutput && adjustBindingOutput())
-        || (traverseBindingOperation2Operation && adjustOperation())
-        || (traverseBindingOperation2BindingInput && adjustBindingInput())
-        || (traverseBindingOperation2ExtensibilityElement
-          && adjustExtensibilityElement())
-        || (traverseBindingOperation2SOAPOperation && adjustSOAPOperation());
-    if (!value)
-      ignoreBindingOperation();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustInput()
-  {
-    boolean value =
-      visitInput
-        || (traverseInput2Element && adjustElement())
-        || (traverseInput2Message && adjustMessage());
-    if (!value)
-      ignoreInput();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustBinding()
-  {
-    boolean value =
-      visitBinding
-        || (traverseBinding2Element && adjustElement())
-        || (traverseBinding2BindingOperation && adjustBindingOperation())
-        || (traverseBinding2ExtensibilityElement && adjustExtensibilityElement())
-        || (traverseBinding2PortType && adjustPortType())
-        || (traverseBinding2SOAPBinding && adjustSOAPBinding());
-    if (!value)
-      ignoreBinding();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPBody()
-  {
-    boolean value = visitSOAPBody;
-    /* || 
-    		(traverseSOAPBody2Part && adjustPart());*/
-    if (!value)
-      ignoreSOAPBody();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPHeaderFault()
-  {
-    boolean value = visitSOAPHeaderFault;
-    if (!value)
-      ignoreSOAPHeaderFault();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustBindingInput()
-  {
-    boolean value =
-      visitBindingInput
-        || (traverseBindingInput2Element && adjustElement())
-        || (traverseBindingInput2ExtensibilityElement
-          && adjustExtensibilityElement())
-        || (traverseBindingInput2SOAPBody
-          && adjustSOAPBody()
-          || (traverseBindingInput2SOAPHeader && adjustSOAPHeader()));
-    if (!value)
-      ignoreBindingInput();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustOutput()
-  {
-    boolean value =
-      visitOutput
-        || (traverseOutput2Element && adjustElement())
-        || (traverseOutput2Message && adjustMessage());
-    if (!value)
-      ignoreOutput();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustBindingFault()
-  {
-    boolean value =
-      visitBindingFault
-        || (traverseBindingFault2Element && adjustElement())
-        || (traverseBindingFault2ExtensibilityElement
-          && adjustExtensibilityElement())
-        || (traverseBindingFault2SOAPFault && adjustSOAPFault());
-    if (!value)
-      ignoreBindingFault();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPOperation()
-  {
-    boolean value = visitSOAPOperation;
-    if (!value)
-      ignoreSOAPOperation();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustDefinition()
-  {
-    boolean value =
-      visitDefinition
-        || (traverseDefinition2Element && adjustElement())
-        || (traverseDefinition2Import && adjustImport())
-        || (traverseDefinition2Types && adjustTypes())
-        || (traverseDefinition2Message && adjustMessage())
-        || (traverseDefinition2ExtensibilityElement
-          && adjustExtensibilityElement())
-        || (traverseDefinition2PortType && adjustPortType())
-        || (traverseDefinition2Binding && adjustBinding())
-        || (traverseDefinition2Service && adjustService());
-    if (!value)
-      ignoreDefinition();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustSOAPFault()
-  {
-    boolean value = visitSOAPFault;
-    if (!value)
-      ignoreSOAPFault();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustImport()
-  {
-    boolean value = visitImport || (traverseImport2Definition
-    /* && adjustDefinition()*/
-      )
-    || // avoid cycling problem. Thus, you should call ignoreImport manually  
-   (traverseImport2Element && adjustElement());
-    if (!value)
-      ignoreImport();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustFault()
-  {
-    boolean value =
-      visitFault
-        || (traverseFault2Element && adjustElement())
-        || (traverseFault2Message && adjustMessage());
-    if (!value)
-      ignoreFault();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustPortType()
-  {
-    boolean value =
-      visitPortType
-        || (traversePortType2Element && adjustElement())
-        || (traversePortType2Operation && adjustOperation());
-    if (!value)
-      ignorePortType();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustService()
-  {
-    boolean value =
-      visitService
-        || (traverseService2Element && adjustElement())
-        || (traverseService2ExtensibilityElement && adjustExtensibilityElement())
-        || (traverseService2Port && adjustPort());
-    if (!value)
-      ignoreService();
-    return value;
-  }
-  /**
-   * The method adjusts traversal ignore flags according to the
-   * corresponding visit flags.
-   * @return boolean 
-   */
-  private boolean adjustMessage()
-  {
-    boolean value =
-      visitMessage
-        || (traverseMessage2Element && adjustElement())
-        || (traverseMessage2Part && adjustPart());
-    if (!value)
-      ignoreMessage();
-    return value;
-  }
-
-  /**
-   * The method traverses given WSDL extensibility element according to the 
-   * settings in the traversal context.
-   * 
-   * @param objExtensibilityElement  a WSDL extensibility element artifact.
-   * @param parent                   parent of the WSDL extensibility element artifact.
-   * @param ctx                      the traversal contex.
-   */
-  private void traverse(
-    ExtensibilityElement objExtensibilityElement,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeExtensibilityElementProcessing();
-    ctx.setExtensibilityElement(objExtensibilityElement);
-    if (visitExtensibilityElement)
-      visitor.visit(objExtensibilityElement, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL part artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objPart  the WSDL part artifact.
-   * @param parent   parent of the WSDL part artifact.
-   * @param ctx      the traversal contex.
-   */
-  private void traverse(Part objPart, Object parent, WSDLTraversalContext ctx)
-  {
-    ctx.resumePartProcessing();
-    ctx.setPart(objPart);
-    if (visitPart)
-    {
-      visitor.visit(objPart, parent, ctx);
-      if (!ctx.processPart())
-        return;
-    }
-    if (objPart == null)
-      return;
-    if (traversePart2Element)
-      traverse(objPart.getDocumentationElement(), objPart, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL SOAP header artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objSOAPHeader  a WSDL SOAP header artifact.
-   * @param parent         parent of the WSDL SOAP header artifact.
-   * @param ctx            the traversal contex.
-   */
-  private void traverse(
-    SOAPHeader objSOAPHeader,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeSOAPHeaderProcessing();
-    ctx.setSOAPHeader(objSOAPHeader);
-    if (visitSOAPHeader)
-    {
-      visitor.visit(objSOAPHeader, parent, ctx);
-      if (!ctx.processSOAPHeader())
-        return;
-    }
-    if (objSOAPHeader == null)
-      return;
-    if (traverseSOAPHeader2SOAPHeaderFault
-      && objSOAPHeader.getSOAPHeaderFaults() != null)
-    {
-      Iterator it = objSOAPHeader.getSOAPHeaderFaults().iterator();
-      while (it.hasNext())
-      {
-        traverse((SOAPHeaderFault) it.next(), objSOAPHeader, ctx);
-        if (!ctx.processSOAPHeader())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL element artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objElement  a WSDL element artifact.
-   * @param parent   parent of the WSDL element artifact.
-   * @param ctx      the traversal contex.
-   */
-  private void traverse(
-    Element objElement,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.setElement(objElement);
-    if (visitElement)
-      visitor.visit(objElement, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL types artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objTypes  a WSDL types artifact.
-   * @param parent    parent of the WSDL types artifact.
-   * @param ctx       the traversal contex.
-   */
-  private void traverse(
-    Types objTypes,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeTypesProcessing();
-    ctx.setTypes(objTypes);
-    if (visitTypes)
-    {
-      visitor.visit(objTypes, parent, ctx);
-      if (!ctx.processTypes())
-        return;
-    }
-    if (objTypes == null)
-      return;
-    if (traverseTypes2Element)
-    {
-      traverse(objTypes.getDocumentationElement(), objTypes, ctx);
-      if (!ctx.processTypes())
-        return;
-    }
-    if (traverseTypes2ExtensibilityElement
-      && objTypes.getExtensibilityElements() != null)
-    {
-      Iterator it = objTypes.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objTypes, ctx);
-        if (!ctx.processTypes())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL SOAP binding artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objSOAPBinding  a WSDL SOAP binding artifact.
-   * @param parent          parent of the WSDL SOAP binding artifact.
-   * @param ctx             the traversal contex.
-   */
-  private void traverse(
-    SOAPBinding objSOAPBinding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.setSOAPBinding(objSOAPBinding);
-    if (visitSOAPBinding)
-      visitor.visit(objSOAPBinding, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL definition artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objDefinition  a WSDL definition artifact.
-   * @param parent         parent of the WSDL definition artifact.
-   * @param ctx            the traversal contex.
-   */
-  private void traverse(
-    Definition objDefinition,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeDefinitionProcessing();
-    ctx.setDefinition(objDefinition);
-    if (visitDefinition)
-    {
-      visitor.visit(objDefinition, parent, ctx);
-      if (!ctx.processDefinition())
-        return;
-    }
-    if (objDefinition == null)
-      return;
-    if (traverseDefinition2Import && objDefinition.getImports() != null)
-    {
-      Iterator it = objDefinition.getImports().values().iterator();
-      while (it.hasNext())
-      {
-        Vector v = (Vector) it.next();
-        if (v != null)
-        {
-          Iterator it2 = v.iterator();
-          while (it2.hasNext())
-          {
-            traverse((Import) it2.next(), objDefinition, ctx);
-            if (!ctx.processDefinition())
-              return;
-          }
-        }
-      }
-    }
-    if (traverseDefinition2Element)
-    {
-      traverse(objDefinition.getDocumentationElement(), objDefinition, ctx);
-      if (!ctx.processDefinition())
-        return;
-    }
-    if (traverseDefinition2Types)
-    {
-      traverse(objDefinition.getTypes(), objDefinition, ctx);
-      if (!ctx.processDefinition())
-        return;
-    }
-    if (traverseDefinition2Message && objDefinition.getMessages() != null)
-    {
-      Iterator it = objDefinition.getMessages().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Message) it.next(), objDefinition, ctx);
-        if (!ctx.processDefinition())
-          return;
-      }
-    }
-    if (traverseDefinition2PortType && objDefinition.getPortTypes() != null)
-    {
-      Iterator it = objDefinition.getPortTypes().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((PortType) it.next(), objDefinition, ctx);
-        if (!ctx.processDefinition())
-          return;
-      }
-    }
-    if (traverseDefinition2Binding && objDefinition.getBindings() != null)
-    {
-      Iterator it = objDefinition.getBindings().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Binding) it.next(), objDefinition, ctx);
-        if (!ctx.processDefinition())
-          return;
-      }
-    }
-    if (traverseDefinition2Service && objDefinition.getServices() != null)
-    {
-      Iterator it = objDefinition.getServices().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Service) it.next(), objDefinition, ctx);
-        if (!ctx.processDefinition())
-          return;
-      }
-    }
-    if (traverseDefinition2ExtensibilityElement
-      && objDefinition.getExtensibilityElements() != null)
-    {
-      Iterator it = objDefinition.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objDefinition, ctx);
-        if (!ctx.processDefinition())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL port artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objPort  a WSDL port artifact.
-   * @param parent   parent of the WSDL port artifact.
-   * @param ctx      the traversal contex.
-   */
-  private void traverse(Port objPort, Object parent, WSDLTraversalContext ctx)
-  {
-    ctx.resumePortProcessing();
-    ctx.setPort(objPort);
-    if (visitPort)
-    {
-      visitor.visit(objPort, parent, ctx);
-      if (!ctx.processPort())
-        return;
-    }
-    if (objPort == null)
-      return;
-    if (traversePort2Element)
-    {
-      traverse(objPort.getDocumentationElement(), objPort, ctx);
-      if (!ctx.processPort())
-        return;
-    }
-    if (traversePort2Binding)
-    {
-      traverse(objPort.getBinding(), objPort, ctx);
-      if (!ctx.processPort())
-        return;
-    }
-    if (traversePort2ExtensibilityElement
-      && objPort.getExtensibilityElements() != null)
-    {
-      Iterator it = objPort.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objPort, ctx);
-        if (!ctx.processPort())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL operation artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objOperation  a WSDL operation artifact.
-   * @param parent        parent of the WSDL operation artifactt.
-   * @param ctx           the traversal contex.
-   */
-  private void traverse(
-    Operation objOperation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeOperationProcessing();
-    ctx.setOperation(objOperation);
-    if (visitOperation)
-    {
-      visitor.visit(objOperation, parent, ctx);
-      if (!ctx.processOperation())
-        return;
-    }
-    if (objOperation == null)
-      return;
-    if (traverseOperation2Element)
-    {
-      traverse(objOperation.getDocumentationElement(), objOperation, ctx);
-      if (!ctx.processOperation())
-        return;
-    }
-    if (traverseOperation2Input)
-    {
-      traverse(objOperation.getInput(), objOperation, ctx);
-      if (!ctx.processOperation())
-        return;
-    }
-    if (traverseOperation2Output)
-    {
-      traverse(objOperation.getOutput(), objOperation, ctx);
-      if (!ctx.processOperation())
-        return;
-    }
-    if (traverseOperation2Fault && objOperation.getFaults() != null)
-    {
-      Iterator it = objOperation.getFaults().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Fault) it.next(), objOperation, ctx);
-        if (!ctx.processOperation())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL input artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objInput  a WSDL input artifact.
-   * @param parent    parent of the WSDL input artifact.
-   * @param ctx       the traversal contex.
-   */
-  private void traverse(
-    Input objInput,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeInputProcessing();
-    ctx.setInput(objInput);
-    if (visitInput)
-    {
-      visitor.visit(objInput, parent, ctx);
-      if (!ctx.processInput())
-        return;
-    }
-    if (objInput == null)
-      return;
-    if (traverseInput2Element)
-    {
-      traverse(objInput.getDocumentationElement(), objInput, ctx);
-      if (!ctx.processInput())
-        return;
-    }
-    if (traverseInput2Message)
-      traverse(objInput.getMessage(), objInput, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL SOAP body artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objSOAPBody  a WSDL SOAP body artifact.
-   * @param parent       parent of the WSDL SOAP body artifact.
-   * @param ctx          the traversal contex.
-   */
-  private void traverse(
-    SOAPBody objSOAPBody,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    //  	ctx.resumeSOAPBodyProcessing();
-    ctx.setSOAPBody(objSOAPBody);
-    if (visitSOAPBody)
-      //	{
-      visitor.visit(objSOAPBody, parent, ctx);
-    /*	  if (!ctx.processSOAPBody())
-    		return;
-    	}
-    	if (objSOAPBody == null)
-    		return;
-    	if (traverseSOAPBody2Part && objSOAPBody.getParts() != null) {
-    	  if (ctx)
-    	  Iterator it = objSOAPBody.getParts().iterator();
-    	  while (it.hasNext()) {
-    	  	
-    		traverse((Part)it.next(), objSOAPBody, ctx);
-    		if (!ctx.processSOAPBody())
-    		  return;
-    	  }
-    	}
-    */
-  }
-
-  /**
-   * The method traverses given WSDL SOAP header fault artifact according to 
-   * the settings in the traversal context.
-   * 
-   * @param objSOAPHeaderFault  a WSDL SOAP header fault artifact.
-   * @param parent              parent of the WSDL SOAP header fault artifact.
-   * @param ctx                 the traversal contex.
-   */
-  private void traverse(
-    SOAPHeaderFault objSOAPHeaderFault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.setSOAPHeaderFault(objSOAPHeaderFault);
-    if (visitSOAPHeaderFault)
-      visitor.visit(objSOAPHeaderFault, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL output artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objOutput  a WSDL output artifact.
-   * @param parent   parent of the WSDL output artifact.
-   * @param ctx      the traversal contex.
-   * @param parent
-   * @param ctx
-   */
-  private void traverse(
-    Output objOutput,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeOutputProcessing();
-    ctx.setOutput(objOutput);
-    if (visitOutput)
-    {
-      visitor.visit(objOutput, parent, ctx);
-      if (!ctx.processOutput())
-        return;
-    }
-    if (objOutput == null)
-      return;
-    if (traverseOutput2Element)
-    {
-      traverse(objOutput.getDocumentationElement(), objOutput, ctx);
-      if (!ctx.processOutput())
-        return;
-    }
-    if (traverseOutput2Message)
-      traverse(objOutput.getMessage(), objOutput, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL binding fault artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objBindingFault  a WSDL binding fault artifact.
-   * @param parent           parent of the WSDL binding fault artifact.
-   * @param ctx              the traversal contex.
-   */
-  private void traverse(
-    BindingFault objBindingFault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeBindingFaultProcessing();
-    ctx.setBindingFault(objBindingFault);
-    if (visitBindingFault)
-    {
-      visitor.visit(objBindingFault, parent, ctx);
-      if (!ctx.processBindingFault())
-        return;
-    }
-    if (objBindingFault == null)
-      return;
-    if (traverseBindingFault2Element)
-    {
-      traverse(objBindingFault.getDocumentationElement(), objBindingFault, ctx);
-      if (!ctx.processBindingFault())
-        return;
-    }
-    if (traverseBindingFault2SOAPFault
-      && objBindingFault.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingFault.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        Object o = it.next();
-        if (o instanceof SOAPFault)
-          traverse((SOAPFault) o, objBindingFault, ctx);
-        if (!ctx.processBindingFault())
-          return;
-      }
-    }
-    if (traverseBindingFault2ExtensibilityElement
-      && objBindingFault.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingFault.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objBindingFault, ctx);
-        if (!ctx.processBindingFault())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL SOAP operation artifact according to 
-   * the settings in the traversal context.
-   * 
-   * @param objSOAPOperation  a WSDL SOAP operation artifact.
-   * @param parent            parent of the WSDL SOAP operation artifact.
-   * @param ctx               the traversal contex.
-   */
-  private void traverse(
-    SOAPOperation objSOAPOperation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.setSOAPOperation(objSOAPOperation);
-    if (visitSOAPOperation)
-      visitor.visit(objSOAPOperation, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL binding input artifact according to 
-   * the settings in the traversal context.
-   * 
-   * @param objBindingInput  a WSDL binding input artifact.
-   * @param parent           parent of the WSDL binding input artifact.
-   * @param ctx              the traversal contex.
-   */
-  private void traverse(
-    BindingInput objBindingInput,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeBindingInputProcessing();
-    ctx.setBindingInput(objBindingInput);
-    if (visitBindingInput)
-    {
-      visitor.visit(objBindingInput, parent, ctx);
-      if (!ctx.processBindingInput())
-        return;
-    }
-    if (objBindingInput == null)
-      return;
-    if (traverseBindingInput2Element)
-    {
-      traverse(objBindingInput.getDocumentationElement(), objBindingInput, ctx);
-      if (!ctx.processBindingInput())
-        return;
-    }
-    if ((traverseBindingInput2SOAPBody || traverseBindingInput2SOAPHeader)
-      && objBindingInput.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingInput.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        Object o = it.next();
-        if (traverseBindingInput2SOAPBody && (o instanceof SOAPBody))
-          traverse((SOAPBody) o, objBindingInput, ctx);
-        else if (traverseBindingInput2SOAPHeader && (o instanceof SOAPHeader))
-          traverse((SOAPHeader) o, objBindingInput, ctx);
-        if (!ctx.processBindingInput())
-          return;
-      }
-    }
-    if (traverseBindingInput2ExtensibilityElement
-      && objBindingInput.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingInput.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objBindingInput, ctx);
-        if (!ctx.processBindingInput())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL binding operation artifact according to 
-   * the settings in the traversal context.
-   * 
-   * @param objBindingOperation  a WSDL binding operation artifact.
-   * @param parent               parent of the WSDL binding operation artifact.
-   * @param ctx                  the traversal contex.
-   */
-  private void traverse(
-    BindingOperation objBindingOperation,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeBindingOperationProcessing();
-    ctx.setBindingOperation(objBindingOperation);
-    if (visitBindingOperation)
-    {
-      visitor.visit(objBindingOperation, parent, ctx);
-      if (!ctx.processBindingOperation())
-        return;
-    }
-    if (objBindingOperation == null)
-      return;
-    if (traverseBindingOperation2Element)
-    {
-      traverse(
-        objBindingOperation.getDocumentationElement(),
-        objBindingOperation,
-        ctx);
-      if (!ctx.processBindingOperation())
-        return;
-    }
-    if (traverseBindingOperation2SOAPOperation
-      && objBindingOperation.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingOperation.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        Object o = it.next();
-        if (o instanceof SOAPOperation)
-          traverse((SOAPOperation) o, objBindingOperation, ctx);
-        if (!ctx.processBindingOperation())
-          return;
-      }
-    }
-    if (traverseBindingOperation2ExtensibilityElement
-      && objBindingOperation.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingOperation.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objBindingOperation, ctx);
-        if (!ctx.processBindingOperation())
-          return;
-      }
-    }
-    if (traverseBindingOperation2Operation)
-    {
-      traverse(objBindingOperation.getOperation(), objBindingOperation, ctx);
-      if (!ctx.processBindingOperation())
-        return;
-    }
-    if (traverseBindingOperation2BindingInput)
-    {
-      traverse(objBindingOperation.getBindingInput(), objBindingOperation, ctx);
-      if (!ctx.processBindingOperation())
-        return;
-    }
-    if (traverseBindingOperation2BindingOutput)
-    {
-      traverse(
-        objBindingOperation.getBindingOutput(),
-        objBindingOperation,
-        ctx);
-      if (!ctx.processBindingOperation())
-        return;
-    }
-    if (traverseBindingOperation2BindingFault
-      && objBindingOperation.getBindingFaults() != null)
-    {
-      Iterator it = objBindingOperation.getBindingFaults().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((BindingFault) it.next(), objBindingOperation, ctx);
-        if (!ctx.processBindingOperation())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL SOAP fault artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objSOAPFault  a WSDL SOAP fault artifact.
-   * @param parent        parent of the WSDL SOAP fault artifact.
-   * @param ctx           the traversal contex.
-   */
-  private void traverse(
-    SOAPFault objSOAPFault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.setSOAPFault(objSOAPFault);
-    if (visitSOAPFault)
-      visitor.visit(objSOAPFault, parent, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL binding artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objBinding  a WSDL binding artifact.
-   * @param parent      parent of the WSDL binding artifact.
-   * @param ctx         the traversal contex.
-   */
-  private void traverse(
-    Binding objBinding,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeBindingProcessing();
-    ctx.setBinding(objBinding);
-    if (visitBinding)
-    {
-      visitor.visit(objBinding, parent, ctx);
-      if (!ctx.processBinding())
-        return;
-    }
-    if (objBinding == null)
-      return;
-    if (traverseBinding2Element)
-    {
-      traverse(objBinding.getDocumentationElement(), objBinding, ctx);
-      if (!ctx.processBinding())
-        return;
-    }
-    if (traverseBinding2SOAPBinding
-      && objBinding.getExtensibilityElements() != null)
-    {
-      Iterator it = objBinding.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        Object o = it.next();
-        if (o instanceof SOAPBinding)
-          traverse((SOAPBinding) o, objBinding, ctx);
-        if (!ctx.processBinding())
-          return;
-      }
-    }
-    if (traverseBinding2PortType)
-    {
-      traverse(objBinding.getPortType(), objBinding, ctx);
-      if (!ctx.processBinding())
-        return;
-    }
-    if (traverseBinding2BindingOperation
-      && objBinding.getBindingOperations() != null)
-    {
-      Iterator it = objBinding.getBindingOperations().iterator();
-      while (it.hasNext())
-      {
-        traverse((BindingOperation) it.next(), objBinding, ctx);
-        if (!ctx.processBinding())
-          return;
-      }
-    }
-    if (traverseBinding2ExtensibilityElement
-      && objBinding.getExtensibilityElements() != null)
-    {
-      Iterator it = objBinding.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objBinding, ctx);
-        if (!ctx.processBinding())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL fault artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objFault  a WSDL fault artifact.
-   * @param parent    parent of the WSDL fault artifact.
-   * @param ctx       the traversal contex.
-   */
-  private void traverse(
-    Fault objFault,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeFaultProcessing();
-    ctx.setFault(objFault);
-    if (visitFault)
-    {
-      visitor.visit(objFault, parent, ctx);
-      if (!ctx.processFault())
-        return;
-    }
-    if (objFault == null)
-      return;
-    if (traverseFault2Element)
-    {
-      traverse(objFault.getDocumentationElement(), objFault, ctx);
-      if (!ctx.processFault())
-        return;
-    }
-    if (traverseFault2Message)
-      traverse(objFault.getMessage(), objFault, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL service artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objService  a WSDL service artifact.
-   * @param parent      parent of the WSDL service artifact.
-   * @param ctx         the traversal contex.
-   */
-  private void traverse(
-    Service objService,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeServiceProcessing();
-    ctx.setService(objService);
-    if (visitService)
-    {
-      visitor.visit(objService, parent, ctx);
-      if (!ctx.processService())
-        return;
-    }
-    if (objService == null)
-      return;
-    if (traverseService2Element)
-    {
-      traverse(objService.getDocumentationElement(), objService, ctx);
-      if (!ctx.processService())
-        return;
-    }
-    if (traverseService2ExtensibilityElement
-      && objService.getExtensibilityElements() != null)
-    {
-      Iterator it = objService.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objService, ctx);
-        if (!ctx.processService())
-          return;
-      }
-    }
-    if (traverseService2Port && objService.getPorts() != null)
-    {
-      Iterator it = objService.getPorts().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Port) it.next(), objService, ctx);
-        if (!ctx.processService())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL import artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objImport  a WSDL import artifact.
-   * @param parent     parent of the WSDL import artifact.
-   * @param ctx        the traversal contex.
-   */
-  private void traverse(
-    Import objImport,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeImportProcessing();
-    ctx.setImport(objImport);
-    if (visitImport)
-    {
-      visitor.visit(objImport, parent, ctx);
-      if (!ctx.processImport())
-        return;
-    }
-    if (objImport == null)
-      return;
-    if (traverseImport2Element)
-    {
-      traverse(objImport.getDocumentationElement(), objImport, ctx);
-      if (!ctx.processImport())
-        return;
-    }
-    if (traverseImport2Definition)
-      traverse(objImport.getDefinition(), objImport, ctx);
-  }
-
-  /**
-   * The method traverses given WSDL binding output artifact according to the 
-   * settings in the traversal context.
-   * 
-   * @param objBindingOutput  a WSDL binding output artifact.
-   * @param parent            parent of the WSDL binding output artifact.
-   * @param ctx               the traversal contex.
-   */
-  private void traverse(
-    BindingOutput objBindingOutput,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeBindingOutputProcessing();
-    ctx.setBindingOutput(objBindingOutput);
-    if (visitBindingOutput)
-    {
-      visitor.visit(objBindingOutput, parent, ctx);
-      if (!ctx.processBindingOutput())
-        return;
-    }
-    if (objBindingOutput == null)
-      return;
-    if (traverseBindingOutput2Element)
-    {
-      traverse(
-        objBindingOutput.getDocumentationElement(),
-        objBindingOutput,
-        ctx);
-      if (!ctx.processBindingOutput())
-        return;
-    }
-    if ((traverseBindingOutput2SOAPBody || traverseBindingOutput2SOAPHeader)
-      && objBindingOutput.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingOutput.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        Object o = it.next();
-        if (traverseBindingOutput2SOAPBody && (o instanceof SOAPBody))
-          traverse((SOAPBody) o, objBindingOutput, ctx);
-        else if (traverseBindingOutput2SOAPHeader && (o instanceof SOAPHeader))
-          traverse((SOAPHeader) o, objBindingOutput, ctx);
-        if (!ctx.processBindingOutput())
-          return;
-      }
-    }
-    if (traverseBindingOutput2ExtensibilityElement
-      && objBindingOutput.getExtensibilityElements() != null)
-    {
-      Iterator it = objBindingOutput.getExtensibilityElements().iterator();
-      while (it.hasNext())
-      {
-        traverse((ExtensibilityElement) it.next(), objBindingOutput, ctx);
-        if (!ctx.processBindingOutput())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL port type artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objPortType  a WSDL port type artifact.
-   * @param parent       parent of the WSDL port type.
-   * @param ctx          the traversal contex.
-   */
-  private void traverse(
-    PortType objPortType,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumePortTypeProcessing();
-    ctx.setPortType(objPortType);
-    if (visitPortType)
-    {
-      visitor.visit(objPortType, parent, ctx);
-      if (!ctx.processPortType())
-        return;
-    }
-    if (objPortType == null)
-      return;
-    if (traversePortType2Element)
-    {
-      traverse(objPortType.getDocumentationElement(), objPortType, ctx);
-      if (!ctx.processPortType())
-        return;
-    }
-    if (traversePortType2Operation && objPortType.getOperations() != null)
-    {
-      Iterator it = objPortType.getOperations().iterator();
-      while (it.hasNext())
-      {
-        traverse((Operation) it.next(), objPortType, ctx);
-        if (!ctx.processPortType())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL message artifact according to the settings in
-   * the traversal context.
-   * 
-   * @param objMessage  a WSDL message.
-   * @param parent      parent of the WSDL message.
-   * @param ctx         the traversal contex.
-   */
-  private void traverse(
-    Message objMessage,
-    Object parent,
-    WSDLTraversalContext ctx)
-  {
-    ctx.resumeMessageProcessing();
-    ctx.setMessage(objMessage);
-    if (visitMessage)
-    {
-      visitor.visit(objMessage, parent, ctx);
-      if (!ctx.processMessage())
-        return;
-    }
-    if (objMessage == null)
-      return;
-    if (traverseMessage2Element)
-    {
-      traverse(objMessage.getDocumentationElement(), objMessage, ctx);
-      if (!ctx.processMessage())
-        return;
-    }
-    if (traverseMessage2Part && objMessage.getParts() != null)
-    {
-      Iterator it = objMessage.getParts().values().iterator();
-      while (it.hasNext())
-      {
-        traverse((Part) it.next(), objMessage, ctx);
-        if (!ctx.processMessage())
-          return;
-      }
-    }
-  }
-
-  /**
-   * The method traverses given WSDL part artifact according to the settings.
-   * @param a  a WSDL part artifact.
-   */
-  public void traverse(Part a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL service artifact according to the settings.
-   * @param a  a WSDL service artifact.
-   */
-  public void traverse(Service a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL types artifact according to the settings.
-   * @param a WSDL types artifact.
-   */
-  public void traverse(Types a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL operation artifact according to the settings.
-   * @param a  a WSDL operation artifact.
-   */
-  public void traverse(Operation a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL input artifact according to the settings.
-   * @param a  a WSDL input artifact.
-   */
-  public void traverse(Input a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL output artifact according to the settings.
-   * @param a  a WSDL output artifact.
-   */
-  public void traverse(Output a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL fault artifact according to the settings.
-   * @param a  a WSDL fault artifact.
-   */
-  public void traverse(Fault a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL binding artifact according to the settings.
-   * @param a  a WSDL binding artifact.
-   */
-  public void traverse(Binding a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL binding operation artifact according to the 
-   * settings.
-   * @param a  a WSDL binding operation artifact.
-   */
-  public void traverse(BindingOperation a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL binding input artifact according to 
-   * the settings.
-   * @param a  a WSDL binding input artifact.
-   */
-  public void traverse(BindingInput a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL binding output artifact according to 
-   * the settings.
-   * @param a  a WSDL binding output artifact.
-   */
-  public void traverse(BindingOutput a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL binding fault artifact according to 
-   * the settings.
-   * @param a   a WSDL binding fault artifact.
-   */
-  public void traverse(BindingFault a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL import artifact according to the settings.
-   * @param a  a WSDL import artifact.
-   */
-  public void traverse(Import a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL element artifact according to the settings.
-   * @param a  a WSDL element artifact.
-   */
-  public void traverse(Element a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL message artifact according to the settings.
-   * @param a  a WSDL message artifact.
-   */
-  public void traverse(Message a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL port artifact according to the settings.
-   * @param a  a WSDL port artifact.
-   */
-  public void traverse(Port a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL port type artifact according to the settings.
-   * @param a  a WSDL port type artifact.
-   */
-  public void traverse(PortType a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL definition artifact according to the settings.
-   * @param a  a WSDL definition artifact.
-   */
-  public void traverse(Definition a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL extensibility elment artifact according 
-   * to the settings.
-   * @param a  a WSDL extensibility element artifact.
-   */
-  public void traverse(ExtensibilityElement a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP binding artifact according to 
-   * the settings.
-   * @param a  a WSDL SOAP binding artifact.
-   */
-  public void traverse(SOAPBinding a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP body artifact according to the settings.
-   * @param a  a WSDL SOAP body artifact.
-   */
-  public void traverse(SOAPBody a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP header artifact according to the settings.
-   * @param a  a WSDL SOAP header artifact.
-   */
-  public void traverse(SOAPHeader a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP header fault artifact according to 
-   * the settings.
-   * @param a  a WSDL SOAP header fault artifact.
-   */
-  public void traverse(SOAPHeaderFault a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP fault artifact according to the settings.
-   * @param a  a WSDL SOAP fault artifact.
-   */
-  public void traverse(SOAPFault a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-  /**
-   * The method traverses given WSDL SOAP operation artifact according to 
-   * the settings.
-   * @param a  a WSDL SOAP operation artifact.
-   */
-  public void traverse(SOAPOperation a)
-  {
-    adjust();
-    traverse(a, null, new WSDLTraversalContext(this));
-  }
-
-  /**
-   * The method traverses given WSDL part artifact according to the settings.
-   * @param a       a WSDL part artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Part a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL service artifact according to the settings.
-   * @param a       a WSDL service artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Service a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL types artifact according to the settings.
-   * @param a       a WSDL types artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Types a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL operation artifact according to the settings.
-   * @param a       a WSDL operation artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Operation a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL input artifact according to the settings.
-   * @param a       a WSDL input artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Input a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL output artifact according to the settings.
-   * @param a       a WSDL output artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Output a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL fault artifact according to the settings.
-   * @param a       a WSDL fault artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Fault a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL binding artifact according to the settings.
-   * @param a       a WSDL binding artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(Binding a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL binding operation artifact according 
-   * to the settings.
-   * @param a       a WSDL binding operation artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(BindingOperation a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL binding input artifact according 
-   * to the settings.
-   * @param a       a WSDL binding input artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(BindingInput a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL binding output artifact according to 
-   * the settings.
-   * @param a       a WSDL binding output artifact.
-   * @param params  a Map object representing settings.  
-   */
-  public void traverse(BindingOutput a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL binding fault artifact according to 
-   * the settings.
-   * @param a       a WSDL binding fault artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(BindingFault a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL import artifact according to the settings.
-   * @param a       a WSDL import artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(Import a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL element artifact according to the settings.
-   * @param a       a WSDL element artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(Element a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL message artifact according to the settings.
-   * @param a       a WSDL message.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(Message a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL port artifact according to the settings.
-   * @param a       a WSDL port.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(Port a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL port type artifact according to the settings.
-   * @param a       a WSDL port type artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(PortType a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL definition artifact according to the settings.
-   * @param a       a WSDL definition artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(Definition a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL extensibility element artifact according to the settings.
-   * @param a       a WSDL extensibility element artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(ExtensibilityElement a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL SOAP binding artifact according to the settings.
-   * @param a       a WSDL SOAP binding artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(SOAPBinding a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL SOAP body artifact according to the settings.
-   * @param a       a WSDL SOAP body artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(SOAPBody a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL SOAP header artifact according to the settings.
-   * @param a       a WSDL SOAP header artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(SOAPHeader a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL hearder fault artifact according to the settings.
-   * @param a       a WSDL SOAP header fault artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(SOAPHeaderFault a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL SOAP fault artifact according to the settings.
-   * @param a       a WSDL SOAP fault artifact.
-   * @param params  a Map object representing settings.   
-   */
-  public void traverse(SOAPFault a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-  /**
-   * The method traverses given WSDL SOAP operation artifact according to the settings.
-   * @param a       a WSDL SOAP operation artifact.
-   * @param params  a Map object representing settings.
-   */
-  public void traverse(SOAPOperation a, Map params)
-  {
-    adjust();
-    WSDLTraversalContext ctx = new WSDLTraversalContext(this);
-    if (params != null)
-      ctx.params.putAll(params);
-    traverse(a, null, ctx);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java
deleted file mode 100644
index cd4dbe7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java
+++ /dev/null

@@ -1,1126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.w3c.dom.Element;
-
-/**
- * The class represents runtime context for the traversal process.
- * Context stores artifacts being processed.
- * 
- * @author Andrey Kulik
- */
-public class WSDLTraversalContext
-{
-  /**
-   * Flags which indicate whether corresponding WSDL element should be processed
-   * or not.
-   */
-  private boolean processPart = true;
-  private boolean processService = true;
-  private boolean processTypes = true;
-  private boolean processOperation = true;
-  private boolean processInput = true;
-  private boolean processOutput = true;
-  private boolean processFault = true;
-  private boolean processBinding = true;
-  private boolean processBindingOperation = true;
-  private boolean processBindingInput = true;
-  private boolean processBindingOutput = true;
-  private boolean processBindingFault = true;
-  private boolean processImport = true;
-  private boolean processElement = true;
-  private boolean processMessage = true;
-  private boolean processPort = true;
-  private boolean processPortType = true;
-  private boolean processDefinition = true;
-  private boolean processExtensibilityElement = true;
-  private boolean processSOAPBinding = true;
-  private boolean processSOAPHeader = true;
-  private boolean processSOAPHeaderFault = true;
-  private boolean processSOAPFault = true;
-  private boolean processSOAPOperation = true;
-
-  /**
-   * Last processed WSDL elements. 
-   */
-  private Part activePart = null;
-  private Service activeService = null;
-  private Types activeTypes = null;
-  private Operation activeOperation = null;
-  private Input activeInput = null;
-  private Output activeOutput = null;
-  private Fault activeFault = null;
-  private Binding activeBinding = null;
-  private BindingOperation activeBindingOperation = null;
-  private BindingInput activeBindingInput = null;
-  private BindingOutput activeBindingOutput = null;
-  private BindingFault activeBindingFault = null;
-  private Import activeImport = null;
-  private Element activeElement = null;
-  private Message activeMessage = null;
-  private Port activePort = null;
-  private PortType activePortType = null;
-  private Definition activeDefinition = null;
-  private ExtensibilityElement activeExtensibilityElement = null;
-  private SOAPBinding activeSOAPBinding = null;
-  private SOAPBody activeSOAPBody = null;
-  private SOAPHeader activeSOAPHeader = null;
-  private SOAPHeaderFault activeSOAPHeaderFault = null;
-  private SOAPFault activeSOAPFault = null;
-  private SOAPOperation activeSOAPOperation = null;
-
-  /**
-   * Parameters map
-   */
-  Map params = new TreeMap();
-
-  /**
-   * Active traversal.
-   */
-  final private WSDLTraversal traversal;
-
-  /**
-   * The default constructor.
-   * @param traversal
-   */
-  WSDLTraversalContext(WSDLTraversal traversal)
-  {
-    this.traversal = traversal;
-  }
-
-  /**
-   * Gets the active traversal.
-   * @return tha active traversal.
-   */
-  public WSDLTraversal getTraversal()
-  {
-    return traversal;
-  }
-
-  /**
-   * Gets parameter from context by the given key. 
-   * @param key  a key value.
-   * @return a parameter corresponding to the given key.
-   */
-  public Object getParameter(Object key)
-  {
-    return params.get(key);
-  }
-
-  /**
-   * Adds parameter into context with the given key.
-   * @param key    the key.
-   * @param value  the value.
-   */
-  public void addParameter(Object key, Object value)
-  {
-    params.put(key, value);
-  }
-
-  /**
-   * Removes the parameter from context by the given key.
-   * @param key  a key value.
-   */
-  public void removeParameter(Object key)
-  {
-    params.remove(key);
-  }
-
-  /**
-   * Cancels processing of the corresponding WSDL part. 
-   */
-  public void cancelPartProcessing()
-  {
-    processPart = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL service. 
-   */
-  public void cancelServiceProcessing()
-  {
-    processService = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL types. 
-   */
-  public void cancelTypesProcessing()
-  {
-    processTypes = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL operation. 
-   */
-  public void cancelOperationProcessing()
-  {
-    processOperation = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL input. 
-   */
-  public void cancelInputProcessing()
-  {
-    processInput = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL output. 
-   */
-  public void cancelOutputProcessing()
-  {
-    processOutput = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL fault. 
-   */
-  public void cancelFaultProcessing()
-  {
-    processFault = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL binding. 
-   */
-  public void cancelBindingProcessing()
-  {
-    processBinding = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL binding operation. 
-   */
-  public void cancelBindingOperationProcessing()
-  {
-    processBindingOperation = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL binding input. 
-   */
-  public void cancelBindingInputProcessing()
-  {
-    processBindingInput = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL binding output. 
-   */
-  public void cancelBindingOutputProcessing()
-  {
-    processBindingOutput = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL binding fault. 
-   */
-  public void cancelBindingFaultProcessing()
-  {
-    processBindingFault = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL import. 
-   */
-  public void cancelImportProcessing()
-  {
-    processImport = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL element. 
-   */
-  public void cancelElementProcessing()
-  {
-    processElement = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL message. 
-   */
-  public void cancelMessageProcessing()
-  {
-    processMessage = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL port. 
-   */
-  public void cancelPortProcessing()
-  {
-    processPort = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL port type. 
-   */
-  public void cancelPortTypeProcessing()
-  {
-    processPortType = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL definition. 
-   */
-  public void cancelDefinitionProcessing()
-  {
-    processDefinition = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL extensibility element. 
-   */
-  public void cancelExtensibilityElementProcessing()
-  {
-    processExtensibilityElement = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL SOAP binding. 
-   */
-  public void cancelSOAPBindingProcessing()
-  {
-    processSOAPBinding = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL SOAP header. 
-   */
-  public void cancelSOAPHeaderProcessing()
-  {
-    processSOAPHeader = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL SOAP header fault. 
-   */
-  public void cancelSOAPHeaderFaultProcessing()
-  {
-    processSOAPHeaderFault = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL SOAP fault. 
-   */
-  public void cancelSOAPFaultProcessing()
-  {
-    processSOAPFault = false;
-  }
-  /**
-   * Cancels processing of the corresponding WSDL operation. 
-   */
-  public void cancelSOAPOperationProcessing()
-  {
-    processSOAPOperation = false;
-  }
-
-  /**
-   * Cancels WSDL elements processing. 
-   */
-  public void cancelProcessing()
-  {
-    cancelPartProcessing();
-    cancelServiceProcessing();
-    cancelTypesProcessing();
-    cancelOperationProcessing();
-    cancelInputProcessing();
-    cancelOutputProcessing();
-    cancelFaultProcessing();
-    cancelBindingProcessing();
-    cancelBindingOperationProcessing();
-    cancelBindingInputProcessing();
-    cancelBindingOutputProcessing();
-    cancelBindingFaultProcessing();
-    cancelImportProcessing();
-    cancelElementProcessing();
-    cancelMessageProcessing();
-    cancelPortProcessing();
-    cancelPortTypeProcessing();
-    cancelDefinitionProcessing();
-    cancelExtensibilityElementProcessing();
-    cancelSOAPBindingProcessing();
-    cancelSOAPHeaderProcessing();
-    cancelSOAPHeaderFaultProcessing();
-    cancelSOAPFaultProcessing();
-    cancelSOAPOperationProcessing();
-  }
-
-  /**
-   * Resumes processing of the corresponding WSDL part. 
-   */
-  public void resumePartProcessing()
-  {
-    processPart = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL service. 
-   */
-  public void resumeServiceProcessing()
-  {
-    processService = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL types. 
-   */
-  public void resumeTypesProcessing()
-  {
-    processTypes = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL operation. 
-   */
-  public void resumeOperationProcessing()
-  {
-    processOperation = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL input. 
-   */
-  public void resumeInputProcessing()
-  {
-    processInput = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL output. 
-   */
-  public void resumeOutputProcessing()
-  {
-    processOutput = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL fault. 
-   */
-  public void resumeFaultProcessing()
-  {
-    processFault = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL binding. 
-   */
-  public void resumeBindingProcessing()
-  {
-    processBinding = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL binding operation. 
-   */
-  public void resumeBindingOperationProcessing()
-  {
-    processBindingOperation = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL binding input. 
-   */
-  public void resumeBindingInputProcessing()
-  {
-    processBindingInput = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL binding output. 
-   */
-  public void resumeBindingOutputProcessing()
-  {
-    processBindingOutput = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL binding fault. 
-   */
-  public void resumeBindingFaultProcessing()
-  {
-    processBindingFault = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL import. 
-   */
-  public void resumeImportProcessing()
-  {
-    processImport = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL element. 
-   */
-  public void resumeElementProcessing()
-  {
-    processElement = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL message. 
-   */
-  public void resumeMessageProcessing()
-  {
-    processMessage = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL port. 
-   */
-  public void resumePortProcessing()
-  {
-    processPort = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL port type. 
-   */
-  public void resumePortTypeProcessing()
-  {
-    processPortType = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL definition. 
-   */
-  public void resumeDefinitionProcessing()
-  {
-    processDefinition = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL extensibility element. 
-   */
-  public void resumeExtensibilityElementProcessing()
-  {
-    processExtensibilityElement = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL SOAP binding. 
-   */
-  public void resumeSOAPBindingProcessing()
-  {
-    processSOAPBinding = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL SOAP header. 
-   */
-  public void resumeSOAPHeaderProcessing()
-  {
-    processSOAPHeader = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL SOAP header fault. 
-   */
-  public void resumeSOAPHeaderFaultProcessing()
-  {
-    processSOAPHeaderFault = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL SOAP fault. 
-   */
-  public void resumeSOAPFaultProcessing()
-  {
-    processSOAPFault = true;
-  }
-  /**
-   * Resumes processing of the corresponding WSDL SOAP operation. 
-   */
-  public void resumeSOAPOperationProcessing()
-  {
-    processSOAPOperation = true;
-  }
-  /**
-   * Indicates whether the corresponding WSDL part should be processed.
-   * @return true if the corresponding WSDL part should be processed.
-   */
-  public boolean processPart()
-  {
-    return processPart;
-  }
-  /**
-   * Indicates whether the corresponding WSDL service should be processed.
-   * @return true if the corresponding WSDL service should be processed.
-   */
-  public boolean processService()
-  {
-    return processService;
-  }
-  /**
-   * Indicates whether the corresponding WSDL types should be processed.
-   * @return true if the corresponding WSDL types should be processed.
-   */
-  public boolean processTypes()
-  {
-    return processTypes;
-  }
-  /**
-   * Indicates whether the corresponding WSDL operation should be processed.
-   * @return true if the corresponding WSDL operation should be processed.
-   */
-  public boolean processOperation()
-  {
-    return processOperation;
-  }
-  /**
-   * Indicates whether the corresponding WSDL input should be processed.
-   * @return true if the corresponding WSDL input should be processed.
-   */
-  public boolean processInput()
-  {
-    return processInput;
-  }
-  /**
-   * Indicates whether the corresponding WSDL output should be processed.
-   * @return true if the corresponding WSDL output should be processed.
-   */
-  public boolean processOutput()
-  {
-    return processOutput;
-  }
-  /**
-   * Indicates whether the corresponding WSDL fault should be processed.
-   * @return true if the corresponding WSDL fault should be processed.
-   */
-  public boolean processFault()
-  {
-    return processFault;
-  }
-  /**
-   * Indicates whether the corresponding WSDL binding should be processed.
-   * @return true if the corresponding WSDL binding should be processed.
-   */
-  public boolean processBinding()
-  {
-    return processBinding;
-  }
-  /**
-   * Indicates whether the corresponding WSDL binding operation should be processed.
-   * @return true if the corresponding WSDL binding operation should be processed.
-   */
-  public boolean processBindingOperation()
-  {
-    return processBindingOperation;
-  }
-  /**
-   * Indicates whether the corresponding WSDL binding input should be processed.
-   * @return true if the corresponding WSDL binding input should be processed.
-   */
-  public boolean processBindingInput()
-  {
-    return processBindingInput;
-  }
-  /**
-   * Indicates whether the corresponding WSDL binding output should be processed.
-   * @return true if the corresponding WSDL binding output should be processed.
-   */
-  public boolean processBindingOutput()
-  {
-    return processBindingOutput;
-  }
-  /**
-   * Indicates whether the corresponding WSDL binding fault should be processed.
-   * @return true if the corresponding WSDL binding fault should be processed.
-   */
-  public boolean processBindingFault()
-  {
-    return processBindingFault;
-  }
-  /**
-   * Indicates whether the corresponding WSDL import should be processed.
-   * @return true if the corresponding WSDL import should be processed.
-   */
-  public boolean processImport()
-  {
-    return processImport;
-  }
-  /**
-   * Indicates whether the corresponding WSDL element should be processed.
-   * @return true if the corresponding WSDL element should be processed.
-   */
-  public boolean processElement()
-  {
-    return processElement;
-  }
-  /**
-   * Indicates whether the corresponding WSDL message should be processed.
-   * @return true if the corresponding WSDL message should be processed.
-   */
-  public boolean processMessage()
-  {
-    return processMessage;
-  }
-  /**
-   * Indicates whether the corresponding WSDL port should be processed.
-   * @return true if the corresponding WSDL port should be processed.
-   */
-  public boolean processPort()
-  {
-    return processPort;
-  }
-  /**
-   * Indicates whether the corresponding WSDL port type should be processed.
-   * @return true if the corresponding WSDL port type should be processed.
-   */
-  public boolean processPortType()
-  {
-    return processPortType;
-  }
-  /**
-   * Indicates whether the corresponding WSDL definition should be processed.
-   * @return true if the corresponding WSDL definition should be processed.
-   */
-  public boolean processDefinition()
-  {
-    return processDefinition;
-  }
-  /**
-   * Indicates whether the corresponding WSDL extensibility element should be processed.
-   * @return true if the corresponding WSDL extensibility element should be processed.
-   */
-  public boolean processExtensibilityElement()
-  {
-    return processExtensibilityElement;
-  }
-  /**
-   * Indicates whether the corresponding WSDL SOAP binding should be processed.
-   * @return true if the corresponding WSDL SOAP binding should be processed.
-   */
-  public boolean processSOAPBinding()
-  {
-    return processSOAPBinding;
-  }
-  /**
-   * Indicates whether the corresponding WSDL SOAP header should be processed.
-   * @return true if the corresponding WSDL SOAP header should be processed.n
-   */
-  public boolean processSOAPHeader()
-  {
-    return processSOAPHeader;
-  }
-  /**
-   * Indicates whether the corresponding WSDL SOAP header fault should be processed.
-   * @return true if the corresponding WSDL SOA header fault should be processed.
-   */
-  public boolean processSOAPHeaderFault()
-  {
-    return processSOAPHeaderFault;
-  }
-  /**
-   * Indicates whether the corresponding WSDL SOAP fault should be processed.
-   * @return true if the corresponding WSDL SOAP fault should be processed.
-   */
-  public boolean processSOAPFault()
-  {
-    return processSOAPFault;
-  }
-  /**
-   * Indicates whether the corresponding WSDL operation should be processed.
-   * @return true if the corresponding WSDL operation should be processed.
-   */
-  public boolean processSOAPOperation()
-  {
-    return processSOAPOperation;
-  }
-  /**
-   * Sets WSDL part to be processed.
-   * @param value  the WSDL part to be processed.
-   */
-  void setPart(Part value)
-  {
-    activePart = value;
-  }
-  /**
-   * Gets last processed WSDL part.
-   * @return the last processed WSDL part.
-   */
-  public Part getPart()
-  {
-    return activePart;
-  }
-  /**
-   * Sets WSDL service to be processed.
-   * @param value  the WSDL service to be processed.
-   */
-  void setService(Service value)
-  {
-    activeService = value;
-  }
-  /**
-   * Gets last processed WSDL service.
-   * @return the last processed WSDL service.
-   */
-  public Service getService()
-  {
-    return activeService;
-  }
-  /**
-   * Sets WSDL types to be processed.
-   * @param value  the WSDL types to be processed.
-   */
-  void setTypes(Types value)
-  {
-    activeTypes = value;
-  }
-  /**
-   * Gets last processed WSDL types.
-   * @return the last processed WSDL types.
-   */
-  public Types getTypes()
-  {
-    return activeTypes;
-  }
-  /**
-   * Sets WSDL operation to be processed.
-   * @param value  the WSDL operation to be processed.
-   */
-  void setOperation(Operation value)
-  {
-    activeOperation = value;
-  }
-  /**
-   * Gets last processed WSDL operation.
-   * @return the last processed WSDL operation.
-   */
-  public Operation getOperation()
-  {
-    return activeOperation;
-  }
-  /**
-   * Sets WSDL input to be processed
-   * @param the WSDL input to be processed.
-   */
-  void setInput(Input value)
-  {
-    activeInput = value;
-  }
-  /**
-   * Gets last processed WSDL input.
-   * @return last processed WSDL input.
-   */
-  public Input getInput()
-  {
-    return activeInput;
-  }
-  /**
-   * Sets WSDL output to be processed.
-   * @param value  the WSDL output to be processed.
-   */
-  void setOutput(Output value)
-  {
-    activeOutput = value;
-  }
-  /**
-   * Gets last processed WSDL output.
-   * @return the last processed WSDL output.
-   */
-  public Output getOutput()
-  {
-    return activeOutput;
-  }
-  /**
-   * Sets WSDL fault to be processed.
-   * @param value  the WSDL fault to be processed.
-   */
-  void setFault(Fault value)
-  {
-    activeFault = value;
-  }
-  /**
-   * Gets last processed WSDL fault.
-   * @return the last processed WSDL fault.
-   */
-  public Fault getFault()
-  {
-    return activeFault;
-  }
-  /**
-   * Sets WSDL binding to be processed.
-   * @param value  the WSDL binding to be processed.
-   */
-  void setBinding(Binding value)
-  {
-    activeBinding = value;
-  }
-  /**
-   * Gets last processed WSDL binding.
-   * @return the last processed WSDL binding.
-   */
-  public Binding getBinding()
-  {
-    return activeBinding;
-  }
-  /**
-   * Sets WSDL binding operation to be processed.
-   * @param value  the SDL binding operation to be processed.
-   */
-  void setBindingOperation(BindingOperation value)
-  {
-    activeBindingOperation = value;
-  }
-  /**
-   * Gets last processed WSDL binding operation.
-   * @return the last processed WSDL binding operation.
-   */
-  public BindingOperation getBindingOperation()
-  {
-    return activeBindingOperation;
-  }
-  /**
-   * Sets WSDL binding input to be processed.
-   * @param value  the WSDL binding input to be processed.
-   */
-  void setBindingInput(BindingInput value)
-  {
-    activeBindingInput = value;
-  }
-  /**
-   * Gets last processed WSDL binding input.
-   * @return the last processed WSDL binding input.
-   */
-  public BindingInput getBindingInput()
-  {
-    return activeBindingInput;
-  }
-  /**
-   * Sets WSDL binding output to be processed.
-   * @param value  the WSDL binding output to be processed.
-   */
-  void setBindingOutput(BindingOutput value)
-  {
-    activeBindingOutput = value;
-  }
-  /**
-   * Gets last processed WSDL binding output.
-   * @return the last processed WSDL binding output.
-   */
-  public BindingOutput getBindingOutput()
-  {
-    return activeBindingOutput;
-  }
-  /**
-   * Sets WSDL binding fault to be processed.
-   * @param value  the WSDL binding fault to be processed.
-   */
-  void setBindingFault(BindingFault value)
-  {
-    activeBindingFault = value;
-  }
-  /**
-   * Gets last processed WSDL binding fault.
-   * @return the last processed WSDL binding fault.
-   */
-  public BindingFault getBindingFault()
-  {
-    return activeBindingFault;
-  }
-  /**
-   * Sets WSDL import to be processed.
-   * @param value  the WSDL import to be processed.
-   */
-  void setImport(Import value)
-  {
-    activeImport = value;
-  }
-  /**
-   * Gets last processed WSDL import.
-   * @return the last processed WSDL import.
-   */
-  public Import getImport()
-  {
-    return activeImport;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  the WSDL element to be processed.
-   */
-  void setElement(Element value)
-  {
-    activeElement = value;
-  }
-  /**
-   * Gets last processed WSDL element.
-   * @return the last processed WSDL element.
-   */
-  public Element getElement()
-  {
-    return activeElement;
-  }
-  /**
-   * Sets WSDL message to be processed.
-   * @param value  the WSDL message to be processed.
-   */
-  void setMessage(Message value)
-  {
-    activeMessage = value;
-  }
-  /**
-   * Gets last processed WSDL message.
-   * @return the last processed WSDL message.
-   */
-  public Message getMessage()
-  {
-    return activeMessage;
-  }
-  /**
-   * Sets WSDL port to be processed.
-   * @param value  the WSDL port to be processed.
-   */
-  void setPort(Port value)
-  {
-    activePort = value;
-  }
-  /**
-   * Gets last processed WSDL port.
-   * @return the last processed WSDL port.
-   */
-  public Port getPort()
-  {
-    return activePort;
-  }
-  /**
-   * Sets WSDL port type to be processed.
-   * @param value  the WSDL port type to be processed.
-   */
-  void setPortType(PortType value)
-  {
-    activePortType = value;
-  }
-  /**
-   * Gets last processed WSDL port type.
-   * @return the last processed WSDL port type.
-   */
-  public PortType getPortType()
-  {
-    return activePortType;
-  }
-  /**
-   * Sets WSDL definition to be processed.
-   * @param value  the WSDL definition to be processed.
-   */
-  void setDefinition(Definition value)
-  {
-    activeDefinition = value;
-  }
-  /**
-   * Gets last processed WSDL definition.
-   * @return the last processed WSDL definition.
-   */
-  public Definition getDefinition()
-  {
-    return activeDefinition;
-  }
-  /**
-   * Sets WSDL extensibility element to be processed.
-   * @param value  the WSDL extensibility element to be processed.
-   */
-  void setExtensibilityElement(ExtensibilityElement value)
-  {
-    activeExtensibilityElement = value;
-  }
-  /**
-   * Gets last processed WSDL extensibility element.
-   * @return the last processed WSDL extensibility element.
-   */
-  public ExtensibilityElement getExtensibilityElement()
-  {
-    return activeExtensibilityElement;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  the WSDL element to be processed.
-   */
-  void setSOAPBinding(SOAPBinding value)
-  {
-    activeSOAPBinding = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP binding.
-   * @return the last processed WSDL SOAP binding.
-   */
-  public SOAPBinding getSOAPBinding()
-  {
-    return activeSOAPBinding;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  WSDL element to be processed.
-   */
-  void setSOAPBody(SOAPBody value)
-  {
-    activeSOAPBody = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP body.
-   * @return the last processed WSDL SOAP body.
-   */
-  public SOAPBody getSOAPBody()
-  {
-    return activeSOAPBody;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  the WSDL element to be processed.
-   */
-  void setSOAPHeader(SOAPHeader value)
-  {
-    activeSOAPHeader = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP header.
-   * @return the last processed WSDL SOAP header.
-   */
-  public SOAPHeader getSOAPHeader()
-  {
-    return activeSOAPHeader;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  the WSDL element to be processed.
-   */
-  void setSOAPHeaderFault(SOAPHeaderFault value)
-  {
-    activeSOAPHeaderFault = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP header fault.
-   * @return the last processed WSDL SOAP header fault.
-   */
-  public SOAPHeaderFault getSOAPHeaderFault()
-  {
-    return activeSOAPHeaderFault;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  the WSDL element to be processed.
-   */
-  void setSOAPFault(SOAPFault value)
-  {
-    activeSOAPFault = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP fault.
-   * @return the last processed WSDL SOAP fault.
-   */
-  public SOAPFault getSOAPFault()
-  {
-    return activeSOAPFault;
-  }
-  /**
-   * Sets WSDL element to be processed.
-   * @param value  theWSDL element to be processed
-   */
-  void setSOAPOperation(SOAPOperation value)
-  {
-    activeSOAPOperation = value;
-  }
-  /**
-   * Gets last processed WSDL SOAP operation.
-   * @return the last processed WSDL SOAP operation.
-   */
-  public SOAPOperation getSOAPOperation()
-  {
-    return activeSOAPOperation;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java
deleted file mode 100644
index ab95d7a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java
+++ /dev/null

@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
-
-import org.w3c.dom.Element;
-
-/**
- * The interface defines callback methods during traverse WSDL.
- * WSDLVisitor could cancel artifact processing by using traversal context
- * <code>cancelXXXProcessing</code> methods.
- * 
- * @author Kulik
- */
-public interface WSDLVisitor
-{
-  /**
-   * Method visits WSDL part object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Part obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL service object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Service obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL types object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Types obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL operation object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Operation obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL input object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Input obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL output object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Output obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL fault object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Fault obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL binding object.
-     * @param obj WSDL element to be visited.
-     * @param parent WSDL element.
-     * @param ctx current traversal context.
-   */
-  public void visit(Binding obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL binding operation object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(
-    BindingOperation obj,
-    Object parent,
-    WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL binding input object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(BindingInput obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL binding output object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(BindingOutput obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL binding fault object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(BindingFault obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL import object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Import obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL element object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Element obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL message object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Message obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL port object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Port obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL port type object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(PortType obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL definition object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(Definition obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL extensibility element object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(
-    ExtensibilityElement obj,
-    Object parent,
-    WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP binding object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(SOAPBinding obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP body object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(SOAPBody obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP header object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(SOAPHeader obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP header fault object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(
-    SOAPHeaderFault obj,
-    Object parent,
-    WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP fault object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element.
-   * @param ctx current traversal context.
-   */
-  public void visit(SOAPFault obj, Object parent, WSDLTraversalContext ctx);
-  /**
-   * Method visits WSDL SOAP operation object.
-   * @param obj WSDL element to be visited.
-   * @param parent WSDL element..
-   * @param ctx current traversal context.
-   */
-  public void visit(SOAPOperation obj, Object parent, WSDLTraversalContext ctx);
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/FileEntityResolver.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/FileEntityResolver.java
deleted file mode 100644
index bdafbd9..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/FileEntityResolver.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.io.IOException;
-import java.io.InputStream;
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-/**
- * Entity resolve to resolve file entities.
- */
-public class FileEntityResolver implements XMLEntityResolver
-{
-
-  /**
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resource) throws XNIException, IOException
-  {
-    String publicId = resource.getPublicId();
-    String systemId = resource.getExpandedSystemId();
-    String url = systemId;
-    if(url == null)
-    {
-      url = publicId;
-    }
-    if(url == null)
-    {
-      url = resource.getNamespace();
-    }
-    if(url != null)
-    {
-      InputStream is = new LazyURLInputStream(url);
-      return new XMLInputSource(publicId, systemId, systemId, is, null);
-    }
-    return null;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java
deleted file mode 100644
index 92e2d4f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java
+++ /dev/null

@@ -1,590 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * Generate a String representation of a schema for an inline schema. Will add imports for unresolved
- * namespaces.
- * 
- * @author Lawrence Mandel, IBM
- */
-public class InlineSchemaGenerator
-{
-  protected final String SOAP_ENCODING_URI = "http://schemas.xmlsoap.org/soap/encoding/";
-  protected final String XMLNS = "xmlns";
-  protected final String TARGETNAMESPACE = "targetNamespace";
-  protected final String NAMESPACE = "namespace";
-  protected final String IMPORT = "import";
-  protected final String INCLUDE = "include";
-  protected final String SCHEMA = "schema";
-  protected final String SCHEMALOCATION = "schemaLocation";
-  protected final String TYPE = "type";
-  protected final String NAME = "name";
-  protected final String[] ignoreNamespaces =
-    { Constants.NS_URI_XSD_1999, Constants.NS_URI_XSD_2000, Constants.NS_URI_XSD_2001 };
-
-  protected static InlineSchemaGenerator instance = null;
-
-  /**
-   * Constructor.
-   */
-  protected InlineSchemaGenerator()
-  {
-  }
-
-  /**
-   * Get the instance of the InlineSchemaGenerator.
-   * 
-   * @return The instance of the inline schema generator.
-   */
-  protected static InlineSchemaGenerator getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new InlineSchemaGenerator();
-    }
-    return instance;
-  }
-  
-  /**
-   * Create a string representation of a schema from the element provided.
-   * 
-   * @param element The root element of the schema.
-   * @param elements A list of the elements in the schema in order.
-   * @param filelocation The URI of the file that contains the schema.
-   * @return A string representation of a schema.
-   */
-  public static String createXSDString(Element element, List elements, String filelocation)
-  {
-    return InlineSchemaGenerator.createXSDString(element, elements, filelocation, new Hashtable());
-  }
-  
-  /**
-  	* Creates a String representing the schema model with the root element of
-  	* extElem. Calls createXSDStringRecursively to take care of building the String
-  	* after it obtains the Element from the UnknownExtensibilityElement.
-  	* 
-  	* @param element The root element of the schema.
-  	* @param elements A list to contain the elements in the schema in order.
-  	* @param filelocation The location of the file the schema is located in.
-  	* @param parentNSs A hashtable of parent namespaces to used to resolve prefixes.
-  	* @return A string representation of the schema with the root element 'element'.
-  	*/
-  public static String createXSDString(Element element, List elements, String filelocation, Hashtable parentNSs)
-  {
-    InlineSchemaGenerator schemaGenerator = InlineSchemaGenerator.getInstance();
-    Hashtable nsResolver = schemaGenerator.getNSResolver(element);
-    List reqns = schemaGenerator.getRequiredNamespaces(element);
-    Hashtable reqNSDecl = schemaGenerator.resolveNamespaces(reqns, nsResolver, parentNSs);
-    //Hashtable reqNSDecl = schemaGenerator.getRequiredNSDeclarations(reqns, nsResolver, parentNSs);
-    List importNS = schemaGenerator.getImportNamespaces(element);
-    reqns = schemaGenerator.removeImports(reqns, importNS);
-    reqns = schemaGenerator.removeLocalNamespaces(reqns, element);
-    return schemaGenerator.createXSDStringRecursively(element, elements, reqns, reqNSDecl, filelocation);
-  }
-  /**
-   * Returns true if the SOAP encoding namespace is required but not imported.
-   * 
-   * @param element The root element of the schema.
-   * @param filelocation The location of the file containing the schema.
-   * @param parentNSs A hashtable of the parent namespaces.
-   * @return True if the soap encoding namespace is required but not imported, false otherwise.
-   */
-  public static boolean soapEncodingRequiredNotImported(Element element, String filelocation, Hashtable parentNSs)
-  {
-    InlineSchemaGenerator schemaGenerator = InlineSchemaGenerator.getInstance();
-    Hashtable nsResolver = schemaGenerator.getNSResolver(element);
-    List reqns = null;
-
-    reqns = schemaGenerator.getRequiredNamespaces(element);
-    schemaGenerator.resolveNamespaces(reqns, nsResolver, parentNSs);
-    //schemaGenerator.resolveUndeclaredNamespaces(reqns, parentNSs);
-    List importNS = schemaGenerator.getImportNamespaces(element);
-    reqns = schemaGenerator.removeImports(reqns, importNS);
-    reqns = schemaGenerator.removeLocalNamespaces(reqns, element);
-
-    return schemaGenerator.checkSOAPEncodingRequired(reqns);
-  }
-
-  /**
-   * This recursive method creates the schema String from the root Element.
-   * 
-   * @param elem The root element of the schema.
-   * @param elements A list to be created of the elements in the schema in order.
-   * @param requiredNamespaces A list of required namespaces.
-   * @param reqNSDecl A hashtable of required namespace declarations.
-   * @param filelocation The uri of the file that contains this schema.
-   * @return A string representation of this schema.
-   */
-  protected String createXSDStringRecursively(
-    Element elem,
-    List elements,
-    List requiredNamespaces,
-    Hashtable reqNSDecl,
-    String filelocation)
-  {
-    if (elem == null)
-      return ""; // just in case
-
-    elements.add(elem);
-
-    StringBuffer xsdString = new StringBuffer();
-    String elementName = elem.getTagName();
-    xsdString.append("<").append(elementName);
-
-    boolean foundSchemaLocation = false; // flag if schemalocation is defined
-    String namespace = ""; // the namespace if we're checking an import or include
-    String namePrefix = ""; // the xmlns prefix used for the elements
-    // Get all of the attributes for this element and append them to the xsdString
-    NamedNodeMap atts = elem.getAttributes();
-    for (int i = 0; i < atts.getLength(); i++)
-    {
-      Node n = atts.item(i);
-      xsdString.append(" ").append(n.getNodeName()).append("=\"");
-      String nodeName = n.getNodeName();
-      if (nodeName.equalsIgnoreCase(SCHEMALOCATION) && filelocation != null)
-      {
-        foundSchemaLocation = true;
-        String relativePath = n.getNodeValue();
-        xsdString.append(relativePath).append("\"");   
-      }
-      else
-      {
-        String nodeValue = n.getNodeValue();
-        if (nodeName.equalsIgnoreCase(NAMESPACE))
-        {
-          namespace = nodeValue;
-        }
-        // get the name prefix for this schema to use in generating import statements
-        else if (nodeName.indexOf(XMLNS) != -1)
-        {
-
-          if (nodeValue.equalsIgnoreCase(elem.getNamespaceURI()))
-          {
-            namePrefix = nodeName;
-            if (namePrefix.equalsIgnoreCase(XMLNS))
-            {
-              namePrefix = "";
-            }
-            else
-            {
-              namePrefix = namePrefix.substring(6) + ":";
-            }
-          }
-        }
-        // Replace old schema namespaces with the new schema namespace.
-        if(nodeValue.equals(Constants.NS_URI_XSD_1999) || nodeValue.equals(Constants.NS_URI_XSD_2000))
-         {
-          nodeValue = Constants.NS_URI_XSD_2001;
-        }
-        xsdString.append(nodeValue).append("\"");
-      }
-    }
-    if (elementName.equalsIgnoreCase("import") && !foundSchemaLocation)
-    {
-      xsdString.append(" ").append(SCHEMALOCATION).append("=\"").append(namespace).append("\"");
-    }
-    // add in any required NS declarations from parent elements
-    if (reqNSDecl != null)
-    {
-      Enumeration keys = reqNSDecl.keys();
-      while (keys.hasMoreElements())
-      {
-        String key = (String)keys.nextElement();
-        String declNS = (String)reqNSDecl.get(key);
-        if(declNS.equals(Constants.NS_URI_XSD_1999) || declNS.equals(Constants.NS_URI_XSD_2000))
-         {
-          declNS = Constants.NS_URI_XSD_2001;
-        }
-        xsdString.append(" ").append(key).append("=\"").append(declNS).append("\"");
-      }
-
-    }
-    xsdString.append(">");
-    if (requiredNamespaces != null)
-    {
-      Iterator iRequiredNamespaces = requiredNamespaces.iterator();
-      while (iRequiredNamespaces.hasNext())
-      {
-        String ns = (String)iRequiredNamespaces.next();
-
-        xsdString
-          .append("<")
-          .append(namePrefix)
-          .append(IMPORT)
-          .append(" ")
-          .append(NAMESPACE)
-          .append("=\"")
-          .append(ns)
-          .append("\" ")
-          .append(SCHEMALOCATION)
-          .append("=\"")
-          .append(ns)
-          .append("\"/>");
-      }
-
-    }
-    xsdString.append("\n");
-
-    // call the method recursively for each child element
-    NodeList childNodes = elem.getChildNodes();
-
-    for (int i = 0; i < childNodes.getLength() || i < 5; i++)
-    {
-      Node n = childNodes.item(i);
-      // we only want nodes that are Elements
-      if (n instanceof Element)
-      {
-        Element child = (Element)n;
-        xsdString.append(createXSDStringRecursively(child, elements, null, null, filelocation));
-      }
-    }
-
-    xsdString.append("</").append(elem.getTagName()).append(">");
-
-    return xsdString.toString();
-
-  }
-  /**
-   * Get a list of all the namespaces that are used for elements or types in the schema.
-   * These are the required namespaces in order to ensure that all the elments are valid.
-   * 
-   * @param elem The element to check for required namespaces.
-   * @return A list of required namespaces for the element and all its children.
-   */
-  protected List getRequiredNamespaces(Element elem)
-  {
-    List namespace = new Vector();
-
-    // call the method recursively for each child element
-    // register all the child types first
-    NodeList childNodes = elem.getChildNodes();
-    int numChildren = childNodes.getLength();
-    // TODO: why is there a < 5 condition?
-    for (int i = 0; i < numChildren /*|| i < 5*/; i++)
-    {
-      Node n = childNodes.item(i);
-      // we only want nodes that are Elements
-      if (n instanceof Element)
-      {
-        Element child = (Element)n;
-        List childns = getRequiredNamespaces(child);
-        for (int j = childns.size() - 1; j >= 0; j--)
-        {
-          String ns = (String)childns.get(j);
-          
-          if (!namespace.contains(ns))
-          {
-            namespace.add(ns);
-          }
-        }
-      }
-    }
-    // Add the namespace of the current element
-    String elemNS = elem.getPrefix();
-    // if there is no namespace prefix set it to the empty prefix.
-    if(elemNS == null)
-    {
-      elemNS = "";
-    }
-    if (!namespace.contains(elemNS.intern()))
-     {
-      namespace.add(elemNS.intern());
-    }
-    // now add all of the current element's namespaces
-    // don't include import and schema elements
-    String localname = elem.getLocalName();
-    if (!localname.equals(IMPORT) && !localname.equals(INCLUDE) && !localname.equals(SCHEMA))
-    {
-      NamedNodeMap atts = elem.getAttributes();
-      for (int i = 0; i < atts.getLength(); i++)
-      {
-        Node n = atts.item(i);
-
-        String nodeName = n.getNodeName();
-        // removed restriction that we're only looking at types
-        //		if (nodeName.equalsIgnoreCase(TYPE))
-        //		{
-        // don't take namespace info from attributes defining namespaces.
-        // that includes xmlns, targetNamespace
-        // don't take namespace info from name attributes
-        if (nodeName.indexOf(XMLNS) != -1 || nodeName.equals(TARGETNAMESPACE) || nodeName.equals(NAME))
-        {
-          continue;
-        }
-        String nodeValue = n.getNodeValue();
-        
-        
-        int colonIndex = nodeValue.indexOf(":");
-        // Don't take namespace info from attributes with the default namespace, that is attributes
-        // that are not prefixed. (colonIndex == -1)
-        // If the colonIndex is followed by a / then it is a URI and not
-        // namespace qualified.
-        if (colonIndex == -1 || nodeValue.charAt(colonIndex + 1) == '/')
-        {
-          continue;
-        }
-        // here we have found a colon delimiter so we need the namespace defined here
-        else
-        {
-          nodeValue = nodeValue.substring(0, colonIndex);
-        }
-        if (!namespace.contains(nodeValue.intern()))
-        {
-
-          namespace.add(nodeValue.intern());
-        }
-        //		}
-      }
-    }
-
-    return namespace;
-
-  }
-
-  /**
-   * Get a list of all the namespaces that have an import statement.
-   * 
-   * @param elem The root element of the schema.
-   * @return A list of all the namespaces that are imported.
-   */
-  protected List getImportNamespaces(Element elem)
-  {
-    List namespace = new Vector();
-
-    // call the method recursively for each child element
-    // register all the child types first
-    NodeList childNodes = elem.getChildNodes();
-
-    for (int i = 0; i < childNodes.getLength() || i < 5; i++)
-    {
-      Node n = childNodes.item(i);
-      // we only want nodes that are Elements
-      if (n instanceof Element)
-      {
-        Element child = (Element)n;
-        List childns = getImportNamespaces(child);
-        for (int j = childns.size() - 1; j >= 0; j--)
-        {
-          String ns = (String)childns.get(j);
-          if (!namespace.contains(ns))
-          {
-            namespace.add(ns);
-          }
-        }
-      }
-    }
-    // if this is an import element get the namespace and add it to the list
-    if (elem.getLocalName().equalsIgnoreCase(IMPORT))
-    {
-      NamedNodeMap atts = elem.getAttributes();
-      for (int i = 0; i < atts.getLength(); i++)
-      {
-        Node n = atts.item(i);
-
-        String nodeName = n.getNodeName();
-        if (nodeName.equalsIgnoreCase(NAMESPACE))
-        {
-          String nodeValue = n.getNodeValue();
-          if (!namespace.contains(nodeValue.intern()))
-          {
-
-            namespace.add(nodeValue.intern());
-          }
-        }
-      }
-    }
-
-    return namespace;
-
-  }
-
-  /**
-   * Return a Hashtable with namespace prefixes as keys from the given element.
-   * 
-   * @param elem The root element of the schema.
-   * @return A hashtable with namespace prefixes mapped to namespaces.
-   */
-  protected Hashtable getNSResolver(Element elem)
-  {
-    Hashtable nsResolver = new Hashtable();
-
-    NamedNodeMap atts = elem.getAttributes();
-    for (int i = 0; i < atts.getLength(); i++)
-    {
-      Node n = atts.item(i);
-
-      String nodeName = n.getNodeName();
-      if (nodeName.indexOf(XMLNS) != -1)
-      {
-        String nodeValue = n.getNodeValue();
-        String namePrefix = nodeName;
-
-        if (namePrefix.equalsIgnoreCase(XMLNS))
-        {
-          namePrefix = "";
-        }
-        else
-        {
-          namePrefix = namePrefix.substring(6);
-        }
-        nsResolver.put(namePrefix, nodeValue);
-
-      }
-    }
-    return nsResolver;
-
-  }
-
-  /**
-   * Resolve the namespaces in the given namespaces list with the two namespace
-   * resolver hashtables provided. Return a list of all the namespace that need
-   * to be declared.
-   * First resolve against the local namespaces with nsResolver.
-   * Next resolve against the parent namespace with parentNSResolver.
-   * A side affect of this method is the namespaces list is left with only those 
-   * namespaces that are resolved and the resolved entities are placed in the 
-   * list instead of the original entries.
-   * For ex. If you provide a list such as {xsd, intf} and only xsd can be resolved
-   * you will end up with the list {http://www.w3.org/2001/XMLSchema}
-   * 
-   * @param namespaces The list of namespaces to resolve.
-   * @param nsResolver The hashtable to be used as the local resolver.
-   * @param parentNSResolver The hashtable to be used as the parent namespace resolver.
-   * @return A Hashtable of namespaces that must be declared.
-   */
-  protected Hashtable resolveNamespaces(List namespaces, Hashtable nsResolver, Hashtable parentNSResolver)
-  {
-  	Hashtable reqNSDecl = new Hashtable();
-    if (namespaces != null && !namespaces.isEmpty() && nsResolver != null)
-    {
-      for (int i = namespaces.size() - 1; i >= 0; i--)
-      {
-        String ns = (String)namespaces.get(i);
-        // Remove the namespace from the list.
-        namespaces.remove(i);
-        // First try to resolve against the local namespace resolver.
-        if (nsResolver.containsKey(ns))
-        {
-          Object resolvedNS = nsResolver.get(ns);
-          // Only add the namespace if it's not already in the list.
-          if(!namespaces.contains(resolvedNS))
-          {
-            namespaces.add(i, nsResolver.get(ns));
-          }
-        }
-        // Next try to resolve against the parent namespace resolver.
-        else
-        {
-        	if (ns.equals(""))
-            {
-              ns = XMLNS;
-            }
-            else
-            {
-              ns = XMLNS + ":" + ns;
-            }
-            if (parentNSResolver.containsKey(ns))
-            {
-              Object resolvedNS = parentNSResolver.get(ns);
-              // Only add the namespace if it's not already in the list.
-              if(!namespaces.contains(resolvedNS))
-              {
-                namespaces.add(i, resolvedNS);
-              }
-              // Still need to declare the namespace though.
-              reqNSDecl.put(ns, resolvedNS);
-            }
-        }
-
-      }
-    }
-    return reqNSDecl;
-  }
-
-  /**
-   * Remove any namespace from the namespaces list if it is in the import list.
-   * 
-   * @param namespaces The namespaces list.
-   * @param importedNamespaces A list of imported namespaces.
-   * @return The list of namespaces without the imported namespaces.
-   */
-  protected List removeImports(List namespaces, List importedNamespaces)
-  {
-    if (namespaces != null && importedNamespaces != null && !importedNamespaces.isEmpty())
-    {
-      Iterator iImportedNS = importedNamespaces.iterator();
-      while (iImportedNS.hasNext())
-      {
-        String iNS = (String)iImportedNS.next();
-
-        namespaces.remove(iNS);
-      }
-    }
-    return namespaces;
-  }
-
-  /**
-   * Remove the local namespace for the schema and the namespaces listed in the ignoreNamespaces
-   * list from the namespaces list provided.
-   * 
-   * @param namespaces The list of local namespaces.
-   * @param elem The root element of the schema.
-   * @return The list of namespaces with the local namespaces removed.
-   */
-  protected List removeLocalNamespaces(List namespaces, Element elem)
-  {
-    if (namespaces != null && elem != null)
-    {
-      String ns = elem.getAttribute(TARGETNAMESPACE);
-      namespaces.remove(ns);
-
-      for (int i = ignoreNamespaces.length - 1; i >= 0; i--)
-      {
-        // keep removing the namespace until it is not in the list
-        if (namespaces.remove(ignoreNamespaces[i]))
-        {
-          i++;
-        }
-      }
-    }
-    return namespaces;
-  }
-  
-  /**
-   * Returns true if the SOAP encoding namespace is in the list of required namespaces,
-   * false otherwise.
-   * 
-   * @param reqns The list of namespaces to check for the SOAP encoding namespace.
-   * @return True if the SOAP encoding namespaces is in the list, false otherwise.
-   */
-  protected boolean checkSOAPEncodingRequired(List reqns)
-  {
-    if (reqns.contains(SOAP_ENCODING_URI))
-    {
-      return true;
-    }
-    return false;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java
deleted file mode 100644
index aec05ba..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java
+++ /dev/null

@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.ibm.wsdl.Constants;
-
-/**
- * Plugin validator for the WSDL Validation framework. Validates inline schema found in a WSDL document.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class InlineSchemaValidator
-{
-  List elements = null;
-
-
-  public Map validate(Object element, List parents, String filename) throws Exception
-  {
-  	elements = new Vector();
-    UnknownExtensibilityElement elem = (UnknownExtensibilityElement) element;
-    Definition wsdlDefinition = (Definition) parents.get(parents.size() - 1);
-    // Add in the namespaces defined in the doc already that aren't defined locally in this schema.
-    // There is no need to check for namespaces other then in the defintions and types elements as
-    // inline schema can not have any other parents and must have there two parents.
-    // First take care of the definitions element
-
-    // create the inline schema string
-	Element w3celement = elem.getElement();
-	Hashtable parentnamespaces = getNamespaceDeclarationsFromParents(wsdlDefinition,w3celement);
-	String targetNamespace = w3celement.getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-	// if the targetNamespace hasn't been defined for the schema use the 
-	// targetNamespace of the definitions element
-	/*if(targetNamespace == null || targetNamespace.equals(""))
-	 {
-	  targetNamespace = wsdlDefinition.getTargetNamespace();
-	  w3celement.setAttribute(Constants.ATTR_TARGET_NAMESPACE,targetNamespace);
-	}*/
-
-	String xsd = InlineSchemaGenerator.createXSDString(w3celement, elements, filename, parentnamespaces);
-
-    // If the namespace given is one of the old schema namespaces produce a warning.
-    String namespace = w3celement.getNamespaceURI();
-    if(namespace.equals(Constants.NS_URI_XSD_1999) || namespace.equals(Constants.NS_URI_XSD_2000))
-    {
-      throw new Exception("An old version of the schema namespace is specified.");
-    }
-
-    // now create and call the validator for the inline schema
-    XSDValidator schemav = new XSDValidator();
-
-    //String fileLocation = new URL(validatormanager.getFilename()).getPath();
-    InlineXSDResolver inlineEntityResolver =
-      getEntityResolver(wsdlDefinition, (Types) parents.get(0), filename, targetNamespace);
-    //	add in the external XSD Catalog to resolve schemas offline
-    XMLEntityResolverChain entityResolverChain = new XMLEntityResolverChain();
-    entityResolverChain.addEntityResolver(inlineEntityResolver);
-    entityResolverChain.addEntityResolver(new FileEntityResolver());
-    entityResolverChain.addEntityResolver(XMLCatalogResolver.getInstance());
-    schemav.validateInlineSchema(xsd, targetNamespace, filename, entityResolverChain, inlineEntityResolver);
-
-    // check if the SOAP Encoding namespace is required but not imported
-    if (InlineSchemaGenerator.soapEncodingRequiredNotImported(elem.getElement(), filename,parentnamespaces))
-    {
-      throw new Exception("The inline schema uses an element or type from "
-        + "the SOAP encoding namespace but the namespace has not been imported. "
-        + "The SOAP encoding namespace should be imported with an import "
-        + "statement before it is used.");
-    }
-
-    // If the schema isn't valid
-    if (!schemav.isValid())
-    {
-      // Gathering all the errors
-      StringBuffer exception = new StringBuffer();
-      Iterator i = schemav.getErrors().iterator();
-      while (i.hasNext())
-      {
-        exception.append(i.next()).append('\n');
-      }
-      // throw an exception
-      throw new Exception(exception.toString());
-    }
-    // if the schema is valid
-    else
-    {
-      Map map = new HashMap(1);
-      map.put(targetNamespace, schemav.getXSModel());
-      return map;
-    }
-  }
-
-  /**
-   * Get an entity resolver that will resolve inline schemas.  Every inline schema is preregistered with
-   * the resolver.
-   * 
-   * @param wsdlDefinition The WSDL definitions element.
-   * @param types The types element.
-   * @param referenceLocation The location of the file that contains this schema.
-   * @param targetNamespace The targetNamespace of the schema.
-   * @return An entity resolver that can resolve inline schemas.
-   */
-  protected InlineXSDResolver getEntityResolver(Definition wsdlDefinition, Types types, String referenceLocation, String targetNamespace)
-  {
-    InlineXSDResolver entityResolver = new InlineXSDResolver();
-//    entityResolver.setReferenceLocation(referenceLocation);
-    List schemas = types.getExtensibilityElements();
-    if (schemas != null)
-    {
-      Iterator iSchemas = schemas.iterator();
-      while (iSchemas.hasNext())
-      {
-        UnknownExtensibilityElement extElem = (UnknownExtensibilityElement) iSchemas.next();
-        String thisNamespace = extElem.getElement().getAttribute(Constants.ATTR_TARGET_NAMESPACE);
-        if (thisNamespace != null && !thisNamespace.equalsIgnoreCase(targetNamespace))
-        {
-
-        	Element element = extElem.getElement();
-			
-//			create the inline schema string
-			 //Element w3celement = elem.getElement();
-			 Hashtable parentnamespaces = getNamespaceDeclarationsFromParents(wsdlDefinition,element);
-			 String xsd = InlineSchemaGenerator.createXSDString(element, elements, referenceLocation, parentnamespaces);
-        	//addNamespaceDeclarationsFromParents(wsdlDefinition,element);
-          entityResolver.add(thisNamespace, xsd);
-        }
-
-      }
-    }
-    return entityResolver;
-  }
-  
-  /**
-   * Get the namespace declarations as in the form 
-   * xmlns="somenamespace"
-   * from the definitions and types elements and add them to the schema element so the schema 
-   * validator will have access to them.
-   * 
-   * @param wsdlDefinition The WSDL definitions element.
-   * @param element The types element.
-   * @return A hashtable with the namespace elements from the elements provided.
-   */
-  protected Hashtable getNamespaceDeclarationsFromParents(Definition wsdlDefinition, Element element)
-  {
-  	Hashtable nss = new Hashtable();
-    Iterator nameSpaces = wsdlDefinition.getNamespaces().keySet().iterator();
-
-    String XMLNS = Constants.ATTR_XMLNS;
-    
-    while (nameSpaces.hasNext())
-    {
-      String nsprefix = XMLNS;
-      String ns = (String) nameSpaces.next();
-      if (!ns.equalsIgnoreCase(""))
-      {
-        nsprefix += ":";
-      }
-      if (!element.hasAttribute(nsprefix + ns))
-      {
-      	nss.put(nsprefix + ns, wsdlDefinition.getNamespace(ns));
-//        element.setAttribute(nsprefix + ns, wsdlDefinition.getNamespace(ns));
-      }
-
-    }
-    // Next handle the parent types element
-    NamedNodeMap atts = element.getParentNode().getAttributes();
-    int attslength = atts.getLength();
-    for (int i = 0; i < attslength; i++)
-    {
-      Node tempnode = atts.item(i);
-      String nodename = tempnode.getNodeName();
-      // if this is a namespace attribute
-      if (nodename.indexOf(XMLNS) != -1)
-      {
-		nss.put(nodename,  tempnode.getNodeValue());
-        //element.setAttribute(nodename, tempnode.getNodeValue());
-      }
-    }
-    return nss;
-  }
-  
-  /**
-   * Given a line number for the schema returns the element found on that line. 
-   * Useful for obtaining elements from schema Strings.
-   * 
-   * @param line The line number for the schema.
-   * @return The object located at the line or at line 0 if the line is invalid.
-   */
-   public Object getObjectAtLine(int line)
-   {
-   	if(line < 0 || line >= elements.size())
-   	{
-   	  line = 0;
-   	}
-	return elements.get(line);
-   }
-   
-  /**
-   * Replace any instance of the 2001 schema namespace in the given message with
-   * the given namespace.
-   * 
-   * @param message The message to replace the namespace in.
-   * @param namespace The namespace used for replacement.
-   * @return The message with the 2001 schema namespace replaced by the given namespace.
-   */
- // private String replaceNamespace(String message, String namespace)
- //  {
- //    String xsd2001 = Constants.NS_URI_XSD_2001;
- //    int start = message.indexOf(xsd2001);
- //    int end = start + xsd2001.length();
- //    if(start < 0)
- //    {
- //      return message;
- //    }
- //    String startString = message.substring(0,start);
- //    String endString = message.substring(end,message.length());
- //    return startString + namespace + endString;
- //  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineXSDResolver.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineXSDResolver.java
deleted file mode 100644
index a9d5a79..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineXSDResolver.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Hashtable;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-/**
- * An XMLEntityResolver that allows inline schemas to resolve each other through imports.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class InlineXSDResolver implements XMLEntityResolver
-{
-  protected Hashtable entities = new Hashtable();
-  protected XMLInputSource referringSchemaInputSource = null;
-  protected String referringSchemaNamespace = null;
-
-  /**
-   * Constuctor.
-   */
-  public InlineXSDResolver()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier)
-		 throws XNIException, IOException {
-	String systemId = resourceIdentifier.getExpandedSystemId();
-	String publicId = resourceIdentifier.getPublicId();
-	String namespace = resourceIdentifier.getNamespace();
-	XMLInputSource is = null;
-	String schema = null;
-	if (systemId == null)
-	{
-	  if(publicId == null)
-	  {
-	  	if(namespace == null)
-	  	{	
-	      return null;
-	  	}
-	  	else
-	  	{
-	  		systemId = namespace;
-	  	}
-	  }
-	  else
-	  {	
-	    systemId = publicId;
-	  }
-	}
-	  
-	if(referringSchemaNamespace != null && referringSchemaNamespace.equals(systemId))
-	{
-		if(referringSchemaInputSource!=null)
-		{
-			return referringSchemaInputSource;
-		}
-	}
-	else if ((schema = (String) entities.get(systemId)) != null && !schema.equals(""))
-	{
-		is = new XMLInputSource(publicId, systemId, systemId,new StringReader(schema),null);
-	}
-	
-    //if(is == null)
-    //{
-    //	throw new IOException();
-    //}
-	return is;
-  }
-
-  /**
-   * Add an inline schema.
-   * 
-   * @param targetNamespace - the target namespace of the schema
-   * @param schema - a string representation of the schema
-   */
-  public void add(String targetNamespace, String schema)
-  {
-    entities.put(targetNamespace, schema);
-  }
-  
-  /**
-   * Add the referring inline schema. 
-   * 
-   * @param inputSource - a representation of the inline schema
-   * @param namespace - the namespace of the inline schema
-   */
-  public void addReferringSchema(XMLInputSource inputSource, String namespace)
-  {
-    referringSchemaInputSource = inputSource;
-    referringSchemaNamespace = namespace;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/LazyURLInputStream.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/LazyURLInputStream.java
deleted file mode 100644
index 86e2a91..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/LazyURLInputStream.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-
-/**
- * This class allows InputStreams to be created and returned to xerces without
- * actually opening file handles or network connections until it is absolutely
- * neccessary.
- */
-public class LazyURLInputStream extends InputStream
-{  
-  private static int debugTotalOpenStreamCount = 0; 
-  protected InputStream inner;
-  protected String url;
-  protected boolean error;
-  boolean hasMarks;
-  boolean pretendFileIsStillOpen;
-
-  public LazyURLInputStream(String url)
-  {
-    this.url = url;
-	inner = null;
-	pretendFileIsStillOpen = false;
-  }
-
-  private void createInnerStreamIfRequired() throws IOException
-  {
-    if (inner == null && !error)
-    {
-      debugTotalOpenStreamCount++;
-      //System.out.println("Creating stream (" + debugTotalOpenStreamCount + ")-- " + url);
-      try
-      {
-        inner = new URL(url).openStream();
-		pretendFileIsStillOpen = false;
-		hasMarks = false;
-      }
-      finally 
-      {
-        if (inner == null)
-        {  
-          error = true;
-        }
-      }
-    }
-  }
-
-	protected void closeStream() throws IOException {
-		if (inner != null && !pretendFileIsStillOpen) {
-			inner.close();
-			pretendFileIsStillOpen = true;
-		}
-  	}
-
-  public int available() throws IOException
-  {
-	if (pretendFileIsStillOpen) return 0;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	return inner.available();
-  }
-
-  public void close() throws IOException
-  {
-	if (pretendFileIsStillOpen) {
-		// Stop behaving as if the stream were still open.
-		pretendFileIsStillOpen = false;
-	} else {
-		if (inner != null) {
-			debugTotalOpenStreamCount--;
-		      //System.out.println("Closing stream (" + debugTotalOpenStreamCount + ") -- " + url);
-			inner.close();
-		}
-	}
-  }
-
-  public void mark(int readlimit)
-  {
-	if (pretendFileIsStillOpen) return;
-	hasMarks = true;
-	try {
-		createInnerStreamIfRequired();
-		inner.mark(readlimit);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-  }
-
-  public boolean markSupported()
-  {
-	if (pretendFileIsStillOpen) return false;
-	try {
-		createInnerStreamIfRequired();
-		if (inner == null) return false;
-		return inner.markSupported();
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-	return false;
-  }
-
-  public int read() throws IOException
-  {
-	if (pretendFileIsStillOpen) return -1;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	int bytesRead = inner.read();
-	if (bytesRead == -1 && !hasMarks) closeStream();
-	return bytesRead;
-  }
-
-
-	public int read(byte[] b) throws IOException {
-		if (pretendFileIsStillOpen) return -1;
-		createInnerStreamIfRequired();
-		if (inner == null) throw new IOException("Stream not available");
-		int bytesRead = inner.read(b);
-		if (bytesRead == -1 && !hasMarks) closeStream();
-		return bytesRead;
-	}
-
-  public int read(byte[] b, int off, int len) throws IOException
-  {    
-	if (pretendFileIsStillOpen) return -1;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	int bytesRead = inner.read(b, off, len);
-	if (bytesRead == -1 && !hasMarks) closeStream();
-	return bytesRead;
-  }
-
-  public void reset() throws IOException
-  {
-	if (pretendFileIsStillOpen) return;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	inner.reset();
-  }
-
-  public long skip(long n) throws IOException
-  {   
-	if (pretendFileIsStillOpen) return 0;
-	createInnerStreamIfRequired();
-	if (inner == null) throw new IOException("Stream not available");
-	return inner.skip(n);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/SchemaAttributeTable.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/SchemaAttributeTable.java
deleted file mode 100644
index 449762f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/SchemaAttributeTable.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import org.apache.xerces.impl.xs.SchemaSymbols;
-import org.apache.xerces.util.SymbolTable;
-/**
- * This class will allow the calling code to see if the attribute is defined in schema.
- * This serves as schema for schema.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class SchemaAttributeTable extends SymbolTable
-{
-
-  /**
-   * Constructor.
-   */
-  public SchemaAttributeTable()
-  {
-    // add all of the sybols to the table. SchemaSymbols probably should have
-    // a SymbolTable for these but it doesn't
-
-    super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDANY);
-    super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDLOCAL);
-    super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDOTHER);
-    super.addSymbol(SchemaSymbols.ATTVAL_TWOPOUNDTARGETNS);
-    super.addSymbol(SchemaSymbols.ATTVAL_POUNDALL);
-    super.addSymbol(SchemaSymbols.ATTVAL_FALSE_0);
-    super.addSymbol(SchemaSymbols.ATTVAL_TRUE_1);
-    super.addSymbol(SchemaSymbols.ATTVAL_ANYSIMPLETYPE);
-    super.addSymbol(SchemaSymbols.ATTVAL_ANYTYPE);
-    super.addSymbol(SchemaSymbols.ATTVAL_ANYURI);
-    super.addSymbol(SchemaSymbols.ATTVAL_BASE64BINARY);
-    super.addSymbol(SchemaSymbols.ATTVAL_BOOLEAN);
-    super.addSymbol(SchemaSymbols.ATTVAL_BYTE);
-    super.addSymbol(SchemaSymbols.ATTVAL_COLLAPSE);
-    super.addSymbol(SchemaSymbols.ATTVAL_DATE);
-    super.addSymbol(SchemaSymbols.ATTVAL_DATETIME);
-    super.addSymbol(SchemaSymbols.ATTVAL_DAY);
-    super.addSymbol(SchemaSymbols.ATTVAL_DECIMAL);
-    super.addSymbol(SchemaSymbols.ATTVAL_DOUBLE);
-    super.addSymbol(SchemaSymbols.ATTVAL_DURATION);
-    super.addSymbol(SchemaSymbols.ATTVAL_ENTITY);
-    super.addSymbol(SchemaSymbols.ATTVAL_ENTITIES);
-    super.addSymbol(SchemaSymbols.ATTVAL_EXTENSION);
-    super.addSymbol(SchemaSymbols.ATTVAL_FALSE);
-    super.addSymbol(SchemaSymbols.ATTVAL_FLOAT);
-    super.addSymbol(SchemaSymbols.ATTVAL_HEXBINARY);
-    super.addSymbol(SchemaSymbols.ATTVAL_ID);
-    super.addSymbol(SchemaSymbols.ATTVAL_IDREF);
-    super.addSymbol(SchemaSymbols.ATTVAL_IDREFS);
-    super.addSymbol(SchemaSymbols.ATTVAL_INT);
-    super.addSymbol(SchemaSymbols.ATTVAL_INTEGER);
-    super.addSymbol(SchemaSymbols.ATTVAL_LANGUAGE);
-    super.addSymbol(SchemaSymbols.ATTVAL_LAX);
-    super.addSymbol(SchemaSymbols.ATTVAL_LIST);
-    super.addSymbol(SchemaSymbols.ATTVAL_LONG);
-    super.addSymbol(SchemaSymbols.ATTVAL_NAME);
-    super.addSymbol(SchemaSymbols.ATTVAL_NEGATIVEINTEGER);
-    super.addSymbol(SchemaSymbols.ATTVAL_MONTH);
-    super.addSymbol(SchemaSymbols.ATTVAL_MONTHDAY);
-    super.addSymbol(SchemaSymbols.ATTVAL_NCNAME);
-    super.addSymbol(SchemaSymbols.ATTVAL_NMTOKEN);
-    super.addSymbol(SchemaSymbols.ATTVAL_NMTOKENS);
-    super.addSymbol(SchemaSymbols.ATTVAL_NONNEGATIVEINTEGER);
-    super.addSymbol(SchemaSymbols.ATTVAL_NONPOSITIVEINTEGER);
-    super.addSymbol(SchemaSymbols.ATTVAL_NORMALIZEDSTRING);
-    super.addSymbol(SchemaSymbols.ATTVAL_NOTATION);
-    super.addSymbol(SchemaSymbols.ATTVAL_OPTIONAL);
-    super.addSymbol(SchemaSymbols.ATTVAL_POSITIVEINTEGER);
-    super.addSymbol(SchemaSymbols.ATTVAL_PRESERVE);
-    super.addSymbol(SchemaSymbols.ATTVAL_PROHIBITED);
-    super.addSymbol(SchemaSymbols.ATTVAL_QNAME);
-    super.addSymbol(SchemaSymbols.ATTVAL_QUALIFIED);
-    super.addSymbol(SchemaSymbols.ATTVAL_REPLACE);
-    super.addSymbol(SchemaSymbols.ATTVAL_REQUIRED);
-    super.addSymbol(SchemaSymbols.ATTVAL_RESTRICTION);
-    super.addSymbol(SchemaSymbols.ATTVAL_SHORT);
-    super.addSymbol(SchemaSymbols.ATTVAL_SKIP);
-    super.addSymbol(SchemaSymbols.ATTVAL_STRICT);
-    super.addSymbol(SchemaSymbols.ATTVAL_STRING);
-    super.addSymbol(SchemaSymbols.ATTVAL_SUBSTITUTION);
-    super.addSymbol(SchemaSymbols.ATTVAL_TIME);
-    super.addSymbol(SchemaSymbols.ATTVAL_TOKEN);
-    super.addSymbol(SchemaSymbols.ATTVAL_TRUE);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNBOUNDED);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNION);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNQUALIFIED);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDBYTE);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDINT);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDLONG);
-    super.addSymbol(SchemaSymbols.ATTVAL_UNSIGNEDSHORT);
-    super.addSymbol(SchemaSymbols.ATTVAL_YEAR);
-    super.addSymbol(SchemaSymbols.ATTVAL_YEARMONTH);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/ValidateErrorHandler.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/ValidateErrorHandler.java
deleted file mode 100644
index 33a73fa..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/ValidateErrorHandler.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLErrorHandler;
-import org.apache.xerces.xni.parser.XMLParseException;
-
-/**
- * An implementation of XMLErrorHandler that captures error from Xerces.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class ValidateErrorHandler implements XMLErrorHandler
-{
-  ArrayList errorList = new ArrayList();
-
-  /**
-   * Get the error messages created by Xerces.
-   * 
-   * @return The errors list.
-   */
-  public List getErrorMessages()
-  {
-    return errorList;
-  }
-
-  /**
-   * @see org.apache.xerces.xni.parser.XMLErrorHandler#error(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
-   */
-  public void error(String arg0, String arg1, XMLParseException exception) throws XNIException
-  {
-    errorList.add("Error: " + exception.getMessage());
-  }
-
-  /**
-   * @see org.apache.xerces.xni.parser.XMLErrorHandler#fatalError(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
-   */
-  public void fatalError(String arg0, String arg1, XMLParseException exception) throws XNIException
-  {
-    errorList.add("Fatal error: " + exception.getMessage());
-  }
-
-  /**
-   * @see org.apache.xerces.xni.parser.XMLErrorHandler#warning(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
-   */
-  public void warning(String arg0, String arg1, XMLParseException exception) throws XNIException
-  {
-    errorList.add("Warning: " + exception.getMessage());
-  }
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalog.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalog.java
deleted file mode 100644
index e4afb55..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalog.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-/**
- * XMLCatalog
- * This class can be used to register, obtain and delete an instance of an 
- * XML catalog. Method definitions are provided for the catalog to set
- * a location in the catalog and resolve an entity from the catalog.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public abstract class XMLCatalog
-{
-  private static XMLCatalog instance = null;
-  private static Class xmlcatalogclass = null;
-
-  /**
-   * Return an instance of the XML catalog. If no instance is registered,
-   * returns a default instance.
-   * 
-   * @return the instance of the XML catalog
-   */
-  public static XMLCatalog getInstance()
-  {
-    if (instance == null)
-    {
-      if (xmlcatalogclass != null)
-      {
-        try
-        {
-          instance = (XMLCatalog)xmlcatalogclass.newInstance();
-        }
-        catch (Exception e)
-        {
-          instance = new XMLCatalogImpl();
-        }
-      }
-      else
-      {
-        instance = new XMLCatalogImpl();
-      }
-    }
-    return instance;
-  }
-
-  /**
-   * Set the class of the XML catalog to be used.
-   * 
-   * @param xmlcatalog - the class of the XML catalog to be used
-   */
-  public static void setXMLCatalog(Class xmlcatalog)
-  {
-    xmlcatalogclass = xmlcatalog;
-  }
-
-  /**
-   * Resets the instance of the XML catalog to null. Allows switching XML catalogs.
-   */
-  public static void reset()
-  {
-    instance = null;
-    xmlcatalogclass = null;
-  }
-
-  /**
-   * Add a public id and a location to the catalog.
-   * 
-   * @param publicId - the public id of the entry
-   * @param systemId - the system id of the entry
-   */
-  public abstract void addEntryToCatalog(String publicId, String systemId);
-
-  /**
-   * Resolve the location of an entity given public and system ids.
-   * 
-   * @param publicId - the public id of the entity to be resolved
-   * @param systemId - the system id of the entity to be resolved
-   * @return the location of the entity
-   */
-  public abstract String resolveEntityLocation(String publicId, String systemId);
-}
\ No newline at end of file

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogImpl.java
deleted file mode 100644
index f7c40e7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogImpl.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * The default implementation of the XML Catalog.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class XMLCatalogImpl extends XMLCatalog
-{
-  protected Map catalog = new Hashtable();
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.xmlconformance.XMLCatalog#addEntryToCatalog(java.lang.String, java.lang.String)
-   */
-  public void addEntryToCatalog(String publicId, String systemId)
-  {
-    catalog.put(publicId, systemId);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.xmlconformance.XMLCatalog#resolveEntityLocation(java.lang.String, java.lang.String)
-   */
-  public String resolveEntityLocation(String publicId, String systemId)
-  {
-  	// if there's no system id use the public id
-    if (systemId == null || systemId.equals(""))
-    {
-      systemId = publicId;
-    }
-    return (String)catalog.get(systemId);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogResolver.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogResolver.java
deleted file mode 100644
index 33efdc2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogResolver.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-/**
- * A resolver to resolve entities from the XML catalog.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class XMLCatalogResolver implements XMLEntityResolver
-{
-  protected static XMLCatalogResolver xmlCatalog;
-
-  /**
-   * Constructor.
-   */
-  protected XMLCatalogResolver()
-  {
-  }
-
-  /**
-   * Get the instance of this resolver.
-   * 
-   * @return the instance of this resolver
-   */
-  public static XMLCatalogResolver getInstance()
-  {
-    if (xmlCatalog == null)
-    {
-      xmlCatalog = new XMLCatalogResolver();
-    }
-    return xmlCatalog;
-  }
-
-  /**
-   * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) throws XNIException, IOException
-  {
-    String publicId = resourceIdentifier.getPublicId();
-    String systemId = resourceIdentifier.getExpandedSystemId();
-    String location = XMLCatalog.getInstance().resolveEntityLocation(publicId, systemId);
-    if (location == null)
-    {
-      XMLInputSource inputSource = new XMLInputSource(publicId, systemId, systemId, new StringReader(location), null);
-      return inputSource;
-    }
-    // otherwise return null to tell the parser to locate the systemId as a URI
-    return null;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLEntityResolverChain.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLEntityResolverChain.java
deleted file mode 100644
index f71f803..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLEntityResolverChain.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-/**
- * Handle a chain of entity resolvers.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class XMLEntityResolverChain implements XMLEntityResolver
-{
-  private List entityResolvers = new Vector();
-  
-  /**
-   * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-   */
-  public XMLInputSource resolveEntity(XMLResourceIdentifier xmlResourceIdentifier) throws XNIException, IOException
-  {
-    XMLInputSource is = null;
-    Iterator entityResolverIter = entityResolvers.iterator();
-    while (entityResolverIter.hasNext())
-    {
-      XMLEntityResolver entityResolver = (XMLEntityResolver)entityResolverIter.next();
-      try
-      {
-        is = entityResolver.resolveEntity(xmlResourceIdentifier);
-      }
-      catch (XNIException e)
-      {
-      }
-      catch (IOException e)
-      {
-      }
-      if (is != null)
-      {
-        break;
-      }
-    }
-    // Throw and IOException if the file isn't found
-    if (is == null)
-    {
-      throw new IOException("Unable to locate file");
-    }
-    return is;
-  }
-
-  /**
-   * Add an entity resolver to this chain.
-   * 
-   * @param entityResolver The resolver to add to the chain.
-   */
-  public void addEntityResolver(XMLEntityResolver entityResolver)
-  {
-    entityResolvers.add(entityResolver);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XSDValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XSDValidator.java
deleted file mode 100644
index bad3c71..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XSDValidator.java
+++ /dev/null

@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.wsdl.xsd;
-
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.parsers.XMLGrammarPreparser;
-import org.apache.xerces.util.XMLGrammarPoolImpl;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.grammars.XSGrammar;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.apache.xerces.xs.XSModel;
-
-
-/**
- * Validate schemas from files or String.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- */
-public class XSDValidator
-{
-  private XSModel xsModel;
-  private boolean isValidXSD;
-  private List errors;
-  private String filelocation;
-
-  /**
-   * Constructor.
-   */
-  public XSDValidator()
-  {
-    xsModel = null;
-    isValidXSD = false;
-    errors = new ArrayList();
-  }
-  /**
-   * Validate an inline schema.
-   * 
-   * @param schema A schema represented as a string.
-   * @param targetNamespace The target namespace of the schema.
-   * @param fileloc The uri of the file that contains the schema.
-   */
-  public void validateInlineSchema(String schema, String targetNamespace, String fileloc)
-  {
-    validateInlineSchema(schema, targetNamespace, fileloc, null, null);
-  }
-
-  /**
-   * Validate an inline schema and specify an entity resolver.
-   * 
-   * @param schema This schema represented as a string.
-   * @param targetNamespace The target namespace of the schema.
-   * @param fileloc The uri of the file that contains this schema.
-   * @param entityResolverChain The entity resolver chain.
-   * @param inlineSchemaEntityResolver An inline schema resolver for this schema.
-   */
-  public void validateInlineSchema(
-    String schema,
-    String targetNamespace,
-    String fileloc,
-    XMLEntityResolver entityResolverChain,
-    XMLEntityResolver inlineSchemaEntityResolver)
-  {
-    filelocation = fileloc;
-
-    validateXSD(schema, true, entityResolverChain,targetNamespace, inlineSchemaEntityResolver);
-  }
-
-  /**
-   * Validate the file located at the uri specified with the given entity resolver.
-   * 
-   * @param uri An absolute uri for the schema location.
-   * @param entityResolver An entity resolver to be used.
-   */
-  public void validate(String uri, XMLEntityResolver entityResolver)
-  {
-    validateXSD(uri, false, entityResolver, null, null);
-  }
-
-  /**
-   * Validate the schema.
-   * 
-   * @param schema The schema or it's location.
-   * @param inlineXSD True if an inline schema, false otherwise.
-   * @param entityResolver An entity resolver to use.
-   * @param targetNamespace The target namespace of the schema being validated.
-   * @param inlineSchemaEntityResolver An inline schema entity resolver.
-   */
-  protected void validateXSD(String schema, boolean inlineXSD, XMLEntityResolver entityResolver, String targetNamespace, XMLEntityResolver inlineSchemaEntityResolver)
-  {
-    ValidateErrorHandler errorHandler = new ValidateErrorHandler();
-    errorHandler.getErrorMessages().clear();
-    try
-    {
-		XMLGrammarPreparser grammarPreparser = new XMLGrammarPreparser();
-		XMLGrammarPool grammarPool = new XMLGrammarPoolImpl();
-		grammarPreparser.setGrammarPool(grammarPool);
-	 
-      grammarPreparser.setErrorHandler(errorHandler);
-      if (entityResolver != null)
-      {
-		grammarPreparser.setEntityResolver(entityResolver);
-      }
-
-      try
-      {
-		XMLInputSource is = null;
-        // this allows support for the inline schema in WSDL documents
-        if (inlineXSD)
-        {
-        	
-        	Reader reader = new StringReader(schema);
-			is = new XMLInputSource(null,filelocation,filelocation,reader,null);
-			
-			((InlineXSDResolver)inlineSchemaEntityResolver).addReferringSchema(is,targetNamespace);
-
-        }
-        // get the input source for an external schema file
-        else
-        {
-          is = new XMLInputSource(null,schema,schema);
-        }
-        
-        grammarPreparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA,null/*schemaLoader*/);
-        grammarPreparser.getLoader(XMLGrammarDescription.XML_SCHEMA);
-
-		XSGrammar grammar = (XSGrammar)grammarPreparser.preparseGrammar(XMLGrammarDescription.XML_SCHEMA,is);
-		xsModel = grammar.toXSModel();
-      }
-      catch (Exception e)
-      {
-        //parser will return null pointer exception if the document is structurally invalid
-        errors.add("Schema is structurally invalid.");
-      }
-
-      errors.addAll(errorHandler.getErrorMessages());
-    }
-    catch (Exception e)
-    {
-    	System.out.println(e);
-    }
-    if (errors.isEmpty())
-    {
-      isValidXSD = true;
-    }
-  }
-
-  /**
-   * Returns the XSModel created.
-   * 
-   * @return The XSModel created.
-   */
-
-  public XSModel getXSModel()
-  {
-  	return xsModel;
-  }
-  /**
-   * Returns true if the schema is valid, false otherwise.
-   * 
-   * @return True if the schema is valid, false otherwise.
-   */
-  public boolean isValid()
-  {
-    return isValidXSD;
-  }
-
-  /**
-   * Return the error list.
-   * 
-   * @return A list of error from the schema.
-   */
-  public List getErrors()
-  {
-    return errors;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLConvertor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLConvertor.java
deleted file mode 100644
index 82b134c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLConvertor.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- *
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import java.io.FileOutputStream;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-/**
- * This class converts a XML document using an XSL file.
- * 
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class XMLConvertor
-{
-
-  /**
-   * Transforms an XML document using an XSL file.
-   * @param args  arguments for main.
-   */
-  public static void main(String[] args)
-  {
-    try
-    {
-      if (args.length < 3)
-      {
-        System.out.println(
-          "Usage: XMLConvertor <xslFile> <inXMLFile> <outFile>");
-      }
-
-      else
-      {
-        // Get transformer 
-        Transformer transformer =
-          TransformerFactory.newInstance().newTransformer(
-            new StreamSource(args[0]));
-
-        // Transform the XML document using the specificed XSL file
-        transformer.transform(
-          new StreamSource(args[1]),
-          new StreamResult(new FileOutputStream(args[2])));
-
-        // Display results
-        System.out.println(
-          "Created " + args[2] + " from " + args[0] + " and " + args[1] + ".");
-      }
-    }
-
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-
-    System.exit(0);
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCache.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCache.java
deleted file mode 100644
index 4108752..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCache.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class creates a HashMap to cache XML documents.
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class XMLDocumentCache extends HashMap
-{
-	static XMLDocumentCache instance;
-
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3834028043709657401L;
-
-	/**
-   * Constructor for XMLDocumentCache.
-   * @param initialCapacity  the initial capacity.
-   * @param loadFactor       the load factor. 
-   */
-  public XMLDocumentCache(int initialCapacity, float loadFactor)
-  {
-    super(initialCapacity, loadFactor);
-    instance = this;
-  }
-
-  /**
-   * Constructor for XMLDocumentCache.
-   * @param initialCapacity  the initial capacity.
-   */
-  public XMLDocumentCache(int initialCapacity)
-  {
-    super(initialCapacity);
-    instance = this;
-  }
-
-  /**
-   * Constructor for XMLDocumentCache.
-   */
-  public XMLDocumentCache()
-  {
-    super();
-    instance = this;
-  }
-
-  /**
-   * Constructor for XMLDocumentCache.
-   * @param t  the map whose mappings are to be placed in this map.
-   */
-  public XMLDocumentCache(Map t)
-  {
-    super(t);
-    instance = this;
-  }
-
-  public static XMLDocumentCache instance()
-  {
-	  if (instance == null) 
-		  instance = new XMLDocumentCache();
-	  
-	  return instance;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java
deleted file mode 100644
index a50f07e..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import java.net.URL;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.w3c.dom.Document;
-
-/**
- * This is an abstract class that takes advantage of cached XML documents.
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-
-public abstract class XMLDocumentCacheUser
-{
-  /**
-   * Get document from cache.
-   * @see #setDocument
-   *
-   * @param key  a String. 
-   * @return a Document object corresponding to the key.
-   */
-  protected Document getDocument(String key)
-  {
-    return (Document) XMLDocumentCache.instance().get(key);
-  }
-
-  /**
-   * Put document with corresponding key in cache.
-   * @see #getDocument
-   *
-   * @param key       a String used as a key to identify specified document.
-   * @param document  a document.
-   */
-  protected void setDocument(String key, Object document)
-  {
-	  XMLDocumentCache.instance().put(key, document);
-  }
-
-  /**
-   * Get document list.
-   * @return a XMLDocumentCache object representing the document list value.
-   */
-  public XMLDocumentCache getDocumentList()
-  {
-    return XMLDocumentCache.instance();
-  }
-
-  /**
-   * Parse XML document.
-   * @param urlString  a String locating the XML document.
-   * @param baseURI    a base url to assist in locating the XML document.
-   * @return a Document object.
-   * @throws WSIException if document cannot be parsed.
-   */
-  public Document parseXMLDocumentURL(String urlString, String baseURI)
-    throws WSIException
-  {
-    return parseXMLDocumentURL(urlString, baseURI, null);
-  }
-
-  /**
-   * Parse XML document and validate with a schema document.
-   * @param urlString  a String locating the XML document.
-   * @param baseURI    a base url to assist in locating the XML document.
-   * @param schema     a String identifying related schema document.
-   * @return a Document object.
-   * @throws WSIException if document cannot be parsed.
-   */
-  public Document parseXMLDocumentURL(
-    String urlString,
-    String baseURI,
-    String schema)
-    throws WSIException
-  {
-    Document document = null;
-
-    try
-    {
-      // Create URL reference to document
-      URL url = XMLUtils.createURL(urlString, baseURI);
-               
-      // TODO: Add schema to the xml document cache, so that you can detect when it has already 
-      //  been parsed using a specific schema definition 
-
-      // If the document is not in the cache, then read and parse it
-   	  if ((document = getDocument(urlString)) == null)
-      {
-        document = XMLUtils.parseXMLDocumentURL(url, schema);
-        // Add document to cache
-        setDocument(urlString, document);
-      }
-    }
-
-    catch (WSIException e)
-    {
-      throw e;
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIException(e.getMessage(), e);
-    }
-
-    return document;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLTags.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLTags.java
deleted file mode 100644
index e12d04f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLTags.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import javax.xml.namespace.QName;
-
-/**
- * This class contains information on XML tags.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public interface XMLTags
-{
-  /**
-   * Namespaces.
-   */
-  public final static String NS_URI_XSI =
-    "http://www.w3.org/2001/XMLSchema-instance";
-  public final static String NS_URI_XMLNS = "http://www.w3.org/2000/xmlns/";
-  public final static String NS_URI_XSD = "http://www.w3.org/2001/XMLSchema";
-  public final static String XSD_SCHEMALOCATION =
-    "http://www.w3.org/2001/XMLSchema.xsd";
-
-  /**
-   * Qualified names of XSD elements and attributes.
-   */
-  public final static QName ELEM_XSD_ANNOTATION =
-    new QName(NS_URI_XSD, "annotation");
-  public final static QName ELEM_XSD_IMPORT = new QName(NS_URI_XSD, "import");  
-  public final static QName ELEM_XSD_INCLUDE = new QName(NS_URI_XSD, "include");
-  public final static QName ELEM_XSD_SCHEMA = new QName(NS_URI_XSD, "schema");
-  public final static QName ELEM_XSD_ELEMENT = new QName(NS_URI_XSD, "element");
-  public final static QName ELEM_XSD_ATTRIBUTE =
-    new QName(NS_URI_XSD, "attribute");
-  public final static QName ELEM_XSD_COMPLEXTYPE =
-    new QName(NS_URI_XSD, "complexType");
-
-  public final static QName ATTR_XSI_TYPE = new QName(NS_URI_XSI, "type");
-  public final static QName ATTR_XSI_NIL = new QName(NS_URI_XSI, "nil");
-
-  public final static QName ATTR_XSD_NAME = new QName(NS_URI_XSD, "name");
-  public final static QName ATTR_XSD_TYPE = new QName(NS_URI_XSD, "type");
-  public final static QName ATTR_XSD_BASE = new QName(NS_URI_XSD, "base");
-  public final static QName ATTR_XSD_NAMESPACE =
-    new QName(NS_URI_XSD, "namespace");
-  public final static QName ATTR_XSD_SCHEMALOCATION =
-    new QName(NS_URI_XSD, "schemaLocation");
-  public final static QName ATTR_XSD_TARGETNAMESPACE =
-    new QName(NS_URI_XSD, "targetNamespace");
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLTraversal.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLTraversal.java
deleted file mode 100644
index f6233f0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLTraversal.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Entity;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.Notation;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-/**
- * We don't have access to the node source code, so this does
- * our double-dispatch the hard way.
- */
-public abstract class XMLTraversal extends XMLVisitor
-{
-  /**
-     * Returning false from action would terminates traversal.
-     * However, this always returns true. -- a no-op.
-     * @param n - an XML node.
-     * @return always true.
-     */
-  public boolean action(Node n)
-  {
-    return true;
-  }
-
-  public void visit(CDATASection s)
-  {
-    action(s);
-  }
-
-  public void visit(Document e)
-  {
-    if (action(e))
-    {
-      // This does visit DocumentType, which is considered a child Node.
-      for (Node n = e.getFirstChild(); n != null; n = n.getNextSibling())
-      {
-        doVisit(n);
-      }
-    }
-  }
-
-  public void visit(DocumentType type)
-  {
-    if (action(type))
-    {
-      visit(type.getEntities());
-      visit(type.getNotations());
-    }
-  }
-
-  public void visit(Attr e)
-  {
-    action(e);
-  }
-
-  public void visit(Element node)
-  {
-    if (action(node))
-    {
-      visit(node.getAttributes());
-      for (Node n = node.getFirstChild(); n != null; n = n.getNextSibling())
-      {
-        doVisit(n);
-      }
-    }
-  }
-
-  public void visit(Comment e)
-  {
-    action(e);
-  }
-
-  public void visit(Text e)
-  {
-    action(e);
-  }
-
-  public void visit(EntityReference e)
-  {
-    action(e);
-  }
-
-  public void visit(Entity e)
-  {
-    action(e);
-  }
-
-  public void visit(Notation n)
-  {
-    action(n);
-  }
-
-  public void visit(ProcessingInstruction i)
-  {
-    action(i);
-  }
-
-  public void visit(NamedNodeMap map)
-  {
-    if (map != null)
-    {
-      for (int i = 0; i < map.getLength(); ++i)
-      {
-        doVisit(map.item(i));
-      }
-    }
-  }
-}
-
-// END OF FILE

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java
deleted file mode 100644
index 137833d..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java
+++ /dev/null

@@ -1,1528 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.WSITag;
-import org.eclipse.wst.wsi.internal.core.util.NullUtil;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-
-import com.ibm.wsdl.util.StringUtils;
-
-/**
- * Set of XML related utilities.
- * 
- * @version 1.0.1
- * @author Peter Brittenham
- */
-public final class XMLUtils
-{
-	/**
-	 * Some sax features that need to be set.
-	 */
-	public static final String FEATURE_NAMESPACE_PREFIXES = "http://xml.org/sax/features/namespace-prefixes";
-	public static final String FEATURE_NAMESPACES = "http://xml.org/sax/features/namespaces";
-	public static final String FEATURE_VALIDATION_SCHEMA = "http://apache.org/xml/features/validation/schema";
-	public static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
-	public static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
-	public static final String W3C_SOAP_12_SCHEMA = "http://schemas.xmlsoap.org/soap/envelope/";
-	public static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
-	public static final String PROPERTY_EXTERNAL_SCHEMA_LOCATION = "http://apache.org/xml/properties/schema/external-schemaLocation";
-
-	public static final String SOAP_ELEM_ENVELOPE = "Envelope";
-	public static final String SOAP_ELEM_HEADER = "Header";
-	public static final String SOAP_ELEM_BODY = "Body";
-	public static final String SOAP_ELEM_FAULT = "Fault";
-	public static final String SOAP_ELEM_FAULT_CODE = "faultcode";
-	public static final String SOAP_ELEM_FAULT_STRING = "faultstring";
-	public static final String SOAP_ELEM_FAULT_DETAIL = "detail";
-	public static final String SOAP_ELEM_FAULT_ACTOR = "faultactor";
-	public static final String SOAP_ATTR_MUST_UNDERSTAND = "mustUnderstand";
-	public static final String SOAP_ATTR_ACTOR = "actor";
-
-	/**
-	 * Get XMLReader.
-	 * 
-	 * @return the XMLReader value
-	 * @throws WSIException if there are problems getting the XMLReader
-	 *           implementation.
-	 */
-	public static XMLReader getXMLReader() throws WSIException {
-		XMLReader xmlReader = null;
-
-		try
-		{
-			xmlReader = (new org.apache.xerces.jaxp.SAXParserFactoryImpl())
-					.newSAXParser().getXMLReader();
-
-			// Set namespace aware
-			xmlReader.setFeature(FEATURE_NAMESPACE_PREFIXES, true);
-			xmlReader.setFeature(FEATURE_NAMESPACES, true);
-		}
-
-		catch (Exception e)
-		{
-			throw new WSIException("Could not get XMLReader implementation.", e);
-		}
-
-		return xmlReader;
-	}
-
-	/**
-	 * Parse text string as an XML document and return the document element.
-	 * 
-	 * @param text XML document text.
-	 * @param validate true if the document will be validate, false otherwise
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(String text, boolean validate)
-			throws WSIException {
-		return parseXML(new StringReader(text), validate);
-	}
-
-	/**
-	 * Parse text string as an XML document and return the document element.
-	 * 
-	 * @param text XML document text.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(String text) throws WSIException {
-		return parseXML(new StringReader(text));
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param uri the location of the XML document.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 * @throws IOException if an I/O exception of some sort has occurred.
-	 */
-	public static Document parseXMLDocument(String uri) 
-	throws WSIException, IOException 
-	{
-		return parseXMLDocument(uri, null);
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param uri the location of the XML document.
-	 * @param schema a String identifying related schema document.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 * @throws IOException if an I/O exception of some sort has occurred.
-	 */
-	public static Document parseXMLDocument(String uri, String schema)
-	throws WSIException, IOException 
-	{
-	      URL url = StringUtils.getURL(null, uri);
-	      InputStream inputStream = (InputStream)url.getContent();
-	      InputSource inputSource = new InputSource(inputStream);
-	      inputSource.setSystemId(url.toString());
-	      
-	      if (schema == null)
-	      	return parseXML(inputSource, false);
-	      else
-            return parseXML(inputSource, schema);
-	}
-
-	/**
-	 * Parses an XML document from a reader and returns the document object.
-	 * 
-	 * @param url a String locating the XML document.
-	 * @param schema a String identifying related schema document.
-	 * @param baseURI a base url to assist in locating the XML document.
-	 * @return Document.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXMLDocumentURL(String url, String schema,
-			String baseURI) throws WSIException {
-		try
-		{
-		  parseXMLDocumentURL(createURL(url, baseURI), schema);
-		}
-
-		catch (Exception e)
-		{
-			throw new WSIException(e.getMessage(), e);
-		}
-
-		return parseXMLDocumentURL(url, schema);
-	}
-
-	/**
-	 * Parses an XML document from a reader and returns the document object.
-	 * 
-	 * @param url a URL object identifying the XML document.
-	 * @param schema a String identifying related schema document.
-	 * @return Document.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXMLDocumentURL(URL url, String schema)
-			throws WSIException {
-		try
-		{
-	      InputStream inputStream = (InputStream)url.getContent();
-	      InputSource inputSource = new InputSource(inputStream);
-	      inputSource.setSystemId(url.toString());
-
-			Document doc = null;
-
-			if (schema == null)
-				doc = parseXML(inputSource);
-			else
-				doc = parseXML(inputSource, schema);
-
-			inputStream.close();
-			return doc;
-		}
-
-		catch (WSIException e)
-		{
-			throw e;
-		}
-
-		catch (Throwable t)
-		{
-			throw new WSIException(t.getMessage());
-		}
-	}
-
-	/**
-	 * Parses an XML document from a reader and returns the document object.
-	 * 
-	 * @param urlString a String locating the XML document.
-	 * @param baseURI a base url to assist in locating the XML document.
-	 * @return Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXMLDocumentURL(String urlString, String baseURI)
-			throws WSIException {
-		Document document = null;
-
-		try
-		{
-			URL url = createURL(urlString, baseURI);
-
-			document = parseXMLDocumentURL(url);
-		}
-
-		catch (WSIException we)
-		{
-			throw we;
-		}
-
-		catch (Exception e)
-		{
-			throw new WSIException(e.getMessage(), e);
-		}
-
-		return document;
-	}
-
-	/**
-	 * Parses an XML document from a reader and returns the document object.
-	 * 
-	 * @param url a URL object identifying the XML document.
-	 * @return Document.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXMLDocumentURL(URL url) throws WSIException {
-		Document document = null;
-
-		try
-		{
-			Reader reader = new InputStreamReader(url.openStream());
-			InputSource source = new InputSource(reader);
-			source.setSystemId(url.toString());
-			document = parseXML(source);
-
-			reader.close();
-		}
-
-		catch (Exception e)
-		{
-			throw new WSIException(e.getMessage(), e);
-		}
-
-		return document;
-	}
-
-	/**
-	 * Parse an XML document from a reader and return the document object.
-	 * 
-	 * @param reader a Reader object.
-	 * @param validate true if the document will be validate, false otherwise
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(InputSource source, boolean validate)
-			throws WSIException {
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-    	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-
-  		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  // ADD: This should be set to true when we have access to the schema
-		  // document
-		  factory.setValidating(false);
-
- 		  // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  doc = builder.parse(source);
-		  // workaround for compatibility Xerces 2.2.1 with Xerces 2.6.2,
-		  // Xerces 2.6.2 supported XML 1.1 but WSI-tool and Xerces 2.2.1
-		  // supported only XML 1.0
-		  if (doc instanceof org.apache.xerces.dom.DocumentImpl)
-		  {
-			if (((org.apache.xerces.dom.DocumentImpl) doc).getXmlVersion().equals(
-						"1.1"))
-			{
-				throw new WSIException("Fatal Error: XML version &quot;1.1&quot; "
-						+ "is not supported, only XML 1.0 is supported.");
-			}
-		  }
-		}
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-
-		// Return document
-		return doc;
-	}
-
-	/**
-	 * Parse an XML document from a reader and return the document object.
-	 * 
-	 * @param reader a Reader object.
-	 * @param validate true if the document will be validate, false otherwise
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(Reader reader, boolean validate)
-			throws WSIException {
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-		  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-		
-		  // Create input source
-		  InputSource inputSource = new InputSource(reader);
-
-		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  // ADD: This should be set to true when we have access to the schema
-		  // document
-		  factory.setValidating(false);
-
-		  // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  doc = builder.parse(inputSource);
-	   	  // workaround for compatibility Xerces 2.2.1 with Xerces 2.6.2,
-		  // Xerces 2.6.2 supported XML 1.1 but WSI-tool and Xerces 2.2.1
-		  // supported only XML 1.0
-		  if (doc instanceof org.apache.xerces.dom.DocumentImpl)
-		  {
-			if (((org.apache.xerces.dom.DocumentImpl) doc).getXmlVersion().equals(
-						"1.1"))
-			{
-			  throw new WSIException("Fatal Error: XML version &quot;1.1&quot; "
-							+ "is not supported, only XML 1.0 is supported.");
-			}
-	      }
-		}
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-
-		// Return document
-		return doc;
-	}
-
-	/**
-	 * Parse an XML document from a input source and return the document object.
-	 * 
-	 * @param source a InputSource object.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(Reader reader) throws WSIException {
-		return parseXML(reader, false);
-	}
-
-	/**
-	 * Parse an XML document from a input source and return the document object.
-	 * 
-	 * @param source a InputSource object.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(InputSource source) throws WSIException {
-		return parseXML(source, false);
-	}
-
-	/**
-	 * Parse text string as an XML document and return the document element.
-	 * 
-	 * @param text XML document text.
-	 * @param schema a String identifying related schema document.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(String text, String schema)
-			throws WSIException {
-		return parseXML(new StringReader(text), schema);
-	}
-
-	/**
-	 * Parse text string as an XML document and return the document element.
-	 * 
-	 * @param text XML document text.
-	 * @param schemas a collection of related schema documents.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(String text, Collection schemas)
-			throws WSIException {
-		return parseXML(new StringReader(text), schemas);
-	}
-
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param text XML document text.
-	 * @param schemaString a StringReader object.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 * @throws IOException if an I/O exception of some sort has occurred.
-	 */
-	public static Document parseXML(String text, StringReader schemaString)
-			throws WSIException, IOException {
-		return parseXML(new StringReader(text), schemaString);
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param reader a Reader object.
-	 * @param schema a String identifying related schema document.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(Reader reader, String schema)
-			throws WSIException {
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-    	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-		  // Create input source
-		  InputSource inputSource = new InputSource(reader);
-
-		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  try
-		  {
-		    factory.setValidating(false);
-			factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
- 		  }
-   		  catch (IllegalArgumentException e)
-		  {
-			String errMessage = "Error: JAXP DocumentBuilderFactory attribute not recognized: "
-					+ JAXP_SCHEMA_LANGUAGE
-					+ "\n"
-					+ "Check to see if parser conforms to JAXP 1.2 spec.";
-			throw new WSIException(errMessage, e);
-		  }
-		  factory.setAttribute(JAXP_SCHEMA_SOURCE, new InputSource(schema));
-
-		  // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  builder.setErrorHandler(new ErrHandler());
-		  doc = builder.parse(inputSource);
-
-		  // workaround for compatibility Xerces 2.2.1 with Xerces 2.6.2,
-		  // Xerces 2.6.2 supported XML 1.1 but WSI-tool and Xerces 2.2.1
-		  // supported only XML 1.0
-		  if (doc instanceof org.apache.xerces.dom.DocumentImpl)
-		  {
-			if (((org.apache.xerces.dom.DocumentImpl) doc).getXmlVersion().equals("1.1"))
-			{
-		 	  throw new WSIException("Fatal Error: XML version &quot;1.1&quot; "
-							+ "is not supported, only XML 1.0 is supported.");
-			}
-		  }
-	    }
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-		// Return document
-    	return doc;
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param reader a Reader object.
-	 * @param schema a String identifying related schema document.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(InputSource source, String schema)
-			throws WSIException {
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-    	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
- 		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  factory.setValidating(false);
-		  try
-		  {
-			factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
-		  }
-
-		  catch (IllegalArgumentException e)
-		  {
-			String errMessage = "Error: JAXP DocumentBuilderFactory attribute not recognized: "
-					+ JAXP_SCHEMA_LANGUAGE
-					+ "\n"
-					+ "Check to see if parser conforms to JAXP 1.2 spec.";
-			throw new WSIException(errMessage, e);
-		  }
-		  factory.setAttribute(JAXP_SCHEMA_SOURCE, new InputSource(schema));
-
-          // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  builder.setErrorHandler(new ErrHandler());
-		  doc = builder.parse(source);
-
-		  // workaround for compatibility Xerces 2.2.1 with Xerces 2.6.2,
-		  // Xerces 2.6.2 supported XML 1.1 but WSI-tool and Xerces 2.2.1
-		  // supported only XML 1.0
-		  if (doc instanceof org.apache.xerces.dom.DocumentImpl)
-		  {
-			if (((org.apache.xerces.dom.DocumentImpl) doc).getXmlVersion().equals(
-						"1.1"))
-			{
-				throw new WSIException("Fatal Error: XML version &quot;1.1&quot; "
-						+ "is not supported, only XML 1.0 is supported.");
-			}
-		  }
-		}
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-
-		// Return document
-		return doc;
-
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param filename a Reader object.
-	 * @param schemaString a StringReader object.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(Reader filename, StringReader schemaString)
-			throws WSIException {
-
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-    	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-
-		  // Create input source
-		  InputSource inputSource = new InputSource(filename);
-
-		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  factory.setValidating(false);
-		  try
-		  {
-			factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
-		  } catch (IllegalArgumentException e)
-		  {
-			String errMessage = "Error: JAXP DocumentBuilderFactory attribute not recognized: "
-					+ JAXP_SCHEMA_LANGUAGE
-					+ "\n"
-					+ "Check to see if parser conforms to JAXP 1.2 spec.";
-			throw new WSIException(errMessage, e);
-		  }
-		  factory.setAttribute(JAXP_SCHEMA_SOURCE, new InputSource(schemaString));
-
-		  // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  builder.setErrorHandler(new ErrHandler());
-		  doc = builder.parse(inputSource);
-		}
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-
-		// Return document
-		return doc;
-
-	}
-
-	/**
-	 * Parse the XML document and return the document element.
-	 * 
-	 * @param filename a Reader object
-	 * @param schemaStrings a collection of related schema documents.
-	 * @return a Document object.
-	 * @throws WSIException if there is a problem parsing the XML document.
-	 */
-	public static Document parseXML(Reader filename, Collection schemaStrings)
-			throws WSIException {
-
-		Document doc = null;
-		ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-		try
-		{
-    	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-
-		  // Create input source
-		  InputSource inputSource = new InputSource(filename);
-
-		  // Get the document factory
-		  DocumentBuilderFactory factory = new org.eclipse.wst.wsi.internal.core.xml.jaxp.DocumentBuilderFactoryImpl();
-
-		  // Set namespace aware, but for now do not validate
-		  factory.setNamespaceAware(true);
-		  factory.setIgnoringElementContentWhitespace(true);
-
-		  factory.setValidating(false);
-		  try
-		  {
-			factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
-		  } catch (IllegalArgumentException e)
-		  {
-		    String errMessage = "Error: JAXP DocumentBuilderFactory attribute not recognized: "
-					+ JAXP_SCHEMA_LANGUAGE
-					+ "\n"
-					+ "Check to see if parser conforms to JAXP 1.2 spec.";
-			throw new WSIException(errMessage, e);
-		  }
-		  // convert schema strings to array of InputSources
-		  Iterator i = schemaStrings.iterator();
-		  Vector readers = new Vector();
-		  while (i.hasNext())
-		  {
-			String nextSchema = (String) i.next();
-			readers.add(new InputSource(new StringReader(nextSchema)));
-		  }
-		  InputSource[] inputSources = (InputSource[]) readers
-				.toArray(new InputSource[]{});
-		  // pass an array of schema strings (each of which contains a schema)
-		  factory.setAttribute(JAXP_SCHEMA_SOURCE, inputSources);
-
-		  // Parse the document
-		  DocumentBuilder builder = factory.newDocumentBuilder();
-		  builder.setErrorHandler(new ErrHandler());
-		  doc = builder.parse(inputSource);
-		}
-		catch (Exception e)
-		{
-			throw new WSIException("Could not parse XML document.", e);
-		}
-	    finally
-	    { 
-	      Thread.currentThread().setContextClassLoader(currentLoader);
-	    }    
-
-		// Return document
-		return doc;
-
-	}
-
-	/**
-	 * Get attribute value with the given name defined for the specified element.
-	 * 
-	 * @param element an Element object.
-	 * @param attrName a name of an attribute
-	 * @return the attribute value.
-	 */
-	public static String getAttributeValue(Element element, String attrName) {
-		String attrValue = null;
-		Attr attr = null;
-
-		// Get the attribute using its name
-		if ((attr = element.getAttributeNode(attrName)) != null)
-		{
-			attrValue = attr.getValue().trim();
-		}
-
-		// Return attribute value
-		return attrValue;
-	}
-
-	/**
-	 * Get attribute value.
-	 * 
-	 * @param element an Element object.
-	 * @param attrName a name of an attribute
-	 * @param defaultValue a default value for the specified attribute.
-	 * @return the attribute value if found. Otherwise the specified default
-	 *         value.
-	 */
-	public static String getAttributeValue(Element element, String attrName,
-			String defaultValue) {
-		String returnValue = defaultValue;
-		String attrValue = null;
-
-		if ((attrValue = getAttributeValue(element, attrName)) != null)
-			returnValue = attrValue;
-
-		return returnValue;
-	}
-
-	/**
-	 * Get attribute value.
-	 * 
-	 * @param element an Element object.
-	 * @param namespace a namespace.
-	 * @param attrName a name of an attribute
-	 * @return the attribute value.
-	 */
-	public static String getAttributeValueNS(Element element, String namespace,
-			String attrName) {
-		String attrValue = null;
-		Attr attr = null;
-
-		// Get the attribute using its name
-		if ((attr = element.getAttributeNodeNS(namespace, attrName)) != null)
-		{
-			attrValue = attr.getValue().trim();
-		}
-
-		// Return attribute value
-		return attrValue;
-	}
-
-	/**
-	 * Get the first child element from the input elment.
-	 * 
-	 * @param element an Element object.
-	 * @return the firstchild element.
-	 */
-	public static Element getFirstChild(Element element) {
-		// Return the first child element
-		return findNextSibling(element.getFirstChild());
-	}
-
-	/**
-	 * Get the next sibling element.
-	 * 
-	 * @param element - an Element object.
-	 * @return the next sibling element.
-	 */
-	public static Element getNextSibling(Element element) {
-		// Return next sibling element
-		return findNextSibling(element.getNextSibling());
-	}
-
-	/**
-	 * Find the next sibling element.
-	 * 
-	 * @param startNode XML start node.
-	 * @return the next sibling element.
-	 */
-	protected static Element findNextSibling(Node startNode) {
-		Node node = null;
-		Element returnElement = null;
-
-		// Find the next sibling element
-		for (node = startNode; node != null && returnElement == null; node = node
-				.getNextSibling())
-		{
-			// If this node is an element node, then return it
-			if (node.getNodeType() == Node.ELEMENT_NODE)
-			{
-				returnElement = (Element) node;
-			}
-		}
-
-		// Return next sibling element
-		return (Element) returnElement;
-	}
-
-	/**
-	 * Find the previous sibling element.
-	 * 
-	 * @param startNode XML start node.
-	 * @return the previous sibling element.
-	 */
-	public static Element findPreviousSibling(Node startNode) {
-		if (startNode == null)
-			return null;
-
-		while (startNode != null)
-		{
-			startNode = startNode.getPreviousSibling();
-			if (startNode == null)
-				return null;
-			if (startNode.getNodeType() == Node.ELEMENT_NODE)
-				return (Element) startNode;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the text that is associated with this element.
-	 * 
-	 * @param element an Element object.
-	 * @return the text that is associated with this element.
-	 */
-	public static String getText(Element element) {
-		String text = null;
-
-		// Get first child element
-		Node node = element.getFirstChild();
-
-		// NodeList nodeList = element.getChildNodes();
-
-		// int length = nodeList.getLength();
-
-		// Process while there are nodes and the text hasn't been found
-		while ((node != null) && (text == null))
-		{
-			// If a text node or cdata section is found, then get text
-			if ((node.getNodeType() == Node.TEXT_NODE)
-					|| (node.getNodeType() == Node.CDATA_SECTION_NODE))
-			{
-				text = ((CharacterData) node).getData();
-			}
-
-			// Get next sibling
-			node = node.getNextSibling();
-		}
-
-		if (text != null)
-			text = text.trim();
-
-		return text;
-	}
-
-	/**
-	 * Determine if an element is represented by the QName.
-	 * 
-	 * @param qname a QName object.
-	 * @param element an Element object.
-	 * @return true if an element is represented by the QName.
-	 */
-	public static boolean equals(QName qname, Element element) {
-		boolean equals = false;
-
-		// If both the namespace URI and local name are the same, then they are
-		// equal
-		if ((qname.getNamespaceURI().equals(element.getNamespaceURI()))
-				&& (qname.getLocalPart().equals(element.getLocalName())))
-		{
-			equals = true;
-		}
-
-		return equals;
-	}
-
-	/**
-	 * XML encode a text string.
-	 * 
-	 * @param text - a String.
-	 * @return an XML encoded text string.
-	 */
-	public static String xmlEscapedString(String text) 
-	{
-	  if (text == null) return text;
-	  else
-	  {
-	    StringBuffer sb = new StringBuffer(text.length()*2);
-	    int size = text.length();
-	    for (int i=0; i<size; i++)
-	    {
-	      char c = text.charAt(i);
-	      switch (c)
-		  {
-             case '<': 
-               sb.append("&lt;");
-               break;
-             case '>': 
-             	sb.append("&gt;");
-                break;
-             case '&': 
-             	sb.append("&amp;");
-                break;
-             case '"': 
-             	sb.append("&quot;");
-                break;
-             case '\'': 
-             	sb.append("&apos;");
-                break;
-             case '\r': 
-             	sb.append("&#xd;");
-                break;
-             default:
-             	sb.append(c);
-		  }
-		}
-	    return  sb.toString();
-	  }
-	}
-
-	/**
-	 * XML encode a text string.
-	 * 
-	 * @param text - a String.
-	 * @return an XML encoded text string.
-	 */
-	public static String xmlRemoveEscapedString(String text) 
-	{
-	  if (text == null) return text;
-	  else
-	  {
-        StringBuffer sb = new StringBuffer(text);
-      
-	    int i = sb.indexOf("&#xd;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+5, "\r");
-	      i = sb.indexOf("&#xd;");
-	    }
-	    
-	    i = sb.indexOf("&lt;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+4, "<");
-	      i = sb.indexOf("&lt;");
-	    }
-
-	    i = sb.indexOf("&gt;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+4, ">");
-	      i = sb.indexOf("&gt;");
-	    }
-
-	    i = sb.indexOf("&quot;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+6, "\"");
-	      i = sb.indexOf("&quot;");
-	    }
-
-	    i = sb.indexOf("&apos;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+6, "\'");
-	      i = sb.indexOf("&apos;");
-	    }
-
-	    i = sb.indexOf("&amp;");
-	    while(i != -1)
-	    {
-	      sb.replace(i, i+5, "&");
-	      i = sb.indexOf("&amp;");
-	    }
- 	    return  sb.toString();
-	  }
-	}
-	/**
-	 * Get the specified element from a parent element.
-	 * 
-	 * @param elementName the element tag to serach for.
-	 * @param parentElement the parent element.
-	 * @return an element given the name and the parent element.
-	 */
-	public static Element getElement(String elementName, Element parentElement) {
-		Element returnElement = null;
-		NodeList nl;
-
-		// Get the list of elements
-		if ((nl = parentElement.getElementsByTagName(elementName)) != null)
-		{
-			// Return first element found
-			returnElement = (Element) nl.item(0);
-		}
-
-		// Return element
-		return returnElement;
-	}
-
-	/**
-	 * Determine if this element matches specified local name in the specified
-	 * namespace.
-	 * 
-	 * @param element an Element object.
-	 * @param namespaceURI a namespace.
-	 * @param localName a local name.
-	 * @return true if this element matches specified local name in the specified
-	 *         namespace.
-	 */
-	public static boolean isElement(Element element, String namespaceURI,
-			String localName) {
-		boolean isElement = false;
-
-		if (element != null)
-		{
-			// Check is
-			if (element.getNamespaceURI().equals(namespaceURI)
-					&& element.getLocalName().equals(localName))
-			{
-				isElement = true;
-			}
-		}
-
-		return isElement;
-	}
-
-	/**
-	 * Determine if this element matches specified local name in the specified
-	 * namespace.
-	 * 
-	 * @param element an Element object.
-	 * @param namespaceURIs a list of valid namespaces.
-	 * @param localName a local name.
-	 * @return true if this element matches specified local name in the specified
-	 *         namespace.
-	 */
-	public static boolean isElement(Element element, List namespaceURIs,
-			String localName) {
-		boolean isElement = false;
-
-		if (element != null)
-		{
-			// Check is
-			if (namespaceURIs.contains(element.getNamespaceURI())
-					&& element.getLocalName().equals(localName))
-			{
-				isElement = true;
-			}
-		}
-
-		return isElement;
-	}
-
-	/**
-	 * Get element text as a boolean.
-	 * 
-	 * @param element an Element object.
-	 * @param defaultValue a boolean to be used as a default value.
-	 * @return element text as a boolean value.
-	 */
-	public static boolean getBooleanValue(Element element, boolean defaultValue) {
-		boolean returnValue = defaultValue;
-		String booleanValue = null;
-
-		// Get value as a string
-		if ((booleanValue = XMLUtils.getText(element)) != null)
-		{
-			returnValue = Boolean.valueOf(booleanValue).booleanValue();
-		}
-
-		// Return boolean
-		return returnValue;
-	}
-
-	/**
-	 * Get attribute value as a boolean.
-	 * 
-	 * @param element an Element object.
-	 * @param attrName a name of an attribute.
-	 * @param defaultValue a boolean to be used as a default value.
-	 * @return attribute value as a boolean.
-	 */
-	public static boolean getBooleanValue(Element element, String attrName,
-			boolean defaultValue) {
-		boolean returnValue = defaultValue;
-		String booleanValue = null;
-
-		// Get value as a string
-		if ((booleanValue = XMLUtils.getAttributeValue(element, attrName)) != null)
-		{
-			returnValue = Boolean.valueOf(booleanValue).booleanValue();
-		}
-
-		// Return boolean
-		return returnValue;
-	}
-
-	/**
-	 * Create QName.
-	 * 
-	 * @param qnameString a qualified name.
-	 * @return a QName object.
-	 */
-	public static QName createQName(String qnameString) {
-		QName qname = null;
-
-		// Locate local part
-		int index = qnameString.lastIndexOf(":");
-
-		// Create new QName
-		if (index != -1)
-		{
-			qname = new QName(qnameString.substring(0, index), qnameString
-					.substring(index + 1));
-		}
-
-		else
-		{
-			qname = new QName(qnameString);
-		}
-
-		return qname;
-	}
-
-	/**
-	 * Error Handler
-	 */
-	private static class ErrHandler implements ErrorHandler
-	{
-		/**
-		 * Warning
-		 */
-		public void warning(SAXParseException spe) throws SAXException {
-			String message = "Warning: " + spe.getMessage();
-			throw new SAXException(message);
-		}
-
-		/**
-		 * Error
-		 */
-		public void error(SAXParseException spe) throws SAXException {
-			String message = "Error: " + spe.getMessage();
-			throw new SAXException(message);
-		}
-
-		/**
-		 * Fatal Error
-		 */
-		public void fatalError(SAXParseException spe) throws SAXException {
-			String message = "Fatal Error: " + spe.getMessage();
-			throw new SAXException(message);
-		}
-	}
-
-	/**
-	 * Determine if the string is a NMTOKEN data type.
-	 * 
-	 * @param text a string value.
-	 * @return true if the string is a NMTOKEN data type.
-	 */
-	public static boolean isNmtoken(String text) {
-		boolean nmtoken = true;
-
-		// ADD: Need to find a utility function that does this or write it from
-		// scratch
-
-		return nmtoken;
-	}
-
-	/**
-	 * The method searches the first direct descendant element with the given
-	 * qname.
-	 * 
-	 * @param parent parent DOM element.
-	 * @param elementName QName of the element to be searched.
-	 * @return DOM element if the required element found, and null otherwise.
-	 */
-	static public Element findChildElement(Element parent, QName elementName) {
-		if (parent == null)
-			throw new IllegalArgumentException("Parent element can not be NULL");
-		if (elementName == null)
-			throw new IllegalArgumentException("Element name can not be NULL");
-		if (elementName.getLocalPart() == null)
-			throw new IllegalArgumentException(
-					"Local part of the element name can not be NULL");
-
-		Node n = parent.getFirstChild();
-		String local = elementName.getLocalPart();
-		String ns = elementName.getNamespaceURI();
-		while (n != null)
-		{
-			if (Node.ELEMENT_NODE == n.getNodeType()
-					&& local.equals(n.getLocalName())
-					&& NullUtil.equals(ns, n.getNamespaceURI()))
-				return (Element) n;
-			n = n.getNextSibling();
-		}
-
-		return null;
-	}
-
-	/**
-	 * The method searches the first sibling element with the given qname.
-	 * 
-	 * @param active DOM element.
-	 * @param elementName QName of the element to be searched.
-	 * @return DOM element if the required element found, and null otherwise.
-	 */
-	static public Element findElement(Element active, QName elementName) {
-		if (active == null)
-			throw new IllegalArgumentException("Active element can not be NULL");
-		if (elementName == null)
-			throw new IllegalArgumentException("Element name can not be NULL");
-		if (elementName.getLocalPart() == null)
-			throw new IllegalArgumentException(
-					"Local part of the element name can not be NULL");
-
-		Node n = active.getNextSibling();
-		String local = elementName.getLocalPart();
-		String ns = elementName.getNamespaceURI();
-		while (n != null)
-		{
-			if (Node.ELEMENT_NODE == n.getNodeType()
-					&& local.equals(n.getLocalName())
-					&& NullUtil.equals(ns, n.getNamespaceURI()))
-				return (Element) n;
-			n = n.getNextSibling();
-		}
-
-		return null;
-	}
-
-	/**
-	 * The method returns attribute node by the given qname.
-	 * 
-	 * @param el owner element.
-	 * @param attributeName QName of the attribute node to be searched.
-	 * @return attribute node by the given qname.
-	 */
-	static public Attr getAttribute(Element el, QName attributeName) {
-		if (el == null)
-			throw new IllegalArgumentException("Element can not be NULL");
-		if (attributeName == null)
-			throw new IllegalArgumentException("Attribute name can not be NULL");
-		if (attributeName.getLocalPart() == null)
-			throw new IllegalArgumentException(
-					"Local part of the attribute name can not be NULL");
-
-		attributeName.getNamespaceURI();
-		attributeName.getLocalPart();
-		Attr a = el.getAttributeNodeNS(attributeName.getNamespaceURI(),
-				attributeName.getLocalPart());
-		if (a == null)
-			// try to get with null namespace
-			a = el.getAttributeNodeNS(null, attributeName.getLocalPart());
-		return a;
-	}
-
-	/**
-	 * The method compares node's name to the given qname.
-	 * 
-	 * @param n a node.
-	 * @param name a QName object.
-	 * @return true if the node's name is the same as the given qname.
-	 */
-	static public boolean equals(Node n, QName name) {
-		if (n == null || name == null)
-			return false;
-		return (NullUtil.equals(name.getLocalPart(), n.getLocalName()) && NullUtil
-				.equals(name.getNamespaceURI(), n.getNamespaceURI()));
-	}
-
-	/**
-	 * The method searches namespace URI for the given prefix. The searching
-	 * mechanism is implemented according to the "XML Namespaces resolution"
-	 * algorithm ('http://www.w3.org/TR/2003/WD-DOM-Level-3-
-	 * Core-20030226/namespaces-algorithms.html').
-	 * 
-	 * @param n a node.
-	 * @param prefix a prefix.
-	 * @return the namespace URI for the given prefix.
-	 */
-	static public String findNamespaceURI(Node n, String prefix) {
-		if (prefix == null)
-			return null;
-
-		while (n != null)
-		{
-			if (prefix.equals(n.getPrefix()))
-				return n.getNamespaceURI();
-
-			if (Node.ELEMENT_NODE == n.getNodeType())
-			{
-				NamedNodeMap m = n.getAttributes();
-				if (m != null)
-					for (int i = 0; i < m.getLength(); i++)
-					{
-						Node a = m.item(i);
-						if (WSITag.NS_URI_XMLNS.equals(a.getNamespaceURI())
-								&& prefix.equals(a.getLocalName()))
-							return a.getNodeValue();
-					}
-			}
-
-			n = n.getParentNode();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Serializes element.
-	 * 
-	 * @param n a DOM element.
-	 * @return the serialized element.
-	 */
-	public static String serialize(Element n) {
-		String value = null;
-		try
-		{
-			StringWriter writer = new StringWriter();
-			XMLSerializer s = new XMLSerializer(writer, new OutputFormat("xml",
-					"UTF-8", true));
-			s.serialize(n);
-			value = writer.toString();
-			writer.close();
-		} catch (Throwable t)
-		{
-			// nothing
-			value = "EXCEPTION : " + t.getMessage();
-		}
-
-		return value;
-	}
-
-	/**
-	 * The method return list of child elements.
-	 * 
-	 * @param parent an org.w3c.dom.Element object.
-	 * @return list of child elements.
-	 */
-	static public Vector getChildElements(Element parent) {
-		if (parent == null)
-			throw new IllegalArgumentException("Element can not be NULL");
-
-		Vector vect = new Vector();
-		Element elem = getFirstChild(parent);
-		while (elem != null)
-		{
-			vect.add(elem);
-			elem = getNextSibling(elem);
-		}
-		return vect;
-	}
-
-	/**
-	 * Serializes document.
-	 * 
-	 * @param doc an org.w3c.dom.Document object.
-	 * @param writer a java.io.Writer object.
-	 * @throws Exception if unable to serialize the document.
-	 */
-	public static void serializeDoc(Document doc, Writer writer)
-			throws java.lang.Exception {
-		XMLSerializer s = new XMLSerializer(writer, new OutputFormat("xml",
-				"UTF-8", true));
-		s.serialize(doc);
-	}
-
-	/**
-	 * Serealizes element.
-	 * 
-	 * @param elem an org.w3c.dom.Element object.
-	 * @param writer a java.io.Writer object.
-	 * @throws Exception if unable to serialize the DOM element.
-	 */
-	public static void serializeElement(Element elem, Writer writer)
-			throws java.lang.Exception {
-		XMLSerializer s = new XMLSerializer(writer, new OutputFormat("xml",
-				"UTF-8", true));
-		s.serialize(elem);
-	}
-
-	/**
-	 * Remove all elements from list without namespace.
-	 * 
-	 * @param vect a list of elements.
-	 */
-	public static void removeAllElementsWithoutNS(Vector vect) {
-		for (int i = 0; i < vect.size();)
-		{
-			if (((Element) vect.get(i)).getNamespaceURI() == null
-					|| ((Element) vect.get(i)).getNamespaceURI().equals(""))
-				vect.remove(i);
-			else
-				i++;
-		}
-	}
-
-	/**
-	 * Create URL using base URI.
-	 * 
-	 * @param url a URL string.
-	 * @param baseURI a base url string to assist in creating a URL.
-	 * @return newly created URL.
-	 * @throws MalformedURLException if a malformed URL has occurred.
-	 */
-	public static URL createURL(String url, String baseURI)
-			throws MalformedURLException {
-		URL returnURL = null;
-		URI uri = null;
-		try
-		{
-            returnURL = new URL(url);
-			uri = new URI(url);
-			uri = uri.normalize();
-			returnURL =  new URL(uri.toString());
-		}
-
-		catch (Exception mue)
-		{
-			int i = baseURI.lastIndexOf('/');
-			int j = baseURI.lastIndexOf('\\');
-			if (j > i)
-				i = j;
-			try
-			{
-			  uri = new URI(baseURI.substring(0, i + 1) + url);
-			  uri = uri.normalize();
-			  returnURL = uri.toURL();
-			}
-			catch (Exception e)
-			{
-			  return new URL(baseURI.substring(0, i + 1) + url);
-			}
-		}
-		return returnURL;
-	}
-
-	/**
-	 * Create URL using base URI.
-	 * 
-	 * @param url a URL string.
-	 * @param baseURI a base url string to assist in creating a URL.
-	 * @return newly created URL string.
-	 * @throws MalformedURLException if a malformed URL has occurred.
-	 */
-	public static String createURLString(String url, String baseURI)
-			throws MalformedURLException {
-		return createURL(url, baseURI).toExternalForm();
-	}
-
-	/**
-	 * This method is used only for unit testing.
-	 * 
-	 * @param args arguments for main.
-	 */
-	public static void main(String[] args) {
-		try
-		{
-		  System.out.println("Filename: " + args[0] + ", schema: " + args[1]);
-		  parseXMLDocument(args[0], args[1]);
-		  System.out.println("Done.");
-		}
-
-		catch (Exception e)
-		{
-			System.err.println(e.toString());
-		}
-
-		System.exit(0);
-	}
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java
deleted file mode 100644
index fc9ea36..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java
+++ /dev/null

@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Entity;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Notation;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-/**
- * We don't have access to the node source code, so this does
- * our double-dispatch the hard way.
- */
-public class XMLVisitor
-{
-  /**
-  * Visit XML CDATASection node.
-  * @param s  an XML CDATASection node.
-  */
-  public void visit(CDATASection s)
-  {
-  }
-
-  /**
-  * Visit XML Document node.
-  * @param e  an XML Document node.
-  */
-  public void visit(Document e)
-  {
-  }
-
-  /**
-  * Visit XML DocumentType node.
-  * @param e  an ML DocumentType node.
-  */
-  public void visit(DocumentType e)
-  {
-  }
-
-  /**
-  * Visit XML Attribute node.
-  * @param e  an XML Atrribute node.
-  */
-  public void visit(Attr e)
-  {
-  }
-
-  /**
-  * Visit XML Element node.
-  * @param e  an XML Element node.
-  */
-  public void visit(Element e)
-  {
-  }
-
-  /**
-  * Visit XML Comment node.
-  * @param e  an XML Comment node.
-  */
-  public void visit(Comment e)
-  {
-  }
-
-  /**
-   * Visit XML Text node.
-  * @param e  an XML Text node.
-  */
-  public void visit(Text e)
-  {
-  }
-
-  /**
-   * Visit XML EntityReference node. 
-  * @param e  an XML EntityReference node.
-  */
-  public void visit(EntityReference e)
-  {
-  }
-
-  /**
-   * Visit XML Entity node. 
-  * @param e  an XML Entity node.
-  */
-  public void visit(Entity e)
-  {
-  }
-
-  /**
-   * Visit XML Notation node. 
-  * @param n  an XML Notation node.
-  */
-  public void visit(Notation n)
-  {
-  }
-
-  /**
-   * Visit XML ProcessingInstruction node. 
-  * @param i  an XML ProcessingInstruction node.
-  */
-  public void visit(ProcessingInstruction i)
-  {
-  }
-
-  /**
-   * Visit XML NamedNodeMap node. 
-  * @param i  an XML NamedNodeMap node.
-  */
-  public void visit(NamedNodeMap i)
-  {
-  }
-
-  /**
-   * Visit XML node. 
-  * @param node  an XML node.
-  */
-  public void doVisit(Object node)
-  {
-    if (node instanceof Element)
-    {
-      visit((Element) node);
-    }
-    else if (node instanceof Comment)
-    {
-      visit((Comment) node);
-    }
-    else if (node instanceof CDATASection)
-    {
-      // CDATASection extends Text, so it must come first
-      visit((CDATASection) node);
-    }
-    else if (node instanceof Text)
-    {
-      visit((Text) node);
-    }
-    else if (node instanceof Attr)
-    {
-      visit((Attr) node);
-    }
-    else if (node instanceof Document)
-    {
-      visit((Document) node);
-    }
-    else if (node instanceof EntityReference)
-    {
-      visit((EntityReference) node);
-    }
-    else if (node instanceof Entity)
-    {
-      visit((Entity) node);
-    }
-    else if (node instanceof DocumentType)
-    {
-      visit((DocumentType) node);
-    }
-    else if (node instanceof Notation)
-    {
-      visit((Notation) node);
-    }
-    else if (node instanceof ProcessingInstruction)
-    {
-      visit((ProcessingInstruction) node);
-    }
-    else if (node instanceof NamedNodeMap)
-    {
-      visit((NamedNodeMap) node);
-    }
-  }
-}
-
-// END OF FILE

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
deleted file mode 100644
index 2ee0361..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.dom;
-
-import org.apache.xerces.dom.ElementImpl;
-import org.apache.xerces.xni.Augmentations;
-import org.apache.xerces.xni.NamespaceContext;
-import org.apache.xerces.xni.QName;
-import org.apache.xerces.xni.XMLAttributes;
-import org.apache.xerces.xni.XMLLocator;
-import org.apache.xerces.xni.XNIException;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-
-/**
- * This class specializes org.apache.xerces.parsers.DOMParser.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class DOMParser extends org.apache.xerces.parsers.DOMParser
-{
-  /**
-   * Locator.
-   */
-  XMLLocator locator = null;
-
-  /* (non-Javadoc)
-   * @see org.apache.xerces.xni.XMLDocumentHandler#startDocument(org.apache.xerces.xni.XMLLocator, java.lang.String, org.apache.xerces.xni.NamespaceContext, org.apache.xerces.xni.Augmentations)
-   */
-  public void startDocument(
-    XMLLocator locator,
-    String encoding,
-    NamespaceContext context,
-    Augmentations augs)
-    throws XNIException
-  {
-    this.locator = locator;
-    super.startDocument(locator, encoding, context, augs);
-  }
-
-  /* (non-Javadoc)
-   * @see org.apache.xerces.xni.XMLDocumentHandler#startElement(org.apache.xerces.xni.QName, org.apache.xerces.xni.XMLAttributes, org.apache.xerces.xni.Augmentations)
-   */
-  public void startElement(
-    QName qname,
-    XMLAttributes attributes,
-    Augmentations augs)
-    throws XNIException
-  {
-    Element element;
-    ElementImpl elementImpl;
-
-    // DEBUG:
-    //System.err.println("1-line: " + locator.getLineNumber() + ", column: " + locator.getColumnNumber());
-
-    super.startElement(qname, attributes, augs);
-
-    // DEBUG:
-    //System.err.println("2-line: " + locator.getLineNumber() + ", column: " + locator.getColumnNumber());    
-
-    try
-    {
-      element = (Element) getProperty(CURRENT_ELEMENT_NODE);
-
-      elementImpl = (ElementImpl) element;
-      // Setting the user data with an identifier such as ElementLocation.KEY_NAME
-      // may be a long term good idea. The setUserData method with no id is used 
-      // to support JVMs with alternate versions of Xerces.
-      elementImpl.setUserData(new ElementLocation(locator.getLineNumber(), locator.getColumnNumber()));
-    }
-    catch (ClassCastException cce)
-    {
-    }
-    catch (SAXNotSupportedException snse)
-    {
-      // DEBUG:
-      //System.err.println(snse.toString());
-    }
-    catch (SAXNotRecognizedException snre)
-    {
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java
deleted file mode 100644
index fa90533..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.dom;
-
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.xml.sax.Locator;
-
-/**
- * This class provides line and column information for a node within an XML document.
- *  
- * @version 1.0.1
- * @author Peter Brittenham  (peterbr@us.ibm.com)
- */
-public class ElementLocation
-{
-  /**
-   * Line number.
-   */
-  public static final String KEY_NAME = ElementLocation.class.getName();
-
-  /**
-   * Line number.
-   */
-  protected int lineNumber = 0;
-
-  /**
-   * Column number.
-   */
-  protected int columnNumber = 0;
-
-  /**
-   * Element location.
-   * @param lineNumber    a line number.
-   * @param columnNumber  a column number.
-   */
-  public ElementLocation(int lineNumber, int columnNumber)
-  {
-    this.lineNumber = lineNumber;
-    this.columnNumber = columnNumber;
-  }
-
-  /**
-   * Element location.
-   * @param locator  a Locator object.
-   */
-  public ElementLocation(Locator locator)
-  {
-    this.lineNumber = locator.getLineNumber();
-    this.columnNumber = locator.getColumnNumber();
-  }
-
-  /**
-   * Get the line number.
-   * @return an int representing the line number value.
-   */
-  public int getLineNumber()
-  {
-    return this.lineNumber;
-  }
-
-  /**
-   * Get the column number.
-   * @return an int representing the column number value.
-   */
-  public int getColumnNumber()
-  {
-    return this.columnNumber;
-  }
-
-  /**
-   * Get string representation of this object.
-   */
-  public String toString()
-  {
-    return "Element Location:\n"
-      + "  "
-      + WSIConstants.ATTR_LINE_NUMBER
-      + "="
-      + this.lineNumber
-      + "\n";
-    //+ "  " + WSIConstants.ATTR_COLUMN_NUMBER + "=" + this.columnNumber + "\n";
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java
deleted file mode 100644
index 4bec5cd..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.jaxp;
-
-import java.util.Hashtable;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * This class defines a factory API that enables us to obtain a parser that
- * produces DOM object trees from XML documents. Note this class specializes 
- * javax.xml.parsers.DocumentBuilderFactory.
- * 
- * @author Peter Brittenham (peterbr@us.ibm.com)
- */
-public class DocumentBuilderFactoryImpl extends DocumentBuilderFactory
-{
-
-  protected Hashtable attributes = new Hashtable();
-
-  /**
-   * Creates a new instance of a DocumentBuilder using the currently 
-   * configured parameters.
-   * 
-   * @return a new instance of a DocumentBuilder. 
-   * @throws ParserConfigurationException if a DocumentBuilder cannot
-   *         be created which satisfies the configuration requested.
-   */
-  public DocumentBuilder newDocumentBuilder()
-    throws ParserConfigurationException
-  {
-    DocumentBuilder documentBuilder = null;
-
-    try
-    {
-      documentBuilder = new DocumentBuilderImpl(this, attributes);
-    }
-
-    catch (Exception e)
-    {
-      throw new ParserConfigurationException(e.getMessage());
-    }
-
-    return documentBuilder;
-  }
-
-  /**
-   * Allows the user to retrieve specific attributes on the underlying 
-   * implementation.
-   * 
-   * @param name  the name of the attribute.
-   * @return the value of the attribute. 
-   * @throws IllegalArgumentException if the underlying implementation 
-   *         doesn't recognize the attribute.
-   */
-  public Object getAttribute(String name) throws IllegalArgumentException
-  {
-    return attributes.get(name);
-  }
-
-  /**
-   * Allows the user to set specific attributes on the underlying 
-   * implementation. 
-   * 
-   * @param name   the name of the attribute.
-   * @param value  the value of the attribute.
-   * @throws IllegalArgumentException if the underlying implementation 
-   *         doesn't recognize the attribute.
-   */
-  public void setAttribute(String name, Object value)
-    throws IllegalArgumentException
-  {
-    attributes.put(name, value);
-  }
-  
-  public void setFeature(String arg0, boolean arg1) 
-    throws ParserConfigurationException
-  {
-    // currently we do not support setting any feature
-	// as per spec, we should throw an exception
-	throw new ParserConfigurationException(arg0 + " Not supported");
-  }
-
-  public boolean getFeature(String arg0) 
-    throws ParserConfigurationException
-  {
-	// as per spec, we should throw an exception
-	throw new ParserConfigurationException(arg0 + " is not supported");
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java
deleted file mode 100644
index 2858dd7..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java
+++ /dev/null

@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.jaxp;
-
-
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xerces.dom.DOMImplementationImpl;
-import org.apache.xerces.dom.DocumentImpl;
-import org.apache.xerces.impl.Constants;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.eclipse.wst.wsi.internal.core.xml.dom.DOMParser;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Using this class, we can obtain a Document from XML. This class is a 
- * specialization of javax.xml.parsers.DocumentBuilder.
- * 
- * An instance of this class can be obtained from the 
- * DocumentBuilderFactory.newDocumentBuilder method. Once an instance 
- * of this class is obtained, XML can be parsed from a variety of input 
- * sources. These input sources are InputStreams, Files, URLs, and SAX 
- * InputSources.
-
-This class will javax.xml.parsers.DocumentBuilderFactory...
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class DocumentBuilderImpl extends DocumentBuilder
-{
-  protected DOMParser domParser = null;
-
-  protected EntityResolver entityResolver = null;
-  protected ErrorHandler errorHandler = new DefaultHandler();
-
-  protected static final String NAMESPACES_FEATURE =
-    Constants.SAX_FEATURE_PREFIX + Constants.NAMESPACES_FEATURE;
-  protected static final String VALIDATION_FEATURE =
-    Constants.SAX_FEATURE_PREFIX + Constants.VALIDATION_FEATURE;
-
-  /**
-   * Constructor for DocumentBuilderImpl2.
-   *
-   * @param dbFactory  a DocumentBuilderFactory object.
-   * @throws SAXException if any parse errors occur. 
-   */
-  public DocumentBuilderImpl(DocumentBuilderFactory dbFactory, Hashtable attributes)
-    throws SAXException
-  {
-    // Create parser
-    domParser = new DOMParser();
-
-    // Set namespace aware
-    domParser.setFeature(NAMESPACES_FEATURE, dbFactory.isNamespaceAware());
-
-    // Set validating
-    domParser.setFeature(VALIDATION_FEATURE, dbFactory.isValidating());
-    if (dbFactory.isValidating()) domParser.setFeature(XMLUtils.FEATURE_VALIDATION_SCHEMA, true);
-
-    // Do not defer node expansion
-    domParser.setFeature(
-      Constants.XERCES_FEATURE_PREFIX + Constants.DEFER_NODE_EXPANSION_FEATURE,
-      false);
-
-    // Set other features from the document factory builder
-    domParser.setFeature(
-      Constants.XERCES_FEATURE_PREFIX + Constants.INCLUDE_IGNORABLE_WHITESPACE,
-      !dbFactory.isIgnoringElementContentWhitespace());
-    domParser.setFeature(
-      Constants.XERCES_FEATURE_PREFIX
-        + Constants.CREATE_ENTITY_REF_NODES_FEATURE,
-      !dbFactory.isExpandEntityReferences());
-    domParser.setFeature(
-      Constants.XERCES_FEATURE_PREFIX + Constants.INCLUDE_COMMENTS_FEATURE,
-      !dbFactory.isIgnoringComments());
-    domParser.setFeature(
-      Constants.XERCES_FEATURE_PREFIX + Constants.CREATE_CDATA_NODES_FEATURE,
-      !dbFactory.isCoalescing());
-   
-    // set features and properties specified at factory level
-    if (attributes != null)
-    {
-      for (Enumeration i=attributes.keys(); i.hasMoreElements();)
-      {
-        String attribute = (String)i.nextElement();
-        if (attribute.equals(XMLUtils.JAXP_SCHEMA_SOURCE))
-        {
-          // for multiple schema validation may be array of InputSource 
-          if(attributes.get(attribute) instanceof InputSource[])
-            domParser.setProperty(attribute, (InputSource[])attributes.get(attribute));
-          else
-            domParser.setProperty(attribute, (InputSource)attributes.get(attribute));
-        }
-        else
-        {
-          domParser.setProperty(attribute, attributes.get(attribute));
-        }
-      }
-    }
-  }
-
-  /**
-   * Parse the content of the given input source as an XML document and return a new DOM.
-   * @param is  InputStream containing the content to be parsed. 
-   * @throws SAXException if any parse errors occur. 
-   * @throws IOException if any IO errors occur. 
-   */
-  public Document parse(InputSource is) throws SAXException, IOException
-  {
-	ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-	try
-	{
-	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
- 	
-      // Set entity resolver
-      if (this.entityResolver != null)
-        domParser.setEntityResolver(this.entityResolver);
-
-      // Set error handler    
-      if (this.errorHandler != null)
-        domParser.setErrorHandler(this.errorHandler);
-
-      // Parse input source
-      domParser.parse(is);
-
-      // Return the document that was created
-      return domParser.getDocument();
-	}
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }    
-  }
-
-  /**
-   * Indicates whether or not this parser is configured to understand namespaces.
-   * @return true if this parser is configured to understand namespaces; false otherwise.
-   */
-  public boolean isNamespaceAware()
-  {
-    boolean namespaceAware = false;
-
-    try
-    {
-      namespaceAware = domParser.getFeature(NAMESPACES_FEATURE);
-    }
-
-    catch (SAXException se)
-    {
-      throw new RuntimeException(se.toString());
-    }
-
-    return namespaceAware;
-  }
-
-  /**
-   * Indicates whether or not this parser is configured to validate XML documents.
-   * @return true if this parser is configured to validate XML documents; false otherwise.
-   */
-  public boolean isValidating()
-  {
-    boolean validating = false;
-
-    try
-    {
-      validating = domParser.getFeature(VALIDATION_FEATURE);
-    }
-
-    catch (SAXException se)
-    {
-      throw new RuntimeException(se.toString());
-    }
-
-    return validating;
-  }
-
-  /**
-   * Specify the EntityResolver to be used to resolve entities present 
-   * in the XML document to be parsed. Setting this to null will result 
-   * in the underlying implementation using it's own default 
-   * implementation and behavior.
-   * 
-   * @param er  the EntityResolver to be used to resolve entities 
-   *            present in the XML document to be parsed.
-   */
-  public void setEntityResolver(EntityResolver entityResolver)
-  {
-    this.entityResolver = entityResolver;
-  }
-
-  /**
-   * Specify the ErrorHandler to be used to report errors present in 
-   * the XML document to be parsed. Setting this to null will result 
-   * in the underlying implementation using it's own default 
-   * implementation and behavior. 
-   * 
-   * param eh  the ErrorHandler to be used to report errors present in 
-   *           the XML document to be parsed.
-   */
-  public void setErrorHandler(ErrorHandler errorHandler)
-  {
-    this.errorHandler = errorHandler;
-  }
-
-  /**
-   * Obtain a new instance of a DOM Document object to build a DOM 
-   * tree with. An alternative way to create a DOM Document object 
-   * is to use the getDOMImplementation method to get a DOM Level 2 
-   * DOMImplementation object and then use DOM Level 2 methods on 
-   * that object to create a DOM Document object.
-   * 
-   * @return a new instance of a DOM Document object.
-   */
-  public Document newDocument()
-  {
-    return new DocumentImpl();
-  }
-
-  /**
-   * Obtain an instance of a DOMImplementation object. 
-   * @return a new instance of a DOMImplementation.
-   */
-  public DOMImplementation getDOMImplementation()
-  {
-    return new DOMImplementationImpl();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java
deleted file mode 100644
index 6dc2435..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.schema;
-
-import java.util.List;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * This class processes target namespaces. Note this class is a specialization
- * of org.wsi.xml.schema.XMLSchemaProcessor.
- * 
- * @author Peter Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class TargetNamespaceProcessor extends XMLSchemaProcessor
-{
-
-  /**
-   * Constructor for TargetNamespaceProcess.
-   * 
-   * @param context
-   *            document context
-   * @param documentList
-   *            cache of previously parsed documents
-   */
-  public TargetNamespaceProcessor(String context)
-  {
-    super(context, false);
-  }
-
-  protected void processSchema(Element element)
-  {
-    String tns = null;
-    Attr attr = XMLUtils.getAttribute(element, ATTR_XSD_TARGETNAMESPACE);
-
-    // If the attribute was found and value is not null, then add it to the list
-    if ((attr != null) && ((tns = attr.getValue()) != null))
-    {
-      // Add the targetNamespace to the return list
-      returnList.add(tns);
-    }
-  }
-
-  /**
-   * Search for all schema elements, load the xsd documents, and then process
-   * them.
-   * 
-   * @param node
-   *            node.
-   * @return a list.
-   * @throws WSIException
-   *             if the XML schema file is not found or if it is not formatted
-   *             correctly.
-   */
-  public List processAllSchema(Node node) throws WSIException
-  {
-    return processAllSchema(node, context);
-  }
-
-  /**
-   * Search for all schema elements, load the xsd documents, and then process
-   * them.
-   * 
-   * @param node
-   *            node.
-   * @return a list.
-   * @throws WSIException
-   *             if the XML schema file is not found or if it is not formatted
-   *             correctly.
-   */
-  private List processAllSchema(Node node, String ctx) throws WSIException
-  {
-	ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-	try
-	{
-   	  Thread.currentThread().setContextClassLoader(XMLUtils.class.getClassLoader());   
-	
-      // if xsd:schema element is found -> process schema
-      if (XMLUtils.equals(node, ELEM_XSD_SCHEMA))
-      {
-        processSchema((Element) node);
-
-        Node n = node.getFirstChild();
-        while (n != null)
-        {
-          if (Node.ELEMENT_NODE == n.getNodeType()&& XMLUtils.equals(n, ELEM_XSD_IMPORT))
-          {
-            Attr schemaLocation = XMLUtils.getAttribute((Element) n, ATTR_XSD_SCHEMALOCATION);
-
-            // Try to parse imported XSD
-            if (schemaLocation != null && schemaLocation.getValue() != null)
-            {
-         	  if (!schemaLocations.contains(schemaLocation.getValue()))
-          	  {
-                schemaLocations.add(schemaLocation.getValue());
-                try
-                {
-                  // Read and pParse the XML schema document
-                  Document document = parseXMLDocumentURL(schemaLocation.getValue(), ctx, TestUtils.getXMLSchemaLocation());
-                  processAllSchema(document.getDocumentElement(), XMLUtils.createURLString(schemaLocation.getValue(), ctx));
-                }
-                catch (WSIException e)
-                {
-                  if (throwException) throw e;
-                }
-                catch (Throwable t)
-               {
-                 // NOTE: An exception will occur if the XML schema file is not
-  			     // found or if it is not formatted correctly
-                 if (throwException) throw new WSIException(t.getMessage(), t);
-               }
-             }
-           }
-         }
-         n = n.getNextSibling();
-       }
-     }
-
-     // Return list created by the class that extends this class
-     return returnList;
-    }
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }    
-}
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java
deleted file mode 100644
index e6e52e1..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java
+++ /dev/null

@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.schema;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCacheUser;
-import org.eclipse.wst.wsi.internal.core.xml.XMLTags;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * This abstract class is used to process an XML Schema.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public abstract class XMLSchemaProcessor
-  extends XMLDocumentCacheUser
-  implements XMLTags
-{
-  protected List returnList = new Vector();
-  protected String context;
-  protected boolean throwException = true;
-  protected List schemaLocations = new Vector();
-
-  /**
-   * Constructor for XMLSchemaProcessor.
-   * @param context       document context. 
-   * @param documentList  cache of previously parsed documents.
-   */
-  public XMLSchemaProcessor(String context)
-  {
-    this(context, true);
-  }
-
-  /**
-   * Constructor for XMLSchemaProcessor.
-   * @param context        document context. 
-   * @param documentList   cache of previously parsed documents.
-   * @param throwException indicates if an exception should be thrown if there is a parsing problem.
-   */
-  public XMLSchemaProcessor(
-    String context,
-    boolean throwException)
-  {
-    super();
-
-    this.context = context;
-    this.throwException = throwException;
-  }
-
-  /**
-   * Search for all schema elements, load the xsd documents, and then process them.
-   * @param node  node.
-   * @return a list.
-   * @throws WSIException if the XML schema file is not found or if it is not formatted correctly.
-   */
-  public List processAllSchema(Node node) throws WSIException
-  {
-    return processAllSchema(node, context);
-  }
-
-  /**
-   * Search for all schema elements, load the xsd documents, and then process them.
-   * @param node  node.
-   * @return a list.
-   * @throws WSIException if the XML schema file is not found or if it is not formatted correctly.
-   */
-  private List processAllSchema(Node node, String ctx) throws WSIException
-  {
-	ClassLoader currentLoader = Thread.currentThread().getContextClassLoader();   
-	try
-	{
-   	  Thread.currentThread().setContextClassLoader(XMLSchemaProcessor.class.getClassLoader());   
-      // Process all nodes
-      while (node != null)
-      {
-        // If this is an element node, then continue
-        if (Node.ELEMENT_NODE == node.getNodeType())
-        {
-          // if xsd:schema element is found -> process schema
-          if (XMLUtils.equals(node, ELEM_XSD_SCHEMA))
-          {
-            processSchema((Element) node);
-
-            // Process all children of the schema element
-            processAllSchema(node.getFirstChild(), ctx);
-          }
-
-          // if xsd:import element is found -> load schema and process schema
-          else if (XMLUtils.equals(node, ELEM_XSD_IMPORT))
-          {
-
-            Attr schemaLocation =
-              XMLUtils.getAttribute((Element) node, ATTR_XSD_SCHEMALOCATION);
-
-            // Try to parse imported XSD
-            if (schemaLocation != null && schemaLocation.getValue() != null)
-            {
-          	  if (!schemaLocations.contains(schemaLocation.getValue()))
-          	  {
-          		schemaLocations.add(schemaLocation.getValue());
-                try
-                {
-                  // Read and pParse the XML schema document
-                  Document document =
-                    parseXMLDocumentURL(
-                      schemaLocation.getValue(),
-                      ctx,
-                      TestUtils.getXMLSchemaLocation());
-
-                  processAllSchema(document.getDocumentElement(),
-                      XMLUtils.createURLString(schemaLocation.getValue(), ctx));
-                }
-                catch (WSIException e)
-                {
-                  if (throwException)
-                    throw e;
-                }
-
-                catch (Throwable t)
-                {
-                  // NOTE: An exception will occur if the XML schema file is not found or if it is not formatted correctly
-                  if (throwException)
-                    throw new WSIException(t.getMessage(), t);
-                }
-              }
-            }
-          }
-
-          else
-          {
-            // else iterate element recursively
-            processAllSchema(node.getFirstChild(), ctx);
-          }
-        }
-
-        // Get next sibiling
-        node = node.getNextSibling();
-      }
-
-    }
-    finally
-    { 
-      Thread.currentThread().setContextClassLoader(currentLoader);
-    }    
-
-
-    // Return list created by the class that extends this class
-    return returnList;
-  }
-
-  protected abstract void processSchema(Element element);
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java
deleted file mode 100644
index 36ca130..0000000
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.core.xml.schema;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.util.TestUtils;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.ibm.wsdl.util.xml.DOM2Writer;
-
-/**
- * This class is used to validate an XML Schema.
- * 
- * @author Peter  Brittenham (peterbr@us.ibm.com)
- * @version 1.0.1
- */
-public class XMLSchemaValidator extends XMLSchemaProcessor
-{
-  private static final String XMLNS_PREFIX = "xmlns:";
-
-  /**
-   * Constructor for XMLSchemaValidator.
-   * @param context       document context. 
-   * @param documentList  cache of previously parsed documents.
-   */
-  public XMLSchemaValidator(String context)
-  {
-    super(context);
-  }
-
-  protected void processSchema(Element element)
-  {
-    NamedNodeMap attrList;
-
-    HashMap elementMap = new HashMap();
-    HashMap nsMap = new HashMap();
-
-    try
-    {
-      // Get schema content as a string
-      String schema = DOM2Writer.nodeToString(element);
-
-      // Get list of element namespaces
-      if ((attrList = element.getAttributes()) != null)
-      {
-        addNamespaces(attrList, elementMap, null);
-      }
-
-      // If elementMap does not contain entry for it's own namespace, then add it
-      if (elementMap.get(XMLNS_PREFIX + element.getPrefix()) == null)
-      {
-        elementMap.put(
-          XMLNS_PREFIX + element.getPrefix(),
-          element.getNamespaceURI());
-      }
-
-      // Get first parent node and then process all of them until you hit the top of the document
-      Node parentNode = element.getParentNode();
-      while (parentNode != null)
-      {
-        // Only process Element nodes
-        if (parentNode.getNodeType() == Node.ELEMENT_NODE)
-        {
-          // Get the list of attributes for the parent node
-          attrList = parentNode.getAttributes();
-
-          // If there are attributes, look for the xmlns: attributes
-          if (attrList != null)
-          {
-            addNamespaces(attrList, nsMap, elementMap);
-          }
-        }
-
-        parentNode = parentNode.getParentNode();
-      }
-
-      // Build namespace list
-      if (nsMap.size() > 0)
-      {
-        String attr;
-        String namespaceList = "";
-        Iterator iterator = nsMap.keySet().iterator();
-        while (iterator.hasNext())
-        {
-          attr = (String) iterator.next();
-          namespaceList += " " + attr + "=\"" + nsMap.get(attr) + "\"";
-        }
-
-        // Add namespace settings, since the DOM2Writer will miss any that are used as attribute values
-        int index = schema.indexOf(">");
-        if (index > 0)
-        {
-          String start = schema.substring(0, index);
-          String end = schema.substring(index);
-
-          schema = start + namespaceList + end;
-        }
-      }
-
-      // Schema validate the XML schema document
-      XMLUtils.parseXML(schema, TestUtils.getXMLSchemaLocation());
-    }
-
-    catch (WSIException we)
-    {
-      Throwable t = we.getTargetException();
-      if (t != null)
-      {
-        returnList.add(t.getMessage());
-      }
-    }
-  }
-
-  private void addNamespaces(NamedNodeMap attrList, Map nsMap, Map elementMap)
-  {
-    Node attr;
-    String nodeName;
-
-    for (int i = 0; i < attrList.getLength(); i++)
-    {
-      attr = attrList.item(i);
-
-      // Get the attribute node name
-      nodeName = attr.getNodeName();
-
-      // If it starts with xmlns:, then determine if it should be added to the list of namespaces 
-      if (nodeName.startsWith(XMLNS_PREFIX)
-        && ((elementMap == null
-          || (elementMap != null && elementMap.get(nodeName) == null))))
-      {
-        if (nsMap.get(nodeName) == null)
-          nsMap.put(nodeName, attr.getNodeValue());
-      }
-    }
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSIPreferences.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSIPreferences.java
deleted file mode 100644
index 84b8d21..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSIPreferences.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal;
-
-/**
- * WS-I test tools property.
- * 
- * @author David Lauzon, IBM
- *
- */
-
-public class WSIPreferences
-{
-  protected String complianceLevel = "";
-  protected String tadfile = "";
-  
-  /**
-   *  Constructor.
-   */
-  public WSIPreferences()
-  {
-	complianceLevel = WSITestToolsProperties.WARN_NON_WSI;
-	tadfile = WSITestToolsProperties.DEFAULT_ASSERTION_FILE;
-  }
-  
-  /**
-   * Returns the WS-I compliance level.
-   * @return the WS-I compliance level.
-   * @see #setComplianceLevel
-   */
-  public String getComplianceLevel()
-  {
-    return complianceLevel;
-  }
-
-  /**
-   * Set the WS-I compliance level.
-   * @param compliance the WS-I compliance level.
-   * @see #getComplianceLevel
-   */
-  public void setComplianceLevel(String compliance)
-  {
-    this.complianceLevel = compliance;
-  }
-
-  /**
-   * Returns the location of the Basic Profile Test Assertions file.
-   * @return the location of the Basic Profile Test Assertions file.
-   * @see #setTADFile
-   */
-  public String getTADFile()
-  {
-    return tadfile;
-  }
-
-  /**
-   * Set the location of the Basic Profile Test Assertions file.
-   * @param file the location of the Basic Profile Test Assertions file.
-   * @see #getTADFile
-   */
-  public void setTADFile(String file)
-  {
-    this.tadfile = file;
-  }
-}
-

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsEclipseProperties.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsEclipseProperties.java
deleted file mode 100644
index 54662d2..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsEclipseProperties.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-
-/**
- * WS-I test tool properties specific for Eclipse.
- */
-public class WSITestToolsEclipseProperties extends WSITestToolsProperties
-{
- /**
-  * @see org.eclipse.wst.wsi.internal.WSITestToolsProperties#checkWSIPreferences(java.lang.String)
-  */
-  public static WSIPreferences checkWSIPreferences(String fileuri)
-  {
-    WSIPreferences preferences = new WSIPreferences();
-    
-    // Remove file: and any slashes from the fileuri. 
-    // Eclipse's resolution mechanism needs to start with the drive.
-    String uriStr = trimURI(fileuri);
-
-    WSUIPlugin wsui = WSUIPlugin.getInstance();
-    PersistentWSIContext APcontext = wsui.getWSIAPContext();
-    PersistentWSIContext SSBPcontext = wsui.getWSISSBPContext();
-    
-    IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(uriStr));
-    if (files != null && files.length == 1)
-    {
-      //check project level conpliance
-      IProject project = files[0].getProject();
-      
-      if (APcontext.projectStopNonWSICompliances(project))
-      {
-        preferences.setTADFile(AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-      } 
-      else if (APcontext.projectWarnNonWSICompliances(project))
-      {
-        preferences.setTADFile(AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-      }
-      else if (SSBPcontext.projectStopNonWSICompliances(project))
-      {
-        preferences.setTADFile(SSBP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-      }
-      else if (SSBPcontext.projectWarnNonWSICompliances(project))
-      {
-        preferences.setTADFile(SSBP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-      }
-      else
-      {
-        preferences.setTADFile(DEFAULT_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.IGNORE_NON_WSI);
-      }
-    }
-    else
-    {
-      // If we can't obtain the project preference use the global preference.
-      String APlevel = APcontext.getPersistentWSICompliance();
-      String SSBPlevel = SSBPcontext.getPersistentWSICompliance();
-      if(APlevel.equals(PersistentWSIContext.STOP_NON_WSI))
-      {
-        preferences.setTADFile(AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-      }
-      else if(APlevel.equals(PersistentWSIContext.WARN_NON_WSI))
-      {
-        preferences.setTADFile(AP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-     }
-     if(SSBPlevel.equals(PersistentWSIContext.STOP_NON_WSI))
-     {
-       preferences.setTADFile(SSBP_ASSERTION_FILE);
-       preferences.setComplianceLevel(PersistentWSIContext.STOP_NON_WSI);
-     }
-     else if(SSBPlevel.equals(PersistentWSIContext.WARN_NON_WSI))
-     {
-      preferences.setTADFile(SSBP_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.WARN_NON_WSI);
-     }
-     else
-     {
-        preferences.setTADFile(DEFAULT_ASSERTION_FILE);
-        preferences.setComplianceLevel(PersistentWSIContext.IGNORE_NON_WSI);
-      }
-    }
-    return preferences;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java
deleted file mode 100644
index 4dd002a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal;
-
-import java.io.IOException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The WS-I test tools plugin.
- * 
- * @author lauzond
- */
-
-public class WSITestToolsPlugin extends AbstractUIPlugin
-{
-  private static AbstractUIPlugin instance;
-  protected final String PLUGIN_PROPERTIES = "wsivalidate";
-  protected ResourceBundle resourcebundle = null;
-  
-  /**
-   * Constructor for wsiTestToolsPlugin.
-   * @param descriptor an IPluginDescriptor object.
-   */
-  public WSITestToolsPlugin(IPluginDescriptor descriptor)
-  {
-    super(descriptor);
-    instance = this;
-
-    // set the current directory
-   WSITestToolsProperties.setInstallDir(getInstallURL());
-   WSITestToolsProperties.setEclipseContext(true);
-   resourcebundle = ResourceBundle.getBundle(PLUGIN_PROPERTIES);
-  }
-
-  /**
-   * Method getInstance.
-   * @return AbstractUIPlugin
-   */
-  public static AbstractUIPlugin getInstance()
-  {
-    return instance;
-  }
-
-  /**
-   * Returns the resource bundle for this plugin.
-   * 
-   * @return The resource bundle for this plugin.
-   */
-  public ResourceBundle getResourceBundle()
-  {
-    return resourcebundle;
-  }
-
-  /**
-   * Method getPlugin.
-   * @return WSIToolsUtilPlugin
-   */
-  public static WSITestToolsPlugin getPlugin()
-  {
-    return (WSITestToolsPlugin) instance;
-  }
-
-  /**
-   * Returns installable URL for this plugin.
-   * @return installable URL for this plugin.
-   */
-  public String getInstallURL()
-  {
-    try
-    {
-      return Platform.resolve(getDescriptor().getInstallURL()).getFile();
-    }
-    catch (IOException e)
-    {
-      return null;
-    }
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java
deleted file mode 100644
index 902d20a..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Properties;
-
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.wsi.internal.core.util.WSIProperties;
-
-/**
- * WS-I test tools property.
- */
-public class WSITestToolsProperties
-{
-  protected static String installURL = "";
-  protected static String tadfile = "";
-
-  public final static String schemaDir = "common/schemas/";
-  public final static String SSBP_ASSERTION_FILE = "http://www.ws-i.org/Testing/Tools/2005/01/SSBP10_BP11_TAD_1-0.xml";
-  public final static String AP_ASSERTION_FILE = "http://www.ws-i.org/Testing/Tools/2004/12/AP10_BP11_SSBP10_TAD.xml";
-  public final static String DEFAULT_ASSERTION_FILE = AP_ASSERTION_FILE;
-  
-  public static final String STOP_NON_WSI = "0";
-  public static final String WARN_NON_WSI = "1";
-  public static final String IGNORE_NON_WSI = "2";
-  
-  protected static boolean eclipseContext = false;
-
-  /**
-   *  Constructor.
-   */
-  protected WSITestToolsProperties()
-  {
-    super();
-  }
-  
-  public static void setEclipseContext(boolean eclipseActive)
-  {
-    eclipseContext = eclipseActive;
-  }
-  
-  public static boolean getEclipseContext()
-  {
-    return eclipseContext;
-  }
-  
-  /**
-   * Set the schema location.
-   * @param dir the schema location.
-   */
-  public static void setInstallDir(String dir)
-  {
-    installURL = dir.replace('\\', '/');
-  }
-  
-  /**
-   * Set local properties.
-   */
-  public static void setLocal()
-  {
-    Properties schemaLocationProperties = new Properties();
-    String schemaURL = installURL + schemaDir;
-    try
-    {
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.xmlschema.schema",
-        URIEncoder.encode(schemaURL + "XMLSchema.xsd", "UTF8"));
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.wsdl.schema",
-        URIEncoder.encode(schemaURL + "wsdl11.xsd", "UTF8"));
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.soap.schema",
-        URIEncoder.encode(schemaURL + "soapEnvelope.xsd", "UTF8"));
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.wsdlsoap.schema",
-        URIEncoder.encode(schemaURL + "wsdlSoap.xsd", "UTF8"));
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.xmlschema.schema",
-        URIEncoder.encode(schemaURL + "XMLSchema.xsd", "UTF8"));
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.wsdl.schema",
-        URIEncoder.encode(schemaURL + "wsdl11.xsd", "UTF8"));
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.soap.schema",
-        URIEncoder.encode(schemaURL + "soapEnvelope.xsd", "UTF8"));
-      schemaLocationProperties.setProperty(
-        "wsi.analyzer.wsdlsoap.schema",
-        URIEncoder.encode(schemaURL + "wsdlSoap.xsd", "UTF8"));
-    }
-    catch (UnsupportedEncodingException e)
-    {
-    }
-    WSIProperties.setThreadLocalProperties(schemaLocationProperties);
-  }
-
-  /**
-   * Checks the WS-I preferences for the given file and return them in a
-   * WSIPreferences object.
-   * 
-   * @param fileuri The file URI to check the WS-I preferences for.
-   * @return A WSIPreferences object containing the preference for this file URI.
-   */
-  public static WSIPreferences checkWSIPreferences(String fileuri)
-  {
-  	return new WSIPreferences();
-  }
-  
-  /**
-   * Remove file: and any slashes from the fileuri. 
-   * Eclipse's resolution mechanism needs to start with the drive.
-   */
-  protected static String trimURI(String fileuri)
-  {
-  	String uriStr = fileuri;
-  	
-    if(fileuri.startsWith("file:"))
-    {
-      uriStr = fileuri.substring(5);
-    }
-    while(uriStr.startsWith("/") || uriStr.startsWith("\\"))
-    {
-      uriStr = uriStr.substring(1);
-    }
-    return uriStr;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java
deleted file mode 100644
index 6a99390..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java
+++ /dev/null

@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.analyzer;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.wsi.internal.WSIPreferences;
-import org.eclipse.wst.wsi.internal.WSITestToolsEclipseProperties;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.AssertionResultsOptionImpl;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLElementImpl;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLReferenceImpl;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.impl.FailureDetailImpl;
-import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
-
-/**
- * MessageAnalyzer
- * 
- * A class that allows simple access to the WS-I Test Tools in order to analyze
- * messages in a log file.
- */
-
-public class MessageAnalyzer
-{
-  public final static String PLUGIN_ID = "org.wsi.test.tools";
-  
-  public final static String TYPE_PORT = "port";
-  public final static String TYPE_BINDING = "binding";
-  public final static String TYPE_PORTTYPE = "porttype";
-  public final static String TYPE_OPERATION = "operation";
-  public final static String TYPE_MESSAGE = "message";
-
-  // Test result Strings
-  protected final String NOTPASSED = "notPassed";
-  protected final String WARNING = "warning";
-  protected final String FAILED = "failed";
-  
-  protected String filename;
-  protected String wsdlfile = null;
-  protected String elementname = null;
-  protected String namespace = null;
-  protected String parentname = null;
-  protected boolean wsdlspecified = false;
-  protected String type  = null;
-  protected List assertionwarnings;
-  protected List assertionerrors;
-  protected WSIPreferences wsiPreferences = null;
-  
-  /**
-   * Constructor for MessageAnalyzer.
-   * @param filename log file name.
-   */
-  public MessageAnalyzer(String filename)
-  {
-    this.filename = filename.replace('\\', '/');
-
-    assertionwarnings = new Vector();
-    assertionerrors = new Vector();
-  	this.wsiPreferences = WSITestToolsEclipseProperties.checkWSIPreferences(filename);
-  }
-  
-  /**
-   * Constructor for MessageAnalyzer.
-   * @param filename log file name.
-   */
-  public MessageAnalyzer(String filename, WSIPreferences wsiPreferences)
-  {
-    this.filename = filename.replace('\\', '/');
-
-    assertionwarnings = new Vector();
-    assertionerrors = new Vector();
-  	this.wsiPreferences = wsiPreferences;
-  }
-
-  public MessageAnalyzer(String filename, String wsdlfile, String elementname, String namespace, String parentname, String type)
-  {
-  	this(filename.replace('\\', '/'));
-  	wsdlspecified = true;
-  	
-  	this.wsdlfile = wsdlfile.replace('\\', '/');
-  	this.elementname = elementname;
-  	this.namespace = namespace;
-  	this.parentname = parentname;
-  	this.type = type;
-  }
-
-  public MessageAnalyzer(String filename, String wsdlfile, String elementname, String namespace, String parentname, String type, WSIPreferences wsiPreferences)
-  {
-  	this(filename, wsiPreferences);
-  	wsdlspecified = true;
-  	
-  	this.wsdlfile = wsdlfile.replace('\\', '/');
-  	this.elementname = elementname;
-  	this.namespace = namespace;
-  	this.parentname = parentname;
-  	this.type = type;
-  }
-
-  /**
-   * Method validateConformance.
-   * 
-   * Checks the conformance of the given logfile against the WS-I Basic Profile.
-   * If there are conformance problems they can be obtained from getAssertionErrors.
-   * 
-   * @throws WSIAnalyzerException
-   */
-  public void validateConformance() throws WSIAnalyzerException
-  {
-    try
-    {
-	  WSITestToolsEclipseProperties.setLocal();
-	  
-	  if (wsiPreferences.getComplianceLevel() != WSITestToolsEclipseProperties.IGNORE_NON_WSI)
-	  {
-        DocumentFactory documentFactory = DocumentFactory.newInstance();
-        // Initialize the BasicProfileAnalyzer using an analyzerconfig object
-        AnalyzerConfig analyzerconfig = documentFactory.newAnalyzerConfig();
-        if(wsdlspecified)
-        {
-      	  WSDLReference wsdlref = new WSDLReferenceImpl();
-      	  wsdlref.setWSDLLocation(wsdlfile);
-      	
-      	  WSDLElement wsdlelem = new WSDLElementImpl();
-      	  wsdlelem.setName(elementname);
-      	  wsdlelem.setNamespace(namespace);
-      	  wsdlelem.setParentElementName(parentname);
-      	  wsdlelem.setType(type);
-      	
-      	  wsdlref.setWSDLElement(wsdlelem);
-      	
-      	  analyzerconfig.setWSDLReference(wsdlref);
-        }
-
-        AssertionResultsOption aro = new AssertionResultsOptionImpl();
-        aro.setAssertionResultType(AssertionResultType.newInstance(NOTPASSED));
-        aro.setShowAssertionDescription(false);
-        aro.setShowFailureDetail(false);
-        aro.setShowFailureMessage(false);
-        aro.setShowMessageEntry(false);
-
-        // although we don't use a stylesheet for our application it is required or the 
-        // WS-I tools will fail
-        AddStyleSheet addstylesheet = new AddStyleSheetImpl();
-
-        analyzerconfig.setAssertionResultsOption(aro);
-        analyzerconfig.setAddStyleSheet(addstylesheet);
-      
-        analyzerconfig.setCorrelationType("endpoint");
-  	    try
-		{
-		  analyzerconfig.setLogLocation(URIEncoder.encode(filename, "UTF8"));
-		  analyzerconfig.setTestAssertionsDocumentLocation(
-			   URIEncoder.encode(wsiPreferences.getTADFile(), "UTF8"));
-		}
-		catch (UnsupportedEncodingException uee)
-		{
-		  analyzerconfig.setLogLocation(URIEncoder.encode(filename, "UTF8"));
-	      analyzerconfig.setTestAssertionsDocumentLocation(URIEncoder.encode(wsiPreferences.getTADFile(), "UTF8"));
-		}
-        //analyzerconfig.setLogLocation(filename);
-        //analyzerconfig.setTestAssertionsDocumentLocation(getBasicProfileTestAssertionsFile());
-        analyzerconfig.setVerboseOption(false);
-      
-
-        List analyzerConfigs = new Vector();
-        analyzerConfigs.add(analyzerconfig);
-        // here's where the validation actually starts happening
-        WSIBasicProfileAnalyzer bpanalyzer = new WSIBasicProfileAnalyzer(analyzerConfigs);
-
-        bpanalyzer.validateAll();
-        ReportImpl report = (ReportImpl) bpanalyzer.getReport();
-
-        List entries = report.getEntries();
-
-        // if there are report entries we iterate through them and add all
-        // error and warning messages to the error list.
-        if (entries != null)
-        {
-          Iterator ientry = entries.iterator();
-          while (ientry.hasNext())
-          {
-            Entry entry = (Entry) ientry.next();
-            Map assertionResults = entry.getAssertionResultList();
-
-            if (assertionResults != null)
-            {
-              Iterator iassertionResults = assertionResults.values().iterator();
-
-              while (iassertionResults.hasNext())
-              {
-                AssertionResult ar = (AssertionResult) iassertionResults.next();
-
-                if (ar.getResult().equalsIgnoreCase(FAILED) && 
-                	wsiPreferences.getComplianceLevel().equals(WSITestToolsEclipseProperties.STOP_NON_WSI))
-                {
-                  TestAssertion ta = ar.getAssertion();
-                  if (ta.isEnabled())
-                  {
-                    Iterator errorMessages = ar.getFailureDetailList().iterator();
-                    while (errorMessages.hasNext())
-                    {
-                      FailureDetailImpl fdi = (FailureDetailImpl)errorMessages.next();
-                      int lineNumber = 0;
-                      int columnNumber = 0;
-                    
-                      ElementLocation el = fdi.getElementLocation();
-
-                      if (el != null)
-                      {
-                        lineNumber = el.getLineNumber();
-                        columnNumber = el.getColumnNumber();
-                      }
-
-                      //TODO: get assertion locations in the log file
-                      assertionerrors.add(
-                        new AssertionError(
-                        ta.getId(),
-                        "Message ID " + entry.getReferenceID() + ":" + ta.getFailureMessage(),
-                        lineNumber,
-                        columnNumber));
-                    }
-                  }
-                }
-                else if (ar.getResult().equalsIgnoreCase(FAILED) && 
-                         wsiPreferences.getComplianceLevel().equals(WSITestToolsEclipseProperties.WARN_NON_WSI))
-                {
-                  TestAssertion ta = ar.getAssertion();
-                  if (ta.isEnabled())
-                  {
-                    Iterator errorMessages = ar.getFailureDetailList().iterator();
-                    while (errorMessages.hasNext())
-                    {
-                      FailureDetailImpl fdi = (FailureDetailImpl)errorMessages.next();
-                      int lineNumber = 0;
-                      int columnNumber = 0;
-                    
-                      ElementLocation el = fdi.getElementLocation();
-
-                      if (el != null)
-                      {
-                        lineNumber = el.getLineNumber();
-                        columnNumber = el.getColumnNumber();
-                      }
-                      //TODO: get assertion locations in the log file
-                      assertionwarnings.add(
-                        new AssertionError(
-                        ta.getId(),
-                        "Message ID " + entry.getReferenceID() + ":" + ta.getFailureMessage(),
-                        lineNumber,
-                        columnNumber));
-                    }
-                  }
-                }
-              }
-            }
-          }
-        } 
-	  }
-    }
-    catch (WSIException e)
-    {
-      throw new WSIAnalyzerException("The MessageAnalyzer was unable to validate the given logfile.", e.getTargetException());
-    }
-    catch (Exception e)
-    {
-      throw new WSIAnalyzerException("The MessageAnalyzer was unable to validate the given logfile.");
-    }
-
-  }
-
-  /**
-   * Method getAssertionWarnings.
-   * Returns a list of any assertion warnings generated from validateConformance.
-   * @return List
-   */
-  public List getAssertionWarnings()
-  {
-    return assertionwarnings;
-  }
-
-  /**
-   * Method getAssertionFailures.
-   * Returns a list of any assertion errors generated from validateConformance.
-   * @return List
-   */
-  public List getAssertionErrors()
-  {
-    return assertionerrors;
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java
deleted file mode 100644
index 2623ecd..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java
+++ /dev/null

@@ -1,395 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.analyzer;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.wsi.internal.WSIPreferences;
-import org.eclipse.wst.wsi.internal.WSITestToolsEclipseProperties;
-import org.eclipse.wst.wsi.internal.WSITestToolsProperties;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.AssertionResultsOptionImpl;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLElementImpl;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.impl.WSDLReferenceImpl;
-import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
-import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
-import org.eclipse.wst.wsi.internal.core.report.Entry;
-import org.eclipse.wst.wsi.internal.core.report.impl.FailureDetailImpl;
-import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl;
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
-
-/**
- * WSDLAnalyzer
- * The interface to the WS-I Test Tools for analyzing a WSDL file.  Allows a WSDL file to be analyzed
- * at any of the following levels.
- *  port
- *  binding
- *  portType
- *  operation
- *  message
- */
-
-public class WSDLAnalyzer
-{
-  public final static String PLUGIN_ID = "org.wsi.test.tools";
-  
-  public static final String PORT = "port";
-  public static final String BINDING = "binding";
-  public static final String PORTTYPE = "portType";
-  public static final String OPERATION = "operation";
-  public static final String MESSAGE = "message";
-
-  protected final String NOTPASSED = "notPassed";
-  protected final String WARNING = "warning";
-  protected final String FAILED = "failed";
-  
-  protected List analyzerConfigs;
-  protected String wsdlURI;
-  // assertions to ignore - used for assertions that the tools have not implemented properly yet
-  //protected String[] ignoreAssertions = { /*"WSI2105" , "WSI2119"*/};
-  protected List assertionerrors;
-  protected List assertionwarnings;
-  protected WSIPreferences wsiPreferences = null;
-
-  /**
-   * Constructor.
-   * Given the file name, parent element name, the element to analyze and the type of element
-   * sets up the WSDLAnalyzer to analyze the file.
-   * @param fileName log file name.
-   * @param parentName parent element name.
-   * @param namespace  a namespace.
-   * @param elementName the element to analyze.
-   * @param elementType the type of the element.
-   * @param wsiPreferences the preferences.
-   * @throws WSIAnalyzerException if unable to add configuration information.
-   */
-  public WSDLAnalyzer(String fileName, String parentName, String namespace, String elementName, String elementType, WSIPreferences wsiPreferences) throws WSIAnalyzerException
-  {
-    this(fileName, wsiPreferences);
-    addConfigurationToTest(parentName, namespace, elementName, elementType);
-
-  }
-
-  /**
-   * Constructor.
-   * Given the file name, parent element name, the element to analyze and the type of element
-   * sets up the WSDLAnalyzer to analyze the file.
-   * @param fileName log file name.
-   * @param parentName parent element name.
-   * @param namespace  a namespace.
-   * @param elementName the element to analyze.
-   * @param elementType the type of the element.
-   * @throws WSIAnalyzerException if unable to add configuration information.
-   */
-  public WSDLAnalyzer(String fileName, String parentName, String namespace, String elementName, String elementType) throws WSIAnalyzerException
-  {
-    this(fileName);
-    addConfigurationToTest(parentName, namespace, elementName, elementType);
-
-  }
-
-  /**
-   * Constructor.
-   * @param fileName  log file name.
-   */
-  public WSDLAnalyzer(String fileName, WSIPreferences wsiPreferences)
-  {
-    reset(fileName);
-    this.wsiPreferences = wsiPreferences;
-  }
-
-  /**
-   * Constructor.
-   * @param fileName  log file name.
-   */
-  public WSDLAnalyzer(String fileName)
-  {
-    reset(fileName);
-    if(WSITestToolsProperties.getEclipseContext())
-    {
-      this.wsiPreferences = WSITestToolsEclipseProperties.checkWSIPreferences(fileName);
-    }
-    else
-    {
-  	  this.wsiPreferences = WSITestToolsProperties.checkWSIPreferences(fileName);
-    }
-  }
-
-  public WSIPreferences getWSIPreferences()
-  {
-	  return this.wsiPreferences;
-  }
-	  
-  /**
-   * validateConformance.
-   * Validate the WSDL file as setup in the constructor.
-   * @throws WSIAnalyzerException if unable to validate the given WSDL File.
-   */
-  public void validateConformance() throws WSIAnalyzerException
-  {
-    try
-    {
-      WSITestToolsProperties.setLocal();
-	  
-	  if (wsiPreferences.getComplianceLevel() != WSITestToolsProperties.IGNORE_NON_WSI)
-	  {
-        // here's where the validation actually starts happening
-        WSIBasicProfileAnalyzer bpanalyzer = new WSIBasicProfileAnalyzer(analyzerConfigs,wsdlURI);
-        bpanalyzer.validateAll();
-        ReportImpl report = (ReportImpl) bpanalyzer.getReport();
-
-        List entries = report.getEntries();
-
-        // if there are report entries we iterate through them and add all
-        // error and warning messages to the error list. 
-        if (entries != null)
-        {
-          Iterator ientry = entries.iterator();
-          while (ientry.hasNext())
-          {
-            Entry entry = (Entry) ientry.next();
-            Map assertionResults = entry.getAssertionResultList();
-
-            if (assertionResults != null)
-            {
-              Iterator iassertionResults = assertionResults.values().iterator();
-
-              while (iassertionResults.hasNext())
-              {
-                AssertionResult ar = (AssertionResult) iassertionResults.next();
-                TestAssertion ta = ar.getAssertion();
-                // add in to skip errors for assertions that are reporting incorrect problems.
-                // This allows us to not report incorrect errors reported in the tools without disabling them
-                //              String assertionId = ta.getId();
-                //              boolean ignoreAssertion = false;
-                //              for(int i = ignoreAssertions.length-1; i >=0;i--)
-                //              {
-                //              	if(ignoreAssertions[i].equalsIgnoreCase(assertionId))
-                //              	{
-                //              		ignoreAssertion = true;
-                //              	}
-                //              }
-                //              if(ignoreAssertion)
-                //              {
-                //              	continue;
-                //              }
-                if (ar.getResult().equalsIgnoreCase(FAILED) && 
-                	wsiPreferences.getComplianceLevel().equals(WSITestToolsProperties.STOP_NON_WSI))
-                {
-                  if (ta.isEnabled())
-                  {
-                    List errorMessageList = ar.getFailureDetailList();
-                    if (errorMessageList != null)
-                    {
-                      Iterator errorMessages = errorMessageList.iterator();
-
-                      while (errorMessages.hasNext())
-                      {
-                        FailureDetailImpl fdi = (FailureDetailImpl) errorMessages.next();
-                        int lineNumber = 0;
-                        int columnNumber = 0;
-
-                        ElementLocation el = fdi.getElementLocation();
-
-                        if (el != null)
-                        {
-                          lineNumber = el.getLineNumber();
-                          columnNumber = el.getColumnNumber();
-                        }
-
-                        assertionerrors.add(
-                          new AssertionError(ta.getId(), ta.getFailureMessage(), lineNumber, columnNumber));
-                      }
-                    }
-                    // the errorMessageList is null but there is an error so assign it to line 0 for now
-                    else
-                    {
-                      assertionerrors.add(new AssertionError(ta.getId(), ta.getFailureMessage(), 0, 0));
-                    }
-                  }
-                }
-                else if (ar.getResult().equalsIgnoreCase(FAILED) && 
-                         wsiPreferences.getComplianceLevel().equals(WSITestToolsProperties.WARN_NON_WSI))
-                {
-                  if (ta.isEnabled())
-                  {
-                    List errorMessageList = ar.getFailureDetailList();
-                    if (errorMessageList != null)
-                    {
-                      Iterator errorMessages = errorMessageList.iterator();
-                      while (errorMessages.hasNext())
-                      {
-                        FailureDetailImpl fdi = (FailureDetailImpl) errorMessages.next();
-                        int lineNumber = 0;
-                        int columnNumber = 0;
-
-                        ElementLocation el = fdi.getElementLocation();
-
-                        if (el != null)
-                        {
-                          lineNumber = el.getLineNumber();
-                          columnNumber = el.getColumnNumber();
-                        }
-                        assertionwarnings.add(
-                          new AssertionError(ta.getId(), ta.getFailureMessage(), lineNumber, columnNumber));
-                      }
-                    }
-                    // the errorMessageList is null but there is an error so assign it to line 0 for now
-                    else
-                    {
-                      assertionwarnings.add(new AssertionError(ta.getId(), ta.getFailureMessage(), 0, 0));
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-	  }
-    }
-
-    catch (Exception e)
-    {
-      throw new WSIAnalyzerException(e + "The WSDLAnalyzer was unable to validate the given WSDL File.");
-    }
-
-  }
-
-  /**
-   * Add configuration information.
-   * @param parentName parent element name.
-   * @param namespace  a namespace.
-   * @param elementName the element to analyze.
-   * @param elementType the type of the element.
-   * @throws WSIAnalyzerException if unable to add configuration information.
-   */
-  public void addConfigurationToTest(
-    String parentName,
-    String namespace,
-    String elementName,
-    String elementType) throws WSIAnalyzerException
-  {
-  	try
-  	{
-      WSDLReference wsdlReference = new WSDLReferenceImpl();
-
-      WSDLElement wsdlElement = (WSDLElement) new WSDLElementImpl();
-      wsdlElement.setType(elementType);
-      if (parentName != null)
-      {
-        wsdlElement.setParentElementName(parentName);
-      }
-      wsdlElement.setNamespace(namespace);
-      wsdlElement.setName(elementName);
-      wsdlReference.setWSDLElement(wsdlElement);
-
-      wsdlReference.setWSDLLocation(wsdlURI);
-      DocumentFactory documentFactory = DocumentFactory.newInstance();
-      // Initialize the BasicProfileAnalyzer using an analyzerconfig object
-      AnalyzerConfig analyzerconfig = documentFactory.newAnalyzerConfig();
-
-      AssertionResultsOption aro = new AssertionResultsOptionImpl();
-      aro.setAssertionResultType(AssertionResultType.newInstance(NOTPASSED));
-      aro.setShowAssertionDescription(false);
-      aro.setShowFailureDetail(false);
-      aro.setShowFailureMessage(false);
-      aro.setShowMessageEntry(false);
-
-      // although we don't use a stylesheet for our application it is required or the 
-      // WS-I tools will fail
-      AddStyleSheet addstylesheet = new AddStyleSheetImpl();
-
-      analyzerconfig.setAssertionResultsOption(aro);
-      analyzerconfig.setAddStyleSheet(addstylesheet);
-      analyzerconfig.setReplaceReport(true);
-      //analyzerconfig.setLogLocation(filename);
-	  try
-	 {
-	   analyzerconfig.setTestAssertionsDocumentLocation(
-		 URIEncoder.encode(wsiPreferences.getTADFile(), "UTF8"));
-	 }
-	 catch (UnsupportedEncodingException uee)
-	 {
-	   analyzerconfig.setTestAssertionsDocumentLocation(URIEncoder.encode(wsiPreferences.getTADFile(), "UTF8"));
-
-	 }
-      analyzerconfig.setVerboseOption(false);
-
-      // set the wsdlReference
-      analyzerconfig.setWSDLReference(wsdlReference);
-      analyzerConfigs.add(analyzerconfig);
-    }
-    catch (Exception e)
-    {
-      throw new WSIAnalyzerException("Unable to add AnalyzerConfig to list. " + e);
-    }
-  }
-  /**
-   * Method getAssertionFailures.
-   * Return a list of the assertion failures.
-   * @return a list of the assertion failures.
-   */
-  public List getAssertionErrors()
-  {
-    return assertionerrors;
-  }
-
-  /**
-  	 * Method getAssertionWarnings.
-  	 * Returns a list of any assertion warnings generated from validateConformance.
-  	 * @return a list of any assertion warnings generated from validateConformance.
-  	 */
-  public List getAssertionWarnings()
-  {
-    return assertionwarnings;
-  }
-  
-  /**
-   * Reset.
-   * @param filename log file name.
-   */
-  public void reset(String filename)
-  {
-	if (filename != null)
-	{
-	  String tmp = filename.replace('\\', '/');
-	  if ((!tmp.startsWith(WSIConstants.HTTP_PREFIX)) &&
-          (!tmp.startsWith(WSIConstants.FILE_PREFIX)))
-	  {
-	    tmp = WSIConstants.FILE_PROTOCOL + tmp;
-	  }
-	  try
-	  {
-	    wsdlURI = URIEncoder.encode(tmp, "UTF8");
-	  }
-	  catch (UnsupportedEncodingException uee)
-	  {
-	  }
-	}
-  	analyzerConfigs = new Vector();
-  	assertionerrors = new Vector();
-  	assertionwarnings = new Vector();
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIAnalyzerException.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIAnalyzerException.java
deleted file mode 100644
index 5777853..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIAnalyzerException.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.analyzer;
-
-/**
- * AnalyzerException
- * 
- * Exception to be thrown if an analyzer fails
- */
-public class WSIAnalyzerException extends Exception
-{
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3835158350219194677L;
-	/**
-   * Throwable.
-   */
-  protected Throwable throwable = null;
-
-  /**
-   * Constructor for AnalyzerException.
-   */
-  public WSIAnalyzerException()
-  {
-    super();
-  }
-
-  /**
-   * Constructor for AnalyzerException.
-   * @param s detail message.
-   */
-  public WSIAnalyzerException(String s)
-  {
-    super(s);
-  }
-
-  /**
-   * Create an exception with a message and related exception.
-   * 
-   * @param msg        the exception message
-   * @param throwable  throwable that is related to this exception
-   */
-  public WSIAnalyzerException(String msg, Throwable throwable)
-  {
-    // Exception
-    super(msg);
-
-    // Save input reference
-    this.throwable = throwable;
-  }
-
-  /**
-   * Returns the String representation of this object's values.
-   *
-   * @return Returns the detail message of this throwable object.
-   */
-  public String getMessage()
-  {
-    return super.getMessage();
-  }
-
-  /**
-   * Returns the exception that caused this exception to be created.
-   * 
-   * @return Returns the encapsulated throwable object.
-   */
-  public Throwable getTargetException()
-  {
-    // Return throwable
-    return throwable;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java
deleted file mode 100644
index fb9b928..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.analyzer;
-
-import java.util.List;
-
-import org.eclipse.wst.wsi.internal.core.ToolInfo;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.analyzer.BasicProfileAnalyzer;
-import org.eclipse.wst.wsi.internal.core.profile.validator.ProfileValidatorFactory;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.util.MessageList;
-import org.eclipse.wst.wsi.internal.document.DocumentFactoryImpl;
-
-/**
- * WSIBasicProfileAnalyzer
- * 
- * An extension of the BasicProfileAnalyzer from the WS-I Test Tools that
- * allows calling code to get the report generated from WS-I validation.
- */
-public class WSIBasicProfileAnalyzer extends BasicProfileAnalyzer
-{
-  /**
-   * Default document factory class name.
-   */
-  public static final String DEF_DOCUMENT_FACTORY = "org.eclipse.wsi.test.tools.util.document.DocumentFactoryImpl";
-
-  /**
-   * Constructor for WSIBasicProfileAnalyzer.
-   * @param analyzerConfig configuration information.
-   * @param wsdlURI the location of the WSDL document.
-   * @throws WSIException @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public WSIBasicProfileAnalyzer(List analyzerConfig, String wsdlURI) throws WSIException
-  {
-    super(analyzerConfig, wsdlURI);
-  }
-
-  /**
-   * Constructor for WSIBasicProfileAnalyzer.
-   * @param analyzerConfig configuration information.
-   * @throws WSIException @throws WSIException if unable to create a Basic profile analyzer.
-   */
-  public WSIBasicProfileAnalyzer(List analyzerConfig) throws WSIException
-  {
-    super(analyzerConfig);
-  }
-
-  /**
-   * Common initialization.
-   * @param toolInfo a ToolInfo object.
-   * @throws WSIException if problems during initialization.
-   */
-  protected void init(ToolInfo toolInfo) throws WSIException
-  {
-    this.toolInfo = toolInfo;
-    
-    // Create message list
-    messageList = new MessageList(RESOURCE_BUNDLE_NAME);
-
-    // Create profile validator factory
-    factory = ProfileValidatorFactory.newInstance();
-
-    // Create document factory
-    documentFactory = new DocumentFactoryImpl();
-  }
-
-  /**
-   * Method getReport.
-   * 
-   * Return the Report generated by the validation.
-   * @return the Report generated by the validation.
-   */
-  public Report getReport()
-  {
-    return reporter.getReport();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/document/DocumentFactoryImpl.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/document/DocumentFactoryImpl.java
deleted file mode 100644
index c29eaf0..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/document/DocumentFactoryImpl.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.document;
-
-
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.eclipse.wst.wsi.internal.core.report.ReportWriter;
-import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl;
-import org.eclipse.wst.wsi.internal.report.ReportNoWriterImpl;
-
-/**
- * DocumentFactoryImpl
- * 
- * Extends the WS-I Test Tools document factory to specify specific Report
- * and ReportWriter classes needed for inclusion of the tools in WSAD.
- */
-public class DocumentFactoryImpl extends org.eclipse.wst.wsi.internal.core.document.impl.DocumentFactoryImpl
-{
-
-  /**
-   * Constructor for DocumentFactoryImpl.
-   */
-  public DocumentFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * Create a new instance of a DocumentWriter.
-   */
-  public ReportWriter newReportWriter()
-  {
-    // Return implementation
-    return new ReportNoWriterImpl();
-  }
-
-  /**
-   * Create report.
-   * @return newly created report.
-   */
-  public Report newReport()
-  {
-    return new ReportImpl();
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/report/AssertionError.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/report/AssertionError.java
deleted file mode 100644
index 3e0ec82..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/report/AssertionError.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
- package org.eclipse.wst.wsi.internal.report;
-
-/**
- * AssertionError
- * 
- * Object to hold an assertion error generated by the WS-I Test Tools.
- * Provides access to all the information about the error including the
- * id, message and location in the file.
- */
-public class AssertionError
-{
-
-  protected String message;
-  protected String assertionid;
-  protected int column;
-  protected int line;
-  /**
-   * Constructor for AssertionError.
-   */
-  public AssertionError()
-  {
-    message = assertionid = "";
-    line = column = 0;
-  }
-
-  /**
-   * Constructor for AssertionError.
-   * @param id assertion id.
-   * @param message a error message.
-   * @param line a line number.
-   * @param column a column number.
-   */
-  public AssertionError(String id, String message, int line, int column)
-  {
-    this.assertionid = id;
-    this.message = message;
-    this.line = line;
-    this.column = column;
-  }
-
-  /**
-   * Method setAssertionID.
-   * @param id assertion id.
-   * @see #getAssertionID
-   */
-  public void setAssertionID(String id)
-  {
-    assertionid = id;
-  }
-
-  /**
-   * Method getAssertionID.
-   * @return asserion id.
-   * @see #setAssertionID
-   */
-  public String getAssertionID()
-  {
-    return assertionid;
-  }
-
-  /**
-   * Method setErrorMessage.
-   * @param message a error message.
-   * @see #getErrorMessage
-   */
-  public void setErrorMessage(String message)
-  {
-    this.message = message;
-  }
-
-  /**
-   * Method getErrorMessage.
-   * @return error message.
-   * @see #setErrorMessage
-   */
-  public String getErrorMessage()
-  {
-    return message;
-  }
-
-  /**
-   * Method setLine.
-   * @param line line number.
-   * @see #getLine
-   */
-  public void setLine(int line)
-  {
-    this.line = line;
-  }
-
-  /**
-   * Method getLine.
-   * @return line number.
-   * @see #setLine
-   */
-  public int getLine()
-  {
-    return line;
-  }
-
-  /**
-   * Method setColumn.
-   * @param column column number.
-   * @see #getColumn
-   */
-  public void setColumn(int column)
-  {
-    this.column = column;
-  }
-
-  /**
-   * Method getColumn.
-   * @return column number.
-   * @see #setColumn
-   */
-  public int getColumn()
-  {
-    return column;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/report/ReportNoWriterImpl.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/report/ReportNoWriterImpl.java
deleted file mode 100644
index 7f3725c..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/report/ReportNoWriterImpl.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.report;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.report.Report;
-import org.w3c.dom.Document;
-
-/**
- * WS-I conformance test ReportWriter for wsi plugin.
- * This ReportWriter writes nothing so no report file will be created.
- */
-public class ReportNoWriterImpl implements org.eclipse.wst.wsi.internal.core.report.ReportWriter
-{
-
-  /**
-   * @see java.lang.Object#Object()
-   */
-  public ReportNoWriterImpl()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#getDocument()
-   */
-  public Document getDocument() throws UnsupportedOperationException
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#setWriter(String)
-   */
-  public void setWriter(String documentLocation) throws IOException
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#write(Reader)
-   */
-  public void write(Reader reader) throws WSIException, IllegalStateException
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#write(Reader, Writer)
-   */
-  public void write(Reader reader, Writer writer) throws WSIException
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ReportWriter#write(Report)
-   */
-  public void write(Report report) throws IllegalStateException
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.report.ReportWriter#write(Report, Writer)
-   */
-  public void write(Report report, Writer writer)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.wsi.test.document.DocumentWriter#close()
-   */
-  public void close() throws WSIException, IllegalStateException
-  {
-  }
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java
deleted file mode 100644
index b84694f..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java
+++ /dev/null

@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.internal.validate.wsdl;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-
-import org.eclipse.wst.wsdl.validation.internal.IValidationInfo;
-import org.eclipse.wst.wsdl.validation.internal.IWSDLValidator;
-import org.eclipse.wst.wsdl.validation.internal.ValidationInfoImpl;
-import org.eclipse.wst.wsdl.validation.internal.exception.ValidateWSDLException;
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver;
-import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidationInfoImpl;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDLDocument;
-import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDLReaderImpl;
-import org.eclipse.wst.wsi.internal.WSIPreferences;
-import org.eclipse.wst.wsi.internal.WSITestToolsProperties;
-import org.eclipse.wst.wsi.internal.analyzer.WSDLAnalyzer;
-import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException;
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
-import org.w3c.dom.Document;
-
-/**
- * The WSI validator plugs into the WSDL validator to provide
- * validation for a WSDL document with respect to the WS-I Basic Profile (currently 1.0).
- * This class acts as an bridge between the WS-I tools and the WSDL Validator.
- * 
- * @author Lawrence Mandel (lmandel@ca.ibm.com)
- * @author Wajiha Rehman
- */
-public class WSDLValidator implements IWSDLValidator
-{
-  protected final String _EXC_UNABLE_TO_VALIDATE_WSI = "_EXC_UNABLE_TO_VALIDATE_WSI";
-
-  // indications for types of errors
-  protected final int ERROR = 2;
-  protected final int WARNING = 1;
-  
-  protected MessageGenerator messagegenerator = null;
-  protected boolean wsiValid = false;
-
-  /**
-   * Constructor.
-   */
-  public WSDLValidator()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wsdl.validate.IWSDLValidator#validate(org.w3c.dom.Document, org.eclipse.wsdl.validate.ValidationInfo)
-   */
-  public void validate(Document domModel, IValidationInfo valInfo) throws ValidateWSDLException
-  {
-	boolean withAttachments = false;
-	boolean withBasic = false;
-	Object attValue = valInfo.getAttribute("http://ws-i.org/profiles/BasicWithAttachments/ComplianceLevel");
-	if(attValue == null)
-	{
-	  attValue = valInfo.getAttribute("http://ws-i.org/profiles/Basic/ComplianceLevel");
-   	  if(attValue != null)
-	  {
-	    withBasic = true;
-	  }
-	}
-	else
-	{
-	  withAttachments = true;
-	}
-	String wsiLevel = WSITestToolsProperties.WARN_NON_WSI;
-	if(attValue != null)
-	{
-	  String value = (String)attValue;
-	  if(value.equals("IGNORE"))
-	  {
-	  	wsiLevel = WSITestToolsProperties.IGNORE_NON_WSI;
-	  }
-	  else if(value.equals("REQUIRE"))
-	  {
-	   	wsiLevel = WSITestToolsProperties.STOP_NON_WSI;
-	  }
-	}
-	// If we are ignoring WS-I then don't run the tests.
-	if(wsiLevel.equals(WSITestToolsProperties.IGNORE_NON_WSI))
-	{
-	  return;
-	}
-	    
-  	wsiValid = true;
-  	Definition definition = null;
-	boolean hasAnalyzerConfig = false;
-	String uri = valInfo.getFileURI();
-  	try
-  	{
-      //WSDLFactory factory = WSDLFactory.newInstance();
- 	  ValidationInfoImpl vali = new ValidationInfoImpl(valInfo.getFileURI(), messagegenerator);
-  	  vali.setURIResolver((URIResolver)valInfo.getURIResolver());
-      WSDLReaderImpl reader = new WSDLReaderImpl(new WSDL11ValidationInfoImpl(vali));
-      WSDLDocument[] docs = reader.readWSDL(uri, domModel);
-      int numdocs = docs.length;
-      for(int i = 0; i < numdocs; i++)
-      {
-        WSDLDocument tempDoc = docs[i];
-		if(tempDoc.getDefinition().getDocumentBaseURI().equals(valInfo.getFileURI()))
-        {
-          definition = tempDoc.getDefinition();  
-          break;
-        }
-      }
-  	}
-  	catch(WSDLException e)
-  	{
-  	  throw new ValidateWSDLException(messagegenerator.getString(_EXC_UNABLE_TO_VALIDATE_WSI,uri));
-  	}
-	    
-    if (definition != null && valInfo != null)
-    {
-      String namespace = definition.getTargetNamespace();
-
-      // get all the collections we may need to validate
-      Collection services = definition.getServices().values();
-      Collection bindings = definition.getBindings().values();
-      Collection portTypes = definition.getPortTypes().values();
-      Collection messages = definition.getMessages().values();
-
-      WSDLAnalyzer wsdlAnalyzer;
-	  if(withAttachments)
-	  {
-	  	WSIPreferences preferences = new WSIPreferences();
-   	    preferences.setComplianceLevel(wsiLevel);
-	    preferences.setTADFile(WSITestToolsProperties.AP_ASSERTION_FILE);
-	    wsdlAnalyzer = new WSDLAnalyzer(uri, preferences);
-	  }
-	  else if(withBasic)
-	  {
-	  	WSIPreferences preferences = new WSIPreferences();
-		preferences.setComplianceLevel(wsiLevel);	
-	    preferences.setTADFile(WSITestToolsProperties.SSBP_ASSERTION_FILE);
-	    wsdlAnalyzer = new WSDLAnalyzer(uri, preferences);
-	  }
-	  else
-	  {
-		// default preference setting
-	  	wsdlAnalyzer = new WSDLAnalyzer(uri);
-	  }
-
-	  // The WS-I conformance tools require that each service be analyzed separately.
-	  // Get all the services and analyze them.
-	  if (services != null && !services.isEmpty())
-	  {
-	    Iterator serviceIterator = services.iterator();
-
-	    while (serviceIterator.hasNext())
-        {
-          Service service = (Service) serviceIterator.next();
-
-          String servicename = service.getQName().getLocalPart();
-
-          Collection ports = service.getPorts().values();
-          if (ports != null && !ports.isEmpty())
-          {
-            // The WS-I tools must be called once for each port within each service.
-            Iterator portIterator = ports.iterator();
-            while (portIterator.hasNext())
-            {
-              Port port = (Port) portIterator.next();
-
-              try
-              {
-                wsdlAnalyzer.addConfigurationToTest(servicename, namespace, port.getName(), WSDLAnalyzer.PORT);
-				hasAnalyzerConfig = true;
-              }
-              catch (WSIAnalyzerException e)
-              {
-                // TODO: Add code to log error 
-                //System.out.println("exception " + e);
-              }
-
-            }
-          }
-        }
-      }
-      // validate at the binding level - check for every binding
-      else if (bindings != null && !bindings.isEmpty())
-      {
-        Iterator bindingIterator = bindings.iterator();
-
-        while (bindingIterator.hasNext())
-        {
-          Binding binding = (Binding) bindingIterator.next();
-
-          String bindingname = binding.getQName().getLocalPart();
-          try
-          {
-            wsdlAnalyzer.addConfigurationToTest(null, namespace, bindingname, WSDLAnalyzer.BINDING);
-			hasAnalyzerConfig = true;
-          }
-          catch (WSIAnalyzerException e)
-          {
-            // TODO: Add code to log error 
-            //System.out.println("exception " + e);
-          }
-        }
-      }
-      // validate at the portType level - check for every portType
-      else if (portTypes != null && !portTypes.isEmpty())
-      {
-        Iterator portTypeIterator = portTypes.iterator();
-        while (portTypeIterator.hasNext())
-        {
-          PortType portType = (PortType) portTypeIterator.next();
-          String portTypename = portType.getQName().getLocalPart();
-          try
-          {
-            wsdlAnalyzer.addConfigurationToTest(null, namespace, portTypename, WSDLAnalyzer.PORTTYPE);
-			hasAnalyzerConfig = true;
-          }
-          catch (WSIAnalyzerException e)
-          {
-            // TODO: Add code to log error 
-            //System.out.println("exception " + e);
-          }
-        }
-      }
-      // validate at the message level - check for every message
-      else if (messages != null && !messages.isEmpty())
-      {
-        Iterator messageIterator = messages.iterator();
-
-        while (messageIterator.hasNext())
-        {
-          Message message = (Message) messageIterator.next();
-          String messagename = message.getQName().getLocalPart();
-          try
-          {
-            wsdlAnalyzer.addConfigurationToTest(null, namespace, messagename, WSDLAnalyzer.MESSAGE);
-			hasAnalyzerConfig = true;
-          }
-          catch (WSIAnalyzerException e)
-          {
-            // TODO: Add code to log error 
-            //System.out.println("exception " + e);
-          }
-        }
-      }
-      try
-      {
-        // only run the analyzer if there is something to check
-		if(hasAnalyzerConfig)
-		{
-		  // run the conformance check and add errors and warnings as needed
-		  wsdlAnalyzer.validateConformance();
-			  
-		  // If the level is suggest all errors should be reported as warnings.
-		  if(wsdlAnalyzer.getWSIPreferences().getComplianceLevel().equals(WSITestToolsProperties.WARN_NON_WSI))
-		  {
-		    addWarnings(wsdlAnalyzer.getAssertionErrors(), valInfo);
-		  }
-		  else
-		  {
-		    addErrors(wsdlAnalyzer.getAssertionErrors(), valInfo);
-		  }
-		  addWarnings(wsdlAnalyzer.getAssertionWarnings(), valInfo);
-		}
-      }
-	  catch (WSIAnalyzerException e)
-	  {
-		// TODO: Add code to log error 
-		System.out.println("Unable to run WS-I WSDL conformance check.\n" + e);
-	  }
-    }
-  }
-
-  /**
-   * Add error messages to the validationcontroller.
-   * 
-   * @param errors The list of errors to add.
-   * @param valInfo The object that contains the validation information.
-   */
-  protected void addErrors(List errors, IValidationInfo valInfo)
-  {
-    reportProblems(errors, valInfo, ERROR);
-  }
-
-  /**
-   * Add warning messages to the validationcontroller.
-   * 
-   * @param warnings The list of warnings to add.
-   * @param valInfo The object that contains the validation information.
-   */
-  protected void addWarnings(List warnings, IValidationInfo valInfo)
-  {
-    reportProblems(warnings, valInfo, WARNING);
-  }
-
-  /**
-   * Report the problems specified for the given type to the validationcontroller.
-   * 
-   * @param problems The problems to report.
-   * @param valInfo The object to report the problems to.
-   * @param type The type of messages to add.
-   */
-  protected void reportProblems(List problems, IValidationInfo valInfo, int type)
-  {
-    // if there were no problems just return
-    if (problems == null)
-      return;
-
-    
-    Iterator problemsIterator = problems.iterator();
-    while (problemsIterator.hasNext())
-    {
-      AssertionError assertionerror = (AssertionError) problemsIterator.next();
-      if (type == ERROR)
-      {
-		wsiValid = false;
-        valInfo.addError(
-        		WSIConstants.WSI_PREFIX + "(" + assertionerror.getAssertionID()+ ") " + assertionerror.getErrorMessage(),
-          assertionerror.getLine(),
-          assertionerror.getColumn(),
-          valInfo.getFileURI());
-
-      }
-      else if (type == WARNING)
-      {
-        valInfo.addWarning(
-        		WSIConstants.WSI_PREFIX + "(" + assertionerror.getAssertionID()+ ") " + assertionerror.getErrorMessage(),
-          assertionerror.getLine(),
-          assertionerror.getColumn(),
-          valInfo.getFileURI());
-      }
-    }
-  }
-
-  /**
-   * @see org.eclipse.wsdl.validate.controller.IWSDLValidator#setResourceBundle(java.util.ResourceBundle)
-   */
-  public void setResourceBundle(ResourceBundle rb)
-  {
-    messagegenerator = new MessageGenerator(rb);
-  }
-
-  /**
-   * @see org.eclipse.wsdl.validate.controller.IWSDLValidator#isValid()
-   */
-  public boolean isValid()
-  {
-    return wsiValid;
-  }
-
-}

diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/wsivalidate.properties b/bundles/org.eclipse.wst.wsi/wsivalidate/wsivalidate.properties
deleted file mode 100644
index 8a906b4..0000000
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/wsivalidate.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-# /**
-#  * <copyright>
-#  *
-#  * Copyright (c) 2002-2003 IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Common Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/cpl-v10.html
-#  * 
-#  * Contributors: 
-#  *   IBM - Initial API and implementation
-#  *
-#  * </copyright>
-#  */
-
-_EXC_UNABLE_TO_VALIDATE_WSI = Unable to validate WS-I conformance.  An error occured reading the WSDL document {0}.
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.axis.infopop/.project b/docs/org.eclipse.jst.ws.axis.infopop/.project
deleted file mode 100644
index ac4579a..0000000
--- a/docs/org.eclipse.jst.ws.axis.infopop/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/docs/org.eclipse.jst.ws.axis.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.axis.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 4f54f9b..0000000
--- a/docs/org.eclipse.jst.ws.axis.infopop/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Web services Axis UI
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.infopop; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true

diff --git a/docs/org.eclipse.jst.ws.axis.infopop/about.html b/docs/org.eclipse.jst.ws.axis.infopop/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.jst.ws.axis.infopop/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.axis.infopop/axisconsumptionui-f1Contexts.xml b/docs/org.eclipse.jst.ws.axis.infopop/axisconsumptionui-f1Contexts.xml
deleted file mode 100644
index 07ef125..0000000
--- a/docs/org.eclipse.jst.ws.axis.infopop/axisconsumptionui-f1Contexts.xml
+++ /dev/null

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-
-<!--WebServiceAxisProxyPage.java-->
-
-<context id="PWJB0003">
-<!--Folder field of the WSDL to Java Bindings Page-->
-<description>Select the project in which the Web service will be created.</description>
-</context>
-
-<context id="PWJB0009">
-<!--Indicates whether to generate a proxy or not-->
-<description>Select this check box Java bean client proxy to the Web service. The Java bean client proxy that is generated provides a remote procedure call interface to the Web service.</description>
-</context>
-
-<context id="PWJB0016">
-<!--Show Mappings checkbox of the Bean Methods Page-->
-<description>Select this check box to customize the mappings between packages and namespaces.</description>
-</context>
-
-<!--WebServiceAxisMappingsPage.java-->
-
-<context id="PWJM0001">
-<!--WSDL to Java Mappings Page-->
-<description>Use this panel to add customized package to namespace mappings.</description>
-</context>
-
-</contexts>

diff --git a/docs/org.eclipse.jst.ws.axis.infopop/axiscreationui-f1Contexts.xml b/docs/org.eclipse.jst.ws.axis.infopop/axiscreationui-f1Contexts.xml
deleted file mode 100644
index b9e7b19..0000000
--- a/docs/org.eclipse.jst.ws.axis.infopop/axiscreationui-f1Contexts.xml
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<!--WebServiceAxisBeanClassPage.java-->
-
-<context id="PBCL0001">
-<!--Bean Selection Page-->
-<description>Use this page to select the Java bean from which you will create your Web service.</description>
-</context>
-
-<context id="PBCL0002">
-<!--Bean Selection field of the Bean Selection Page-->
-<description>Enter the name of the Java bean to be used to create the Web service. Defaults the selected Java bean. Click <b>Browse classes </b>to view the bean class of the selected Java bean. The bean class is a model or template (an abstract data type) that can be instantiated to create objects with a common definition and therefore, common properties, operations, and behavior. Click <b>Browse files </b>to select a Java bean from the project.</description>
-</context>
-
-<context id="PBCL0003">
-<!--Bean Class Browse button of the Bean Selection Page-->
-<description>Click to view the bean class of the selected Java bean.</description>
-</context>
-
-<context id="PBCL0004">
-<!--Bean Resource Browse button of the Bean Selection Page-->
-<description>Click this button to browse to a Java bean on your system to be used to create a Web service.</description>
-</context>
-
-<!--WebServiceAxisBeanConfigPage.java-->
-<context id="PBCF0001">
-<!--Bean Identity Page-->
-<description>On this page you can select the name of the WSDL file that will be generated, and the methods that will be included in the Web service.</description>
-</context>
-<context id="PBCF0002">
-<!--URI field of the Bean Config Page-->
-<description>This field contains the unique identifier of the Web service. It is read-only.</description>
-</context>
-<context id="PBCF0006">
-<!--WSDL Folder field in the Bean Config Page-->
-<description>This field contains the folder where the WSDL file will be generated. It is read-only.</description>
-</context>
-<context id="PBCF0007">
-<!--WSDL File field of the Bean Config Page-->
-<description>This field contains the name of the WSDL file that will be generated. Accept the default or enter a new name.</description>
-</context>
-
-<context id="PBME0002">
-<!--Methods tree of the Bean Methods Page-->
-<description>Select from the available Java bean methods which ones to include in your Web service.</description>
-</context>
-<context id="PBME0010">
-<!--Select All button of the Bean Methods Page-->
-<description>Click this button to include all listed methods in your Web service.</description>
-</context>
-<context id="PBME0011">
-<!--Deselect All button of the Bean Methods Page-->
-<description>Click this button to remove all listed methods from your Web service.</description>
-</context>
-
-<context id="PBCF0016">
-<!--Show Mappings checkbox of the Bean Methods Page-->
-<description>Select this check box to customize the mappings between packages and namespaces.</description>
-</context>
-
-
-<!--WebServiceSkeletonAxisConfigPage.java-->
-
-<context id="PBSC0001">
-<!--Skeleton Config Page-->
-<description>Use this page to specify information about the Java bean skeleton being created.</description>
-</context>
-<context id="PBCF0002">
-<!--URI field of the Bean Config Page-->
-<description>This field lists the SOAP body namespace and unique identifier of the Web service being created.</description>
-</context>
-<context id="PBCF0006">
-<!--WSDL Folder field in the Bean Config Page-->
-<description>This field lists the location of the WSDL file being generated.</description>
-</context>
-<context id="PBCF0007">
-<!--WSDL File field of the Bean Config Page-->
-<description>Enter the name of the WSDL file being created, or accept the default.</description>
-</context>
-<context id="PBSC0004">
-<!--Skeleton Folder field of the Skeleton Config Page-->
-<description>Enter the location where the Java bean skeleton will be created, or accept the default.</description>
-</context>
-<context id="PBSC0005">
-<!--Skeleton Folder Browse button of the Skeleton Config Page-->
-<description>Use this button to browse to the location where you want the Java bean skeleton to be created.</description>
-</context>
-<context id="PBCF0016">
-<!--Show Mappings checkbox of the Bean Methods Page-->
-<description>Select this check box to customize the mappings between packages and namespaces.</description>
-</context>
-
-
-</contexts>

diff --git a/docs/org.eclipse.jst.ws.axis.infopop/build.properties b/docs/org.eclipse.jst.ws.axis.infopop/build.properties
deleted file mode 100644
index ca7adc1..0000000
--- a/docs/org.eclipse.jst.ws.axis.infopop/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-bin.includes = axisconsumptionui-f1Contexts.xml,\
-               axiscreationui-f1Contexts.xml,\
-               plugin.xml,\
-               about.html,\
-               META-INF/
-src.includes = build.properties

diff --git a/docs/org.eclipse.jst.ws.axis.infopop/plugin.xml b/docs/org.eclipse.jst.ws.axis.infopop/plugin.xml
deleted file mode 100644
index 430617d..0000000
--- a/docs/org.eclipse.jst.ws.axis.infopop/plugin.xml
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?> 
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-	<extension point="org.eclipse.help.contexts">
-		<contexts file="axisconsumptionui-f1Contexts.xml" plugin="org.eclipse.jst.ws.axis.consumption.ui"/>
-		<contexts file="axiscreationui-f1Contexts.xml" plugin="org.eclipse.jst.ws.axis.creation.ui"/>
-	</extension>
-</plugin>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/.project b/docs/org.eclipse.jst.ws.axis.ui.doc.user/.project
deleted file mode 100644
index c0232a5..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/.project
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.ui.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.axis.ui.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index adbb422..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.ui.doc.user
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="2.1",
- org.eclipse.core.runtime.compatibility
-Eclipse-AutoStart: true

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/about.html b/docs/org.eclipse.jst.ws.axis.ui.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/build.properties b/docs/org.eclipse.jst.ws.axis.ui.doc.user/build.properties
deleted file mode 100644
index 363a491..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-bin.includes = plugin.properties,\
-               plugin.xml,\
-               wsaxisbuild_toc.xml,\
-               about.html,\
-               concepts/,\
-               tasks/,\
-               META-INF/
-src.includes = build.properties

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/concepts/caxistover.html b/docs/org.eclipse.jst.ws.axis.ui.doc.user/concepts/caxistover.html
deleted file mode 100644
index 780868d..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/concepts/caxistover.html
+++ /dev/null

@@ -1,71 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating Web services with the Apache Axis run-time environment</title>
-</head>
-<body id="axisoverview"><a name="axisoverview"><!-- --></a>
-
-<h1 class="topictitle1">Creating Web services with the Apache Axis run-time environment</h1>
-<div><p>This run-time environment is for users who prefer to develop for
-the open Apache Axis platform. It is for non-production use only. Axis is
-the third generation of the Apache SOAP implementation.  It evolved from
-Apache SOAP (which began at IBM<sup>®</sup> as SOAP4J) to make the SOAP engine more flexible,
-configurable, and able to handle both SOAP and the upcoming XML Protocol specification
-from the W3C open-source effort.</p>
-<div class="section"><h4 class="sectiontitle">Overview</h4><p>Axis is based on JSR 101 Java APIs
-for XML based RPC (also known as JAX-RPC).  JSR 101 provides a single
-interface to any XML-based RPC mechanism, including SOAP.</p>
-<p>Web services
-application server uses Axis within a servlet to process the incoming message,
-extract information from the message headers, and payloads, as well as conforming
-to the particular RPC semantics. </p>
-<p>The level of Axis currently supported
-by Rational Developer products is 1.0.  For more information on Axis,
-refer to  <a href="http://xml.apache.org/axis" target="_blank">http://xml.apache.org/axis</a>.
-The User's Guide available on this site provides more in-depth information
-about using Web services with Apache Axis. The Reading Guide lists several
-documents to further your understanding of Axis.</p>
-<div class="note"><span class="notetitle">Note:</span> The support for
-Axis in Rational Developer products is limited to validation that the application
-is invoking the Axis emitters correctly. Support for other Axis issues should
-be directed to <a href="http://ws.apache.org/axis" target="_blank">http://ws.apache.org/axis</a></div>
-</div>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../tasks/twsbeana.html">Creating a Web service from a Java bean using the Apache Axis run-time environment</a></strong><br />
-The Web Service wizard assists you in creating a new Web service,
-configuring it for deployment, and deploying the Web service to a server.
-Once your Web service is deployed, the wizard assists you in generating the
-client proxy and sample application to test the Web service. When you have
-completed testing, you can publish your Web service to a UDDI Business Registry
-using the Export wizard.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tsklwsdla.html">Creating a Java bean skeleton from a WSDL document using the Apache Axis run-time environment</a></strong><br />
-The Web service wizard assists you in creating a skeleton bean
-from an existing WSDL document. The skeleton bean contains a set of methods
-that correspond to the operations described in the WSDL document. When the
-bean is created, each method has a trivial implementation that you replace
-by editing the bean.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tsampappa.html">Generating a Java client proxy and a sample application from a WSDL document using the Axis run-time environment</a></strong><br />
-The Web Service Client wizard assists you in generating a Java bean
-proxy and a sample application. The sample Web application demonstrates how
-to code a proxy file.</li>
-</ul>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html">Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cjaxrpc.html">JAX-RPC</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/tasks/toverws.html"> Developing Web services</a></div></div>
-</div>
-<p>
-		(C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
-		</p> 
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/plugin.xml b/docs/org.eclipse.jst.ws.axis.ui.doc.user/plugin.xml
deleted file mode 100644
index 8c0ab31..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/plugin.xml
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?> 
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-  
-	<extension point="org.eclipse.help.toc">
-		<toc file="wsaxisbuild_toc.xml" />
-
-	</extension>
-</plugin>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsampappa.html b/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsampappa.html
deleted file mode 100644
index 3c48821..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsampappa.html
+++ /dev/null

@@ -1,119 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Generating a Java client proxy and a sample application from
-a WSDL document using the Axis run-time environment</title>
-</head>
-<body id="tsampappa"><a name="tsampappa"><!-- --></a>
-
-<h1 class="topictitle1">Generating a Java client proxy and a sample application
-from a WSDL document using the Axis run-time environment</h1>
-<div><p>The Web Service Client wizard assists you in generating a Java bean
-proxy and a sample application. The sample Web application demonstrates how
-to code a proxy file.</p>
-<div class="p"><p>Prerequisites:</p>
-<ol><li>If you are using the Apache Jakarta Tomcat servlet
-container as your server, you must install it, configure an instance of it,
-and create a Web project targeted to it as described in <a href="ttomcatserv.html">Creating an Apache Tomcat server and Web project</a></li>
-<li>Discover and import a WSDL document into the Web project. You can only
-use a WSDL file that contains a service element.</li>
-</ol>
-</div>
-<div class="section">To generate a Java client proxy and a sample application
-from a discovered WSDL document:</div>
-<ol><li><span>Switch to the J2EE perspective (<span class="uicontrol">Window &gt; Open Perspective
-&gt; J2EE</span>).</span></li>
-<li><span>In the Navigator view, select the Web project in which you want
-to generate a sample application.</span></li>
-<li><span>Click  <span class="uicontrol">File &gt; New &gt; Other</span>. Select  <span class="uicontrol">Web
-Services</span> in order to display the various Web service wizards.
-Select the  <span class="uicontrol">Web Service Client</span> wizard. Click  <span class="uicontrol">Next</span>.</span></li>
-<li><span>Web Services page: Select the type of proxy to be generated, and
-whether or not it will be tested.</span></li>
-<li><span>Client Environment Configuration page: Select the run-time environment
-and the server for your Web service client.</span><ol type="a"><li class="substepexpand"><span>Click  <span class="uicontrol">Explore Options</span> and select the
-Apache Axis run-time environment and select the server on which you want to
-run your Web service client.</span></li>
-<li class="substepexpand"><span>Select the type and name of project in which you want the Web
-service client created.</span> <ul><li> If you enter the name of an existing project, the project type field
-must match that of the existing project. Ensure that the project selected
-as the Client Web Project is different from the Service Web Project, or the
-service will be overwritten by the client's generated artifacts.</li>
-<li>If you enter a name of a project that does not already exist, the wizard
-will create the project for you.</li>
-<li>Note that the only project type supported for Axis and SOAP run-time clients
-is a Web project. If you want the client to be created in a Java, EJB,
-or Application Client project, you must select the WebSphere<sup>®</sup> run-time environment for
-your client.</li>
-</ul>
-</li>
-</ol>
-</li>
-<li><span>Web Service Selection page: Enter the URI to the WSDL, WSIL, or
-HTML file that will be used to generate the client. You can optionally generate
-a WSIL file from this file as well.</span></li>
-<li><span>Web Service Proxy page: This panel shows the options for the proxy.
-It lists the folder where the proxy will be generated, and you can optionally
-create custom mappings between namespaces and packages.</span></li>
-<li><span>Web Service Namespace to Package Mappings page: if you selected
- <span class="uicontrol">Define custom mapping for namespace to package</span> on
-the previous page, you can enter your custom mapping pairs on this page by
-clicking  <span class="uicontrol">Add</span>.</span></li>
-<li><span>Web Service Client Test page: Select the test facility that you
-will use to test the proxy, and the methods that you want included in the
-proxy. Note that the Universal Test Client (UTC) is only compatible with Web
-service clients deployed on WebSphere servers.</span></li>
-<li><span>Click  <span class="uicontrol">Finish</span>. If you have selected to test
-the proxy, the test client will open in a browser window.</span></li>
-</ol>
-<div class="section"><p>The generated Java bean proxy provides a remote procedure
-call interface to the Web service. The sample Web application demonstrates
-how to code the proxy file.</p>
-<p>Once you have generated your Java client
-proxy, you may test the methods of the Web service through the proxy using
-Web Services sample JSPs or the Universal test client.</p>
-<ul><li>If you have selected to test the generated proxy using Web service JSPs,
-the proxy is launched in a Web browser at the following URL: <samp class="codeph">http://localhost: <var class="varname">port</var>/ <var class="varname">WebProject</var>Client/sample<em>BeanName</em>/ <var class="varname">WebServiceName</var>/TestClient.jsp</samp> You
-can use this sample application to test the Web service by selecting a method,
-entering a value for the method, and clicking  <span class="uicontrol">Invoke</span>.
-The result of the method will display in the results pane.</li>
-<li>If you have selected to test the generated proxy using the Universal Test
-Client, it will be launched in a browser window at the following URL:  <tt class="sysout">http://localhost:9080/UTC/preload?object= <var class="varname">BeanPackage</var>. <var class="varname">BeanServiceProxy</var></tt>. In the Reference pane,
-under Object References, expand the proxy stub to display the methods of the
-Web service. Click the method you want to test, enter a value in the Parameters
-pane, and click  <span class="uicontrol">Invoke</span>. The result will be generated
-below.</li>
-<li>If you have selected to test the Web service using the Web Services Explorer,
-the Explorer will open. Select the operation you want to test, enter the required
-information, and click  <strong>Go</strong>. The result will display in the Status pane.</li>
-</ul>
-<p>For more information on creating a Web project, refer to the Web application
-development documentation.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/caxistover.html" title="This run-time environment is for users who prefer to develop for the open Apache Axis platform. It is for non-production use only. Axis is the third generation of the Apache SOAP implementation.  It evolved from Apache SOAP (which began at IBM as SOAP4J) to make the SOAP engine more flexible, configurable, and able to handle both SOAP and the upcoming XML Protocol specification from the W3C open-source effort.">Creating Web services with the Apache Axis run-time environment</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cruntime.html"> Web services run-time environments</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.html"> Using the Web Services Explorer</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/ref/rwsdl.html">WSDL documents</a></div></div>
-</div>
-<p>
-		(C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
-		</p> 
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsklwsdla.html b/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsklwsdla.html
deleted file mode 100644
index c3505c6..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsklwsdla.html
+++ /dev/null

@@ -1,154 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a Java bean skeleton from a WSDL document using the
-Apache Axis run-time environment</title>
-</head>
-<body id="tsklwsdla"><a name="tsklwsdla"><!-- --></a>
-
-<h1 class="topictitle1">Creating a Java bean skeleton from a WSDL document using the Apache
-Axis run-time environment</h1>
-<div><p>The Web service wizard assists you in creating a skeleton bean
-from an existing WSDL document. The skeleton bean contains a set of methods
-that correspond to the operations described in the WSDL document. When the
-bean is created, each method has a trivial implementation that you replace
-by editing the bean.</p>
-<div class="p"><p>Prerequisites:</p>
-<ol><li id="tsklwsdla__createtomcatlink"><a name="tsklwsdla__createtomcatlink"><!-- --></a>If you are using the Apache Jakarta Tomcat servlet
-container as your server, you must install it, configure an instance of it,
-and create a Web project targeted to it as described in <a href="ttomcatserv.html">Creating an Apache Tomcat server and Web project</a></li>
-<li>Create or import a WSDL file into the Web Content folder of the Web project.
-You can only use a WSDL file that contains a service element.</li>
-</ol>
-</div>
-<div class="section">To create a Web service from a WSDL file using the Apache Axis 1.0
-run-time environment:</div>
-<ol><li class="stepexpand"><span>Switch to the J2EE perspective (<span class="uicontrol">Window &gt; Open Perspective
-&gt; J2EE</span>).</span></li>
-<li class="stepexpand"><span>In the Project Explorer view, select the WSDL file that you created
-or imported into the Web Content folder of your Web project.</span></li>
-<li class="stepexpand"><span>Click  <span class="uicontrol">File &gt; New &gt; Other</span>. Select  <span class="uicontrol">Web
-Services</span> in order to display the various Web service wizards.
-Select the  <span class="uicontrol">Web Service</span> wizard. Click  <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Web Services page: select  <span class="uicontrol">Top down Java bean Web service</span> as
-your Web service type. You can optionally choose to do the following: </span> <ul><li>Start the Web service in a Web project - if you do not select this option
-you will have to manually start the Web service. You must select this option
-to enable the other options on this page.</li>
-<li>Launch the Web Services Explorer to publish your Web service to a UDDI
-registry.</li>
-<li>Generate a Java bean client proxy to the Web service. The Java bean
-client proxy that is generated provides a remote procedure call interface
-to the Web service.</li>
-<li>Test the Web service - this allows you to test the Web service in the
-Web Service Explorer before a proxy is generated.</li>
-<li>Send the Web service traffic through the TCP/IP Monitor, which allows
-you to watch the SOAP traffic generated by the Web service and to test this
-traffic for WS-I compliance. Note that this is only supported for Tomcat v4.0
-and v4.1. If you are using Tomcat v5.0 and want to monitor the Web service
-traffic, you need to manually set up a TCP/IP monitor as described in <a href="../../org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html">../../org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html</a></li>
-</ul>
-</li>
-<li class="stepexpand"><span>Web Service Selection page: Enter the URI to the WSDL, WSIL, or
-HTML file that will be used to generate the Java bean. If you have selected the WSDL
-file before starting the wizard, this information should be prefilled. You
-can optionally generate a WSIL file from this file as well.</span>  Ensure
-that there are no spaces at the beginning of the URI or you may generate a
-null pointer exception.</li>
-<li class="stepexpand"><span>Service Deployment Configuration page: specify the server and client
-deployment settings.</span><ol type="a"><li class="substepexpand"><span>Click  <span class="uicontrol">Edit</span> and select the Apache Axis
-run-time environment and select the server on which you want to run your Web
-service and Web service client.</span></li>
-<li class="substepexpand"><span>Select the Web project in which you want your Web service created. </span> The wizard will create this for you if they do not already exist.</li>
-<li class="substepexpand"><span>Select the type and name of project in which you want the Web
-service client created. If you enter the name of an existing project, the
-project type field must match that of the existing project. If you enter a
-name of a project that does not already exist, the wizard will create the
-project for you. Note that the only project type supported for Axis and SOAP
-run-time clients is a Web project. If you want the client to be created in
-a Java,
-EJB, or Application Client project, you must select the WebSphere<sup>®</sup> run-time
-environment for your client.</span></li>
-</ol>
-</li>
-<li class="stepexpand"><span>Web Services Skeleton Java Bean Configuration page: Select the
-folder where the generated Java will be stored. If you want to review
-or edit the mappings between packages and namespaces, select the  <span class="uicontrol">Define
-custom mapping for namespace to package</span> check box. Click  <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Web Service Namespace to Package Mappings page: if you selected
- <span class="uicontrol">Define custom mapping for package to namespace</span> on
-the previous panel, you can enter your custom mapping pairs on this panel
-by clicking  <span class="uicontrol">Add.</span> Click  <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Web Service Test page: If you selected to test the Web service,
-select the test facility for the generated Web service. This will open the
-Web service in the Web Services Explorer. Select the operation you want to
-test, enter the required information, and click  <span class="uicontrol">Go</span>.
-The result will display in the Status pane. Click  <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Web Service Proxy page: If you have selected to generate a proxy,
-this page shows the options for the proxy. It lists the folder where the proxy
-will be generated, and you can optionally create custom mappings between namespaces
-and packages. Click  <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Web Service Client Test page: Use this page to select the following
-options: </span><ol type="a"><li><span>Select your test facility. You can test the generated proxy
-in the Universal Test Client or the Web Service Explorer, or you can generate
-a sample Web service JSP.</span></li>
-<li><span>If you selected to test the proxy through a JSP, you can select
-the folder where the JSP will be located, and you can select the methods that
-will be included in the JSP.</span></li>
-<li><span>Select  <span class="uicontrol">Run test on server</span> to start the
-server for you automatically.</span></li>
-</ol>
-</li>
-<li class="stepexpand"><span>Web Service Publication page: If you have selected to publish your
-Web service to a UDDI registry, use this page to launch the Web Services Explorer
-and select the UDDI registry to which the Web service will be published. Click
- <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="section">After the Web service has been created, the following may occur depending
-on the options you selected: <ul><li>If you have selected to test the generated proxy using Web service JSPs,
-the proxy is launched in a Web browser at the following URL: <samp class="codeph">http://localhost: <var class="varname">port</var>/ <var class="varname">WebProject</var>Client/sample<em>BeanName</em>/<var class="varname">WebServiceName</var>/TestClient.jsp</samp> You
-can use this sample application to test the Web service by selecting a method,
-entering a value for the method, and clicking  <span class="uicontrol">Invoke</span>.
-The result of the method will display in the results pane.</li>
-<li>If you have selected to test the generated proxy using the Universal Test
-Client, it will be launched in a browser window at the following URL:  <tt class="sysout">http://localhost:9080/UTC/preload?object= <var class="varname">BeanPackage</var>. <var class="varname">BeanServiceProxy</var></tt>. In the Reference pane,
-under Object References, expand the proxy stub to display the methods of the
-Web service. Click the method you want to test, enter a value in the Parameters
-pane, and click  <span class="uicontrol">Invoke</span>. The result will be generated
-below.</li>
-<li>If you have selected to test the Web service using the Web Services Explorer,
-the Explorer will open. Select the operation you want to test, enter the required
-information, and click  <strong>Go</strong>. The result will display in the Status pane.</li>
-<li>If you have selected to publish the Web service, the Web Services Explorer
-is launched displaying the page required to publish your Web service to the IBM<sup>®</sup> UDDI
-Test Registry. Follow the instructions in  <var class="varname">Publishing the Web service</var> to
-complete this task.</li>
-</ul>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/caxistover.html" title="This run-time environment is for users who prefer to develop for the open Apache Axis platform. It is for non-production use only. Axis is the third generation of the Apache SOAP implementation.  It evolved from Apache SOAP (which began at IBM as SOAP4J) to make the SOAP engine more flexible, configurable, and able to handle both SOAP and the upcoming XML Protocol specification from the W3C open-source effort.">Creating Web services with the Apache Axis run-time environment</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cruntime.html"> Web services run-time environments</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/tasks/toverws.html"> Developing Web services</a></div>
-<div><a href="../../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.html"> Using the Web Services Explorer</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/ref/rwsdl.html">WSDL documents</a></div></div>
-</div>
-<p>
-		(C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
-		</p> 
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/ttomcatserv.html b/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/ttomcatserv.html
deleted file mode 100644
index bc99c1a..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/ttomcatserv.html
+++ /dev/null

@@ -1,60 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating an Apache Tomcat server and Web project</title>
-</head>
-<body id="creatinganapachetomcatserver"><a name="creatinganapachetomcatserver"><!-- --></a>
-
-<h1 class="topictitle1">Creating an Apache Tomcat server and Web project</h1>
-<div><p>If you plan to create a Web service that uses Apache Jakarta Tomcat
-as its server, Tomcat must be installed and a server created before you begin
-creating your Web service.</p>
-<div class="p">Install Apache Jakarta Tomcat from this URL: <a href="http://jakarta.apache.org/tomcat" target="_blank">http://jakarta.apache.org/tomcat</a></div>
-<div class="section">Once you have installed the server, create a Tomcat server in the
-workbench by doing the following: </div>
-<ol><li class="stepexpand"><span>From the File menu, select <span class="uicontrol">New &gt; Other &gt; Server &gt; Server
-&gt; Next</span>.</span></li>
-<li class="stepexpand"><span>Select Tomcat v 3.x, 4.x or v5.0 as the server type, electing the
-correct version of Tomcat for your install, and click <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>On the Tomcat server page:</span><ol type="a"><li><span>Enter a server name.</span></li>
-<li><span>Specify where Tomcat is installed.</span></li>
-<li><span>Click <span class="uicontrol">Installed JREs</span>, click <span class="uicontrol">Add</span>,
-and enter the appropriate information for the JDK you plan to use for Tomcat.
-For example, for Tomcat v5.0 the JRE name would be jdk141 and the JRE home
-would be the home directory for JDK 1.4.1. Click <span class="uicontrol">OK</span> twice
-once you have entered this information. Ensure that the newly added JDK is
-now selected in the JRE field of the Tomcat server page. Note that if you
-point the server at a JRE rather than a JDK the JSPs will not properly compile
-and will not be able to run on the Tomcat server.</span></li>
-</ol>
-</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span>  To see the
-server you have created in the workspace, from the Window menu select <span class="uicontrol">Show
-view &gt; Other &gt; Server &gt; Servers &gt; Ok.</span> </li>
-</ol>
-<div class="example"><p>To build a dynamic Web project that points to the Tomcat server
-that you have created:</p>
-<ol><li>Create the service Web project by selecting <span class="uicontrol">New &gt; Web &gt; Dynamic
-Web project</span>. Enter the following information: <ul><li>Web Project: enter a project name</li>
-<li>Servlet version: 2.3</li>
-<li>Target Server: Tomcat server v3.x, 4.x or 5.x depending on the version
-you installed</li>
-<li>Ensure that <span class="uicontrol">Add Module to an EAR module</span> is <em>not</em> selected.</li>
-</ul>
-</li>
-<li>Click <span class="uicontrol">Finish</span>.</li>
-<li>To associate the project with the server, right-click the Tomcat server
-you created in the Server view and select <span class="uicontrol">Add and remove projects</span>.
-Select the service and client projects from the Available projects list and
-click <span class="uicontrol">Add</span>. </li>
-</ol>
-</div>
-</div>
-<div></div>
-<p>
-		(C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
-		</p> 
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/twsbeana.html b/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/twsbeana.html
deleted file mode 100644
index cee53bf..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/twsbeana.html
+++ /dev/null

@@ -1,172 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a Web service from a Java bean using the Apache Axis
-run-time environment</title>
-</head>
-<body id="twsbeana"><a name="twsbeana"><!-- --></a>
-
-<h1 class="topictitle1">Creating a Web service from a Java bean using the Apache Axis run-time
-environment</h1>
-<div><p>The Web Service wizard assists you in creating a new Web service,
-configuring it for deployment, and deploying the Web service to a server.
-Once your Web service is deployed, the wizard assists you in generating the
-client proxy and sample application to test the Web service. When you have
-completed testing, you can publish your Web service to a UDDI Business Registry
-using the Export wizard.</p>
-<div class="p"><div class="p">Prerequisites:<ol><li>If you are using the Apache Jakarta Tomcat servlet
-container as your server, you must install it, configure an instance of it,
-and create a Web project targeted to it as described in <a href="ttomcatserv.html">Creating an Apache Tomcat server and Web project</a></li>
-<li>Create or import a bean into the Java source folder of the Web project.</li>
-</ol>
-</div>
-</div>
-<div class="section">To create a Web service from a bean using the Apache Axis run-time
-environment:</div>
-<ol><li class="stepexpand"><span>Switch to the J2EE perspective ( <span class="uicontrol">Window &gt; Open Perspective
-&gt; J2EE</span>).</span></li>
-<li class="stepexpand"><span>In the Project Explorer view, select the bean that you created
-or imported into the source folder of your Web project.</span></li>
-<li class="stepexpand"><span>Click  <span class="uicontrol">File &gt; New &gt; Other</span>.</span> Select<span class="uicontrol">Web
-Services</span> in order to display the various Web service wizards.
-Select the  <span class="uicontrol">Web Service</span> wizard. Click  <span class="uicontrol">Next</span>.</li>
-<li class="stepexpand"><span>Web Services page: select  <span class="uicontrol">Bottom up Java bean Web service</span> as
-your Web service type. You can optionally choose to do the following: </span> <ul><li>Start the Web service in a Web project - if you do not select this option
-you will have to manually start the Web service. You must select this option
-to enable the other options on this page.</li>
-<li>Launch the Web Services Explorer to publish your Web service to a UDDI
-registry.</li>
-<li>Generate a Java bean client proxy to the Web service. The Java bean
-client proxy that is generated provides a remote procedure call interface
-to the Web service.</li>
-<li>Test the Web service - this allows you to test the Web service in the
-Web Service Explorer before a proxy is generated.</li>
-<li>Send the Web service traffic through the TCP/IP Monitor, which allows
-you to watch the SOAP traffic generated by the Web service and to test this
-traffic for WS-I compliance. Note that this is only supported for Tomcat v4.0
-and v4.1. If you are using Tomcat v5.0 and want to monitor the Web service
-traffic, you need to manually set up a TCP/IP monitor as described in <a href="../../org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html">../../org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html</a></li>
-</ul>
-</li>
-<li class="stepexpand"><span>Object selection page: select the Java bean from which the Web service will
-be created.</span></li>
-<li class="stepexpand"><span>Service Deployment Configuration page: specify the server and client
-deployment settings.</span><ol type="a"><li class="substepexpand"><span>Click  <span class="uicontrol">Edit</span> and select the Apache Axis
-run-time environment and select the server on which you want to run your Web
-service and Web service client.</span></li>
-<li class="substepexpand"><span>Select the Web project in which you want your Web service created,
-and the EAR with which it will be associated. </span> The wizard will
-create these for you if they do not already exist.</li>
-<li class="substepexpand"><span>Select the type and name of project in which you want the Web
-service client created. If you enter the name of an existing project, the
-project type field must match that of the existing project. If you enter a
-name of a project that does not already exist, the wizard will create the
-project for you. Note that the only project type supported for Axis and SOAP
-run-time clients is a Web project. If you want the client to be
-created in a Java, EJB, or Application Client project, you must select
-the WebSphere<sup>®</sup> run-time
-environment for your client.</span></li>
-<li class="substepexpand"><span>Select an existing EAR or enter a unique name to associate the
-Web service client with a different EAR than the Web service EAR. <strong>Note:</strong> Selecting
-different EARs for the Web service and Web service client can reduce the chance
-of encountering run time errors, but will use more system resources.</span></li>
-</ol>
-</li>
-<li class="stepexpand"><span>A message will display stating that you have made a WS-I non-compliant
-selection.</span> The Apache Axis run-time environment is not WS-I compliant.
-Select <span class="uicontrol">Ignore</span>.</li>
-<li class="stepexpand"><span>Web Service Java Bean Identity page: the Web service
-URI and WSDL name will be listed.</span> You  have the following
-options:<ul><li>Select the methods to expose.</li>
-<li>Select the encoding style. RPC/Encoded is the recommended encoding style
-for the Axis run-time environment. This encoding method is not WS-I compliant.</li>
-<li>Select if you want to customize the package to namespace mappings.</li>
-</ul>
-Click  <span class="uicontrol">Next</span></li>
-<li class="stepexpand"><span>Web Service Package to Namespace Mappings page: if you selected
- <span class="uicontrol">Define custom mapping for package to namespace</span> on
-the previous panel, you can enter your custom mapping pairs on this panel
-by clicking  <span class="uicontrol">Add</span>.</span></li>
-<li class="stepexpand"><span>Web Service Test page: If you selected to test the Web service,
-select the test facility for the generated Web service.</span> This will
-open the Web service in the Web Services Explorer. Select the operation you
-want to test, enter the required information, and click<span class="uicontrol">Go</span>.
-The result will display in the Status pane. Click  <span class="uicontrol">Next</span>.</li>
-<li class="stepexpand"><span>Web Service Proxy page: if you have selected to generate a proxy,
-select if you want to customize the package to namespace mappings.</span></li>
-<li class="stepexpand"><span>Web Service Client Test page: Use this page to select the following
-options: </span><ol type="a"><li><span>Select your test facility. You can test the generated proxy
-in the Universal Test Client or the Web Service Explorer, or you can generate
-a sample Web service JSP.</span></li>
-<li><span>If you selected to test the proxy through a JSP, you can select
-the folder where the JSP will be located, and you can select the methods that
-will be included in the JSP.</span></li>
-<li><span>Select  <span class="uicontrol">Run test on server</span> to start the
-server for you automatically.</span></li>
-</ol>
-</li>
-<li class="stepexpand"><span>Web Service Publication page: Select whether or not you want to
-publish this Web service to a UDDI registry. Click <span class="uicontrol">Finish</span>. </span> Note: you may see a warning stating <samp class="codeph">Error in generating WSDL
-from Java. ClassNotFound: &lt;bean name&gt;</samp>. This error can be safely
-ignored.</li>
-</ol>
-<div class="section"><div class="p">After the Web service has been created, the following may occur
-depending on the options you selected: <ul><li>If you have selected to test the generated proxy using Web service JSPs,
-the proxy is launched in a Web browser at the following URL: http://localhost: <var class="varname">port</var>/ <var class="varname">WebProject</var>Client/sample<em>BeanName</em>/ <var class="varname">WebServiceName</var>/TestClient.jsp You can use
-this sample application to test the Web service by selecting a method, entering
-a value for the method, and clicking  <span class="uicontrol">Invoke</span>. The result
-of the method will display in the results pane.</li>
-<li>If you have selected to test the generated proxy using the Universal Test
-Client, it will be launched in a browser window at the following URL:  <tt class="sysout">http://localhost:9080/UTC/preload?object= <var class="varname">BeanPackage</var>. <var class="varname">BeanServiceProxy</var></tt>. In the Reference pane,
-under Object References, expand the proxy stub to display the methods of the
-Web service. Click the method you want to test, enter a value in the Parameters
-pane, and click  <span class="uicontrol">Invoke</span>. The result will be generated
-below.</li>
-<li>If you have selected to test the Web service using the Web Services Explorer,
-the Explorer will open. Select the operation you want to test, enter the required
-information, and click  <strong>Go</strong>. The result will display in the Status pane.</li>
-<li>If you have selected to publish the Web service, the Web Services Explorer
-is launched displaying the page required to publish your Web service to the IBM<sup>®</sup> UDDI
-Test Registry. Follow the instructions in  <var class="varname">Publishing the Web service</var> to
-complete this task.</li>
-</ul>
-</div>
-<p> <span class="uicontrol">Important:</span> If your methods contain types,
-not supported by the sample, such as arrays, indexed properties, and collections,
-the methods will be omitted from the sample and you will receive a warning
-message.</p>
-<p>Once you have created your Web service from a bean, you may
-test the methods of your Web service, using the Universal Test Client, and
-then publish your Web service to a UDDI Business Registry. For more information
-on publishing your Web service using the Web Services Explorer, refer to Publishing
-a Web service.  For more information on the Universal Test Client, refer
-to the Server tools online help.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/caxistover.html" title="This run-time environment is for users who prefer to develop for the open Apache Axis platform. It is for non-production use only. Axis is the third generation of the Apache SOAP implementation.  It evolved from Apache SOAP (which began at IBM as SOAP4J) to make the SOAP engine more flexible, configurable, and able to handle both SOAP and the upcoming XML Protocol specification from the W3C open-source effort.">Creating Web services with the Apache Axis run-time environment</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cruntime.html"> Web services run-time environments</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/tasks/toverws.html"> Developing Web services</a></div>
-<div><a href="../../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.html"> Using the Web Services Explorer</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/ref/rwsdl.html">WSDL documents</a></div></div>
-</div>
-<p>
-		(C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
-		</p> 
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.axis.ui.doc.user/wsaxisbuild_toc.xml b/docs/org.eclipse.jst.ws.axis.ui.doc.user/wsaxisbuild_toc.xml
deleted file mode 100644
index c3ec062..0000000
--- a/docs/org.eclipse.jst.ws.axis.ui.doc.user/wsaxisbuild_toc.xml
+++ /dev/null

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="wsaxis" >
-   <topic label="Creating an Apache Tomcat server and Web project" href="tasks/ttomcatserv.html"/>
-</toc>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.infopop/.project b/docs/org.eclipse.jst.ws.consumption.infopop/.project
deleted file mode 100644
index 440bda3..0000000
--- a/docs/org.eclipse.jst.ws.consumption.infopop/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.consumption.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/docs/org.eclipse.jst.ws.consumption.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.consumption.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index fb67cfd..0000000
--- a/docs/org.eclipse.jst.ws.consumption.infopop/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Web services UI
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption.infopop; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true

diff --git a/docs/org.eclipse.jst.ws.consumption.infopop/about.html b/docs/org.eclipse.jst.ws.consumption.infopop/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.jst.ws.consumption.infopop/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.infopop/build.properties b/docs/org.eclipse.jst.ws.consumption.infopop/build.properties
deleted file mode 100644
index c4a3dd2..0000000
--- a/docs/org.eclipse.jst.ws.consumption.infopop/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-bin.includes = plugin.xml,\
-               wsconsumptionui-f1Contexts.xml,\
-               wscreationui-f1Contexts.xml,\
-               about.html,\
-               META-INF/
-src.includes = build.properties

diff --git a/docs/org.eclipse.jst.ws.consumption.infopop/plugin.xml b/docs/org.eclipse.jst.ws.consumption.infopop/plugin.xml
deleted file mode 100644
index 3b80770..0000000
--- a/docs/org.eclipse.jst.ws.consumption.infopop/plugin.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?> 
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-  
-	<extension point="org.eclipse.help.contexts">
-		<contexts file="wsconsumptionui-f1Contexts.xml" plugin="org.eclipse.jst.ws.consumption.ui"/>
-		<contexts file="wscreationui-f1Contexts.xml" plugin="org.eclipse.jst.ws.creation.ui"/>
-	</extension>
-</plugin>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.infopop/wsconsumptionui-f1Contexts.xml b/docs/org.eclipse.jst.ws.consumption.infopop/wsconsumptionui-f1Contexts.xml
deleted file mode 100644
index 4550858..0000000
--- a/docs/org.eclipse.jst.ws.consumption.infopop/wsconsumptionui-f1Contexts.xml
+++ /dev/null

@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<!-- new v6 preference page-->
-<context id="SRPF0001">
-<!--server preference on the server runtime preference page-->
-<description>Select the default Web server to be used for Web service creation.</description>
-</context>
-<context id="SRPF0002">
-<!--runtime preference on the server runtime preference page-->
-<description>Select the default server run-time environment to be used for Web service creation.</description>
-</context>
-<context id="SRPF0003">
-<!--J2EE version preference on the server runtime preference page-->
-<description>Select the default J2EE version to be used for Web service creation.</description>
-</context>
-
-<!-- new v6 handler wizard-->
-<context id="AHDL0001">
-<!--Handler config page-->
-<description>Use this wizard to add and remove handlers for a Web service. The order in which they are listed represents the order in which the handlers will be acted upon.</description>
-</context>
-
-<context id="WSIL0001">
-<!--  WSIL Import Page-->
-<description>Enter the required information to generate a standardized WSDL reference (WSIL) document in your project.</description>
-</context>
-
-<context id="WSIL0002">
-<!--  WSIL Text field-->
-<description>Enter the name of the WSIL document being generated, or accept the default.</description>
-</context>
-
-<context id="WSIL0003">
-<!--  WSIL browse button-->
-<description>Browse to the location of a WSDL or WSIL file from which the new WSIL document will be generated.</description>
-</context>
-
-<context id="WSIL0004">
-<!--  WSIL table-->
-<description>This lists all the WSDL URIs that will be included in the WSIL document.</description>
-</context>
-
-<!--WebServiceTPBeanClassPage.java-->
-<context id="PBCL0001">
-<!--PBCL0001 for the Bean Selection Page-->
-<description>Use this page to select the Java bean or class used to create the Web service.</description>
-</context>
-<context id="PBCL0002">
-<!--PBCL0002 for the Bean Selection field of the Bean Selection Page-->
-<description>Enter the name of the Java bean to be used to create the Web service. Defaults the selected Java bean. Click <b>Browse classes </b>to view the bean class of the selected Java bean. The bean class is a model or template (an abstract data type) that can be instantiated to create objects with a common definition and therefore, common properties, operations, and behavior. Click <b>Browse files </b>to select a Java bean from the project.</description>
-</context>
-<context id="PBCL0003">
-<!--PBCL0003 for the Bean Class Browse button of the Bean Selection Page-->
-<description>Click to view the bean class of the selected Java bean.</description>
-</context>
-<context id="PBCL0004">
-<!--PBCL0004 for the Bean Resource Browse button of the Bean Selection Page-->
-<description>Browse to the correct Java bean to be used to create the Web service.</description>
-</context>
-
-
-<context id="PWPR0001">
-<!-- Project Page -->
-<description>Select the type of Web service you want to generate and any file and folder options for your Web service.</description>
-</context>
-
-<context id="PWPR0003">
-<!--Overwrite files without warning (checkbox)-->
-<description>Allows you to overwrite files without receiving a warning message asking for confirmation when overwriting files.</description>
-</context>
-
-<context id="PWPR0004">
-<!--Create folders when necessary (checkbox)-->
-<description>Select to create folders and folder structures without receiving a warning message asking for confirmation.</description>
-</context>
-
-<context id="PWPR0005">
-<!--  Generate Proxy check box of the Project Page -->
-<description>The generated Java bean proxy provides a remote procedure call interface to the Web service.</description>
-</context>
-
-<context id="PWPR0006">
-<!--  Test Proxy check box of the Project Page -->
-<description>Select this check box to test the generated proxy.</description>
-</context>
-
-<context id="PWPR0009">
-<!--  Start Web Project check box check box of the Project Page -->
-<description>Click to start the server. If you leave the box unchecked you will have to manually start the server.</description>
-</context>
-
-<context id="PWPR0010">
-<!-- Web Service Type combo box of the Project Page -->
-<description>Select the type of Web service you want to build. Your selection will affect the files available for selection.</description>
-</context>
-
-<context id="PWPR0011">
-<!--  Wizard Scenario Service group of the Project Page -->
-<description>Select the type of Web service you want to build. Your selection will affect the files available for selection.</description>
-</context>
-
-<context id="PWPR0011">
-<!--  Test service checkbox of the project page -->
-<description>Select this check box to launch the Web service in the Web Services Explorer in order to examine it.</description>
-</context>
-
-<context id="PWPR0012">
-<!--  Launch UDDI check box of the Project Page -->
-<description>Select this checkbox to launch the Web Services Explorer in order to publish the Web service to a UDDI registry.</description>
-</context>
-
-<context id="PWPR0013">
-<!--  Wizard Scenario Client group of the Project Page -->
-<description>The generated Java bean proxy provides a remote procedure call interface to the Web service.</description>
-</context>
-
-<context id="PWPR0014">
-<!--  Web Service Client Type combo box of the Project Page -->
-<description>Select the client proxy type. The generated Java bean proxy provides a remote procedure call interface to the Web service.</description>
-</context>
-
-<context id="PWPR0015">
-<!--  Check Out Files check box of the Project Page -->
-<description>Select to check out files without receiving a warning message asking for confirmation.</description>
-</context>
-
-
-<context id="PEBD0001">
-<!-- EAR Projects drop-down box -->
-<description>Select from the listed EAR projects.</description>
-</context>
-
-<context id="PEBD0002">
-<!-- Table containing all of the bean names -->
-<description>Select from the listed Java beans.</description>
-</context>
-
-<!--WebServiceTPBeanClassPage.java-->
-<context id="PBCL0001">
-<!--PBCL0001 for the Bean Selection Page-->
-<description>Use this page to select the Java bean or class used to create the Web service.</description>
-</context>
-
-<context id="PBCL0002">
-<!--PBCL0002 for the Bean Selection field of the Bean Selection Page-->
-<description>Enter the name of the Java bean to be used to create the Web service. Defaults the selected Java bean. Click <b>Browse classes </b>to view the bean class of the selected Java bean. The bean class is a model or template (an abstract data type) that can be instantiated to create objects with a common definition and therefore, common properties, operations, and behavior. Click <b>Browse files </b>to select a Java bean from the project.</description>
-</context>
-
-<context id="PBCL0003">
-<!--PBCL0003 for the Bean Class Browse button of the Bean Selection Page-->
-<description>Click to view the bean class of the selected Java bean.</description>
-</context>
-
-<context id="PBCL0004">
-<!--PBCL0004 for the Bean Resource Browse button of the Bean Selection Page-->
-<description>Browse to the correct Java bean to be used to create the Web service.</description>
-</context>
-
-
-<context id="PCON0001">
-<!-- WSDL Selection Page-->
-<description>Use this page to select the WSDL, WSIL, or HTML document that will be used to create the Web service.</description>
-</context>
-
-<context id="PCON0002">
-<!-- WSDL Document text field of the WSDL Selection Page-->
-<description>Enter the path to a WSDL, WSIL, or HTML document.</description>
-</context>
-
-<context id="PCON0003">
-<!-- WSDL Resource Browse button of the WSDL Selection Page-->
-<description>Browse to the location of a WSDL, WSIL, or HTML document.</description>
-</context>
-
-<context id="PCON0004">
-<!--  Generate WSIL button of the WSDL Selection Page-->
-<description>Select this check box to generate a standardized WSDL reference (WSIL) document in your project.</description>
-</context>
-
-<context id="PCON0005">
-<!--  WSIL Document text field of the WSDL Selection Page-->
-<description>Enter the path to an existing WSIL document, or select the location where the WSIL document will be created.</description>
-</context>
-
-<context id="PCON0006">
-<!--  WSIL Resource Browse button of the WSDL Selection Page-->
-<description>Browse to the location of an existing WSIL document</description>
-</context>
-
-
-<context id="PWPB0001">
-<!--  UDDI Publish Page -->
-<description>Select to launch the Web Services Explorer to allow you to publish the Web service.</description>
-</context>
-
-<context id="PWPB0002">
-<!--  UDDI Launch check box of the UDDI Publish Page-->
-<description>If selected will launch the Web Services Explorer to allow you to publish the Web service.</description>
-</context>
-
-<context id="PWRS0001">
-<!--  Run-time/servers in the Web Service type-->
-<description>Select the scenario configuration for run-time environments, servers, and projects.</description>
-</context>
-
-<context id="PWRS0004">
-<!--  service-side run-time environment selection of the run-time environment selection Page-->
-<description>This is the server-side run-time environment which the Web service will use. To change this click Edit.</description>
-</context>
-
-<context id="PWRS0005">
-<!-- service-side server selection of the run-time environment selection Page-->
-<description>This is the server-side server on which the Web service will run. To change this click Edit.</description>
-</context>
-
-<context id="PWRS0006">
-<!--  service-side Web project combo box of the run-time environment selection Page-->
-<description>Select the Web project or EJB project in which the Web service will be created. The wizard will create the Web project for you if it does not already exist. If you are using an EJB project, it must already exist.</description>
-</context>
-
-<context id="PWRS0007">
-<!--service-side EJB project combo box of the run-time environment selection Page-->
-<description>Select the EJB project in which the Web service will be created.</description>
-</context>
-
-<context id="PWRS0008">
-<!--  client-side run-time environment selection of the run-time environment selection Page-->
-<description>This is the client-side run-time environment which the Web service will use. To change this click Edit.</description>
-</context>
-
-<context id="PWRS0009">
-<!-- client-side server selection of the run-time environment selection Page-->
-<description>This is the client-side server on which the Web service will run. To change this click Edit.</description>
-</context>
-
-<context id="PWRS0010">
-<!--  service-side Web project combo box of the run-time environment selection Page-->
-<description>Select the project in which the Web service client will be created. The wizard will generate this project if it does not already exist.</description>
-</context>
-
-<context id="PWRS0011">
-<!-- client type combo box of the server run-time environment selection Page -->
-<description>Select from the listed project types the type of project that you want created to contain your Web service client.</description>
-</context>
-
-<context id="PWRS0012">
-<!-- EAR combo box of the server run-time environment selection Page -->
-<description>Select from the listed EAR projects. It is recommended that you select different EARs for the client and the service to avoid runtime errors. The wizard will create the EAR for you if it does not already exist.</description>
-</context>
-
-
-<context id="PWSM0001">
-<!-- Sample Page -->
-<description>The sample Web application demonstrates how to code the proxy file.</description>
-</context>
-
-<context id="PWSM0002">
-<!-- Test check box of the Sample Page -->
-<description>If selected will launch the sample Web application in the Web browser.</description>
-</context>
-
-<context id="PWSM0003">
-<!-- Test Type Combo box of the Sample Page -->
-<description>The sample Web application demonstrates how to code the proxy file.</description>
-</context>
-
-<context id="PWSM0005">
-<!-- Methods tree of the Sample Page -->
-<description>The methods that can be invoked on the service object and encoding styles for the method inputs and outputs. Only selected methods will be available for invocation and documented in the WSDL. Select encoding styles for input parameters and output return. The methods list will display supported methods for a selected service object.</description>
-</context>
-
-<context id="PWSM0006">
-<!-- Select All button of the Sample Page -->
-<description>Click this button to add all the available methods to the Web service sample proxy.</description>
-</context>
-
-<context id="PWSM0007">
-<!-- Deselect All button of the Sample Page -->
-<description>Click this button to remove all the available methods to the Web service sample proxy.</description>
-</context>
-
-<context id="PWSM0008">
-<!-- JSP Folder field of the Sample Page -->
-<description>Folder into which your Web service JSPs are deposited.</description>
-</context>
-
-<context id="PWSM0009">
-<!-- JSP Folder Browse button of the Sample Page -->
-<description>Click to find the folder into which your Web service JSPs are deposited.</description>
-</context>
-
-<context id="PWSM0010">
-<!-- Project combo box of the Sample Page -->
-<description>Select an existing project into which your sample will be generated.</description>
-</context>
-
-<context id="PWSM0014">
-<!-- Folder field of the Sample Page -->
-<description>Folder into which the fully qualified proxy is generated. Defaults to the source folder inside of your Web project.Folder into which the fully qualified proxy is generated. Defaults to the source folder inside of your Web project.</description>
-</context>
-
-<context id="PWSM0015">
-<!-- Run test check box of the Sample Page -->
-<description>Select this check box to run the sample application on the server.</description>
-</context>
-
-<context id="PWSM0016">
-<!-- EAR combo box of the Sample Page -->
-<description>Select the EAR in which you want your Web service sample application created.</description>
-</context>
-
-
-<context id="PWWS0001">
-<!--  WSDL Selection Page-->
-<description>Use this page to select the WSDL, WSIL, or HTML document that will be used to create the Web service.</description>
-</context>
-
-<context id="PWWS0002">
-<!--  WSDL Document text field of the WSDL Selection Page-->
-<description>Enter the path to a WSDL, WSIL, or HTML document.</description>
-</context>
-
-<context id="PWWS0003">
-<!--  WSDL Resource Browse button of the WSDL Selection Page-->
-<description>Browse to the location of a WSDL, WSIL, or HTML document.</description>
-</context>
-
-
-<context id="DBAS0001">
-<!-- HTTP basic authentication user name -->
-<description>Enter the user name used for HTTP basic authentication.</description>
-</context>
-
-<context id="DBAS0002">
-<!-- HTTP basic authentication password -->
-<description>Enter the password used for HTTP basic authentication.</description>
-</context>
-
-
-
-
-</contexts>

diff --git a/docs/org.eclipse.jst.ws.consumption.infopop/wscreationui-f1Contexts.xml b/docs/org.eclipse.jst.ws.consumption.infopop/wscreationui-f1Contexts.xml
deleted file mode 100644
index 42ee42e..0000000
--- a/docs/org.eclipse.jst.ws.consumption.infopop/wscreationui-f1Contexts.xml
+++ /dev/null

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-
-<!--Important - all infopops taken from wsconsumptionui-f1Contexts.xml - use that as translation source-->
-
-<context id="PWPR0001">
-<!-- Project Page -->
-<description>Select the type of Web service you want to generate and any file and folder options for your Web service.</description>
-</context>
-
-<context id="PWPR0005">
-<!--  Generate Proxy check box of the Project Page -->
-<description>The generated Java bean proxy provides a remote procedure call interface to the Web service.</description>
-</context>
-
-<context id="PWPR0009">
-<!--  Start Web Project check box check box of the Project Page -->
-<description>Click to start the server. If you leave the box unchecked you will have to manually start the server.</description>
-</context>
-
-<context id="PWPR0010">
-<!-- Web Service Type combo box of the Project Page -->
-<description>Select the type of Web service you want to build. Your selection will affect the files available for selection.</description>
-</context>
-
-<context id="PWPR0011">
-<!--  Wizard Scenario Service group of the Project Page -->
-<description>Select the type of Web service you want to build. Your selection will affect the files available for selection.</description>
-</context>
-
-<context id="PWPR0013">
-<!--  Test service checkbox of the project page -->
-<description>Select this check box to launch the Web service in the Web Services Explorer in order to examine it.</description>
-</context>
-
-<context id="PWPR0012">
-<!--  Launch UDDI check box of the Project Page -->
-<description>Select this checkbox to launch the Web Services Explorer in order to publish the Web service to a UDDI registry.</description>
-</context>
-
-<context id="PWPR0014">
-<!--  Web Service Client Type combo box of the Project Page -->
-<description>Select the client proxy type. The generated Java bean proxy provides a remote procedure call interface to the Web service.</description>
-</context>
-
-
-
-<context id="PSTP0001">
-<!--  Test Type Combo box of the Service Test Page-->
-<description>Select the test facility in which you would like to test the Web service being created.</description>
-</context>
-
-<context id="PSTP0002">
-<!--  Launch button of the Service Test Page-->
-<description>Click this to launch the Web service in a browser window to test it.</description>
-</context>
-
-
-</contexts>

diff --git a/docs/org.eclipse.jst.ws.consumption.infopop/wsui-f1Contexts.xml b/docs/org.eclipse.jst.ws.consumption.infopop/wsui-f1Contexts.xml
deleted file mode 100644
index c0c7d91..0000000
--- a/docs/org.eclipse.jst.ws.consumption.infopop/wsui-f1Contexts.xml
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-
-
-
-<context id="PPAD0006">
-<!--  create web service check box-->
-<description>Select this check box to hide the option of generating a Web service client when you right-click a file in the Project Explorer or Navigator.</description>
-</context>
-
-<context id="PPAD0008">
-<!--  generate skeleton check box-->
-<description>Select this check box to hide the option of generating skeleton Java classes when you right-click a file in the Project Explorer or Navigator. The skeleton bean contains a set of methods that correspond to the operations described in the WSDL document. When the bean is created, each method has a trivial implementation that you replace by editing the bean.</description>
-</context>
-
-<context id="PPAD0009">
-<!--  publish WSDL check box-->
-<description>Select this check box to hide the option of publishing the Web service's WSDL file to a UDDI registry when you right-click a file in the Project Explorer or Navigator.</description>
-</context>
-
-
-</contexts>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/.project b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/.project
deleted file mode 100644
index a4059a9..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/.project
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.consumption.ui.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 23345ab..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui.doc.user
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="2.1",
- org.eclipse.core.runtime.compatibility
-Eclipse-AutoStart: true

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/about.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/build.properties b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/build.properties
deleted file mode 100644
index 72b92f5..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/build.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-bin.includes = plugin.properties,\
-               plugin.xml,\
-               wsconsumptionbuild_toc.xml,\
-               wsconsumptiont_toc.xml,\
-               about.html,\
-               images/,\
-               concepts/,\
-               tasks/,\
-               ref/,\
-               META-INF/
-src.includes = build.properties

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cuddi.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cuddi.html
deleted file mode 100644
index 872148c..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cuddi.html
+++ /dev/null

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Universal Description, Discovery, and Integration (UDDI)</title>
-</head>
-<body id="cuddi"><a name="cuddi"><!-- --></a>
-
-<h1 class="topictitle1">Universal Description, Discovery, and Integration (UDDI)</h1>
-<div><p>Universal Description, Discovery, and Integration (UDDI) specification
-defines a way to publish and discover information about Web services.</p>
-<div class="p">UDDI has two functions: <ul><li>It is a SOAP-based protocol that defines how clients communicate with
-UDDI registries.</li>
-<li>It is a particular set of global replicated registries.</li>
-</ul>
-</div>
-<p>UDDI includes an XML schema for SOAP messages that defines a set of documents
-to describe business and services information, a common set of APIs for querying
-and publishing information to the directories, and an API for replicating
-directory entries between peer UDDI nodes.</p>
-<p>For more information on UDDI refer to  <a href="http://www.uddi.org" target="_blank">www.uddi.org</a></p>
-<div class="section"><h4 class="sectiontitle">UDDI registries</h4><p>UDDI manages the discovery of Web
-services by relying on a distributed registry of businesses and their service
-descriptions implemented in a common XML format. Before you can publish your
-business entity and Web service to a public registry, you must first register
-your business entity with a UDDI registry.</p>
-<p>UDDI registries come in two
-forms: public and private.  Both types comply to the same specifications. 
-A private registry enables you to publish and test your internal e-business
-applications in a secure, private environment.  Rational<sup>®</sup> Developer
-products include a private UDDI registry. </p>
-<p>A public registry is
-a collection of peer directories that contain information about businesses
-and services. It locates services that are registered at one of its peer nodes
-and facilitates the discovery of published Web services. Data is replicated
-at each of the registries on a regular basis. This ensures consistency in
-service description formats and makes it easy to track changes as they occur. IBM<sup>®</sup> maintains
-two public registries called the IBM UDDI Business Registry and the IBM UDDI Test
-Registry. The IBM UDDI
-Test Registry allows you to develop your Web service and experience the UDDI
-registration process without placing your Web service in an official registry. 
-Use the IBM UDDI
-Test Registry to experiment with UDDI, and to test and validate your Web service. 
-For more information on the IBM's public registries, refer to  <a href="http://uddi.ibm.com" target="_blank">http://uddi.ibm.com</a> For
-a list of public registries, refer to  <a href="http://www.uddi.org/register.html" target="_blank">http://www.uddi.org/register.html</a></p>
-<p>A private
-registry allows you to publish and test your internal applications in a secure,
-private environment. IBM has developed a private registry called the IBM WebSphere<sup>®</sup> UDDI
-Registry.  The IBM WebSphere UDDI Registry is a persistent storage
-mechanism for information published in the Registry.  There are two implementations
-of the SOAP-based APIs - the WebSphere Studio version 5.0 and 5.1 registries
-based on UDDI v2 and the Rational Developer products' registry based on UDDI
-v3 - that allow programmatic publish and inquiry operations. The private registry
-supports access using JDBC 2. Access using JDBC 1 is not supported. The IBM private
-registry and the Web Services Explorer support user-defined custom taxonomies
-in addition to the standard NAICS, UNSPSC and ISO-3166 taxonomies.</p>
-<p>The
-UDDI Business Registry acts as a B2B directory linking marketplaces, buyers,
-and sellers. The information provided in the registry consists of three components:
-white pages, yellow pages, and green pages. White pages include the business
-name, contact information, and a text description of the business's services.
-Yellow pages include industrial categorizations based on standard taxonomies
-such as NAICS, ISO 3166, and UNSPSC. Green pages include references to specifications
-for Web services and pointers to various file and URL-based discovery mechanisms.
-This makes it easy for businesses to integrate across marketplaces. Because
-it is registered, information is made available across all applications. For
-more information on NAICS refer to  <a href="http://www.naics.com" target="_blank">www.naics.com</a> For more information on UNSPSC refer
-to  <a href="http://www.unspsc.org" target="_blank">www.unspsc.org</a> For
-more information on ISO 3166 refer to  <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html" target="_blank">http://www.iso.org/iso/en/prods-services/iso3166ma/index.html</a></p>
-<p>Businesses
-populate the registry with descriptions of the services that they support.
-UDDI assigns a unique identifier to each service description and business
-registration. These become the service and business keys respectively. Search
-engines, and applications query the registry to discover services. UDDI servers
-are a directory of available services and service providers.</p>
-</div>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="cwsdlud.html" title="The Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services. UDDI has two functions: (1) it is a SOAP-based protocol that defines how UDDI clients communicate with registries, and (2) it is a particular set of globally replicated registries.">Relationship between UDDI and WSDL</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsilud.html">Relationship between UDDI and WSIL</a></div>
-<div><a href="../../org.eclipse.jst.ws.uddi.registry.doc.user/concepts/cusercats.html">User-defined UDDI categories</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="../../org.eclipse.jst.ws.uddi.registry.doc.user/tasks/tuddiwiz.html"> Configuring a Unit Test UDDI Registry</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cwsdlud.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cwsdlud.html
deleted file mode 100644
index 2f0d394..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cwsdlud.html
+++ /dev/null

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Relationship between UDDI and WSDL</title>
-</head>
-<body id="cwsdlud"><a name="cwsdlud"><!-- --></a>
-
-<h1 class="topictitle1">Relationship between UDDI and WSDL</h1>
-<div><p>The Universal Description, Discovery, and Integration (UDDI) specification
-defines a way to publish and discover information about Web services. UDDI
-has two functions: (1) it is a SOAP-based protocol that defines how UDDI clients
-communicate with registries, and (2) it is a particular set of globally replicated
-registries.</p>
-<p>Registering a service involves four core data structure types:</p>
-<ul><li>The  <tt class="sysout">businessEntity</tt> data type contains information
-about the business that has a published service.</li>
-<li>The  <tt class="sysout">businessService</tt> data type is a description
-of a Web service.</li>
-<li>The  <tt class="sysout">bindingTemplate</tt> data type contains technical
-information for determining the entry point and construction specifications
-for invoking a Web service.</li>
-<li>The  <tt class="sysout">tModel</tt> data type provides a reference
-system to assist in the discovery of Web services and acts as a technical
-specification for a Web service.</li>
-</ul>
-<p>For more information on the UDDI data types, refer to the related reference
-topics at the end of this topic.</p>
-<p>Web Services Description Language (WSDL) is an XML-based standard specification
-for describing Web services. WSDL defines an XML format for describing network
-services as a set of endpoints that operate on messages that contain either
-document-oriented or procedure-oriented information.</p>
-<p>The WSDL service description can be structured in many ways. However, to
-assist with publishing and finding WSDL service descriptions in a UDDI registry,
-WSDL documents consist of two main parts: </p>
-<ul><li>The service interface definition describes the abstract type interface
-and its protocol binding, known as the WSDL binding document</li>
-<li>The service implementation definition describes the service access location
-information, known as the WSDL service document</li>
-</ul>
-<p>When creating Web services with the IBM<sup>®</sup> SOAP run-time environment,  the
-tools in this product store these two main parts in three separate XML documents
-when generating Web services from Java™ beans, EJBs, and URLs: the WSDL service
-document, the WSDL binding document, and the WSDL interface document. When
-generating Web services from DADX files, the two main parts are stored in
-two separate XML documents: the WSDL binding document and the WSDL service
-document. For more information on the WSDL service, binding, and interface
-documents, refer to the related reference topics at the end of this topic.</p>
-<p>Whe creating Web services with the WebSphere<sup>®</sup> run-time environment or
-the Apache Axis run-time environment, the Web services tools create a single
-WSDL document when generating Web services from Java beans or EJBs. This WSDL document contains
-both the service interface and implementation documents.</p>
-<p>A service interface is described by a WSDL document that contains the types,
-import, message, portType, and binding elements. A service interface contains
-the WSDL service definition that will be used to implement one or more services.
-It is an abstract definition of a Web service, and is used to describe a specific
-type of service. This document can reference another service interface document
-using an import element. The Web services tools in this product generate a
-service interface document that contains only the message and portType elements
-that are referenced by the binding document that contains only bindings for
-the portType.</p>
-<p>The service implementation document contains the service elements. A service
-implementation document contains a description of a service that implements
-a service interface. At least one of the import elements will contain a reference
-to the WSDL service interface document; however monolithic WSDL such as that
-created using the Axis and WebSphere run-time environments do not have imports.
-A service implementation document can contain references to more than one
-service interface document.</p>
-<p>A service provider hosts a Web service and makes it accessible using protocols
-such as SOAP/HTTP and SOAP/JMS. The Web service is described by the WSDL documents
-that are stored on the provider's server or in a special repository. The WSDL
-documents are referenced by UDDI business services (service documents) and
-tModels (binding documents). These pointers enable discovery of a Web service
-by a service requestor.</p>
-<p>Figure 1. Relationship between UDDI and WSDL.</p>
-<p> <img src="../images/wsdluddi.gif" alt="Illustration of the relationship between UDDI and WSDL." /> </p>
-<p>Figure 1 illustrates the relationship between UDDI and WSDL. The WSDL service
-element references the WSDL binding element. The URL of the document containing
-the WSDL binding element is published to the UDDI business registry as a tModel.
-The URL of the document containing the WSDL service element is published to
-the UDDI business registry as a businessService and contains information about
-the bindingTemplate. For more information on UDDI registry data structure
-types, refer to the related reference section at the end of this document.
-Note that the import portion of the diagram is optional depending on the run-time
-environment; monolithic WSDL such as that created using the Axis and WebSphere run-time
-environments do not have imports.</p>
-<p>The service implementation describes an instance of a service. The instance
-is defined using a WSDL service element. The service element in a service
-implementation document is used to publish a UDDI businessService. When publishing
-a WSDL service description, a service interface must be published as a tModel
-before a service implementation is published as a businessService.</p>
-<p>A service implementation is published in a UDDI registry as part of a businessService
-with one or more bindingTemplate elements. The businessService is published
-by the service provider. A new businessService is created for a service element
-that is defined in the service implementation document. A new bindingTemplate
-element is created within a businessService for each port element that is
-defined within a service element.</p>
-<p>For more information on the relationship between WSDL and UDDI refer to
- <a href="http://uddi.org/bestpractices.html" target="_blank">uddi.org/bestpractices.html</a>.</p>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">Web Services Description Language (WSDL)</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/ref/rwsdl.html">Web Services Description Language (WSDL)</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/addfav.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/addfav.gif
deleted file mode 100644
index 48895f4..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/addfav.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/adduddi.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/adduddi.gif
deleted file mode 100644
index 8399bb0..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/adduddi.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/bindnode.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/bindnode.gif
deleted file mode 100644
index c60abfc..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/bindnode.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/busasst.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/busasst.gif
deleted file mode 100644
index 3fdcbb0..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/busasst.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/fav.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/fav.gif
deleted file mode 100644
index debfabd..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/fav.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/find.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/find.gif
deleted file mode 100644
index 6dc3ebe..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/find.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/fswsdlicon.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/fswsdlicon.gif
deleted file mode 100644
index b03233a..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/fswsdlicon.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/mptwsdlicon.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/mptwsdlicon.gif
deleted file mode 100644
index 905e655..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/mptwsdlicon.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/opnode.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/opnode.gif
deleted file mode 100644
index 3e8a295..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/opnode.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/publish2.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/publish2.gif
deleted file mode 100644
index 14a11a5..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/publish2.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/pubserv.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/pubserv.gif
deleted file mode 100644
index 31d36b7..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/pubserv.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/refserv.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/refserv.gif
deleted file mode 100644
index f5c015b..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/refserv.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/scenario7.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/scenario7.gif
deleted file mode 100644
index 9808268..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/scenario7.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/servnode.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/servnode.gif
deleted file mode 100644
index 65b9c09..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/servnode.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddi.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddi.gif
deleted file mode 100644
index 7a02c09..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddi.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiref.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiref.gif
deleted file mode 100644
index 7c148a7..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiref.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiview.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiview.gif
deleted file mode 100644
index 0601bc8..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiview.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlbnddetl.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlbnddetl.gif
deleted file mode 100644
index a22eda6..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlbnddetl.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdldtlicon.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdldtlicon.gif
deleted file mode 100644
index d8ee67c..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdldtlicon.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlexp.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlexp.gif
deleted file mode 100644
index 27f3f69..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlexp.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlfavicon.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlfavicon.gif
deleted file mode 100644
index cb9d514..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlfavicon.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlicon.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlicon.gif
deleted file mode 100644
index 7b6bd28..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlicon.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlnode.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlnode.gif
deleted file mode 100644
index 68ef08c..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlnode.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlop.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlop.gif
deleted file mode 100644
index a0f370e..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlop.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopret.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopret.gif
deleted file mode 100644
index 60d7e41..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopret.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopretx.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopretx.gif
deleted file mode 100644
index ff93bdd..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopretx.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlservdet.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlservdet.gif
deleted file mode 100644
index 6c197c0..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlservdet.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlstatx.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlstatx.gif
deleted file mode 100644
index 6081fa9..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlstatx.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdluddi.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdluddi.gif
deleted file mode 100644
index febb7d5..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdluddi.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsilview.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsilview.gif
deleted file mode 100644
index 789d689..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsilview.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wswizicon.gif b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wswizicon.gif
deleted file mode 100644
index a4fe8b3..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wswizicon.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.properties b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.properties
deleted file mode 100644
index b437ca6..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.properties
+++ /dev/null

@@ -1,3 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-Plugin.name = Web service consumption documentation

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.xml b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.xml
deleted file mode 100644
index 248e72b..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?> 
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-  
-	<extension point="org.eclipse.help.toc">
-		<toc file="wsconsumptionbuild_toc.xml"/>
-		<toc file="wsconsumptiont_toc.xml" />
-	</extension>
-</plugin>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/ref/ruddi.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/ref/ruddi.html
deleted file mode 100644
index 0e8a157..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/ref/ruddi.html
+++ /dev/null

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Data structure types (UDDI registry)</title>
-</head>
-<body id="ruddi"><a name="ruddi"><!-- --></a>
-
-<h1 class="topictitle1">Data structure types (UDDI registry)</h1>
-<div><p>Once you have registered and logged in to the UDDI registry that
-you want to use, you can register your Web service.  Registration of
-a service involves four core data structure types: business information, service
-information, binding information, and information describing the specifications
-for services. The relationship between these data types is described in Figure
-1.</p>
-<div class="section"><blockquote> <p> <span class="uicontrol">Business information.</span> Information
-that is contained in a  <tt class="sysout">businessEntity</tt> structure.
-The  <tt class="sysout">businessEntity</tt> contains information about
-the business that has published the service, such as business name, description,
-contacts and identifiers.</p>
- <p> <span class="uicontrol">Service information.</span> Information
-that describes a group of Web services. It is contained in a  <tt class="sysout">businessService</tt> structure.
-The  <tt class="sysout">businessService</tt> contains information about
-families of technical services.  It groups a set of Web services related
-to either a business process or group of services.</p>
- <p> <span class="uicontrol">Binding
-information.</span> Information represented by the  <tt class="sysout">bindingTemplate</tt> structure.
-The  <tt class="sysout">bindingTemplate</tt> holds technical information
-for determining the entry point and construction specifications for invoking
-a Web service.  The  <tt class="sysout">bindingTemplate</tt> provides
-the Web service descriptions relevant for application developers that want
-to find and invoke a Web service.  The  <tt class="sysout">bindingTemplate</tt> points
-to a service implementation descriptions, for example via a URL.</p>
- <p> <span class="uicontrol">Information
-describing the specifications for services.</span> Metadata about the
-various specifications implemented by a given Web service represented by the
- <tt class="sysout">tModel</tt>. The  <tt class="sysout">tModel</tt> provides
-a reference system to assist in the discovery of Web services.</p>
- </blockquote>
-<p>Figure
-1. Relationship between data types.</p>
-<p> <img src="../images/uddi.gif" alt="Figure 1 illustrates the relationship between the business entity, business service, binding template, and tmodel." /> </p>
-<p>Each child structure has a unique
-parent structure. This means that each  <tt class="sysout">businessService</tt> structure
-is owned by a specific  <tt class="sysout">businessEntity</tt>. In turn,
-each  <tt class="sysout">bindingTemplate</tt> is owned by a specific
- <tt class="sysout">businessService</tt>. Each  <tt class="sysout">bindingTemplate</tt> structure
-references to unique instances of  <tt class="sysout">tModel</tt> structures;
-however, since references can be repeated within several parent structures,
-there can be many references to  <tt class="sysout">tModels</tt> from
-different Entity-Service-Template parents, as seen in Figure 2.</p>
-<p>Figure
-2. References to tModel.</p>
-<p> <img src="../images/uddiref.gif" alt="Figure 2 illustrates the multiple references to a tModel." /> </p>
-</div>
-<div class="section"><h4 class="sectiontitle">Publisher assertions</h4><p>A publisher assertion is a
-way in UDDI to associate businessEntity structures. The publisher assertion
-defines a group of businessEntity structures. Many businesses are not effectively
-represented by a single businessEntity. A publisher assertion allows for the
-association between businessEntity structures. For example, a large company
-may have several subsidiaries that have different descriptions but are still
-closely coupled and want to make their relationships visible in UDDI registries.</p>
-</div>
-<div class="section"><h4 class="sectiontitle">Service projections</h4><p>A service projection enables
-a business entity to reference a service that was published by another business
-entity. By using the businessService structure as a projection to an already
-published businessService, businesses can share or reuse services. Service
-projections are managed centrally as part of the referencing businessEntity.
-This means that any changes made to the businessService by any of the referencing
-businessEntity structures are valid for all of the referencing businessEntity
-structures.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tpublish.html" title="The Web service, also known as the business service, describes a Web service's endpoint and where its WSDL file resides. The WSDL file lists the operations that service provides.">Publishing a Web service</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/taddreg.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/taddreg.html
deleted file mode 100644
index 87c7d20..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/taddreg.html
+++ /dev/null

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a Registry to the Web Services Explorer</title>
-</head>
-<body id="taddreg"><a name="taddreg"><!-- --></a>
-
-<h1 class="topictitle1">Adding a Registry to the IBM Web Services Explorer</h1>
-<div><p>Although the Web Services Explorer comes populated with several
-registries, you can also add additional registries to your list of favorites.</p>
-<div class="p"><div class="p">Prerequisites:<ol><li><a href="treg.html">Register with a registry</a></li>
-<li><a href="tstrtexp.html">Launch the Web Services Explorer</a></li>
-</ol>
-</div>
-</div>
-<div class="section"><p>When you are ready to publish your business entity and Web service,
-add a production registry to the IBM<sup>®</sup> Web Services Explorer. In order to publish
-your business entity and Web service to a production registry, you must first
-register with the registry. The registry will provide instructions for registering.
-For more information on registries, refer to  <a href="treg.html">Registering
-with a registry</a>.</p>
-<p>The UDDI Business Registry is a
-set of global replicated registries. For a list of public registries refer
-to  <a href="http://www.UDDI.org/register.html" target="_blank">www.uddi.org/register.html</a></p>
-<p>The IBM UDDI
-Business Registry is a public production registry maintained by IBM. For more
-information on the IBM UDDI Business Registry refer to  <a href="http://uddi.ibm.com" target="_blank">http://uddi.ibm.com</a></p>
-</div>
-<ol><li><span>To add a Registry to the Web Services Explorer from Favorites,
-do the following:</span><ol type="a"><li><span>Click the  <span class="uicontrol">Favorites</span> icon  <img src="../images/fav.gif" alt="Picture of the Favorites icon." /> in the main toolbar.</span></li>
-<li><span>Expand  <span class="uicontrol">Favorite UDDI Registries</span>.</span></li>
-<li><span>Select a registry then click the  <span class="uicontrol">Add to UDDI Page</span> icon
- <img src="../images/adduddi.gif" alt="Picture of the Add to UDDI Page icon." /> in the Actions pane.</span></li>
-</ol>
-</li>
-<li><span>To add a Registry to the Web Services Explorer manually, do the
-following:</span><ol type="a"><li><span>In the UDDI Navigator pane, click the  <span class="uicontrol">UDDI Main</span> node.</span></li>
-<li><span>In the Actions pane, enter the Registry name and Inquiry URL
-of the registry you want to add.</span></li>
-<li><span>Click  <span class="uicontrol">Go</span>.</span></li>
-</ol>
-</li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="treg.html" title="In order to publish your business entity and Web service to a UDDI registry, you must first register with the registry that you want to use.">Registering with a UDDI registry</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tassert.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tassert.html
deleted file mode 100644
index d970c06..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tassert.html
+++ /dev/null

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Managing publisher assertions</title>
-</head>
-<body id="tassert"><a name="tassert"><!-- --></a>
-
-<h1 class="topictitle1">Managing publisher assertions</h1>
-<div><p>A publisher assertion is a way in UDDI to associate businessEntity
-structures.  The publisher assertion defines a group of businessEntity
-structures. Many businesses are not effectively represented by a single businessEntity.
-A publisher assertion allows for associations to be formed between several
-businessEntity structures. For example, a large company may have several subsidiaries
-that have different descriptions but are still closely coupled and want to
-make their relationships visible in UDDI registries.</p>
-<div class="p">Prerequisites:<ol><li><a href="treg.html">Register with a registry</a></li>
-<li><a href="tstrtexp.html">Launch the Web Services Explorer</a></li>
-<li><a href="taddreg.html">Add the registry to the Web Services Explorer</a></li>
-</ol>
-</div>
-<div class="section"><p>For more information on publisher assertions, refer to the  <a href="http://www.uddi.org/specification.html" target="_blank">UDDI Version
-2.0 Programmer's API Specification</a> and the  <a href="http://www.uddi.org/specification.html" target="_blank">UDDI Version 2.0 Data Structure Specification</a>.</p>
-<p>To
-manage publisher assertions, do the following:</p>
-</div>
-<ol><li><span>In the Navigator pane, select the business entity for which you
-want to manage referenced businesses.</span></li>
-<li><span>In the Actions pane toolbar, click the  <span class="uicontrol">Manage Publisher
-Assertions</span> icon  <img src="../images/busasst.gif" alt="Picture of the Manage Publisher Assertions icon." />.</span></li>
-<li><span>On the Manage Publisher Assertions page you can add, remove, and
-maintain relationships with other business entities.</span></li>
-</ol>
-<div class="section"><p> <span class="uicontrol">Important:</span> A business entity that is referenced
-by another business entity must in turn reference that business entity in
-order to make the publisher assertion public. A one-way reference is considered
-an incomplete publisher assertion and is visible only to the owner of the
-business entity.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="treg.html" title="In order to publish your business entity and Web service to a UDDI registry, you must first register with the registry that you want to use.">Registering with a UDDI registry</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbkmrk.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbkmrk.html
deleted file mode 100644
index 77d5f24..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbkmrk.html
+++ /dev/null

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a registry, business entity, business service, service
-interface, WSIL, or WSDL service to Favorites</title>
-</head>
-<body id="tbkmrk"><a name="tbkmrk"><!-- --></a>
-
-<h1 class="topictitle1">Adding a registry, business entity, business service, service interface,
-WSIL, or WSDL service to Favorites</h1>
-<div><div class="p">Prerequisite:  <ul><li><a href="tstrtexp.html">Launch the Web Services Explorer</a></li>
-</ul>
-</div>
-<div class="section"><p>To add a registry, business entity, Web service, service interface,
-WSIL, or WSDL to Favorites using the Web Services Explorer:</p>
-</div>
-<ol><li><span>Navigate through the registry hierarchy to find the registry, business
-entity, Web service, service interface or the WSIL page to find the WSIL or
-WSDL service you want to add to Favorites.</span></li>
-<li><span>Select the business entity, Web service, service interface, WSIL,
-or WSDL service.</span></li>
-<li><span>In the Actions icon bar, click the  <span class="uicontrol">Add to favorites</span> icon
- <img src="../images/addfav.gif" alt="Picture of the Add to favorites icon." />.</span></li>
-</ol>
-<div class="section"><p>Any favorites that you add are saved by the Web Services Explorer
-to </p>
-<p> <var class="varname">X</var>:\workspace\.metadata\.plugins\org.eclipse.webservice.explorer\favorites.wsil</p>
-<p>Where
- <var class="varname">X</var> is the directory where your workspace folder is located.
-If you are migrating from an earlier version of the product, your favorites
-will be automatically migrated to this location.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="treg.html" title="In order to publish your business entity and Web service to a UDDI registry, you must first register with the registry that you want to use.">Registering with a UDDI registry</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbusproj.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbusproj.html
deleted file mode 100644
index bbd85d0..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbusproj.html
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Managing referenced services</title>
-</head>
-<body id="tbusproj"><a name="tbusproj"><!-- --></a>
-
-<h1 class="topictitle1">Managing referenced services</h1>
-<div><p>A service projection enables a business entity to reference a service
-that was published by another business entity. By using the businessService
-structure as a projection to an already published businessService, businesses
-can share or reuse services.  Service projections are managed centrally
-as part of the referencing businessEntity.</p>
-<div class="p">Prerequisites:<ol><li><a href="treg.html">Register with a registry</a></li>
-<li><a href="tstrtexp.html">Launch the Web Services Explorer</a></li>
-<li><a href="taddreg.html">Add the registry to the Web Services Explorer</a></li>
-</ol>
-</div>
-<div class="section"><p>For more information on referenced services, refer to the  <a href="http://www.uddi.org/specification.html" target="_blank">UDDI Version
-2.0 Programmer's API Specification</a> and the  <a href="http://www.uddi.org/specification.html" target="_blank">UDDI Version 2.0 Data Structure Specification</a>.</p>
-<p>To
-manage referenced services, do the following:</p>
-</div>
-<ol><li><span>In the Navigator pane, select the business entity for which you
-want to manage referenced services.</span></li>
-<li><span>In the Actions pane toolbar, click the  <span class="uicontrol">Manage Referenced
-Services</span> icon  <img src="../images/refserv.gif" alt="Picture of the Manage Referenced Services icon." />.</span></li>
-<li><span>On the Manage Referenced Services page you can add, remove, and
-maintain services that are referenced by the business entity.</span></li>
-</ol>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="treg.html" title="In order to publish your business entity and Web service to a UDDI registry, you must first register with the registry that you want to use.">Registering with a UDDI registry</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tdiscov.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tdiscov.html
deleted file mode 100644
index 7b4a71a..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tdiscov.html
+++ /dev/null

@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Discovering and importing Web services</title>
-</head>
-<body id="tdiscov"><a name="tdiscov"><!-- --></a>
-
-<h1 class="topictitle1">Discovering Web Services</h1>
-<div><p>Web services can be located through a public business registry
-such as the IBM<sup>®</sup> UDDI
-Business Registry, a private business registry, or a WSIL document. UDDI manages
-the discovery of Web services by relying on a distributed registry of businesses
-and their service descriptions implemented in a common XML format.</p>
-<div class="p"><div class="p">Prerequisites:<ol><li><a href="treg.html">Register with a registry</a></li>
-<li><a href="tstrtexp.html">Launch the IBM Web Services Explorer</a></li>
-<li><a href="taddreg.html">Add the registry to the IBM Web Services Explorer</a></li>
-</ol>
-</div>
-</div>
-<div class="section"><p>Web Services Inspection Language (WSIL) is a service discovery
-mechanism that is an alternative to UDDI as well as complementary to UDDI.
-WSIL allows you to go directly to the service provider and ask for the services
-it provides. For more information on the Web Services Inspection Language
-specification, refer to  <a href="http://www-106.ibm.com/developerworks/webservices/library/ws-wsilspec.html" target="_blank"> www.ibm.com/developerworks/webservices/library/ws-wsilspec.html</a>.
- For more information on UDDI and the IBM UDDI Business registries, refer to  <a href="http://www.ibm.com/services/uddi/index.html" target="_blank">www.ibm.com/services/uddi/index.html</a>.</p>
-<p>You
-can discover a Web service in two ways using the Web Services Explorer:</p>
-</div>
-<div class="section"><ul><li> <a href="#tdiscov__discover_from_uddi">Discovering a Web service from
-a UDDI registry</a> </li>
-<li> <a href="#tdiscov__discover_from_wsil">Discovering a Web service from
-a WSIL document</a> </li>
-</ul>
-</div>
-</div>
-<div></div><div class="nested1" xml:lang="en-us" id="discover_from_uddi"><a name="discover_from_uddi"><!-- --></a><h2 class="topictitle2"> Discovering a Web Service from a UDDI Registry</h2>
-<div><div class="section"><p>The registry contains URL references to Web service WSDL documents.
-In order to discover a Web service the URL to the Web service WSDL document
-must be resolvable. To locate Web service descriptions:</p>
-</div>
-<ol><li><span>Launch the Web Services Explorer</span></li>
-<li><span>Click <span class="uicontrol">UDDI Main</span>.</span></li>
-<li><span>In the Actions pane select a registry from the drop-down list and
-click <span class="uicontrol">Go</span>.</span></li>
-<li><span>In the Actions pane toolbar click the  <strong>Find</strong> icon  <img src="../images/find.gif" alt="A picture of the Find icon." />.</span></li>
-<li><span>In the Actions pane, enter the name of the query, what you are
-searching for, the type of search that you want to perform, and any query
-information: </span><ol type="a"><li class="substepexpand"><span> <strong>Search for</strong>  This list allows you to search for
-businesses, services, or service interfaces. </span> <ul><li> <strong>Businesses</strong> Once you locate a business in the registry, use the
-icons in the Action pane toolbar to do the following:<ul><li>View and edit business details</li>
-<li>Get the services associated with that business</li>
-<li>Publish a service</li>
-<li>Manage referenced services</li>
-<li>Manage publisher assertions</li>
-<li>Add the business to Favorites</li>
-<li>Unpublish the business</li>
-</ul>
-</li>
-<li> <strong>Services</strong> Once you locate a service in the registry, use the icons
-in the Action pane toolbar to do the following: <ul><li>View and edit service details</li>
-<li>Get the business associated with that service</li>
-<li>Get the service interfaces associated with that service</li>
-<li>Import the service WSDL file to the Eclipse workbench</li>
-<li>Import the service WSDL file to the file system</li>
-<li>Launch the Web Service wizards</li>
-<li>Add the service to Favorites</li>
-<li>Unpublish the service</li>
-</ul>
-</li>
-<li> <strong>Service interfaces</strong> Once you locate a service interface in the
-registry, use the icons in the Action pane toolbar to do the following: <ul><li>View and edit interface details</li>
-<li>Get the services associated with that service interface</li>
-<li>Get the businesses associated with that service interface</li>
-<li>Import the service interface WSDL file to the Eclipse workbench</li>
-<li>Import the service interface WSDL file to the file system</li>
-<li>Launch the Web Service wizards</li>
-<li>Add the service interface to Favorites</li>
-<li>Unpublish the service interface</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="substepexpand"><span> <strong>Type of search</strong>  These radio buttons allow you to
-specify a simple or advanced search, or a search by a Universal Unique Identifier
-(UUID). </span> <dl><dt class="dlterm">Simple</dt>
-<dd>Type the name of the businesses, services, or service interfaces for which
-you are searching.  <strong>Note:</strong> The search set size is set to 100 and the
-maximum number of returned results is set to 10 by default.  If you would
-like to override the defaults, use the Advanced search.</dd>
-<dt class="dlterm">Advanced </dt>
-<dd>Allows you to enter more search options to focus the scope of your search.
-Select this option if you would like to search for multiple businesses or
-services.</dd>
-<dt class="dlterm">UUID </dt>
-<dd>Allow you to enter the UUID key.  The UUID key is the identifier
-that is associated with the published object.</dd>
-</dl>
-</li>
-</ol>
-</li>
-<li><span>Once you have searched and discovered the business service description
-you desired, select the service or the service interface and click the  <strong>Import</strong> icon
-to: </span><ul><li>import the WSDL document into your Web project</li>
-<li>import the WSDL document into the WSDL Explorer for testing</li>
-<li>launch the Web Service Skeleton Creation wizard or Web Service Client
-wizard directly from the Web Services Explorer.</li>
-</ul>
-</li>
-</ol>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="discover_from_wsil"><a name="discover_from_wsil"><!-- --></a><h2 class="topictitle2"> Discovering a Web Service from a WSIL Document</h2>
-<div><div class="section"><p>To locate Web service descriptions:</p>
-</div>
-<ol><li class="stepexpand"><span>From the Web Services Explorer toolbar, click the  <strong>WSIL Page</strong> icon
- <img src="../images/wsilview.gif" alt="Picture of the WSIL Page icon." />.</span></li>
-<li class="stepexpand"><span>In the Navigator pane, click  <strong>WSIL Main</strong>.</span></li>
-<li class="stepexpand"><span>In the  <strong>URL to document</strong> field of the Actions pane enter
-the URL to the WSIL document or HTTP document that contains links to a WSIL
-document. Details on how an HTTP file can contain links to WSIL can be found
-here: http://www.ibm.com/developerworks/webservices/library/ws-wsilspec.html</span></li>
-<li class="stepexpand"><span>Once you have located the WSIL document, use the icons in the Action
-pane toolbar to do the following:</span><ul><li>View WSIL document details</li>
-<li>List all of the WSDL services associated with that WSIL document</li>
-<li>List all of the UDDI services associated with that WSIL document</li>
-<li>List all of the UDDI businesses associated with that WSIL document</li>
-<li>List all of the WSIL links associated with that WSIL document</li>
-<li>Import the WSIL document to the file system</li>
-<li>Add the WSIL document to Favorites</li>
-</ul>
- <strong>Important:</strong> If the IBM Web Services Explorer does not display
-the project that you would like to import your WSDL file to, ensure that you
-have created the project and/or click the  <strong>Refresh</strong> icon.</li>
-</ol>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="treg.html" title="In order to publish your business entity and Web service to a UDDI registry, you must first register with the registry that you want to use.">Registering with a UDDI registry</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/tasks/toverws.html"> Developing Web services</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div></div> 
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tgenwsil.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tgenwsil.html
deleted file mode 100644
index ae282f8..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tgenwsil.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Generating a WSIL file</title>
-</head>
-<body id="tgenwsil"><a name="tgenwsil"><!-- --></a>
-
-<h1 class="topictitle1">Generating a WSIL file</h1>
-<div><p>Web Services Inspection Language (WSIL) is a service discovery
-mechanism that is an alternative to UDDI as well as complementary to UDDI.
-WSIL can be generated at any point in the Web service development cycle once
-the WSDL file for the Web service has been created.</p>
-<div class="p"><strong>Prerequisites:</strong> In order to generate a WSIL file, you need to
-know the URL to a WSDL file.</div>
-<div class="section"><p>WSIL helps synchronize this process by maintaining references
-to WSDL URLs. Web services tools that process WSDL documents - such as the
-Web Service Client and Creation wizards - will accept a WSIL document as a
-substitute for WSDL. This allows you to create a standardized WSDL reference
-(WSIL) document in your project during Web service client generation, then
-at a later time easily regenerate the client from that reference document.
-No copies of the WSDL or WSDL URLs are required.</p>
-<p>You can generate a
-WSIL file from a pre-existing WSDL file or during Web service creation or
-consumption.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-</div><div class="nested1" xml:lang="en-us" id="d0e27"><a name="d0e27"><!-- --></a><h2 class="topictitle2">Generating a WSIL file though the import utility</h2>
-<div><div class="section"><p>To generate a WSIL file through the import utility:</p>
-</div>
-<ol><li><span>Optional: Select the WSDL document for which you want to create
-a WSIL file.</span></li>
-<li><span>From the  <strong>File</strong> menu, select  <strong>Import</strong> &gt;  <strong>WSIL &gt;
-Next</strong>. The WSIL Import window opens.</span></li>
-<li><span>If you have selected to perform step 1, the WSIL URI field should
-be prefilled with the name of your WSDL file, where the extension has been
-changed from  <tt class="sysout">.wsdl</tt> to  <tt class="sysout">.wsil</tt>.
-The WSDL section should contain the URLs to the selected WSDL files. You can
-also enter additional WSDL URLs. Alternately, you can browse to the location
-of a WSIL file, or manually enter the location of the WSIL and WSDL files
-in the appropriate locations.</span></li>
-<li><span>Click Finish. A WSIL file will be generated in the specified location.</span></li>
-</ol>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e62"><a name="d0e62"><!-- --></a><h2 class="topictitle2">Generating a WSIL file through the Web Services Explorer</h2>
-<div><div class="section"><p>To generate a WSIL file through the Web Services Explorer:</p>
-</div>
-<ol><li><span>Open the Web Services Explorer.</span></li>
-<li><span>Open the WSDL Explorer by clicking this icon:  <img src="../images/wsdlicon.gif" alt="icon used to launch the web services explorer" /></span></li>
-<li><span>Open a WSDL file.</span></li>
-<li><span>Select the WSDL file that you have opened in the Navigator pane,
-and from the available actions, choose to import a WSDL file to the workbench
-by clicking this icon:  <img src="../images/mptwsdlicon.gif" alt="icon used to import a file" /></span></li>
-<li><span>Select  <strong>Import as a service reference to a WSIL document</strong>.</span></li>
-<li><span>Enter a name for the WSIL file that you want to generate, and click
- <strong>Go</strong>.</span></li>
-</ol>
-</div>
-</div> 
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpubent.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpubent.html
deleted file mode 100644
index dbfe066..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpubent.html
+++ /dev/null

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Publishing a business entity</title>
-</head>
-<body id="tpubent"><a name="tpubent"><!-- --></a>
-
-<h1 class="topictitle1">Publishing a business entity</h1>
-<div><p>A business entity contains information about the business that
-has published a service.  Before you can publish a business service,
-you must publish a business entity.</p>
-<div class="p">Prerequisites:<ol><li><a href="treg.html">Register with a registry</a></li>
-<li><a href="tstrtexp.html">Launch the IBM<sup>®</sup> Web Services Explorer</a></li>
-<li><a href="taddreg.html">Add the registry to the IBM Web Services Explorer</a></li>
-</ol>
-</div>
-<div class="section"><p>You can publish a business entity using two different publication
-formats: simple and advanced.</p>
-<blockquote> <p> <span class="uicontrol">Simple</span> Allows
-you to enter the minimal amount of information required to publish your business
-entity.  A simple publish only allows you to specify only one name and
-one business description.</p>
-<p> <span class="uicontrol">Advanced </span> Allows you
-to enter more information about your business entity. An advanced publish
-allows you to specify multiple names and descriptions for multi-lingual support.</p>
- </blockquote>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-</div><div class="nested1" xml:lang="en-us" id="d0e74"><a name="d0e74"><!-- --></a><h2 class="topictitle2">Publish a business entity using the simple option</h2>
-<div><div class="section"><p>To publish a business entity using the simple option:</p>
-</div>
-<ol><li><span>In the Web Services Explorer, select UDDI Main and select the registry
-to which you want to publish the business entity.</span></li>
-<li><span>In the Navigator pane, select the business entity for which
-you want to publish the business service.</span></li>
-<li><span>In the Actions pane toolbar, click the  <strong>Publish</strong> icon  <img src="../images/publish2.gif" alt="Picture of the Publish  icon." />.</span></li>
-<li><span>Select the  <strong>Simple</strong> radio button.</span></li>
-<li><span>Enter the publish URL, your user ID, password, WSDL URL, business
-name, and business description in the respective fields.</span></li>
-<li><span>Click  <strong>Go</strong> to publish your business entity.</span></li>
-</ol>
-<div class="section"><p>The IBM Web
-Services Explorer is automatically updated with your published Web service.
-The registry contains pointers to the URL of the WSDL service document of
-the Web service. Businesses can now discover and integrate with your Web service.</p>
-</div>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e113"><a name="d0e113"><!-- --></a><h2 class="topictitle2">Publish a business entity using the advanced option</h2>
-<div><div class="section"><p>To publish a business entity using the advanced option:</p>
-</div>
-<ol><li><span>In the  Web Services Explorer Navigator pane, select the business
-entity for which you want to publish the business service.</span></li>
-<li><span>In the Actions pane toolbar, click the  <strong>Publish Service</strong> icon
- <img src="../images/pubserv.gif" alt="Picture of the Publish Service icon." />.</span></li>
-<li><span>Select the  <strong>Advanced</strong> radio button.</span></li>
-<li><span>Enter the publish URL, your user ID, password, and WSDL URL in
-the respective fields.</span></li>
-<li><span>Click  <strong>Add</strong> to create business names.</span></li>
-<li><span>Click  <strong>Add</strong> to create business descriptions.</span></li>
-<li><span>Click <span class="uicontrol">Add</span> to create an identifier. For example,
-an identifier for your business entity may be your business phone number.
-The key name would be "Phone Number" and the key value would be your business
-telephone number. </span></li>
-<li><span>Click  <strong>Add</strong> to create categories. Enter your business categories.
-Select a category type from the drop down list. Click  <strong>Browse</strong> to open
-the Categories pane. Navigate through the hierarchical taxonomy and select
-the appropriate classification for your business service, then exit the Categories
-pane.</span></li>
-<li><span>Click  <strong>Go</strong> to publish your business entity.</span></li>
-</ol>
-<div class="section"><p>The Web Services Explorer is automatically updated with your published
-Web service. The registry contains pointers to the URL of the WSDL service
-document of the Web service. Businesses can now discover and integrate with
-your Web service.</p>
-</div>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="treg.html" title="In order to publish your business entity and Web service to a UDDI registry, you must first register with the registry that you want to use.">Registering with a UDDI registry</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div></div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpublish.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpublish.html
deleted file mode 100644
index 68fe528..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpublish.html
+++ /dev/null

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Publishing a Web service</title>
-</head>
-<body id="tpublish"><a name="tpublish"><!-- --></a>
-
-<h1 class="topictitle1">Publishing a Web service</h1>
-<div><p>The Web service, also known as the business service, describes
-a Web service's endpoint and where its WSDL file resides. The WSDL file lists
-the operations that service provides.</p>
-<div class="p">Prerequisites:<ol><li> <a href="treg.html">Register with a registry</a>.</li>
-<li> <a href="tstrtexp.html">Launch the Web Services Explorer</a>.</li>
-<li> <a href="taddreg.html">Add the registry to the Web Services Explorer</a>.</li>
-<li>Create a Web service.</li>
-<li>Deploy the Web service.</li>
-<li> <a href="tpubent.html">Publish a Business Entity</a>.</li>
-</ol>
-</div>
-<div class="section"><p>You can publish a business service using two different publication
-formats: simple and advanced.</p>
-</div>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../ref/ruddi.html">Data structure types (UDDI registry)</a></strong><br />
-Once you have registered and logged in to the UDDI registry that
-you want to use, you can register your Web service.  Registration of
-a service involves four core data structure types: business information, service
-information, binding information, and information describing the specifications
-for services. The relationship between these data types is described in Figure
-1.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-</div><div class="nested1" xml:lang="en-us" id="d0e74"><a name="d0e74"><!-- --></a><h2 class="topictitle2">Publish a business service using the simple option</h2>
-<div><div class="section"><p>To publish a Web service using the simple option:</p>
-</div>
-<ol><li><span>In the Web Services Explorer Navigator pane, select the business
-entity for which you want to publish the business service.</span></li>
-<li><span>In the Actions pane toolbar, click the  <strong>Publish Service</strong> icon
- <img src="../images/pubserv.gif" alt="Picture of the Publish Service icon." />.</span></li>
-<li><span>Select the  <strong>Simple</strong> radio button.</span></li>
-<li><span>Enter the publish URL, your user ID, password, WSDL URL, business
-name, and business description in the respective fields.</span></li>
-<li><span>Click  <strong>Go</strong> to publish your business entity.</span></li>
-</ol>
-<div class="section"><p> <strong>Important:</strong> Ensure that you select the service document,
-since the service element is the basis for the Business Service that you will
-publish. You cannot publish a Business Service using a WSDL document that
-does not have service elements.</p>
-<p>The Web Services Explorer is automatically
-updated with your published Web service. The registry contains pointers to
-the URL of the WSDL service document of the Web service. Businesses can now
-discover and integrate with your Web service.</p>
-</div>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e113"><a name="d0e113"><!-- --></a><h2 class="topictitle2">Publish a business service using the advanced option</h2>
-<div><div class="section"><p>To publish a Web service using the advanced option:</p>
-</div>
-<ol><li><span>In the Web Services Explorer Navigator pane, select the business
-entity for which you want to publish the business service.</span></li>
-<li><span>In the Actions pane toolbar, click the  <strong>Publish Service</strong> icon
- <img src="../images/pubserv.gif" alt="Picture of the Publish Service icon." />.</span></li>
-<li><span>Select the  <strong>Advanced</strong> radio button.</span></li>
-<li><span>Enter the publish URL, your user ID, password, and WSDL URL in
-the respective fields.</span></li>
-<li><span>Click  <strong>Get</strong> or <span class="uicontrol">Find</span> to associate the
-service with a business entity.</span></li>
-<li><span>Click  <strong>Get</strong> or <span class="uicontrol">Find</span> to associate a
-specific service interface with the service.</span></li>
-<li><span>Click  <strong>Add</strong> to create business service names.</span></li>
-<li><span>Click  <strong>Add</strong> to create business service descriptions.</span></li>
-<li><span>Click  <strong>Add</strong> to create categories. Enter your business service
-categories. Select a category type from the drop down list. Click  <strong>Browse</strong> to
-open the Categories pane.  Navigate through the hierarchical taxonomy
-and select the appropriate classification for your business service, then
-exit the Categories pane.</span></li>
-<li><span>Click  <strong>Go</strong> to publish your business entity.</span></li>
-</ol>
-<div class="section"><p> <strong>Important:</strong> Ensure that you select the service document,
-since the service element is the basis for the Business Service that you will
-publish.  You cannot publish a Business Service using a WSDL document
-that does not have service elements.</p>
-<p>The Web Services Explorer
-is automatically updated with your published Web service. The registry contains
-pointers to the URL of the WSDL service document of the Web service. Businesses
-can now discover and integrate with your Web service.</p>
-</div>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="treg.html" title="In order to publish your business entity and Web service to a UDDI registry, you must first register with the registry that you want to use.">Registering with a UDDI registry</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div></div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/treg.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/treg.html
deleted file mode 100644
index 115e4a7..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/treg.html
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Registering with a UDDI Registry</title>
-</head>
-<body id="treg"><a name="treg"><!-- --></a>
-
-<h1 class="topictitle1">Registering with a UDDI registry</h1>
-<div><p>In order to publish your business entity and Web service to a UDDI
-registry, you must first register with the registry that you want to use.</p>
-<div class="section"><p>There are many different public and private registries with which
-you can register.  For a list of public registries refer to  <a href="http://www.uddi.org/register.html" target="_blank">www.uddi.org/register.html</a> Since each registry is
-different, the registry provider will give you instructions for registering.</p>
-<p>The
-following registries are automatically added to Favorites:</p>
-<ul><li>IBM<sup>®</sup> UDDI
-Registry</li>
-<li>IBM UDDI
-Test Registry</li>
-<li>Microsoft<sup>®</sup> UDDI
-Registry</li>
-<li>Microsoft UDDI
-Test Registry</li>
-<li>SAP UDDI Registry</li>
-<li>SAP UDDI Test Registry</li>
-<li>XMethods Registry</li>
-<li>NTT Communications Registry</li>
-</ul>
-<p>You can use any of these registries by selecting the Favorites icon
-in the Web Services Explorer toolbar. All of these registries are based on
-the UDDI Business Registry Version 2. Go to the following URL to obtain a
-user ID and password for the IBM UDDI registry:  <a href="http://www-3.ibm.com/services/uddi/" target="_blank">www.ibm.com/services/uddi/</a>.
-The details page of each registry will have registration instructions.</p>
-<p>The IBM UDDI
-Test Registry allows you to develop your Web service and experience the UDDI
-registration process without placing your Web service in an official registry.
-Use the IBM UDDI
-Test Registry or a private registry to experiment with UDDI, and to test and
-validate your Web service. The public production registries are listed
-under Favorites. The Web Services Explorer does not preload any registries
-by default.  You can preload registries from the favorites section of
-the Web Services Explorer or by using the Unit Test UDDI wizard. You can also
-preload and configure private registries using the Unit Test UDDI wizard.
-On the Open Registry page of the Web Services Explorer, you can select from
-public registries and registries listed in your favorites to automatically
-fill in the information required to open a particular registry.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tsampapp.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tsampapp.html
deleted file mode 100644
index 5c65754..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tsampapp.html
+++ /dev/null

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Generating a Java client proxy and a sample application from
-a WSDL document</title>
-</head>
-<body id="tsampapp"><a name="tsampapp"><!-- --></a>
-
-<h1 class="topictitle1">Generating a Java client proxy and a sample application
-from a WSDL document using the IBM SOAP run-time environment</h1>
-<div><p>The Web Service Client wizard assists you in generating a Java™ bean
-proxy and a sample application.  The sample Web application demonstrates
-how to code a proxy file.</p>
-<div class="p">Prerequisites:<ol><li id="tsampapp__createtomcatlinks"><a name="tsampapp__createtomcatlinks"><!-- --></a>If you are using the Apache Jakarta Tomcat servlet
-container as your server, you must install it, configure an instance of it,
-and create a Web project targeted to it as described in <a href="../../org.eclipse.jst.ws.axis.creation.ui.doc.user/tasks/ttomcatserv.html">Creating a WebSphere<sup>®</sup> Server and Web project</a></li>
-<li id="tsampapp__prereqcreatewsprojs"><a name="tsampapp__prereqcreatewsprojs"><!-- --></a>If you are using a WebSphere server, create a dynamic
-Web project targeted to the appropriate server as described in <a href="../../org.eclipse.jst.ws.doc.user/tasks/twasserv.html">Creating a WebSphere Server and Web project</a>.</li>
-<li>Discover and import a WSDL document into the Web project. You can only
-use a WSDL file that contains a service element.</li>
-</ol>
-</div>
-<div class="section"><p>To generate a Java client proxy and a sample application
-from a discovered WSDL document:</p>
-</div>
-<ol><li><span>Switch to the J2EE perspective (<span class="uicontrol">Window &gt; Open Perspective
-&gt; J2EE</span>).</span></li>
-<li><span>In the Project Explorer view, select the Web project in which you
-want to generate a sample application.</span></li>
-<li><span>Click  <span class="uicontrol">File &gt; New &gt; Other</span>. Select  <span class="uicontrol">Web
-Services</span> in order to display the various Web service wizards.
-Select the  <span class="uicontrol">Web Service Client</span> wizard. Click  <span class="uicontrol">Next</span>.</span></li>
-<li><span>Web Services panel: Select the type of proxy to be generated, and
-whether or not it will be tested.</span></li>
-<li><span>Client Environment Configuration page: Select the run-time environment
-and the server for your Web service client.</span><ol type="a"><li class="substepexpand"><span>Click  <span class="uicontrol">Explore Options</span> and select the IBM<sup>®</sup> SOAP
-run-time environment and select the server on which you want to run your Web
-service client.</span> If you want to use the Apache Axis 1.0 run-time
-environment or the IBM WebSphere run-time environments, refer to the appropriate
-task. </li>
-<li class="substepexpand"><span>Select the type and name of project in which you want the Web
-service client created.</span> <ul><li> If you enter the name of an existing project, the project type field
-must match that of the existing project. Ensure that the project selected
-as the Client Web Project is different from the Service Web Project, or the
-service will be overwritten by the client's generated artifacts.</li>
-<li>If you enter a name of a project that does not already exist, the wizard
-will create the project for you.</li>
-<li>Note that the only project type supported for Axis and SOAP run-time clients
-is a Web project. If you want the client to be created in a Java, EJB,
-or Application Client project, you must select the WebSphere run-time environment for
-your client.</li>
-</ul>
-</li>
-<li class="substepexpand"><span> Select an existing EAR or enter a unique name to associate
-the Web service client with a different EAR than the Web service EAR. <strong>Note:</strong> Selecting
-different EARs for the Web service and Web service client can reduce the chance
-of encountering run time errors, but will use more system resources.</span></li>
-</ol>
-</li>
-<li><span>Web Service Selection panel: Enter the URI to the WSDL, WSIL, or
-HTML file that will be used to generate the Java bean. You can optionally generate a
-WSIL file from this file as well.</span></li>
-<li><span>Web Service Binding Proxy Generation panel: Select the binding
-and proxy options.</span></li>
-<li><span>Web Service Proxy Test panel: Select the test facility that you
-will use to test the proxy, and the methods that you want included in the
-proxy. Note that the Universal Test Client (UTC) is only compatible with Web
-service clients deployed on WebSphere servers. Click  <span class="uicontrol">Finish</span></span></li>
-</ol>
-<div class="section"><p>Notes<sup>®</sup>:</p>
-<ul><li>When defining custom mappings ensure the bean, serializer, and deserializer
-classes are on the build path of the Web project, otherwise the wizard will
-not accept their class names.</li>
-<li>Indexed properties that result from WSDL XSD complex Types involving more
-than one occurrence of DOM Elements are not supported by the sample. SOAP
-encoded methods using indexed properties are not available for invocation.
-Literal XML encoded methods using indexed properties are available for invocation;
-however, the inputs and outputs must be specified as Literal XML.</li>
-<li>Only the following types are supported by the sample application:  <ul><li>Members that use getters and setters.</li>
-<li>All primitive types and corresponding Java types.</li>
-<li>Java type
-String.</li>
-<li>org.w3c.dom.Element</li>
-<li>Java beans.</li>
-<li>BigDecimal, GregorianCalendar, and Date.</li>
-</ul>
-</li>
-</ul>
-<p><strong>Important:</strong> It is recommended that you select the service WSDL
-document rather than the binding WSDL document in order to generate a client
-proxy that contains the complete endpoint information. The service element
-is the basis for the Business Service that you will publish. You cannot publish
-a Business Service using a WSDL document that does not have service elements. 
-If you generate a proxy from a WSDL binding document, you must call the  <tt class="sysout">setEndPoint()</tt> method
-to set an endpoint URL before you call any other method in the proxy. 
-The proxy generated from a WSDL binding document is not automatically equipped
-with an endpoint URL.</p>
-<p>The generated Java bean proxy provides a remote procedure
-call interface to the Web service. The sample Web application demonstrates
-how to code the proxy file.</p>
-<p>Once you have generated your Java client
-proxy, you may test the methods of the Web service through the proxy using
-Web Services sample JSPs or the Universal test client.</p>
-<ul><li>If you have selected to test the generated proxy using Web service JSPs,
-the proxy is launched in a Web browser at the following URL:<samp class="codeph"> http://localhost: <var class="varname">port</var>/WebProjectClient/sample/ <var class="varname">WebService</var>/TestClient.jsp </samp> You can use this sample application to test the
-Web service by selecting a method, entering a value for the method, and clicking
- <span class="uicontrol">Invoke</span>. The result of the method will display in the
-results pane.</li>
-<li>If you have selected to test the generated proxy using the Universal Test
-Client, it will be launched in a browser window at the following URL:<samp class="codeph">  <tt class="sysout">http://localhost:9080/UTC/preload?object=proxy.soap. <var class="varname">ProxyName</var>Proxy</tt> </samp> In the Reference pane,
-under Object References, expand the proxy to display the methods of the Web
-service. Click the method you want to test, enter a value in the Parameters
-pane, and click  <span class="uicontrol">Invoke</span>. The result will be generated
-below.</li>
-</ul>
-<p>For more information on creating a Web project, refer to the Web application
-development documentation.</p>
-</div>
-</div>
-<div>
-<div class="linklist"><strong>Collected links</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div></div>
-
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tstrtexp.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tstrtexp.html
deleted file mode 100644
index 6fb1de5..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tstrtexp.html
+++ /dev/null

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Launching the Web Services Explorer</title>
-</head>
-<body id="tstrtexp"><a name="tstrtexp"><!-- --></a>
-
-<h1 class="topictitle1">Launching the Web Services Explorer</h1>
-<div><p>The Web services tools allows you to launch the Web Services Explorer
-in several ways.</p>
-<div class="section"><ul><li>From the main toolbar in the J2EE perspective.</li>
-<li>By using the Web service wizards.</li>
-<li>By using the Import wizard.</li>
-<li>By using the Export wizard.</li>
-<li>From the Run menu in the J2EE perspective.</li>
-<li>From a WSDL file.</li>
-</ul>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-</div><div class="nested1" xml:lang="en-us" id="d0e38"><a name="d0e38"><!-- --></a><h2 class="topictitle2">Launching the Web Services Explorer from the main toolbar</h2>
-<div><div class="section"><p>To launch the Web Services Explorer from the main toolbar, ensure
-that you are in the J2EE perspective and click the  <strong>Launch the Web Services
-Explorer</strong> icon  <img src="../images/uddiview.gif" alt="Picture of the Launch Web Services Explorer icon." />. The Web Services Explorer opens without
-any registries displayed in the Navigator pane. You can now  <a href="taddreg.html">add
-a registry</a> to the Web Services Explorer.</p>
-</div>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e50"><a name="d0e50"><!-- --></a><h2 class="topictitle2">Launching the Web Services Explorer using the Web Services Wizard</h2>
-<div><div class="section"><p>To launch the Web Services Explorer from the Web Services Wizard,
-select the  <strong>Test the Web Service</strong> check box in the first page of the
-Web Services Wizard. Proceed with the wizard and then in the Web Service Test
-Page, choose  <strong>Web Services Explorer</strong> as the test facility and click
-on the  <strong>Launch</strong> button. If you launch the Web Services Explorer using
-this method, it will automatically preload the WSDL (and its child nodes)
-in the WSDL page.</p>
-</div>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e63"><a name="d0e63"><!-- --></a><h2 class="topictitle2">Launching the Web Services Explorer using the Import wizard</h2>
-<div><div class="section"><p>To launch the Web Services Explorer using the Import wizard, do
-the following:</p>
-</div>
-<ol><li><span>From the main menu, click  <strong>File &gt; Import</strong>. The Import wizard
-opens.</span></li>
-<li><span>Select  <strong>Web Service</strong> and click  <strong>Next</strong>. The Web service
-import wizard opens.</span></li>
-<li><span>Click  <strong>Finish</strong>.</span></li>
-</ol>
-<div class="section"><p>The Web Services Explorer opens. If you selected a registry on
-the Web Service Publication page of the Web service Import wizard, you will
-see the registry displayed in the Navigator pane.</p>
-</div>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e95"><a name="d0e95"><!-- --></a><h2 class="topictitle2">Launching the Web Services Explorer using the Export wizard</h2>
-<div><div class="section"><p>To launch the Web Services Explorer using the Export wizard, do
-the following:</p>
-</div>
-<ol><li><span>From the main menu, click  <strong>File &gt; Export</strong>. The Export wizard
-opens.</span></li>
-<li><span>Select  <strong>Web Service</strong> and click  <strong>Next</strong>. The Web Service
-Export wizard opens.</span></li>
-<li><span>Click  <strong>Finish</strong>. The Web Services Explorer opens.</span></li>
-</ol>
-<div class="section"><p>The Web Services Explorer opens.  If you selected a registry
-on the Web Service Publication page of the Web Service Export wizard, you
-will see the registry displayed in the Navigator pane.</p>
-</div>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e127"><a name="d0e127"><!-- --></a><h2 class="topictitle2">Launching the Web Services Explorer from the Run menu</h2>
-<div><div class="section"><p>To launch the Web Services Explorer from the main menu, ensure
-that you are in the J2EE perspective and click  <strong>Run &gt; Launch the Web Services
-Explorer</strong>. The Import wizard opens. The Web Services Explorer opens. 
-The Web Services Explorer opens without any registries displayed in the Navigator
-pane.</p>
-</div>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e134"><a name="d0e134"><!-- --></a><h2 class="topictitle2">Launching the Web Services Explorer from a WSDL file</h2>
-<div><div class="section"><p>To launch the Web Services Explorer from a WSDL file,
-select the WSDL file and right-click and choose  <strong>Web Services &gt; Test with
-Web Services Explorer</strong> or  <strong>Publish WSDL file</strong>.  The Web Services
-Explorer opens. The  <strong>Test with Web Services Explorer</strong> action will preload
-the WSDL in the WSDL page.</p>
-</div>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="treg.html" title="In order to publish your business entity and Web service to a UDDI registry, you must first register with the registry that you want to use.">Registering with a UDDI registry</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div></div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html
deleted file mode 100644
index 61132ab..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html
+++ /dev/null

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Using the WSDL Explorer</title>
-</head>
-<body id="ttestwsdl"><a name="ttestwsdl"><!-- --></a>
-
-<h1 class="topictitle1">Testing WSDL documents and Web services using the WSDL Explorer</h1>
-<div><p>WSDL documents allow developers to expose their applications as
-network-accessible services on the Internet. Through UDDI and WSIL, other
-applications can discover WSDL documents and bind with them to execute transactions
-or perform other business processes. The Web Services Explorer allows you
-to explore, import, and test WSDL documents.</p>
-<div class="p">Prerequisites:  To use the WSDL Explorer:<ul><li>You must have a valid URL for a WSDL document.</li>
-<li>You must launch the Web Services Explorer: <a href="tstrtexp.html">Launch
-the Web Services Explorer</a></li>
-</ul>
-</div>
-<div class="section"><p>The WSDL Explorer allows you to explore, and test WSDL documents.
-For more information on exploring WSDL documents using the WSDL Explorer,
-refer to <a href="twsdlexp.html">Using the WSDL Explorer</a> .</p>
-<p>To
-test a Web service using the WSDL Explorer:</p>
-</div>
-<ol><li class="stepexpand"><span>To launch the WSDL Explorer, complete the following steps:</span><ol type="a"><li><span>In the Web Services Explorer, switch to the WSDL Explorer by
-clicking the icon in the upper right-hand corner  <img src="../images/wsdlicon.gif" alt="Icon to launch the WSDL Explorer" />. </span></li>
-</ol>
-</li>
-<li class="stepexpand"><span>Select WSDL Main in the Navigator pane, enter or browse to an existing
-WSDL URL in the right-hand pane, and click  <strong>Go</strong>. For this example the
-WSDL being used is a Web Service which returns a temperature for any entered
-zip code.   <br /><img src="../images/wsdlexp.gif" alt="Screen capture of the WSDL Main pane of the Web Services Explorer" /><br />  The following nodes
-will be added to the WSDL tree: </span> <ul><li>The WSDL node:  <img src="../images/wsdlnode.gif" alt="WSDL node icon" /></li>
-<li>The service node (which represents a service element within the WSDL file):
- <img src="../images/servnode.gif" alt="Service node icon" /></li>
-<li>The binding node:  <img src="../images/bindnode.gif" alt="Binding node icon" /></li>
-<li>The operation node:  <img src="../images/opnode.gif" alt="Operation node icon" /></li>
-</ul>
-</li>
-<li class="stepexpand"><span>In the WSDL Binding Details pane, click the operation (in this
-example the  <tt class="sysout">getTemp</tt> operation) to display: </span> <ul><li>A drop-down list with the endpoints available for this operation</li>
-<li>Fields for each of the parameters of this operation (in this example the
- <tt class="sysout">zipcode</tt> parameter) and the type of information
-the parameter is looking for (in this example  <tt class="sysout">zipcode</tt> is
-requesting a string).   <br /><img src="../images/wsdlop.gif" alt="Invoke a WSDL Operation pane of the Web Services Explorer" /><br />  The Form view allows
-you to enter the parameters for the Web service operation call. Parameters
-names are displayed as links whose action is to display a dialog describing
-embedded XML Schema Definition Language (XSD) information. More information
-about XSD can be found here:  <a href="http://www.eclipse.org/xsd/">http://www.eclipse.org/xsd/</a> 
- <br /><img src="../images/scenario7.gif" alt="Screen capture of the XSD Information Dialog" /><br />  </li>
-</ul>
-</li>
-<li class="stepexpand"><span>Enter your string and click  <strong>Go</strong>. The result is returned
-in the Status pane.   <br /><img src="../images/wsdlopret.gif" alt="Screen capture of an invoked WSDL operation showing the result in the Status pane" /><br />  </span></li>
-<li class="stepexpand"><span>If you are using SOAP as your binding method, clicking Source or
-Form in the upper right-hand corner will toggle the display between the Form
-view (shown above) and the Source view, which displays the SOAP message in
-the XML format. You can also enter the same information as in the form, only
-in XML format (this is suggested for advanced users only). The Explorer does
-validate the XML if you modify it, but not the parameter values you enter.
- <br /><img src="../images/wsdlopretx.gif" alt="Source view of the Invoke a WSDL Operation pane." /><br /></span></li>
-<li class="stepexpand"><span> If you are using SOAP as your binding type, you will also
-have the option of toggling the Status pane between the Source and Form views.
-The Source view shows the SOAP request and response envelopes, including the
-parameters you have entered to test the service and the returned value.   <br /><img src="../images/wsdlstatx.gif" alt="Screen capture of the source view of the SOAP request and response envelopes" /><br /> </span></li>
-</ol>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/tasks/toverws.html"> Developing Web services</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.html
deleted file mode 100644
index a0f56c5..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.html
+++ /dev/null

@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Publishing Web services and business entities with the Web Services
-Explorer</title>
-</head>
-<body id="tuddiexp"><a name="tuddiexp"><!-- --></a>
-
-<h1 class="topictitle1">Publishing Web services and business entities</h1>
-<div><p>Through UDDI and WSIL, other applications can discover WSDL documents
-and bind with them to execute transactions or perform other business processes. </p>
-<div class="section"><p>UDDI enables the discovery of Web services by providing a distributed
-registry of businesses and their service descriptions, implemented in a common
-XML format.  In order for a service requestor to discover a service,
-a service provider must first publish a business entity and at least one business
-service, and service interface in a UDDI registry.  The Web Services
-Explorer is a Web application that supports the publication, discovery, and
-maintenance of business entities, business services, and service interfaces.</p>
-<p>WSIL
-enables the discovery of Web services by defining a distributed service discovery
-method that supplies references to service descriptions at the service provider's
-point-of-offering, by specifying how to inspect a Web site for available Web
-services.  The WSIL specification defines the locations on a Web site
-where you can look for Web service descriptions. Since WSIL focuses on
-distributed service discovery, the WSIL specification complements UDDI by
-facilitating the discovery of services that are available on Web sites
-that may not be listed yet in a UDDI registry. The Web Services Explorer allows
-you to generate and explore WSIL documents.</p>
-<p>The favorites page of the
-Web Services Explorer allows you to store the location of UDDI registries,
-business entities, Web services, service interfaces, as well as WSIL and WSDL
-documents.</p>
-<p>Use the Web Services Explorer to do any of the following
-tasks:</p>
-<ul><li> <a href="taddreg.html">Add a registry to the Web Services Explorer</a> </li>
-<li> <a href="tbkmrk.html">Adding a registry, business entity, business
-service, service interface, WSIL, or WSDL service to Favorites</a> </li>
-<li> <a href="tdiscov.html">Discover a Web service</a> </li>
-<li> <a href="tpubent.html">Publish a business entity to a registry</a> </li>
-<li> <a href="tpublish.html">Publish a business service to a registry</a> </li>
-<li> <a href="tunpub.html">Remove a business entity, business service,
-or service interface from a registry</a> </li>
-<li> <a href="tupdate.html">Update a business entity, business service,
-or service interface</a> </li>
-<li> <a href="tbusproj.html">Manage referenced services</a> </li>
-<li> <a href="tassert.html">Manage publisher assertions</a> </li>
-</ul>
-<p>Prerequisites:</p>
-</div>
-<ol><li class="stepexpand"><span>Before you can use the Web Services Explorer to perform any of
-these functions, you must  <a href="treg.html">register with a public registry</a> or <a href="../../org.eclipse.jst.ws.uddi.registry.doc.user/tasks/tuddiwiz.html"> configure a private registry</a>.  There are many different
-registries with which you can register.</span> </li>
-<li class="stepexpand"><span>Ensure that you are using a supported Web browser.</span> The
-following Web browsers and versions are supported:<ul><li>Internet Explorer: 6.0 and up</li>
-<li>Mozilla: 1.2.1 and up</li>
-</ul>
-</li>
-<li class="stepexpand"><span> <a href="tstrtexp.html">Launch the Web Services Explorer</a>.</span></li>
-</ol>
-<div class="section"><div class="p"><strong>Known limitations of the Web Services Explorer:</strong><ul><li>The taxonomy categories in the Web Services Explorer are not translated
-since they must match those in the standards adhered to by UDDI (ISO, UNSPSC
-7.3, NAICS).</li>
-<li>The Web Services Explorer will launch without the browser toolbar which
-shows, amongst other things, the URL to the Web application. This URL should
-only be used by users with accessibility needs. The URL to the Web Services
-Explorer Web application can be obtained through the following steps:<ol><li>From the Window menu, select Preferences.</li>
-<li>In the Preferences dialog, select <span class="uicontrol">Web Browser</span> in
-the left pane.</li>
-<li>On the right, select <span class="uicontrol">Use external Web Browser</span>.</li>
-<li>In the <span class="uicontrol">Location: text</span> field, browse or type in
-the full path of the Internet Explorer executable. (for example, C:\Program
-Files\Internet Explorer\iexplore.exe).</li>
-<li>Click <span class="uicontrol">Apply</span> followed by <span class="uicontrol">OK</span>.</li>
-</ol>
- Note that this preference will now apply to any browser windows that
-are launched by the user or by the tools themselves (such as the Universal
-Test Client).  The Web Services Explorer will now launch in an external browser
-and its URL should be in the Address field. This can then be pasted or opened
-using am accessibility assisting browser such as IBM<sup>®</sup> Home Page Reader.</li>
-<li>When performing an advanced find or publish in the UDDI page of the Web
-Services Explorer, the items in the drop down list for picking a language
-in conjunction with a name or description is sorted  according to the operating
-system's locale settings. On Windows<sup>®</sup>, this order may be managed through
-the Control Panel. To do this:<ol><li>Open the Control Panel.</li>
-<li>Launch the Regional Options control panel applet.</li>
-<li>In the General tab of the resulting dialog, there may be a "Sorting order"
-drop-down list. If so, pick a sorting order and then click <span class="uicontrol">Apply</span> followed
-by <span class="uicontrol">OK</span>.</li>
-<li>In the Web Services Explorer, the new sorting order comes into effect
-once the page reloads. This can be accomplished by pressing the back arrow
-followed by the forward arrow in the main toolbar.</li>
-</ol>
-Note: The instructions above apply to Windows 2000. On Windows XP,
-the tab mentioned in step 3 is called "Regional Options". Beside the language
-drop-down, there is a <span class="uicontrol">Customize</span> button. When this is
-clicked, a new dialog appears. A sorting tab will allow users to pick the
-sorting method if applicable.</li>
-</ul>
-</div>
-</div>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../tasks/tstrtexp.html">Launching the Web Services Explorer</a></strong><br />
-The Web services tools allows you to launch the Web Services Explorer
-in several ways.</li>
-<li class="ulchildlink"><strong><a href="../tasks/treg.html">Registering with a UDDI registry</a></strong><br />
-In order to publish your business entity and Web service to a UDDI
-registry, you must first register with the registry that you want to use.</li>
-<li class="ulchildlink"><strong><a href="../tasks/taddreg.html">Adding a Registry to the IBM Web Services Explorer</a></strong><br />
-Although the Web Services Explorer comes populated with several
-registries, you can also add additional registries to your list of favorites.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tpubent.html">Publishing a business entity</a></strong><br />
-A business entity contains information about the business that
-has published a service.  Before you can publish a business service,
-you must publish a business entity.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tpublish.html">Publishing a Web service</a></strong><br />
-The Web service, also known as the business service, describes
-a Web service's endpoint and where its WSDL file resides. The WSDL file lists
-the operations that service provides.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tupdate.html">Updating a business entity, Web service, or service interface</a></strong><br />
-After you have published a business entity, Web service, or service
-interface, you can update it through the Web Services Explorer.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tunpub.html">Removing a business entity, Web service, or service interface from a registry</a></strong><br />
-After you have published a business entity, Web service, or service
-interface, you can remove or unpublish it through the Web Services Explorer.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tbusproj.html">Managing referenced services</a></strong><br />
-A service projection enables a business entity to reference a service
-that was published by another business entity. By using the businessService
-structure as a projection to an already published businessService, businesses
-can share or reuse services.  Service projections are managed centrally
-as part of the referencing businessEntity.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tassert.html">Managing publisher assertions</a></strong><br />
-A publisher assertion is a way in UDDI to associate businessEntity
-structures.  The publisher assertion defines a group of businessEntity
-structures. Many businesses are not effectively represented by a single businessEntity.
-A publisher assertion allows for associations to be formed between several
-businessEntity structures. For example, a large company may have several subsidiaries
-that have different descriptions but are still closely coupled and want to
-make their relationships visible in UDDI registries.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tbkmrk.html">Adding a registry, business entity, business service, service interface, WSIL, or WSDL service to Favorites</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../tasks/tgenwsil.html">Generating a WSIL file</a></strong><br />
-Web Services Inspection Language (WSIL) is a service discovery
-mechanism that is an alternative to UDDI as well as complementary to UDDI.
-WSIL can be generated at any point in the Web service development cycle once
-the WSDL file for the Web service has been created.</li>
-</ul>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="twsdlexp.html">Exploring WSDL using the WSDL Explorer</a></div>
-<!-- <div><a href="../../org.eclipse.jst.ws.uddi.registry.doc.user/tasks/tuddiwiz.html">Configure a private registry</a></div>-->
-<div><a href="../../org.eclipse.jst.ws.doc.user/tasks/toverws.html"> Developing Web services</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tunpub.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tunpub.html
deleted file mode 100644
index f5587c4..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tunpub.html
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Removing a business entity, Web service, or service interface
-from a registry</title>
-</head>
-<body id="tunpub"><a name="tunpub"><!-- --></a>
-
-<h1 class="topictitle1">Removing a business entity, Web service, or service interface from
-a registry</h1>
-<div><p>After you have published a business entity, Web service, or service
-interface, you can remove or unpublish it through the Web Services Explorer.</p>
-<div class="p">Prerequisites:<ol><li> <a href="tpubent.html">Publish a business entity</a>.</li>
-<li> <a href="tpublish.html">Publish a Web service</a>.</li>
-<li> <a href="tpublish.html">Publish a service interface</a>.</li>
-<li> <a href="tstrtexp.html">Launch the IBM<sup>®</sup> Web Services Explorer</a>.</li>
-</ol>
-</div>
-<div class="section">To unpublish a business entity, Web service, or service interface
-using the Web Services Explorer:</div>
-<ol><li><span>Navigate through the registry hierarchy to find the business entity,
-Web service, or service interface you want to unpublish. Select the business
-entity, Web service, or service interface.</span></li>
-<li><span>In the Actions icon bar, click the  <span class="uicontrol">Unpublish</span> icon.</span></li>
-<li><span>Enter the publish URL, your user ID, and password, if necessary,
-then click  <span class="uicontrol">Go</span>.</span></li>
-</ol>
-<div class="section"><p>The business entity, Web service, or service interface is removed
-from the registry and the Web Services Explorer is automatically updated with
-your change.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="tpubent.html" title="A business entity contains information about the business that has published a service.  Before you can publish a business service, you must publish a business entity.">Publishing a business entity</a></div>
-<div><a href="tpublish.html" title="The Web service, also known as the business service, describes a Web service's endpoint and where its WSDL file resides. The WSDL file lists the operations that service provides.">Publishing a Web service</a></div>
-<div><a href="tunpub.html" title="After you have published a business entity, Web service, or service interface, you can remove or unpublish it through the Web Services Explorer.">Removing a business entity, Web service, or service interface from a registry</a></div>
-<div><a href="tupdate.html" title="After you have published a business entity, Web service, or service interface, you can update it through the Web Services Explorer.">Updating a business entity, Web service, or service interface</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tupdate.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tupdate.html
deleted file mode 100644
index edb2c81..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tupdate.html
+++ /dev/null

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Updating a business entity, Web service, or service interface</title>
-</head>
-<body id="tupdate"><a name="tupdate"><!-- --></a>
-
-<h1 class="topictitle1">Updating a business entity, Web service, or service interface</h1>
-<div><p>After you have published a business entity, Web service, or service
-interface, you can update it through the Web Services Explorer.</p>
-<div class="p">Prerequisites:<ol><li> <a href="tpubent.html">Publish a business entity</a>.</li>
-<li> <a href="tpublish.html">Publish a Web service</a>.</li>
-<li> <a href="tpublish.html">Publish a service interface</a>.</li>
-<li> <a href="tstrtexp.html">Launch the Web Services Explorer</a>.</li>
-</ol>
-</div>
-<div class="section">To update a business entity, Web service, or service interface using
-the Web Services Explorer:</div>
-<ol><li><span>Navigate through the registry hierarchy to find the business entity,
-Web service, or service interface you want to update. Select the business
-entity, Web service, or service interface.</span></li>
-<li><span>In the Actions icon bar, click the  <span class="uicontrol">Details</span> icon.</span></li>
-<li><span>Make any necessary changes and enter your publish URL, your user
-ID, and password, if necessary, then click  <span class="uicontrol">Go</span>.</span></li>
-</ol>
-<div class="section"><p>The business entity, Web service, or service interface is updated
-in the registry and the Web Services Explorer is automatically
-updated with your change.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html"> Tools for Web services development</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<div><a href="tpubent.html" title="A business entity contains information about the business that has published a service.  Before you can publish a business service, you must publish a business entity.">Publishing a business entity</a></div>
-<div><a href="tpublish.html" title="The Web service, also known as the business service, describes a Web service's endpoint and where its WSDL file resides. The WSDL file lists the operations that service provides.">Publishing a Web service</a></div>
-<div><a href="tunpub.html" title="After you have published a business entity, Web service, or service interface, you can remove or unpublish it through the Web Services Explorer.">Removing a business entity, Web service, or service interface from a registry</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="../ref/ruddi.html" title="Once you have registered and logged in to the UDDI registry that you want to use, you can register your Web service.  Registration of a service involves four core data structure types: business information, service information, binding information, and information describing the specifications for services. The relationship between these data types is described in Figure 1.">Data structure types (UDDI registry)</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdisc.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdisc.html
deleted file mode 100644
index 1186622..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdisc.html
+++ /dev/null

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a Web service proxy using Faces</title>
-</head>
-<body id="creatingawebserviceproxy"><a name="creatingawebserviceproxy"><!-- --></a>
-
-<h1 class="topictitle1">Creating a Web service proxy using Faces</h1>
-<div><p>The Web Service Discovery Dialog allows you to discover a Web service
-that exists online or in your workspace, create a proxy to the Web service,
-and then place the methods of the proxy on a Faces JSP file.</p>
-<div class="p">Prerequisite: You must have a Faces JSP file on which you will place
-the proxy methods.</div>
-<div class="section">To discover a Web service and create a proxy for it:</div>
-<ol><li><span>Open your Faces JSP file in an editor by double-clicking it.</span></li>
-<li><span>The Page Data view should be open below the Project Navigator.
-If the Page Data view is not visible, open from the Window menu by selecting <span class="menucascade"><span class="uicontrol">Show View</span> &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">Web</span> &gt; <span class="uicontrol">Page Data</span></span>.</span></li>
-<li><span>In the Page Data view, right-click and select <span class="uicontrol">New</span> &gt; <span class="uicontrol">Web
-Service</span>.</span></li>
-<li><span>In the Web Service Discovery Dialog, select how you want to find
-a Web service: </span>
-<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="choicetableborder">
-<thead><tr><th valign="bottom" align="left" id="d0e42-option">Option</th>
-<th valign="bottom" align="left" id="d0e42-desc">Description</th></tr></thead>
-<tbody><tr><td valign="top" headers="d0e42-option" id="d0e49"><strong>Searching a public or private UDDI registry.</strong></td>
-<td valign="top" headers="d0e42-desc d0e49">If
-you select this option the UDDI Registry page displays.<ol type="a"><li>Enter the URL of a public or private UDDI registry, or select from the
-registries supplied.</li>
-<li>Enter the text with which you want to search the registry. This can include
-either the partial or full name or key (UUID) of the service.</li>
-<li>Select if you want to search by the name of the Web service, or by the
-key that is associated with a published Web service, and click <span class="uicontrol">Go</span>.</li>
-<li>The UDDI Services table is populated with a list of available Web services
-that match your criteria, including their name, description, and a URL where
-their WSDL file is located.<ul><li>To see additional information about the service, click Details. This will
-launch the Web service in the Web Services Explorer. For more information
-about using the Web Services Explorer, refer to <a href="ttestwsdl.html">Testing WSDL documents and Web services using the WSDL Explorer</a>.</li>
-<li>Click a WSDL file to continue creating your Web service proxy. Go to step <a href="#creatingawebserviceproxy__disc_step_5">5</a>.</li>
-</ul>
-</li>
-</ol>
-</td>
-</tr>
-<tr><td valign="top" headers="d0e42-option" id="d0e77"><strong>From a known URL. This can include known WSDL, WSIL, DISCO,
-and HTML URLs.</strong></td>
-<td valign="top" headers="d0e42-desc d0e77">When you select this option, the URL page
-displays. Enter the URL to a WSDL, WSIL, DISCO or HTML file that contains
-a Web service, and click <span class="uicontrol">Go</span>.<ul><li>If you entered a URL to a WSIL, HMTL, or DISCO file, a list of Web services
-available from the URL are displayed. Select one of the Web services by clicking
-on the WSDL file, and go to step <a href="#creatingawebserviceproxy__disc_step_5">5</a>.</li>
-<li>If you entered a URL to a WSDL file, go to step <a href="#creatingawebserviceproxy__disc_step_5">5</a>.</li>
-</ul>
-</td>
-</tr>
-<tr><td valign="top" headers="d0e42-option" id="d0e96"><strong>Selecting from Web services that are deployed and running
-in your workspace.</strong></td>
-<td valign="top" headers="d0e42-desc d0e96">If you selected to discover Web services
-that are in your workspace, the Workspace page displays. It contains a list
-of the Web services available in your workspace. Select a Web service by clicking
-on the appropriate WSDL file and go to step <a href="#creatingawebserviceproxy__disc_step_5">5</a>.</td>
-</tr>
-</tbody></table>
-</li>
-<li id="creatingawebserviceproxy__disc_step_5"><a name="creatingawebserviceproxy__disc_step_5"><!-- --></a><span>Once you have selected a WSDL file, a table displays
-the Web Service name and location, any documentation included in the Web service,
-and lists the available ports.</span><ol type="a"><li class="substepexpand"><span>If there is more than one port, select the port for which you
-want to create the proxy.</span></li>
-<li class="substepexpand"><span>To test the Web service and to see additional information about
-it, click Details. This will launch the Web service in the Web Services Explorer.</span> For more information about using the Web Services Explorer, refer to <a href="ttestwsdl.html">Testing WSDL documents and Web services
-using the WSDL Explorer</a>.</li>
-<li class="substepexpand"><span>Once you have ensured that the chosen Web service is the correct
-one, click Add to Project.</span> This generates your proxy bean.</li>
-</ol>
-</li>
-<li><span>The proxy is now listed in the list of existing proxy beans. Click <span class="uicontrol">OK</span> to
-add it to your Page Data.</span></li>
-<li id="creatingawebserviceproxy__ws_disc_step_7"><a name="creatingawebserviceproxy__ws_disc_step_7"><!-- --></a><span>Select the proxy method in the Page Data view,
-and drag it onto your Faces JSP file Design view. You will be asked if you
-want to use this bean to update fields or to display fields. Select the appropriate
-choice, and if necessary add an action to the bean by clicking the Browse
-button beside the Action field. Repeat for any other elements that you want
-to add to the page.</span></li>
-</ol>
-<div class="section">The proxy for the Web service is now on a Faces JSP. Save the Faces
-JSP and run it on a sever to test your Web service.</div>
-</div>
-<div></div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html
deleted file mode 100644
index a07c991..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html
+++ /dev/null

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-</head>
-<body id="twsdlexp"><a name="twsdlexp"><!-- --></a>
-
-<h1 class="topictitle1">Exploring WSDL using the WSDL Explorer</h1>
-<div><div class="p">Prerequisites: To use the WSDL Explorer, you must have a valid URL
-for a WSDL document.</div>
-<div class="section">The WSDL Explorer allows you to explore, and test WSDL documents.
-The following actions are available in the WSDL Explorer:<ul><li>Import WSDL to the Workbench:  <img src="../images/mptwsdlicon.gif" alt="Import WSDL to the Workbench icon" /></li>
-<li>Import WSDL to your file system:  <img src="../images/fswsdlicon.gif" alt="Import WSDL to your file system icon" /></li>
-<li>Launch the Web Service Wizard:  <img src="../images/wswizicon.gif" alt="Launch the Web Service Wizard icon" /></li>
-<li>Add WSDL to Favorites:  <img src="../images/wsdlfavicon.gif" alt="Add WSDL to Favorites icon" /></li>
-<li>Show WSDL details:  <img src="../images/wsdldtlicon.gif" alt="WSDL Details icon" /></li>
-</ul>
-</div>
-</div>
-<div></div><div class="nested1" xml:lang="en-us" id="d0e47"><a name="d0e47"><!-- --></a><h2 class="topictitle2">Launching the WSDL Explorer</h2>
-<div><div class="section"><p>To launch the WSDL Explorer, complete the following steps:</p>
-</div>
-<ol><li><span> <a href="tstrtexp.html">Launch the Web Services Explorer</a>.</span></li>
-<li><span>Switch to the WSDL Explorer by clicking the icon in the upper right-hand
-corner  <img src="../images/wsdlicon.gif" alt="Icon to launch the WSDL Explorer" />.</span></li>
-</ol>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e64"><a name="d0e64"><!-- --></a><h2 class="topictitle2">Importing a WSDL file to your workspace</h2>
-<div><div class="section"><p>To import the WSDL file to the Workbench:</p>
-</div>
-<ol><li><span>Click this icon:  <img src="../images/mptwsdlicon.gif" alt="Import WSDL to the Workbench icon" />.</span></li>
-<li><span>Select the project into which you want to import the WSDL.</span></li>
-<li><span>If you want to generate a WSIL file from the WSDL, select  <strong>Import
-as a service reference to a WSIL document</strong>.</span></li>
-<li><span>Click  <strong>Go</strong>.</span></li>
-</ol>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e90"><a name="d0e90"><!-- --></a><h2 class="topictitle2">Importing a WSDL file to your file system</h2>
-<div><div class="section"><p>To import the WSDL file to your file system, click this icon:
- <img src="../images/fswsdlicon.gif" alt="Import WSDL to your file system icon" />. Specify where you want the WSDL file saved on your system.</p>
-</div>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e96"><a name="d0e96"><!-- --></a><h2 class="topictitle2">Launching the Web services wizard</h2>
-<div><div class="section"><p>To launch the Web Service Wizard, click this icon:  <img src="../images/wswizicon.gif" alt="Launch the Web Service Wizard icon" />. You can select if you want to create
-a Web service client or a Skeleton Web service from the WSDL file. Click  <strong>Go</strong> to
-launch the wizard.</p>
-</div>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e105"><a name="d0e105"><!-- --></a><h2 class="topictitle2">Adding a WSDL file to your favorites</h2>
-<div><div class="section"><p>To add the WSDL file to Favorites, click this icon:  </p>
-<p>.
-The Status pane displays that the WSDL was successfully added to your list
-of favorites. </p>
-</div>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="d0e110"><a name="d0e110"><!-- --></a><h2 class="topictitle2">Exploring WSDL documents using the WSDL Explorer:</h2>
-<div><ol><li class="stepexpand"><span>Select WSDL Main in the Navigator pane, enter or browse to an existing
-WSDL URL in the right-hand pane, and click  <strong>Go</strong>. Note that the Explorer
-will only allow you to browse for WSDL files that reside in the <samp class="codeph">WebContent/WSDL</samp> folder
-of a project. To explore WSDL files stored in other locations within your
-workspace, type the name of the WSDL file or select the file in the workspace,
-right-click and select <span class="menucascade"><span class="uicontrol">Web Services </span> &gt; <span class="uicontrol"> Launch
-Web Services Explorer</span></span>. For this example the WSDL
-being used is a Web Service which returns a temperature for any entered zip
-code.   <br /><img src="../images/wsdlexp.gif" alt="" /><br /> 
-The following nodes will be added to the WSDL tree: </span> <ul><li>The WSDL node:  <img src="../images/wsdlnode.gif" alt="WSDL node icon" /></li>
-<li>The service node (which represents a service element within the WSDL file):
- <img src="../images/servnode.gif" alt="Service node icon" /></li>
-<li>The binding node:  <img src="../images/bindnode.gif" alt="Binding node icon" /></li>
-<li>The operation node:  <img src="../images/opnode.gif" alt="Operation node icon" /></li>
-</ul>
-</li>
-<li class="stepexpand"><span>Clicking the Service node in the Navigator pane (in this example
-this would be the  <tt class="sysout">TemperatureService</tt> node) displays
-all the bindings for this service, as well as their type and a brief description
-of the binding if the WSDL provider has included one in the Actions pane.
-Three types of bindings are supported: SOAP, HTTP Get, and HTTP Post.   <br /><img src="../images/wsdlservdet.gif" alt="" /><br />  The WSDL
-used in this example only has one binding,  <tt class="sysout">TemperatureBinding</tt>,
-which is represented as the  <tt class="sysout">TemperaturePortType</tt> node
-in the WSDL tree in the Navigator pane.</span></li>
-<li class="stepexpand"><span>Clicking a displayed binding or its node displays the WSDL binding
-details in the Actions pane. This includes the operations and endpoints available
-for this service.   <br /><img src="../images/wsdlbnddetl.gif" alt="" /><br />  In this view you can add or remove endpoints for the service. To
-add an endpoint, click  <strong>Add</strong>, enter the URL for the endpoint, and click
- <strong>Go</strong>. The Status pane should say that the endpoints were successfully
-updated. To remove an endpoint, select its checkbox, and click  <strong>Remove</strong>.</span></li>
-</ol>
-<div class="section"><div class="note"><span class="notetitle">Note:</span> When the
-Web Services Explorer loads WSDL files that use multiple inline schemas, warning
-messages will be generated for types that are referenced across these schemas.
-The warning message will be similar to: <samp class="codeph">Reference of type &lt;<em>qualified_type_name</em>&gt;
-isn't resolved.</samp></div>
-</div>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cws.html">Web services development</a></div>
-<div><a href="../concepts/cuddi.html" title="Universal Description, Discovery, and Integration (UDDI) specification defines a way to publish and discover information about Web services.">Universal Description, Discovery, and Integration (UDDI)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="tuddiexp.html" title="Through UDDI and WSIL, other applications can discover WSDL documents and bind with them to execute transactions or perform other business processes.">Publishing Web services and business entities</a></div>
-<div><a href="tstrtexp.html" title="The Web services tools allows you to launch the Web Services Explorer in several ways.">Launching the Web Services Explorer</a></div>
-<!-- <div><a href="../../org.eclipse.jst.ws.doc.user/tasks/toverws.html"> Developing Web services</a></div>-->
-</div>
-</div></div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptionbuild_toc.xml b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptionbuild_toc.xml
deleted file mode 100644
index 46ed8dc..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptionbuild_toc.xml
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<toc link_to="../org.eclipse.jst.ws.doc.user/webservice_toc.xml#wsconsumptiont" label="wsconsumptiont" topic="concepts/cuddi.html">
-   <topic label="Universal Description, Discovery, and Integration (UDDI)" href="concepts/cuddi.html"/>
-   <topic label="Relationship between UDDI and WSDL" href="concepts/cwsdlud.html"/>
-   <topic label="Discovering Web Services" href="tasks/tdiscov.html"/>
-   <topic label="Exploring WSDL using the WSDL Explorer" href="tasks/twsdlexp.html"/>
-   <topic label="Testing WSDL documents and Web services using the WSDL Explorer" href="tasks/ttestwsdl.html"/>
-   <topic label="Generating a Java client proxy and a sample application from a WSDL document using the IBM SOAP run-time environment" href="tasks/tsampapp.html"/>
-   <topic label="Creating a Web service proxy using Faces" href="tasks/twsdisc.html"/>
-   <topic label="Publishing Web services and business entities" href="tasks/tuddiexp.html">
-      <topic label="Launching the Web Services Explorer" href="tasks/tstrtexp.html"/>
-      <topic label="Registering with a UDDI registry" href="tasks/treg.html"/>
-      <topic label="Adding a Registry to the IBM Web Services Explorer" href="tasks/taddreg.html"/>
-      <topic label="Publishing a business entity" href="tasks/tpubent.html"/>
-      <topic label="Publishing a Web service" href="tasks/tpublish.html">
-         <topic label="Data structure types (UDDI registry)" href="ref/ruddi.html"/>
-      </topic>
-      <topic label="Updating a business entity, Web service, or service interface" href="tasks/tupdate.html"/>
-      <topic label="Removing a business entity, Web service, or service interface from a registry" href="tasks/tunpub.html"/>
-      <topic label="Managing referenced services" href="tasks/tbusproj.html"/>
-      <topic label="Managing publisher assertions" href="tasks/tassert.html"/>
-      <topic label="Adding a registry, business entity, business service, service interface, WSIL, or WSDL service to Favorites" href="tasks/tbkmrk.html"/>
-      <topic label="Generating a WSIL file" href="tasks/tgenwsil.html"/>
-   </topic>
-</toc>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptiont_toc.xml b/docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptiont_toc.xml
deleted file mode 100644
index c290461..0000000
--- a/docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptiont_toc.xml
+++ /dev/null

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<toc label="wsconsumptiont" link_to="../org.eclipse.jst.ws.doc.user/webservice_toc.xml#wsconsumptiont" topic="tasks/tuddiexp.html">
-   <topic label="Publishing Web services and business entities" href="tasks/tuddiexp.html">
-      <topic label="Launching the Web Services Explorer" href="tasks/tstrtexp.html"/>
-      <topic label="Registering with a UDDI registry" href="tasks/treg.html"/>
-      <topic label="Adding a Registry to the IBM Web Services Explorer" href="tasks/taddreg.html"/>
-      <topic label="Publishing a business entity" href="tasks/tpubent.html"/>
-      <topic label="Publishing a Web service" href="tasks/tpublish.html">
-         <topic label="Data structure types (UDDI registry)" href="ref/ruddi.html"/>
-      </topic>
-      <topic label="Updating a business entity, Web service, or service interface" href="tasks/tupdate.html"/>
-      <topic label="Removing a business entity, Web service, or service interface from a registry" href="tasks/tunpub.html"/>
-      <topic label="Managing referenced services" href="tasks/tbusproj.html"/>
-      <topic label="Managing publisher assertions" href="tasks/tassert.html"/>
-      <topic label="Adding a registry, business entity, business service, service interface, WSIL, or WSDL service to Favorites" href="tasks/tbkmrk.html"/>
-   </topic>
-</toc>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/.project b/docs/org.eclipse.jst.ws.doc.user/.project
deleted file mode 100644
index 395f1e9..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/.project
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

diff --git a/docs/org.eclipse.jst.ws.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index dab4ac4..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Web services UI
-Bundle-SymbolicName: org.eclipse.jst.ws.doc.user; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true

diff --git a/docs/org.eclipse.jst.ws.doc.user/about.html b/docs/org.eclipse.jst.ws.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/build.properties b/docs/org.eclipse.jst.ws.doc.user/build.properties
deleted file mode 100644
index 3c5317f..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/build.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-bin.includes = plugin.properties,\
-               plugin.xml,\
-               webservice_toc.xml,\
-               about.html,\
-               images/,\
-               concepts/,\
-               tasks/,\
-               ref/,\
-               META-INF/
-src.includes = build.properties

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/cjaxrpc.html b/docs/org.eclipse.jst.ws.doc.user/concepts/cjaxrpc.html
deleted file mode 100644
index 30a692a..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/cjaxrpc.html
+++ /dev/null

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>JAX-RPC</title>
-</head>
-<body id="cjaxrpc"><a name="cjaxrpc"><!-- --></a>
-
-<h1 class="topictitle1">JAX-RPC</h1>
-<div><p>JAX-RPC stands for Java™ API for XML-based RPC, also known as
-JSR 101. It is a specification that describes Java Application Programming Interfaces
-(APIs) and conventions for building Web services and Web service clients that
-use remote procedure calls (RPC) and XML. It standardizes the Java to
-WSDL and WSDL to Java mappings, and provides the core APIs for developing
-Web services and Web service clients on the Java platform. Often used in a distributed
-client/server model, an RPC mechanism enables clients to execute procedures
-on other systems.</p>
-<p>The current release of JAX-RPC requires the support of SOAP over HTTP for
-interoperability purposes. The SOAP specification defines message structure,
-encoding rules, and conventions for exchanging information in the RPC programming
-model. These calls and responses are transmitted as SOAP messages over HTTP.
-In this release, JAX-RPC supports SOAP 1.1 and HTTP 1.1. For more information
-on SOAP, refer to <a href="csoap.html">Simple Object Access Protocol (SOAP)</a>.</p>
-<p>Although the underlying run-time mechanisms (for example, Java to
-WSDL serialization, WSDL to Java deserialization, protocol and transport)
-are very complex, the API hides this complexity from the application developer.
-On the server side, the developer can provide a Service Endpoint Interface
-(SEI); alternately an SEI can be created using the Web services wizrds. An
-SEI is an interface written in the Java programming language that specifies
-the remote procedures of a Web service. The developer also provides the implementation
-of a Web service, in the form of one or more Java classes that implement methods of the
-same signature as those on the SEI. Client programs are also easy to code.
-A client creates a proxy, a local object representing the service implementation
-and the SEI, and then simply invokes methods on the proxy.</p>
-<p>JAX-RPC is highly interoperable: a JAX-RPC client can access a Web service
-that is not running on the Java platform and vice versa. This flexibility
-is possible because JAX-RPC uses SOAP over HTTP, and the Web Service Description
-Language (WSDL). JAX-RPC was designed to support WS-I.</p>
-<p>For more information on JAX-RPC, refer to the  <a href="http://www.jcp.org/en/jsr/detail?id=101" target="_blank">official JSR 101 specifications</a>.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-<div><a href="cwsinwsa.html">Tools for Web services development</a></div>
-<div><a href="cjsr109.html" title="JSR 109 and JSR 921 (Implementing Enterprise Web Services) define the programming model and run-time architecture to deploy and look up Web services in the J2EE environment; more specifically, in the Web, EJB, and Client Application containers. One of its main goals is to ensure vendors' implementations interoperate.">JSR 109 and JSR 921- Implementing Enterprise Web services</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/toverws.html"> Developing
-Web services</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/cjsr109.html b/docs/org.eclipse.jst.ws.doc.user/concepts/cjsr109.html
deleted file mode 100644
index 50e94b2..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/cjsr109.html
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>JSR 109 and JSR 921- Implementing Enterprise Web services</title>
-</head>
-<body id="cjsr109"><a name="cjsr109"><!-- --></a>
-
-<h1 class="topictitle1">JSR 109 and JSR 921- Implementing Enterprise Web services</h1>
-<div><p>JSR 109 and JSR 921 (Implementing Enterprise Web Services) define
-the programming model and run-time architecture to deploy and look up Web
-services in the J2EE environment; more specifically, in the Web, EJB, and
-Client Application containers. One of its main goals is to ensure vendors'
-implementations interoperate.</p>
-<p>JSR 109 and JSR 921 build on top of JAX-RPC to cover the use of JAX-RPC
-in a J2EE environment, as well as the implementation and deployment of Web
-services to a J2EE application server. JSR 109 and JSR 921 define a set of
-XML-based deployment descriptors to standardize Web services and Web service
-client deployments in the J2EE environment. Rational Developer tools support
-JSR 109 for J2EE 1.3 and JSR 921 for J2EE 1.4.</p>
-<p>For more information, refer to:  <a href="http://www.jcp.org/en/jsr/detail?id=109" target="_blank">JSR 109, "Implementing Enterprise Web Services</a> and <a href="http://www.jcp.org/en/jsr/detail?id=921" target="_blank">JSR 921: Implementing
-Enterprise Web Services 1.1</a>.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-<div><a href="cwsinwsa.html">Tools for Web services development</a></div>
-<div><a href="cjaxrpc.html" title="JAX-RPC stands for Java API for XML-based RPC, also known as JSR 101. It is a specification that describes Java Application Programming Interfaces (APIs) and conventions for building Web services and Web service clients that use remote procedure calls (RPC) and XML. It standardizes the Java to WSDL and WSDL to Java mappings, and provides the core APIs for developing Web services and Web service clients on the Java platform. Often used in a distributed client/server model, an RPC mechanism enables clients to execute procedures on other systems.">JAX-RPC</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/toverws.html"> Developing
-Web services</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/csoap.html b/docs/org.eclipse.jst.ws.doc.user/concepts/csoap.html
deleted file mode 100644
index b9c796a..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/csoap.html
+++ /dev/null

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Simple Object Access Protocol (SOAP)</title>
-</head>
-<body id="csoap"><a name="csoap"><!-- --></a>
-
-<h1 class="topictitle1">Simple Object Access Protocol (SOAP)</h1>
-<div><p>Simple Object Access Protocol (SOAP) is a lightweight protocol
-for the exchange of information in a decentralized, distributed environment.
-A SOAP message is a transmission of information from a sender to a receiver.
-SOAP messages can be combined to perform request/response patterns. </p>
-<p>SOAP is transport independent but is most commonly carried over HTTP in
-order to run with the existing Internet infrastructure.  SOAP enables
-the binding and usage of discovered Web services by defining a message path
-for routing messages. SOAP is used to query UDDI for Web services. Rational<sup>®</sup> Developer
-products support SOAP 1.1.</p>
-<p>SOAP is an XML-based protocol that defines three parts to every message:</p>
-<ul><li> <span class="uicontrol">Envelope.</span>  The envelope defines a framework
-for describing what is in a message and how to process it.  A SOAP message
-is an envelope containing zero or more headers and exactly one body. 
-The envelope is the top element of the XML document, providing a container
-for control information, the address of a message, and the message itself. 
-Headers transport any control information such as quality-of-service attributes. 
-The body contains the message identification and its parameters.  Both
-the headers and the body are child elements of the envelope.</li>
-<li> <span class="uicontrol">Encoding rules.</span>  The set of encoding rules
-expresses instances of application-defined data types. Encoding rules define
-a serialization mechanism that can be used to exchange instances of application-defined
-data types. SOAP defines a programming language-independent data type scheme
-based on XSD plus encoding rules for all data types defined according to this
-model. SOAP encoding is not WS-I compliant and thus the Literal use (which
-is no encoding) is suggested for interoperable Web services and required for
-WS-I compliance.</li>
-<li> <span class="uicontrol">Communication styles.</span> Communications can follow
-a remote procedure call (RPC) or message-oriented (Document) format. 
-These are discussed below.</li>
-</ul>
-<div class="section"><h4 class="sectiontitle">Binding styles</h4><p>SOAP supports two different communication
-styles:</p>
-<blockquote> <p> <span class="uicontrol">Remote procedure call (RPC):</span> 
-Invocation of an operation returning a result. Typically used with SOAP encoding,
-which is not WS-I compliant.</p>
-<p> <span class="uicontrol">Document Style:</span> 
-Also known as document-oriented or message-oriented style.  This style
-provides a lower layer of abstraction, and requires more programming work
-if you are using the IBM<sup>®</sup> SOAP or Apache Axis run-time environments.</p>
- </blockquote>
-</div>
-<div class="section"><h4 class="sectiontitle">Encoding styles</h4><p>In distributed computing environments,
-encoding styles define how data values defined in the application can be translated
-to and from a particular protocol format.  The translation process is
-know as serialization and deserialization.</p>
-<p>The SOAP specification defines
-the SOAP encoding style:</p>
-<blockquote> <p> <span class="uicontrol">SOAP encoding:</span> 
-The SOAP encoding style allows you to serialize/deserialize values of data
-types from the SOAP data model.  This encoding style is defined in the
-SOAP 1.1 standard, and is not WS-I compliant.</p>
- </blockquote>
-<p>WSDL defines the
-Literal XML encoding style:</p>
-<blockquote> <p> <span class="uicontrol">Literal XML:</span> 
-Literal refers to the fact that the document should be read as-is, or unencoded.
-The document is serialized as XMI, meaning that the message XML complies with
-the Schema in the WSDL. When using Literal encoding, each message part references
-a concrete schema definition. Literal encoding is WS-I compliant.</p>
- </blockquote>
-</div>
-<div class="section"><h4 class="sectiontitle">Data model</h4><p>The purpose of the SOAP data model is
-to provide a language-independent abstraction for data types used by common
-programming language types. It consists of:</p>
-<ul><li> <span class="uicontrol">Simple XSD types.</span>  For example int, string,
-and date.</li>
-<li> <span class="uicontrol">Compound types.</span>  There are two kinds of compound
-types,  <var class="varname">structs</var> and  <var class="varname">arrays</var>.  Structs
-are named aggregate types in which each element has a unique name or XML tag. 
-Arrays have elements that are identified by position, not by name.</li>
-</ul>
-<p>All elements and identifiers comprising the SOAP data model are defined
-in the namespace URI.  The SOAP standard defines the rules for how data
-types can be constructed.  A project specific XML schema must define
-the actual data types. The elements of the SOAP specification are defined
-in  <a href="http://schemas.xmlsoap.org/soap/envelope/" target="_blank">http://schemas.xmlsoap.org/soap/envelope/</a> and
- <a href="http://schemas.xmlsoap.org/soap/encoding/" target="_blank">http://schemas.xmlsoap.org/soap/encoding/</a></p>
-</div>
-<div class="section"><h4 class="sectiontitle">SOAP implementations</h4><p>Different implementations of
-the SOAP protocol are available today.  For example, the Apache Foundation
-provides Apache SOAP, which grew out of an IBM project called SOAP4J, as well as Apache
-Axis and the IBM WebSphere<sup>®</sup> run-time
-environment. This release of the Web services tools in Rational Developer Tools supports Apache
-SOAP 2.3, Axis 1.0, and IBM WebSphere implementations.</p>
-</div>
-<div class="section"><h4 class="sectiontitle">Mappings</h4><p>A mapping defines an association between
-a qualified XML element name, a Java™ class name, and an encoding style. 
-The mapping specifies how, under the given encoding, an incoming XML element
-with a fully qualified name is converted to a Java class and vice versa.</p>
-<p>For more
-information on Apache SOAP, refer to  <a href="http://xml.apache.org/soap" target="_blank">xml.apache.org/soap</a>  For more information on
-SOAP refer to  <a href="http://www.w3.org/TR/SOAP" target="_blank">www.w3.org/TR/SOAP</a> For
-more information on Web services and the WebSphere Application Server SOAP
-run-time, refer to the WebSphere Application Server documentation.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-<div><a href="cwsinwsa.html">Tools for Web services development</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/toverws.html"> Developing
-Web services</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/cws.html b/docs/org.eclipse.jst.ws.doc.user/concepts/cws.html
deleted file mode 100644
index a6c33e8..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/cws.html
+++ /dev/null

@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web services overview</title>
-</head>
-<body id="cws"><a name="cws"><!-- --></a>
-
-<h1 class="topictitle1">Web services overview</h1>
-<div><p>A Web service is a set of related application functions that can
-be programmatically invoked over the Internet. Businesses can dynamically
-mix and match Web services to perform complex transactions with minimal programming.
-Web services allow buyers and sellers all over the world to discover each
-other, connect dynamically, and execute transactions in real time with minimal
-human interaction.</p>
-<p>Web services are self-contained, self-describing modular applications that
-can be published, located, and invoked across the Web.</p>
-<blockquote> <p> <span class="uicontrol">Web services are self-contained.</span>  On
-the client side, no additional software is required.  A programming language
-with XML and HTTP client support is enough to get you started.  On the
-server side, a Web server and servlet engine are required.  The client
-and server can be implemented in different environments.  It is possible
-to Web service enable an existing application without writing a single line
-of code.</p>
- <p> <span class="uicontrol">Web services are self-describing.</span> 
-The client and server need to recognize only the format and content of request
-and response messages.  The definition of the message format travels
-with the message; no external metadata repositories or code generation tools
-are required.</p>
- <p> <span class="uicontrol">Web services are modular.</span> 
-Simple Web services can be aggregated to form more complex Web services either
-by using workflow techniques or by calling lower layer Web services from a
-Web service implementation.</p>
-<p><span class="uicontrol">Web Services are platform independent.</span> Web
-services are based on a concise set of open, XML-based standards designed
-to promote interoperability between a Web service and clients across a variety
-of computing platforms and programming languages.</p>
- </blockquote>
-<p>Web services might be anything, for example, theatre review articles, weather
-reports, credit checks, stock quotations, travel advisories, or airline travel
-reservation processes. Each of these self-contained business services is an
-application that can easily integrate with other services, from the same or
-different companies, to create a complete business process. This interoperability
-allows businesses to dynamically publish, discover, and bind a range of Web
-services through the Internet.</p>
-<div class="section"><h4 class="sectiontitle">Categories of Web services</h4><p>Web services can be grouped
-into three categories:</p>
-<blockquote> <p> <span class="uicontrol">Business information.</span> A
-business shares information with consumers or other businesses. In this case,
-the business is using Web services to expand its scope. Examples of business
-informational Web services are news streams, weather reports, or stock quotations.</p>
- <p> <span class="uicontrol">Business
-integration.</span> A business provides transactional, "for fee" services
-to its customers. In this case, the business becomes part of a global network
-of value-added suppliers that can be used to conduct commerce. Examples of
-business integration Web services include bid and auction e-marketplaces,
-reservation systems, and credit checking.</p>
- <p> <span class="uicontrol">Business process
-externalization.</span> A business differentiates itself from its competition
-through the creation of a global value chain. In this case, the business uses
-Web services to dynamically integrate its processes. An example of business
-process externalization Web services is the associations between different
-companies to combine manufacturing, assembly, wholesale distribution, and
-retail sales of a particular product.</p>
- </blockquote>
-</div>
-<div class="section"><h4 class="sectiontitle">Service roles and interactions</h4><p>A network component
-in a Web Services architecture can play one or more fundamental roles: service
-provider, service broker, and service client.</p>
-<ul><li>Service providers create and deploy their Web services and can publish
-the availability of their WSDL-described services through a service registry,
-such as a UDDI Business Registry.</li>
-<li>Service brokers register and categorize published services and provide
-search services. For example, UDDI acts as a service broker for WSDL-described
-Web services.</li>
-<li>Service clients use broker services such as the UDDI Business Registry
-to discover a needed WSDL-described service and then bind to and call the
-service provider.</li>
-</ul>
-<p>Binding involves establishing all environmental prerequisites that
-are necessary to successfully complete the services. Examples of environmental
-prerequisites include security, transaction monitoring, and HTTP availability.
-The relationships between these roles are described in Figure 1.</p>
-<p>Figure
-1. Service roles and interactions.</p>
-<p> <img src="../images/roles.gif" alt="Figure 1 illustrates the interactions between the service broker, service provider, and service requestor." /> </p>
-</div>
-<div class="section"><h4 class="sectiontitle">Web service standards</h4><p>One of the key attributes
-of Internet standards is that they focus on protocols and not on implementations.
-The Internet is composed of heterogeneous technologies that successfully interoperate
-through shared protocols. This prevents individual vendors from imposing a
-standard on the Internet. Open Source software development plays a crucial
-role in preserving the interoperability of vendor implementations of standards.</p>
-<p>The
-following standards play key roles in Web services: Universal Description,
-Discovery and Integration (UDDI), Web Services Description Language (WSDL),
-Web Services Inspection Language (WSIL), Simple Object Access Protocol (SOAP)
-and Web Services Interoperability (WS-I). The relationship between these standards
-is described in Figure 2.</p>
-<p>The UDDI specification defines open, platform-independent
-standards that enable businesses to share information in a global business
-registry, discover services on the registry, and define how they interact
-over the Internet. For more information on UDDI, refer to  <a href="http://www.uddi.org" target="_blank">www.uddi.org</a></p>
-<p>WSIL
-is an XML-based open specification that defines a distributed service discovery
-method that supplies references to service descriptions at the service provider's
-point-of-offering, by specifying how to inspect a Web site for available Web
-services.  A WSIL document defines the locations on a Web site where
-you can look for Web service descriptions. Since WSIL focuses on distributed
-service discovery, the WSIL specification complements UDDI by facilitating
-the discovery of services that are available on Web sites that may not be
-listed yet in a UDDI registry. A separate topic in this documentation
-discusses the  <a href="cwsilud.html">Relationship between UDDI and WSIL</a>. 
-For more information on WSIL, refer to  <a href="http://www-106.ibm.com/developerworks/webservices/library/ws-wsilspec.html" target="_blank"> www.ibm.com/developerworks/webservices/library/ws-wsilspec.html</a></p>
-<p>WSDL
-is an XML-based open specification that describes the interfaces to and instances
-of Web services on the network. It is extensible, so endpoints can be described
-regardless of the message formats or network protocols that are used to communicate.
-Businesses can make the WSDL documents for their Web services available though
-UDDI, WSIL, or by broadcasting the URLs to their WSDL via email or Web sites.
-WSDL is described as a separate topic in this documentation. For more information
-on WSDL, refer to  <a href="http://www.w3.org/TR/wsdl" target="_blank">www.w3.org/TR/wsdl</a></p>
-<div class="p">SOAP
-is an XML-based standard for messaging over HTTP and other Internet protocols.
-It is a lightweight protocol for the exchange of information in a decentralized,
-distributed environment. It is based on XML and consists of three parts:<ul><li>An envelope that defines a framework for describing what is in a message
-and how to process it.</li>
-<li>A set of encoding rules for expressing instances of application-defined
-data types.</li>
-<li>A convention for representing remote procedure calls and responses.</li>
-</ul>
-SOAP enables the binding and usage of discovered Web services by defining
-a message path for routing messages. SOAP may be used to query UDDI for Web
-services. For more information on SOAP, refer to  <a href="http://www.w3.org/TR/SOAP" target="_blank">www.w3.org/TR/SOAP</a></div>
-<p>Figure 2. Relationships between
-SOAP, UDDI, WSIL and WSDL.</p>
-<p> <img src="../images/soapudws.gif" alt="Figure 2 illustrates the relationships between SOAP, UDDI, WSIL, and WSDL." /> </p>
-<p>A service provider hosts a Web
-service and makes it accessible using protocols such as SOAP/HTTP or SOAP/JMS.
-The Web service is described by a WSDL document that is stored on the provider's
-server or in a special repository. The WSDL document may be referenced by
-the UDDI business registry and WSIL documents. These contain pointers to the
-Web service's WSDL files.</p>
-<p>The WS-I Simple SOAP Binding Profile and WS-I
-Attachments Profile are outlines of requirements to which WSDL and Web service
-protocol (SOAP/HTTP) traffic must comply in order to claim WS-I conformance.
-The Web services WS-I validation tools currently support WS-I Simple SOAP
-Binding Profile 1.0 and the Attachment Profile 1.0. To view the specifications,
-refer to the WS-I Web site, and under  <span class="uicontrol">Resources</span> select
- <span class="uicontrol">Documentation</span>: <a href="http://www.ws-i.org" target="_blank">http://www.ws-i.org</a></p>
-<div class="p">Several
-new Web services standards are also supported by Rational<sup>®</sup> Developer products. These
-include:<dl><dt class="dlterm">JAX-RPC</dt>
-<dd>JAX-RPC stands for Java™ API for XML-based RPC, also known as
-JSR 101. It is a specification that describes Java Application Programming Interfaces
-(APIs) and conventions for building Web services and Web service clients that
-use remote procedure calls (RPC) and XML. It standardizes the Java to
-WSDL and WSDL to Java mappings, and provides the core APIs for developing
-and deploying Web services and Web service clients on the Java platform.
-For more information refer to the <a href="http://www.jcp.org/en/jsr/detail?id=101" target="_blank">official specifications</a>.</dd>
-<dt class="dlterm">JSR-109 and JSR-921</dt>
-<dd>JSR-109 and JSR-921 (Implementing Enterprise Web Services) define the
-programming model and run-time architecture to deploy and look up Web services
-in the J2EE environment; more specifically, in the Web, EJB, and Client Application
-containers. One of its main goals is to ensure vendors' implementations interoperate.
-For more information, refer to the official specifications: <ul><li><a href="http://www.jcp.org/en/jsr/detail?id=109" target="_blank">JSR-109</a></li>
-<li><a href="http://www.jcp.org/en/jsr/detail?id=921" target="_blank">JSR-921</a></li>
-</ul>
-</dd>
-<dt class="dlterm">WS-S</dt>
-<dd>Rational Developer
-products support the OASIS Web Services Security 1.0 standard. For more information
-on the various components of this standard, refer to:<ul><li><a href="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0.pdf" target="_blank">Web Services Security: SOAP Message Security
-V1.0</a> </li>
-<li> <a href="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0.pdf" target="_blank">Web Services Security: Username Token Profile
-V1.0</a></li>
-<li> <a href="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0.pdf" target="_blank">Web Services Security: X.509 Token Profile V1.0</a></li>
-</ul>
-</dd>
-</dl>
-</div>
-<p>For more information on Web services, refer to  <a href="http://www.ibm.com/developerworks/webservices" target="_blank">www.ibm.com/developerworks/webservices</a></p>
-</div>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cwsinwsa.html">Tools for Web services development</a></div>
-<div><a href="cwsiover.html" title="WS-I is an organization designed to promote Web service interoperability across platforms, operating systems, and programming languages.">Web services
-interoperability (WS-I)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/toverws.html" title="Use Web services tools to discover, create, and publish Web services that are created from Java beans, DADX files, enterprise beans, WSDL files, and URLs. The Rational Developer products support the creation of Web services using a top-down approach (which starts with a WSDL file) or a bottom-up approach (which starts with a Java bean or EJB)."> Developing Web
-services</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsbtmup.html b/docs/org.eclipse.jst.ws.doc.user/concepts/cwsbtmup.html
deleted file mode 100644
index 7619a68..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsbtmup.html
+++ /dev/null

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating bottom-up Web services</title>
-</head>
-<body id="creatingbottom-upwebservices"><a name="creatingbottom-upwebservices"><!-- --></a>
-
-<h1 class="topictitle1">Creating bottom-up Web services</h1>
-<div><p>Web services can be created using two methods: top-down development
-and bottom-up development. Bottom-up Web services development involves creating
-a Web service from a Java™ bean, enterprise bean, URL, DADX file,
-or ISD.</p>
-<p>Although bottom-up Web service development may be faster and easier, especially
-if you are new to Web services, the top-down approach is the recommended way
-of creating a Web service.</p>
-<p>When creating a Web service using a bottom-up approach, first you create
-a Java bean
-or EJB bean and then use the Web services wizard to create the WSDL file and
-Web service.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="/tasks/toverws.html">Creating Web services</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-<div><a href="cwsinwsa.html">Tools for Web services development</a></div>
-<div><a href="cwstopdown.html" title="Web services can be created using two methods: top-down development and bottom-up development. Top-down Web services development involves creating a Web service from a WSDL file.">Creating top-down Web
-services</a></div></div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsdl.html b/docs/org.eclipse.jst.ws.doc.user/concepts/cwsdl.html
deleted file mode 100644
index 557198f..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsdl.html
+++ /dev/null

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web Services Description Language (WSDL)</title>
-</head>
-<body id="cwsdl"><a name="cwsdl"><!-- --></a>
-
-<h1 class="topictitle1">Web Services Description Language (WSDL)</h1>
-<div><p>Web Services Description Language (WSDL) is a standard specification
-for describing networked, XML-based services. It provides a simple way for
-service providers to describe the basic format of requests to their systems
-regardless of the underlying run-time implementation.</p>
-<p>WSDL defines an XML format for describing network services as a set of
- <var class="varname">endpoints</var> that operate on messages that contain either
-document-oriented or procedure-oriented information. The operations and messages
-are first described abstractly and then bound to a concrete network protocol
-and message format in order to define an endpoint. Related concrete endpoints
-are combined into abstract endpoints (services). WSDL is extensible to allow
-description of endpoints and their messages, regardless of which message formats
-or network protocols are used to communicate. This means that interfaces are
-defined abstractly using XML schema and then bound to concrete representations
-that are appropriate for the protocol.</p>
-<p>WSDL allows a service provider to specify the following characteristics
-of a Web service:</p>
-<ul><li>The name of the Web service and addressing information</li>
-<li>The protocol and encoding style to be used when accessing the public operations
-of the Web service</li>
-<li>The type information such as operations, parameters, and data types comprising
-the interface of the Web service</li>
-</ul>
-<p>WSDL documents allow developers to expose their applications as network-accessible
-services on the Internet. Through UDDI and WSIL, other applications can discover
-WSDL documents and bind with them to execute transactions or perform other
-business processes.</p>
-<p>Rational<sup>®</sup> Developer
-products support and encourages the development and use of WS-I compliant
-WSDL. Using Rational Developer
-products a business service provider can deploy Java™ beans and enterprise beans, DADX-described
-queries and remote procedures, or existing URLs as a Web service and generate
-a WSDL document that describes the service. They can also generate Java and
-enterprise bean skeletons from an existing WSDL file. A business service client
-can generate a Java proxy from a WSDL document, thereby providing an
-easy-to-use Java interface to the Web service. The Java interface
-hides the network communications details from the client enabling the business
-service provider to focus on business and process portions of the application.</p>
-<p>In addition to providing tools to create Web services, Rational Developer
-products provide a WSDL editor that allows you to create WSDL files using
-a graphical interface, a WSDL validator that ensures that your WSDL file is
-semantically correct and optionally checks for WS-I compliance, and the Web
-Services Explorer which allows you to dynamically test Web services without
-requiring you to generate a proxy.</p>
-<p>Rational Developer
-products support WSDL 1.1. For more information on the WSDL specification,
-refer to  <a href="http://www.w3.org/TR/wsdl" target="_blank">www.w3.org/TR/wsdl</a></p>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../ref/rwsdl.html">Web Services Description Language (WSDL) reference</a></strong><br />
-A WSDL document defines services as collections of network endpoints,
-or ports. In WSDL, the abstract definition of endpoints and messages is separated
-from their concrete network deployment or data format bindings. This allows
-the reuse of abstract definitions: messages, which are abstract descriptions
-of the data being exchanged, and port types which are abstract collections
-of operations. </li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-<div><a href="cwsinwsa.html">Tools for Web services development</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/toverws.html"> Developing Web
-services</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsil.html b/docs/org.eclipse.jst.ws.doc.user/concepts/cwsil.html
deleted file mode 100644
index 7c6abfa..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsil.html
+++ /dev/null

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web Services Inspection Language (WSIL)</title>
-</head>
-<body id="cwsil"><a name="cwsil"><!-- --></a>
-
-<h1 class="topictitle1">Web Services Inspection Language (WSIL)</h1>
-<div><p>Web Services Inspection Language (WSIL) is a service discovery
-mechanism that is an alternative to UDDI as well as complementary to UDDI.
-When you discover Web services with UDDI, you go to a centralized registry. 
-WSIL is an alternative approach to Web service discovery.  WSIL allows
-you to go directly to the service provider and ask for the services it provides.</p>
-<p>IBM<sup>®</sup> and
-Microsoft's proposal for the WSIL specification is designed around an XML-based
-model for building an aggregation of references to existing Web service descriptions,
-that are exposed using standard Web server technology.</p>
-<p>WSIL provides a distributed service discovery method that supplies references
-to service descriptions at the service provider's point-of-offering, by specifying
-how to inspect a Web site for available Web services.  The WSIL specification
-defines the locations on a Web site where you can look for Web service descriptions. </p>
-<p>Since WSIL focuses on distributed service discovery, the WSIL specification
-complements UDDI by facilitating the discovery of services that are available
-on Web sites that may not be listed yet in a UDDI registry. A separate
-topic in this documentation discusses the  <a href="cwsilud.html">Relationship
-between UDDI and WSIL</a>.</p>
-<p>The WSIL specification does not define a service description language. 
-WSIL documents provide a method for aggregating different types of service
-descriptions.  Within a WSIL document, a single service can have more
-than one reference to a service description.  For example, a single Web
-service might be referenced twice in a WSIL document: once directly via its
-WSDL, and again via its businessService entry in a UDDI registry. References
-to these two service descriptions should be put into a WSIL document. 
-If multiple references are available, it is beneficial to put all of them
-in the WSIL document so that the application that uses the document can select
-the type of service description that is compatible with and preferred by that
-application.</p>
-<p>The WSIL specification serves two primary functions:</p>
-<ul><li>WSIL defines an XML format for listing references to existing service
-descriptions. These service descriptions can be defined in any format, such
-as WSDL, UDDI, or plain HTML.  A WSIL document is generally made available
-at the point-of-offering for the services that are referenced within the document.
-A WSIL document can contain a list of references to service descriptions,
-as well as references to other WSIL documents.  <p>The ability to link a WSIL
-document to one or more different WSIL documents allows you to manage service
-description references by grouping them into different documents and to build
-a hierarchy of WSIL documents.  For example, separate WSIL documents
-can be created for different categories of services, and one primary WSIL
-document can link all of them together.</p>
-</li>
-<li>WSIL defines a set of conventions so that it is easy to locate other WSIL
-documents. The WSIL specification does not limit the type of service descriptions
-that can be referenced.  The WSIL specification defines a set of standard
-extensibility elements for both WSDL and UDDI.  The WSIL specification
-is the definition of locations where you can access WSIL documents.  </li>
-<li> Two conventions make the location and retrieval of WSIL documents easy: <ul><li> <span class="uicontrol">Fixed-name WSIL documents.</span> The fixed name for
-WSIL documents is inspection.wsil.  The inspection.wsil file is placed
-at common entry points for a Web site.  For example, if the common entry
-point is http://entrypoint.com then the location of the WSIL document would
-be http://entrypoint.com/inspection.wsil</li>
-<li> <span class="uicontrol">Linked WSIL documents.</span> References to WSIL documents
-can also appear within different content documents, such as HTML pages.</li>
-</ul>
- </li>
-</ul>
-<p>For more information on the Web Services Inspection Language specification,
-refer to  <a href="http://www-106.ibm.com/developerworks/webservices/library/ws-wsilspec.html" target="_blank"> www.ibm.com/developerworks/webservices/library/ws-wsilspec.html</a></p>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../concepts/cwsilud.html">Relationship between UDDI and WSIL</a></strong><br />
-The Web Services Inspection Language (WSIL) and the Universal Description,
-Discovery, and Integration (UDDI) specification both address issues related
-to Web service discovery.  However, each specification takes a different
-approach to the discovery of Web services.  The two specifications can
-be used separately or jointly; searching with WSIL can result in finding items
-in UDDI.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-<div><a href="cwsinwsa.html">Tools for Web services development</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/toverws.html"> Developing
-Web services</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsilud.html b/docs/org.eclipse.jst.ws.doc.user/concepts/cwsilud.html
deleted file mode 100644
index e54aec9..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsilud.html
+++ /dev/null

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Relationship between UDDI and WSIL</title>
-</head>
-<body id="cwsilud"><a name="cwsilud"><!-- --></a>
-
-<h1 class="topictitle1">Relationship between UDDI and WSIL</h1>
-<div><p>The Web Services Inspection Language (WSIL) and the Universal Description,
-Discovery, and Integration (UDDI) specification both address issues related
-to Web service discovery.  However, each specification takes a different
-approach to the discovery of Web services.  The two specifications can
-be used separately or jointly; searching with WSIL can result in finding items
-in UDDI.</p>
-<p>The UDDI specification addresses Web service discovery through the use
-of a centralized model.  One or more repositories are created to house
-information about businesses and the services they offer.  Requests and
-updates pertaining to the service and business related information are issued
-directly against the repositories.  In addition, UDDI prescribes a specific
-format for a portion of the stored description information and, to facilitate
-advanced (focused) searching, assumes that other description information will
-be stored and registered within the system as well.</p>
-<p>UDDI systems facilitate focused discovery patterns since these systems
-are based on organized repositories that provide advanced searching capabilities. 
-This helps requestors locate potential communication partners.  In order
-to provide advanced functionality, however, UDDI requires the deployment and
-maintenance of a certain amount of infrastructure, thus increasing the cost
-of operation.  In addition, unless the service descriptions are stored
-only within UDDI, there is a cost associated with keeping the different versions
-synchronized.</p>
-<p>The WSIL specification relies on a completely distributed model for providing
-service-related information.  The service descriptions can be stored
-at any location, and requests to retrieve the information are generally made
-directly to the entities that are offering the services.  The WSIL specification
-does not stipulate any particular format for the service information. 
-It relies on other standards, including UDDI, to define the description formats. 
-The WSIL specification also relies on existing Web technologies and infrastructure
-to provide mechanisms for publishing and retrieving its documents.</p>
-<p>WSIL provides the ability to disseminate service-related information through
-existing protocols directly from the point at which the service is being offered. 
-This enables focused discovery to be performed on a single target; however,
-because of its decentralized and distributed model, WSIL is not a good mechanism
-for executing focused discovery if the communication partner is unknown.</p>
-<p>The UDDI and WSIL specifications should be viewed as complementary technologies
-to be used either together or separately depending on the situation. 
-For example, a UDDI repository could be populated based on the results found
-when performing a search for WSIL documents.  Likewise, a UDDI repository
-may itself be discovered when a requester retrieves a WSIL document that references
-an entry in the repository.  In environments where the advanced functionality
-afforded by UDDI is not required and where constraints do not allow for its
-deployment, the WSIL mechanism may provide all of the capabilities that are
-needed.  In situations where data needs to be centrally managed, a UDDI
-solution alone may provide the best fit.  The UDDI and WSIL specifications
-should not be viewed as mutually exclusive.</p>
-<div class="note"><span class="notetitle">Note:</span> Both UDDI and WSIL contain only references to WSDL - they do not contain
-the WSDL documents themselves.</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cwsil.html" title="Web Services Inspection Language (WSIL) is a service discovery mechanism that is an alternative to UDDI as well as complementary to UDDI. When you discover Web services with UDDI, you go to a centralized registry.  WSIL is an alternative approach to Web service discovery.  WSIL allows you to go directly to the service provider and ask for the services it provides.">Web Services Inspection Language (WSIL)</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-<div><a href="cwsinwsa.html">Tools for Web services development</a></div>
-<div><a href="cwsil.html" title="Web Services Inspection Language (WSIL) is a service discovery mechanism that is an alternative to UDDI as well as complementary to UDDI. When you discover Web services with UDDI, you go to a centralized registry.  WSIL is an alternative approach to Web service discovery.  WSIL allows you to go directly to the service provider and ask for the services it provides.">Web Services Inspection Language (WSIL)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/toverws.html"> Developing
-Web services</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html b/docs/org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html
deleted file mode 100644
index fc1a73c..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html
+++ /dev/null

@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Tools for Web services development</title>
-</head>
-<body id="cwsinwsa"><a name="cwsinwsa"><!-- --></a>
-
-<h1 class="topictitle1">Tools for Web services development</h1>
-<div><p>Tools are provided to assist with the following aspects of Web services
-development:</p>
-<ul><li> <span class="uicontrol">Discover</span>. Browse the UDDI Business Registries
-or WSIL documents to locate existing Web services for integration. The Web
-becomes an extension of Rational<sup>®</sup> Developer products.</li>
-<li> <span class="uicontrol">Create or Transform</span>. Create bottom-up Web services
-from existing artifacts, such as Java™ beans, enterprise beans, URLs that
-take and return data, DB2<sup>®</sup> XML Extender calls, DB2 Stored Procedures, and SQL queries.
-Create top-down Web services from WSDL discovered from others or created using
-the WSDL Editor.</li>
-<li> <span class="uicontrol">Build</span>. Wrap existing artifacts as SOAP accessible
-services and describe them in WSDL. The Web services wizards assist you in
-generating a Java client proxy to Web services described in WSDL
-and in generating Java bean skeletons from WSDL.</li>
-<li> <span class="uicontrol">Deploy</span>. Deploy Web services into the WebSphere<sup>®</sup> Application
-Server or Tomcat test environments. Secure Web services running on WebSphere Application
-Server.</li>
-<li> <span class="uicontrol">Test</span>. Test Web services running locally or remotely
-in order to get instant feedback.</li>
-<li> <span class="uicontrol">Develop</span>. Generate sample applications to assist
-you in creating your own Web service client application.</li>
-<li> <span class="uicontrol">Publish</span>. Publish Web services to a UDDI v2 or
-v3 Business Registry, advertising your Web services so that other businesses
-and clients can access them.</li>
-</ul>
-<div class="p">Some of the Web service tools available and their uses include the following:<ul><li>Use the Web Services Client wizard to create the Java client
-to a deployed Web service and to test the Web service.</li>
-<li>Use the Web Services wizard to create, deploy, test, and publish Web services
-bottom-up from existing Java beans and enterprise beans, or top-down
-from WSDL. The Web Services wizard supports the generation of the Java bean
-proxy and a sample application.</li>
-<li>Publish your Web service to a UDDI Business Registry using the Web Services
-Explorer.</li>
-<li>The Unit Test UDDI wizard installs, configures, and removes a Private
-UDDI Registry.</li>
-<li>The Java Beans for XML Schema wizard enables you to generate Java beans
-from schema.</li>
-<li>The IBM<sup>®</sup> Web
-Services Explorer assists you in discovering and publishing your Web service
-descriptions.</li>
-<li>Use the WSDL validator to check for structural and semantic problems in
-WSDL files.</li>
-<li>WS-I compliance can be validated using several tools, such as the WSDL
-validator, the Web service and client wizards, and a TCP/IP monitor.</li>
-<li>The deployment settings for a Web service can be modified using the J2EE
-deployment descriptor editors. Double-click any deployment descriptor to launch
-the appropriate editor.</li>
-</ul>
- </div>
-<p>Web services tooling supports the following specifications:</p>
-
-<div class="tablenoborder"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr><th valign="top" width="47.73869346733669%" id="d0e117">Technology or specification</th>
-<th valign="top" width="52.26130653266332%" id="d0e119">Version or level supported</th>
-</tr>
-</thead>
-<tbody><tr><td colspan="2" valign="top" headers="d0e117 d0e119 "><strong>Transports</strong></td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">HTTP/HTTPS</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">v1.0 and v1.1</td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">JMS</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">&nbsp;</td>
-</tr>
-<tr><td colspan="2" valign="top" headers="d0e117 d0e119 "><strong>Messaging</strong></td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">SOAP specification</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">v1.1</td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">SOAP Attachements</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">&nbsp;</td>
-</tr>
-<tr><td colspan="2" valign="top" headers="d0e117 d0e119 "><strong>Description</strong></td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">UDDI</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">v2.0</td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">WSDL</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">v1.1</td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">WSIL</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">v1.0</td>
-</tr>
-<tr><td colspan="2" valign="top" headers="d0e117 d0e119 "><strong>Security</strong></td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">WS-Security</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">OASIS Standard 1.0</td>
-</tr>
-<tr><td colspan="2" valign="top" headers="d0e117 d0e119 "><strong>Ineroperability</strong></td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">WS-I Basic Profile</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">1.1.2</td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">WS-I Simple SOAP Binding Profile</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">1.0.3</td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">WS-I Attachments Profile</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">1.0</td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 "><strong>Other Standards</strong></td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">&nbsp;</td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">JAX-RPC</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">v1.0 for J2EE 1.3, v1.1 for J2EE 1.4</td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">JSR 109</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">J2EE 1.3</td>
-</tr>
-<tr><td valign="top" width="47.73869346733669%" headers="d0e117 ">JSR 921</td>
-<td valign="top" width="52.26130653266332%" headers="d0e119 ">J2EE 1.4</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../../org.eclipse.jst.ws.axis.ui.doc.user/concepts/caxistover.html">Creating Web services with the Apache Axis run-time environment</a></strong><br />
-</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/toverws.html" title="Use Web services tools to discover, create, and publish Web services that are created from Java beans, DADX files, enterprise beans, WSDL files, and URLs. The Rational Developer products support the creation of Web services using a top-down approach (which starts with a WSDL file) or a bottom-up approach (which starts with a Java bean or EJB)."> Developing Web
-services</a></div></div>
-</div> 
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsiover.html b/docs/org.eclipse.jst.ws.doc.user/concepts/cwsiover.html
deleted file mode 100644
index d2b1bac..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/cwsiover.html
+++ /dev/null

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web services interoperability (WS-I)</title>
-</head>
-<body id="cwsiover"><a name="cwsiover"><!-- --></a>
-
-<h1 class="topictitle1">Web services interoperability (WS-I)</h1>
-<div><p>WS-I is an organization designed to promote Web service interoperability
-across platforms, operating systems, and programming languages.</p>
-<p>For more information on WS-I, refer to their Web site:  <a href="http://www.ws-i.org/" target="_blank">http://www.ws-i.org/</a>.
-This site contains resources such as an overview of Web services interoperability,
-usage scenarios, and specifications.</p>
-<p>WS-I Basic Profile is a outline of requirements to which WSDL and Web service
-protocol (SOAP/HTTP) traffic must comply in order to claim WS-I conformance.
-The Web services WS-I validation tools currently support WS-I Simple SOAP
-Binding Profile 1.0 (WS-I SSBP) which builds on the WS-I Basic Profile, and
-the WS-I Attachments Profile 1.0 (WS-I AP). To view the specifications, refer
-to the WS-I Web site, and under  <span class="uicontrol">Deliverables</span> select
- <span class="uicontrol">Basic Profile</span>.</p>
-<p>Depending on the type of Web service being created, you may or may not
-want your Web service to comply with the WS-I profiles. The default level
-of compliance is to generate a warning if a non WS-I SSBP complaint Web service
-option is selected and to ignore any non WS-I AP compliant selections. You
-can set the level of WS-I compliance at the workspace or project level. The
-Web services wizards, the WebSphere<sup>®</sup> run-time environments, the WSDL editor,
-and other Web services tools provided support and encourage the development
-of WS-I compliance services.</p>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../tasks/twsicomply.html">Setting the level of WS-I compliance</a></strong><br />
-The Web services WS-I validation tools support the level of WS-I
-compliance outlined in the WS-I Basic Profile 1.1, the WS-I Simple SOAP Binding
-Profile 1.0 (WS-I SSBP), and the WS-I Attachments Profile 1.0 (WS-I AP). You
-can choose to make your Web service compliant or non-compliant, depending
-on your needs. For example, encoded style (RPC/encoded), SOAP over JMS protocols,
-and secured Web services, are not WS-I compliant.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-</div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/twsicomply.html" title="The Web services WS-I validation tools support the level of WS-I compliance outlined in the WS-I Basic Profile 1.1, the WS-I Simple SOAP Binding Profile 1.0 (WS-I SSBP), and the WS-I Attachments Profile 1.0 (WS-I AP). You can choose to make your Web service compliant or non-compliant, depending on your needs. For example, encoded style (RPC/encoded), SOAP over JMS protocols, and secured Web services, are not WS-I compliant.">Setting the level of WS-I compliance</a></div></div>
-</div> 
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/concepts/cwstopdown.html b/docs/org.eclipse.jst.ws.doc.user/concepts/cwstopdown.html
deleted file mode 100644
index 248b775..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/concepts/cwstopdown.html
+++ /dev/null

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating top-down Web services</title>
-</head>
-<body id="creatingtop-downwebservices"><a name="creatingtop-downwebservices"><!-- --></a>
-
-<h1 class="topictitle1">Creating top-down Web services</h1>
-<div><p>Web services can be created using two methods: top-down development
-and bottom-up development. Top-down Web services development involves creating
-a Web service from a WSDL file.</p>
-<p>Although bottom-up Web service development may be faster and easier, especially
-if you are new to Web services, the top-down approach is the recommended way
-of creating a Web service.</p>
-<p>When creating a Web service using a top-down approach, first you design
-the implementation of the Web service by creating a WSDL file. You can do
-this using the WSDL Editor. You can then use the Web services wizard to create
-the Web service and skeleton Java™ classes to which you can add the required
-code.</p>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="/tasks/toverws.html">Creating Web services</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-<div><a href="cwsinwsa.html">Tools for Web services development</a></div>
-<div><a href="cwsbtmup.html" title="Web services can be created using two methods: top-down development and bottom-up development. Bottom-up Web services development involves creating a Web service from a Java bean, enterprise bean, URL, DADX file, or ISD.">Creating bottom-up Web services</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/images/roles.gif b/docs/org.eclipse.jst.ws.doc.user/images/roles.gif
deleted file mode 100644
index 05e9987..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/images/roles.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.doc.user/images/soapudws.gif b/docs/org.eclipse.jst.ws.doc.user/images/soapudws.gif
deleted file mode 100644
index efb42f5..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/images/soapudws.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.jst.ws.doc.user/plugin.properties b/docs/org.eclipse.jst.ws.doc.user/plugin.properties
deleted file mode 100644
index 2f3916b..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/plugin.properties
+++ /dev/null

@@ -1,3 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-Plugin.name = Web services main documentation

diff --git a/docs/org.eclipse.jst.ws.doc.user/plugin.xml b/docs/org.eclipse.jst.ws.doc.user/plugin.xml
deleted file mode 100644
index 6eda01a..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/plugin.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?> 
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-  
-  <extension point="org.eclipse.help.toc">
-       <toc file="webservice_toc.xml" />
-   </extension>
-   
-</plugin>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/ref/rwsdl.html b/docs/org.eclipse.jst.ws.doc.user/ref/rwsdl.html
deleted file mode 100644
index f7d9127..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/ref/rwsdl.html
+++ /dev/null

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web Services Description Language (WSDL) reference</title>
-</head>
-<body id="rwsdl"><a name="rwsdl"><!-- --></a>
-
-<h1 class="topictitle1">Web Services Description Language (WSDL) reference</h1>
-<div><p>A WSDL document defines services as collections of network endpoints,
-or ports. In WSDL, the abstract definition of endpoints and messages is separated
-from their concrete network deployment or data format bindings. This allows
-the reuse of abstract definitions: messages, which are abstract descriptions
-of the data being exchanged, and port types which are abstract collections
-of operations. </p>
-<div class="section"><p>The concrete protocol and data format specifications for a particular
-port type constitutes a reusable binding. A port is defined by associating
-a network address with a reusable binding, and a collection of ports define
-a service. Hence, a WSDL document uses the following elements in the definition
-of network services:</p>
-<ul><li> <span class="uicontrol">Types</span>: a container for data type definitions using
-some type system (such as XSD).</li>
-<li> <span class="uicontrol">Message</span>: an abstract, typed definition of the
-data being communicated.</li>
-<li> <span class="uicontrol">Operation</span>: an abstract description of an action
-supported by the service.</li>
-<li> <span class="uicontrol">Port Type</span>: an abstract set of operations supported
-by one or more endpoints.</li>
-<li> <span class="uicontrol">Binding</span>: a concrete protocol and data format specification
-for a particular port type. The binding is usually SOAP and the encoding and
-data formatting regulations used (also known as the style) is usually literal
-(this includes document/literal, and sometimes rpc/literal).</li>
-<li> <span class="uicontrol">Port</span>: a single endpoint defined as a combination
-of a binding and a network address.</li>
-<li> <span class="uicontrol">Service</span>: a collection of related endpoints.</li>
-</ul>
-<p>For more information on WSDL, refer to  </p>
-<p><a href="http://www.w3.org/TR/wsdl" target="_blank">www.w3.org/TR/wsdl</a></p>
-<p>The
-various WSDL elements can be structured in many ways. It can be in one single
-WSDL file or in mulitple WSDL files. If the IBM<sup>®</sup> WebSphere<sup>®</sup> or AXIS 1.0 run-time environment
-are selected, Rational<sup>®</sup> Developer
-products generate one single WSDL file containing in-line schema. If the IBM SOAP
-run-time environment is selected, Rational Developer products generate
-multiple WSDL and XSD files by default.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cwsdl.html" title="Web Services Description Language (WSDL) is a standard specification for describing networked, XML-based services. It provides a simple way for service providers to describe the basic format of requests to their systems regardless of the underlying run-time implementation.">Web Services Description Language (WSDL)</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../concepts/cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-<div><a href="../concepts/cwsdl.html" title="Web Services Description Language (WSDL) is a standard specification for describing networked, XML-based services. It provides a simple way for service providers to describe the basic format of requests to their systems regardless of the underlying run-time implementation.">Web Services Description Language (WSDL)</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/toverws.html"> Developing Web
-services</a></div>
-<div><a href="../../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.html"> Using the Web Services Explorer</a></div></div>
-
-<div class="linklist"><strong>Related Reference</strong><br />
-
-<div><a href="rsoapwsdl.html" title="When using the IBM SOAP run-time environment, by default the Web services tools in this product store the elements in three separate XML documents when generating Web services from Java beans, EJBs, and URLs: the WSDL binding document, the WSDL service document, and the WSDL interface document. By default XSD files are also generated if non-inline complex types are used by the interface. When generating Web services from DADX files, one WSDL document is generated.">WSDL files generated by the IBM SOAP run-time environment</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/ref/rwspref.html b/docs/org.eclipse.jst.ws.doc.user/ref/rwspref.html
deleted file mode 100644
index bbdafc3..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/ref/rwspref.html
+++ /dev/null

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Web services preferences</title>
-</head>
-<body id="rwspref"><a name="rwspref"><!-- --></a>
-
-<h1 class="topictitle1">Web services preferences</h1>
-<div><div class="section"><div class="p">To set any of the Web services preferences, follow these steps:<ol><li>Click  <span class="uicontrol">Window &gt; Preferences</span> to open the Preferences
-notebook.</li>
-<li>Expand  <span class="uicontrol">Web services</span>, and click the preference
-category that you want to set</li>
-<li>Select the check boxes that you want to set as the default when creating
-your Web service.</li>
-<li>Click  <span class="uicontrol">OK</span> to apply the changes and close the Preferences
-notebook.</li>
-</ol>
-If you require more information on any of the options, select the option
-and press  <span class="uicontrol">F1</span>.</div>
-<p>Web services tools enable you
-to define the following preferences:</p>
-<dl><dt class="dlterm">Popup Dialog Selection</dt>
-<dd>The Dialogs preferences enable you to determine which dialog boxes that
-you want to see when running popup actions. If you have disabled any of the
-dialogs by selecting "Do not show this dialog again" on the first page of
-a Web services wizard, you can undo your change by clearing the check box
-beside the dialog that you have chosen to hide.</dd>
-<dt class="dlterm">Project Topology</dt>
-<dd>The Project Topology preferences allow you to:<ul><li>Select the default client project type that the Web services wizards will
-create when generating a Web service client. You can also set the order in
-which the client project types will be listed in the wizard. Note that this
-selection is simply a default and an alternate project type can be selected
-in the wizard.</li>
-<li>Select whether you want to generate the Web service and the Web service
-client in the same EAR project or different EAR projects. Generating the service
-and client into different EAR projects can reduce the chance of conflicts
-that occur when both exist in a single EAR project, but uses more system resources.</li>
-</ul>
-</dd>
-<dt class="dlterm">Resource Management</dt>
-<dd>The Resource Management preferences enable you to determine the file and
-folder creation and overwriting defaults that you want to use when creating
-your Web service.</dd>
-<dt class="dlterm">Scenario Defaults</dt>
-<dd>The Scenario Defaults preferences enable you to set the following scenario
-defaults that you want to use when creating your Web service:<ul><li>which type of Web service you want to be selected by default.</li>
-<li>whether or not you want the Web service started by the wizard.</li>
-<li>if you want the Web Services Explorer to launch by default so that you
-can publish your Web service to a UDDI registry.</li>
-<li>if you want to generate a proxy and the default type of proxy generated.</li>
-<li>if you want the Web Services Explorer to launch by default so that you
-can test the Web service.</li>
-<li>if you want the Web service SOAP traffic routed through a TCP/IP monitor
-so that you can monitor the SOAP packets and optionally test them for WS-I
-compliance.</li>
-</ul>
-Note that all these defaults can be overridden in the wizard.</dd>
-<dt class="dlterm">Server and Runtime</dt>
-<dd>Select the server, Web service run-time environment, and J2EE version
-that you want selected by default in the Web services wizard. Note that all
-these defaults can be overridden in the wizard.</dd>
-<dt class="dlterm">Test Facility Defaults</dt>
-<dd>can select whether to have the wizard automatically launch a test facility,
-and you can select your preferred type of test facility</dd>
-<dt class="dlterm">WSDL files</dt>
-<dd>When creating a WSDL file in the WSDL editor, you can set the default
-target namespace. If you do not select to change the default, your WSDL file
-will have http://tempuri.org as its target namespace.</dd>
-<dt class="dlterm">WS-I Compliance</dt>
-<dd>The WS-I Compliance preferences allow you to select your level of compliance
-with the WS-I Simple SOAP Binding Profile (SSBP) and WS-I Attachement Profile
-(AP). Note: if you change the level of WS-I compliance while WS-I incompliances
-are listed in the Task view, the Task view will not be automatically updated.
-The workspace must be revalidated before the warnings will be removed from
-the Task view. For more information on WS-I, refer to: </dd>
-</dl>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cws.html" title="A Web service is a set of related application functions that can be programmatically invoked over the Internet. Businesses can dynamically mix and match Web services to perform complex transactions with minimal programming. Web services allow buyers and sellers all over the world to discover each other, connect dynamically, and execute transactions in real time with minimal human interaction.">Web services overview</a></div>
-</div>
-
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../concepts/cwsinwsa.html">Tools for Web services development</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../tasks/toverws.html"> Developing Web
-services</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/tasks/twsicomply.html b/docs/org.eclipse.jst.ws.doc.user/tasks/twsicomply.html
deleted file mode 100644
index 6e4099b..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/tasks/twsicomply.html
+++ /dev/null

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Setting the level of WS-I compliance</title>
-</head>
-<body id="twsicomply"><a name="twsicomply"><!-- --></a>
-
-<h1 class="topictitle1">Setting the level of WS-I compliance</h1>
-<div><p>The Web services WS-I validation tools support the level of WS-I
-compliance outlined in the WS-I Basic Profile 1.1, the WS-I Simple SOAP Binding
-Profile 1.0 (WS-I SSBP), and the WS-I Attachments Profile 1.0 (WS-I AP). You
-can choose to make your Web service compliant or non-compliant, depending
-on your needs. For example, encoded style (RPC/encoded), SOAP over JMS protocols,
-and secured Web services, are not WS-I compliant.</p>
-<div class="section"><p>You can set the level of compliance for either the Basic Profile
-and the Simple SOAP Binding Profile, or for the Attachments Profile. You can
-select from three levels of compliance with WS-I specifications:</p>
-<ul><li>Require WS-I compliance - this level prevents you from creating a non-compliant
-Web service.</li>
-<li>Suggest WS-I compliance - this level allows you to create a non-compliant
-Web service, but provides a visible warning stating how the service is non-compliant.</li>
-<li>Ignore WS-I compliance - this level allows you to create a non-compliant
-Web service and does not notify you of non-compliance.</li>
-</ul>
-<p>You can set the level of WS-I compliance at the workspace
-level, or at the project level.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cwsiover.html" title="WS-I is an organization designed to promote Web service interoperability across platforms, operating systems, and programming languages.">Web services interoperability (WS-I)</a></div>
-</div>
-</div><div class="nested1" xml:lang="en-us" id="sdgfsdgs"><a name="sdgfsdgs"><!-- --></a><h2 class="topictitle2">Set the level of WS-I compliance for the workspace</h2>
-<div><div class="section"><p>To set the level of WS-I compliance for the workspace:</p>
-</div>
-<ol><li><span>From the  <strong>Window</strong> menu, select  <strong>Preferences</strong>.</span></li>
-<li><span>Select  <strong>Web Services</strong> from the component tree on the left-hand
-side of the panel.</span></li>
-<li><span>Under WS-I compliance, select the level of compliance you want
-from the drop-down lists.</span></li>
-<li><span>Click  <strong>Apply</strong>, then click  <strong>OK</strong>.</span></li>
-</ol>
-</div>
-</div>
-<div class="nested1" xml:lang="en-us" id="xvgdsgfsg"><a name="xvgdsgfsg"><!-- --></a><h2 class="topictitle2">Set the level of WS-I compliance for a project</h2>
-<div><div class="section"><p>To set the level of WS-I compliance for a project:</p>
-</div>
-<ol><li><span>In the Project Navigator, right click and select  <strong>Properties</strong>.</span></li>
-<li><span>Select  <strong>WS-I Compliance</strong> from the component tree on the left-hand
-side of the panel.</span></li>
-<li><span>Under WS-I compliance, select the level of compliance you want
-from the drop-down lists, or select to have the project share the same level
-of WS-I compliance as the workspace</span></li>
-<li><span>Click  <strong>Apply</strong>, then click  <strong>OK</strong>.</span></li>
-</ol>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../concepts/cwsiover.html" title="WS-I is an organization designed to promote Web service interoperability across platforms, operating systems, and programming languages.">Web services interoperability (WS-I)</a></div></div>
-</div></div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.doc.user/webservice_toc.xml b/docs/org.eclipse.jst.ws.doc.user/webservice_toc.xml
deleted file mode 100644
index 19e3393..0000000
--- a/docs/org.eclipse.jst.ws.doc.user/webservice_toc.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="wsmaintoc" topic="concepts/cws.html">
-   <topic label="Web services overview" href="concepts/cws.html">
-      <topic label="Technologies">
-         <topic label="Web Services Description Language (WSDL)" href="concepts/cwsdl.html">
-            <topic label="Web Services Description Language (WSDL) reference" href="ref/rwsdl.html"/>
-         </topic>
-         <topic label="Simple Object Access Protocol (SOAP)" href="concepts/csoap.html"/>
-         <topic label="Universal Description, Discovery, and Integration (UDDI)" href="../org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cuddi.html">
-            <topic label="Relationship between UDDI and WSDL" href="../org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cwsdlud.html"/>
-         </topic>
-         <topic label="Web Services Inspection Language (WSIL)" href="concepts/cwsil.html">
-            <topic label="Relationship between UDDI and WSIL" href="concepts/cwsilud.html"/>
-         </topic>
-         <topic label="JAX-RPC" href="concepts/cjaxrpc.html"/>
-         <topic label="JSR 109 and JSR 921- Implementing Enterprise Web services" href="concepts/cjsr109.html"/>
-      </topic>
-      <topic label="Workspace and tools">
-         <topic label="Tools for Web services development" href="concepts/cwsinwsa.html">
-            <topic label="Creating Web services with the Apache Axis run-time environment" href="../org.eclipse.jst.ws.axis.ui.doc.user/concepts/caxistover.html"/>
-         </topic>
-         <topic label="Configuring your workspace">
-            <topic label="Web services preferences" href="ref/rwspref.html"/>
-            <topic label="Web services interoperability (WS-I)" href="concepts/cwsiover.html">
-               <topic label="Setting the level of WS-I compliance" href="tasks/twsicomply.html"/>
-            </topic>
-            <topic label="Creating an Apache Tomcat server and Web project" href="../org.eclipse.jst.ws.axis.ui.doc.user/tasks/ttomcatserv.html"/>
-         </topic>
-      </topic>
-   </topic>
-   <topic label="Importing and creating resources used by Web services">
-      <link toc="../org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.xml"/>
-   </topic>
-   <topic label="Creating Web services" href="/tasks/toverws.html">
-      <topic label="Creating top-down Web services" href="concepts/cwstopdown.html">
-         <topic label="Creating a Web service and Java bean skeleton from WSDL" href="../org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsklwsdla.html"/>
-      </topic>
-      <topic label="Creating bottom-up Web services" href="concepts/cwsbtmup.html">
-         <topic label="Creating a Web service from a Java bean" href="../org.eclipse.jst.ws.axis.ui.doc.user/tasks/twsbeana.html"/>
-      </topic>
-      <topic label="Creating Web service clients">
-         <topic label="Discovering and importing a Web service" href="../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tdiscov.html"/>
-         <topic label="Generating a Java client proxy from a WSDL document using the Axis run-time environment" href="../org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsampappa.html"/>
-      </topic>
-   </topic>
-   <topic label="Testing and validating Web services">
-      <topic label="Testing WSDL documents and Web services with the WSDL Explorer" href="../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html"/>
-      <topic label="Validating WSDL" href="../org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html"/>
-      <topic label="Testing Web services with the TCP/IP Monitor" href="../org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html">
-         <topic label="Validating WS-I compliance of Web service SOAP traffic" href="../org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html"/>
-      </topic>
-   </topic>
-   <topic label="Publishing Web services">
-      <link toc="../org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptiont_toc.xml"/>
-      <topic label="Generating WSIL" href="../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tgenwsil.html"/>
-   </topic>
-</toc>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.infopop/.project b/docs/org.eclipse.jst.ws.infopop/.project
deleted file mode 100644
index e6b5d69..0000000
--- a/docs/org.eclipse.jst.ws.infopop/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/docs/org.eclipse.jst.ws.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index f59d3fb..0000000
--- a/docs/org.eclipse.jst.ws.infopop/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Web services UI
-Bundle-SymbolicName: org.eclipse.jst.ws.infopop; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true

diff --git a/docs/org.eclipse.jst.ws.infopop/about.html b/docs/org.eclipse.jst.ws.infopop/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.jst.ws.infopop/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.infopop/build.properties b/docs/org.eclipse.jst.ws.infopop/build.properties
deleted file mode 100644
index e30e471..0000000
--- a/docs/org.eclipse.jst.ws.infopop/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = plugin.xml,\
-               webserviceui-f1Contexts.xml,\
-               about.html,\
-               META-INF/
-src.includes = build.properties

diff --git a/docs/org.eclipse.jst.ws.infopop/plugin.xml b/docs/org.eclipse.jst.ws.infopop/plugin.xml
deleted file mode 100644
index 4db6d24..0000000
--- a/docs/org.eclipse.jst.ws.infopop/plugin.xml
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?> 
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-	<extension point="org.eclipse.help.contexts">
-		<contexts file="webserviceui-f1Contexts.xml" plugin="org.eclipse.jst.ws.ui"/>
-		<contexts file="wsui-f1Contexts.xml" plugin="org.eclipse.jst.ws.ui"/>
-	</extension>
-</plugin>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.infopop/webserviceui-f1Contexts.xml b/docs/org.eclipse.jst.ws.infopop/webserviceui-f1Contexts.xml
deleted file mode 100644
index 07059b4..0000000
--- a/docs/org.eclipse.jst.ws.infopop/webserviceui-f1Contexts.xml
+++ /dev/null

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<!--DRES: Resource Selection Dialog-->
-<context id="DRES0001">
-<!--Resource Type drop down-->
-<description>Select a resource from which to create a Web service.</description>
-</context>
-<context id="DRES0002">
-<!--Resource tree-->
-<description>Lists the resources that can be turned into a Web service.</description>
-</context>
-
-
-<context id="PPAD0004">
-<!--  Hide generate client check box-->
-<description>Select this check box to hide the option of generating a Web service client when you right-click a file in the Project Explorer or Navigator.</description>
-</context>
-
-<context id="PPAD0005">
-<!--  Hide generate sample check box-->
-<description>Select this check box to hide the option of generating sample JSP code for the Web service when you right-click a file in the Project Explorer or Navigator.</description>
-</context>
-
-<!--TopologyPreferencePage.java-->
-<context id="PTPP0002">
-<!--PTPP0002 for the Topology Preference Page-->
-<description>This table respresents the the types of projects available into which you can generate a Web services client. You cannot add or remove project types, however you can change the order in which they appear in the Web services wizard. This is useful if you are creating several Web services that use the same type of client project because you can set that client project type as the default. To change the order, select a project type and use the up and down arrows to move it within the list. Changing the order of the list does not restrict your ability to select any of the options.</description>
-</context>
-
-<context id="PTPP0003">
-<!--PTPP0002 for the Topology Preference Page-->
-<description>Click this button to move the selected client project type towards the beginning of the list. This changes the order of the items in the client selection list and does not restrict your selection in any way.</description>
-</context>
-
-<context id="PTPP0004">
-<!--PTPP0004 for the Topology Preference Page-->
-<description>Click this button to move the selected client project type towards the end of the list. This changes the order of the items in the client selection list and does not restrict your selection in any way.</description>
-</context>
-
-<context id="PTPP0005">
-<!--PTPP0002 for the Topology Preference Page-->
-<description>If you select this check box, by default the Web services wizard will generate the Web services server and client code into different EARs. It is recommended that you enable this feature.</description>
-</context>
-
-<!--PPRM: Resource Management Preference page-->
-
-<context id="PPRM0002">
-<!--File overwrite check box-->
-<description>The Resource Management preferences enable you to determine the defaults that you want to use when creating your Web service. Allows you to overwrite files without receiving a warning message asking for confirmation when overwriting files.</description>
-</context>
-<context id="PPRM0003">
-<!--Create folders check box-->
-<description>The Resource Management preferences enable you to determine the defaults that you want to use when creating your Web service. Select to create folders and folder structures without receiving a warning message asking for confirmation.</description>
-</context>
-<context id="PPRM0004">
-<!--Check out files check box-->
-<description>The Resource Management preferences enable you to determine the defaults that you want to use when creating your Web service. Select to check out files without receiving a warning message asking for confirmation.</description>
-</context>
-
-
-<!--PPSD: Scenario Defaults Preference page-->
-
-<!--ScenarioDefaultsPreferencePage.java-->
-<context id="PPSD0001">
-<!--PPSD0001 for the Scenario Defaults Preference Page-->
-<description>Use this page to select the default settings for the Web services wizard.</description>
-</context>
-<context id="PPSD0002">
-<!--PPSD0002 for the launch sample check box on the Scenario Defaults Preference Page-->
-<description>The Scenario Defaults preferences enable you to determine the defaults that you want to use when creating your Web service. The sample Web application demonstrates how to code the proxy file. Select this check box to launch sample application after it is created.</description>
-</context>
-<context id="PPSD0004">
-<!--PPSD0004 for the sample JSP type combo box on the Scenario Defaults Preference Page-->
-<description>Select the type of sample JSP to be created.</description>
-</context>
-<context id="PPSD0003">
-<!--PPSD0003 for the web explorer type combo box on the Scenario Defaults Preference Page-->
-<description>The Scenario Defaults preferences enable you to determine the defaults that you want to use when creating your Web service. Select from the available Web services explorers.</description>
-</context>
-<context id="PPSD0005">
-<!--PPSD0005 for the User-defined UDDI Category Data Column Delimiter text field on the Scenario Defaults Preference Page-->
-<description>Enter the character you want to use as a column delimiter for user-defined UDDI Category data.</description>
-</context>
-<context id="PPSD0006">
-<!--PPSD0006 for the User-defined UDDI Category Data String Delimiter text field on the Scenario Defaults Preference Page-->
-<description>Enter the character you want to use as a string delimiter for user-defined UDDI Category data.</description>
-</context>
-
-
-</contexts>
\ No newline at end of file

diff --git a/docs/org.eclipse.jst.ws.infopop/wsui-f1Contexts.xml b/docs/org.eclipse.jst.ws.infopop/wsui-f1Contexts.xml
deleted file mode 100644
index c0c7d91..0000000
--- a/docs/org.eclipse.jst.ws.infopop/wsui-f1Contexts.xml
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-
-
-
-<context id="PPAD0006">
-<!--  create web service check box-->
-<description>Select this check box to hide the option of generating a Web service client when you right-click a file in the Project Explorer or Navigator.</description>
-</context>
-
-<context id="PPAD0008">
-<!--  generate skeleton check box-->
-<description>Select this check box to hide the option of generating skeleton Java classes when you right-click a file in the Project Explorer or Navigator. The skeleton bean contains a set of methods that correspond to the operations described in the WSDL document. When the bean is created, each method has a trivial implementation that you replace by editing the bean.</description>
-</context>
-
-<context id="PPAD0009">
-<!--  publish WSDL check box-->
-<description>Select this check box to hide the option of publishing the Web service's WSDL file to a UDDI registry when you right-click a file in the Project Explorer or Navigator.</description>
-</context>
-
-
-</contexts>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.ws.infopop/.cvsignore b/docs/org.eclipse.wst.ws.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.ws.infopop/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-build.xml

diff --git a/docs/org.eclipse.wst.ws.infopop/.project b/docs/org.eclipse.wst.ws.infopop/.project
deleted file mode 100644
index 527501f..0000000
--- a/docs/org.eclipse.wst.ws.infopop/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/docs/org.eclipse.wst.ws.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.ws.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 2bc9d65..0000000
--- a/docs/org.eclipse.wst.ws.infopop/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Web services UI
-Bundle-SymbolicName: org.eclipse.wst.ws.infopop; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Localization: plugin
-Eclipse-AutoStart: true

diff --git a/docs/org.eclipse.wst.ws.infopop/about.html b/docs/org.eclipse.wst.ws.infopop/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.ws.infopop/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.ws.infopop/build.properties b/docs/org.eclipse.wst.ws.infopop/build.properties
deleted file mode 100644
index 82d0318..0000000
--- a/docs/org.eclipse.wst.ws.infopop/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = about.html,\
-               plugin.xml,\
-               webserviceui-f1Contexts.xml,\
-               META-INF/
-src.includes = build.properties

diff --git a/docs/org.eclipse.wst.ws.infopop/plugin.xml b/docs/org.eclipse.wst.ws.infopop/plugin.xml
deleted file mode 100644
index a24ebc0..0000000
--- a/docs/org.eclipse.wst.ws.infopop/plugin.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?> 
-<plugin>
-	<extension point="org.eclipse.help.contexts">
-		<contexts file="webserviceui-f1Contexts.xml" plugin="org.eclipse.wst.ws.ui"/>
-	</extension>
-</plugin>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.ws.infopop/webserviceui-f1Contexts.xml b/docs/org.eclipse.wst.ws.infopop/webserviceui-f1Contexts.xml
deleted file mode 100644
index 8bb0b15..0000000
--- a/docs/org.eclipse.wst.ws.infopop/webserviceui-f1Contexts.xml
+++ /dev/null

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<contexts>
-
-<!--WSIPage.java-->
-<context id="PWSI0001">
-<!--desc-->
-<description>The Web services WS-I validation tools support the level of WS-I compliance outlined in the WS-I Basic Profile 1.1, the WS-I Simple SOAP Binding Profile 1.0 (WS-I SSBP), and the WS-I Attachments Profile 1.0 (WS-I AP). You can choose to make your Web service compliant or non-compliant, depending on your needs. For example, encoded style (RPC/encoded), SOAP over JMS protocols, and secured Web services, are not WS-I compliant.
-<br />
-You can set the level of compliance for either the Basic Profile and the Simple SOAP Binding Profile, or for the Attachments Profile. You can select from three levels of compliance with WS-I specifications:
-<ul>
-<li>Require WS-I compliance - this level prevents you from creating a non-compliant Web service.</li>
-<li>Suggest WS-I compliance - this level allows you to create a non-compliant Web service, but provides a visible warning stating how the service is non-compliant.</li>
-<li>Ignore WS-I compliance - this level allows you to create a non-compliant Web service and does not notify you of non-compliance.</li>
-</ul>
-</description>
-</context>
-
-</contexts>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/.cvsignore b/docs/org.eclipse.wst.wsdl.ui.doc.user/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-build.xml

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/.project b/docs/org.eclipse.wst.wsdl.ui.doc.user/.project
deleted file mode 100644
index 2785100..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsdl.ui.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.wsdl.ui.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 4666279..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WSDL Editor Documentation
-Bundle-SymbolicName: org.eclipse.wst.wsdl.ui.doc.user; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/about.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/build.properties b/docs/org.eclipse.wst.wsdl.ui.doc.user/build.properties
deleted file mode 100644
index b3934c9..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/build.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-bin.includes = wswsdleditorc_toc.xml,\
-               wswsdleditort_toc.xml,\
-               about.html,\
-               images/,\
-               plugin.properties,\
-               plugin.xml,\
-               topics/,\
-               META-INF/,\
-               build.properties,\
-               concepts/,\
-               tasks/
-src.includes = build.properties
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.html
deleted file mode 100644
index b853ce3..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.html
+++ /dev/null

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing WSDL files with the WSDL editor</title>
-</head>
-<body id="cwsdled"><a name="cwsdled"><!-- --></a>
-
-<h1 class="topictitle1">Editing WSDL files with the WSDL Editor</h1>
-<div><p>The WSDL editor allows you to easily and graphically create, modify,
-view, and validate WSDL files.</p>
-<p>Using the WSDL editor, you can do the following:</p>
-<ul><li>Create new WSDL files</li>
-<li>Validate and edit WSDL files</li>
-<li>Create and delete:  <ul><li>services, which are used to aggregate a set of related ports. These are
-the root elements of all WSDL files.</li>
-<li>ports, which specify an address for a binding, thus defining a single
-communication endpoint.</li>
-<li>bindings, which specify concrete protocol and data format specifications
-for the operations and messages defined by a particular port type.</li>
-<li>port types, which are a set of abstract operations. Each operation refers
-to an input message and output messages.</li>
-<li>operations, which refer to input and output messages</li>
-<li>messages, which represent an abstract definition of the data being transmitted.
-A message consists of logical parts, each of which is associated with a definition
-within some type system.</li>
-<li>parts, which are a flexible mechanism for describing the logical abstract
-content of a message</li>
-<li>types, which describe all the data types used between the client and server.
-WSDL is not tied exclusively to a specific typing system, but it uses the
-W3C XML Schema specification as its default choice.</li>
-<li>import statements, which are used to associate a namespace with a document
-location </li>
-</ul>
-</li>
-<li>Import existing WSDL files for structured viewing</li>
-<li>Generate documentation from a WSDL document.</li>
-</ul>
-<p>The WSDL support in the WSDL editor is based on the W3C <a href="http://www.w3.org/TR/wsdl" target="_blank">Web Services Description
-Language (WSDL) 1.1</a>. The WSDL specification from the W3C Web site is
-also used for validation.  </p>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../tasks/tedtwsdl.html">Editing WSDL files</a></strong><br />
-Once you have created a WSDL file, you can edit it in the WSDL
-editor. You can also import WSDL files you have created outside Rational Developer
-products into the workbench and edit them in the WSDL editor.</li>
-</ul>
-
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">WSDL</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="../tasks/tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/httpskel.gif b/docs/org.eclipse.wst.wsdl.ui.doc.user/images/httpskel.gif
deleted file mode 100644
index dca2dc3..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/httpskel.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/show-hide-binding.gif b/docs/org.eclipse.wst.wsdl.ui.doc.user/images/show-hide-binding.gif
deleted file mode 100644
index cda9b58..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/show-hide-binding.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/soapskel.gif b/docs/org.eclipse.wst.wsdl.ui.doc.user/images/soapskel.gif
deleted file mode 100644
index 219721a..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/soapskel.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/wsdleditor.gif b/docs/org.eclipse.wst.wsdl.ui.doc.user/images/wsdleditor.gif
deleted file mode 100644
index fb26004..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/images/wsdleditor.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.xml b/docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.xml
deleted file mode 100644
index f3ca99a..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.xml
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
-    <toc file="wswsdleditort_toc.xml"/>   
-    <toc file="wswsdleditorc_toc.xml"/>
-      
-</extension>
-
-
-</plugin>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.html
deleted file mode 100644
index 742d36e..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.html
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a message</title>
-</head>
-<body id="taddmess"><a name="taddmess"><!-- --></a>
-
-<h1 class="topictitle1">Adding a message</h1>
-<div><p>Messages represent an abstract definition of the data being transmitted.
-A message consists of logical parts, each of which is associated with a definition
-within some type system. WSDL messages are top level objects that can be referenced
-by an operation's input, output and fault elements (within a port type).</p>
-<div class="section"><p>If you want to create a new message for your input, output, or
-fault element, follow these steps:  </p>
-</div>
-<ol><li class="stepexpand"><span>In the Graph view, right-click your input, output, or fault element
-and click  <strong>Set Message.</strong></span></li>
-<li class="stepexpand"><span>Select the  <strong>Create a new message</strong> radio button.</span></li>
-<li class="stepexpand"><span>Type the name of the message in dialog.</span> This name should
-be a unique amongst all messages defined within the enclosing WSDL document.
-Click <strong>OK</strong>.</li>
-<li class="stepexpand"><span>The new message will appear in the graph view within the messages
-section.</span> An line should be visible connecting the input, output
-or fault with the message.</li>
-</ol>
-<div class="section"><p> <strong>Note</strong>: Messages are referenced within a port type (specifically
-by an operation's input, output and fault objects). The input, output and
-fault objects within a binding do not reference messages. Hence you cannot
-create a new message by right clicking on a input, output, or fault within
-a binding (these are also known as binding input, binding output and binding
-faults).</p>
-<p> <strong>Tip</strong>: You can also create a new message for your input,
-output, or fault element using the Outline view. Under the  <strong>Port Types</strong> 
-folder, right-click your element and click  <strong>Set Message &gt; Create a new
-message</strong>. Your message will appear in the Outline view under the  <strong>Messages</strong> folder. </p>
-<p>If
-you want to reuse a message for your input, output, or fault element, follow
-these steps:  </p>
-<ol><li>In the Graph view, right-click your input, output, or fault element and
-click  <strong>Set Message.</strong></li>
-<li>Press the  <span class="uicontrol">Select an existing message</span> radio button.</li>
-<li>The existing messages will be listed. Select one and click  <strong>Finish</strong>.</li>
-</ol>
-<p>If you want to import an existing message for your input, output,
-or fault element, follow these steps:</p>
-<ol><li>In the Graph view, right-click your input, output, or fault element and
-click  <strong>Set Message.</strong></li>
-<li>Select the  <strong>Import message from a file</strong> check box. Click  <strong>Browse</strong>.</li>
-<li>Select the file that contains the message you want to use. Click  <strong>OK</strong>.</li>
-<li>The messages in the file will be listed. Select one and click  <strong>Finish</strong>.</li>
-</ol>
-<p>You can now add parts to your message. Parts are a flexible mechanism
-for describing the logical abstract content of a message.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div>
-</div>
-
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.html
deleted file mode 100644
index bb553f6..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.html
+++ /dev/null

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding an operation</title>
-</head>
-<body id="taddoper"><a name="taddoper"><!-- --></a>
-
-<h1 class="topictitle1">Adding an operation</h1>
-<div><p>An operation names the operation and lists the expected inputs
-and outputs. The operation element may also contain a fault sub-element that
-describes any error data the operation may return.</p>
-<div class="section">Using these, you can declare four transmission primitives that an
-endpoint can support:<ul><li> <strong>One-way</strong>. The endpoint receives a message.</li>
-<li> <strong>Request-response</strong>. The endpoint receives a message, and sends a
-correlated message.</li>
-<li> <strong>Solicit-response</strong>. The endpoint sends a message, and receives a
-correlated message.</li>
-<li> <strong>Notification</strong>. The endpoint sends a message.</li>
-</ul>
-<p>You can add an operation to a port type or a port binding.</p>
-<p>To
-add an operation to a port type, follow these steps:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Graph view, right-click your port type.</span> Click <strong>Add Child
-&gt; Operation</strong>.</li>
-<li class="stepexpand"><span>In the dialog, enter a name for the operation.</span></li>
-<li class="stepexpand"><span>Right click on the operation to add an input, output or fault objects.</span> Depending on an operation's inputs and outputs it can be classified
-as follows:<ul><li><strong>One way operation</strong>: input </li>
-<li><strong>Request response operation</strong>: input, output </li>
-<li><strong> Solicit response operation</strong>: output, input </li>
-<li><strong>Notification operation</strong> : output</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Type any information about the operation you wish the user to read
-in the  <strong>Documentation</strong> pane. </span></li>
-</ol>
-<div class="section"><p> <strong>Tip</strong>: You can also create a new operation for your port
-type using the Outline view.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div>
-</div>
-
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.html
deleted file mode 100644
index 579b6ee..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.html
+++ /dev/null

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a part to a message</title>
-</head>
-<body id="taddpart"><a name="taddpart"><!-- --></a>
-
-<h1 class="topictitle1">Adding a part to a message</h1>
-<div><p>All messages contain one or more parts. Parts are a flexible mechanism
-for describing the logical abstract content of a message. The message definition
-associates each part with a type using a message-typing attribute.</p>
-<div class="section"><p>To add a part to a message, follow these steps:</p>
-</div>
-<ol><li class="stepexpand"><span>In Graph view, select the message you want to add a part to.</span></li>
-<li class="stepexpand"><span>Right-click the message and click  <strong>Add Child &gt; Part</strong>.</span></li>
-<li class="stepexpand"><span>Type the name of the part in the dialog.</span> Click <strong>OK</strong>.</li>
-<li class="stepexpand"><span>Your part can refer to either a <strong>type</strong> or an <strong>element</strong>.</span> Select the appropriate option from the <strong>Reference Kind</strong> list.</li>
-<li class="stepexpand"><span>If you selected  <strong>type</strong> in the <strong>Reference Kind</strong> list,
-you now have the option of selecting an XML schema data type from the <strong>Type</strong> drop
-down list. The list of types comes from any available referenced XML schemas.</span> </li>
-<li class="stepexpand"><span>If you selected <strong>element</strong> in the <strong>Reference Kind</strong> list,
-you now have the option of selecting an XML schema element from
-the  <strong>Element</strong> drop down list. The list of elements comes from any
-available referenced XML schemas.</span> </li>
-</ol>
-<div class="section"><p> <strong>Tip</strong>: You can also create a new part for your message using
-the Outline view. Under the  <strong>Messages</strong> folder, right-click your element
-and click  <strong>Add Child &gt; Part</strong>. Your part will automatically appear in
-the Outline view (under the  <strong>Messages</strong> folder), but it will only appear
-in the Graph view if the message you added it to currently does.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div>
-</div>
-
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.html
deleted file mode 100644
index 535dbc5..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.html
+++ /dev/null

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a port to a service</title>
-</head>
-<body id="taddport"><a name="taddport"><!-- --></a>
-
-<h1 class="topictitle1">Adding a port to a service</h1>
-<div><p>A port defines an individual endpoint by specifying a single address
-for a binding. The port contains a 'binding' attribute that references a binding
-and an address element that provides a specification for the endpoint.</p>
-<div class="section"><p>Services are used to group sets of related ports together. Ports
-within a service have the following relationship:</p>
-<ul><li>None of the ports communicate with each other (for example, the output
-of one port is not the input of another).</li>
-<li>If a service has several ports that share a port type, but employ different
-bindings or addresses, the ports are alternatives. Each port provides semantically
-equivalent behavior (within the transport and message format limitations imposed
-by each binding). </li>
-<li>You can determine a service's port types by examining its ports. Using
-this information a user can determine if a given machine supports all the
-operations needed to complete a given task.</li>
-</ul>
-<p>To add a port to a service, follow these steps:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Graph view, right-click the service you want to add a port
-to, then click  <strong>Add Child &gt; Port.</strong></span></li>
-<li class="stepexpand"><span>Type the name of the port in the dialog.</span> Click <strong>Finish</strong>.
-The name of the port should provide it with a unique name amongst all the
-ports defined within the service.</li>
-<li class="stepexpand"><span>A  <strong>Binding</strong> defines the message format and protocol details
-for operations and messages defined by a particular port type.</span> You
-can either create a new binding for your port, re-use an existing one, or
-import one. Refer to the related tasks for more details.</li>
-<li class="stepexpand"><span>Type any information about the port you want the user to read in
-the  <strong>Documentation</strong> field.</span></li>
-</ol>
-<div class="section"><p> <strong>Tip</strong>: You can also create a port using the Outline view
-by right-clicking your service under the  <strong>Services</strong> folder and clicking
- <strong>Add Child &gt; Port</strong>. Your port (regardless of which view you create it
-in) will appear in both the Graph view and the Outline view.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div>
-</div>
-
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.html
deleted file mode 100644
index 07b3c91..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.html
+++ /dev/null

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding a service</title>
-</head>
-<body id="taddsrvc"><a name="taddsrvc"><!-- --></a>
-
-<h1 class="topictitle1">Adding a service</h1>
-<div><p>The  <tt class="sysout">service</tt> element is a collection
-of related ports and specifies the location of the service.</p>
-<div class="section"><p>To create a new service, follow these steps:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Graph view, right-click in any blank space and click  <strong>Add
-Child &gt; Service</strong>.</span></li>
-<li class="stepexpand"><span>Type the name of the service in the dialog.</span> The name
-of the service provides it with a unique name amongst all the services defined
-within in the enclosing WSDL document.</li>
-<li class="stepexpand"><span>Click  <strong>OK</strong>.</span></li>
-<li class="stepexpand"><span>Type any information about the service you want the user to read
-in the  <strong>Documentation</strong> pane.</span></li>
-</ol>
-<div class="section"><p> <strong>Tip</strong>: You can also create a service using the Outline view
-by right-clicking the  <strong>Services</strong> folder and clicking  <strong>Add Child &gt;
-Service</strong>.</p>
-<p>You can now add a port to your service. A port defines
-an individual endpoint by specifying a single address for a binding.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div>
-</div>
-
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.html
deleted file mode 100644
index 398b62d..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.html
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating an import statement</title>
-</head>
-<body id="tcrtimpt"><a name="tcrtimpt"><!-- --></a>
-
-<h1 class="topictitle1">Creating an import statement</h1>
-<div><p>The import statement is used to import other WSDL documents or
-XML schemas into your WSDL document. This enables you to have more modular
-WSDL documents. The use of the  <strong>import</strong> statement allows the separation
-of the different elements of a service definition into independent documents,
-which can then be imported as needed. This technique helps in writing clearer
-service definitions, by separating the definitions according to their level
-of abstraction.</p>
-<div class="section"><p>To create an import statement, follow these steps:</p>
-</div>
-<ol><li><span>In the Graph view, right-click the  <strong>Imports</strong> group and click
- <strong>Add Child &gt; Import.</strong></span></li>
-<li><span>Select your new import statement.</span></li>
-<li><span>Specify the  <strong>namespace</strong> of the document you wish to import,
-then specify the  <strong>location</strong> of the document you wish to import.</span></li>
-</ol>
-<div class="section">Once you specify the location of the document you wish to import,
-the import object's label changes to reflect the specified location. Imported
-WSDL components may now be visible within the editor.</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div>
-</div>
-
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.html
deleted file mode 100644
index 34d86ff..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.html
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a new type for your WSDL file</title>
-</head>
-<body id="tcrttype"><a name="tcrttype"><!-- --></a>
-
-<h1 class="topictitle1">Creating a new type for your WSDL file</h1>
-<div><p>Types describe all the data types used between the client and server.
-WSDL is not tied exclusively to a specific typing system, but it uses the
-W3C XML Schema specification as its default choice.</p>
-<div class="section"><p>WSDL allows type systems to be added via extensibility elements.
-An extensibility element may appear under the  <strong>types</strong> element to identify
-the type definition system being used and to provide an XML container element
-for the type definitions.</p>
-<p>To add an extensibility element to your WSDL
-file, follow these steps:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Graph view right-click the  <strong>Types</strong> group.</span></li>
-<li class="stepexpand"><span>Click  <strong>Add Child</strong> &gt;  <strong>Add Schema</strong>.  You will be
-creating an inline schema - a schema that is defined directly within the WSDL
-file.</span> </li>
-<li class="stepexpand"><span>A schema object will appear in the group.</span> Select it.</li>
-<li class="stepexpand"><span>The following information about your schema is listed:  </span> <ul><li> <strong>Prefix</strong> - The prefix associated with the current namespace</li>
-<li> <strong>URI</strong> - the target namespace for the schema</li>
-<li>Other attributes, such as  <strong>version</strong>,  <strong>language</strong>, and  <strong>attribute
-form</strong>.</li>
-</ul>
- You can manually modify the value of any of these attributes.</li>
-<li class="stepexpand"><span>You can also add new components to your XML schema. In the Graph
-view, press the arrow icon to the left of the schema object to drill down
-into the schema.</span>  Now you can edit the schema within the graph
-view. When finished, press the <span class="uicontrol">Back</span> button at the top
-left of the WSDL editor to return to the definition view of the WSDL document.</li>
-</ol>
-<div class="section"><p>For more information about XML schemas, refer to the XML schema
-editor online documentation.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div>
-</div>
-
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html
deleted file mode 100644
index f16e13e..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html
+++ /dev/null

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating a new WSDL file</title>
-</head>
-<body id="tcrtwsdl"><a name="tcrtwsdl"><!-- --></a>
-
-<h1 class="topictitle1">Creating a new WSDL file</h1>
-<div><p>You can create a new, empty WSDL file, then edit it using the WSDL
-editor.</p>
-<div class="section"><p>To create a WSDL file, follow these steps:</p>
-</div>
-<ol><li class="stepexpand"><span>Create a project to contain the WSDL document.</span> It does
-not matter what kind of project you create.</li>
-<li class="stepexpand"><span>In the workbench, click  <strong>File &gt; New &gt; Other &gt; Web Services &gt;
-WSDL</strong>.</span> Click <strong>Next</strong>.</li>
-<li class="stepexpand"><span>Select the project or folder that will contain the WSDL file.</span> In the  <strong>File name</strong> field, type the name of the WSDL file, for
-example  <tt class="sysout">MyWSDLFile.wsdl</tt>. The name of your XML
-file must end in  <tt class="sysout">.wsdl</tt></li>
-<li class="stepexpand"><span>Click  <strong>Next.</strong></span></li>
-<li class="stepexpand"><span>Enter the  following information: </span><ol type="a"><li class="substepexpand"><span><strong>Target namespace</strong> is the namespace for the WSDL file or
-accept the default (<samp class="codeph">http://www.example.org/<em>MyWSDLFile</em>/</samp>).</span> The target namespace is used for the names of messages and the port
-type, binding and service defined in the WSDL file. The value must take the
-form of a valid URI (for example, <samp class="codeph">http://www.mycompany.com/myservice/</samp>)</li>
-<li class="substepexpand"><span>The  <strong>Prefix</strong> is the prefix associated with the target
-namespace.</span></li>
-<li class="substepexpand"><span>Select <span class="uicontrol">Create WSDL Skeleton</span> if you want
-the wizard to create the skeleton of the WSDL file.</span>  This will
-generate the WSDL elements required for your service, including bindings,
-ports and messages. You can then modify these to meet the requirements of
-your Web service.</li>
-<li class="substepexpand"><span>If you have chosen to create a WSDL skeleton, select the binding
-options you want to use in the WSDL document. The options are SOAP and HTTP.</span>  If you select SOAP you can then select the encoding style you want
-to use. If you select HTTP you can select whether to create an HTTP getter
-or setter.</li>
-</ol>
-</li>
-<li class="stepexpand"><span>Click  <strong>Finish</strong>.</span> The WSDL file opens in the WSDL
-editor.</li>
-</ol>
-<div class="section"><p>If you created a WSDL file with a skeleton using SOAP bindings,
-it should look similar to the following:<br /><img src="../images/soapskel.gif" alt="Image of a WSDL skeleton using SOAP bindings" /><br /></p>
-<p>If you created
-a WSDL file with a skeleton using HTTP bindings, it should look similar to
-the following:<br /><img src="../images/httpskel.gif" alt="Image of a WSDL skeleton using HTTP bindings" /><br /></p>
-</div>
-</div>
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">WSDL</a></div>
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="timpwsdl.html">Importing a WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.html
deleted file mode 100644
index 5ded832..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.html
+++ /dev/null

@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing WSDL files</title>
-</head>
-<body id="tedtwsdl"><a name="tedtwsdl"><!-- --></a>
-
-<h1 class="topictitle1">Editing WSDL files</h1>
-<div><p>Once you have created a WSDL file, you can edit it in the WSDL
-editor. You can also import WSDL files you have created outside Rational<sup>®</sup> Developer
-products into the workbench and edit them in the WSDL editor.</p>
-<div class="section"><p>To open a WSDL file in the WSDL editor, double-click it in the
-Navigator view or right-click it and click  <strong>Open With &gt; WSDL Editor.</strong></p>
-</div>
-</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../tasks/taddsrvc.html">Adding a service</a></strong><br />
-The  <tt class="sysout">service</tt> element is a collection
-of related ports and specifies the location of the service.</li>
-<li class="ulchildlink"><strong><a href="../tasks/taddport.html">Adding a port to a service</a></strong><br />
-A port defines an individual endpoint by specifying a single address
-for a binding. The port contains a 'binding' attribute that references a binding
-and an address element that provides a specification for the endpoint.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tsetprtt.html">Setting a port type</a></strong><br />
-A port type is a named set of abstract operations and the abstract
-messages involved. Each operation refers to an input message and output messages.
-A port type is reference by a binding object. Each binding references exactly
-one port type. Since each port refers to exactly one binding, each port has
-exactly one port type.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tsetbind.html">Setting a binding</a></strong><br />
-A binding is a top level WSDL object that provides a concrete specification
-regarding the transmission of messages to and from a web service. A binding
-references exactly one port type. The structure of a binding corresponds very
-closely to that of the port type. The binding contains extensibility elements
-(for example, soap, http, and mime) that specify protocol specific details.
-Each port within a service references exactly one binding.</li>
-<li class="ulchildlink"><strong><a href="../tasks/taddoper.html">Adding an operation</a></strong><br />
-An operation names the operation and lists the expected inputs
-and outputs. The operation element may also contain a fault sub-element that
-describes any error data the operation may return.</li>
-<li class="ulchildlink"><strong><a href="../tasks/taddmess.html">Adding a message</a></strong><br />
-Messages represent an abstract definition of the data being transmitted.
-A message consists of logical parts, each of which is associated with a definition
-within some type system. WSDL messages are top level objects that can be referenced
-by an operation's input, output and fault elements (within a port type).</li>
-<li class="ulchildlink"><strong><a href="../tasks/taddpart.html">Adding a part to a message</a></strong><br />
-All messages contain one or more parts. Parts are a flexible mechanism
-for describing the logical abstract content of a message. The message definition
-associates each part with a type using a message-typing attribute.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tcrtimpt.html">Creating an import statement</a></strong><br />
-The import statement is used to import other WSDL documents or
-XML schemas into your WSDL document. This enables you to have more modular
-WSDL documents. The use of the  <strong>import</strong> statement allows the separation
-of the different elements of a service definition into independent documents,
-which can then be imported as needed. This technique helps in writing clearer
-service definitions, by separating the definitions according to their level
-of abstraction.</li>
-<li class="ulchildlink"><strong><a href="../tasks/tcrttype.html">Creating a new type for your WSDL file</a></strong><br />
-Types describe all the data types used between the client and server.
-WSDL is not tied exclusively to a specific typing system, but it uses the
-W3C XML Schema specification as its default choice.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div>
-</div>
-</div><div class="nested1" id="editisourceview"><a name="editisourceview"><!-- --></a><h2 class="topictitle2">Editing in the Source view</h2>
-<div><div class="section">To edit a WSDL file in the Source view, follow these steps:</div>
-<ol><li><span>Open your WSDL file in the WSDL editor.</span></li>
-<li><span>Click the  <strong>Source</strong> tab.</span></li>
-<li><span>Select the source code you want to edit.</span></li>
-</ol>
-<div class="section"><p>At any time, you can switch to the Source view to review the source
-for the WSDL file. You can also edit your WSDL file directly in the Source
-view.</p>
-</div>
-</div>
-</div>
-<div class="nested1" id="editeditview"><a name="editeditview"><!-- --></a><h2 class="topictitle2">Editing in the Graph view</h2>
-<div><div class="section"><p>The Graph view provides a graphical way to browse and edit your
-WSDL file. Each type of top level wsdl object is shown within a group (e.g.
-service, port type, message). Within each group is a tree view that can be
-used to browse the structure of the object. The service, binding, port type
-and message groups are 'linked'. If for example we select an input in the
-port types, we'll notice that the message that is referenced by this message
-is scrolled into view in the messages group. A line displays to denote a reference
-(or association) between these objects.</p>
-<p> <br /><img src="../images/wsdleditor.gif" alt="Image of a WSDL file open in the WSDL editor" /><br /> </p>
-</div>
-</div>
-</div>
-<div class="nested1" id="showbndgraph"><a name="showbndgraph"><!-- --></a><h2 class="topictitle2">Showing Bindings in the Graph view</h2>
-<div><div class="section">By default bindings are shown in the Graph View. Select the show/hide
-binding button at the top left of the Graph View to hide the bindings. With
-the bindings hidden a service can be browsed from a purely abstract level
-without showing binding information. When the need arises to understand the
-concrete details represented by the binding, select the show/hide binding
-button again to make them visible.</div>
-</div>
-</div>
-<div class="nested1" id="editoutlineview"><a name="editoutlineview"><!-- --></a><h2 class="topictitle2">Editing in the Outline view</h2>
-<div><div class="section"><p>The Outline view will show you all the items in your WSDL file
-as you add them. In this view, you can both create and delete WSDL components.</p>
-<p>The
-Outline view contains the following folders you can use (by right-clicking
-and selecting the appropriate option) to edit your WSDL file:</p>
-<ul><li> <strong>Imports</strong> statements, which are used to associate a namespace
-with a document location.</li>
-<li> <strong>Types</strong>, which provide data type definitions used to describe the
-messages exchanged.  You cannot edit any types directly using this folder.</li>
-<li> <strong>Messages</strong>, which represent an abstract definition of the data being
-transmitted. A message consists of logical parts, each of which is associated
-with a definition within some type system.</li>
-<li> <strong>Port Types</strong>, which are a set of abstract operations. Each operation
-refers to an input message and output messages.</li>
-<li> <strong>Bindings</strong>, which specify concrete protocol and data format specifications
-for the operations and messages defined by a particular port type.</li>
-<li> <strong>Services</strong>, which are used to aggregate a set of related ports <img src="../images/show-hide-binding.gif" alt="" /> </li>
-</ul>
-</div>
-</div>
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">WSDL</a></div>
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="timpwsdl.html">Importing a WSDL file</a></div></div>
-</div></div>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.html
deleted file mode 100644
index 90a8205..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.html
+++ /dev/null

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Importing WSDL files</title>
-</head>
-<body id="timpwsdl"><a name="timpwsdl"><!-- --></a>
-
-<h1 class="topictitle1">Importing a WSDL file</h1>
-<div><div class="section"><p>The Web Service wizard assists you in creating a new Web service
-from a WSDL file. You must first create or import a WSDL file. A WSDL file
-can be created using the WSDL editor. This is described in:  <a href="../tasks/tcrtwsdl.html">Creating a new WSDL file</a>. To import a WSDL file follow
-the instructions below.</p>
-<p>You can import WSDL files into the workbench
-and open them in the WSDL editor. Opening them in the WSDL editor provides
-you with an opportunity to have a structured viewing of the WSDL file.</p>
-<p> <span class="uicontrol">Prerequisite:</span> Create
-a project. It is recommend that you create a Web project so that the WSDL
-can be easily used to generate additional artifacts and deployed.</p>
-<p>For
-more information on creating a Web project, refer to the Web application development
-documentation.</p>
-<p>To import a WSDL file to your Web project:</p>
-</div>
-<ol><li class="stepexpand"><span>Select your project in the J2EE Navigator pane, and from the  <span class="uicontrol">File</span> menu,
-select  <span class="uicontrol">Import</span>.</span></li>
-<li class="stepexpand"><span>Select  <span class="uicontrol">File System</span> and click  <span class="uicontrol">Next</span>.</span></li>
-<li class="stepexpand"><span>Click the  <span class="uicontrol">Browse</span> button on the next page
-of the wizard to select the directories from which you would like to add the
-WSDL.</span></li>
-<li class="stepexpand"><span>In the import selection panes, use the following methods to select
-exactly the resources you want to add:  </span> <ul><li>Expand the hierarchies in the left pane and select or clear the checkboxes
-that represent the folders in the selected directory. Then in the right pane,
-select or clear checkboxes for individual files.</li>
-<li>Click  <span class="uicontrol">Filter Types</span> to filter the current selection
-for files of a specific type.</li>
-<li>Click  <span class="uicontrol">Select All</span> to select all resources in the
-directory, then go through and deselect the ones that you do not want to add.</li>
-<li>Click  <span class="uicontrol">Deselect All</span> to deselect all resources in
-the directory, then go through and choose individual resources to add.</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Specify the Workbench project or folder that will be the import
-destination.</span></li>
-<li class="stepexpand"><span>When you have finished specifying your import options, click  <span class="uicontrol">Finish.</span></span></li>
-</ol>
-<div class="section"><p>After you have imported a WSDL file into the workbench and opened
-it in the WSDL editor, you can edit it.</p>
-<p>Alternately, you can import
-a WSDL file using the WSDL Explorer. For more information, refer to:  <a href="../../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html"> Using the WSDL Explorer</a>.  </p>
-</div>
-<div class="section"><strong>Known limitation when importing WSDL:</strong> On some Windows<sup>®</sup> systems,
-the "Import to File System" operation may result in saving the HTML file rather
-than the desired WSDL files. The workaround and fix for this problem is documented
-in Microsoft<sup>®</sup> Knowledge
-Base article Q281119. A dialog box may ask if you want to save "WSDLFileDownloader",
-the message is incorrect and does not affect the actual name of the file saved.
-If the file extension displays XML when selecting the save location for the
-WSDL document, ignore the incorrect extension and continue the save. The file
-will be saved with the WSDL extension.</div>
-</div>
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">WSDL</a></div>
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.html
deleted file mode 100644
index c53655f..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.html
+++ /dev/null

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Setting a binding</title>
-</head>
-<body id="tsetbind"><a name="tsetbind"><!-- --></a>
-
-<h1 class="topictitle1">Setting a binding</h1>
-<div><p>A binding is a top level WSDL object that provides a concrete specification
-regarding the transmission of messages to and from a web service. A binding
-references exactly one port type. The structure of a binding corresponds very
-closely to that of the port type. The binding contains extensibility elements
-(for example, soap, http, and mime) that specify protocol specific details.
-Each port within a service references exactly one binding.</p>
-<div class="section"><p>You can create a new binding, reuse an existing one, or import
-one.</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div>
-</div>
-</div><div class="nested1" id="createnewbind"><a name="createnewbind"><!-- --></a><h2 class="topictitle2">Creating a new binding</h2>
-<div><div class="section"><p>To create a new binding for your port, follow these steps:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Graph view, right-click your port and click  <strong>Set Binding</strong>.</span></li>
-<li class="stepexpand"><span>Select the  <strong>Create a new binding</strong> radio button.</span></li>
-<li class="stepexpand"><span>Type the name of the binding in  <span class="uicontrol">Name</span> field.</span> The name should be unique among all bindings defined within the enclosing
-WSDL document. Click <strong>Finish.</strong></li>
-<li class="stepexpand"><span>In order to see the binding you need to ensure the hide/show binding
-button <img src="../images/show-hide-binding.gif" alt="hide/show binding button" /> is
-toggled so that bindings are showing.</span></li>
-<li class="stepexpand"><span>A  <strong>Port Type</strong> is a named set of abstract operations and the
-abstract messages involved.</span> You can either create a new port type
-for your binding, reuse an existing one, or import one. Refer to the related
-tasks for more details.</li>
-<li class="stepexpand"><span>Type any information about the binding you want the user to read
-in the  <strong>Documentation</strong> field.</span></li>
-</ol>
-<div class="section"><p> <strong>Tip</strong>: You can also create a new binding for your port using
-the Outline view.</p>
-</div>
-</div>
-</div>
-<div class="nested1" id="reusebinding"><a name="reusebinding"><!-- --></a><h2 class="topictitle2">Reusing a binding for a port</h2>
-<div><div class="section"><p>To reuse a binding for your port, follow these steps:</p>
-</div>
-<ol><li><span>In the Graph view, select your port.</span></li>
-<li><span>From the  <strong>Binding</strong> drop down list, select the binding you
-want to use.</span></li>
-</ol>
-</div>
-</div>
-<div class="nested1" id="regeneratingabinding"><a name="regeneratingabinding"><!-- --></a><h2 class="topictitle2">Regenerating a binding</h2>
-<div><div class="section">To regenerate a binding:</div>
-<ol><li><span>Right-click the binding you want to regenerate.</span></li>
-<li><span>Select <span class="uicontrol">Generate Binding Content</span>.</span></li>
-<li><span>Specify an required binding information. If you are modifying an
-existing binding, ensure that you select <span class="uicontrol">Overwrite existing binding
-information</span>.</span></li>
-</ol>
-</div>
-</div>
-<div class="nested1" id="impbinding"><a name="impbinding"><!-- --></a><h2 class="topictitle2">Import an existing binding</h2>
-<div><div class="section">To import an existing binding for your port, follow these steps:</div>
-<ol><li><span>In the Graph view, right-click your port and click  <strong>Set Binding.</strong></span></li>
-<li><span>Click the  <strong>Import binding from a file</strong> check box. Click  <strong>Browse</strong>.</span></li>
-<li><span>Select the file that contains the binding you want to use. Click
- <strong>OK</strong>.</span></li>
-</ol>
-</div>
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div></div>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.html b/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.html
deleted file mode 100644
index 105e521..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.html
+++ /dev/null

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Setting a port type</title>
-</head>
-<body id="tsetprtt"><a name="tsetprtt"><!-- --></a>
-
-<h1 class="topictitle1">Setting a port type</h1>
-<div><p>A port type is a named set of abstract operations and the abstract
-messages involved. Each operation refers to an input message and output messages.
-A port type is reference by a binding object. Each binding references exactly
-one port type. Since each port refers to exactly one binding, each port has
-exactly one port type.</p>
-<div class="section"><p>You can create a port type by right clicking on the port types
-group and selecting  <span class="uicontrol">Add Child &gt; portType</span> . As a convenience
-you can also add a port type via a binding or port object. This allows you
-to create a port type and modify the binding to reference to the new port
-type in one action. You can either create a new port type for your binding,
-re-use an existing one, or import one</p>
-</div>
-</div>
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../tasks/tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div>
-</div>
-</div><div class="nested1" id="createporttype"><a name="createporttype"><!-- --></a><h2 class="topictitle2">Create a new port type</h2>
-<div><div class="section"><p>If you want to create a new port type for your binding, follow
-these steps:</p>
-</div>
-<ol><li class="stepexpand"><span>In the Graph view, right-click on a binding or port object (note
-that port must reference a binding) and click  <strong>Set Port Type.</strong></span></li>
-<li class="stepexpand"><span>Click the  <strong>Create a new port type</strong> radio button.</span></li>
-<li class="stepexpand"><span>Type the name of the port type in the  <strong>Name of port type</strong> field.</span> The name should be unique name among all port types defined within in
-the enclosing WSDL document. Click <strong>Finish</strong>.</li>
-<li class="stepexpand"><span>Click the port type. Type any information about the port type
-you wish the user to read in the  </span> <strong>Documentation</strong> field. </li>
-</ol>
-<div class="section"><p> <strong>Tip</strong>: You can also create a new port type for your binding
-using the Outline view.</p>
-<p>Once you have created a port type, you can add
-operations to it, which can send and receive messages.</p>
-</div>
-</div>
-</div>
-<div class="nested1" id="reuseporttype"><a name="reuseporttype"><!-- --></a><h2 class="topictitle2">Reuse a port type for a binding</h2>
-<div><div class="section"><p>If you want to reuse a port type for your binding, follow these
-steps:</p>
-</div>
-<ol><li><span>In the Graph view, right-click on a binding or port object (note
-that port must reference a binding) and click  <strong>Set Port Type.</strong></span></li>
-<li><span>Click the  <strong>Select an existing port type</strong> radio button.</span></li>
-<li><span>The existing bindings will be listed. Select one and click  <strong>Finish</strong>.</span></li>
-</ol>
-</div>
-</div>
-<div class="nested1" id="importporttype"><a name="importporttype"><!-- --></a><h2 class="topictitle2">Import a port type for a binding</h2>
-<div><div class="section"><p>.If you want to import an existing port type for your binding,
-follow these steps:</p>
-</div>
-<ol><li><span>In the Graph view, right-click on a binding or port object (note
-that port must reference a binding) and click  <strong>Set Port Type.</strong></span></li>
-<li><span>Click the  <strong>Import port type from a file</strong> radio button. Click
- <strong>Browse</strong>.</span></li>
-<li><span>Select the file that contains the port type you want to use. Click
- <strong>OK</strong>.</span></li>
-<li><span>The bindings in the file will be listed. Select one and click  <strong>Finish</strong>.</span></li>
-<li><span>Click the port type. Type any information about the port type
-you wish the user to read in the  <strong>Documentation</strong> field.</span></li>
-</ol>
-</div>
-<div>
-<div class="linklist"><strong>Related concepts</strong><br />
-
-<div><a href="../concepts/cwsdled.html" title="The WSDL editor allows you to easily and graphically create, modify, view, and validate WSDL files.">Editing WSDL files with the WSDL Editor</a></div></div>
-
-<div class="linklist"><strong>Related tasks</strong><br />
-
-<div><a href="tcrtwsdl.html" title="You can create a new, empty WSDL file, then edit it using the WSDL editor.">Creating a new WSDL file</a></div>
-<div><a href="tedtwsdl.html" title="Once you have created a WSDL file, you can edit it in the WSDL editor. You can also import WSDL files you have created outside Rational Developer products into the workbench and edit them in the WSDL editor.">Editing WSDL files</a></div></div>
-</div></div>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.xml b/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.xml
deleted file mode 100644
index 6fa5d61..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<toc label="wswsdleditorc" link_to="../org.eclipse.jst.ws.doc.user/webservice_toc.xml#wswsdleditorc" topic="concepts/cwsdled.html">
-   <topic label="Editing WSDL files with the WSDL Editor" href="concepts/cwsdled.html">
-      <anchor id="wsadie_childof_wsdledit"/>
-   </topic>
-</toc>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.xml b/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.xml
deleted file mode 100644
index e8f72e4..0000000
--- a/docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS  TYPE="org.eclipse.help.toc"?>
-<toc link_to="../org.eclipse.jst.ws.doc.user/webservice_toc.xml#wswsdleditort" label="wswsdleditort" topic="tasks/timpwsdl.html">
-   <topic label="Importing a WSDL file" href="tasks/timpwsdl.html"/>
-   <topic label="Creating a new WSDL file" href="tasks/tcrtwsdl.html"/>
-   <topic label="Editing WSDL files with the WSDL Editor" href="concepts/cwsdled.html">
-      <topic label="Editing WSDL files" href="tasks/tedtwsdl.html">
-         <topic label="Adding a service" href="tasks/taddsrvc.html"/>
-         <topic label="Adding a port to a service" href="tasks/taddport.html"/>
-         <topic label="Setting a port type" href="tasks/tsetprtt.html"/>
-         <topic label="Setting a binding" href="tasks/tsetbind.html"/>
-         <topic label="Adding an operation" href="tasks/taddoper.html"/>
-         <topic label="Adding a message" href="tasks/taddmess.html"/>
-         <topic label="Adding a part to a message" href="tasks/taddpart.html"/>
-         <topic label="Creating an import statement" href="tasks/tcrtimpt.html"/>
-         <topic label="Creating a new type for your WSDL file" href="tasks/tcrttype.html"/>
-      </topic>
-   </topic>
-   <topic label="Exploring WSDL using the Web Services Explorer" href="../org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html"/>
-</toc>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/.project b/docs/org.eclipse.wst.wsi.ui.doc.user/.project
deleted file mode 100644
index c16d955..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/.project
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsi.ui.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.wsi.ui.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index f57f078..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WS Documentation
-Bundle-SymbolicName: org.eclipse.wst.wsi.ui.doc.user; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Eclipse-AutoStart: true

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/about.html b/docs/org.eclipse.wst.wsi.ui.doc.user/about.html
deleted file mode 100644
index 4c99086..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/build.properties b/docs/org.eclipse.wst.wsi.ui.doc.user/build.properties
deleted file mode 100644
index d96075d..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-bin.includes = about.html,\
-               concepts/,\
-               images/,\
-               plugin.xml,\
-               tasks/,\
-               wswsitest_toc.xml,\
-               META-INF/
-src.includes = build.properties

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/build.xml b/docs/org.eclipse.wst.wsi.ui.doc.user/build.xml
deleted file mode 100644
index c1911e3..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/build.xml
+++ /dev/null

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.wst.wsi.ui.doc.user" default="build.jars" basedir=".">
-
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="true"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<property name="compilerArg" value=""/>
-	<path id="path_bootclasspath">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.wst.wsi.ui.doc.user">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.wst.wsi.ui.doc.user for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<zip destfile="${plugin.destination}/org.eclipse.wst.wsi.ui.doc.user_0.7.0.jar" basedir="${temp.folder}/org.eclipse.wst.wsi.ui.doc.user_0.7.0" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.wst.wsi.ui.doc.user.">
-	</target>
-
-	<target name="build.sources" depends="init">
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.wst.wsi.ui.doc.user_0.7.0"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui.doc.user_0.7.0" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}" includes="about.html,concepts/,images/,plugin.xml,tasks/,wswsitest_toc.xml,META-INF/"			/>
-		</copy>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<copy todir="${destination.temp.folder}/org.eclipse.wst.wsi.ui.doc.user_0.7.0" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}" includes="build.properties"			/>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.wst.wsi.ui.doc.user of all the zips, jars and logs created.">
-		<delete file="${plugin.destination}/org.eclipse.wst.wsi.ui.doc.user_0.7.0.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.wst.wsi.ui.doc.user_0.7.0.zip"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="D:/builds/Workspaces/pureHeadWTP/org.eclipse.wst.wsi.ui.doc.user" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.wst.wsi.ui.doc.user.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.wst.wsi.ui.doc.user_0.7.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-</project>

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/images/traffic.gif b/docs/org.eclipse.wst.wsi.ui.doc.user/images/traffic.gif
deleted file mode 100644
index 231ea4a..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/images/traffic.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/images/wsivalico.gif b/docs/org.eclipse.wst.wsi.ui.doc.user/images/wsivalico.gif
deleted file mode 100644
index 1bcad84..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/images/wsivalico.gif
+++ /dev/null
Binary files differ

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/plugin.xml b/docs/org.eclipse.wst.wsi.ui.doc.user/plugin.xml
deleted file mode 100644
index 10fcb0d..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/plugin.xml
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
-    <toc file="wswsitest_toc.xml"/>   
-  
-      
-</extension>
-
-
-</plugin>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html b/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html
deleted file mode 100644
index 81fe615..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html
+++ /dev/null

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Using the TCP/IP or SOAP monitor to test Web services</title>
-</head>
-<body id="tmonitor"><a name="tmonitor"><!-- --></a>
-
-<h1 class="topictitle1">Using the TCP/IP Monitor to test Web services</h1>
-<div><p>Once you have created your Web service and Web service client,
-you can monitor the Web service's SOAP traffic using the TCP/IP Monitor.</p>
-<div class="p"><p> Prerequisites: </p>
-<ul><li>Generate a Web service</li>
-<li>Generate a Proxy and a sample application</li>
-</ul>
-</div>
-<div class="section"><p>When creating a Web service using the Web service or Web service
-client wizards, you can select to set up and run the TCP/IP Monitor automatically.
-Alternately, you can set up the TCP/IP Monitor manually by completing the
-following steps:</p>
-</div>
-<ol><li class="stepexpand"><span>In the sample application, invoke the getEndPoint method. Record
-this endpoint. The default endpoint for a Web service is: </span> <ul><li>WebSphere<sup>®</sup> or
-Apache Axis run-time environment: http://localhost:&lt;port&gt;/&lt;web module
-context root&gt;/services/&lt;port&gt;</li>
-<li>IBM<sup>®</sup> SOAP
-run-time environment: http://localhost:&lt;port&gt;/&lt;web module context root&gt;/servlet/rpcrouter.</li>
-</ul>
-</li>
-<li class="stepexpand"><span>Create a server to act as the TCP/IP Monitor:</span><ol type="a"><li><span>From the Window menu, select <span class="uicontrol">Preferences</span>. </span></li>
-<li><span>In the Preferences window, expand Internet and then select <span class="uicontrol">TCP/IP
-Monitor</span>. </span></li>
-<li><span>Select the <span class="uicontrol">Show TCP/IP Monitor View when there is
-activity</span> check box. </span></li>
-<li><span>Under the TCP/IP Monitors lists, click <span class="uicontrol">Add</span>.
-A New Monitor dialog opens.</span></li>
-<li><span>Specify the following settings: </span></li>
-</ol>
-
-<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="choicetableborder">
-<thead><tr><th valign="bottom" align="left" id="d0e68-option">Option</th>
-<th valign="bottom" align="left" id="d0e68-desc">Description</th></tr></thead>
-<tbody><tr><td valign="top" headers="d0e68-option" id="d0e75"><strong>Local monitoring port</strong></td>
-<td valign="top" headers="d0e68-desc d0e75">Specify a unique
-port number on your local machine.</td>
-</tr>
-<tr><td valign="top" headers="d0e68-option" id="d0e80"><strong>Host name</strong></td>
-<td valign="top" headers="d0e68-desc d0e80">Specify the host name or IP address
-of the machine where the server is running.</td>
-</tr>
-<tr><td valign="top" headers="d0e68-option" id="d0e85"><strong>Port</strong></td>
-<td valign="top" headers="d0e68-desc d0e85">Specify the port number of the remote
-server.</td>
-</tr>
-<tr><td valign="top" headers="d0e68-option" id="d0e90"><strong>Type</strong></td>
-<td valign="top" headers="d0e68-desc d0e90">Specify whether the request type from
-the Web browser are sent by HTTP or TCP/IP. If the HTTP option is selected
-the requests from the Web browser are modified so that the HTTP header points
-to the remote machine and separated if multiple HTTP requests are received
-in the same connection. If the TCP/IP option is selected, all the requests
-are sent byte for byte. </td>
-</tr>
-</tbody></table>
-</li>
-<li class="stepexpand"><span>In order to route the Web service through the monitor, the endpoint
-of the Web service client needs to be changed. The TCP/IP Monitor listens
-on port 9081. In the Web browser window used in step 1, invoke the setEndPoint
-method, and change the endpoint so that it directs to port 9081. For example,
-the default would be: <samp class="codeph">http://localhost:9081/web_module_context_root/servlet/rpcrouter</samp> Invoke
-the getEndPoint method again to ensure that your change has been implemented.</span></li>
-<li class="stepexpand"><span>Select a Web service method in the Methods pane. Invoke this method.</span></li>
-<li class="stepexpand"><span>Change to the TCP/IP Monitor view by selecting the TCP/IP Monitor
-tab in the Servers view. This will display request and response pairs that
-are being routed through the TCP/IP Monitor. It will look similar to the following
-picture:  <br /><img src="../images/traffic.gif" alt="Screen capture of request and response traffic" /><br /></span></li>
-<li class="stepexpand"><span>To ensure that your Web service SOAP traffic is WS-I compliant,
-you can generate a log file by clicking the  <img src="../images/wsivalico.gif" alt="WS-I validation icon" /> icon. In the dialog box that opens,
-select a name for the log file and specify where you want it to be stored. </span></li>
-</ol>
-<div class="section">This log file will be validated for WS-I compliance. You can open
-the log file in an XML editor to examine its contents.</div>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/csoap.html">SOAP</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.html">WS-I</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/tasks/twsicomply.html">Setting the level of WS-I compliance</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html b/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html
deleted file mode 100644
index 9309a24..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html
+++ /dev/null

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Validating WSDL files</title>
-</head>
-<body id="twsdlval"><a name="twsdlval"><!-- --></a>
-
-<h1 class="topictitle1">Validating WSDL files</h1>
-<div><div class="section"><p>If you have created a WSDL file through the Web services wizard
-the WSDL that is generated should be valid. However, if you have imported
-a WSDL file, or if you are creating a WSDL file, you should validate the WSDL
-to ensure it is valid.</p>
-<p>If you have selected Require or Suggest WS-I
-Compliance on the WS-I Compliance preference page, the validation also checks
-WS-I compliance. If you have selected Ignore WS-I Compliance the validator
-will only check the validity of the WSDL. For more information on setting
-WS-I compliance levels, refer to:  <a href="../../org.eclipse.jst.ws.doc.user/tasks/twsicomply.html"> Setting the level of WS-I compliance</a>.</p>
-<p>The WSDL
-Validator compares the WSDL file in your project to the W3C  <a href="http://www.w3.org/TR/wsdl" target="_blank">Web Services Description
-Language (WSDL) 1.1</a> specifications, and the WS-I compliance settings
-that you have selected.</p>
-<p>To validate your WSDL, complete the following
-steps:</p>
-</div>
-<ol><li><span>Select a WSDL file in the  <strong>Project Navigator</strong> view.</span></li>
-<li><span>Right-click the WSDL file, and select  <strong>Validate WSDL file.</strong></span></li>
-</ol>
-<div class="section">Any problems encountered while validating the file will be shown in
-the  <strong>Tasks</strong> view.<p>When you rebuild a project or save a resource, the
-WSDL Validator can be set to run automatically. To do this, from the Window
-menu, select  <strong>Preferences</strong> &gt;  <strong>Validation</strong>. Ensure that the check
-box beside WSDL Validator is selected.</p>
-</div>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsdl.html">WSDL</a></div>
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.html">WS-I</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/tasks/twsicomply.html">Setting WS-I compliance</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html b/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html
deleted file mode 100644
index 08287c1..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html
+++ /dev/null

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Validating WS-I Web service traffic compliance</title>
-</head>
-<body id="twsival"><a name="twsival"><!-- --></a>
-
-<h1 class="topictitle1">Validating WS-I Web service traffic compliance</h1>
-<div><p>As well as setting the level of WS-I compliance during Web services
-creation, you can validate WS-I compliance of the SOAP traffic a Web service
-produces through the TCP/IP Monitor.</p>
-<div class="p"> Prerequisites:  Before you can use the validation tool to ensure
-that your Web service SOAP traffic is WS-I compliant, you must have completed
-the following steps:<ul><li>Generate a Web service.</li>
-<li> <a href="twsdlval.html">Validate the WSDL that is produced.</a> </li>
-<li>Generate a Proxy and a sample application. </li>
-<li> <a href="tmonitor.html">Set up the TCP/IP Monitor.</a> Ensure that
-your Web service sample application traffic is directed through the TCP/IP
-Monitor.</li>
-</ul>
-</div>
-<div class="section"><p>To validate your Web service, complete the following steps:</p>
-</div>
-<ol><li><span>Invoke a method in your Web service sample application to generate
-traffic through the TCP/IP Monitor.</span></li>
-<li><span>To ensure that your Web service SOAP traffic is WS-I compliant,
-you can generate a log file by clicking the  <img src="../images/wsivalico.gif" alt="Validate icon" /> icon.</span></li>
-<li><span>In the dialog box that opens, select a name for the log file and
-specify where you want it to be stored.</span></li>
-</ol>
-<div class="section"> This log file will show whether or not messages sent to and from
-your Web service are WS-I compliant, and list any non-compliant elements.
-You can open the log file in an XML editor to examine its contents.</div>
-</div>
-<div>
-<div class="linklist"><strong>Related Concepts</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/concepts/cwsiover.html">WS-I</a></div></div>
-
-<div class="linklist"><strong>Related Tasks</strong><br />
-
-<div><a href="../../org.eclipse.jst.ws.doc.user/tasks/twsicomply.html">Setting the level of WS-I compliance</a></div></div>
-</div>
-</body>
-</html>
\ No newline at end of file

diff --git a/docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.xml b/docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.xml
deleted file mode 100644
index 0081741..0000000
--- a/docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.xml
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="wswsitest" link_to="../org.eclipse.jst.ws.doc.user/webservice_toc.xml#wswsitest" topic="tasks/twsdlval.html">
-   <topic label="Validating WSDL files" href="tasks/twsdlval.html"/>
-   <topic label="Using the TCP/IP Monitor to test Web services" href="tasks/tmonitor.html"/>
-   <topic label="Validating WS-I Web service traffic compliance" href="tasks/twsival.html"/>
-</toc>
\ No newline at end of file

diff --git a/features/org.eclipse.wst.ws_core.feature/.project b/features/org.eclipse.wst.ws_core.feature/.project
deleted file mode 100644
index 5effa78..0000000
--- a/features/org.eclipse.wst.ws_core.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws_core.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/features/org.eclipse.wst.ws_core.feature/build.properties b/features/org.eclipse.wst.ws_core.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.wst.ws_core.feature/build.properties
+++ /dev/null

@@ -1 +0,0 @@
-bin.includes = feature.xml

diff --git a/features/org.eclipse.wst.ws_core.feature/feature.xml b/features/org.eclipse.wst.ws_core.feature/feature.xml
deleted file mode 100644
index 07ddd2b..0000000
--- a/features/org.eclipse.wst.ws_core.feature/feature.xml
+++ /dev/null

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.ws_core.feature"
-      label="org.eclipse.wst.ws_core.feature"
-      version="1.0.0">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.apache.axis.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.apache.wsil4j.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.uddi4j.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.wsdl4j.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.common_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.apache.xerces.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.apache.wsil4j.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.wst.xml_core.feature" version="1.0.0"/>
-      <import feature="org.eclipse.wst.common_core.feature" version="1.0.0"/>
-      <import feature="org.apache.axis.feature" version="1.2.1"/>
-      <import feature="org.apache.wsil4j.feature" version="1.0.0"/>
-      <import feature="org.uddi4j.feature" version="2.0.3"/>
-      <import feature="org.apache.xerces.feature" version="2.7.0"/>
-      <import feature="org.wsdl4j.feature" version="1.4.0"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.ws"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.ws.parser"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.wsdl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/features/org.eclipse.wst.ws_sdk.feature/.project b/features/org.eclipse.wst.ws_sdk.feature/.project
deleted file mode 100644
index 87ebee7..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/features/org.eclipse.wst.ws_sdk.feature/build.properties b/features/org.eclipse.wst.ws_sdk.feature/build.properties
deleted file mode 100644
index d8035f9..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml
-
-generate.plugin@org.eclipse.wst.ws.source=org.eclipse.wst.ws_ui.feature
-

diff --git a/features/org.eclipse.wst.ws_sdk.feature/feature.xml b/features/org.eclipse.wst.ws_sdk.feature/feature.xml
deleted file mode 100644
index 669b2e2..0000000
--- a/features/org.eclipse.wst.ws_sdk.feature/feature.xml
+++ /dev/null

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.ws_sdk.feature"
-      label="org.eclipse.wst.ws_sdk.feature"
-      version="1.0.0">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.wst.common_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.ws_ui.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.wst.common_sdk.feature" version="1.0.0"/>
-      <import feature="org.eclipse.wst.xml_sdk.feature" version="1.0.0"/>
-      <import feature="org.eclipse.wst.ws_ui.feature" version="1.0.0"/>
-   </requires>
-
-</feature>

diff --git a/features/org.eclipse.wst.ws_tests.feature/.cvsignore b/features/org.eclipse.wst.ws_tests.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-build.xml

diff --git a/features/org.eclipse.wst.ws_tests.feature/.project b/features/org.eclipse.wst.ws_tests.feature/.project
deleted file mode 100644
index cae2354..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws_tests.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/features/org.eclipse.wst.ws_tests.feature/build.properties b/features/org.eclipse.wst.ws_tests.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/build.properties
+++ /dev/null

@@ -1 +0,0 @@
-bin.includes = feature.xml

diff --git a/features/org.eclipse.wst.ws_tests.feature/feature.xml b/features/org.eclipse.wst.ws_tests.feature/feature.xml
deleted file mode 100644
index d586665..0000000
--- a/features/org.eclipse.wst.ws_tests.feature/feature.xml
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.ws_tests.feature"
-      label="org.eclipse.wst.ws_tests.feature"
-      version="1.0.0">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.test" version="3.1.0"/>
-      <import feature="org.eclipse.wst.ws_ui.feature" version="1.0.0"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.ws.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.wsdl.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.wsdl.tests.performance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.wsdl.tests.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.wsdl.validation.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.wsi.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>

diff --git a/features/org.eclipse.wst.ws_ui.feature/.cvsignore b/features/org.eclipse.wst.ws_ui.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-build.xml

diff --git a/features/org.eclipse.wst.ws_ui.feature/.project b/features/org.eclipse.wst.ws_ui.feature/.project
deleted file mode 100644
index c03a8b0..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws_ui.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/features/org.eclipse.wst.ws_ui.feature/build.properties b/features/org.eclipse.wst.ws_ui.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/build.properties
+++ /dev/null

@@ -1 +0,0 @@
-bin.includes = feature.xml

diff --git a/features/org.eclipse.wst.ws_ui.feature/feature.xml b/features/org.eclipse.wst.ws_ui.feature/feature.xml
deleted file mode 100644
index 4ac2381..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/feature.xml
+++ /dev/null

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.ws_ui.feature"
-      label="org.eclipse.wst.ws_ui.feature"
-      version="1.0.0">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.wst.ws_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_ui.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.wst.xml_ui.feature" version="1.0.0"/>
-      <import feature="org.eclipse.wst.ws_core.feature" version="1.0.0"/>
-      <import feature="org.apache.xerces.feature" version="2.7.0"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.ws.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.ws.explorer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.ws.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.wsdl.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.wsdl.validation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.wsi.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.wsi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>

diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index dae413b..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null

@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null

@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-

diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 720ca87..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings

-# contains fill-ins for about.properties

-# java.io.Properties file (ISO 8859-1 with "\" escapes)

-# This file does not need to be translated.

-

-0=@build@
\ No newline at end of file

diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 88a06c5..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null

@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools SDK\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-

diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 4580e1d..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null

@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-#
-# Note, this is the template files used to create the
-# org.eclipse.wst.source plugin
-#
-# see org.eclipse.wst.sdk feature and its 
-# build.properites file for the the generate statement
-# generate.plugin@org.eclipse.wst.source=org.eclipse.wst
-#
-#
-# The plugin.xml and manifest.mf files are created 
-# automatically by the build process, but, apparently
-# still need to be "included" in the bin spec. 
-# note: do not use src.includes, as this "doubles" source!
-#
-#
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/*
-#src/**/*.zip, src/**/schema/*.exsd
-sourcePlugin = true
\ No newline at end of file

diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ

diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ

diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index d1f9286..0000000
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Web Standard Tools SDK - Web Services Component
-providerName=Eclipse.org

diff --git a/features/org.eclipse.wst.ws_userdoc.feature/.project b/features/org.eclipse.wst.ws_userdoc.feature/.project
deleted file mode 100644
index fd5675e..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws_userdoc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/features/org.eclipse.wst.ws_userdoc.feature/build.properties b/features/org.eclipse.wst.ws_userdoc.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/build.properties
+++ /dev/null

@@ -1 +0,0 @@
-bin.includes = feature.xml

diff --git a/features/org.eclipse.wst.ws_userdoc.feature/feature.xml b/features/org.eclipse.wst.ws_userdoc.feature/feature.xml
deleted file mode 100644
index fd00f92..0000000
--- a/features/org.eclipse.wst.ws_userdoc.feature/feature.xml
+++ /dev/null

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.ws_userdoc.feature"
-      label="org.eclipse.wst.ws_userdoc.feature"
-      version="1.0.0">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.wst.xml_userdoc.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.wsdl.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.wsi.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.wsdleditor.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>

diff --git a/tests/org.eclipse.jst.ws.tests.performance/.classpath b/tests/org.eclipse.jst.ws.tests.performance/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/tests/org.eclipse.jst.ws.tests.performance/.cvsignore b/tests/org.eclipse.jst.ws.tests.performance/.cvsignore
deleted file mode 100644
index 60463af..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-build.xml

diff --git a/tests/org.eclipse.jst.ws.tests.performance/.project b/tests/org.eclipse.jst.ws.tests.performance/.project
deleted file mode 100644
index 088e1a8..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.tests.performance</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
deleted file mode 100644
index c4189af..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Axis Perfmsr Plug-in
-Bundle-SymbolicName: org.eclipse.jst.ws.tests.performance
-Bundle-Version: 0.7.0
-Bundle-ClassPath: axisPerfmsr.jar
-Bundle-Activator: org.eclipse.jst.ws.tests.performance.plugin.PerformancePlugin
-Bundle-Vendor: IBM
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr,
- org.eclipse.jst.ws.tests.performance,
- org.eclipse.jst.ws.tests.performance.plugin
-Require-Bundle: org.eclipse.jst.ws,
- org.eclipse.jst.j2ee.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.wst.server.core,
- org.junit,
- org.eclipse.jst.ws.tests,
- org.eclipse.jem.util,
- org.eclipse.test.performance,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.modulecore
-Eclipse-AutoStart: true

diff --git a/tests/org.eclipse.jst.ws.tests.performance/about.html b/tests/org.eclipse.jst.ws.tests.performance/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.ws.tests.performance/build.properties b/tests/org.eclipse.jst.ws.tests.performance/build.properties
deleted file mode 100644
index bf17c58..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/build.properties
+++ /dev/null

@@ -1,9 +0,0 @@
-bin.includes = build.xml,\
-               plugin.xml,\
-               test.xml,\
-               axisPerfmsr.jar,\
-               META-INF/,\
-               about.html
-jars.compile.order = axisPerfmsr.jar
-source.axisPerfmsr.jar = src/
-output.axisPerfmsr.jar = bin/

diff --git a/tests/org.eclipse.jst.ws.tests.performance/plugin.xml b/tests/org.eclipse.jst.ws.tests.performance/plugin.xml
deleted file mode 100644
index 7bf65fb..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/plugin.xml
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-</plugin>

diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java
deleted file mode 100644
index 28fc8ee..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java
+++ /dev/null

@@ -1,148 +0,0 @@
-package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-/**
- * Bottom up performance scenario with Axis and Tomcat v5.0
- */
-public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test {
-	// Constants
-    private final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
-	private final String PROJECT_NAME = "TestBUWeb";
-    private final String WEB_MODULE_NAME = "TestBUWebModule";
-
-	private IFile sourceFile_;
-	
-  /**
-   * Sets up the input data;
-   * - create project(s),
-   * - copy resources to workspace 
-   */
-	protected void installInputData() throws Exception
-	{
-		// Create a Web project (TestWeb) targetted to Tomcat 5.0
-		IStatus s = JUnitUtils.createWebModule(PROJECT_NAME, WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_3_ID), env_, null);
-		if (s.getSeverity() != Status.OK) {
-		  System.out.println("Error: "+s.getMessage());
-			throw new Exception(s.getException());
-		}
-		IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
-		assertTrue(webProject.exists());
-
-		
-		// Copy the contents of data/<test name> to the Web project's source folder.
-		// <Web Project>/JavaSource/foo/Echo.java
-		//IFolder destFolder = JUnitUtils.getSourceFolderForWebProject(WEB_PROJECT_NAME);
-        IPath destPath = ResourceUtils.getJavaSourceLocation(webProject);
-        IFolder folder = (IFolder)ResourceUtils.findResource(destPath);
-		JUnitUtils.copyTestData("BUJava/src",folder,env_, null);
-		sourceFile_ = folder.getFile(new Path("foo/Echo.java"));
-		assertTrue(sourceFile_.exists());
-		
-		// Ensure that Echo.class is built in:
-		// <Web Project>/WebContent/WEB-INF/classes/foo/Echo.class
-		JUnitUtils.syncBuildProject(webProject,env_, null);
-		//assertTrue(JUnitUtils.getClassesFolderForWebProject(WEB_PROJECT_NAME).getFile(new Path("foo/Echo.class")).exists());
-		
-		
-	}
-	
-  /**
-   * Set the persistent server runtime context preferences
-   */  
-	protected void initJ2EEWSRuntimeServerDefaults() throws Exception
-	{
-		// Set default preferences for J2EE 1.4 Axis and Tomcat 5.0
-		JUnitUtils.setJ2EEWSRuntimeServer(String.valueOf(J2EEVersionConstants.J2EE_1_3_ID), WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);		
-	}
-	
-  /**
-   * Set the initial selection
-   */
-	protected void initInitialSelection() throws Exception
-	{
-		initialSelection_ = new StructuredSelection(sourceFile_);
-	}
-	
-  /**
-   * Launches the pop-up command to initiate the scenario
-   * @throws Exception
-   */  
-	public void testBUJavaAxisTC50() throws Exception
-	{
-	  	IStatus status = Status.OK_STATUS;
-	    IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
-	    JUnitUtils.disableWSIDialog(webProject);
-
-	    Performance perf= Performance.getDefault();
-	    PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));	    
-	    try {
-    
-	      performanceMeter.start();
-	      status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_BOTTOM_UP,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
-	      performanceMeter.stop();
-
-	      performanceMeter.commit();
-	      perf.assertPerformance(performanceMeter);
-	    }
-	    finally {
-			performanceMeter.dispose();
-	 	}
-		
-		if (status.getSeverity() == Status.OK)
-		  verifyOutput();
-		else
-		  throw new Exception(status.getException());
-		
-	}
-	
-  /**
-   * Verify the scenario completed successfully
-   * @throws Exception
-   */
-	private final void verifyOutput() throws Exception
-	{
-        IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);    
-		IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
-    
-        IFolder wsdlFolder = webContentFolder.getFolder("wsdl");
-		assertTrue(wsdlFolder.exists());
-		assertTrue(wsdlFolder.members().length > 0);
-		assertTrue(webContentFolder.getFolder("wsdl").members().length > 0);
-    
-        //TODO Check if wsdd contains new Web service
-        //TODO Check if Web serivce can be invoked by a client
-	}
-	
-  /**
-   * Clear workspace if necessary
-   */
-	protected void deleteInputData() throws Exception
-	{
-		// Remove the EAR from the server.
-		IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
-		//JUnitUtils.removeModuleFromServer(server_,webProject,env_);
-		
-		// Delete the Web project.
-		webProject.delete(true,true, null);
-        assertFalse(webProject.exists());
-		
-	}
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java
deleted file mode 100644
index 3ce91d2..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java
+++ /dev/null

@@ -1,135 +0,0 @@
-package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-/**
- * Client performance scenario with Axis and Tomcat v5.0
- */
-public class PerfmsrClientAxisTC50 extends WSWizardTomcat50Test {
-
-  private final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
-  
-	private final String CLIENT_PROJECT_NAME = "TestWebClient";
-  private final String CLIENT_WEB_MODULE_NAME =  "TestWebClientModule";
-
-	private IFile sourceFile_;
-
-	/**
-   * Sets up the input data;
-   * - create project(s),
-   * - copy resources to workspace 
-	 */
-	protected void installInputData() throws Exception {
-		
-		// Create an associated Web project (TestWeb) targetted to Tomcat v5.0 
-		IStatus s = JUnitUtils.createWebModule(CLIENT_PROJECT_NAME, CLIENT_WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), env_, null);
-		if (s.getSeverity() != Status.OK)
-			throw new Exception(s.getException());
-    
-		IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
-		assertTrue(webProject.exists());
-
-        // Copy Echo.wsdl file to WebContent folder
-        IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);
-		JUnitUtils.copyTestData("TDJava",destFolder,env_, null);
-		sourceFile_ = destFolder.getFile(new Path("Echo.wsdl"));
-		assertTrue(sourceFile_.exists());
-
-
-	}
-
-  /**
-   * Set the persistent server runtime context preferences
-   */
-	protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
-        // Set default preferences for J2EE 1.4 Axis and Tomcat 5.0    
-		JUnitUtils.setJ2EEWSRuntimeServer(String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
-	}
-
-  /**
-   * Set the initial selection
-   */
-	protected void initInitialSelection() throws Exception {
-		initialSelection_ = new StructuredSelection(sourceFile_);
-	}
-
-  /**
-   * Launches the pop-up command to initiate the scenario
-   * @throws Exception
-   */
-	public void testClientAxisTC50() throws Exception
-	{	
-	  	IStatus status = Status.OK_STATUS;
-	  	
-		JUnitUtils.enableProxyGeneration(true);
-		JUnitUtils.enableOverwrite(true);
-		Performance perf= Performance.getDefault();
-		PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));	    
-	    try {
-    
-	      performanceMeter.start();
-	      status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_CLIENT,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
-	      performanceMeter.stop();
-	      performanceMeter.commit();
-	      perf.assertPerformance(performanceMeter);
-	    }
-	    finally {
-			performanceMeter.dispose();
-	 	}
-	    
-		if (status.getSeverity() == Status.OK) {
-		  verifyOutput();
-		} else {
-		  throw new Exception(status.getException());
-		}
-
-	}
-	
-  /**
-   * Verify the scenario completed succesfully
-   * @throws Exception
-   */
-	private final void verifyOutput() throws Exception {
-        IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
-    
-        IPath destPath = ResourceUtils.getJavaSourceLocation(webProject);
-        IFolder srcFolder = (IFolder)ResourceUtils.findResource(destPath);
-    
-		//IFolder srcFolder = JUnitUtils.getSourceFolderForWebProject(CLIENT_PROJECT_NAME);
-		IFolder folder = srcFolder.getFolder("foo");
-		assertTrue(folder.exists());
-		assertTrue(folder.members().length > 0);
-		
-		//TODO Check that the client runs    
-
-	}
-	
-  /**
-   * Remove workspace if necessary
-   */
-	protected void deleteInputData() throws Exception {
-
-		// Delete the Web project.
-		IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
-		webProject.delete(true,true, null);
-		
-	}
-
-}

diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java
deleted file mode 100644
index a1b6a74..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java
+++ /dev/null

@@ -1,125 +0,0 @@
-package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-/**
- * Top down performance scenario with Axis and Tomcat v5.0
- */
-public class PerfmsrTDJavaAxisTC50 extends WSWizardTomcat50Test {
-
-  private final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
-  
-  private final String WEB_MODULE_NAME = "TestTDWebModule";  
-  private final String PROJECT_NAME = "TestTDProject";
-  private IFile sourceFile_;
-	
-
-  /**
-   * Sets up the input data;
-   * - create project(s),
-   * - copy resources to workspace 
-   */  
-	protected void installInputData() throws Exception {
-
-		// Create an associated Web project (TestWeb) targetted to Tomcat 5.0
-		IStatus s = JUnitUtils.createWebModule(PROJECT_NAME, WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), env_, null);
-		if (s.getSeverity() != Status.OK)
-			throw new Exception(s.getException());
-    
-		IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
-		assertTrue(webProject.exists());
-
-		IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);		
-		JUnitUtils.copyTestData("TDJava",destFolder,env_, null);
-		sourceFile_ = destFolder.getFile(new Path("Echo.wsdl"));
-		assertTrue(sourceFile_.exists());
-
-	}
-
-  /**
-   * Set the persistent server runtime context preferences
-   */  
-	protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
-		// Set default preferences for J2EE 1.4, Axis and Tomcat v5.0 server
-		JUnitUtils.setJ2EEWSRuntimeServer(String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);		
-	}
-
-  /**
-   * Set the initial selection
-   */  
-	protected void initInitialSelection() throws Exception {
-		initialSelection_ = new StructuredSelection(sourceFile_);
-
-	}
-
-  /**
-   * Launches the pop-up command to initiate the scenario
-   * @throws Exception
-   */  
-	public void testTDJavaAxisTC50() throws Exception {
-	  
-	  IStatus status = Status.OK_STATUS;
-		Performance perf= Performance.getDefault();
-		PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));	    
-	    try {
-    
-	      performanceMeter.start();
-	      status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_TOP_DOWN,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
-	      performanceMeter.stop();
-	      performanceMeter.commit();
-	      perf.assertPerformance(performanceMeter);
-	    }
-	    finally {
-			performanceMeter.dispose();
-	 	}
-		if (status.getSeverity() == Status.OK)
-		  verifyOutput();
-		else
-		  throw new Exception(status.getException());
-
-	}
-
-  /**
-   * Verify the scenario completed successfully
-   * @throws Exception
-   */
-	private final void verifyOutput() throws Exception
-	{
-        IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);    
-        IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject);    
-    
-		
-		IFolder wsdlFolder = webContentFolder.getFolder("wsdl");
-		assertTrue(wsdlFolder.exists());
-		assertTrue(wsdlFolder.members().length > 0);
-
-        //TODO Verify that wsdd contains this Web service
-        //TODO Verify that the service can be invoked by a client
-	}
-	
-  /**
-   * Clear workspace if required
-   */
-	protected void deleteInputData() throws Exception {
-		// Delete the Web project.
-		IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
-		webProject.delete(true,true,null);
-		
-	}
-
-}

diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java
deleted file mode 100644
index 1701022..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50;
-
-public class AllPerformanceTests {
-  public static Test suite() {
-    
-    // TODO: Create a test suite 
-    TestSuite suite = new TestSuite("Test for org.eclipse.jst.ws.tests.performance");
-    //$JUnit-BEGIN$
-    suite.addTestSuite(PerfmsrBUJavaAxisTC50.class);
-    suite.addTestSuite(PerfmsrTDJavaAxisTC50.class);
-    suite.addTestSuite(PerfmsrClientAxisTC50.class);
-    //$JUnit-END$
-    return suite;
-  }
-}

diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java
deleted file mode 100644
index 31f6077..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java
+++ /dev/null

@@ -1,71 +0,0 @@
-package org.eclipse.jst.ws.tests.performance.plugin;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class PerformancePlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static PerformancePlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public PerformancePlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.internal.test.performance.PerformancePlugin");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PerformancePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = PerformancePlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}

diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java
deleted file mode 100644
index f48f1a3..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java
+++ /dev/null

@@ -1,77 +0,0 @@
-package org.eclipse.jst.ws.tests.performance.util;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.common.environment.ILog;
-
-
-public class EclipsePerformanceLog implements ILog {
-
-  private boolean runState = false;
-  Performance perf = null;      
-  PerformanceMeter performanceMeter= null;  
-  
-  public boolean isEnabled() {
-    // TODO Auto-generated method stub
-    return false;
-  }
-
-  public boolean isEnabled(String option) {
-    // TODO Auto-generated method stub
-    return false;
-  }
-  
-  public void log(int severity, int messageNum, Object caller, String method, Throwable throwable) {
-    // TODO Auto-generated method stub
-
-  }
-
-  public void log(int severity, String option, int messageNum, Object caller, String method, Throwable throwable) {
-    // TODO Auto-generated method stub
-
-  }
-
-  public void log(int severity, int messageNum, Object caller, String method, IStatus status) {
-    // TODO Auto-generated method stub
-
-  }
-
-  public void log(int severity, String option, int messageNum, Object caller, String method, IStatus status) {
-    // TODO Auto-generated method stub
-
-  }
-
-  public void log(int severity, int messageNum, Object caller, String method, Object object) {
-    // TODO Auto-generated method stub
-
-  }
-
-  public void log(int severity, String option, int messageNum, Object caller, String method, Object object) {
-    
-    if (method.equals("runCommand")) {
-
-      try {
-        if (!runState) {
-          // begin performance recording
-          perf = Performance.getDefault();      
-          performanceMeter = perf.createPerformanceMeter(((String)object).toString());          
-          performanceMeter.start();
-          runState = true;
-        }
-        else {
-          // end performance recording
-          performanceMeter.stop();
-          performanceMeter.commit();
-          perf.assertPerformance(performanceMeter);
-          performanceMeter.dispose();
-          runState = false;
-        }
-      }
-      catch(Exception e) {
-        // handle exception
-      }        
-    }
-  }
-
-}

diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java
deleted file mode 100644
index 029a0a1..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.performance.util;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.tests.util.AccumulateStatusHandler;
-import org.eclipse.jst.ws.tests.util.DynamicPopupJUnitWizard;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-
-
-public class PerformanceJUnitUtils {
-  
-	private static IStatus launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
-	{
-		IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.popupMenus").getExtensions();
-		for (int i=0;i<extensions.length;i++)
-		{
-			if (extensions[i].getNamespace().equals(pluginNS));
-			{
-				IConfigurationElement[] configElements = extensions[i].getConfigurationElements();
-				for (int j=0;j<configElements.length;j++)
-				{
-					if (configElements[j].getAttribute("id").equals(wizardId) && configElements[j].getAttribute("objectClass").equals(objectClassId))
-					{
-						IConfigurationElement actionElement = configElements[j].getChildren()[0];
-						AccumulateStatusHandler statusHandler = new AccumulateStatusHandler();
-                        // Use this to enable per command performance measurements
-                        //DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler, log);
-						DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler);
-						wizard.setInitializationData(actionElement,null,null);
-						wizard.selectionChanged(null,initialSelection);
-						wizard.run(null);
-						return statusHandler.getStatus();
-					}
-				}
-			}
-		}
-		return StatusUtils.errorStatus( "No wizard found for: " );
-	}
-	
-	public static IStatus launchCreationWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
-	{
-		return launchWizard("org.eclipse.jst.ws.creation.ui",wizardId,objectClassId,initialSelection);
-	}
-	
-	public static IStatus launchConsumptionWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
-	{
-		return launchWizard("org.eclipse.jst.ws.internal.consumption.ui",wizardId,objectClassId,initialSelection);
-	}
-	
-}

diff --git a/tests/org.eclipse.jst.ws.tests.performance/test.xml b/tests/org.eclipse.jst.ws.tests.performance/test.xml
deleted file mode 100644
index 183b4ea..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/test.xml
+++ /dev/null

@@ -1,189 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="performance" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
-	<echo message="basedir ${basedir}" />
-	<echo message="eclipse place ${eclipse-home}" />
-	
-  <!-- sets the properties plugin-name, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jst.ws.tests.performance"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-  <property name="perf-tests-file" value="${testDir}/performance-tests.xml"/>
-  <property name="workspace" value="${eclipse-home}/workspace_ws_performance"/>
-  <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/>
-      
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-      <delete dir="${workspace}" quiet="true"/>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="performance_suite">
-  	
-  	<!-- Iteration 1 -->
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>  	
-  	
-  	<!-- Iteration 2 -->
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>  	
-
-  	<!-- Iteration 3 -->
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>  	
-
-  	<!-- Iteration 4 -->
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>  	
-
-  	<!-- Iteration 5 -->
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>
-  	
-    <delete dir="${workspace}" quiet="true"/>    	
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
-      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>      
-    </ant>  	
-  	
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-    <delete dir="${workspace}" quiet="true"/>  
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="performance" depends="init,performance_suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org.eclipse.jst.ws.tests.performance*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-</project>

diff --git a/tests/org.eclipse.jst.ws.tests/.classpath b/tests/org.eclipse.jst.ws.tests/.classpath
deleted file mode 100644
index 9f4b4d1..0000000
--- a/tests/org.eclipse.jst.ws.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="tests"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/tests/org.eclipse.jst.ws.tests/.cvsignore b/tests/org.eclipse.jst.ws.tests/.cvsignore
deleted file mode 100644
index 60463af..0000000
--- a/tests/org.eclipse.jst.ws.tests/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-build.xml

diff --git a/tests/org.eclipse.jst.ws.tests/.project b/tests/org.eclipse.jst.ws.tests/.project
deleted file mode 100644
index fe80d54..0000000
--- a/tests/org.eclipse.jst.ws.tests/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index c67dbf1..0000000
--- a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Java Web Services Tools Tests
-Bundle-SymbolicName: org.eclipse.jst.ws.tests
-Bundle-Version: 0.7.0
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.jst.ws.tests.plugin.TestsPlugin
-Bundle-Vendor: IBM
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.tests,
- org.eclipse.jst.ws.tests.axis.tomcat.v50,
- org.eclipse.jst.ws.tests.plugin,
- org.eclipse.jst.ws.tests.unittest,
- org.eclipse.jst.ws.tests.util
-Require-Bundle: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit,
- org.eclipse.wst.ws.ui,
- org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.wst.server.core,
- org.eclipse.jem.util,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.tests
-Eclipse-AutoStart: true

diff --git a/tests/org.eclipse.jst.ws.tests/about.html b/tests/org.eclipse.jst.ws.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.ws.tests/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.ws.tests/build.properties b/tests/org.eclipse.jst.ws.tests/build.properties
deleted file mode 100644
index f40af6d..0000000
--- a/tests/org.eclipse.jst.ws.tests/build.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-bin.includes = build.xml,\
-               data/,\
-               plugin.xml,\
-               readme.txt,\
-               tests.jar,\
-               META-INF/,\
-               test.xml,\
-               about.html
-jars.compile.order = tests.jar
-source.tests.jar = tests/
-output.tests.jar = bin/

diff --git a/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp b/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp
deleted file mode 100644
index 7b0e3b3..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp
+++ /dev/null

@@ -1,38 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="java.io.*" %>
-<jsp:useBean id="echoProxy" class="foo.EchoProxy" scope="request"/>
-<html>
-<%@ include file = "/outputFilePath.jspf" %>
-<%
-   // HTTP/POST parameter:
-   // testInput - the String argument to call the proxy with.
-   String testInput = request.getParameter("testInput");
-   
-   // Execute the Web service.
-   String result = echoProxy.echoString(testInput);
-   
-   // Write the result to the outputFilePath.
-   PrintWriter pw = null;
-   try
-   {
-     pw = new PrintWriter(new FileOutputStream(outputFilePath));
-     pw.print(result);
-     pw.flush();
-   }   
-   catch (Exception e)
-   {
-   }
-   finally
-   {
-     if (pw != null)
-       pw.close();
-   }
-%>
-</body>
-<p>
-testInput: <%=testInput%>
-<p>
-outputFilePath: <%=outputFilePath%>
-<p>
-The result is <%=result%>
-</body>
-</html>
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java b/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java
deleted file mode 100644
index 4e893d2..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java
+++ /dev/null

@@ -1,9 +0,0 @@
-package foo;
-
-public class Echo
-{
-	public String echoString(String input)
-	{
-		return input;
-	}
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl b/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl
deleted file mode 100644
index 46df32f..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl
+++ /dev/null

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://foo" xmlns:impl="http://foo" xmlns:intf="http://foo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <wsdl:types>
-  <schema targetNamespace="http://foo" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:impl="http://foo" xmlns:intf="http://foo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-   <element name="echoStringResponse">
-    <complexType>
-     <sequence>
-      <element name="echoStringReturn" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="echoString">
-    <complexType>
-     <sequence>
-      <element name="input" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-  </schema>
- </wsdl:types>
-
-   <wsdl:message name="echoStringResponse">
-
-      <wsdl:part element="impl:echoStringResponse" name="parameters"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="echoStringRequest">
-
-      <wsdl:part element="impl:echoString" name="parameters"/>
-
-   </wsdl:message>
-
-   <wsdl:portType name="Echo">
-
-      <wsdl:operation name="echoString">
-
-         <wsdl:input message="impl:echoStringRequest" name="echoStringRequest"/>
-
-         <wsdl:output message="impl:echoStringResponse" name="echoStringResponse"/>
-
-      </wsdl:operation>
-
-   </wsdl:portType>
-
-   <wsdl:binding name="EchoSoapBinding" type="impl:Echo">
-
-      <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-      <wsdl:operation name="echoString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="echoStringRequest">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="echoStringResponse">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-   </wsdl:binding>
-
-   <wsdl:service name="EchoService">
-
-      <wsdl:port binding="impl:EchoSoapBinding" name="Echo">
-
-         <wsdlsoap:address location="http://localhost:9080/TestWeb/services/Echo"/>
-
-      </wsdl:port>
-
-   </wsdl:service>
-
-</wsdl:definitions>

diff --git a/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip b/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip
deleted file mode 100644
index 18618f5..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip
+++ /dev/null
Binary files differ

diff --git a/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf b/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf
deleted file mode 100644
index c8a7aec..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf
+++ /dev/null

@@ -1,6 +0,0 @@
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>  
-<%
-   String outputFilePath = request.getParameter("outputFilePath");
-%>   
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.ws.tests/plugin.xml b/tests/org.eclipse.jst.ws.tests/plugin.xml
deleted file mode 100644
index 7bf65fb..0000000
--- a/tests/org.eclipse.jst.ws.tests/plugin.xml
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-</plugin>

diff --git a/tests/org.eclipse.jst.ws.tests/readme.txt b/tests/org.eclipse.jst.ws.tests/readme.txt
deleted file mode 100644
index 8329546..0000000
--- a/tests/org.eclipse.jst.ws.tests/readme.txt
+++ /dev/null

@@ -1,5 +0,0 @@
-The arguments to be passed in are: 
-
--Dorg.eclipse.jst.server.tomcat.50=E:\\Tomcat\\Tomcat5.0
-
-, where "org.eclipse.jst.server.tomcat.50" is the install directory of your Tomcat v5.0 server.

diff --git a/tests/org.eclipse.jst.ws.tests/test.xml b/tests/org.eclipse.jst.ws.tests/test.xml
deleted file mode 100644
index 57e4c58..0000000
--- a/tests/org.eclipse.jst.ws.tests/test.xml
+++ /dev/null

@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
-	<echo message="basedir ${basedir}" />
-	<echo message="eclipse place ${eclipse-home}" />
-  <!-- sets the properties plugin-name, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jst.ws.tests"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-  <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/>
-	
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="jst-ws-folder" value="${eclipse-home}/jst_ws_folder"/>
-    <delete dir="${jst-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jst-ws-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.unittest.AllWSJUnitTests" />
-   	  <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-   	  <property name="extraVMargs" value="${extraVMargs}"/>    	
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-</project>

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java
deleted file mode 100644
index 2422186..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java
+++ /dev/null

@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests;
-
-import junit.framework.TestCase;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-
-public abstract class WSWizardTest extends TestCase
-{
-	protected IEnvironment env_;
-	protected IRuntime serverRuntime_;
-	protected IServer server_;
-	protected IStructuredSelection initialSelection_;
-  
-  public String defaultURL_ = "http://localhost:8080/";
-	
-	/**
-	 * Set up the workspace for the Web Service Wizard JUnit test. Setup consists of the following steps:
-	 * 1) Obtain an instance of the environment.
-	 * 2) Install the server runtime.
-	 * 3) Install the input data. This may include projects, source files etc.
-	 * 4) Install an instance of the server if required. This may also include configuration of the input data on the server.
-	 * 5) Initialize the J2EE, Web Service Runtime and Server type defaults for the Web Service wizard to use.
-	 * 6) Initialize the initial selection object to set the context for the Web Service wizard.
-	 * @throws Exception
-	 */
-	protected void setUp() throws Exception
-	{
-		// Get an instance of the default environment with the AccumulateStatusHandler to minimize UI dialog blocks.
-	  	PersistentResourceContext  resourceContext = PersistentResourceContext.getInstance();
-		EclipseStatusHandler       handler         = new EclipseStatusHandler();
-		EclipseEnvironment         environment     = new EclipseEnvironment( null, resourceContext, handler );
-	  
-		env_ = environment; 
-		assertTrue(env_ != null);
-		
-		server_ = null;
-		JUnitUtils.hideActionDialogs();
-		installServerRuntime();
-		installServer();
-		installInputData();
-		initJ2EEWSRuntimeServerDefaults();
-		initInitialSelection();
-	}
-	
-	/**
-	 * Install the server runtime.
-	 * @throws Exception
-	 */
-	protected abstract void installServerRuntime() throws Exception;
-	
-	/**
-	 * Installs the input data from an aggregator. This ensures that the environment, runtime
-	 * and server are correctly set on the aggregate since its lifecycle methods are not necessarily
-	 * called.
-	 * @param env
-	 * @param serverRuntime
-	 * @param server
-	 * @throws Exception
-	 */
-	public void installInputData(IEnvironment env,IRuntime serverRuntime,IServer server) throws Exception
-	{
-		env_ = env;
-		serverRuntime_ = serverRuntime;
-		server_ = server;
-		installInputData();
-	}
-	
-	/**
-	 * Install the input data for the test. This may include projects, source files etc.
-	 * @throws Exception
-	 */
-	protected abstract void installInputData() throws Exception;
-	
-	/**
-	 * Install an instance of the server. This may also configure input data on the server.
-	 * @throws Exception
-	 */
-	protected abstract void installServer() throws Exception;
-	
-	/**
-	 * Initialize the J2EE level, Web Service runtime type and Server defaults for the test case.
-	 * @throws Exception
-	 */
-	protected abstract void initJ2EEWSRuntimeServerDefaults() throws Exception;
-	
-	/**
-	 * Initialize the initial selection which drives the Web Service wizard. This could include source Java files,
-	 * WSDL URLs and even EJBs.
-	 * @throws Exception
-	 */
-	protected abstract void initInitialSelection() throws Exception;
-	
-	/**
-	 * Clean up the workspace. Cleanup consists of the following steps:
-	 * 1) Delete the input data. This should include removal of configuration data on the server if necessary.
-	 * 2) Stop the server.
-	 * 3) Delete the server.
-	 * 4) Delete the server runtime.
-	 */
-	protected void tearDown() throws Exception
-	{
-		stopServer();
-//		deleteServer();
-//      deleteInputData();
-//		deleteServerRuntime();
-	}
-	
-	/**
-	 * Delete the input data. This should include removal of projects, src files etc. as well as removal of any server configured data.
-	 * @throws Exception
-	 */
-	protected abstract void deleteInputData() throws Exception;
-	
-	/**
-	 * Stop the server if it is running.
-	 * @throws Exception
-	 */
-	protected void stopServer() throws Exception
-	{
-		if (server_ != null && server_.getServerState() == IServer.STATE_STARTED)
-			server_.stop(true);
-		assertTrue(server_.getServerState() == IServer.STATE_STOPPED);
-	}
-	
-	/**
-	 * Delete the server.
-	 * @throws Exception
-	 */
-	protected void deleteServer() throws Exception
-	{
-		if (server_ != null)
-			server_.delete();
-	}
-	
-	/**
-	 * Delete the server runtime.
-	 * @throws Exception
-	 */
-	protected void deleteServerRuntime() throws Exception
-	{
-		if (serverRuntime_ != null)
-			serverRuntime_.delete();
-	}
-	
-	/**
-	 * Get the default URL in the form of: http://localhost:9080/<contextRoot>/<path>
-	 * @param path - a file or URL relative path.
-	 * @param contextRoot - the context root of the Web module for this URL.
-	 * @return
-	 */
-	protected String getDefaultURL(String path,String contextRoot)
-	{
-		StringBuffer url = new StringBuffer(defaultURL_);
-		url.append(contextRoot);
-		url.append('/');
-		url.append(path);
-		return url.toString();
-	}	
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java
deleted file mode 100644
index 87d78c2..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.axis.tomcat.v50;
-
-import org.eclipse.jst.ws.tests.WSWizardTest;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-
-
-public abstract class WSWizardTomcat50Test extends WSWizardTest {
-  
-	protected final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50");
-	protected final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50";
-	protected final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50";
-	  
-
-  /* (non-Javadoc)
-   * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServerRuntime()
-   */
-  protected void installServerRuntime() throws Exception {
-
-    serverRuntime_ = JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH);
-  }
-
-
-  /* (non-Javadoc)
-   * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServer()
-   */
-  protected void installServer() throws Exception {
-
-    server_ = JUnitUtils.createServer("Apache Tomcat v50", SERVERTYPEID_TC50, serverRuntime_, env_, null );
-  }
-  
-}

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java
deleted file mode 100644
index f768255..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.plugin;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestsPlugin extends Plugin {
-	//The shared instance.
-	private static TestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public TestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.tests.plugin.TestsPlugin");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static TestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = TestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
deleted file mode 100644
index dca8726..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
+++ /dev/null

@@ -1,98 +0,0 @@
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-
-/**
- * This class is to run all the unittest tests.
- */
-public class AllWSJUnitTests extends TestCase implements WSJUnitConstants
-{
-  /**
-   * Method parseArgs.
-   * 
-   * @param args
-   */
-  private void parseArgs(Object args)
-  {
-    // typicially args is an array of strings,
-    // not sure when it wouldn't be.
-  }
-
-  public static void main(String[] args)
-  {
-    new AllWSJUnitTests().runMain(args);
-  }
-
-  
-  public Object runMain(Object args)
-  {
-    Object result = null;
-    try
-    {
-      TestRunner testRunner = null;
-
-      parseArgs(args);
-
-      testRunner = new TestRunner(System.out);
-
-      Test suite = suite();
-      TestResult testResult = testRunner.doRun(suite, false);
-      printHeader(testResult);      
-    }
-    catch (Exception e)
-    {
-      result = e;
-    }
-
-    return result;
-  }
-
-  public static Test suite()
-  {
-    JUnitUtils.enableOverwrite(true);
-    
-    TestSuite testSuite = new TestSuite();
-    testSuite.addTest( ComponentCreationTests.suite() );
-    testSuite.addTest( J2EEUtilsTests.suite() );
-   
-    String s = System.getProperty("org.eclipse.jst.server.tomcat.50");
-    if (s != null && s.length() > 0) {
-      testSuite.addTest( ServerCreationTests.suite());
-    }
-    testSuite.addTest( ResourceUtilsTests.suite() );
-
-
-    return testSuite;
-  }
-
-  /**
-   * Prints the header of the report
-   */
-  protected void printHeader(TestResult result)
-  {
-    if (result.wasSuccessful())
-    {
-      System.out.println();
-      System.out.print("OK");
-      System.out.println(" (" + result.runCount() + " tests)");
-
-    }
-    else
-    {
-      System.out.println();
-      System.out.println("FAILURES!!!");
-      System.out.println(
-        "Tests run: "
-          + result.runCount()
-          + ",  Failures: "
-          + result.failureCount()
-          + ",  Errors: "
-          + result.errorCount());
-    }
-  }
-}

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java
deleted file mode 100644
index dbc014f..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/**
- * 
- */
-package org.eclipse.jst.ws.tests.unittest;
-
-import java.io.IOException;
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.etools.common.test.apitools.ProjectUnzipUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.tests.plugin.TestsPlugin;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * Tests the various Component creation commands
- */
-public class ComponentCreationTests extends TestCase implements WSJUnitConstants {
-
-	public static Test suite(){
-		return new TestSuite(ComponentCreationTests.class);
-	}
-	
-	public void testWebComponentCreation(){
-
-        createServerRuntime();
-        createProjects();
-        //createWebModule(projectName, projectName, J2EEVersionConstants.J2EE_1_4_ID);
-        //createWebModule(project2Name, project2Name, J2EEVersionConstants.J2EE_1_3_ID);
-
-	}
-  
-	// Creates projects from the provided ZIP file.
-	public static boolean createProjects() {
-		IPath localZipPath = getLocalPath();
-		ProjectUnzipUtil util = new ProjectUnzipUtil(localZipPath, projectNames);
-		return util.createProjects();
-	}
-	
-	private static IPath getLocalPath() {
-		URL url = TestsPlugin.getDefault().find(zipFilePath);
-		try {
-			url = Platform.asLocalURL(url);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return new Path(url.getPath());
-	}	
-  
-    public void createServerRuntime(){
-      
-      try {
-        JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH);
-      }
-      catch(Exception e){
-        e.printStackTrace();
-      }      
-      
-    }
-  
-    private void createWebModule(String projectNm, String componentName, int j2eeVersion){
-
-      CreateModuleCommand cmc = new CreateModuleCommand();
-      cmc.setJ2eeLevel(new Integer(j2eeVersion).toString());
-      cmc.setModuleName(componentName);
-      cmc.setModuleType(CreateModuleCommand.WEB);
-      cmc.setProjectName(projectNm);
-      cmc.setServerFactoryId(SERVERTYPEID_TC50);
-      cmc.execute(null, null );
-      
-      System.out.println("Done creating Web component..."+projectNm);      
-      IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectNm);
-      IVirtualComponent vc = ComponentCore.createComponent(p);
-      assertTrue(vc.exists());      
-      
-    }
-    
-    public void dtestCreateEJBModule(){
-     
-      CreateModuleCommand cmc = new CreateModuleCommand();
-      cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString());
-      cmc.setModuleName(ejbComponentName);
-      cmc.setModuleType(CreateModuleCommand.EJB);
-      cmc.setProjectName(ejbProjectName);
-      cmc.setServerFactoryId(SERVERTYPEID_TC50);
-      cmc.execute(null, null );
-      
-      System.out.println("Done creating EJB component.");
-      IProject p = ResourceUtils.getWorkspaceRoot().getProject(ejbProjectName);
-      IVirtualComponent vc = ComponentCore.createComponent(p);
-      assertTrue(vc.exists());      
-    }
-    
-    public void dtestCreateAppClientModule(){
-      CreateModuleCommand cmc = new CreateModuleCommand();
-      cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString());
-      cmc.setModuleName(appClientCompName);
-      cmc.setModuleType(CreateModuleCommand.APPCLIENT);
-      cmc.setProjectName(appClientProjectName);
-      cmc.setServerFactoryId(SERVERTYPEID_TC50);
-      cmc.execute(null, null);
-      
-      System.out.println("Done creating App client component.");
-      IProject p = ResourceUtils.getWorkspaceRoot().getProject(appClientProjectName);
-      IVirtualComponent vc = ComponentCore.createComponent(p);
-      assertTrue(vc.exists());       
-    }
-
-    public void dtestCreateEARModule(){
-      CreateModuleCommand cmc = new CreateModuleCommand();
-      cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString());
-      cmc.setModuleName(earCompName);
-      cmc.setModuleType(CreateModuleCommand.EAR);
-      cmc.setProjectName(projectName);
-      cmc.setServerFactoryId(SERVERTYPEID_TC50);
-      cmc.execute(null, null);
-      
-      System.out.println("Done creating EAR component.");
-      IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectName);
-      IVirtualComponent vc = ComponentCore.createComponent(p);
-      assertTrue(vc.exists());       
-    }
-}

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java
deleted file mode 100644
index b05491e..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java
+++ /dev/null

@@ -1,205 +0,0 @@
-/**
- * 
- */
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * @author sengpl
- *
- */
-public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{
-
-    private IProject project1 = null;
-    private IProject project2 = null;
-    private IProject ejbProject = null;
-    
-    private String comp1 = webComponentName;
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		// Project and component names initialized here!
-		project1 = ProjectUtilities.getProject(projectName);
-		assertNotNull(project1);
-		
-		project2 = ProjectUtilities.getProject(project2Name);
-		assertNotNull(project2);
-    
-        ejbProject = ProjectUtilities.getProject(ejbProjectName);
-        assertNotNull(ejbProject);
-		
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		// TODO Clear the workspace
-		
-	}
-
-	 public static Test suite()
-	  {
-	    return new TestSuite(J2EEUtilsTests.class);
-	  }
-	 
-	  public void testComponentsExist(){
-		  System.out.println("< BEGIN: testComponentExists ...");
-		  IVirtualComponent vc1 = J2EEUtils.getVirtualComponent(project1);
-		  IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2.getName());
-		  
-		  assertTrue(vc1.exists());
-		  assertTrue(J2EEUtils.exists(project1));
-		  assertTrue(vc2.exists());
-		  assertTrue(J2EEUtils.exists(project2.getName(), project2Name));
-		  System.out.println("< END: testComponentExists ...");
-	  }
-	  
-	  public void testLocationGetterMethods(){
-		  
-		  System.out.println("< BEGIN: testLocationGetterMethods ...");
-		  IPath loc1 = J2EEUtils.getWebContentPath(project1);
-		  System.out.println("WebContentPath of project1 = "+loc1);
-		  IResource res = ResourceUtils.getWorkspaceRoot().findMember(loc1);
-		  assertTrue(res.exists());
-		  assertTrue(res.toString().endsWith("WebContent"));
-		  
-		  IPath loc2 = J2EEUtils.getWebContentPath(project2);
-		  System.out.println("WebContentPath of project2 = "+loc2);
-		  IResource res2 = ResourceUtils.getWorkspaceRoot().findMember(loc2);
-		  assertTrue(res2.exists());
-		  assertTrue(res2.toString().endsWith("WebContent"));		  
-		  
-		  IPath loc3 = J2EEUtils.getWebInfPath(project1);
-		  System.out.println("Web-INF path = "+loc3);
-		  IResource res3 = ResourceUtils.getWorkspaceRoot().findMember(loc3);
-		  assertTrue(res3.exists());
-		  assertTrue(res3.toString().endsWith("WEB-INF"));
-		  
-		  IContainer container = J2EEUtils.getWebContentContainer(project2);
-		  IResource res4 = ResourceUtils.getWorkspaceRoot().findMember(container.getFullPath());
-		  assertEquals(res2, res4);
-		  
-		  System.out.println("< END: testLocationGetterMethods ...");
-		  
-	  }
-	  
-	  public void testJ2EEVersionMethods(){
-		  
-		  System.out.println("< BEGIN: testJ2EEVersionMethods ...");
-	  		  
-		  IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2);
-		  int j2 = J2EEUtils.getJ2EEVersion(vc2);
-		  System.out.println("J2EEVersions p1: "+j2);		  
-		  assertEquals(j2, J2EEVersionConstants.VERSION_1_3);
-		  
-		  String j3 = J2EEUtils.getJ2EEVersionAsString(project1);
-		  System.out.println("J2EEVersion p1 as String: "+j3);
-		  assertEquals(j3, J2EEVersionConstants.VERSION_1_4_TEXT);
-		  
-		  System.out.println("< ENG: testJ2EEVersionMethods ...");
-	  }
-
-	  public void testComponentGetterMethods(){
-		  
-		  System.out.println("< BEGIN: testComponentGetterMethods ...");
-		  
-		  IVirtualComponent[] vcs = J2EEUtils.getAllComponents();
-		  checkVirtualComponentsExists(vcs);
-		  
-		  IVirtualComponent[] vcs2 = J2EEUtils.getAllEARComponents();
-		  checkVirtualComponentsExists(vcs2);
-		  
-		  IVirtualComponent[] vcs3 = J2EEUtils.getAllWebComponents();
-		  checkVirtualComponentsExists(vcs3);
-		  
-		  IVirtualComponent[] vcs4 = J2EEUtils.getWebComponents(project1);
-		  checkVirtualComponentsExists(vcs4);
-		  
-		  String[] names = J2EEUtils.getWebComponentNames(project2);
-		  printNameStrings(names);
-		  
-		  String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getComponentsByType(project1, J2EEUtils.WEB | J2EEUtils.EJB));
-		  printNameStrings(names2);
-		  
-		  IProject[] projects = J2EEUtils.getAllFlexibleProjects();
-		  for (int i=0;i<projects.length;i++){
-			  System.out.println("Flex project "+i+" = "+projects[i]);
-		  }
-		  
-		  System.out.println("< END: testComponentGetterMethods ...");
-	  }
-	  
-	  private void checkVirtualComponentsExists(IVirtualComponent[] vcs){
-		  for (int i=0; i<vcs.length;i++){
-			  IVirtualComponent vc = vcs[i];
-			  System.out.println("VC: Project = "+vc.getProject()+" Name = "+vc.getName());
-			  assertTrue(vc.exists());
-			  
-		  }
-	  }
-	  
-	  private void printNameStrings(String[] names){
-		  for (int i=0;i<names.length;i++){
-			  System.out.println("Name"+i+" = "+names[i]);
-		  }
-	  }
-	  
-      public void dtestAssociateComponentCommand(){
-        
-        System.out.println("< BEGIN: testAssociateComponentCommand ...");
-        
-        AssociateModuleWithEARCommand amwe = new AssociateModuleWithEARCommand();
-        amwe.setEar(earCompName);
-        amwe.setEARProject(projectName);
-        amwe.setModule(comp1);
-        amwe.setProject(projectName);
-        amwe.execute(null, null);
-        
-        System.out.println("< END: testAssociateComponentCommand ...");     
-      }
-    
-	  public void dtestReferencingGetterMethods(){
-		  
-		  System.out.println("< BEGIN: testReferencingGetterMethods ...");
-		  
-		  System.out.println("isComponentAssociated ..");
-		  J2EEUtils.isComponentAssociated(project1, project1);
-		
-		  String[] names = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project1));
-		  printNameStrings(names);
-		  String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project2));
-		  printNameStrings(names2);
-		  
-		  String[] names3 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingWebComponentsFromEAR(project1));
-		  printNameStrings(names3);
-		  
-		  System.out.println("< END: testReferencingGetterMethods ...");
-	  }
-	  
-	  public void dtestIsComponentMethods(){
-		
-		  System.out.println("< BEGIN: testIsComponentMethods ...");
-		  
-		  //assertFalse(J2EEUtils.isEJB20Component(ejbProject, ejbComponentName));
-		  assertTrue(J2EEUtils.isEJB20Component(ejbProject));
-		  
-		  System.out.println("< END: testIsComponentMethods ...");
-	  }
-	  
-
-	  
-}

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java
deleted file mode 100644
index ec2f6aa..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java
+++ /dev/null

@@ -1,33 +0,0 @@
-package org.eclipse.jst.ws.tests.unittest;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-/**
- * Minimal app to run as Eclipse "application"
- */
-public class LaunchTest implements IPlatformRunnable
-{
-  /**
-   * @see org.eclipse.core.runtime.IPlatformRunnable#run(Object)
-   */
-  public Object run(Object args) throws Exception
-  {
-
-    Object result = new AllWSJUnitTests().runMain(args);
-
-    if (result != null)
-    {
-      if (result instanceof Throwable)
-      {
-        ((Throwable) result).printStackTrace();
-      }
-      else
-      {
-        System.out.println("tests didn't return 'ok'");
-      }
-      return result;
-    }
-    else
-      return IPlatformRunnable.EXIT_OK;
-  }
-}

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java
deleted file mode 100644
index 0a9683c..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java
+++ /dev/null

@@ -1,99 +0,0 @@
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * JUnit tests for selective ResourceUtils methods.  Calls which return a simple String or rely on a IResource
- * API need not be tested.  The focus is mainly to exercise Component and Flexible project APIs. 
- * 
- */
-public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{
-
-
-	public static Test suite(){
-		return new TestSuite(ResourceUtilsTests.class);
-	}
-	
-	public void testComponentType(){
-		IProject project = ProjectUtilities.getProject(projectName);
-		String componentType = ResourceUtils.getComponentType(project);
-		assertEquals(IModuleConstants.JST_WEB_MODULE, componentType);
-	}
-	
-	public void testComponentOf(){
-		IProject project = ProjectUtilities.getProject(projectName);
-        IPath destPath = ResourceUtils.getJavaSourceLocation(project);
-        IFolder folder = (IFolder)ResourceUtils.findResource(destPath);
-        try {
-            PersistentResourceContext  resourceContext = PersistentResourceContext.getInstance();
-            EclipseStatusHandler       handler         = new EclipseStatusHandler();
-            EclipseEnvironment         env     = new EclipseEnvironment( null, resourceContext, handler );
-
-            IFile file = folder.getFile(new Path("foo/Echo.java"));
-            if (!file.exists()) {
-              JUnitUtils.copyTestData("BUJava/src", folder, env, null );
-            }
-        }
-        catch (Exception ex){
-        	ex.printStackTrace();
-        }
-
-        IPath javaFilePath = folder.getFile(new Path("foo/Echo.java")).getFullPath();
-        IVirtualComponent vc = ResourceUtils.getComponentOf(javaFilePath);
-        assertTrue(vc.exists());
-        
-		
-	}
-	
-	public void testJavaSourceLocation(){
-		IProject project = ProjectUtilities.getProject(projectName);
-		String javaSourceLoc = ResourceUtils.getJavaSourceLocation(project).toString();
-		System.out.println("Java source location = "+javaSourceLoc);
-		assertTrue(javaSourceLoc.endsWith("JavaSource"));
-		
-		// get all the JavaSourceLocations via the VirtualComponent
-		IVirtualComponent vc1 = ComponentCore.createComponent(project);
-		IVirtualComponent vc2 = ComponentCore.createComponent(project);
-		IVirtualComponent[] vcs = new IVirtualComponent[]{vc1, vc2};
-		IPath[] paths = ResourceUtils.getAllJavaSourceLocations(vcs);
-		
-		// verify first folder exists
-		IPath path1 = (IPath)paths[0];
-		IResource resource  = ResourceUtils.findResource(path1);
-		if (resource.exists()){
-			assertEquals(IResource.FOLDER, resource.getType());
-		}
-
-		// verify second folder exists
-		IPath path2 = (IPath)paths[1];
-		IResource resource2  = ResourceUtils.findResource(path2);
-		if (resource2.exists()){
-			assertEquals(IResource.FOLDER, resource2.getType());
-		}		
-	}
-	
-	public void testWebComponentServerRoot() {
-		IProject project = ProjectUtilities.getProject(projectName);
-		IFolder folder = ResourceUtils.getWebComponentServerRoot(project);
-		assertTrue(folder.exists());
-	
-	}
-	
-}

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java
deleted file mode 100644
index 12041b6..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/**
- * 
- */
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerCreationTests extends TestCase implements WSJUnitConstants{
-
-
-	public static Test suite(){
-		return new TestSuite(ServerCreationTests.class);
-	}
-	
-	public void init(){
-	    try {
-          assertNotNull(SERVER_INSTALL_PATH);          
-	      JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH);
-	    }
-	    catch(Exception e){
-	      e.printStackTrace();
-	    } 
-	}
-	
-	public void testCreateTomcatv5Server(){
-		init();
-		
-		System.out.println("Creating Tomcat v5 server.");
-		CreateServerCommand csc = new CreateServerCommand();
-		csc.setServerFactoryid(SERVERTYPEID_TC50);
-		csc.execute(null, null );
-		
-		IServer server = null;
-		String instId = csc.getServerInstanceId();
-		System.out.println("Server instance Id = "+instId);
-		if (instId!=null){
-		  server = ServerCore.findServer(instId);
-		}
-		assertNotNull(server);
-		
-		System.out.println("Done creating Tomcat v5 server.");
-	}
-	
-	public void testReattemptCreateTomcatv5Server(){
-		System.out.println("Attempting to create 2nd Tomcat v5 server.");
-		CreateServerCommand csc = new CreateServerCommand();
-		csc.setServerFactoryid(SERVERTYPEID_TC50);
-		csc.execute(null, null );
-		
-		IServer server = null;
-		String instId = csc.getServerInstanceId();
-		if (instId!=null) {
-		  server = ServerCore.findServer(instId);
-		}
-		assertNotNull(server);
-		
-		System.out.println("Done attempting 2nd Tomcat v5 server creation.");		
-	}
-}

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
deleted file mode 100644
index 52ae5b3..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
+++ /dev/null

@@ -1,37 +0,0 @@
-package org.eclipse.jst.ws.tests.unittest;
-
-import org.eclipse.core.runtime.Path;
-
-
-public interface WSJUnitConstants {
-  
-  public final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50");
-  public final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50";
-
-  public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
-  
-  public final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50";
-  
-  public final String webProjectName = "WebProject";
-  
-  // flexible project structure 1
-  public final String projectName = "FlexProject";
-  public final String webComponentName = "webComponent";
-  public final String webComponent2Name = "webComp2";
-
-  // flexible project structure 2
-  public final String project2Name = "FlexProject2";
-  public final String webComp3Name = "webComp3";
-  public final String webComp4Name = "webComp4";
-    
-  public final String ejbProjectName = "FlexEJBProject";
-  public final String ejbComponentName = "ejbComponent";
-
-  public final String appClientProjectName = "FlexAppClientProject";
-  public final String appClientCompName = "appClientComponent";  
-  
-  public final String earCompName = "EARComponent";
-  
-  public final Path zipFilePath = new Path("/data/WSTestProjects.zip");
-  public final String[] projectNames = new String[]{projectName, project2Name};
-}

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java
deleted file mode 100644
index 06b4540..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-public class AccumulateStatusHandler implements IStatusHandler {
-	  Vector statusList_;
-	  
-	  public AccumulateStatusHandler()
-	  {
-	    resetStatus();    
-	  }
-	  
-	  /**
-	   *  Resets the status so that it starts out empty again. 
-	   *
-	   */
-	  public void resetStatus()
-	  {
-	    statusList_ = new Vector();      
-	  }
-	  
-	  public IStatus getStatus()
-	  {
-	    IStatus worstStatus = Status.OK_STATUS;
-	    
-	    // Find the worst error status code
-	    for( int index = 0; index < statusList_.size(); index++ )
-	    {
-	      IStatus status = (IStatus)statusList_.elementAt( index );
-	      
-	      if( status.getSeverity() > worstStatus.getSeverity() )
-	      {
-	        worstStatus = status;
-	      }
-	    }
-	    
-	    return StatusUtils.multiStatus( worstStatus.getMessage(),
-	                                    (IStatus[])statusList_.toArray( new IStatus[0] ) );
-	  }
-	  
-	  /**
-	   * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[])
-	   */
-	  public Choice report(IStatus status, Choice[] choices) 
-	  {
-	  	Choice result = null;
-	  	
-	  	// Always take the first choice if available.
-	    if( choices != null && choices.length > 0 )
-	    {
-	    	result = choices[0];
-	    }
-	    
-	    statusList_.add( status );
-	    
-	    return result;
-	  }
-
-	  /**
-	   * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status)
-	   */
-	  public void report(IStatus status) throws StatusException
-	  {
-	    statusList_.add( status );
-	  }
-	  	 
-	  /**
-	   * @see com.ibm.env.common.IStatusHandler#reportError(com.ibm.env.common.Status)
-	   */
-	  public void reportError(IStatus status)
-	  {
-	    statusList_.add( status );
-	  }
-	  
-	  /**
-	   * @see com.ibm.env.common.IStatusHandler#reportInfo(com.ibm.env.common.Status)
-	   */
-	  public void reportInfo(IStatus status)
-	  {
-	    statusList_.add( status );
-	  }
-
-}

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java
deleted file mode 100644
index 8ba764c..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager;
-import org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-public class DynamicPopupJUnitWizard extends DynamicPopupWizard {
-	private IStatusHandler handler_;
-    private ILog log_;
-	public DynamicPopupJUnitWizard(IStatusHandler handler)
-	{
-		handler_ = handler;
-	}
-  
-    public DynamicPopupJUnitWizard(IStatusHandler handler, ILog log)
-    {
-        handler_ = handler;
-        log_ = log;
-    }
-    
-	public void runHeadLess(IStructuredSelection selection,IRunnableContext context) {
-		
-		PersistentResourceContext  resourceContext = PersistentResourceContext.getInstance();
-		EclipseEnvironment         environment     = new EclipseEnvironment( null, resourceContext, handler_ );
-		if (log_!=null)
-          environment.setLog(log_);
-    
-		DataMappingRegistryImpl    dataRegistry_   = new DataMappingRegistryImpl();	    
-		DataFlowManager            dataManager     = new DataFlowManager( dataRegistry_, environment );
-		SimpleCommandEngineManager manager         = new SimpleCommandEngineManager(environment, dataManager);
-		  
-	    try
-	    {
-	      commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" );
-	    }
-	    catch( CoreException exc )
-	    {
-	      exc.printStackTrace();
-	    }
-	    
-		commandWidgetBinding_.registerDataMappings( dataRegistry_ );
-		
-		CommandFragment            rootFragment    = getRootFragment( selection, null );
-		manager.setRootFragment( rootFragment );
-		manager.runForwardToNextStop( context );
-	}
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
deleted file mode 100644
index cf74b38..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
+++ /dev/null

@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Enumeration;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.tests.plugin.TestsPlugin;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-
-
-public class JUnitUtils {
-	// Begin Server Utilities
-	public static IRuntime createServerRuntime(String runtimeTypeId,String serverInstallPath) throws Exception
-	{
-		IRuntimeType rt = ServerCore.findRuntimeType(runtimeTypeId);
-		IRuntimeWorkingCopy wc = rt.createRuntime("aRuntime", null);
-		wc.setLocation(new Path(serverInstallPath));
-		
-		return wc.save(true, null);
-	}
-
-	public static IServer createServer(String name,String serverTypeId,IRuntime runtime,IEnvironment env, IProgressMonitor monitor ) throws Exception
-	{
-	  IServerType serverType = ServerCore.findServerType(serverTypeId);
-      IServer[] servers = ServerCore.getServers(); 
-      for (int i=0;i<servers.length;i++){
-        if(servers[i].getServerType().getId().equals(serverType.getId())){
-          return servers[i];  
-        }
-      }
-
-      IServerWorkingCopy serverWc = serverType.createServer(serverTypeId,null, monitor );
-	  serverWc.setName(name);
-	  serverWc.setRuntime(runtime);
-      IServer server = serverWc.saveAll(true, monitor );
-      return server;
-	}	
-	
-	/**
-	 * createServer and install JRE for Servers requiring a specific JRE
-	 * @param javaRuntimePath JRE install location; i.e. E:\\Java141
-	 * @param jreID JRE id; i.e. java141
-	 * @param name server name
-	 * @param serverTypeId server type id
-	 * @param runtime IRuntime
-	 * @param env IEnvironment
-	 * @return  server IServer
-	 * @throws Exception
-	 * 
-	 * @deprecated
-	 */
-	public static IServer createServer(String javaRuntimePath, String jreID, String name,String serverTypeId,IRuntime runtime,IEnvironment env, IProgressMonitor monitor ) throws Exception
-	{
-		IServerType serverType = ServerCore.findServerType(serverTypeId);
-    IServer[] servers = ServerCore.getServers(); 
-    for (int i=0;i<servers.length;i++){
-      if(servers[i].getServerType().getId().equals(serverType.getId())){
-        return servers[i];  
-      }
-    }
-
-		IServerWorkingCopy serverWc = serverType.createServer(serverTypeId,null, monitor );
-		serverWc.setName(name);
-		serverWc.setRuntime(runtime);
-		
-		IServer server = serverWc.saveAll(true, monitor );
-		
-		return server;
-	}
-	
-	public static void startServer(IServer server,IEnvironment env) throws Exception
-	{
-		final IServer currentServer = server;
-		IRunnableWithProgress runnable = new IRunnableWithProgress()
-		{
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
-			{
-				try
-				{
-				  currentServer.start(ILaunchManager.RUN_MODE, monitor );
-				}
-				catch (CoreException e)
-				{
-					InterruptedException wrapper = new InterruptedException(e.getMessage());
-					wrapper.setStackTrace(e.getStackTrace());
-					throw wrapper;
-				}
-			}
-		};
-		PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
-	}
-	
-	public static boolean removeEARFromServer(IServer server,IProject earProject,IEnvironment env, IProgressMonitor monitor ) throws Exception
-	{
-		int numberOfModules = server.getModules().length;
-		if (server != null)
-		{
-      final IModule earProjectModule = ServerUtil.getModule(earProject);
-      final IModule[] modules = {earProjectModule};
-			new ServerUtils().modifyModules(env, server,earProjectModule,false, monitor );
-		  	final IServer currentServer = server;
-		  	IRunnableWithProgress runnable = new IRunnableWithProgress()
-			{
-		  		public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
-				{
-		  		  	for (int i=0;i<1000;i++)
-		  		  	{
-		  		  		int moduleState = currentServer.getModuleState(modules);
-		  		  		if (moduleState == IServer.STATE_STARTED || moduleState == IServer.STATE_STOPPING)
-		  		  		{
-		  		  		  try
-		  				  {
-		  		  		    Thread.sleep(300);
-		  				  }
-		  		  		  catch (InterruptedException e)
-		  				  {
-		  		  		      e.printStackTrace(System.err);
-		  				  }
-		  		  		}
-		  		  		else
-		  		  			break;
-		  		  	}  			  			
-				}  		
-			};
-			PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
-			return (server.getModules().length == (numberOfModules-1));
-		}
-		return false;
-	}
-	
-	public static boolean removeModuleFromServer(IServer server, IProject webProject, IEnvironment env, IProgressMonitor monitor ) throws Exception {
-	  
-	  int numberOfModules = server.getModules().length;
-		if (server != null)
-		{
-      final IModule webProjectModule = ServerUtil.getModule(webProject);
-      final IModule[] modules = {webProjectModule};
-
-			new ServerUtils().modifyModules(env, server,webProjectModule,false, monitor );
-		  	final IServer currentServer = server;
-		  	IRunnableWithProgress runnable = new IRunnableWithProgress()
-			{
-		  		public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
-				{
-		  		  	for (int i=0;i<1000;i++)
-		  		  	{
-		  		  		int moduleState = currentServer.getModuleState(modules);
-		  		  		if (moduleState == IServer.STATE_STARTED || moduleState == IServer.STATE_STOPPING)
-		  		  		{
-		  		  		  try
-		  				  {
-		  		  		    Thread.sleep(300);
-		  				  }
-		  		  		  catch (InterruptedException e)
-		  				  {
-		  		  		      e.printStackTrace(System.err);
-		  				  }
-		  		  		}
-		  		  		else
-		  		  			break;
-		  		  	}  			  			
-				}  		
-			};
-			PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
-			//Thread.sleep(6000);
-			return (server.getModules().length == (numberOfModules-1));
-		}
-		return false;
-	}
-	
-	// Begin: General Eclipse Utilities
-	
-	public static void syncBuildProject(IProject project,IEnvironment env, IProgressMonitor monitor ) throws Exception
-	{
-		project.build(IncrementalProjectBuilder.FULL_BUILD, monitor );
-		WaitForAutoBuildCommand cmd = new WaitForAutoBuildCommand();
-    cmd.setEnvironment( env );
-		cmd.execute( monitor, null );
-	}
-	
-	private static void copyTestFiles(String pathString,int rootSegmentLength,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception
-	{
-		Enumeration e = TestsPlugin.getDefault().getBundle().getEntryPaths(pathString);
-		while (e.hasMoreElements())
-		{
-			String filePath = (String)e.nextElement();
-			if (filePath.endsWith("/"))
-				copyTestFiles(filePath,rootSegmentLength,destFolder,env, monitor );
-			else
-			{
-				IPath fileIPath = new Path(filePath);
-				FileResourceUtils.copyFile(EnvironmentUtils.getResourceContext(env),
-						                   TestsPlugin.getDefault(),
-										   fileIPath.removeLastSegments(fileIPath.segmentCount()-rootSegmentLength), // /data/<subdir>
-										   (new Path(filePath)).removeFirstSegments(rootSegmentLength), // files after /data/<subdir>
-										   destFolder.getFullPath(),
-										   monitor,
-										   env.getStatusHandler());
-			}
-		}
-	}
-	
-	public static void copyTestData(String dataSubdirectory,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception
-	{
-		String pathString = "/data/"+dataSubdirectory;
-		copyTestFiles(pathString,new Path(pathString).segmentCount(),destFolder,env, monitor);
-		
-	}
-	
-	// Begin: Web Services Utilities
-	public static void hideActionDialogs()
-	{
-		PersistentActionDialogsContext actionDialogsCtx = PersistentActionDialogsContext.getInstance();
-		ActionDialogPreferenceType[] actionDialogPrefs  = actionDialogsCtx.getDialogs();
-		for (int i=0;i<actionDialogPrefs.length;i++)
-			actionDialogsCtx.setActionDialogEnabled(actionDialogPrefs[i].getId(),true);		
-	}
-	
-
-	public static boolean enableProxyGeneration(boolean enable)
-	{
-		ScenarioContext ctx = WebServicePlugin.getInstance().getScenarioContext();
-		boolean previousSetting = ctx.getGenerateProxy();
-		ctx.setGenerateProxy(enable);
-		return previousSetting;
-	}
-	
-	public static boolean enableOverwrite(boolean enable)
-	{
-		ResourceContext ctx = WebServicePlugin.getInstance().getResourceContext();
-		boolean previousSetting = ctx.isOverwriteFilesEnabled();
-		ctx.setOverwriteFilesEnabled(enable);
-		return previousSetting;
-	}
-	
-	public static void disableWSIDialog(IProject project){
-	  
-	  PersistentWSIContext ctx = WSUIPlugin.getInstance().getWSIAPContext();
-	  ctx.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI);
-	  
-	  PersistentWSIContext ctx2 = WSUIPlugin.getInstance().getWSISSBPContext();
-	  ctx2.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI);
-	  
-	}
-	
-	public static void setJ2EEWSRuntimeServer(String j2eeLevel,String wsRuntimeId,String serverTypeId)
-	{
-		PersistentServerRuntimeContext serverRuntimeCtx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-		serverRuntimeCtx.setJ2EEVersion(j2eeLevel);
-		serverRuntimeCtx.setRuntimeId(wsRuntimeId);
-		serverRuntimeCtx.setServerFactoryId(serverTypeId);		
-	}
-	
-	private static IStatus launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
-	{
-		IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.popupMenus").getExtensions();
-		for (int i=0;i<extensions.length;i++)
-		{
-			if (extensions[i].getNamespace().equals(pluginNS));
-			{
-				IConfigurationElement[] configElements = extensions[i].getConfigurationElements();
-				for (int j=0;j<configElements.length;j++)
-				{
-					if (configElements[j].getAttribute("id").equals(wizardId) && configElements[j].getAttribute("objectClass").equals(objectClassId))
-					{
-						IConfigurationElement actionElement = configElements[j].getChildren()[0];
-						AccumulateStatusHandler statusHandler = new AccumulateStatusHandler();
-						DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler);
-						wizard.setInitializationData(actionElement,null,null);
-						wizard.selectionChanged(null,initialSelection);
-						wizard.run(null);
-						return statusHandler.getStatus();
-					}
-				}
-			}
-		}
-		return StatusUtils.errorStatus( "No wizard found for: " );
-	}
-	
-	public static IStatus launchCreationWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
-	{
-		return launchWizard("org.eclipse.jst.ws.creation.ui",wizardId,objectClassId,initialSelection);
-	}
-	
-	public static IStatus launchConsumptionWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
-	{
-		return launchWizard("org.eclipse.jst.ws.internal.consumption.ui",wizardId,objectClassId,initialSelection);
-	}
-	
-	public static IStatus createWebModule(String webProjectName, String moduleName, String serverFactoryId, String j2eeVersion, IEnvironment env, IProgressMonitor monitor ){
-
-	  IStatus status = Status.OK_STATUS;
-	  try{
-	    CreateModuleCommand createWeb = new CreateModuleCommand();
-	    createWeb.setProjectName(webProjectName);
-        createWeb.setModuleName(moduleName);
-        createWeb.setModuleType(CreateModuleCommand.WEB);
-	    createWeb.setJ2eeLevel(j2eeVersion);
-	    createWeb.setServerFactoryId(serverFactoryId);
-      createWeb.setEnvironment( env );
-	    return createWeb.execute( monitor, null );
-	  }
-	  catch (Exception e){
-	    status = StatusUtils.errorStatus( e );
-	  }
-	  return status;
-	  
-	}
-	
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java
deleted file mode 100644
index 4217d82..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-public class ScenarioConstants {
-	// Bottom up Java or EJB to Web Service wizard ID.
-	public static final String WIZARDID_BOTTOM_UP = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java";
-	
-	// Top down WSDL to Skeleton Web Service wizard ID.
-	public static final String WIZARDID_TOP_DOWN = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton";
-	
-	// Web Service client wizard ID.
-	public static final String WIZARDID_CLIENT = "org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard";	
-	
-	// Object class for:
-	// 1) Java source (bottom-up)
-	// 2) WSDL or WSIL (top-down or client).
-	public static final String OBJECT_CLASS_ID_IFILE = "org.eclipse.core.resources.IFile";
-	
-	// Object class for Java compilation units (i.e. Java classes selected in the Java perspective).
-	public static final String OBJECT_CLASS_ID_COMPILATIONUNIT = "org.eclipse.jdt.internal.core.CompilationUnit";
-	
-	// Object class for a service selected in the J2EE perspective (top-down or client).
-	public static final String OBJECT_CLASS_ID_SERVICEIMPL = "org.eclipse.wst.wsdl.Service";
-	
-	// Object class for a WSDLResourceImpl (top-down or client).
-	public static final String OBJECT_CLASS_ID_WSDLSERVICEIMPL = "org.eclipse.wst.wsdl.internal.util.WSDLResourceImpl";
-	
-	// Object class for a ServiceRef (top-down or client).
-	public static final String OBJECT_CLASS_ID_SERVICEREF = "org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef";
-	
-	// Object class for a ServiceImplBean (bottom-up).
-	public static final String OBJECT_CLASS_ID_SERVICEIMPLBEAN = "org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean";
-	
-	// Object class for a BeanLink (bottom-up).
-	public static final String OBJECT_CLASS_ID_BEANLINK = "org.eclipse.jst.j2ee.webservice.wsdd.BeanLink";
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.ws.tests/.classpath b/tests/org.eclipse.wst.ws.tests/.classpath
deleted file mode 100644
index 9f4b4d1..0000000
--- a/tests/org.eclipse.wst.ws.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="tests"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/tests/org.eclipse.wst.ws.tests/.cvsignore b/tests/org.eclipse.wst.ws.tests/.cvsignore
deleted file mode 100644
index 57763eb..0000000
--- a/tests/org.eclipse.wst.ws.tests/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar

diff --git a/tests/org.eclipse.wst.ws.tests/.project b/tests/org.eclipse.wst.ws.tests/.project
deleted file mode 100644
index 55f2bcd..0000000
--- a/tests/org.eclipse.wst.ws.tests/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 8b78db9..0000000
--- a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests Plug-in
-Bundle-SymbolicName: org.eclipse.wst.ws.tests
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.ws.tests.plugin.TestsPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.wst.ws,
- org.eclipse.core.runtime,
- org.junit,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.jem.util,
- org.eclipse.jface,
- org.eclipse.ui,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.server.core,
- org.eclipse.wst.ws.ui,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
-Export-Package: org.eclipse.wst.ws.tests.plugin,
- org.eclipse.wst.ws.tests.unittest,
- org.eclipse.wst.ws.tests.util
-Bundle-ClassPath: tests.jar

diff --git a/tests/org.eclipse.wst.ws.tests/about.html b/tests/org.eclipse.wst.ws.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.ws.tests/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.ws.tests/build.properties b/tests/org.eclipse.wst.ws.tests/build.properties
deleted file mode 100644
index f40af6d..0000000
--- a/tests/org.eclipse.wst.ws.tests/build.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-bin.includes = build.xml,\
-               data/,\
-               plugin.xml,\
-               readme.txt,\
-               tests.jar,\
-               META-INF/,\
-               test.xml,\
-               about.html
-jars.compile.order = tests.jar
-source.tests.jar = tests/
-output.tests.jar = bin/

diff --git a/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl b/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl
deleted file mode 100644
index 0bd31ca..0000000
--- a/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl
+++ /dev/null

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/AreaService/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="AreaService" targetNamespace="http://tempuri.org/AreaService/">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://tempuri.org/AreaService/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:element name="area" type="xsd:float"/>
-      <xsd:element name="parameters" type="tns:dimensions"/>
-      <xsd:complexType name="dimensions">
-      	<xsd:sequence>
-      		<xsd:element name="width" type="xsd:float"></xsd:element>
-      		<xsd:element name="height" type="xsd:float"></xsd:element>
-      	</xsd:sequence>
-      </xsd:complexType>
-
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="CalculateRectAreaResponse">
-    <wsdl:part element="tns:area" name="area"/>
-  </wsdl:message>
-  <wsdl:message name="CalculateRectAreaRequest">
-    <wsdl:part element="tns:parameters" name="parameters"/>
-  </wsdl:message>
-  <wsdl:portType name="AreaService">
-    <wsdl:operation name="CalculateRectArea">
-      <wsdl:input message="tns:CalculateRectAreaRequest"/>
-      <wsdl:output message="tns:CalculateRectAreaResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AreaServiceSOAP" type="tns:AreaService">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="CalculateRectArea">
-      <soap:operation soapAction="http://tempuri.org/AreaService/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AreaService">
-    <wsdl:port binding="tns:AreaServiceSOAP" name="AreaServiceSOAP">
-      <soap:address location="http://tempuri.org"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.ws.tests/plugin.xml b/tests/org.eclipse.wst.ws.tests/plugin.xml
deleted file mode 100644
index 8c7e48a..0000000
--- a/tests/org.eclipse.wst.ws.tests/plugin.xml
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-    
-</plugin>

diff --git a/tests/org.eclipse.wst.ws.tests/readme.txt b/tests/org.eclipse.wst.ws.tests/readme.txt
deleted file mode 100644
index 91de037..0000000
--- a/tests/org.eclipse.wst.ws.tests/readme.txt
+++ /dev/null

@@ -1,2 +0,0 @@
-Currently no arguments to be passed in.  See org.eclipse.jst.ws.tests for adding
-arguments when running test suite (i.e. server install location...)

diff --git a/tests/org.eclipse.wst.ws.tests/test.xml b/tests/org.eclipse.wst.ws.tests/test.xml
deleted file mode 100644
index f291ace..0000000
--- a/tests/org.eclipse.wst.ws.tests/test.xml
+++ /dev/null

@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
-	<echo message="basedir ${basedir}" />
-	<echo message="eclipse place ${eclipse-home}" />
-  <!-- sets the properties plugin-name, and library-file -->
-  <property name="plugin-name" value="org.eclipse.wst.ws.tests"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-  <!-- commented for now until such a time as we need to call a server for wst tests -->
-  <!--<property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/> -->
-	
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="wst-ws-folder" value="${eclipse-home}/wst_ws_folder"/>
-    <delete dir="${wst-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${wst-ws-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.ws.tests.unittest.AllWSJUnitTests" />
-   	  <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-<!--   	  <property name="extraVMargs" value="${extraVMargs}"/>    	-->
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-</project>

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java
deleted file mode 100644
index f455fa9..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java
+++ /dev/null

@@ -1,176 +0,0 @@
-package org.eclipse.wst.ws.tests.data;
-
-import java.io.IOException;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.intro.IIntroManager;
-import org.eclipse.ui.intro.IIntroPart;
-import org.eclipse.wst.ws.tests.plugin.TestsPlugin;
-
-/**
- * @author joan
- *  Sets up locator test data - uses same data file but renames it for each use
- *  Workspace structure created looks like this:
- *  
- *  root
- *  --project1
- *    |----folder1
- *         |-----folder2
- *               |------one.wsdl
- *         |-----two.wsdl
- *    |----folder3
- *         |-----three.wsdl
- *         |-----four.wsdl 
- *  --project2
- *    |----five.wsdl
- *    |----folder4
- *    |----folder5
- *         |-----six.wsdl
- *  --project3
- *    |----one.xml
- */
-
-public class LocatorWorkspaceSetup extends TestCase {
-
-	  public static String PROJECT1_NAME = "Project1";
-	  public static String FOLDER1_NAME = "Folder1";  //contains WSDL file and one folder 
-	  public static String FOLDER2_NAME = "Folder2";  //nested in folder 1 and contains WSDL file
-	  public static String FOLDER3_NAME = "Folder3";  //contains two WSDL files
-	  public static String PROJECT2_NAME = "Project2"; //contains WSDL file and two folders
-	  public static String FOLDER4_NAME = "Folder4";  //contains no WSDL
-	  public static String FOLDER5_NAME = "Folder5";  //contains one WSDL file
-	  public static String PROJECT3_NAME = "Project3";  //contains no WSDL files but one XML file
-	  
-	  public static String WSDLFILE_ONE = "one.wsdl";
-	  public static String WSDLFILE_TWO = "two.wsdl";
-	  public static String WSDLFILE_THREE = "three.wsdl";
-	  public static String WSDLFILE_FOUR = "four.wsdl";
-	  public static String WSDLFILE_FIVE = "five.wsdl";
-	  public static String WSDLFILE_SIX = "six.wsdl";
-	  public static String XMLFILE_ONE = "one.XML";
-	  
-	  public static String ACTUAL_TESTFILEPATH = "data/locator/test.wsdl";
-	  	  
-	  private IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-	  
-	  public static Test suite()
-	  {
-	    return new TestSuite(LocatorWorkspaceSetup.class, "LocatorWorkspaceSetup");
-	  }
-
-	  protected void closeIntro()
-	  {
-	    IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
-	    IIntroPart introPart = introManager.getIntro();
-	    if (introPart != null)
-	      introManager.closeIntro(introPart);
-	  }
-
-	  protected IProject createSimpleProject(String name) throws CoreException
-	  {
-	    IProject simpleProject = root.getProject(name);
-	    simpleProject.create(null);
-	    simpleProject.open(null);
-	    return simpleProject;
-	  }
-
-	  protected IFolder createFolder(IContainer parent, String folderName) throws CoreException
-	  {
-		IFolder folder1 = parent.getFolder(new Path(folderName));
-        folder1.create(false, true, null);
-	    return folder1;
-	  }
-
-	  
-	  protected void copyFile(IContainer project, String source, String dest) throws IOException, CoreException
-	  {
-		  
-	    IFile file = project.getFile(new Path(dest));
-	    file.create(TestsPlugin.getDefault().getBundle().getEntry(source).openStream(), true, null);
-	    Assert.assertTrue(file.exists());
-	  }
-
-	  protected void joinAutoBuild() throws CoreException
-	  {
-	    boolean interrupted = true;
-	    while (interrupted)
-	    {
-	      try
-	      {
-	        Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-	        interrupted = false;
-	      }
-	      catch (InterruptedException e)
-	      {
-	        interrupted = true;
-	      }
-	    }
-	  }
-
-	  public void testSetup() throws Exception
-	  {
-		  try{
-		System.out.println("------ locator data setup starting");
-	    closeIntro();
-
-	    IProject project1 = createSimpleProject(PROJECT1_NAME);
-	    IFolder folder1 = createFolder(project1, FOLDER1_NAME);
-	    copyFile(folder1, ACTUAL_TESTFILEPATH, WSDLFILE_TWO);
-	    IFolder folder2 = createFolder(folder1, FOLDER2_NAME);
-	    copyFile(folder2, ACTUAL_TESTFILEPATH, WSDLFILE_ONE);
-	    IFolder folder3 = createFolder(project1, FOLDER3_NAME);
-	    copyFile(folder3, ACTUAL_TESTFILEPATH, WSDLFILE_THREE);
-	    copyFile(folder3, ACTUAL_TESTFILEPATH, WSDLFILE_FOUR);
-	    
-	    IProject project2 = createSimpleProject(PROJECT2_NAME);
-	    copyFile(project2, ACTUAL_TESTFILEPATH, WSDLFILE_FIVE);
-	    createFolder(project2, FOLDER4_NAME);  //folder with no content
-	    IFolder folder5 = createFolder(project2, FOLDER5_NAME);
-	    copyFile(folder5, ACTUAL_TESTFILEPATH, WSDLFILE_SIX);
-	    IProject project3 = createSimpleProject(PROJECT3_NAME);
-	    copyFile(project3, ACTUAL_TESTFILEPATH, XMLFILE_ONE);
-		  }
-		  catch (Exception e)
-		  {
-			  e.printStackTrace();
-		  }
-	 
-		//code to check workspace set up - debug
-		/*DataResourceVisitor visitor = new DataResourceVisitor();
-	    root.accept(visitor);
-	    visitor.visit(root);*/
-	    
-	    System.out.println("------ locator data setup complete");
-	  }
-	
-	protected class DataResourceVisitor implements IResourceVisitor
-	{
-    	public boolean visit(IResource resource) throws CoreException {
-    		if ((resource instanceof IProject) || (resource instanceof IFolder))
-    		{
-    		  System.out.println("visiting " + resource.getName());    		  
-    		}
-    		else if (resource instanceof IFile)
-    		{
-    			System.out.println("found file " + resource.getName());    			
-    		}
-    		return true;
-    	}
-    }
-}

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java
deleted file mode 100644
index da56b67..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java
+++ /dev/null

@@ -1,43 +0,0 @@
-package org.eclipse.wst.ws.tests.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestsPlugin extends Plugin {
-	//The shared instance.
-	private static TestsPlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public TestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static TestsPlugin getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java
deleted file mode 100644
index c4baf9f..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java
+++ /dev/null

@@ -1,90 +0,0 @@
-package org.eclipse.wst.ws.tests.unittest;
-
-import org.eclipse.wst.ws.tests.data.LocatorWorkspaceSetup;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * This class is to run all the unittest tests.
- */
-public class AllWSJUnitTests extends TestCase
-{
-  /**
-   * Method parseArgs.
-   * 
-   * @param args
-   */
-  private void parseArgs(Object args)
-  {
-    // typicially args is an array of strings,
-    // not sure when it wouldn't be.
-  }
-
-  public static void main(String[] args)
-  {
-    new AllWSJUnitTests().runMain(args);
-  }
-
-  public Object runMain(Object args)
-  {
-    Object result = null;
-    try
-    {
-      TestRunner testRunner = null;
-
-      parseArgs(args);
-
-      testRunner = new TestRunner(System.out);
- 
-
-      Test suite = suite();
-      TestResult testResult = testRunner.doRun(suite, false);
-      printHeader(testResult);      
-    }
-    catch (Exception e)
-    {
-      result = e;
-    }
-
-    return result;
-  }
-
-  public static Test suite()
-  {
-    TestSuite testSuite = new TestSuite();
- //add unit tests to suite here...
-    testSuite.addTest( LocatorWorkspaceSetup.suite());
-    testSuite.addTest( WebServiceFinderTests.suite());
-    return testSuite;
-  }
-
-  /**
-   * Prints the header of the report
-   */
-  protected void printHeader(TestResult result)
-  {
-    if (result.wasSuccessful())
-    {
-      System.out.println();
-      System.out.print("OK");
-      System.out.println(" (" + result.runCount() + " tests)");
-
-    }
-    else
-    {
-      System.out.println();
-      System.out.println("FAILURES!!!");
-      System.out.println(
-        "Tests run: "
-          + result.runCount()
-          + ",  Failures: "
-          + result.failureCount()
-          + ",  Errors: "
-          + result.errorCount());
-    }
-  }
-}

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java
deleted file mode 100644
index 3a6efe7..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java
+++ /dev/null

@@ -1,33 +0,0 @@
-package org.eclipse.wst.ws.tests.unittest;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-/**
- * Minimal app to run as Eclipse "application"
- */
-public class LaunchTest implements IPlatformRunnable
-{
-  /**
-   * @see org.eclipse.core.runtime.IPlatformRunnable#run(Object)
-   */
-  public Object run(Object args) throws Exception
-  {
-
-    Object result = new AllWSJUnitTests().runMain(args);
-
-    if (result != null)
-    {
-      if (result instanceof Throwable)
-      {
-        ((Throwable) result).printStackTrace();
-      }
-      else
-      {
-        System.out.println("tests didn't return 'ok'");
-      }
-      return result;
-    }
-    else
-      return IPlatformRunnable.EXIT_OK;
-  }
-}

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/ResourceUtilsTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/ResourceUtilsTests.java
deleted file mode 100644
index 084d082..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/ResourceUtilsTests.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package org.eclipse.wst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * @author sengpl
- *
- */
-public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{
-
-
-	public static Test suite(){
-		return new TestSuite(ResourceUtilsTests.class);
-	}
-	
-	
-	
-}

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java
deleted file mode 100644
index fce5ff9..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java
+++ /dev/null

@@ -1,29 +0,0 @@
-package org.eclipse.wst.ws.tests.unittest;
-
-
-public interface WSJUnitConstants {
-  
-  public final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50");
-  public final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50";
-
-  public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
-  
-  public final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50";
-  
-  public final String webProjectName = "WP";
-  public final String webProject2Name = "WP2";
-  public final String webComponentName = "webComponent";
-  public final String webComponent2Name = "webComp2";
-  public final String webComp3Name = "webComp3";
-  public final String webComp4Name = "webComp4";
-  
-  
-  public final String ejbProjectName = "EJBProject";
-  public final String ejbComponentName = "ejbComponent";
-
-  public final String appClientProjectName = "AppClientProject";
-  public final String appClientCompName = "appClientComponent";  
-  
-  public final String earCompName = "EARComponent";
-  
-}

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java
deleted file mode 100644
index 86f9c5c..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java
+++ /dev/null

@@ -1,38 +0,0 @@
-package org.eclipse.wst.ws.tests.unittest;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.ws.internal.wsfinder.WebServiceFinder;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * @author joan
- *
- */
-
-public class WebServiceFinderTests extends TestCase implements WSJUnitConstants {
-
-	public static Test suite(){
-		return new TestSuite(WebServiceFinderTests.class);
-	}
-	
-	public void testWSFinder(){
-		System.out.println("creating web service finder");
-		WebServiceFinder wsf = WebServiceFinder.instance();
-		
-		System.out.println("attempting to locate all web services in workspace");
-		Iterator wsIterator = wsf.getWebServices();
-		while (wsIterator.hasNext()) {
-			WebServiceInfo wsInfo = (WebServiceInfo) wsIterator.next();
-			System.out.println("webService URL: " + wsInfo.getWsdlURL());
-		}
-		
-		System.out.println("finished finding all webservices");
-		 
-	}
-
-}

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java
deleted file mode 100644
index 8f524fb..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.tests.util;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-public class AccumulateStatusHandler implements IStatusHandler {
-	  Vector statusList_;
-	  
-	  public AccumulateStatusHandler()
-	  {
-	    resetStatus();    
-	  }
-	  
-	  /**
-	   *  Resets the status so that it starts out empty again. 
-	   *
-	   */
-	  public void resetStatus()
-	  {
-	    statusList_ = new Vector();      
-	  }
-	  
-	  public IStatus getStatus()
-	  {
-	    IStatus worstStatus = Status.OK_STATUS;
-	    
-	    // Find the worst error status code
-	    for( int index = 0; index < statusList_.size(); index++ )
-	    {
-	      IStatus status = (IStatus)statusList_.elementAt( index );
-	      
-	      if( status.getSeverity() > worstStatus.getSeverity() )
-	      {
-	        worstStatus = status;
-	      }
-	    }
-	    
-	    return StatusUtils.multiStatus( worstStatus.getMessage(),
-                                     (Status[])statusList_.toArray( new Status[0] ) );
-	  }
-	  
-	  /**
-	   * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[])
-	   */
-	  public Choice report(IStatus status, Choice[] choices) 
-	  {
-	  	Choice result = null;
-	  	
-	  	// Always take the first choice if available.
-	    if( choices != null && choices.length > 0 )
-	    {
-	    	result = choices[0];
-	    }
-	    
-	    statusList_.add( status );
-	    
-	    return result;
-	  }
-
-	  /**
-	   * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status)
-	   */
-	  public void report(IStatus status) throws StatusException
-	  {
-	    statusList_.add( status );
-	  }
-	  	 
-	  /**
-	   * @see com.ibm.env.common.IStatusHandler#reportError(com.ibm.env.common.Status)
-	   */
-	  public void reportError(IStatus status)
-	  {
-	    statusList_.add( status );
-	  }
-	  
-	  /**
-	   * @see com.ibm.env.common.IStatusHandler#reportInfo(com.ibm.env.common.Status)
-	   */
-	  public void reportInfo(IStatus status)
-	  {
-	    statusList_.add( status );
-	  }
-
-}

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/DynamicPopupJUnitWizard.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/DynamicPopupJUnitWizard.java
deleted file mode 100644
index d7049a8..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/DynamicPopupJUnitWizard.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.tests.util;
-
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager;
-import org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-public class DynamicPopupJUnitWizard extends DynamicPopupWizard {
-	private IStatusHandler handler_;
-	public DynamicPopupJUnitWizard(IStatusHandler handler)
-	{
-		handler_ = handler;
-	}
-	public void runHeadLess(IStructuredSelection selection,IRunnableContext context) {
-		CommandFragment            rootFragment    = getRootFragment( selection, null );
-		PersistentResourceContext  resourceContext = PersistentResourceContext.getInstance();
-		EclipseEnvironment         environment     = new EclipseEnvironment( null, resourceContext, handler_ );
-		    
-		DataMappingRegistryImpl    dataRegistry_   = new DataMappingRegistryImpl();	    
-		DataFlowManager            dataManager     = new DataFlowManager( dataRegistry_, environment );
-		SimpleCommandEngineManager manager         = new SimpleCommandEngineManager(environment, dataManager);
-		  
-		commandWidgetBinding_.registerDataMappings( dataRegistry_ );
-		manager.setRootFragment( rootFragment );
-		manager.runForwardToNextStop( context );
-	}
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java
deleted file mode 100644
index e5dbe7b..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.tests.util;
-
-import java.util.Enumeration;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.tests.plugin.TestsPlugin;
-
-
-public class JUnitUtils {
-	
-	// Begin: General Eclipse Utilities
-	public static void syncBuildProject(IProject project,IEnvironment env, IProgressMonitor monitor ) throws Exception
-	{
-		project.build(IncrementalProjectBuilder.FULL_BUILD,null);
-		WaitForAutoBuildCommand cmd = new WaitForAutoBuildCommand();
-    cmd.setEnvironment( env );
-		cmd.execute( monitor, null );
-	}
-	
-	private static void copyTestFiles(String pathString,int rootSegmentLength,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception
-	{
-		Enumeration e = TestsPlugin.getDefault().getBundle().getEntryPaths(pathString);
-		while (e.hasMoreElements())
-		{
-			String filePath = (String)e.nextElement();
-			if (filePath.endsWith("/"))
-				copyTestFiles(filePath,rootSegmentLength,destFolder,env, monitor );
-			else
-			{ 
-				IPath fileIPath = new Path(filePath);
-				FileResourceUtils.copyFile(new TransientResourceContext(),
-						                   TestsPlugin.getDefault(),
-										   fileIPath.removeLastSegments(fileIPath.segmentCount()-rootSegmentLength), // /data/<subdir>
-										   (new Path(filePath)).removeFirstSegments(rootSegmentLength), // files after /data/<subdir>
-										   destFolder.getFullPath(),
-										   monitor,
-										   env.getStatusHandler());
-			}
-		}
-	}
-	
-	public static void copyTestData(String dataSubdirectory,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception
-	{
-		String pathString = "/data/"+dataSubdirectory;
-		copyTestFiles(pathString,new Path(pathString).segmentCount(),destFolder,env, monitor );
-		
-	}
-	
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/ScenarioConstants.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/ScenarioConstants.java
deleted file mode 100644
index 3a894b6..0000000
--- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/ScenarioConstants.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.tests.util;
-
-public class ScenarioConstants {
-	// Bottom up Java or EJB to Web Service wizard ID.
-	public static final String WIZARDID_BOTTOM_UP = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java";
-	
-	// Top down WSDL to Skeleton Web Service wizard ID.
-	public static final String WIZARDID_TOP_DOWN = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton";
-	
-	// Web Service client wizard ID.
-	public static final String WIZARDID_CLIENT = "org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard";	
-	
-	// Object class for:
-	// 1) Java source (bottom-up)
-	// 2) WSDL or WSIL (top-down or client).
-	public static final String OBJECT_CLASS_ID_IFILE = "org.eclipse.core.resources.IFile";
-	
-	// Object class for Java compilation units (i.e. Java classes selected in the Java perspective).
-	public static final String OBJECT_CLASS_ID_COMPILATIONUNIT = "org.eclipse.jdt.internal.core.CompilationUnit";
-	
-	// Object class for a service selected in the J2EE perspective (top-down or client).
-	public static final String OBJECT_CLASS_ID_SERVICEIMPL = "org.eclipse.wst.wsdl.Service";
-	
-	// Object class for a WSDLResourceImpl (top-down or client).
-	public static final String OBJECT_CLASS_ID_WSDLSERVICEIMPL = "org.eclipse.wst.wsdl.internal.util.WSDLResourceImpl";
-	
-	// Object class for a ServiceRef (top-down or client).
-	public static final String OBJECT_CLASS_ID_SERVICEREF = "org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef";
-	
-	// Object class for a ServiceImplBean (bottom-up).
-	public static final String OBJECT_CLASS_ID_SERVICEIMPLBEAN = "org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean";
-	
-	// Object class for a BeanLink (bottom-up).
-	public static final String OBJECT_CLASS_ID_BEANLINK = "org.eclipse.jst.j2ee.webservice.wsdd.BeanLink";
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/.classpath b/tests/org.eclipse.wst.wsdl.tests.performance/.classpath
deleted file mode 100644
index ce61870..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="performance"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/.cvsignore b/tests/org.eclipse.wst.wsdl.tests.performance/.cvsignore
deleted file mode 100644
index ba2fda9..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/.cvsignore
+++ /dev/null

@@ -1,5 +0,0 @@
-bin
-build.xml
-
-temp.folder
-performance.jar

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/.project b/tests/org.eclipse.wst.wsdl.tests.performance/.project
deleted file mode 100644
index 6c6e861..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsdl.tests.performance</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>	
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-     	<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/about.html b/tests/org.eclipse.wst.wsdl.tests.performance/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/build.properties b/tests/org.eclipse.wst.wsdl.tests.performance/build.properties
deleted file mode 100644
index 5798e42..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.performance.jar = performance/
-output.performance.jar = bin/
-bin.includes = plugin.xml,\
-               performance.jar,\
-               test.xml,\
-               data/,\
-               about.html
-src.includes = build.properties

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/data/StockQuote/StockQuote.wsdl b/tests/org.eclipse.wst.wsdl.tests.performance/data/StockQuote/StockQuote.wsdl
deleted file mode 100644
index 80bf965..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/data/StockQuote/StockQuote.wsdl
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/StockQuote/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockQuote" targetNamespace="http://tempuri.org/StockQuote/">

-  <wsdl:types>

-    <xsd:schema targetNamespace="http://tempuri.org/StockQuote/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-      <xsd:element name="getQuoteResponse">

-        <xsd:complexType>

-          <xsd:all>

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

-          </xsd:all>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="getQuoteRequest">

-        <xsd:complexType>

-          <xsd:all>

-            <xsd:element name="price" type="xsd:float"/>

-          </xsd:all>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="Headers">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="header" minOccurs="0" maxOccurs="unbounded">

-              <xsd:complexType>

-                <xsd:sequence>

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

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

-                </xsd:sequence>

-              </xsd:complexType>

-            </xsd:element>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-    </xsd:schema>

-  </wsdl:types>

-  <wsdl:message name="getQuoteResponse">

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

-    <wsdl:part element="tns:Headers" name="headers"/>

-  </wsdl:message>

-  <wsdl:message name="getQuoteRequest">

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

-    <wsdl:part element="tns:Headers" name="headers"/>

-  </wsdl:message>

-  <wsdl:portType name="StockQuote">

-    <wsdl:operation name="getQuote">

-      <wsdl:input message="tns:getQuoteRequest"/>

-      <wsdl:output message="tns:getQuoteResponse"/>

-    </wsdl:operation>

-  </wsdl:portType>

-  <wsdl:binding name="StockQuoteSOAP" type="tns:StockQuote">

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

-    <wsdl:operation name="getQuote">

-      <soap:operation soapAction="http://tempuri.org/StockQuote/getQuote"/>

-      <wsdl:input>

-        <soap:body parts="getQuoteRequest" use="literal"/>

-        <soap:header message="tns:getQuoteRequest" part="headers" use="literal"/>

-      </wsdl:input>

-      <wsdl:output>

-        <soap:body parts="getQuoteResponse" use="literal"/>

-        <soap:header message="tns:getQuoteResponse" part="headers" use="literal"/>

-      </wsdl:output>

-    </wsdl:operation>

-  </wsdl:binding>

-  <wsdl:service name="StockQuote">

-    <wsdl:port binding="tns:StockQuoteSOAP" name="StockQuoteSOAP">

-      <soap:address location="http://tempuri.org"/>

-    </wsdl:port>

-  </wsdl:service>

-</wsdl:definitions>


diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/AllTests.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/AllTests.java
deleted file mode 100644
index ffb64a0..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/AllTests.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
-  *
- * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
-
-package org.eclipse.wst.wsdl.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests
-{
-  public static Test suite()
-  {
-    TestSuite suite = new TestSuite("Test for org.eclipse.wst.wsdl.tests.performance");
-    //$JUnit-BEGIN$
-    suite.addTestSuite(ReadStockQuoteWSDLTestCase.class);
-	suite.addTestSuite(ReadStockQuoteWSDLEMFTestCase.class);
-	suite.addTestSuite(ValidateStockQuoteWSDLTestCase.class);
-    suite.addTestSuite(ValidateStockQuoteWSITestCase.class);
-    suite.addTestSuite(OpenStockQuoteWSDLSetup.class);
-    suite.addTestSuite(OpenStockQuoteWSDLTestCase.class);
-    //$JUnit-END$
-    return suite;
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java
deleted file mode 100644
index 351fd3c..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java
+++ /dev/null

@@ -1,129 +0,0 @@
-package org.eclipse.wst.wsdl.tests.performance;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import javax.wsdl.WSDLException;
-import junit.framework.Assert;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-
-public class OpenEditorOAGISWSDLTestcase extends PerformanceTestCase
-{
-  private final String ID_WSDL_EDITOR = "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-
-  public void testReadWSDL() throws MalformedURLException, WSDLException, CoreException, FileNotFoundException
-  {
-    String oagis80Dir = System.getProperty("oagis80Dir");
-    Assert.assertNotNull(oagis80Dir);
-    if (!oagis80Dir.endsWith("/") && !oagis80Dir.endsWith("\\"))
-      oagis80Dir = oagis80Dir + "/";
-    File dir = new File(oagis80Dir + "OAGIS8.0");
-    if (dir.exists() && dir.isDirectory())
-    {
-      IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("sp");
-      project.create(null);
-      project.open(null);
-      copy(dir, project);
-      joinBackgroundJobs();
-      final List wsdls = new ArrayList();
-      project.accept
-      (
-        new IResourceProxyVisitor()
-        {
-          public boolean visit(IResourceProxy proxy) throws CoreException
-          {
-            if (proxy.getName().endsWith(".wsdl"))
-            {
-              wsdls.add(proxy.requestResource());
-            }
-            return true;
-          }
-        },
-        IContainer.INCLUDE_PHANTOMS
-      );
-      tagAsSummary("Open OAGIS WSDL", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.WORKING_SET});
-      startMeasuring();
-      for (Iterator it = wsdls.iterator(); it.hasNext();)
-        openWSDL((IFile)it.next());
-      stopMeasuring();
-      commitMeasurements();
-      assertPerformance();
-    }
-    else
-      fail(dir.toString());
-  }
-
-  private void copy(File src, IContainer dest) throws CoreException, FileNotFoundException
-  {
-    File[] children = src.listFiles();
-    for (int i = 0; i < children.length; i++)
-    {
-      String name = children[i].getName();
-      if (children[i].isDirectory())
-      {
-        IFolder folder = dest.getFolder(new Path(name));
-        folder.create(true, true, null);
-        copy(children[i], folder);
-      }
-      else if (name.endsWith(".wsdl") || name.endsWith(".xsd"))
-      {
-        IFile file = dest.getFile(new Path(name));
-        file.create(new FileInputStream(children[i]), true, null);
-      }
-    }
-  }
-
-  private void joinBackgroundJobs()
-  {
-    Display.getDefault().syncExec(new Runnable()
-    {
-      public void run()
-      {
-        try
-        {
-          Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-        }
-        catch (InterruptedException e)
-        {
-        }
-        long start = System.currentTimeMillis();
-        Display display = Display.getDefault();
-        while (System.currentTimeMillis() - start < 5000)
-        {
-          if (!display.readAndDispatch())
-          {
-            display.sleep();
-          }
-        }
-      }
-    });
-  }
-
-  private void openWSDL(IFile file) throws PartInitException
-  {
-    IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    IEditorPart editor = workbenchWindow.getActivePage().openEditor(new FileEditorInput(file), ID_WSDL_EDITOR, true);
-    workbenchWindow.getActivePage().closeEditor(editor, false);
-  }
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java
deleted file mode 100644
index 5d5c4ce..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
-
-package org.eclipse.wst.wsdl.tests.performance;
-
-import java.io.IOException;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.intro.IIntroManager;
-import org.eclipse.ui.intro.IIntroPart;
-
-public class OpenStockQuoteWSDLSetup extends TestCase
-{
-  public static String PROJECT_NAME = "Project";
-
-  public static Test suite()
-  {
-    return new TestSuite(OpenStockQuoteWSDLSetup.class, "OpenStockQuoteWSDLSetup");
-  }
-
-  protected void closeIntro()
-  {
-    IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
-    IIntroPart introPart = introManager.getIntro();
-    if (introPart != null)
-      introManager.closeIntro(introPart);
-  }
-
-  protected IProject createSimpleProject(String name) throws CoreException
-  {
-    IProject simpleProject = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-    simpleProject.create(null);
-    simpleProject.open(null);
-    return simpleProject;
-  }
-
-  protected void copyFile(IProject project, String source, String dest) throws IOException, CoreException
-  {
-    IFile file = project.getFile(dest);
-    file.create(PerformancePlugin.getDefault().getBundle().getEntry(source).openStream(), true, null);
-  }
-
-  protected void joinAutoBuild() throws CoreException
-  {
-    boolean interrupted = true;
-    while (interrupted)
-    {
-      try
-      {
-        Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-        interrupted = false;
-      }
-      catch (InterruptedException e)
-      {
-        interrupted = true;
-      }
-    }
-  }
-
-  public void testSetup() throws Exception
-  {
-    closeIntro();
-    IProject project = createSimpleProject(PROJECT_NAME);
-    copyFile(project, "data/StockQuote/StockQuote.wsdl", "StockQuote.wsdl");
-    joinAutoBuild();
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java
deleted file mode 100644
index 5a77575..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
-
-package org.eclipse.wst.wsdl.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-
-public class OpenStockQuoteWSDLTestCase extends PerformanceTestCase
-{
-  private final String EDITOR_ID = "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-
-  public static Test suite()
-  {
-    return new TestSuite(OpenStockQuoteWSDLTestCase.class, "OpenStockQuoteWSDLTestCase");
-  }
-
-  protected IProject getProject(String projectName) throws CoreException
-  {
-    IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-    assertTrue(project.exists());
-    project.open(null);
-    project.refreshLocal(IProject.DEPTH_INFINITE, null);
-    joinAutoBuild();
-    return project;
-  }
-
-  protected void joinAutoBuild() throws CoreException
-  {
-    boolean interrupted = true;
-    while (interrupted)
-    {
-      try
-      {
-        Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-        interrupted = false;
-      }
-      catch (InterruptedException e)
-      {
-        interrupted = true;
-      }
-    }
-  }
-
-  protected IEditorPart openEditor(IEditorInput editorInput, String editorid) throws PartInitException
-  {
-    IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    return workbenchWindow.getActivePage().openEditor(editorInput, editorid, true);
-  }
-
-  protected boolean closeEditor(IEditorPart editor)
-  {
-    IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    return workbenchWindow.getActivePage().closeEditor(editor, false);
-  }
-
-  public void testOpenStockQuoteWSDL() throws Exception
-  {
-    IProject project = getProject(OpenStockQuoteWSDLSetup.PROJECT_NAME);
-    IEditorInput editorInput = new FileEditorInput((IFile)project.findMember("StockQuote.wsdl"));
-    startMeasuring();
-    IEditorPart editorPart = openEditor(editorInput, EDITOR_ID);
-    stopMeasuring();
-    commitMeasurements();
-    assertPerformance();
-    closeEditor(editorPart);
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java
deleted file mode 100644
index 478f4ab..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
-
-package org.eclipse.wst.wsdl.tests.performance;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class PerformancePlugin extends Plugin {
-	//The shared instance.
-	private static PerformancePlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public PerformancePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PerformancePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = PerformancePlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.wsdl.tests.performance.PerformancePluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java
deleted file mode 100644
index 13d566e..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java
+++ /dev/null

@@ -1,54 +0,0 @@
-package org.eclipse.wst.wsdl.tests.performance;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.wsdl.WSDLException;
-import junit.framework.Assert;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLReaderImpl;
-
-public class ReadOAGISWSDLTestcase extends PerformanceTestCase
-{
-  private List defs = new ArrayList();
-
-  public void testReadWSDL() throws MalformedURLException, WSDLException
-  {
-    String oagis80Dir = System.getProperty("oagis80Dir");
-    Assert.assertNotNull(oagis80Dir);
-    if (!oagis80Dir.endsWith("/") && !oagis80Dir.endsWith("\\"))
-      oagis80Dir = oagis80Dir + "/";
-    File dir = new File(oagis80Dir + "OAGIS8.0/ws/wsdl");
-    if (dir.exists() && dir.isDirectory())
-    {
-      File[] wsdls = dir.listFiles
-      (
-        new FileFilter()
-        {
-          public boolean accept(File pathname)
-          {
-            return pathname.getName().endsWith(".wsdl");
-          }
-        }
-      );
-      tagAsSummary("Read OAGIS WSDL", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.WORKING_SET});
-      startMeasuring();
-      for (int i = 0; i < wsdls.length; i++)
-        readWSDL(wsdls[i].toURL().toString());
-      stopMeasuring();
-      commitMeasurements();
-      assertPerformance();
-    }
-    else
-      fail(dir.toString());
-  }
-
-  private void readWSDL(String location) throws WSDLException
-  {
-    WSDLReaderImpl reader = new WSDLReaderImpl();
-    defs.add(reader.readWSDL(location));
-  }
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java
deleted file mode 100644
index 5f7b53d..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
-
-package org.eclipse.wst.wsdl.tests.performance;
-
-import java.net.URL;
-import java.util.Hashtable;
-
-import javax.wsdl.Definition;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class ReadStockQuoteWSDLEMFTestCase extends PerformanceTestCase
-{
-  public static Test suite()
-  {
-    return new TestSuite(ReadStockQuoteWSDLEMFTestCase.class, "ReadStockQuoteWSDLEMFTestCase");
-  }
-    
-  public void testReadStockQuoteWSDL_EMF() throws Exception
-  {
-    startMeasuring();
-    URL wsdl = PerformancePlugin.getDefault().getBundle().getEntry("data/StockQuote/StockQuote.wsdl");
-    
-	ResourceSet resourceSet = new ResourceSetImpl();
-    WSDLResourceImpl resource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl"));
-	resource.setURI(URI.createURI(wsdl.toString()));
-    java.util.Map map = new Hashtable();
-    map.put(WSDLResourceImpl.CONTINUE_ON_LOAD_ERROR,Boolean.valueOf(true));
-    map.put(WSDLResourceImpl.USE_EXTENSION_FACTORIES,Boolean.valueOf(true));
-	resource.load(map); 
-	Definition definition = resource.getDefinition();
-	
-	stopMeasuring();
-	commitMeasurements();
-	assertPerformance();
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java
deleted file mode 100644
index a78fc6b..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
-
-package org.eclipse.wst.wsdl.tests.performance;
-
-import java.net.URL;
-import javax.wsdl.Definition;
-import javax.wsdl.xml.WSDLReader;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import org.xml.sax.InputSource;
-
-public class ReadStockQuoteWSDLTestCase extends PerformanceTestCase
-{
-  public static Test suite()
-  {
-    return new TestSuite(ReadStockQuoteWSDLTestCase.class, "ReadStockQuoteWSDLTestCase");
-  }
-  
-  public void testReadStockQuoteWSDL() throws Exception
-  {
-    startMeasuring();
-    URL wsdl = PerformancePlugin.getDefault().getBundle().getEntry("data/StockQuote/StockQuote.wsdl");
-    WSDLFactoryImpl factory = new WSDLFactoryImpl();
-    WSDLReader reader = factory.newWSDLReader();
-    Definition definition = reader.readWSDL(wsdl.toString(), new InputSource(wsdl.openStream()));
-    stopMeasuring();
-	commitMeasurements();
-	assertPerformance();
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java
deleted file mode 100644
index f2f7153..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java
+++ /dev/null

@@ -1,69 +0,0 @@
-package org.eclipse.wst.wsdl.tests.performance;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.net.MalformedURLException;
-import javax.wsdl.WSDLException;
-import junit.framework.Assert;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.ui.eclipse.WSDLValidator;
-
-public class ValidateOAGISWSDLTestcase extends PerformanceTestCase
-{
-  private WSDLValidator validator;
-	  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp() throws Exception 
-  {
-    super.setUp();
-    // Set the WS-I preference to ignore so only WSDL errors will be tested.
-    WSUIPlugin wsui = WSUIPlugin.getInstance();
-    PersistentWSIContext wsicontext = wsui.getWSISSBPContext();
-    wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
-    wsicontext = wsui.getWSIAPContext();
-    wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
-  } 
-
-  public void testValidateWSDL() throws MalformedURLException, WSDLException
-  {
-    String oagis80Dir = System.getProperty("oagis80Dir");
-    Assert.assertNotNull(oagis80Dir);
-    if (!oagis80Dir.endsWith("/") && !oagis80Dir.endsWith("\\"))
-      oagis80Dir = oagis80Dir + "/";
-    File dir = new File(oagis80Dir + "OAGIS8.0/ws/wsdl");
-    if (dir.exists() && dir.isDirectory())
-    {
-      File[] wsdls = dir.listFiles
-      (
-        new FileFilter()
-        {
-          public boolean accept(File pathname)
-          {
-            return pathname.getName().endsWith(".wsdl");
-          }
-        }
-      );
-      tagAsSummary("Validate OAGIS WSDL", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.WORKING_SET});
-	  validator = WSDLValidator.getInstance();
-	  startMeasuring();
-      for (int i = 0; i < wsdls.length; i++)
-        validateWSDL(wsdls[i].toURL().toString());
-      stopMeasuring();
-      commitMeasurements();
-      assertPerformance();
-    }
-    else
-      fail(dir.toString());
-  }
-
-  private void validateWSDL(String location) throws WSDLException
-  {
-    IValidationReport valreport = validator.validate(location);
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java
deleted file mode 100644
index a5e2f71..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java
+++ /dev/null

@@ -1,69 +0,0 @@
-package org.eclipse.wst.wsdl.tests.performance;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.net.MalformedURLException;
-import javax.wsdl.WSDLException;
-import junit.framework.Assert;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.ui.eclipse.WSDLValidator;
-
-public class ValidateOAGISWSITestcase extends PerformanceTestCase
-{
-  private WSDLValidator validator;
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp() throws Exception 
-  {
-    super.setUp();
-    // Set the WS-I preference to ignore so only WSDL errors will be tested.
-    WSUIPlugin wsui = WSUIPlugin.getInstance();
-    PersistentWSIContext wsicontext = wsui.getWSISSBPContext();
-    wsicontext.updateWSICompliances(PersistentWSIContext.STOP_NON_WSI);
-    wsicontext = wsui.getWSIAPContext();
-    wsicontext.updateWSICompliances(PersistentWSIContext.STOP_NON_WSI);
-  } 
-
-  public void testValidateWSDL() throws MalformedURLException, WSDLException
-  {
-    String oagis80Dir = System.getProperty("oagis80Dir");
-    Assert.assertNotNull(oagis80Dir);
-    if (!oagis80Dir.endsWith("/") && !oagis80Dir.endsWith("\\"))
-      oagis80Dir = oagis80Dir + "/";
-    File dir = new File(oagis80Dir + "OAGIS8.0/ws/wsdl");
-    if (dir.exists() && dir.isDirectory())
-    {
-      File[] wsdls = dir.listFiles
-      (
-        new FileFilter()
-        {
-          public boolean accept(File pathname)
-          {
-            return pathname.getName().endsWith(".wsdl");
-          }
-        }
-      );
-      tagAsSummary("Validate OAGIS WSDL with WS-I", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.WORKING_SET});
-	  validator = WSDLValidator.getInstance();
-	  startMeasuring();
-      for (int i = 0; i < wsdls.length; i++)
-        validateWSDL(wsdls[i].toURL().toString());
-      stopMeasuring();
-      commitMeasurements();
-      assertPerformance();
-    }
-    else
-      fail(dir.toString());
-  }
-
-  private void validateWSDL(String location) throws WSDLException
-  {
-    IValidationReport valreport = validator.validate(location);
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java
deleted file mode 100644
index 78eeb19..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
-
-package org.eclipse.wst.wsdl.tests.performance;
-
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.ui.eclipse.WSDLValidator;
-
-public class ValidateStockQuoteWSDLTestCase extends PerformanceTestCase
-{
-  private WSDLValidator validator;
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp() throws Exception 
-  {
-    super.setUp();
-    // Set the WS-I preference to ignore so only WSDL errors will be tested.
-    WSUIPlugin wsui = WSUIPlugin.getInstance();
-    PersistentWSIContext wsicontext = wsui.getWSISSBPContext();
-    wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
-    wsicontext = wsui.getWSIAPContext();
-    wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
-  }  
-  
-  public static Test suite()
-  {
-    return new TestSuite(ValidateStockQuoteWSDLTestCase.class, "ValidateStockQuoteWSDLTestCase");
-  }
-  
-  public void testValidateStockQuoteWSDL() throws Exception
-  {
-	validator = WSDLValidator.getInstance();
-    URL wsdl = PerformancePlugin.getDefault().getBundle().getEntry("data/StockQuote/StockQuote.wsdl");
-    String path = wsdl.toString();
-	
-    startMeasuring();
-    IValidationReport valreport = validator.validate(path);
-	stopMeasuring();
-	commitMeasurements();
-	assertPerformance();
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java
deleted file mode 100644
index e00fbb9..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
-
-package org.eclipse.wst.wsdl.tests.performance;
-
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.ui.eclipse.WSDLValidator;
-
-public class ValidateStockQuoteWSITestCase extends PerformanceTestCase
-{
-  private WSDLValidator validator;
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp() throws Exception 
-  {
-    super.setUp();
-    // Set the WS-I preference to ignore so only WSDL errors will be tested.
-    WSUIPlugin wsui = WSUIPlugin.getInstance();
-    PersistentWSIContext wsicontext = wsui.getWSISSBPContext();
-    wsicontext.updateWSICompliances(PersistentWSIContext.STOP_NON_WSI);
-    wsicontext = wsui.getWSIAPContext();
-    wsicontext.updateWSICompliances(PersistentWSIContext.STOP_NON_WSI);
-  }  
-  
-  public static Test suite()
-  {
-    return new TestSuite(ValidateStockQuoteWSITestCase.class, "ValidateStockQuoteWSITestCase");
-  }
-  
-  public void testValidateStockQuoteWSI() throws Exception
-  {
-	validator = WSDLValidator.getInstance();
-    URL wsdl = PerformancePlugin.getDefault().getBundle().getEntry("data/StockQuote/StockQuote.wsdl");
-    String path = wsdl.toString();
-	
-    startMeasuring();	
-    IValidationReport valreport = validator.validate(path);
-	stopMeasuring();
-	commitMeasurements();
-	assertPerformance();
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java
deleted file mode 100644
index 6d3e69a..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.wst.wsdl.tests.performance;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.validation.internal.operations.OneValidatorOperation;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-
-/**
- * Test for validation of 50 WSDL files in the sample workspace.
- * 
- * @author Kihup Boo, IBM
- */
-public class ValidateWSDLProjectTestCase extends PerformanceTestCase {
-	
-	public static Test suite() {
-		return new TestSuite(ValidateWSDLProjectTestCase.class, "Test");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-	    super.setUp();
-		// Set the WS-I preference to ignore so WS-I validation will not be run.
-		WSUIPlugin wsui = WSUIPlugin.getInstance();
-		PersistentWSIContext wsicontext = wsui.getWSISSBPContext();
-		wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
-	}
-
-	public void testWSDLProjectValidation() throws Exception {
-		String projectDir = System.getProperty("projectDir");
-		Assert.assertNotNull(projectDir);
-		if (!projectDir.endsWith("/") && !projectDir.endsWith("\\"))
-			projectDir = projectDir + "/";
-		File dir = new File(projectDir);
-		if (dir.exists() && dir.isDirectory()) {
-			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("WSDLProject");
-			project.create(null);
-			project.open(null);
-			copy(dir, project);
-			joinBackgroundJobs();
-
-			IWorkspaceRunnable myRunnable = new OneValidatorOperation(
-					project,
-					"org.eclipse.wst.wsdl.validation.internal.ui.eclipse.Validator",
-					true, 
-					false);
-			IWorkspace workspace = ResourcesPlugin.getWorkspace();
-
-			tagAsSummary("Validate WSDL Project", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.WORKING_SET });
-			startMeasuring();
-			workspace.run(myRunnable, null);
-			// project.build(IncrementalProjectBuilder.CLEAN_BUILD,null);
-			stopMeasuring();
-			commitMeasurements();
-			assertPerformance();
-		} else
-			fail(dir.toString());
-	}
-
-	private void copy(File src, IContainer dest) throws CoreException,
-			FileNotFoundException {
-		File[] children = src.listFiles();
-		for (int i = 0; i < children.length; i++) {
-			String name = children[i].getName();
-			if (children[i].isDirectory()) {
-				IFolder folder = dest.getFolder(new Path(name));
-				folder.create(true, true, null);
-				copy(children[i], folder);
-			} else {
-				IFile file = dest.getFile(new Path(name));
-				file.create(new FileInputStream(children[i]), true, null);
-			}
-		}
-	}
-
-	private void joinBackgroundJobs() {
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				try {
-					Platform.getJobManager().join(
-							ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-				} catch (InterruptedException e) {
-				}
-				long start = System.currentTimeMillis();
-				Display display = Display.getDefault();
-				while (System.currentTimeMillis() - start < 5000) {
-					if (!display.readAndDispatch()) {
-						display.sleep();
-					}
-				}
-			}
-		});
-	}
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/plugin.xml b/tests/org.eclipse.wst.wsdl.tests.performance/plugin.xml
deleted file mode 100644
index dbcfd32..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/plugin.xml
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.wsdl.tests.performance"
-   name="WSDL Performance Plug-in"
-   version="0.7.0"
-   provider-name=""
-   class="org.eclipse.wst.wsdl.tests.performance.PerformancePlugin">
-
-   <runtime>
-      <library name="performance.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.test.performance"/>
-      <import plugin="org.eclipse.wst.validation"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.wst.wsdl.validation"/>
-      <import plugin="org.wsdl4j"/>
-      <import plugin="org.eclipse.wst.ws.ui"/>
-      <import plugin="org.eclipse.wst.command.env"/>
-      <import plugin="org.eclipse.wst.command.env.core"/>
-   </requires>
-
-</plugin>

diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/test.xml b/tests/org.eclipse.wst.wsdl.tests.performance/test.xml
deleted file mode 100644
index 389ee23..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/test.xml
+++ /dev/null

@@ -1,237 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="performance" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.wst.wsdl.tests.performance"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-  <property name="perf-tests-file" value="${testDir}/performance-tests.xml"/>
-  <property name="extraVMargs" value="-Doagis80Dir=${testDir} -DprojectDir=${testDir}/OAGIS8.0 -Xmx256M"/>
-
-  <property name="workspace" value="${eclipse-home}/workspace_wsdl_performance"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org.eclipse.wst.wsdl.tests.performance*.xml"/>
-    </delete>
-  </target>
-  
-  <!-- This target defines the performance tests that need to be run. -->
-  <target name="performance_suite">
-
-    <antcall target="readOAGISWSDLTestcase"/>
-    <antcall target="readOAGISWSDLTestcase"/>
-    <antcall target="readOAGISWSDLTestcase"/>
-    <antcall target="readOAGISWSDLTestcase"/>
-    <antcall target="readOAGISWSDLTestcase"/>
-    <antcall target="readOAGISWSDLTestcase"/>
-    <antcall target="readOAGISWSDLTestcase"/>
-    <antcall target="readOAGISWSDLTestcase"/>
-
-  	<antcall target="ValidateOAGISWSDLTestcase"/>
-  	<antcall target="ValidateOAGISWSDLTestcase"/>
-	<antcall target="ValidateOAGISWSDLTestcase"/>
-  	<antcall target="ValidateOAGISWSDLTestcase"/>
-  	<antcall target="ValidateOAGISWSDLTestcase"/>
-  	<antcall target="ValidateOAGISWSDLTestcase"/>
-  	<antcall target="ValidateOAGISWSDLTestcase"/>
-  	<antcall target="ValidateOAGISWSDLTestcase"/>
-
-  	<antcall target="ValidateOAGISWSITestcase"/>
-  	<antcall target="ValidateOAGISWSITestcase"/>
-  	<antcall target="ValidateOAGISWSITestcase"/>
-  	<antcall target="ValidateOAGISWSITestcase"/>
-  	<antcall target="ValidateOAGISWSITestcase"/>
-  	<antcall target="ValidateOAGISWSITestcase"/>
-  	<antcall target="ValidateOAGISWSITestcase"/>
-  	<antcall target="ValidateOAGISWSITestcase"/>
-
-  	<antcall target="ValidateWSDLProjectTestCase"/>
-  	<antcall target="ValidateWSDLProjectTestCase"/>
-	<antcall target="ValidateWSDLProjectTestCase"/>
-  	<antcall target="ValidateWSDLProjectTestCase"/>
-  	<antcall target="ValidateWSDLProjectTestCase"/>
-  	<antcall target="ValidateWSDLProjectTestCase"/>
-  	<antcall target="ValidateWSDLProjectTestCase"/>
-  	<antcall target="ValidateWSDLProjectTestCase"/>
-  	
-    <antcall target="openEditorOAGISWSDLTestcase"/>
-    <antcall target="openEditorOAGISWSDLTestcase"/>
-    <antcall target="openEditorOAGISWSDLTestcase"/>
-    <antcall target="openEditorOAGISWSDLTestcase"/>
-    <antcall target="openEditorOAGISWSDLTestcase"/>
-    <antcall target="openEditorOAGISWSDLTestcase"/>
-    <antcall target="openEditorOAGISWSDLTestcase"/>
-    <antcall target="openEditorOAGISWSDLTestcase"/>
-
-    <antcall target="ReadStockQuoteWSDLTestCase"/>
-    <antcall target="ReadStockQuoteWSDLTestCase"/>
-    <antcall target="ReadStockQuoteWSDLTestCase"/>
-    <antcall target="ReadStockQuoteWSDLTestCase"/>
-    <antcall target="ReadStockQuoteWSDLTestCase"/>
-    <antcall target="ReadStockQuoteWSDLTestCase"/>
-    <antcall target="ReadStockQuoteWSDLTestCase"/>
-    <antcall target="ReadStockQuoteWSDLTestCase"/>
-
-  	<antcall target="ReadStockQuoteWSDLEMFTestCase"/>
-  	<antcall target="ReadStockQuoteWSDLEMFTestCase"/>
-  	<antcall target="ReadStockQuoteWSDLEMFTestCase"/>
-  	<antcall target="ReadStockQuoteWSDLEMFTestCase"/>
-  	<antcall target="ReadStockQuoteWSDLEMFTestCase"/>
-  	<antcall target="ReadStockQuoteWSDLEMFTestCase"/>
-  	<antcall target="ReadStockQuoteWSDLEMFTestCase"/>
-    <antcall target="ReadStockQuoteWSDLEMFTestCase"/>
-
-  	<antcall target="ValidateStockQuoteWSDLTestCase"/>
-  	<antcall target="ValidateStockQuoteWSDLTestCase"/>
-  	<antcall target="ValidateStockQuoteWSDLTestCase"/>
-  	<antcall target="ValidateStockQuoteWSDLTestCase"/>
-  	<antcall target="ValidateStockQuoteWSDLTestCase"/>
-  	<antcall target="ValidateStockQuoteWSDLTestCase"/>
-  	<antcall target="ValidateStockQuoteWSDLTestCase"/>
-  	<antcall target="ValidateStockQuoteWSDLTestCase"/>
-
-  	<antcall target="ValidateStockQuoteWSITestCase"/>
-  	<antcall target="ValidateStockQuoteWSITestCase"/>
-  	<antcall target="ValidateStockQuoteWSITestCase"/>
-  	<antcall target="ValidateStockQuoteWSITestCase"/>
-  	<antcall target="ValidateStockQuoteWSITestCase"/>
-  	<antcall target="ValidateStockQuoteWSITestCase"/>
-  	<antcall target="ValidateStockQuoteWSITestCase"/>
-  	<antcall target="ValidateStockQuoteWSITestCase"/>
-
-  	<antcall target="OpenStockQuoteWSDLSetup"/>
-  	<antcall target="OpenStockQuoteWSDLSetup"/>
-  	<antcall target="OpenStockQuoteWSDLSetup"/>
-  	<antcall target="OpenStockQuoteWSDLSetup"/>
-  	<antcall target="OpenStockQuoteWSDLSetup"/>
-  	<antcall target="OpenStockQuoteWSDLSetup"/>
-    <antcall target="OpenStockQuoteWSDLSetup"/>
-  	<antcall target="OpenStockQuoteWSDLSetup"/>
-
-  </target>
-
-  <target name="readOAGISWSDLTestcase">
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="core-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ReadOAGISWSDLTestcase"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>
-    </ant>
-  </target>
-
-  <target name="ValidateOAGISWSDLTestcase">
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ValidateOAGISWSDLTestcase"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>
-    </ant>
-  </target>
-
-  <target name="ValidateOAGISWSITestcase">
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ValidateOAGISWSITestcase"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>
-    </ant>
-  </target>
-
-  <target name="ValidateWSDLProjectTestCase">
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ValidateWSDLProjectTestCase"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>
-    </ant>
-  </target>
-	
-  <target name="openEditorOAGISWSDLTestcase">
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.OpenEditorOAGISWSDLTestcase"/>
-      <property name="extraVMargs" value="${extraVMargs}"/>
-    </ant>
-  </target>
-
-  <target name="ReadStockQuoteWSDLTestCase">
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="core-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ReadStockQuoteWSDLTestCase"/>
-    </ant>
-  </target>
-
-  <target name="ReadStockQuoteWSDLEMFTestCase">
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="core-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ReadStockQuoteWSDLEMFTestCase"/>
-    </ant>
-  </target>
-
-  <target name="ValidateStockQuoteWSDLTestCase">
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ValidateStockQuoteWSDLTestCase"/>
-    </ant>
-  </target>
-
-  <target name="ValidateStockQuoteWSITestCase">
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ValidateStockQuoteWSITestCase"/>
-    </ant>
-  </target>
-
-  <target name="OpenStockQuoteWSDLSetup">
-    <delete dir="${workspace}" quiet="true"/>
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.OpenStockQuoteWSDLSetup"/>
-    </ant>
-    <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.OpenStockQuoteWSDLTestCase"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-	<delete dir="${workspace}" quiet="true"/>
-  </target>
-  
-  <!-- This target runs the performance test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="performance" depends="init,performance_suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org.eclipse.wst.wsdl.tests.performance*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/.classpath b/tests/org.eclipse.wst.wsdl.tests.ui/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore b/tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore
deleted file mode 100644
index 5eaddfe..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsdl.tests.ui.jar

diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/.project b/tests/org.eclipse.wst.wsdl.tests.ui/.project
deleted file mode 100644
index b4c5d49..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/.project
+++ /dev/null

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsdl.tests.ui</name>
-	<comment></comment>
-	<projects>
-		<project>com.ibm.etools.wsdl</project>
-		<project>org.eclipse.xsd</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/about.html b/tests/org.eclipse.wst.wsdl.tests.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/build.properties b/tests/org.eclipse.wst.wsdl.tests.ui/build.properties
deleted file mode 100644
index 64a567b..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/build.properties
+++ /dev/null

@@ -1,9 +0,0 @@
-source.wsdl.tests.ui.jar = src/
-bin.includes = plugin.xml,\
-               *.jar,\
-               wsdl.tests.ui.jar,\
-               TemperatureService.wsdl,\
-               jars/,\
-               about.html
-src.includes = TemperatureService.wsdl,\
-               jars/

diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/plugin.xml b/tests/org.eclipse.wst.wsdl.tests.ui/plugin.xml
deleted file mode 100644
index 1fd1491..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/plugin.xml
+++ /dev/null

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-   id="org.eclipse.wst.wsdl.tests.ui"
-   name="WSDL Model UI Samples"
-   version="0.7.0">
-
-   <runtime>
-      <library name="wsdl.tests.ui.jar"/>
-   </runtime>
-   
-   <requires>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.wst.wsdl.tests"/>
-      <import plugin="org.eclipse.xsd"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.junit"/>
-   </requires>
-   
-   <extension point="org.eclipse.ui.popupMenus">
-      <objectContribution
-          objectClass="org.eclipse.core.resources.IFile"
-          nameFilter="*.wsdl"
-          id="org.eclipse.wst.wsdl.tests.ui.object_contribution">
-         <!--
-         <action
-             label="Generate WSDL Sample"
-             class="org.eclipse.wst.wsdl.tests.ui.GenerateWSDLActionDelegate"
-             enablesFor="1"
-             id="org.eclipse.wst.wsdl.tests.ui.generate_wsdl_action">
-         </action>
-         -->
-         <action
-             label="Convert to WSDL 2.0 Document"
-             class="org.eclipse.wst.wsdl.tests.ui.ConvertWSDL20ActionDelegate"
-             enablesFor="1"
-             id="org.eclipse.wst.wsdl.tests.ui.convert_wsdl_action">
-         </action>
-         
-      </objectContribution>
-   </extension>
-   
-</plugin>

diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/ConvertWSDL20ActionDelegate.java b/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/ConvertWSDL20ActionDelegate.java
deleted file mode 100644
index ba87f03..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/ConvertWSDL20ActionDelegate.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests.ui;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.tests.util.DefinitionLoader;
-import org.eclipse.wst.wsdl.tests.util.WSDLConverter;
-
-
-
-public class ConvertWSDL20ActionDelegate implements IActionDelegate
-{
-  private ISelection selection = null;
-
-  public void run(IAction action)
-  {
-    IFile ifile = null;
-    if (!selection.isEmpty() && selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-      Object element = structuredSelection.getFirstElement();
-
-      if (element instanceof IFile)
-      {
-      	ifile = (IFile) element;
-        IPath path = ifile.getLocation();
-        IPath path2 = path.removeLastSegments(1);
-        String output = path2.toString() + "/" + getNewName(ifile);
-        
-        try
-		    {  
-            Definition def = DefinitionLoader.load("file:/" + path.toString());
-            WSDLConverter converter = new WSDLConverter(def);
-            converter.generate20(output);
-            IContainer folder = ifile.getParent();
-            folder.refreshLocal(IResource.DEPTH_ONE,null);
-		    }
-        catch (Throwable e)
-		    {
-          e.printStackTrace();
-		    }
-      }
-      else
-        return;
-    }
-        
-  }
-  
-  private String getNewName(IFile ifile)
-  {
-    // Assert currentName has a file extension, e.g. foo.wsdl.
-    // This will return fooV20.wsdl.
-    String currentName = ifile.getName();
-    String name = currentName.substring(0,currentName.indexOf("."));
-    String extension = currentName.substring(currentName.indexOf("."));
-    String newName = name + "V20" + extension;
-    return newName;
-  }
-  
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-    this.selection = selection;
-  }
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/GenerateWSDLActionDelegate.java b/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/GenerateWSDLActionDelegate.java
deleted file mode 100644
index 19ae8c3..0000000
--- a/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/GenerateWSDLActionDelegate.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests.ui;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.wst.wsdl.tests.WSDLGenerationTest;
-
-public class GenerateWSDLActionDelegate implements IActionDelegate
-{
-  private ISelection selection = null;
-
-  public void run(IAction action)
-  {
-    IFile ifile = null;
-    if (!selection.isEmpty() && selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-      Object element = structuredSelection.getFirstElement();
-
-      if (element instanceof IFile)
-      {
-      	ifile = (IFile) element;
-        IPath path = ifile.getLocation();
-        path = path.removeLastSegments(1);
-        String output = path.toString() + "/MySample.wsdl";
-        
-        try
-		{
-          (new WSDLGenerationTest()).generateTemperatureService(output);
-		}
-        catch (Exception e)
-		{
-          e.printStackTrace();
-		}
-
-      }
-      else
-        return;
-    }
-        
-  }
-  
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-    this.selection = selection;
-  }
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/.classpath b/tests/org.eclipse.wst.wsdl.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/tests/org.eclipse.wst.wsdl.tests/.cvsignore b/tests/org.eclipse.wst.wsdl.tests/.cvsignore
deleted file mode 100644
index 8b5249c..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsdl.tests.jar

diff --git a/tests/org.eclipse.wst.wsdl.tests/.project b/tests/org.eclipse.wst.wsdl.tests/.project
deleted file mode 100644
index 07bfa84..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/.project
+++ /dev/null

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsdl.tests</name>
-	<comment></comment>
-	<projects>
-		<project>com.ibm.etools.wsdl</project>
-		<project>com.ibm.wsdl</project>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.emf.ecore</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.xsd</project>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/tests/org.eclipse.wst.wsdl.tests/about.html b/tests/org.eclipse.wst.wsdl.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.tests/build.properties b/tests/org.eclipse.wst.wsdl.tests/build.properties
deleted file mode 100644
index 6a439a1..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/build.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-bin.includes = plugin.xml,\
-               test.xml,\
-               .options,\
-               testResources/,\
-               runtests.bat,\
-               JUNIT.XSL,\
-               runtime/,\
-               wsdl.tests.jar,\
-               samples/,\
-               about.html
-source.wsdl.tests.jar = src/
-src.includes = build.xml,\
-               .options,\
-               JUNIT.XSL,\
-               runtests.bat,\
-               testResources/,\
-               runtime/,\
-               PTATimeDistribution.wsdl,\
-               TDDataSet.xsd

diff --git a/tests/org.eclipse.wst.wsdl.tests/plugin.xml b/tests/org.eclipse.wst.wsdl.tests/plugin.xml
deleted file mode 100644
index 8cc4779..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/plugin.xml
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.wsdl.tests"
-   name="WSDL JUnit Test"
-   version="0.7.0"
-   class="org.eclipse.wst.wsdl.tests.WSDLTestsPlugin">
-
-   <runtime>
-      <library name="wsdl.tests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.xsd"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.wsdl4j"/>
-      <import plugin="org.eclipse.wst.common.uriresolver"/>
-   </requires>
-
-</plugin>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/LoadAndPrintTest.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/LoadAndPrintTest.wsdl
deleted file mode 100644
index 0cb3a53..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/LoadAndPrintTest.wsdl
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/LoadAndPrintTest/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="LoadAndPrintTest" targetNamespace="http://tempuri.org/LoadAndPrintTest/">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://tempuri.org/LoadAndPrintTest/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part element="tns:NewOperationRequest" name="NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="LoadAndPrintTest">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="LoadAndPrintTestSOAP" type="tns:LoadAndPrintTest">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://tempuri.org/LoadAndPrintTest/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="LoadAndPrintTest">
-    <wsdl:port binding="tns:LoadAndPrintTestSOAP" name="LoadAndPrintTestSOAP">
-      <soap:address location="http://tempuri.org"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java
deleted file mode 100644
index eadd168..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests;
-
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * @author Kihup Boo
- */
-public class AllTestCases extends TestCase
-{
-
-  public AllTestCases()
-  {
-  }
-
-  public static void main(String[] args)
-  {
-  }
-  
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTest(InlineSchemaTest.suite());  
-    suite.addTest(LoadAndSerializationTest.suite());
-    suite.addTest(SemanticTest.suite());
-    suite.addTest(WSDLGenerationTest.suite());
-    suite.addTest(WSDL4JAPITest.suite());
-    suite.addTest(WSDLEMFAPITest.suite());
-	suite.addTest(UtilTest.suite());
-    
-    return suite;
-  }
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.java
deleted file mode 100644
index 587facf..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.java
+++ /dev/null

@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.tests;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.wsdl.xml.WSDLReader;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.tests.util.DefinitionLoader;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-import org.xml.sax.InputSource;
-
-/**
- * @author Kihup Boo
- */
-public class InlineSchemaTest extends TestCase 
-{
-  private String PLUGIN_ABSOLUTE_PATH = WSDLTestsPlugin.getInstallURL();
-	  
-  public InlineSchemaTest(String name) 
-  {
-    super(name);
-  }
-	
-  public static void main(String[] args) 
-  {
-    //junit.textui.TestRunner.run(InlineSchemaTest.class);
-    junit.textui.TestRunner.run(suite());
-  }
-	
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTest
-      (new InlineSchemaTest("InlineSchema") 
-         {
-           protected void runTest() 
-           {
-	         testInlineSchema();
-	       }
-	     }
-	   );
-    
-    suite.addTest
-      (new InlineSchemaTest("InlineSchemaWithWSDL4J") 
-         {
-           protected void runTest() 
-           {
-             testInlineSchemaWithWSDL4J();
-           }
-	     }
-	   );
-    
-	  return suite;
-  }
-
-  protected void setUp() throws Exception 
-  {
-    super.setUp();
-    
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLPackage pkg = WSDLPackage.eINSTANCE;
-    
-    // We need this for XSD <import>.
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl());
-    XSDPackage xsdpkg = XSDPackage.eINSTANCE;
-  }
-
-  protected void tearDown() throws Exception 
-  {
-    super.tearDown();
-  }
-
-  public void testInlineSchema() 
-  {
-    try
-    {
-      Definition definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH +"samples/LoadAndPrintTest.wsdl");
-      traverseDefinition(definition);
-    }
-    catch (Exception e)
-    {
-      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-    }
-  }
-  
-  public void testInlineSchemaWithWSDL4J() 
-  {
-    try
-    {
-      Definition definition = loadDefinitionForWSDL4J("./samples/LoadAndPrintTest.wsdl");
-      traverseDefinition(definition);
-    }
-    catch (Exception e)
-    {
-      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); 
-    }
-  }
-  
-  public void traverseDefinition(Definition definition) throws Exception
-  {
-    Assert.assertNotNull(definition);
-    
-    Iterator iter = definition.getEImports().iterator();
-    while (iter.hasNext())
-    {
-      Import myImport = (Import)iter.next();
-      //traverseImport(myImport);
-    }    
-    
-    // Get Inline Schema
-    Types types = (org.eclipse.wst.wsdl.Types)definition.getTypes();
-    Assert.assertNotNull("<types> is null",types);
-    if (types != null)
-    {
-      Iterator iterator = types.getSchemas().iterator();
-      Assert.assertTrue("<types> does not have inline <schema>s",iterator.hasNext());
-      while (iterator.hasNext())
-      {
-        XSDSchema schema = (XSDSchema)iterator.next();
-        traverseSchema(schema);
-      }
-    }  	
-  }
-  
-  private void traverseImport(Import myImport) throws Exception
-  {
-    Definition def = myImport.getEDefinition();
-    traverseDefinition(def);
-  }
-  
-  private void traverseSchema(XSDSchema schema)
-  {
-  	Iterator iterator = schema.getElementDeclarations().iterator();
-  	XSDElementDeclaration elementDecl = null;
-    Assert.assertTrue("No <element>s are found",iterator.hasNext());
-  	while (iterator.hasNext())
-    {
-      elementDecl = (XSDElementDeclaration)iterator.next();
-
-      if (elementDecl.getName().equals("NewOperationResponse"))
-      	traverseElementDecl(elementDecl);
-      else if (elementDecl.getName().equals("NewOperationRequest"))
-        traverseElementDecl(elementDecl);
-    }
-  }
-
-  private void traverseElementDecl(XSDElementDeclaration elementDecl)
-  {
-    XSDTypeDefinition type = elementDecl.getTypeDefinition();
-    Assert.assertTrue("<element> does not have <simpleType>",type instanceof XSDSimpleTypeDefinition);
-    if (type.getComplexType() == null) // simple type
-      return; // TBD - Currently this always returns at this point.
-    XSDParticleContent content = type.getComplexType().getContent();   
-    traverseModelGroup((XSDModelGroup)content);
-  }
-  
-  private void traverseModelGroup(XSDModelGroup modelGroup)
-  {
-    Iterator iterator = modelGroup.getContents().iterator();
-    XSDParticleContent particleContent = null;
-    while (iterator.hasNext())
-    {
-      particleContent = ((XSDParticle)iterator.next()).getContent();
-      if (particleContent instanceof XSDElementDeclaration)
-      {
-        if (((XSDElementDeclaration)particleContent).isElementDeclarationReference())
-          traverseElementDecl(((XSDElementDeclaration)particleContent).getResolvedElementDeclaration());
-        else
-          traverseElementDecl((XSDElementDeclaration)particleContent);
-      }
-    }
-  }
-  
-  private Definition loadDefinition(String wsdlFile) throws IOException
-  {
-    return DefinitionLoader.load(wsdlFile);
-  }
-  
-  private Definition loadDefinitionForWSDL4J(String wsdlFile) throws Exception
-  {
-    WSDLReader reader = (new WSDLFactoryImpl()).newWSDLReader();
-    IPluginDescriptor pd = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.wst.wsdl.tests");
-    URL url = pd.getInstallURL();
-    url = new URL(url,wsdlFile);
-    String s = Platform.resolve(url).getFile();
-    Definition definition = (org.eclipse.wst.wsdl.Definition)reader.readWSDL(s,new InputSource(new FileInputStream(s)));
-    return definition;
-  }
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.java
deleted file mode 100644
index eccc6ae..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests;
-
-import java.io.File;
-import java.io.FileFilter;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-import org.eclipse.wst.wsdl.tests.util.DefinitionLoader;
-import org.eclipse.wst.wsdl.tests.util.XMLDiff;
-
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-import org.w3c.dom.Element;
-
-/**
- * @author Kihup Boo
- */
-public class LoadAndSerializationTest extends TestCase
-{ 
-  {	    
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLPackage pkg = WSDLPackage.eINSTANCE;
-	    
-    // We need this for XSD <import>.
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl());
-    XSDPackage xsdpkg = XSDPackage.eINSTANCE; 
-  }
-  
-  private String PLUGIN_ABSOLUTE_PATH = WSDLTestsPlugin.getInstallURL();
-  static private File[] wsdls;
-  static private Definition definition = null;
-	
-  /**
-   * Executes a stand-alone test.
-   * @param objects an array of Strings from the command line.
-   * @see #run
-   */
-  public static void main(String args[]) 
-  {
-    junit.textui.TestRunner.run(suite());
-  }
-  
-  public LoadAndSerializationTest(String name) 
-  {
-    super(name);
-  }
-  
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    suite.addTest
-    (new LoadAndSerializationTest("LoadAndStore") 
-      {
-        protected void runTest() 
-        {
-          testLoadAndStore();
-        }
-      }
-    );
-    /* suite.addTest // wtp bug 79326
-    (new LoadAndSerializationTest("Compare") 
-      {
-        protected void runTest() 
-        {
-          testCompare();
-        }
-      }
-    ); */
-    return suite;
-  } 
-
-  /**
-   * Load from the WSDL definitions file and store back to a different file.
-   */
-  public void testLoadAndStore()
-  {
-    File dir = new File(PLUGIN_ABSOLUTE_PATH + "samples");
-    if (dir.exists() && dir.isDirectory())
-    {
-      wsdls = dir.listFiles
-      (
-        new FileFilter()
-        {
-          public boolean accept(File pathname)
-          {
-            return pathname.getName().endsWith(".wsdl");
-          }
-        }
-      );
-
-      try 
-      {
-        for (int i = 0; i < wsdls.length; i++)
-        {
-          System.out.println(wsdls[i].toURL().toString());
-          load(wsdls[i].toString());
-          print(wsdls[i].toString() + ".out");
-        }
-      }
-      catch (Exception e)
-      {
-        Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-      }
-    }
-    else
-      fail(dir.toString());
-
-  }
-  
-  /*
-   * Load from the WSDL definitions file.
-   */
-  private void load(String filename)
-  {	
-    try
-    {
-      definition = DefinitionLoader.load(filename);
-	  Assert.assertNotNull(definition);
-      Assert.assertTrue(definition.eResource() instanceof WSDLResourceImpl);
-	  
-      WSDLResourceImpl wsdlResource = (WSDLResourceImpl)definition.eResource();
-	  Assert.assertNotNull(wsdlResource);
-
-	  Element element = definition.getElement();
-      Assert.assertNotNull(definition.getElement());
-	  
-      WSDLResourceImpl.serialize(System.out, element);
-    }
-    catch (Exception e)
-    {
-      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-    }  
-  }
-  
-  /*
-   * Store the WSDL definitions to a file.
-   */  
-  private void print(String filename)
-  {
-    try
-    {
-      // This removes the associated DOM element, creates a new associated DOM element, and then prints it.
-      // This is a good test for how well serialization works for a model created "bottom up".
-      //
-      definition.setDocument(null);
-      definition.setElement(null);
-      ((DefinitionImpl)definition).updateElement();
-
-	  DefinitionLoader.store(definition,filename);
-    }
-    catch (Exception e)
-    {
-      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-    }   
-  }
-  
-  /**
-   * Compare the output WSDL file to the original.
-   */  
-  public void testCompare()
-  {
-    XMLDiff xmldiff = new XMLDiff();
-    try
-    {
-      for (int i = 0; i < wsdls.length; i++)
-        Assert.assertTrue(xmldiff.diff(wsdls[i].toString(),wsdls[i].toString() + ".out")); 
-    }
-    catch (Exception e)
-    {
-      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-    }
-  }      
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java
deleted file mode 100644
index 4ccaa4d..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests;
-
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-
-public class MyResolver implements EntityResolver
-{
-  public InputSource resolveEntity(String publicId, String systemId)
-  {
-    if (systemId.equals("http://www.myhost.com/today"))
-    {
-      // return a special input source
-      //MyReader reader = new MyReader();
-      //return new InputSource(reader);
-      return new InputSource(systemId); // TBD
-    }
-    else
-    {
-      // use the default behaviour
-      return null;
-    }
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java
deleted file mode 100644
index 474d985..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.w3c.dom.Document;
-import org.xml.sax.EntityResolver;
-
-public class ParserTest extends TestCase
-{
-  
-  public ParserTest(String name) 
-  {
-    super(name);
-  }
-  
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTest
-      (new ParserTest("Parser") 
-         {
-           protected void runTest() 
-           {
-             testParser();
-           }
-         }
-       );
-    
-    return suite;
-  }
-  
-  public void testParser() 
-  {
-    EntityResolver myResolver = new MyResolver();
-    try
-    {
-      InputStream is = new FileInputStream("./samples/LoadAndPrintTest.wsdl");
-      DocumentBuilder myBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-      myBuilder.setEntityResolver(myResolver);
-      Document doc = myBuilder.parse(is);
-      Assert.assertNotNull("Document is null",doc);
-    }
-    catch (Exception e)
-    {
-      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-    }
-  }
-  
-  public static void main(String[] args)
-  {
-  }
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java
deleted file mode 100644
index 16c2962..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java
+++ /dev/null

@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-public class RefactoringTest extends TestCase
-{
-  public RefactoringTest()
-  {
-    //init();
-  }
-  
-  public RefactoringTest(String name) 
-  {
-    super(name);
-  }  
-  
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTest
-      (new RefactoringTest("Refactoring") 
-         {
-           protected void runTest() 
-           {
-             testRefactoring();
-         }
-       }
-     );
-    
-    return suite;
-  }
-  
-  public void testRefactoring() 
-  {
-    try
-    {
-	  // Before running this test, modify the location of the generated WSDL file
-      generateWSDL("RefactoringTest.wsdl");
-    }
-    catch (Exception e)
-    {
-      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-    }
-  }
-  
-  protected void setUp() throws Exception 
-  {
-    super.setUp();
-    
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLPackage pkg = WSDLPackage.eINSTANCE;
-    
-    // We need this for XSD <import>.
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl());
-    XSDPackage xsdpkg = XSDPackage.eINSTANCE;
-  }
-
-  protected void tearDown() throws Exception 
-  {
-    super.tearDown();
-  }
-
-  // defect 6594
-  public void renameOperation(Operation op)
-  {
-	Input input = op.getEInput();
-	Assert.assertNotNull(input);
-	Message message = input.getEMessage();
-	Assert.assertNotNull(message);
-	
-	op.setName("Renamed" + op.getName());
-	QName newQName = new QName(message.getQName().getNamespaceURI(),"Renamed" + message.getQName().getLocalPart());
-	message.setQName(newQName);
-  }
-  
-  public void generateWSDL(String outputFile) throws Exception
-  {
-    ResourceSet resourceSet = new ResourceSetImpl();
-    Resource resource = resourceSet.createResource(URI.createFileURI(outputFile));
-    resourceSet.getResources().add(resource);
-
-    // Create a Definition - Temperature
-    Definition definition = WSDLFactory.eINSTANCE.createDefinition();
-    definition.setQName(new QName(WSDLConstants.WSDL_NAMESPACE_URI,"Temparature"));
-    resource.getContents().add(definition);
-    
-    // Target namespace - http://www.temperature.com
-    definition.setTargetNamespace("http://www.temperature.com");
-    definition.addNamespace("tns", "http://www.temperature.com");
-    
-    // Other namespaces - wsdl, soap, xsd
-    definition.addNamespace("wsdl", WSDLConstants.WSDL_NAMESPACE_URI);
-    definition.addNamespace("xsd", WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-    definition.addNamespace("soap", SOAPConstants.SOAP_NAMESPACE_URI);
-
-    //
-    // Let's start building two messages
-    //
-    
-    // Create a Part - ZipCode
-    Part part = WSDLFactory.eINSTANCE.createPart();
-    part.setName("ZipCode");
-    part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string"));
-    
-    // Create a Message - GetTemperatureInput
-    Message inputMessage = WSDLFactory.eINSTANCE.createMessage();
-    inputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureInput"));
-    inputMessage.addPart(part);
-    definition.addMessage(inputMessage);
-    
-    // Create a Part - Temperature
-    part = WSDLFactory.eINSTANCE.createPart();
-    part.setName("Temperature");
-    part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"float"));
-
-    // Create a Message - GetTemperatureOutput
-    Message outputMessage = WSDLFactory.eINSTANCE.createMessage();
-    outputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureOutput"));
-    outputMessage.addPart(part);
-    definition.addMessage(outputMessage);
-    
-    //
-    // Next, build a PortType
-    //
-    
-    // Create an Input - GetTemperatureInput
-    Input input = WSDLFactory.eINSTANCE.createInput();
-    input.setMessage(inputMessage);
-
-    // Create an Output - GetTemperatureOutput
-    Output output = WSDLFactory.eINSTANCE.createOutput();
-    output.setMessage(outputMessage);
-   
-    // Create an Operation - GetTemperatureForZipCode
-    Operation operation = WSDLFactory.eINSTANCE.createOperation();
-    operation.setName("GetTemperatureForZipCode");
-    operation.setInput(input);
-    operation.setOutput(output);
-    
-    // Create a PortType
-    PortType portType = WSDLFactory.eINSTANCE.createPortType();
-    portType.setQName(new QName(definition.getTargetNamespace(),"GetTemparatureInfoSOAP"));
-    portType.addOperation(operation);
-    definition.addPortType(portType);
-	
-	//
-	// Create the second set op Operations
-	//
-	
-    // Create a Part
-    part = WSDLFactory.eINSTANCE.createPart();
-    part.setName("Part2");
-    part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string"));
-    
-    // Create a Message
-    Message inputMessage2 = WSDLFactory.eINSTANCE.createMessage();
-    inputMessage2.setQName(new QName(definition.getTargetNamespace(), "InputMessage2"));
-    inputMessage2.addPart(part);
-    definition.addMessage(inputMessage2);
-    
-    // Create a Part
-    part = WSDLFactory.eINSTANCE.createPart();
-    part.setName("Part3");
-    part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"float"));
-
-    // Create a Message - GetTemperatureOutput
-    Message outputMessage2 = WSDLFactory.eINSTANCE.createMessage();
-    outputMessage2.setQName(new QName(definition.getTargetNamespace(), "OutputMessage2"));
-    outputMessage2.addPart(part);
-    definition.addMessage(outputMessage2);	
-	
-    // Create an Input
-    Input input2 = WSDLFactory.eINSTANCE.createInput();
-    input2.setMessage(inputMessage2);
-
-    // Create an Output - GetTemperatureOutput
-    Output output2 = WSDLFactory.eINSTANCE.createOutput();
-    output2.setMessage(outputMessage2);
-   
-    // Create an Operation - GetTemperatureForZipCode
-    Operation operation2 = WSDLFactory.eINSTANCE.createOperation();
-    operation2.setName("Operation2");
-    operation2.setInput(input2);
-    operation2.setOutput(output2);	
-	
-	portType.addOperation(operation2);
-     
-	renameOperation(operation);
-	renameOperation(operation2);
-	
-    resource.save(null);
- 
-  }
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java
deleted file mode 100644
index 4119daf..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java
+++ /dev/null

@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests;
-
-import java.util.Iterator;
-
-import javax.wsdl.OperationType;
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.tests.util.DefinitionLoader;
-import org.eclipse.wst.wsdl.tests.util.DefinitionVisitor;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-import org.w3c.dom.Element;
-
-/**
- * @author Kihup Boo
- */
-public class SemanticTest extends DefinitionVisitor
-{
-  private String PLUGIN_ABSOLUTE_PATH = WSDLTestsPlugin.getInstallURL(); 
-  //private String wsdlNamespacePrefix;
-  //private String xsdNamespacePrefix;
-  
-  {
-    // This is needed because we don't have the following in the plugin.xml
-    //
-    //   <extension point = "org.eclipse.emf.extension_parser">
-    //     <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/>
-    //   </extension>
-    //
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLPackage pkg = WSDLPackage.eINSTANCE;
-  
-    // We need this for XSD <import>.
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl());
-    XSDPackage xsdpkg = XSDPackage.eINSTANCE;
-  }
-  
-  // Added for JUnit
-  public SemanticTest(String name) 
-  {
-    super(name);
-  }
-  
-  /**
-   * @param definition
-   */
-  public SemanticTest(Definition definition)
-  {
-    super(definition);
-  }
-/*  
-  private void serialize(String filename) throws Exception
-  {
-    Source domSource = new DOMSource(doc);
-    Transformer transformer = TransformerFactory.newInstance().newTransformer();
-    transformer.setOutputProperty(OutputKeys.INDENT,"yes");
-    transformer.setOutputProperty(OutputKeys.ENCODING,"UTF-8");
-    transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount","4");
-    transformer.transform(domSource,new StreamResult(new FileOutputStream(filename)));
-  }
-  
-  private void createDocument() throws ParserConfigurationException
-  {
-    doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-  }
-  
-  private Element createWSDLElement(String name)
-  {
-    Element element = doc.createElementNS("http://www.w3.org/2004/08/wsdl",name);
-    if (wsdlNamespacePrefix != null)
-      element.setPrefix(wsdlNamespacePrefix);
-    
-    return element;
-  }
- */ 
-  private void visitDocumentation(Element docElement)
-  {
-    if (docElement == null)
-      return;
-    println("documentation: " + docElement); // TBD - serialize docElement
-  }
-  
-  private void println(String s)
-  {
-    System.out.println(s);
-  }
-  
-  protected void visitDefinition(Definition def)
-  {
-    println("Visiting definitions...");
-    visitDocumentation(def.getDocumentationElement());
-    
-    QName qname = def.getQName();
-    if (qname != null)
-      println("name: " + qname.getLocalPart());
-    
-    String targetNamespace = def.getTargetNamespace();
-    if (targetNamespace != null)
-      println("targetNamespace: " + targetNamespace);
-    
-    Iterator iterator = def.getNamespaces().keySet().iterator();
-    String prefix = null;
-    String namespace = null;
-
-    while (iterator.hasNext())
-    {
-      prefix = (String)iterator.next();
-      namespace = def.getNamespace(prefix);
-      println("namespace prefix: " + prefix + ", namespace URI: " + namespace);
-    }
-    super.visitDefinition(def);
-    println("Leaving definitions...");
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitImport(org.eclipse.wst.wsdl.Import)
-   */
-  protected void visitImport(Import wsdlImport)
-  {
-    println("Visiting import...");
-    // Determine if we <import> a schema.
-    if (importingSchema(wsdlImport))
-    {
-      println("<import>ing XML Schema");
-      
-      //  <xs:import namespace="http://foo.com" schemaLocation= "bar.xsd"/>
-      println("namespace: " + wsdlImport.getNamespaceURI());
-      println("schemaLocation: " + wsdlImport.getLocationURI());
-      visitDocumentation(wsdlImport.getDocumentationElement());      
-    }
-  	else
-    {
-      println("<import>ing WSDL");
-      visitDocumentation(wsdlImport.getDocumentationElement());
-    }
-    println("Leaving import...");
-  }
-  
-  private boolean importingSchema(Import myImport)
-  {
-    if (myImport.getDefinition() != null) // it is WSDL import
-      return false;
-    else
-      return true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitTypes(org.eclipse.wst.wsdl.Types)
-   */
-  protected void visitTypes(Types types)
-  {
-    println("Visiting types...");
-
-    Iterator iterator = types.getSchemas().iterator();
-    XSDSchema schema = null;
-    while (iterator.hasNext())
-    {
-      schema = (XSDSchema)iterator.next();
-      println("in-line schema: " + schema);
-    }   
-    println("Leaving types...");
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitPart(org.eclipse.wst.wsdl.Part)
-   */
-  protected void visitPart(Part part)
-  {
-    println("Visiting part...");
-  }
-
-  protected void visitPortType(PortType portType)
-  {
-    println("Visiting portType...");
-  	visitDocumentation(portType.getDocumentationElement());
-  	
-    QName qname = portType.getQName();
-    if (qname != null)
-      println("name: " + qname.getLocalPart());
-    
-    super.visitPortType(portType);
-    println("Leaving portType...");
-  }
-  
-  protected void visitOperation(Operation operation)
-  {
-    println("Visiting operation...");
-    visitDocumentation(operation.getDocumentationElement());
-	
-    String name = operation.getName();
-    if (name != null)
-      println("name: " + name);
-
-    OperationType opType = operation.getStyle();
-    Assert.assertNotNull("Failed determining Operation Type",opType);
-    
-    if (OperationType.REQUEST_RESPONSE == opType)
-      println("op type: " + "in-out");
-    else if (OperationType.SOLICIT_RESPONSE == opType)
-      println("op type" + "out-in");
-    else if (OperationType.NOTIFICATION == opType)
-      println("op type" + "out-only");
-    else if (OperationType.ONE_WAY == opType)
-      println("op type" + "in-only");
-    
-    super.visitOperation(operation);
-    println("Leaving operation...");
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitInput(org.eclipse.wst.wsdl.Input)
-   */
-  protected void visitInput(Input input)
-  {
-    println("Visiting input...");
-    visitDocumentation(input.getDocumentationElement());
-    
-    String name = input.getName();
-    if (name != null)
-      println("name: " + name);
-    
-    Message message = input.getEMessage();
-    Assert.assertNotNull("Failed to resolve the message",message);
-    
-    println("Leaving input...");
-  }
-  
-  private Element getPartElement(MessageReference messageRef)
-  {
-    Iterator iterator = messageRef.getEMessage().getEParts().iterator();
-    // TBD - for now, take the first part.
-    Part part = (Part)iterator.next();
-    Element partElement = part.getElement();
-    return partElement;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitOutput(org.eclipse.wst.wsdl.Output)
-   */
-  protected void visitOutput(Output output)
-  {
-    println("Visiting output...");
-    visitDocumentation(output.getDocumentationElement());
-    
-    String name = output.getName();
-    if (name != null)
-      println("name: " + name);
-    
-    Message message = output.getEMessage();
-    Assert.assertNotNull("Failed to resolve the message",message);
-    
-    println("Leaving output...");
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitFault(org.eclipse.wst.wsdl.Fault)
-   */
-  protected void visitFault(Fault fault)
-  {
-    println("Visiting fault...");
-    println("Leaving fault...");
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitBinding(org.eclipse.wst.wsdl.Binding)
-   */
-  protected void visitBinding(Binding binding)
-  {
-    println("Visiting binding...");
-    visitDocumentation(binding.getDocumentationElement());
-    
-    QName qname = binding.getQName();
-    if (qname != null)
-      println("name: " + qname.getLocalPart());
-    
-    PortType portType = binding.getEPortType();
-    Assert.assertNotNull("Failed to resolve the portType",portType);
-
-    super.visitBinding(binding);
-    Assert.assertTrue("<soapBody> is missing",soapBodyVisited);
-    Assert.assertTrue("<soapBinding> is missing",soapBindingVisited);
-    Assert.assertTrue("<soapOperation> is missing",soapOperationVisited);
-    println("Leaving binding...");
-  }
-  
-  protected void visitBindingOperation(BindingOperation bindingOperation)
-  {
-    println("Visiting binding operation...");
-    visitDocumentation(bindingOperation.getDocumentationElement());
-    
-    Operation operation = bindingOperation.getEOperation();
-    Assert.assertNotNull("Failed to resolve the operation",operation);
-    
-    if (operation != null)
-    {
-      String operationName = operation.getName();
-      println("name: " + operationName);
-    }
- 
-    super.visitBindingOperation(bindingOperation);
-    println("Leaving binding operation...");
-  }
- 
-  protected void visitBindingInput(BindingInput input)
-  {
-    println("Visiting binding input...");
-    visitDocumentation(input.getDocumentationElement());
-    
-    String inputName = input.getName();
-    if (inputName != null)
-      println("name: " + inputName);
-    
-    super.visitBindingInput(input);
-    println("Leaving binding input...");
-  }
-  
-  protected void visitBindingOutput(BindingOutput output)
-  {
-    println("Visiting binding output...");
-    visitDocumentation(output.getDocumentationElement());
-    
-    String outputName = output.getName();
-    if (outputName != null)
-      println("name: " + outputName);
-    
-    super.visitBindingOutput(output);
-    println("Leaving binding output...");
-  }
-  
-  protected void visitBindingFault(BindingFault fault)
-  {
-    println("Visiting binding fault...");
-    visitDocumentation(fault.getDocumentationElement());
-    
-    Element faultElement = fault.getElement();
-    String faultName = fault.getName();
-    if (faultName != null)
-      faultElement.setAttribute("name",faultName);
-    
-    super.visitBindingFault(fault); 
-    println("Leaving binding fault...");
-  }
- 
-  protected void visitService(Service service)
-  {
-    println("Visiting service...");
-    visitDocumentation(service.getDocumentationElement());
-    
-    QName qname = service.getQName();
-    Assert.assertNotNull("Validation Error: service is missing the name attribute",qname);
-    if (qname != null)
-      println("name: " + qname.getLocalPart());
-    
-    super.visitService(service);
-    println("Leaving service...");
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitPort(org.eclipse.wst.wsdl.Port)
-   */
-  protected void visitPort(Port port)
-  {
-    println("Visiting port...");
-    visitDocumentation(port.getDocumentationElement());
-    
-    String name = port.getName();
-    Assert.assertNotNull("Validation Error: port is missing the name attribute",port);
-    if (name != null)
-      println("name: " + port.getName());
-    
-    Binding binding = port.getEBinding();
-    Assert.assertNotNull("Failed to resolve the binding",binding);
-    
-    super.visitPort(port);
-    Assert.assertTrue("<soapAddress> is missing",soapAddressVisited);
-    println("Leaving port...");
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitExtensibilityElement(org.eclipse.wst.wsdl.ExtensibleElement, org.eclipse.wst.wsdl.ExtensibilityElement)
-   */
-  protected void visitExtensibilityElement(ExtensibleElement owner, ExtensibilityElement extensibilityElement)
-  {
-    println("Visiting extensibility element...");
-    if (extensibilityElement instanceof SOAPBody)
-      visitSOAPBody((SOAPBody)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPBinding)
-      visitSOAPBinding((SOAPBinding)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPAddress)
-      visitSOAPAddress((SOAPAddress)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPOperation)
-      visitSOAPOperation((SOAPOperation)extensibilityElement);
-    println("Leaving extensibility element...");
-  }
- 
-  //Needs to improve this part
-  private boolean soapOperationVisited = false;
-  private void visitSOAPOperation(SOAPOperation soapOperation)
-  {
-    soapOperationVisited = true;
-    println("Visiting SOAPOperation...");
-    println("soapAction: " + soapOperation.getSoapActionURI());
-    println("Leaving SOAPOperation...");
-  }
-  
-  //Needs to improve this part
-  private boolean soapBodyVisited = false;
-  private void visitSOAPBody(SOAPBody soapBody)
-  {
-    soapBodyVisited = true;
-    println("Visiting SOAPBody...");
-    println("use: " + soapBody.getUse());
-    println("Leaving SOAPBody...");
-  }
-  
-  //Needs to improve this part
-  private boolean soapBindingVisited = false;
-  private void visitSOAPBinding(SOAPBinding soapBinding)
-  {
-    soapBindingVisited = true;
-    println("Visiting SOAPBinding...");
-    println("style: " + soapBinding.getStyle());
-    println("transport: " + soapBinding.getTransportURI());
-    println("Leaving SOAPBinding...");  
-  }
- 
-  // Needs to improve this part
-  private boolean soapAddressVisited = false;
-  private void visitSOAPAddress(SOAPAddress soapAddress)
-  {
-    soapAddressVisited = true;
-    println("Visiting SOAPAddress...");
-    println("location: " + soapAddress.getLocationURI());
-    println("Leaving SOAPAddress..."); 
-  }
-  
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTest
-      (new SemanticTest("ModelSemanticTest") 
-         {
-           protected void runTest() 
-           {
-             testModelSemantic();
-           }
-         }
-       );
-    return suite;
-  }
-  
-  public void testModelSemantic()
-  {
-    try
-    {
-      Definition def = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/LoadAndPrintTest.wsdl",true);
-      SemanticTest test = new SemanticTest(def);
-      test.visit();
-    }
-    catch (Exception e)
-    {
-      Assert.fail(e.toString());
-    }    
-  }
-  
-  public static void main(String[] args)
-  {
-    junit.textui.TestRunner.run(suite());
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.java
deleted file mode 100644
index 922a78a..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.java
+++ /dev/null

@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.tests.util.DefinitionLoader;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory;
-import org.eclipse.wst.wsdl.util.ExtensibilityElementFactoryRegistry;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class UtilTest extends TestCase {
-	  private String PLUGIN_ABSOLUTE_PATH = WSDLTestsPlugin.getInstallURL();
-	  
-	  public UtilTest(String name) 
-	  {
-	    super(name);
-	  }
-	
-	  public static void main(String args[]) 
-	  {
-	    junit.textui.TestRunner.run(suite());
-	  }
-
-	  public static Test suite() 
-	  {
-	    TestSuite suite = new TestSuite();
-	    
-	    suite.addTest
-	      (new UtilTest("WSDLConstants") 
-	         {
-	           protected void runTest() 
-	           {
-				 testConstants();
-	           }
-	         }
-	       );
-	    
-	    suite.addTest
-	      (new UtilTest("WSDLResourceFactoryImpl") 
-	        {
-	          protected void runTest() 
-	          {
-	            testWSDLResourceFactoryImpl();
-	          }
-	        }
-	      );
-		
-	    suite.addTest
-	      (new UtilTest("WSDLResourceImpl") 
-	        {
-	          protected void runTest() 
-	          {
-	            testWSDLResourceImpl();
-	          }
-	        }
-	      );
-	    suite.addTest
-	      (new UtilTest("ExtensibilityElementFactory") 
-	        {
-	          protected void runTest() 
-	          {
-	            testExtensibilityElementFactory();
-	          }
-	        }
-	      );
-	    suite.addTest
-	      (new UtilTest("ExtensibilityElementFactoryRegistry") 
-	        {
-	          protected void runTest() 
-	          {
-	            testExtensibilityElementFactoryRegistry();
-	          }
-	        }
-	      );
-		
-
-		
-	    return suite;
-	  }
-	  
-	  protected void setUp() throws Exception 
-	  {
-	    super.setUp();
-	    
-	    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-	    WSDLPackage pkg = WSDLPackage.eINSTANCE;
-	    
-	    // We need this for XSD <import>.
-	    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl());
-	    XSDPackage xsdpkg = XSDPackage.eINSTANCE; 
-	  }
-
-	  protected void tearDown() throws Exception 
-	  {
-	    super.tearDown();
-	  }  
-	  
-	  static private Definition definition = null;
-	  
-	  public void testConstants()
-	  {
-        try
-		{
-		  WSDLConstants wsdlConstants = new WSDLConstants();
-		  int type = WSDLConstants.nodeType(WSDLConstants.PORT_ELEMENT_TAG);
-		  Assert.assertTrue("Node type is not that of port", type == 10);
-		  
-	      definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/LoadAndPrintTest.wsdl");
-	      Assert.assertTrue(definition.eResource() instanceof WSDLResourceImpl);
-
-		  int definitionNodeType = WSDLConstants.nodeType(definition.getElement());
-		  Assert.assertTrue("Node type is not that of definition", definitionNodeType == 1);
-		  
-		  boolean isWSDLNamespace = WSDLConstants.isWSDLNamespace(definition.getTargetNamespace());
-		  Assert.assertFalse("This should not be the WSDL Namespace", isWSDLNamespace);
-		  
-		  boolean isMatching = WSDLConstants.isMatchingNamespace("http://www.example.org", "http://www.example.org");  
-		  Assert.assertTrue("isMatchingNamespace is incorrect", isMatching);
-		  
-		  String attr = WSDLConstants.getAttribute(definition.getElement(), "name");
-		  Assert.assertTrue("getAttribute is incorrect", attr.equals("LoadAndPrintTest"));
-		}
-		catch (Exception e)
-	    {
-	      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-		}
-	  }
-  
-	  public void testWSDLResourceFactoryImpl()
-	  {
-	    try
-	    {
-		  WSDLResourceFactoryImpl factoryImpl = new WSDLResourceFactoryImpl();
-		  Resource resource = factoryImpl.createResource(URI.createFileURI("./samples/createResourceTest.wsdl"));
-          Assert.assertTrue("Resource is not of type WSDLResourceImpl", resource instanceof WSDLResourceImpl);
-	    }
-	    catch (Exception e)
-	    {
-	      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-	    }   
-	  }
-	  
-	  public void testWSDLResourceImpl()
-	  {
-	    try
-		{
-		  WSDLResourceImpl resourceImpl = new WSDLResourceImpl(URI.createFileURI("./samples/createResourceTest.wsdl"));
-          Assert.assertTrue("Resource is not of type WSDLResourceImpl", resourceImpl instanceof WSDLResourceImpl);
-		  
-	      definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/LoadAndPrintTest.wsdl");
-	      Assert.assertTrue(definition.eResource() instanceof WSDLResourceImpl);
-		  Element element = definition.getElement();
-		  Document document = definition.getDocument();
-
-	      if (element != null)
-	      {
-	        resourceImpl.serialize(System.out, element, null);
-	      }
-		  
-		  if (document != null)
-		  {
-			resourceImpl.serialize(System.out, document, null);
-		  }
-		  
-		  try
-		  {
-		    resourceImpl.attached(definition);
-		  }
-		  catch (Exception e)
-		  {
-
-		  }
-	  
-		}
-		catch (Exception e)
-		{
-		  Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-		}   
-	  }
-	  
-	  public void testExtensibilityElementFactory()
-	  {
-	    try
-	    {
-		    ExtensibilityElementFactory factory = WSDLPlugin.INSTANCE.getExtensibilityElementFactory(SOAPConstants.SOAP_NAMESPACE_URI);
-		    if (factory != null)
-			{
-		      ExtensibilityElement ee = factory.createExtensibilityElement(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.HEADER_ELEMENT_TAG);
-              Assert.assertTrue("Problem creating SOAP extensibility element", ee instanceof SOAPHeader);
-			}
-	    }
-		catch (Exception e)
-		{
-		  Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-		}   
-	  }
-	  
-	  class TestExtensibilityElement extends ExtensibilityElementImpl implements ExtensibilityElement
-	  {
-		String ns, name;
-		
-		public TestExtensibilityElement(String ns, String name)
-		{
-		  super();
-		  this.ns = ns;
-		  this.name = name;
-		}
-
-		public QName getElementType()
-		{
-		  if (elementType == null)
-		  {
-			elementType = new QName(ns, name);
-		  }
-	      return elementType;
-		}
-	  }
-	  
-	  class WSDLTestFactory implements ExtensibilityElementFactory
-	  {
-		public WSDLTestFactory()
-		{
-		}
-				  
-		public ExtensibilityElement createExtensibilityElement(String namespace, String localName)
-		{
-		  return new TestExtensibilityElement(namespace, localName);
-		}
-	  }
-	  
-	  public void testExtensibilityElementFactoryRegistry()
-	  {
-	    try
-	    {	
-		    ExtensibilityElementFactoryRegistry factoryRegistry = WSDLPlugin.INSTANCE.getExtensibilityElementFactoryRegistry();
-			factoryRegistry.registerFactory("http://org.eclipse.wst.wsdl.tests", new WSDLTestFactory());
-			
-			ExtensibilityElementFactory factory = WSDLPlugin.INSTANCE.getExtensibilityElementFactory("http://org.eclipse.wst.wsdl.tests");
-			ExtensibilityElement ee = factory.createExtensibilityElement("http://org.eclipse.wst.wsdl.tests", "TestElement");
-			Assert.assertTrue("1. Problem creating custom Test extensibility element", ee instanceof TestExtensibilityElement);
-			Assert.assertTrue("2. Problem creating custom Test extensibility element", ee.getElementType().getLocalPart().equals("TestElement"));
-			Assert.assertTrue("3. Problem creating custom Test extensibility element", ee.getElementType().getNamespaceURI().equals("http://org.eclipse.wst.wsdl.tests"));
-			
-	    }
-		catch (Exception e)
-		{
-		  Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-		}   
-	  }
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java
deleted file mode 100644
index f13b19d..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java
+++ /dev/null

@@ -1,458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests;
-
-import java.io.FileInputStream;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.tests.util.WSDL4JDefinitionVisitor;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-/**
- * @author Kihup Boo
- */
-public class WSDL4JAPITest extends WSDL4JDefinitionVisitor
-{
-  private WSDLFactory factory = WSDLPlugin.INSTANCE.createWSDL4JFactory(); 
-  private Definition newDefinition;
-  private Message currentMessage;
-  private Service currentService;
-  private PortType currentPortType;
-  private Operation currentOperation;
-  private Binding currentBinding;
-  private BindingOperation currentBindingOperation;
-   
-  {
-    // This is needed because we don't have the following in the plugin.xml
-    //
-    //   <extension point = "org.eclipse.emf.extension_parser">
-    //     <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/>
-    //   </extension>
-    //
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLPackage pkg = WSDLPackage.eINSTANCE;
-  
-    // We need this for XSD <import>.
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl());
-    XSDPackage xsdpkg = XSDPackage.eINSTANCE;
-  }
-  
-  // Added for JUnit
-  public WSDL4JAPITest(String name) 
-  {
-    super(name);
-  }
-  
-  /**
-   * @param definition
-   */
-  public WSDL4JAPITest(Definition definition)
-  {
-    super(definition);
-  }
-/*  
-  private void serialize(String filename) throws Exception
-  {
-    Source domSource = new DOMSource(doc);
-    Transformer transformer = TransformerFactory.newInstance().newTransformer();
-    transformer.setOutputProperty(OutputKeys.INDENT,"yes");
-    transformer.setOutputProperty(OutputKeys.ENCODING,"UTF-8");
-    transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount","4");
-    transformer.transform(domSource,new StreamResult(new FileOutputStream(filename)));
-  }
-  
-  private void createDocument() throws ParserConfigurationException
-  {
-    doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-  }
-  
-  private Element createWSDLElement(String name)
-  {
-    Element element = doc.createElementNS("http://www.w3.org/2004/08/wsdl",name);
-    if (wsdlNamespacePrefix != null)
-      element.setPrefix(wsdlNamespacePrefix);
-    
-    return element;
-  }
- */ 
-  private void visitDocumentation(Element docElement)
-  {
-    if (docElement == null)
-      return;
-    //println("documentation: " + docElement);
-  }
-  
-  private void println(String s)
-  {
-    System.out.println(s);
-  }
-  
-  protected void visitDefinition(Definition def)
-  {
-    newDefinition = factory.newDefinition();
-    newDefinition.setDocumentationElement(def.getDocumentationElement());    
-    newDefinition.setQName(def.getQName());    
-    newDefinition.setTargetNamespace(def.getTargetNamespace());
-    newDefinition.setDocumentBaseURI(def.getDocumentBaseURI());
-    
-    Iterator iterator = def.getNamespaces().keySet().iterator();
-    String prefix = null;
-    String namespace = null;
-
-    while (iterator.hasNext())
-    {
-      prefix = (String)iterator.next();
-      namespace = def.getNamespace(prefix);
-      newDefinition.addNamespace(prefix,namespace);
-    }
-    
-    super.visitDefinition(def);
-  }
-  
-  protected void visitImport(Import wsdlImport)
-  {
-    Import myImport = newDefinition.createImport();
-    newDefinition.addImport(myImport);
-    
-    // e.g. <xs:import namespace="http://foo.com" schemaLocation= "bar.xsd"/>
-    myImport.setNamespaceURI(wsdlImport.getNamespaceURI());
-    myImport.setLocationURI(wsdlImport.getLocationURI());
-    myImport.setDocumentationElement(wsdlImport.getDocumentationElement());
-    
-    myImport.setDefinition(newDefinition);
-  }
-  
-  protected void visitTypes(Types types)
-  {
-    Types myTypes = newDefinition.createTypes();
-    myTypes.setDocumentationElement(types.getDocumentationElement());
-    
-    Iterator iterator = types.getExtensibilityElements().iterator();
-    /*
-    ExtensibilityElement ee = null;
-    while (iterator.hasNext())
-    {
-      ee = (ExtensibilityElement)iterator.next();
-      myTypes.addExtensibilityElement(ee);
-    }*/
-    newDefinition.setTypes(myTypes);
-  }
-
-  protected void visitPart(Part part)
-  {
-    Part myPart = newDefinition.createPart();
-    myPart.setDocumentationElement(part.getDocumentationElement());
-    myPart.setName(part.getName());
-    myPart.setElementName(part.getElementName());
-    myPart.setTypeName(part.getTypeName());
-    
-    Iterator iterator = part.getExtensionAttributes().keySet().iterator();
-    QName key = null;
-    QName value = null;
-    while (iterator.hasNext())
-    {
-      key = (QName)iterator.next();
-      value = (QName)part.getExtensionAttribute(key);
-      myPart.setExtensionAttribute(key,value);
-    }
-    currentMessage.addPart(myPart);
-  }
-  
-  protected void visitMessage(Message message)
-  {
-    currentMessage = newDefinition.createMessage();
-    super.visitMessage(message);
-  }
-  
-  protected void visitPortType(PortType portType)
-  {
-    currentPortType = newDefinition.createPortType();
-    currentPortType.setDocumentationElement(portType.getDocumentationElement());
-    currentPortType.setQName(portType.getQName());
-    currentPortType.setUndefined(portType.isUndefined());
-    newDefinition.addPortType(currentPortType);
-    
-    super.visitPortType(portType);
-  }
-  
-  protected void visitOperation(Operation operation)
-  {
-    currentOperation = newDefinition.createOperation();
-    currentOperation.setDocumentationElement(operation.getDocumentationElement());
-    currentOperation.setName(operation.getName());
-    currentOperation.setStyle(operation.getStyle());
-    currentOperation.setUndefined(operation.isUndefined());
-    currentOperation.setParameterOrdering(operation.getParameterOrdering());
-    currentPortType.addOperation(currentOperation);
-   
-    super.visitOperation(operation);
-  }
-  
-  protected void visitInput(Input input)
-  {
-    Input myInput = newDefinition.createInput();
-    myInput.setDocumentationElement(input.getDocumentationElement());    
-    myInput.setName(input.getName());
-    myInput.setMessage(input.getMessage());
-    currentOperation.setInput(myInput);
-  }
-
-  protected void visitOutput(Output output)
-  {
-    Output myOutput = newDefinition.createOutput();
-    myOutput.setDocumentationElement(output.getDocumentationElement());   
-    myOutput.setName(output.getName());
-    myOutput.setMessage(output.getMessage());
-    currentOperation.setOutput(myOutput);
-  }
-
-  protected void visitFault(Fault fault)
-  {
-    Fault myFault = newDefinition.createFault();
-    myFault.setDocumentationElement(fault.getDocumentationElement());   
-    myFault.setName(fault.getName());
-    myFault.setMessage(fault.getMessage());
-    currentOperation.addFault(myFault);
-  }
-
-  protected void visitBinding(Binding binding)
-  {
-    currentBinding = newDefinition.createBinding();
-    newDefinition.addBinding(currentBinding);
-    
-    currentBinding.setDocumentationElement(binding.getDocumentationElement());    
-    currentBinding.setQName(binding.getQName());
-    currentBinding.setPortType(binding.getPortType());
-    currentBinding.setUndefined(binding.isUndefined());
-
-    super.visitBinding(binding);
-  }
-  
-  protected void visitBindingOperation(BindingOperation bindingOperation)
-  {
-    currentBindingOperation = newDefinition.createBindingOperation();
-    currentBindingOperation.setDocumentationElement(bindingOperation.getDocumentationElement());   
-    currentBindingOperation.setOperation(bindingOperation.getOperation());
-    currentBindingOperation.setName(bindingOperation.getName());
-    currentBinding.addBindingOperation(currentBindingOperation);
-    
-    super.visitBindingOperation(bindingOperation);
-  }
- 
-  protected void visitBindingInput(BindingInput input)
-  {
-    BindingInput myInput = newDefinition.createBindingInput();
-    myInput.setDocumentationElement(input.getDocumentationElement());    
-    myInput.setName(input.getName());
-    currentBindingOperation.setBindingInput(myInput);
-    
-    super.visitBindingInput(input);
-  }
-  
-  protected void visitBindingOutput(BindingOutput output)
-  {
-    BindingOutput myOutput = newDefinition.createBindingOutput();
-    myOutput.setDocumentationElement(output.getDocumentationElement());   
-    myOutput.setName(output.getName());
-    currentBindingOperation.setBindingOutput(myOutput);
-    
-    super.visitBindingOutput(output);
-  }
-  
-  protected void visitBindingFault(BindingFault fault)
-  {
-    BindingFault myFault = newDefinition.createBindingFault();
-    myFault.setDocumentationElement(fault.getDocumentationElement());   
-    myFault.setName(fault.getName());
-    currentBindingOperation.addBindingFault(myFault);
-    
-    super.visitBindingFault(fault); 
-  }
- 
-  protected void visitService(Service service)
-  {
-    currentService = newDefinition.createService();
-    currentService.setDocumentationElement(service.getDocumentationElement());   
-    currentService.setQName(service.getQName());
-    newDefinition.addService(currentService);
-    
-    super.visitService(service);
-  }
-  
-  protected void visitPort(Port port)
-  {
-    Port myPort = newDefinition.createPort();
-    myPort.setDocumentationElement(port.getDocumentationElement());
-    myPort.setName(port.getName());
-    myPort.setBinding(port.getBinding());
-    currentService.addPort(myPort);
-    
-    super.visitPort(port);
-  }
-
-  protected void visitExtensibilityElement(ExtensibilityElement extensibilityElement)
-  {
-    if (extensibilityElement instanceof SOAPBody)
-      visitSOAPBody((SOAPBody)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPBinding)
-      visitSOAPBinding((SOAPBinding)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPAddress)
-      visitSOAPAddress((SOAPAddress)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPOperation)
-      visitSOAPOperation((SOAPOperation)extensibilityElement);
-  }
- 
-  // Need to improve this part
-  private boolean soapOperationVisited = false;
-  private void visitSOAPOperation(SOAPOperation soapOperation)
-  {
-    soapOperationVisited = true;
-    println("Visiting SOAPOperation...");
-    println("soapAction: " + soapOperation.getSoapActionURI());
-    println("Leaving SOAPOperation...");
-  }
-  
-  //Needs to improve this part
-  private boolean soapBodyVisited = false;
-  private void visitSOAPBody(SOAPBody soapBody)
-  {
-    soapBodyVisited = true;
-    println("Visiting SOAPBody...");
-    println("use: " + soapBody.getUse());
-    println("Leaving SOAPBody...");
-  }
-  
-  //Needs to improve this part
-  private boolean soapBindingVisited = false;
-  private void visitSOAPBinding(SOAPBinding soapBinding)
-  {
-    soapBindingVisited = true;
-    println("Visiting SOAPBinding...");
-    println("style: " + soapBinding.getStyle());
-    println("transport: " + soapBinding.getTransportURI());
-    println("Leaving SOAPBinding...");  
-  }
- 
-  // Needs to improve this part
-  private boolean soapAddressVisited = false;
-  private void visitSOAPAddress(SOAPAddress soapAddress)
-  {
-    soapAddressVisited = true;
-    println("Visiting SOAPAddress...");
-    println("location: " + soapAddress.getLocationURI());
-    println("Leaving SOAPAddress..."); 
-  }
-  
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTest
-      (new WSDL4JAPITest("ModelSemanticTest") 
-         {
-           protected void runTest() 
-           {
-             testModelSemantic();
-           }
-         }
-       );
-    return suite;
-  }
-  
-  public void testModelSemantic()
-  {
-    try
-    {
-      Definition def = loadDefinitionForWSDL4J("./samples/LoadAndPrintTest.wsdl");
-      WSDL4JAPITest test = new WSDL4JAPITest(def);
-      test.visit();
-      serialize(test.newDefinition,"./samples/ClonedLoadAndPrintTest.wsdl");
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-      Assert.fail(e.toString());
-    }    
-  }
-  
-  private void serialize(Definition def, String clonedFile) throws Exception
-  {
-    WSDLWriter writer = factory.newWSDLWriter();
-    IPluginDescriptor pd = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.wst.wsdl.tests");
-    URL url = pd.getInstallURL();
-    //System.out.println(url.toString());
-    url = new URL(url,clonedFile);
-    //System.out.println(url.toString());
-    //String s = Platform.resolve(url).getFile();
-    //System.out.println(Platform.getInstanceLocation().getURL().toString());
-    //String s = url.toString();
-    //System.out.println(s);
-    //writer.writeWSDL(def,new FileOutputStream(s));
-  }  
-  
-  private Definition loadDefinitionForWSDL4J(String wsdlFile) throws Exception
-  {    
-    WSDLReader reader = factory.newWSDLReader();
-    IPluginDescriptor pd = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.wst.wsdl.tests");
-    URL url = pd.getInstallURL();
-    url = new URL(url,wsdlFile);
-    String s = Platform.resolve(url).getFile();
-    //System.out.println("loading " + s);
-    Definition definition = reader.readWSDL(s,new InputSource(new FileInputStream(s)));
-    return definition;
-  }  
-  
-  public static void main(String[] args)
-  {
-    junit.textui.TestRunner.run(suite());
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java
deleted file mode 100644
index e5a4aa9..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java
+++ /dev/null

@@ -1,612 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests;
-
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Namespace;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.tests.util.DefinitionLoader;
-import org.eclipse.wst.wsdl.tests.util.DefinitionVisitor;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-import org.w3c.dom.Element;
-
-/**
- * @author Kihup Boo
- */
-public class WSDLEMFAPITest extends DefinitionVisitor
-{
-  private String PLUGIN_ABSOLUTE_PATH = WSDLTestsPlugin.getInstallURL();
-  private WSDLFactory factory = WSDLFactory.eINSTANCE;
-  
-  Definition newDefinition;
-  private Message currentMessage;
-  private Service currentService;
-  private PortType currentPortType;
-  private Operation currentOperation;
-  private Binding currentBinding;
-  private BindingOperation currentBindingOperation;
-  private ExtensibleElement currentExtensibleElement;
-   
-  {
-    // This is needed because we don't have the following in the plugin.xml
-    //
-    //   <extension point = "org.eclipse.emf.extension_parser">
-    //     <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/>
-    //   </extension>
-    //
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLPackage pkg = WSDLPackage.eINSTANCE;
-  
-    // We need this for XSD <import>.
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl());
-    XSDPackage xsdpkg = XSDPackage.eINSTANCE;
-  }
-  
-  // Added for JUnit
-  public WSDLEMFAPITest(String name) 
-  {
-    super(name);
-  }
-  
-  /**
-   * @param definition
-   */
-  public WSDLEMFAPITest(Definition definition)
-  {
-    super(definition);
-  }
-/*  
-  private void serialize(String filename) throws Exception
-  {
-    Source domSource = new DOMSource(doc);
-    Transformer transformer = TransformerFactory.newInstance().newTransformer();
-    transformer.setOutputProperty(OutputKeys.INDENT,"yes");
-    transformer.setOutputProperty(OutputKeys.ENCODING,"UTF-8");
-    transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount","4");
-    transformer.transform(domSource,new StreamResult(new FileOutputStream(filename)));
-  }
-  
-  private void createDocument() throws ParserConfigurationException
-  {
-    doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-  }
-  
-  private Element createWSDLElement(String name)
-  {
-    Element element = doc.createElementNS("http://www.w3.org/2004/08/wsdl",name);
-    if (wsdlNamespacePrefix != null)
-      element.setPrefix(wsdlNamespacePrefix);
-    
-    return element;
-  }
- */ 
-  private void visitDocumentation(Element docElement)
-  {
-    if (docElement == null)
-      return;
-    println("documentation: " + docElement); // TBD - serialize docElement
-  }
-  
-  private void println(String s)
-  {
-    System.out.println(s);
-  }
-  
-  protected void visitDefinition(Definition def)
-  {
-    // Use WSDLElement to increase the API coverage in the reports
-    WSDLElement root = factory.createDefinition();
-    newDefinition = (Definition)root;
-    
-    root.setDocumentationElement(def.getDocumentationElement());   
-    root.getDocumentationElement();
-    root.setEnclosingDefinition(newDefinition);
-    root.getEnclosingDefinition();
-    root.getContainer();
-    
-    newDefinition.setQName(def.getQName());    
-    newDefinition.setTargetNamespace(def.getTargetNamespace());
-    newDefinition.setDocumentBaseURI(def.getDocumentBaseURI());
-    newDefinition.setLocation(def.getLocation());
-    newDefinition.setEncoding(def.getEncoding());
-    
-    // getENamespaces does not work.
-    Iterator iterator = def.getENamespaces().iterator();
-    Namespace ns = null;   
-    String prefix = null;
-    String uri = null;
-    while (iterator.hasNext())
-    {
-      ns = factory.createNamespace();
-      prefix = ((Namespace)iterator.next()).getPrefix();
-      uri = ((Namespace)iterator.next()).getURI();
-      ns.setURI(uri);
-      ns.setPrefix(prefix);
-      newDefinition.getENamespaces().add(ns);
-    }
-    
-    iterator = def.getNamespaces().keySet().iterator();
-    prefix = null;
-    String namespace = null;
-
-    while (iterator.hasNext())
-    {
-      prefix = (String)iterator.next();
-      namespace = def.getNamespace(prefix);
-      newDefinition.addNamespace(prefix,namespace);
-    }
-    //newDefinition.updateElement();
-    
-    currentExtensibleElement = def;
-    super.visitDefinition(def);
-    
-    root.setElement(null);
-    root.updateElement(true);
-    root.getElement();
-    root.setElement(null);
-    root.updateElement();
-  }
-  
-  protected void visitImport(Import wsdlImport)
-  {
-    Import myImport = factory.createImport();
-    newDefinition.getEImports().add(myImport);
-    
-    // e.g. <xs:import namespace="http://foo.com" schemaLocation= "bar.xsd"/>
-    myImport.setNamespaceURI(wsdlImport.getNamespaceURI());
-    myImport.setLocationURI(wsdlImport.getLocationURI());
-    myImport.setDocumentationElement(wsdlImport.getDocumentationElement());
-    myImport.setEDefinition(newDefinition);
-    myImport.setESchema(wsdlImport.getESchema());
-    myImport.setSchema(wsdlImport.getSchema()); // TBD - review
-    myImport.setEnclosingDefinition(newDefinition);
-  }
-  
-  protected void visitTypes(Types types)
-  {
-    Types myTypes = factory.createTypes();
-    myTypes.setDocumentationElement(types.getDocumentationElement());
-    
-    Iterator iterator = types.getEExtensibilityElements().iterator();
-    ExtensibilityElement ee = null;
-    types.getSchemas("http://tempuri.org/LoadAndPrintTest/");
-    
-    currentExtensibleElement = myTypes;
-    while (iterator.hasNext())
-    {
-      ee = (ExtensibilityElement)iterator.next();
-      visitExtensibilityElement(ee);
-    }
-    
-    myTypes.setEnclosingDefinition(newDefinition);
-    newDefinition.getETypes();
-    newDefinition.setETypes(myTypes);
-  }
-
-  protected void visitPart(Part part)
-  {
-    Part myPart = factory.createPart();
-    myPart.setDocumentationElement(part.getDocumentationElement());
-    myPart.setName(part.getName());
-    myPart.setElementName(part.getElementName());
-    myPart.setTypeName(part.getTypeName());
-    myPart.setEMessage(part.getEMessage());
-    myPart.setElementDeclaration(part.getElementDeclaration());
-    myPart.setTypeDefinition(part.getTypeDefinition());
-    
-    Iterator iterator = part.getExtensionAttributes().keySet().iterator();
-    QName key = null;
-    QName value = null;
-    while (iterator.hasNext())
-    {
-      key = (QName)iterator.next();
-      value = (QName)part.getExtensionAttribute(key);
-      myPart.setExtensionAttribute(key,value);
-    }
-    currentMessage.setEnclosingDefinition(newDefinition);
-    currentMessage.addPart(myPart);
-  }
-
-  protected void visitPortType(PortType portType)
-  {
-    currentPortType = factory.createPortType();
-    currentPortType.setDocumentationElement(portType.getDocumentationElement());
-    currentPortType.setQName(portType.getQName());
-    currentPortType.setUndefined(portType.isUndefined());
-    
-    currentPortType.setEnclosingDefinition(newDefinition);
-    newDefinition.getEPortTypes().add(currentPortType);
-    
-    super.visitPortType(portType);
-  }
-  
-  protected void visitOperation(Operation operation)
-  {
-    currentOperation = factory.createOperation();
-    currentOperation.setDocumentationElement(operation.getDocumentationElement());
-    currentOperation.setName(operation.getName());
-    currentOperation.setStyle(operation.getStyle());
-    currentOperation.setUndefined(operation.isUndefined());
-    operation.getEParameterOrdering(); // TBD
-    currentOperation.setEnclosingDefinition(newDefinition);
-    currentPortType.getEOperations().add(currentOperation);
-   
-    super.visitOperation(operation);
-    //System.out.println("Operation Type is: " + operation.getStyle());
-    //operation.setStyle(OperationType.REQUEST_RESPONSE);
-    //System.out.println("Operation Type is: " + operation.getStyle());
-  }
-  
-  protected void visitMessage(Message message)
-  {
-    currentMessage = factory.createMessage();
-    currentMessage.setQName(message.getQName());
-    currentMessage.setUndefined(message.isUndefined());
-    newDefinition.addMessage(currentMessage);
-
-    super.visitMessage(message);
-  }
-  
-  protected void visitInput(Input input)
-  {
-    MessageReference myInput = factory.createInput();
-    myInput.setDocumentationElement(input.getDocumentationElement());    
-    myInput.setName(input.getName());
-    myInput.getName();
-    myInput.setEMessage(input.getEMessage());
-    myInput.setEnclosingDefinition(newDefinition);
-    currentOperation.setEInput((Input)myInput);
-  }
-
-  protected void visitOutput(Output output)
-  {
-    Output myOutput = factory.createOutput();
-    myOutput.setDocumentationElement(output.getDocumentationElement());   
-    myOutput.setName(output.getName());
-    myOutput.setEMessage(output.getEMessage());
-    myOutput.setEnclosingDefinition(newDefinition);
-    currentOperation.setEOutput(myOutput);
-  }
-
-  protected void visitFault(Fault fault)
-  {
-    Fault myFault = factory.createFault();
-    myFault.setDocumentationElement(fault.getDocumentationElement());   
-    myFault.setName(fault.getName());
-    myFault.setEMessage(fault.getEMessage());
-    myFault.setEnclosingDefinition(newDefinition);
-    currentOperation.getEFaults().add(myFault);
-  }
-
-  protected void visitBinding(Binding binding)
-  {
-    currentBinding = factory.createBinding();
-    newDefinition.getEBindings().add(currentBinding);
-    
-    currentBinding.setDocumentationElement(binding.getDocumentationElement());    
-    currentBinding.setQName(binding.getQName());
-    currentBinding.setEPortType(binding.getEPortType());
-    currentBinding.setUndefined(binding.isUndefined());
-
-    currentExtensibleElement = currentBinding;
-    super.visitBinding(binding);
-  }
-  
-  protected void visitBindingOperation(BindingOperation bindingOperation)
-  {
-    currentBindingOperation = factory.createBindingOperation();
-    currentBindingOperation.setDocumentationElement(bindingOperation.getDocumentationElement());   
-    currentBindingOperation.setEOperation(bindingOperation.getEOperation());
-    currentBindingOperation.setName(bindingOperation.getName());
-    currentBinding.getBindingOperations().add(currentBindingOperation);
-    
-    currentExtensibleElement = currentBindingOperation;
-    super.visitBindingOperation(bindingOperation);    
-  }
- 
-  protected void visitBindingInput(BindingInput input)
-  {
-    BindingInput myInput = factory.createBindingInput();
-    myInput.setDocumentationElement(input.getDocumentationElement());    
-    myInput.setName(input.getName());
-    myInput.setInput(input.getInput());
-    myInput.setEInput(input.getEInput());
-    currentBindingOperation.setEBindingInput(myInput);
- 
-    currentExtensibleElement = myInput;
-    super.visitBindingInput(input);
-  }
-  
-  protected void visitBindingOutput(BindingOutput output)
-  {
-    BindingOutput myOutput = factory.createBindingOutput();
-    myOutput.setDocumentationElement(output.getDocumentationElement());   
-    myOutput.setName(output.getName());
-    myOutput.setOutput(output.getOutput());
-    myOutput.setEOutput(output.getEOutput());
-    currentBindingOperation.setEBindingOutput(myOutput);
-    
-    currentExtensibleElement = myOutput;
-    super.visitBindingOutput(output);
-  }
-  
-  protected void visitBindingFault(BindingFault fault)
-  {
-    BindingFault myFault = factory.createBindingFault();
-    myFault.setDocumentationElement(fault.getDocumentationElement());   
-    myFault.setName(fault.getName());
-    myFault.setEFault(fault.getEFault());
-    myFault.setFault(fault.getFault());
-    currentBindingOperation.getEBindingFaults().add(myFault);
-    
-    currentExtensibleElement = myFault;
-    super.visitBindingFault(fault);
-  }
- 
-  protected void visitService(Service service)
-  {
-    currentService = factory.createService();
-    currentService.setDocumentationElement(service.getDocumentationElement());   
-    currentService.setQName(service.getQName());
-    currentService.setUndefined(service.isUndefined());
-    
-    newDefinition.getEServices().add(currentService);
-    
-    super.visitService(service);
-  }
-  
-  protected void visitPort(Port port)
-  {
-    Port myPort = factory.createPort();
-    myPort.setDocumentationElement(port.getDocumentationElement());
-    myPort.setName(port.getName());
-    myPort.setEBinding(port.getEBinding());
-    
-    currentService.getEPorts().add(myPort);
-    
-    currentExtensibleElement = myPort;
-    super.visitPort(port);
-  }
-
-  protected void visitExtensibilityElement(ExtensibleElement owner, ExtensibilityElement extensibilityElement)
-  {
-    // To move up the API test coverage
-    owner.getEExtensibilityElements();
-    owner.getExtensibilityElements();
-    factory.createExtensibilityElement();
-    WSDLPlugin.getPlugin();
-    WSDLPlugin.INSTANCE.getPluginResourceLocator();
-    
-    visitExtensibilityElement(extensibilityElement);
-  }
-  
-  private void visitExtensibilityElement(ExtensibilityElement extensibilityElement)
-  {
-    XSDSchemaExtensibilityElement xsee = null;
-    UnknownExtensibilityElement uee = null;
-    ExtensibilityElement myEE = null;
-    if (extensibilityElement instanceof XSDSchemaExtensibilityElement)
-    {
-      myEE = factory.createXSDSchemaExtensibilityElement();
-      xsee = (XSDSchemaExtensibilityElement)myEE;
-      xsee.setSchema(((XSDSchemaExtensibilityElement)extensibilityElement).getSchema());
-    }
-    else
-    {
-      myEE = factory.createUnknownExtensibilityElement();
-      uee = (UnknownExtensibilityElement)myEE;
-      uee.getChildren(); // TBD
-    }
-    myEE.setElementType(extensibilityElement.getElementType());
-    myEE.setRequired(extensibilityElement.getRequired());
-    myEE.setRequired(extensibilityElement.isRequired());
-    if (currentExtensibleElement != null)
-      currentExtensibleElement.addExtensibilityElement(myEE);
-    
-    if (extensibilityElement instanceof SOAPBody)
-      visitSOAPBody((SOAPBody)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPBinding)
-      visitSOAPBinding((SOAPBinding)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPAddress)
-      visitSOAPAddress((SOAPAddress)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPOperation)
-      visitSOAPOperation((SOAPOperation)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPFault)
-      visitSOAPFault((SOAPFault)extensibilityElement);  
-    else if (extensibilityElement instanceof SOAPHeader)
-      visitSOAPHeader((SOAPHeader)extensibilityElement);
-    else if (extensibilityElement instanceof SOAPHeaderFault)
-      visitSOAPHeaderFault((SOAPHeaderFault)extensibilityElement);
-  }
-
- 
-  private void visitSOAPFault(SOAPFault soapFault)
-  {
-    SOAPFault mySoapFault = SOAPFactory.eINSTANCE.createSOAPFault();
-    mySoapFault.setEncodingStyles(soapFault.getEncodingStyles());
-    mySoapFault.setName(soapFault.getName());
-    mySoapFault.setNamespaceURI(soapFault.getNamespaceURI());
-    mySoapFault.setUse(soapFault.getUse());
-  } 
-  
-  private void visitSOAPHeader(SOAPHeader soapHeader)
-  {
-    // Use SOAPHeaderBase to increase the API coverage values in the reports
-    
-    SOAPHeaderBase yourSoapHeader = SOAPFactory.eINSTANCE.createSOAPHeaderBase();
-    yourSoapHeader.getEncodingStyles();
-    
-    SOAPHeaderBase mySoapHeader = SOAPFactory.eINSTANCE.createSOAPHeader();
-    mySoapHeader.setMessage(soapHeader.getMessage());
-    mySoapHeader.getMessage();
-    mySoapHeader.setPart(soapHeader.getPart());
-    mySoapHeader.getPart();
-    mySoapHeader.setNamespaceURI(soapHeader.getNamespaceURI());
-    mySoapHeader.getNamespaceURI();
-    mySoapHeader.setUse(soapHeader.getUse());
-    mySoapHeader.getUse();
-    ((SOAPHeader)soapHeader).getHeaderFaults(); // TBD
-  }
-  
-  private void visitSOAPHeaderFault(SOAPHeaderFault soapHeaderFault)
-  {
-    SOAPHeaderFault mySoapHeaderFault = SOAPFactory.eINSTANCE.createSOAPHeaderFault();
-    mySoapHeaderFault.setMessage(soapHeaderFault.getMessage());
-    mySoapHeaderFault.setPart(soapHeaderFault.getPart());
-    mySoapHeaderFault.setNamespaceURI(soapHeaderFault.getNamespaceURI());
-    mySoapHeaderFault.setUse(soapHeaderFault.getUse());
-  }
-  
-  private boolean soapOperationVisited = false;
-  private void visitSOAPOperation(SOAPOperation soapOperation)
-  {
-    soapOperationVisited = true;
-    SOAPOperation mySoapOperation = SOAPFactory.eINSTANCE.createSOAPOperation();
-    mySoapOperation.setSoapActionURI(soapOperation.getSoapActionURI());
-    mySoapOperation.setStyle(soapOperation.getStyle());
-  }
-  
-  //Needs to improve this part
-  private boolean soapBodyVisited = false;
-  private void visitSOAPBody(SOAPBody soapBody)
-  {
-    soapBodyVisited = true;
-    SOAPBody mySoapBody = SOAPFactory.eINSTANCE.createSOAPBody();
-    mySoapBody.setEncodingStyles(soapBody.getEncodingStyles());
-    mySoapBody.setNamespaceURI(soapBody.getNamespaceURI());
-    mySoapBody.setParts(soapBody.getParts());
-    mySoapBody.setUse(soapBody.getUse());
-  }
-  
-  //Needs to improve this part
-  private boolean soapBindingVisited = false;
-  private void visitSOAPBinding(SOAPBinding soapBinding)
-  {
-    soapBindingVisited = true;
-    SOAPBinding mySoapBinding = SOAPFactory.eINSTANCE.createSOAPBinding();
-    mySoapBinding.setStyle(soapBinding.getStyle());
-    mySoapBinding.setTransportURI(soapBinding.getTransportURI()); 
-  }
- 
-  // Needs to improve this part
-  private boolean soapAddressVisited = false;
-  private void visitSOAPAddress(SOAPAddress soapAddress)
-  {
-    soapAddressVisited = true;
-    SOAPAddress mySoapAddress = SOAPFactory.eINSTANCE.createSOAPAddress();
-    mySoapAddress.setLocationURI(soapAddress.getLocationURI()); 
-  }
-  
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTest
-      (new WSDLEMFAPITest("ModelSemanticTest") 
-         {
-           protected void runTest() 
-           {
-             testModelSemantic();
-           }
-         }
-       );
-    return suite;
-  }
-  
-  public void testModelSemantic()
-  {
-    try
-    {
-      Definition def = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH +"samples/LoadAndPrintTest.wsdl",true);
-      WSDLEMFAPITest test = new WSDLEMFAPITest(def);
-      test.visit();      
-      serialize(test.newDefinition);
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-      Assert.fail(e.toString());
-    }     
-  } 
-  
-  private void serialize(Definition def) throws Exception
-  {
-    ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLResourceImpl wsdlMainResource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl"));
-    wsdlMainResource.getContents().add(def);
-
-    IWorkspaceRoot myWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-    IProject myWebProject = myWorkspaceRoot.getProject("org.eclipse.wst.wsdl.tests");
-    if (!myWebProject.exists())
-      myWebProject.create(null);
-    
-    String baseDir = myWebProject.getLocation().toString();
-    
-    DefinitionLoader.store(def,baseDir + "/ClonedLoadAndPrintTest.wsdl");
-  }
-  
-  public static void main(String[] args)
-  {
-    junit.textui.TestRunner.run(suite());
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java
deleted file mode 100644
index 26a0fe1..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java
+++ /dev/null

@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-public class WSDLGenerationTest extends TestCase
-{
-  public WSDLGenerationTest()
-  {
-    init();
-  }
-  
-  public WSDLGenerationTest(String name) 
-  {
-    super(name);
-  }  
-  
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTest
-      (new WSDLGenerationTest("SampleWSDLGeneration") 
-         {
-           protected void runTest() 
-           {
-             testSampleWSDLGeneration();
-         }
-       }
-     );
-    
-    return suite;
-  }
-  
-  public void testSampleWSDLGeneration() 
-  {
-    try
-    {
-      generateTemperatureService("./TemperatureService.wsdl");
-    }
-    catch (Exception e)
-    {
-      Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage());
-    }
-  }
-  
-  protected void setUp() throws Exception 
-  {
-    super.setUp();
-    
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLPackage pkg = WSDLPackage.eINSTANCE;
-    
-    // We need this for XSD <import>.
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl());
-    XSDPackage xsdpkg = XSDPackage.eINSTANCE;
-  }
-
-  protected void tearDown() throws Exception 
-  {
-    super.tearDown();
-  }
-  
-  public void generateTemperatureService(String outputFile) throws Exception
-  {
-    ResourceSet resourceSet = new ResourceSetImpl();
-    Resource resource = resourceSet.createResource(URI.createFileURI(outputFile));
-    resourceSet.getResources().add(resource);
-
-    // Create a Definition - Temperature
-    Definition definition = WSDLFactory.eINSTANCE.createDefinition();
-    definition.setQName(new QName(WSDLConstants.WSDL_NAMESPACE_URI,"Temparature"));
-    resource.getContents().add(definition);
-    
-    // Target namespace - http://www.temperature.com
-    definition.setTargetNamespace("http://www.temperature.com");
-    definition.addNamespace("tns", "http://www.temperature.com");
-    
-    // Other namespaces - wsdl, soap, xsd
-    definition.addNamespace("wsdl", WSDLConstants.WSDL_NAMESPACE_URI);
-    definition.addNamespace("xsd", WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-    definition.getNamespaces().put("soap", SOAPConstants.SOAP_NAMESPACE_URI);
-
-    //
-    // Let's start building two messages
-    //
-    
-    // Create a Part - ZipCode
-    Part part = WSDLFactory.eINSTANCE.createPart();
-    part.setName("ZipCode");
-    part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string"));
-    
-    // Create a Message - GetTemperatureInput
-    Message inputMessage = WSDLFactory.eINSTANCE.createMessage();
-    inputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureInput"));
-    inputMessage.addPart(part);
-    definition.addMessage(inputMessage);
-    
-    // Create a Part - Temperature
-    part = WSDLFactory.eINSTANCE.createPart();
-    part.setName("Temperature");
-    part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"float"));
-
-    // Create a Message - GetTemperatureOutput
-    Message outputMessage = WSDLFactory.eINSTANCE.createMessage();
-    outputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureOutput"));
-    outputMessage.addPart(part);
-    definition.addMessage(outputMessage);
-    
-    //
-    // Next, build a PortType
-    //
-    
-    // Create an Input - GetTemperatureInput
-    Input input = WSDLFactory.eINSTANCE.createInput();
-    input.setMessage(inputMessage);
-
-    // Create an Output - GetTemperatureOutput
-    Output output = WSDLFactory.eINSTANCE.createOutput();
-    output.setMessage(outputMessage);
-   
-    // Create an Operation - GetTemperatureForZipCode
-    Operation operation = WSDLFactory.eINSTANCE.createOperation();
-    operation.setName("GetTemperatureForZipCode");
-    operation.setInput(input);
-    operation.setOutput(output);
-    
-    // Create a PortType
-    PortType portType = WSDLFactory.eINSTANCE.createPortType();
-    portType.setQName(new QName(definition.getTargetNamespace(),"GetTemparatureInfoSOAP"));
-    portType.addOperation(operation);
-    definition.addPortType(portType);
-    
-    //
-    // Now, let's work on Binding
-    //
-    
-    // Create a Binding - GetTemperatureInfoSOAP
-    Binding binding = WSDLFactory.eINSTANCE.createBinding();
-    binding.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureInfoSOAP"));
-    binding.setPortType(portType);
-    definition.addBinding(binding);
-
-    // Create a SOAP Binding
-    SOAPBinding soapBinding = SOAPFactory.eINSTANCE.createSOAPBinding();
-    soapBinding.setStyle("rpc");
-    soapBinding.setTransportURI("http://schemas.xmlsoap.org/soap/http");
-    binding.addExtensibilityElement(soapBinding);
-
-    // Create a Binding Operation
-    BindingOperation bindingOperation = WSDLFactory.eINSTANCE.createBindingOperation();
-    bindingOperation.setName("GetTemperatureForZipCode");
-    binding.addBindingOperation(bindingOperation);
-
-    // Create a SOAP Operation
-    SOAPOperation soapOperation = SOAPFactory.eINSTANCE.createSOAPOperation();
-    soapOperation.setSoapActionURI("http://www.temperature.com/GetTemperatureForZipCode");
-    bindingOperation.addExtensibilityElement(soapOperation);    
-
-    // Create a SOAP Body
-    SOAPBody soapBody = SOAPFactory.eINSTANCE.createSOAPBody();
-    soapBody.setUse("encoded");
-    soapBody.getEncodingStyles().add("http://schemas.xmlsoap.org/soap/encoding/");
-    soapBody.setNamespaceURI("http://www.temperature.com/");
-
-    // Create a Binding Input
-    BindingInput bindingInput = WSDLFactory.eINSTANCE.createBindingInput();
-    bindingInput.addExtensibilityElement(soapBody);
-    bindingOperation.setBindingInput(bindingInput);
-    
-    // Create a SOAP Body
-    soapBody = SOAPFactory.eINSTANCE.createSOAPBody();
-    soapBody.setUse("encoded");
-    soapBody.getEncodingStyles().add("http://schemas.xmlsoap.org/soap/encoding/");
-    soapBody.setNamespaceURI("http://www.temperature.com/");
-    
-    // Create a Binding Output
-    BindingOutput bindingOuput = WSDLFactory.eINSTANCE.createBindingOutput();
-    bindingOuput.addExtensibilityElement(soapBody);
-    bindingOperation.setBindingOutput(bindingOuput);
-    
-    //
-    // Finally, we are building a Service
-    //
-
-    // Create a SOAP Address
-    SOAPAddress soapAddress = SOAPFactory.eINSTANCE.createSOAPAddress();
-    soapAddress.setLocationURI("http://todo-some-address/");
-
-    // Create a Port - GetTemperatureInfoSOAP
-    Port port = WSDLFactory.eINSTANCE.createPort();
-    port.setName("GetTemperatureInfoSOAP");
-    port.setBinding(binding);
-    port.addExtensibilityElement(soapAddress);
-    
-    // Create a Service - TemperatureService
-    Service service = WSDLFactory.eINSTANCE.createService();
-    service.setQName(new QName(definition.getTargetNamespace(),"TemperatureService"));
-    service.addPort(port);
-    definition.addService(service);
-    
-    //
-    // Phew, we are done. Let's serialize it.
-    //
-    
-    resource.save(null);
- 
-  }
-
-  private void init()
-  {
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLPackage pkg = WSDLPackage.eINSTANCE;  
-  }
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java
deleted file mode 100644
index 0bb5f4f..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
-
-package org.eclipse.wst.wsdl.tests;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSDLTestsPlugin extends Plugin {
-	//The shared instance.
-	private static WSDLTestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	  private static Bundle pluginBundle = null;
-	
-	/**
-	 * The constructor.
-	 */
-	public WSDLTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		pluginBundle = context.getBundle();
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-		pluginBundle = context.getBundle();
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static WSDLTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = WSDLTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.wsdl.tests.WSDLTestsPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-	
-  /**
-   * Get the install URL of this plugin.
-   * 
-   * @return the install url of this plugin
-   */
-  public static String getInstallURL()
-  {
-    try
-    {
-      return Platform.resolve(pluginBundle.getEntry("/")).getFile();
-    }
-    catch (IOException e)
-    {
-      return null;
-    }
-  }
-  
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java
deleted file mode 100644
index 674386b..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests.util;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-/**
- * @author Kihup Boo
- */
-public final class DefinitionLoader
-{
-  {
-    // This is needed because we don't have the following in the plugin.xml
-    //
-    //   <extension point = "org.eclipse.emf.extension_parser">
-    //     <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/>
-    //   </extension>
-    //
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLPackage pkg = WSDLPackage.eINSTANCE;
-  
-    // We need this for XSD <import>.
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl());
-    XSDPackage xsdpkg = XSDPackage.eINSTANCE;
-  }
-  
-  /**
-   * This class provides static methods only.
-   */
-  private DefinitionLoader()
-  {
-  }
-
-  static public Definition load(String filename) throws IOException
-  {
-    return load(filename,false);
-  }
-
-  static public Definition load(String filename, boolean useExtensionFactories) throws IOException
-  {
-    // filename is an absolute path
-
-    URI uri = null;
-    uri = URI.createFileURI(filename);
-  
-    ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getAdapterFactories().add(new WSDLModelLocatorAdapterFactory());
-    resourceSet.getAdapterFactories().add(new XSDSchemaLocationResolverAdapterFactory());
-    
-    WSDLResourceImpl wsdlMainResource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl"));
-    wsdlMainResource.setURI(uri);
-    java.util.Map map = new Hashtable();
-    map.put(WSDLResourceImpl.CONTINUE_ON_LOAD_ERROR,Boolean.valueOf(true));
-    map.put(WSDLResourceImpl.USE_EXTENSION_FACTORIES,Boolean.valueOf(useExtensionFactories));
-    wsdlMainResource.load(map);
-  
-    Definition definition = null;
-    for (Iterator resources = resourceSet.getResources().iterator(); resources.hasNext(); )
-    {
-      Object resource = resources.next();
-      if (resource instanceof WSDLResourceImpl)
-      {
-        WSDLResourceImpl wsdlResource = (WSDLResourceImpl)resource;
-        definition = wsdlResource.getDefinition();
-        return definition;
-      }
-    }
-    
-    return null;
-  }
-
-  static public void store(Definition definition, String filename) throws IOException
-  {
-    // filename is an absolute path
-	  
-    Resource resource = definition.eResource();
-    resource.setURI(URI.createFileURI(filename));
-    resource.save(null);
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java
deleted file mode 100644
index 4b139a6..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java
+++ /dev/null

@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests.util;
-
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-
-/**
- * @author Kihup Boo
- */
-public abstract class DefinitionVisitor extends TestCase
-{
-  protected Definition definition;
-  
-  /**
-   * Use DefinitionVisitor(Definition definition)
-   */
-  private DefinitionVisitor()
-  {
-  }
-  
-  // Added for JUnit
-  public DefinitionVisitor(String name)
-  {
-    super(name);
-  }
-  
-  protected DefinitionVisitor(Definition definition)
-  {
-    this.definition = definition;
-  }
-
-  // main entry
-  public void visit()
-  {
-    visitDefinition(definition);
-  }
-  
-  protected void visitDefinition(Definition def)
-  {
-    Iterator iterator = def.getEImports().iterator();
-    while (iterator.hasNext())
-      visitImport((Import)iterator.next());
-    
-    Types types = def.getETypes();
-    if (types != null)
-      visitTypes(types);
-
-    iterator = def.getEMessages().iterator();
-    while (iterator.hasNext())
-      visitMessage((Message)iterator.next());
-    
-    iterator = def.getEPortTypes().iterator();
-    while (iterator.hasNext())
-      visitPortType((PortType)iterator.next());
-
-    iterator = def.getEBindings().iterator();
-    while (iterator.hasNext())
-      visitBinding((Binding)iterator.next());
-    
-    iterator = def.getEServices().iterator();
-    while (iterator.hasNext())
-      visitService((Service)iterator.next());
-
-    iterator = def.getEExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement(def,(ExtensibilityElement)iterator.next());
-
-  }
-  
-  abstract protected void visitImport(Import wsdlImport);
-  
-  abstract protected void visitTypes(Types types);
-
-  protected void visitMessage(Message message)
-  {
-    Iterator iterator = message.getEParts().iterator();
-    while (iterator.hasNext())
-      visitPart((Part)iterator.next()); 
-  }
-
-  abstract protected void visitPart(Part part);
-  
-  protected void visitPortType(PortType portType)
-  {
-    Iterator iterator = portType.getEOperations().iterator();
-    while (iterator.hasNext())
-      visitOperation((Operation)iterator.next());
-  }
-  
-  protected void visitOperation(Operation operation)
-  {
-    Input input = operation.getEInput();
-    visitInput((Input)input);  
-    
-    Output output = operation.getEOutput();
-    visitOutput((Output)output); 
-    
-    Iterator iterator = operation.getEFaults().iterator();
-    while (iterator.hasNext())
-      visitFault((Fault)iterator.next());
-  }
-  
-  protected abstract void visitInput(Input input);
-  
-  protected abstract void visitOutput(Output output);
-  
-  protected abstract void visitFault(Fault fault);
-
-  protected void visitBinding(Binding binding)
-  {
-    Iterator iterator = binding.getEBindingOperations().iterator();
-    while (iterator.hasNext())
-      visitBindingOperation((BindingOperation)iterator.next());
-
-    iterator = binding.getEExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement(binding,(ExtensibilityElement)iterator.next());
-  }
-  
-  protected void visitBindingOperation(BindingOperation operation)
-  {
-    BindingInput input = operation.getEBindingInput();
-    visitBindingInput((BindingInput)input);  
-    
-    BindingOutput output = operation.getEBindingOutput();
-    visitBindingOutput((BindingOutput)output); 
-    
-    Iterator iterator = operation.getEBindingFaults().iterator();
-    while (iterator.hasNext())
-      visitBindingFault((BindingFault)iterator.next());
-    
-    iterator = operation.getEExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement(operation,(ExtensibilityElement)iterator.next());
-
-  }
- 
-  protected void visitBindingInput(BindingInput input)
-  {
-    Iterator iterator = input.getEExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement(input,(ExtensibilityElement)iterator.next());
-  }
-  
-  protected void visitBindingOutput(BindingOutput output)
-  {
-    Iterator iterator = output.getEExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement(output,(ExtensibilityElement)iterator.next());
-  }
-  
-  protected void visitBindingFault(BindingFault fault)
-  {
-    Iterator iterator = fault.getEExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement(fault,(ExtensibilityElement)iterator.next());
-  }
-
-  protected void visitService(Service service)
-  {
-    Iterator iterator = service.getEPorts().iterator();
-    while (iterator.hasNext())
-      visitPort((Port)iterator.next());
-
-    iterator = service.getEExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement(service,(ExtensibilityElement)iterator.next());
-  }
-  
-  protected void visitPort(Port port)
-  {
-    Iterator iterator = port.getEExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement(port,(ExtensibilityElement)iterator.next());
-  }
-
-  abstract protected void visitExtensibilityElement
-    (ExtensibleElement owner,
-     ExtensibilityElement extensibilityElement);
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java
deleted file mode 100644
index f11cd19..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java
+++ /dev/null

@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests.util;
-
-import java.util.Iterator;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-
-import junit.framework.TestCase;
-
-/**
- * @author Kihup Boo
- */
-public abstract class WSDL4JDefinitionVisitor extends TestCase
-{
-  protected Definition definition;
-  
-  /**
-   * Use DefinitionVisitor(Definition definition)
-   */
-  private WSDL4JDefinitionVisitor()
-  {
-  }
-  
-  // Added for JUnit
-  public WSDL4JDefinitionVisitor(String name)
-  {
-    super(name);
-  }
-  
-  protected WSDL4JDefinitionVisitor(Definition definition)
-  {
-    this.definition = definition;
-  }
-
-  // main entry
-  public void visit()
-  {
-    visitDefinition(definition);
-  }
-  
-  protected void visitDefinition(Definition def)
-  {
-    Iterator iterator = def.getImports().entrySet().iterator();
-    while (iterator.hasNext())
-      visitImport((Import)iterator.next());
-    
-    Types types = def.getTypes();
-    if (types != null)
-      visitTypes(types);
-
-    iterator = def.getMessages().values().iterator();
-    while (iterator.hasNext())
-      visitMessage((Message)iterator.next());
-    
-    iterator = def.getPortTypes().values().iterator();
-    while (iterator.hasNext())
-      visitPortType((PortType)iterator.next());
-
-    iterator = def.getBindings().values().iterator();
-    while (iterator.hasNext())
-      visitBinding((Binding)iterator.next());
-    
-    iterator = def.getServices().values().iterator();
-    while (iterator.hasNext())
-      visitService((Service)iterator.next());
-
-    iterator = def.getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement((ExtensibilityElement)iterator.next());
-
-  }
-  
-  abstract protected void visitImport(Import wsdlImport);
-  
-  abstract protected void visitTypes(Types types);
-
-  protected void visitMessage(Message message)
-  {
-    Iterator iterator = message.getParts().values().iterator();
-    while (iterator.hasNext())
-      visitPart((Part)iterator.next()); 
-  }
-
-  abstract protected void visitPart(Part part);
-  
-  protected void visitPortType(PortType portType)
-  {
-    Iterator iterator = portType.getOperations().iterator();
-    while (iterator.hasNext())
-      visitOperation((Operation)iterator.next());
-  }
-  
-  protected void visitOperation(Operation operation)
-  {
-    Input input = operation.getInput();
-    visitInput((Input)input);  
-    
-    Output output = operation.getOutput();
-    visitOutput((Output)output); 
-    
-    Iterator iterator = operation.getFaults().entrySet().iterator();
-    while (iterator.hasNext())
-      visitFault((Fault)iterator.next());
-  }
-  
-  protected abstract void visitInput(Input input);
-  
-  protected abstract void visitOutput(Output output);
-  
-  protected abstract void visitFault(Fault fault);
-
-  protected void visitBinding(Binding binding)
-  {
-    Iterator iterator = binding.getBindingOperations().iterator();
-    while (iterator.hasNext())
-      visitBindingOperation((BindingOperation)iterator.next());
-
-    iterator = binding.getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement((ExtensibilityElement)iterator.next());
-  }
-  
-  protected void visitBindingOperation(BindingOperation operation)
-  {
-    BindingInput input = operation.getBindingInput();
-    visitBindingInput((BindingInput)input);  
-    
-    BindingOutput output = operation.getBindingOutput();
-    visitBindingOutput((BindingOutput)output); 
-    
-    Iterator iterator = operation.getBindingFaults().entrySet().iterator();
-    while (iterator.hasNext())
-      visitBindingFault((BindingFault)iterator.next());
-    
-    iterator = operation.getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement((ExtensibilityElement)iterator.next());
-
-  }
- 
-  protected void visitBindingInput(BindingInput input)
-  {
-    Iterator iterator = input.getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement((ExtensibilityElement)iterator.next());
-  }
-  
-  protected void visitBindingOutput(BindingOutput output)
-  {
-    Iterator iterator = output.getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement((ExtensibilityElement)iterator.next());
-  }
-  
-  protected void visitBindingFault(BindingFault fault)
-  {
-    Iterator iterator = fault.getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement((ExtensibilityElement)iterator.next());
-  }
-
-  protected void visitService(Service service)
-  {
-    Iterator iterator = service.getPorts().values().iterator();
-    while (iterator.hasNext())
-      visitPort((Port)iterator.next());
-
-    iterator = service.getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement((ExtensibilityElement)iterator.next());
-  }
-  
-  protected void visitPort(Port port)
-  {
-    Iterator iterator = port.getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-      visitExtensibilityElement((ExtensibilityElement)iterator.next());
-  }
-
-  abstract protected void visitExtensibilityElement(ExtensibilityElement extensibilityElement);
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java
deleted file mode 100644
index 9247256..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java
+++ /dev/null

@@ -1,608 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests.util;
-
-import java.io.FileOutputStream;
-import java.util.Iterator;
-
-import javax.wsdl.OperationType;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLPackage;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * @author Kihup Boo
- */
-public class WSDLConverter extends DefinitionVisitor
-{
-  private Document doc;
-  private Element description;
-  private Element currentTypes;
-  private Element currentService;
-  private Element currentEndpoint;
-  private Element currentInterface;
-  private Element currentOperation;
-  
-  private Element currentBinding;
-  private Element currentBindingOperation;
-  private Element currentBindingInput;
-  private Element currentBindingOutput;
-  private Element currentBindingFault;
-  
-  private String wsdlNamespacePrefix;
-  private String xsdNamespacePrefix;
-  
-  {
-    // This is needed because we don't have the following in the plugin.xml
-    //
-    //   <extension point = "org.eclipse.emf.extension_parser">
-    //     <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/>
-    //   </extension>
-    //
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl());
-    WSDLPackage pkg = WSDLPackage.eINSTANCE;
-  
-    // We need this for XSD <import>.
-    Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl());
-    XSDPackage xsdpkg = XSDPackage.eINSTANCE;
-  }
-  
-  // Added for JUnit
-  public WSDLConverter(String name) 
-  {
-    super(name);
-  }
-  
-  /**
-   * @param definition
-   */
-  public WSDLConverter(Definition definition)
-  {
-    super(definition);
-    // TODO Auto-generated constructor stub
-  }
-
-  public void generate20(String filename) throws Exception
-  {
-    createDocument();
-    visit();
-    serialize(filename);
-  }
-  
-  private void serialize(String filename) throws Exception
-  {
-    Source domSource = new DOMSource(doc);
-    Transformer transformer = TransformerFactory.newInstance().newTransformer();
-    transformer.setOutputProperty(OutputKeys.INDENT,"yes");
-    transformer.setOutputProperty(OutputKeys.ENCODING,"UTF-8");
-    transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount","4");
-    transformer.transform(domSource,new StreamResult(new FileOutputStream(filename)));
-  }
-  
-  private void createDocument() throws ParserConfigurationException
-  {
-    doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-  }
-  
-  private Element createWSDLElement(String name)
-  {
-    Element element = doc.createElementNS("http://www.w3.org/2004/08/wsdl",name);
-    if (wsdlNamespacePrefix != null)
-      element.setPrefix(wsdlNamespacePrefix);
-    
-    return element;
-  }
-  
-  private void processDocumentation(Element docElement, Element parent)
-  {
-    if (docElement == null)
-      return;
-
-    Element adoptedDocElement = (Element)doc.importNode(docElement,true);
-    parent.appendChild(adoptedDocElement);
-  }
-  
-  protected void visitDefinition(Definition def)
-  {
-    description = createWSDLElement("description");
-    processDocumentation(def.getDocumentationElement(),description);
-    
-    // TBD - Determine later if we want to convert the document to use SOAP 1.2.
-    // However adding these two namespaces may not be harmful.
-    description.setAttribute("xmlns:soapenv","http://www.w3.org/2003/05/soap-envelop");
-    description.setAttribute("xmlns:wsoap","http://www.w3.org/2004/08/soap12");
-
-    String targetNamespace = def.getTargetNamespace();
-    if (targetNamespace != null)
-      description.setAttribute("targetNamespace",targetNamespace);
-    
-    Iterator iterator = def.getNamespaces().keySet().iterator();
-    String prefix = null;
-    String namespace = null;
-    /*
-	xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-		xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"*/
-    while (iterator.hasNext())
-    {
-      prefix = (String)iterator.next();
-      namespace = def.getNamespace(prefix);
-      
-      if ("http://schemas.xmlsoap.org/wsdl/".equals(namespace))
-      {
-      	if (prefix.length() == 0) // meant to be default namespace
-      	  description.setAttribute("xmlns","http://www.w3.org/2004/08/wsdl");
-      	else
-      	{
-          description.setAttribute("xmlns:" + prefix,"http://www.w3.org/2004/08/wsdl");
-          wsdlNamespacePrefix = prefix;
-          description.setPrefix(wsdlNamespacePrefix);
-      	}
-      	continue;
-      }
-      
-      // SOAP 1.2
-      if ("http://schemas.xmlsoap.org/wsdl/soap/".equals(namespace))
-      {
-      	// SOAP 1.2
-        description.setAttribute("xmlns:" + prefix,"http://www.w3.org/2003/05/soap-envelop");
-        
-        // WSDL 2.0 binding for SOAP 1.2
-        description.setAttribute("xmlns:wsoap","http://www.w3.org/2004/08/soap12");
-      	continue;
-      }
-      
-      //if ("http://schemas.xmlsoap.org/soap/encoding/".equals(namespace))
-      //  continue;
-      
-      if ("http://www.w3.org/2001/XMLSchema".equals(namespace))
-        xsdNamespacePrefix = prefix; // We will use this in visitImport().
-      
-      if (prefix.length() == 0) // meant to be default namespace
-        description.setAttribute("xmlns" + prefix,namespace);
-      else
-        description.setAttribute("xmlns:" + prefix,namespace);
-    }
-    
-    doc.appendChild(description);
-    super.visitDefinition(def);
-    
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitImport(org.eclipse.wst.wsdl.Import)
-   */
-  protected void visitImport(Import wsdlImport)
-  {
-    // Determine if we <import> a schema.
-    if (importingSchema(wsdlImport))
-    {
-      currentTypes = createWSDLElement("types");
-      description.appendChild(currentTypes);
-      
-      //  <xs:import namespace="http://foo.com" schemaLocation= "bar.xsd"/>
-      Element schemaImport = doc.createElementNS("http://www.w3.org/2001/XMLSchema","import");
-      if (xsdNamespacePrefix == null) // need to add one
-      {
-        description.setAttribute("xmlns:xs","http://www.w3.org/2001/XMLSchema");
-        xsdNamespacePrefix = "xs";
-        schemaImport.setPrefix(xsdNamespacePrefix);
-      }
-      else if (!"".equals(xsdNamespacePrefix)) // it is not default namespace
-      	schemaImport.setPrefix(xsdNamespacePrefix);
-      
-      schemaImport.setAttribute("namespace",wsdlImport.getNamespaceURI());
-      schemaImport.setAttribute("schemaLocation",wsdlImport.getLocationURI());
-      processDocumentation(wsdlImport.getDocumentationElement(),schemaImport);
-      currentTypes.appendChild(schemaImport);
-    }
-  	else
-    {
-      Element importElement = wsdlImport.getElement();
-      Element adoptedImportElement = (Element)doc.importNode(importElement,true);
-      processDocumentation(wsdlImport.getDocumentationElement(),adoptedImportElement);
-      description.appendChild(adoptedImportElement);
-    }
-  }
-  
-  private boolean importingSchema(Import myImport)
-  {
-    if (myImport.getDefinition() != null) // it is WSDL import
-      return false;
-    else
-      return true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitTypes(org.eclipse.wst.wsdl.Types)
-   */
-  protected void visitTypes(Types types)
-  {
-  	// currentTypes may have been created in visitImport().
-    if (currentTypes == null)
-    {
-      currentTypes = createWSDLElement("types");
-      processDocumentation(types.getDocumentationElement(),currentTypes);
-      description.appendChild(currentTypes);
-    }
-    
-    Iterator iterator = types.getSchemas().iterator();
-    XSDSchema schema = null;
-    Element schemaElement = null;
-    Element adoptedSchemaElement = null;
-    while (iterator.hasNext())
-    {
-      schema = (XSDSchema)iterator.next();
-      schema.updateElement();
-      schemaElement = schema.getElement();
-      adoptedSchemaElement = (Element)doc.importNode(schemaElement,true);
-      currentTypes.appendChild(adoptedSchemaElement);
-    }    
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitPart(org.eclipse.wst.wsdl.Part)
-   */
-  protected void visitPart(Part part)
-  {
-    // TODO Auto-generated method stub
-  }
-
-  protected void visitPortType(PortType portType)
-  {
-    currentInterface = createWSDLElement("interface");
-  	processDocumentation(portType.getDocumentationElement(),currentInterface);
-  	
-    Element portTypeElement = portType.getElement();
-    if (portTypeElement.hasAttribute("name"))
-      currentInterface.setAttribute("name",portTypeElement.getAttribute("name"));
-    
-    description.appendChild(currentInterface);
-    super.visitPortType(portType);
-  }
-  
-  protected void visitOperation(Operation operation)
-  {
-    currentOperation = createWSDLElement("operation");
-    processDocumentation(operation.getDocumentationElement(),currentOperation);
-	
-    Element operationElement = operation.getElement();
-    if (operationElement.hasAttribute("name"))
-      currentOperation.setAttribute("name",operationElement.getAttribute("name"));
-
-    OperationType opType = operation.getStyle();
-    if (OperationType.REQUEST_RESPONSE == opType)
-      currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/in-out");
-    else if (OperationType.SOLICIT_RESPONSE == opType)
-        currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/out-in");
-    else if (OperationType.NOTIFICATION == opType)
-        currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/out-only");
-    else if (OperationType.ONE_WAY == opType)
-        currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/in-only");
-    
-    currentInterface.appendChild(currentOperation);
-    super.visitOperation(operation);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitInput(org.eclipse.wst.wsdl.Input)
-   */
-  protected void visitInput(Input input)
-  {
-    Element currentInput = createWSDLElement("input");
-    processDocumentation(input.getDocumentationElement(),currentInput);
-    
-    Element inputElement = input.getElement();
-    
-    if (inputElement.hasAttribute("name"))
-      currentInput.setAttribute("messageLabel",inputElement.getAttribute("name"));
-    
-    Element partElement = getPartElement(input);
-    if (partElement.hasAttribute("element"))
-      currentInput.setAttribute("element",partElement.getAttribute("element"));
-    // TBD - what if the part uses "type"?
-    
-    currentOperation.appendChild(currentInput);
-  }
-  
-  private Element getPartElement(MessageReference messageRef)
-  {
-    Iterator iterator = messageRef.getEMessage().getEParts().iterator();
-    // TBD - for now, take the first part.
-    Part part = (Part)iterator.next();
-    Element partElement = part.getElement();
-    return partElement;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitOutput(org.eclipse.wst.wsdl.Output)
-   */
-  protected void visitOutput(Output output)
-  {
-    Element currentOutput = createWSDLElement("output");
-    processDocumentation(output.getDocumentationElement(),currentOutput);
-    
-    Element outputElement = output.getElement();
-    
-    if (outputElement.hasAttribute("name"))
-      currentOutput.setAttribute("messageLabel",outputElement.getAttribute("name"));
-    
-    Element partElement = getPartElement(output);
-    if (partElement.hasAttribute("element"))
-      currentOutput.setAttribute("element",partElement.getAttribute("element"));
-    // TBD - what if the part uses "type"?
-    
-    currentOperation.appendChild(currentOutput);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitFault(org.eclipse.wst.wsdl.Fault)
-   */
-  protected void visitFault(Fault fault)
-  {
-    // TODO Auto-generated method stub
-
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitBinding(org.eclipse.wst.wsdl.Binding)
-   */
-  protected void visitBinding(Binding binding)
-  {
-    currentBinding = createWSDLElement("binding");
-    processDocumentation(binding.getDocumentationElement(),currentBinding);
-    
-    Element bindingElement = binding.getElement();
-    if (bindingElement.hasAttribute("name"))
-      currentBinding.setAttribute("name",bindingElement.getAttribute("name"));
-    if (bindingElement.hasAttribute("type"))
-      currentBinding.setAttribute("interface",bindingElement.getAttribute("type"));
-    
-    // TBD - is the next line fixed for SOAP?
-    currentBinding.setAttribute("type","http://www.w3.org/2004/08/wsdl/soap12");
-    currentBinding.setAttribute("wsoap:protocol","http://www.w3.org/2003/05/soap/bindings/HTTP");
-    currentBinding.setAttribute("wsoap:mepDefault","http://www.w3.org.2003/05/soap/mep/request-response");
-
-    description.appendChild(currentBinding);
-    super.visitBinding(binding);
-  }
-  
-  protected void visitBindingOperation(BindingOperation operation)
-  {
-    currentBindingOperation = createWSDLElement("operation");
-    processDocumentation(operation.getDocumentationElement(),currentBindingOperation);
-    
-    Element operationElement = operation.getElement();
-    String operationName = operation.getEOperation().getName();
- 
-    // Determine prefix
-    String prefix = null;
-    String targetNamespace = null;
-    Definition def = operation.getEnclosingDefinition();
-    if (def != null)
-      targetNamespace = def.getTargetNamespace();
-    if (targetNamespace != null)
-      prefix = def.getPrefix(targetNamespace);
-    
-    if (prefix == null)
-      prefix = "";
-    else
-      prefix += ":";
-      
-    currentBindingOperation.setAttribute("ref",prefix + operationName);
-    
-    currentBinding.appendChild(currentBindingOperation);
-    super.visitBindingOperation(operation);
-  }
- 
-  protected void visitBindingInput(BindingInput input)
-  {
-    currentBindingInput = createWSDLElement("input");
-    processDocumentation(input.getDocumentationElement(),currentBindingInput);
-    
-    Element inputElement = input.getElement();
-    String inputName = input.getName();
-    if (inputName != null)
-      inputElement.setAttribute("name",inputName);
-    
-    currentBindingOperation.appendChild(currentBindingInput);
-    super.visitBindingInput(input);
-  }
-  
-  protected void visitBindingOutput(BindingOutput output)
-  {
-    currentBindingOutput = createWSDLElement("output");
-    processDocumentation(output.getDocumentationElement(),currentBindingOutput);
-    
-    Element outputElement = output.getElement();
-    String outputName = output.getName();
-    if (outputName != null)
-      outputElement.setAttribute("name",outputName);
-    
-    currentBindingOperation.appendChild(currentBindingOutput);
-    super.visitBindingOutput(output);
-  }
-  
-  protected void visitBindingFault(BindingFault fault)
-  {
-    currentBindingFault = createWSDLElement("fault");
-    processDocumentation(fault.getDocumentationElement(),currentBindingFault);
-    
-    Element faultElement = fault.getElement();
-    String faultName = fault.getName();
-    if (faultName != null)
-      faultElement.setAttribute("name",faultName);
-    
-    currentBindingOperation.appendChild(currentBindingFault);
-    super.visitBindingFault(fault); 
-  }
- 
-  protected void visitService(Service service)
-  {
-    currentService = createWSDLElement("service");
-    processDocumentation(service.getDocumentationElement(),currentService);
-    
-    Element serviceElement = service.getElement();
-    if (serviceElement.hasAttribute("name"))
-      currentService.setAttribute("name",serviceElement.getAttribute("name"));
-    
-    description.appendChild(currentService);
-    super.visitService(service);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitPort(org.eclipse.wst.wsdl.Port)
-   */
-  protected void visitPort(Port port)
-  {
-    currentEndpoint = createWSDLElement("endpoint");
-    processDocumentation(port.getDocumentationElement(),currentEndpoint);
-    
-    Element portElement = port.getElement();
-    if (portElement.hasAttribute("name"))
-      currentEndpoint.setAttribute("name",portElement.getAttribute("name"));
-    if (portElement.hasAttribute("binding"))
-      currentEndpoint.setAttribute("binding",portElement.getAttribute("binding"));
-    
-    // Add interface to current service
-    Binding binding = port.getEBinding();
-    if (binding != null) // binding could not be resolved
-    {
-      Element bindingElement = binding.getElement();
-      if (bindingElement.hasAttribute("type"))
-        currentService.setAttribute("interface",bindingElement.getAttribute("type"));
-    }
-   
-    currentService.appendChild(currentEndpoint);
-    super.visitPort(port);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitExtensibilityElement(org.eclipse.wst.wsdl.ExtensibleElement, org.eclipse.wst.wsdl.ExtensibilityElement)
-   */
-  protected void visitExtensibilityElement(ExtensibleElement owner, ExtensibilityElement extensibilityElement)
-  {
-    // TBD - It is not just SOAP binding
-    if (owner instanceof org.eclipse.wst.wsdl.internal.impl.PortImpl)
-    {
-      Element soapElement = extensibilityElement.getElement();
-      if (soapElement.hasAttribute("location"))
-        currentEndpoint.setAttribute("address",soapElement.getAttribute("location"));
-    }
-    else
-    {
-      Element domElement = extensibilityElement.getElement();
-      Element adoptedDOMElement = (Element)doc.importNode(domElement,true);
-      
-      if (owner instanceof org.eclipse.wst.wsdl.internal.impl.DefinitionImpl)
-        description.insertBefore(adoptedDOMElement,description.getFirstChild());
-      else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.ServiceImpl)
-        currentService.insertBefore(adoptedDOMElement,currentService.getFirstChild());
-      else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.PortTypeImpl)
-      	currentInterface.insertBefore(adoptedDOMElement,currentInterface.getFirstChild());
-      else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.OperationImpl)
-      	currentOperation.insertBefore(adoptedDOMElement,currentOperation.getFirstChild());
-      else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingImpl)
-      	currentBinding.insertBefore(adoptedDOMElement,currentBinding.getFirstChild());
-      else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingOperationImpl)
-      	currentBindingOperation.insertBefore(adoptedDOMElement,currentBindingOperation.getFirstChild());
-      else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingInputImpl)
-      	currentBindingInput.insertBefore(adoptedDOMElement,currentBindingInput.getFirstChild());
-      else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingOutputImpl)
-      	currentBindingOutput.insertBefore(adoptedDOMElement,currentBindingOutput.getFirstChild());
-      else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingFaultImpl)
-      	currentBindingFault.insertBefore(adoptedDOMElement,currentBindingFault.getFirstChild());
-
-    }
-
-  }
-  
-  public static Test suite() 
-  {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTest
-      (new WSDLConverter("Convert") 
-         {
-           protected void runTest() 
-           {
-             testConvert();
-           }
-         }
-       );
-    return suite;
-  }
-  
-  public void testConvert()
-  {
-    try
-    {
-      Definition def = DefinitionLoader.load("d:/eclipse301/eclipse/workspace/org.eclipse.wst.wsdl.tests/PTATimeDistribution.wsdl");
-      WSDLConverter converter = new WSDLConverter(def);
-      converter.generate20("d:/eclipse301/eclipse/workspace/org.eclipse.wst.wsdl.tests/PTATimeDistribution20.wsdl");
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }    
-  }
-  
-  public static void main(String[] args)
-  {
-    junit.textui.TestRunner.run(suite());
-    /*
-    try
-    {
-      Definition def = DefinitionLoader.load(args[0]);
-      WSDLConverter converter = new WSDLConverter(def);
-      converter.generate20("test20.wsdl");
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }*/
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java
deleted file mode 100644
index a4c5b3b..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator;
-
-public class WSDLModelLocatorAdapterFactory extends AdapterFactoryImpl
-{
-  protected CustomWSDLModelLocator customWSDLModelLocator = new CustomWSDLModelLocator();
-  
-  class CustomWSDLModelLocator extends AdapterImpl implements WSDLModelLocator
-  {
-    public String resolveURI(String baseLocation, String namespace, String location)
-    {
-      return URIResolverPlugin.createResolver().resolve(baseLocation, namespace, location);
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == WSDLModelLocator.class;
-    }
-  }
-
-  public boolean isFactoryForType(Object type)
-  {
-    return type == WSDLModelLocator.class;
-  }
-
-  public Adapter adaptNew(Notifier target, Object type)
-  {
-    return customWSDLModelLocator;
-  }
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java
deleted file mode 100644
index 907a330..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java
+++ /dev/null

@@ -1,169 +0,0 @@
-package org.eclipse.wst.wsdl.tests.util;
-
-import org.w3c.dom.*;
-import org.xml.sax.SAXException;
-
-import java.io.*;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * @author Kihup Boo
- */
-public class XMLDiff
-{
-  private PrintStream out = System.out;
-  private boolean DIFF_ELEMENT_NODE_ONLY = false;
-  
-  public boolean diff(String file1, String file2) throws ParserConfigurationException, SAXException, IOException
-  {
-    return diff(file1,file2,false);
-  }
-  
-  public boolean diff(String file1, String file2, boolean elementOnly) throws ParserConfigurationException, SAXException, IOException
-  {
-    Document doc1 = getDocument(file1);
-    Document doc2 = getDocument(file2);
-  	DIFF_ELEMENT_NODE_ONLY = elementOnly;
-    return diff(doc1,doc2);
-  }
-  
-  public boolean diff(Document doc1, Document doc2)
-  {
-    Element root1 = doc1.getDocumentElement();
-    Element root2 = doc2.getDocumentElement();
-    return compareNodes(root1,root2);
-  }
-  
-  private Document getDocument(String uri) throws ParserConfigurationException, SAXException, IOException
-  {
-    DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-    Document doc = builder.parse(uri);
-    return doc;
-  }
-  
-  private boolean compareNodes(Node node1, Node node2)
-  {
-  	if (DIFF_ELEMENT_NODE_ONLY)
-  	{
-      // Compare only element nodes in the children.
-      filterNonElementNodes(node1);
-      filterNonElementNodes(node2);
-  	}
-  	
-    if (node1.getNodeType() != node2.getNodeType()
-        || node1.getNodeName() != node2.getNodeName())
-    {
-      println("Node type or node name is different:");
-      println("Node 1: " + node1.getNodeName());
-      println("Node 2: " + node2.getNodeName());
-      return false;
-    }
-    
-    if (!compareAttributes(node1,node2))
-      return false;
-    
-    NodeList nodeList1 = node1.getChildNodes();
-    NodeList nodeList2 = node2.getChildNodes();
-    if (nodeList1.getLength() != nodeList2.getLength())
-    {
-      println("The number of children is different:");
-      //println("Node 1: " + nodeList1.getLength());
-      //println("Node 2: " + nodeList2.getLength());
-      println("Node 1: " + node1.getNodeName());
-      println("Node 2: " + node2.getNodeName());
-      return false;
-    }
-    
-    boolean result = true;
-    int length = nodeList1.getLength();
-    for (int i=0; i<length; i++)
-    {
-      result = compareNodes(nodeList1.item(i),nodeList2.item(i));
-      if (!result)
-        return false;
-    }
-  	return true;
-  }
-  
-  private void filterNonElementNodes(Node node)
-  {
-    Node firstChild = node.getFirstChild();
-    while (firstChild.getNodeType() != Node.ELEMENT_NODE)
-    {
-      node.removeChild(firstChild);
-      firstChild = node.getFirstChild();
-    }
-    
-    Node sibling = firstChild.getNextSibling();
-    Node deleteMe = null;
-    while (sibling != null)
-    {
-      if (sibling.getNodeType() != Node.ELEMENT_NODE)
-      {
-      	deleteMe = sibling;
-      	sibling = sibling.getNextSibling();
-        node.removeChild(deleteMe);
-      }
-      
-    }
-  }
-  
-  private boolean compareAttributes(Node node1, Node node2)
-  {
-    NamedNodeMap nodeMap1 = node1.getAttributes();
-    NamedNodeMap nodeMap2 = node2.getAttributes();
-    
-    if (nodeMap1 == null || nodeMap2 == null)
-    {
-      if (nodeMap1 == null && nodeMap2 == null)
-        return true;
-      else
-        return false;
-    }
-    
-    if (nodeMap1.getLength() != nodeMap2.getLength())
-    {
-    	println("The number of attributes is different:");
-        println("Node 1: " + node1.getNodeName());
-        println("Node 2: " + node2.getNodeName());
-        return false;
-    }
-    
-    Node attrNode1 = null;
-    Node attrNode2 = null;
-    int length = nodeMap1.getLength();
-    for (int i=0; i<length; i++)
-    {
-      attrNode1 = nodeMap1.item(i);
-      attrNode2 = nodeMap2.getNamedItem(attrNode1.getNodeName());
-      if (attrNode2 == null)
-      {
-    	println("The attribute is not found in Node 2: " + attrNode1.getNodeName());
-        println("Node 1: " + node1.getNodeName());
-        println("Node 2: " + node2.getNodeName());
-        return false;
-      }
-      else if (!attrNode1.getNodeValue().equals(attrNode2.getNodeValue()))
-      {
-    	println("The attribute values are different:");
-        println("Node 1: " + node1.getNodeName() + "," + attrNode1.getNodeValue());
-        println("Node 2: " + node2.getNodeName() + "," + attrNode2.getNodeValue());
-        return false;      
-      }
-    }
-  	return true;
-  }
-  
-  private void print(String s)
-  {
-    out.print(s);
-  }
-  
-  private void println(String s)
-  {
-    out.println(s);
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java
deleted file mode 100644
index 5bbba87..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.xsd.util.XSDSchemaLocationResolver;
-
-public class XSDSchemaLocationResolverAdapterFactory extends AdapterFactoryImpl
-{
-    protected XSDSchemaLocationResolverImpl schemaLocator = new XSDSchemaLocationResolverImpl();
-
-    public boolean isFactoryForType(Object type)
-    {
-      return type == XSDSchemaLocationResolver.class;
-    }
-
-    public Adapter adaptNew(Notifier target, Object type)
-    {
-      return schemaLocator;
-    }
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java
deleted file mode 100644
index 7a4387a..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.tests.util;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDSchemaLocationResolver;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocationResolverImpl extends AdapterImpl implements XSDSchemaLocationResolver
-{
-    public String resolveSchemaLocation(XSDSchema xsdSchema, String namespaceURI, String schemaLocationURI)
-    {
-      String baseLocation = xsdSchema.getSchemaLocation();      
-      return URIResolverPlugin.createResolver().resolve(baseLocation, namespaceURI, schemaLocationURI);
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }  
-}

diff --git a/tests/org.eclipse.wst.wsdl.tests/test.xml b/tests/org.eclipse.wst.wsdl.tests/test.xml
deleted file mode 100644
index fca583e..0000000
--- a/tests/org.eclipse.wst.wsdl.tests/test.xml
+++ /dev/null

@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-	<!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-		
-		<echo message="basedir ${basedir}" />
-		<echo message="eclipse place ${eclipse-home}" />
-	
-	<!-- sets the properties plugin-name, and library-file -->
-	<property name="plugin-name" value="org.eclipse.wst.wsdl.tests" />
-	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<tstamp/>
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org.eclipse.wst.wsdl.tests.*xml" />
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-		<property name="wst-folder" value="${eclipse-home}/wst_folder"/>
-		<delete dir="${wst-folder}" quiet="true"/>
-    	<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      		<property name="data-dir" value="${wst-folder}"/>
-      		<property name="plugin-name" value="${plugin-name}"/>
-      		<property name="classname" value="org.eclipse.wst.wsdl.tests.AllTestCases" />
-   			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-    	</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-		<!--<delete dir="${workspace}" quiet="true" />-->
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init,suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org.eclipse.wst.wsdl.tests.*xml" />
-			<property name="output-file" value="${plugin-name}.xml" />
-		</ant>
-	</target>
-
-</project>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/.classpath b/tests/org.eclipse.wst.wsdl.validation.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/.cvsignore b/tests/org.eclipse.wst.wsdl.validation.tests/.cvsignore
deleted file mode 100644
index 1172c7f..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsdlvalidatetests.jar

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/.project b/tests/org.eclipse.wst.wsdl.validation.tests/.project
deleted file mode 100644
index f2a6db4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsdl.validation.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index a24b92f..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WSDL Validator Tests Plug-in
-Bundle-SymbolicName: org.eclipse.wst.wsdl.validation.tests
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsdlvalidatetests.jar
-Bundle-Activator: org.eclipse.wst.wsdl.validation.tests.internal.WSDLValidatorTestsPlugin
-Bundle-Vendor: Eclipse
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit,
- org.eclipse.core.resources,
- org.eclipse.wst.wsdl.validation,
- org.eclipse.wst.ws.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.apache.ant
-Eclipse-AutoStart: true

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/about.html b/tests/org.eclipse.wst.wsdl.validation.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/build.properties b/tests/org.eclipse.wst.wsdl.validation.tests/build.properties
deleted file mode 100644
index 4efc768..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/build.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-source.wsdlvalidatetests.jar = src/
-output.wsdlvalidatetests.jar = bin/
-bin.includes = plugin.xml,\
-               wsdlvalidatetests.jar,\
-               testresources/,\
-               test.xml,\
-               runtests.bat,\
-               META-INF/,\
-               META-INF/,\
-               about.html

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/plugin.xml b/tests/org.eclipse.wst.wsdl.validation.tests/plugin.xml
deleted file mode 100644
index 7bf65fb..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/plugin.xml
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-</plugin>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverTest.java
deleted file mode 100644
index 31dcb93..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverTest.java
+++ /dev/null

@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.internal.resolver;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * URIResolver tests.
- */
-public class URIResolverTest extends TestCase
-{
-  private URIResolver uriResolver = null;
- /**
-  * Create a tests suite from this test class.
-  * 
-  * @return A test suite containing this test class.
-  */
-  public static Test suite()
-  {
-    return new TestSuite(URIResolverTest.class);
-  }
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp() throws Exception 
-  {
-	uriResolver = new URIResolver();	
-  }
-  
-  public void testNormalizeAbsoluteFile()
-  {
-  	// System id is absolute and should not be modified.
-  	String baseLocation = "file:/c:/somepath/somepath/file.txt";
-  	String systemId = "file:/c:/somepath/myfile.txt";
-  	assertEquals("systemId is absolute and should not be modified.", systemId, uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  	
-  }
-  
-  public void testNormalizeRelativeFile()
-  {
-  	// System id is relative 
-  	String baseLocation = "file:/c:/somepath/somepath/file.txt";
-  	String systemId = "myfile.txt";
-  	assertEquals("systemId is simple relative and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileStartsWithDotDot()
-  {
-    // System id is relative with ../
-  	String baseLocation = "file:/c:/somepath/somepath/file.txt";
-  	String systemId = "../myfile.txt";
-  	assertEquals("systemId is relative with ../ and is not modified correctly.", "file:/c:/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileStartsWithDotDotTwice()
-  {
-    // System id is relative with ../../
-  	String baseLocation = "file:/c:/somepath/somepath/file.txt";
-  	String systemId = "../../myfile.txt";
-  	assertEquals("systemId is relative with ../../ and is not modified correctly.", "file:/c:/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileStartsWithDot()
-  {
-    // System id is relative with ./
-  	String baseLocation = "file:/c:/somepath/somepath/file.txt";
-  	String systemId = "./myfile.txt";
-  	assertEquals("systemId is relative with ./ and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileStartsWithDotTwice()
-  {
-    // System id is relative with ././
-  	String baseLocation = "file:/c:/somepath/somepath/file.txt";
-  	String systemId = "././myfile.txt";
-  	assertEquals("systemId is relative with ././ and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileStartsWithSlash()
-  {
-    // System id is relative beginning with /
-  	String baseLocation = "file:/c:/somepath/somepath/file.txt";
-  	String systemId = "/myfile.txt";
-  	assertEquals("systemId is relative beginning with / and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileDotDotInMiddle()
-  {
-    // System id contains ../ in the middle
-  	String baseLocation = "file:/c:/somepath/somepath/file.txt";
-  	String systemId = "somepath/../myfile.txt";
-  	assertEquals("systemId is relative and contains ../ in the middle and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileFotInMiddle()
-  {
-    // System id contains ./ in the middle
-  	String baseLocation = "file:/c:/somepath/somepath/file.txt";
-  	String systemId = "somepath/./myfile.txt";
-  	assertEquals("systemId is relative and contains ./ in the middle and is not modified correctly.", "file:/c:/somepath/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormlizeRelativeFileDotDotInMiddleOfBase()
-  {
-    // Base location contains ../ in the middle
-  	String baseLocation = "file:/c:/somepath/../somepath/file.txt";
-  	String systemId = "myfile.txt";
-  	assertEquals("baseLocation contains ../ in the middle and is not modified correctly.", "file:/c:/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileDotInMiddleOfBase()
-  {
-    // Base location contains ./ in the middle
-  	String baseLocation = "file:/c:/somepath/./somepath/file.txt";
-  	String systemId = "myfile.txt";
-  	assertEquals("baseLocation contains ./ in the middle and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileBaseStartsWithSlashDotDot()
-  {
-    // Base location starts with /../ 
-  	String baseLocation = "file:/../somepath/file.txt";
-  	String systemId = "myfile.txt";
-  	assertEquals("baseLocation starts with ../ and is not modified correctly.", "file:/../somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileBaseStartsWithSlashDot()
-  {
-    // Base location starts with /./
-  	String baseLocation = "file:/./somepath/file.txt";
-  	String systemId = "myfile.txt";
-  	assertEquals("baseLocation starts with ./ and is not modified correctly.", "file:/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileBaseStartsWithDotDot()
-  {
-    // Base location starts with ../ 
-  	String baseLocation = "file:../somepath/file.txt";
-  	String systemId = "myfile.txt";
-  	assertEquals("baseLocation starts with ../ and is not modified correctly.", "file:../somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileBaseStartsWithDot()
-  {
-    // Base location starts with ./ 
-  	String baseLocation = "file:./somepath/file.txt";
-  	String systemId = "myfile.txt";
-  	assertEquals("baseLocation starts with ./ and is not modified correctly.", "file:somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileSomedirDotDot()
-  {
-    // System id contains somedir../ in the middle
-  	String baseLocation = "file:/somepath/file.txt";
-  	String systemId = "somedir../myfile.txt";
-  	assertEquals("systemId has somedir../ and is not modified correctly.", "file:/somepath/somedir../myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeRelativeFileSomedirDot()
-  {
-    // System id contains somedir./ in the middle
-  	String baseLocation = "file:/somepath/file.txt";
-  	String systemId = "somedir./myfile.txt";
-  	assertEquals("systemId has somedir./ and is not modified correctly.", "file:/somepath/somedir./myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeNullSystemId()
-  {
-    // System id is null
-  	String baseLocation = "file:/somepath/file.txt";
-  	String systemId = null;
-  	assertEquals("systemId is null.", null, uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeNullBaseLocation()
-  {
-    // Base location is null
-  	String baseLocation = null;
-  	String systemId = "somedir./myfile.txt";
-  	assertEquals("systemId is null.", null, uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-  
-  public void testNormalizeSystemIdAbsoluteNullBaseLocation()
-  {
-    // Base location is null
-  	String baseLocation = "null";
-  	String systemId = "file:/somedir./myfile.txt";
-  	assertEquals("systemId is null.", "file:/somedir./myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation());
-  }
-
-	
-}

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTask.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTask.java
deleted file mode 100644
index 907875d..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTask.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-import java.util.List;
-
-/**
- * This class is used to expose functionality from the WSDLValidate class for testing.
- */
-public class WSDLValidateTask extends WSDLValidate
-{
-
-  /**
-   * @see org.eclipse.wst.wsdl.validation.internal.ui.ant.WSDLValidate#getFileList()
-   */
-  public List getFileList()
-  {
-    return super.getFileList();
-  }
-
-}

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTest.java
deleted file mode 100644
index 92ca201..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTest.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.internal.ui.ant;
-
-import java.io.File;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.selectors.FilenameSelector;
-import org.eclipse.wst.wsdl.validation.tests.internal.BaseTestCase;
-
-/**
- * WSDLValidate ant task tests.
- */
-public class WSDLValidateTest extends BaseTestCase
-{
-  private String BASE_DIR;;
-  private Project project;
-
- /**
-  * Create a tests suite from this test class.
-  * 
-  * @return A test suite containing this test class.
-  */
-  public static Test suite()
-  {
-    return new TestSuite(WSDLValidateTest.class);
-  }
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp()
-  {
-    super.setUp();
-    try
-    {
-      BASE_DIR = PLUGIN_ABSOLUTE_PATH;
-      BASE_DIR = BASE_DIR.replace('/', File.separatorChar);
-      if(BASE_DIR.startsWith("\\"))
-      {
-        BASE_DIR = BASE_DIR.substring(1);  
-      }
-    }
-    catch(Exception e)
-    {
-      
-    }
-    project = new Project();
-    project.setBaseDir(new File(BASE_DIR));
-  }
-  
-  /**
-   * Test that a single file with a relative location is resolved properly.
-   */
-  public void testRelativeSingleFileLocation()
-  {
-    String fileLoc = "file.wsdl";
-    String resolvedLocation = ("file:///" + BASE_DIR + fileLoc).replace('\\','/');
-    WSDLValidateTask wsdlValidateTask = new WSDLValidateTask();
-    wsdlValidateTask.setProject(project);
-    wsdlValidateTask.setFile(fileLoc);
-    List fileList = wsdlValidateTask.getFileList();
-    assertEquals("The file list does not contain only one file.", 1, fileList.size());
-    // The file locations are converted to lower case to avoid drive letter case differences on windows. ie. C vs c.
-    assertEquals("The file location '" + fileList.get(0) + "' is not correctly resolved to the base location.", resolvedLocation.toLowerCase(), ((String)fileList.get(0)).toLowerCase());
-    
-  }
-  
-  /**
-   * Test that a single file with an absolute location is resolved properly.
-   */
-  public void testAbsoluteSingleFileLocation()
-  {
-    String fileLoc = BASE_DIR + "file.wsdl";
-    String resolvedLocation = (FILE_PROTOCOL + fileLoc).replace('\\','/');
-    WSDLValidateTask wsdlValidateTask = new WSDLValidateTask();
-    wsdlValidateTask.setProject(project);
-    wsdlValidateTask.setFile(fileLoc);
-    List fileList = wsdlValidateTask.getFileList();
-    assertEquals("The file list does not contain only one file.", 1, fileList.size());
-    assertEquals("The file location '" + fileLoc + "' is modified.", resolvedLocation.toLowerCase(), ((String)fileList.get(0)).toLowerCase());
-    
-  }
-  
-  /**
-   * Test that a single file with an absolute, remote location is resolved properly.
-   */
-  public void testAbsoluteSingleFileRemoteLocation()
-  {
-    String resolvedLocation = "http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog.wsdl";
-    String fileLoc = "http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog.wsdl";
-    WSDLValidateTask wsdlValidateTask = new WSDLValidateTask();
-    wsdlValidateTask.setProject(project);
-    wsdlValidateTask.setFile(fileLoc);
-    List fileList = wsdlValidateTask.getFileList();
-    assertEquals("The file list does not contain only one file.", 1, fileList.size());
-    assertEquals("The file location '" + fileLoc + "' is modified.", resolvedLocation.toLowerCase(), ((String)fileList.get(0)).toLowerCase());
-    
-  }
-  
-/**
-   * Test that a single file in a fileset with a relative location is resolved properly
-   * when no directory is specified.
-   */
-  public void testRelativeSingleFileInFilesetNoDirSpecified()
-  {
-    String fileLoc = "Empty.wsdl";
-    String base_dir = BASE_DIR + SAMPLES_DIR + "WSDL" + File.separator + "SelfContained";
-    String resolvedLocation = ("file:///" + base_dir + "/" + fileLoc).replace('\\','/');
-    base_dir = base_dir.replace('/', File.separatorChar);
-    
-    WSDLValidateTask wsdlValidateTask = new WSDLValidateTask();
-    wsdlValidateTask.setProject(project);
-    
-    FileSet fileset = wsdlValidateTask.createFileset();
-    fileset.setProject(project);
-    fileset.setDir(new File(base_dir));
-   
-    FilenameSelector filenameSelector = new FilenameSelector();
-    filenameSelector.setName(fileLoc);
-    fileset.addFilename(filenameSelector);
-    //fileset.setFile(new File(fileLoc));
-    
-    List fileList = wsdlValidateTask.getFileList();
-    assertEquals("The file list does not contain only one file.", 1, fileList.size());
-    // The file locations are converted to lower case to avoid drive letter case differences on windows. ie. C vs c.
-    assertEquals("The file location '" + fileList.get(0) + "' is not correctly resolved to the base location.", resolvedLocation.toLowerCase(), ((String)fileList.get(0)).toLowerCase());
-    
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogTest.java
deleted file mode 100644
index 941135e..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogTest.java
+++ /dev/null

@@ -1,53 +0,0 @@
-package org.eclipse.wst.wsdl.validation.internal.xml;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.wsdl.validation.tests.internal.BaseTestCase;
-
-/**
- * Tests for the WSDL validator's internal XML catalog.
- */
-public class XMLCatalogTest extends BaseTestCase
-{
-  private String CATALOG_DIR = "testresources/samples/XSD/CatalogSchemas/";
-  
-  /**
-   * Create a tests suite from this test class.
-   * 
-   * @return A test suite containing this test class.
-   */
-  public static Test suite()
-  {
-	return new TestSuite(XMLCatalogTest.class);
-  }
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp() 
-  {
-	super.setUp();
-	XMLCatalog.reset();
-  }
-
-
-
-public void testSchemaDir()
-  {
-	XMLCatalog.addSchemaDir(PLUGIN_ABSOLUTE_PATH + CATALOG_DIR);
-	String catalogLocation = PLUGIN_ABSOLUTE_PATH + CATALOG_DIR;
-	catalogLocation = catalogLocation.replace('\\','/');
-    while(catalogLocation.startsWith("/"))
-    {
-    	catalogLocation = catalogLocation.substring(1);
-    }
-    catalogLocation = FILE_PROTOCOL + catalogLocation;
-	IXMLCatalog catalog = XMLCatalog.getInstance();
-	String resolvedLocation = catalog.resolveEntityLocation("http://www.example.org/schema1", "");
-	assertEquals("The resolved location is not equal to the expected location.", catalogLocation + "schema1.xsd", resolvedLocation);
-	resolvedLocation = catalog.resolveEntityLocation("http://www.example.org/schema2", "");
-	assertEquals("The second resolved location is not equal to the resolved location.", catalogLocation + "schema2.xsd", resolvedLocation);
-  
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.java
deleted file mode 100644
index 91daefa..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.tests.internal;
-import junit.framework.Test;
-
-import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverTest;
-import org.eclipse.wst.wsdl.validation.internal.ui.ant.WSDLValidateTest;
-import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalogTest;
-/**
- * The root test suite that contains all other WSDL validator test suites.
- */
-public class AllWSDLTests extends junit.framework.TestSuite
-{
-  /**
-   * Create this test suite.
-   * 
-   * @return This test suite.
-   */
-  public static Test suite()
-  {
-    return new AllWSDLTests();
-  }
-  
-  /**
-   * Constructor
-   */
-  public AllWSDLTests()
-  {
-    super("AllWSDLTests");
-    addTest(XSDTest.suite());
-    addTest(WSDLTest.suite());
-    addTest(PathsTest.suite());
-    addTest(URIResolverTest.suite());
-    addTest(WSDLValidateTest.suite());
-    addTest(XMLCatalogTest.suite());
-  }
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.java
deleted file mode 100644
index f0c27d4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.java
+++ /dev/null

@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.tests.internal;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.ui.eclipse.WSDLValidator;
-
-/**
- * Base test case class which provides methods to 
- * - create logs
- * - read from logs
- * - run log comparison tests
- */
-public class BaseTestCase extends TestCase
-{
-  protected String FILE_PROTOCOL = "file:///"; 
-  protected String PLUGIN_ABSOLUTE_PATH;
-  protected String SAMPLES_DIR = "testresources/samples/";
-  protected String GENERATED_RESULTS_DIR = "testresources/generatedResults/";
-  protected String IDEAL_RESULTS_DIR = "testresources/idealResults/";
-  protected String LOG_FILE_LOCATION = "results.log";
-  
-  protected static final String PLUGIN_NAME = "org.eclipse.wst.wsdl.validation.tests";
-  private WSDLValidator validator = WSDLValidator.getInstance();
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp()
-  {
-    PLUGIN_ABSOLUTE_PATH = WSDLValidatorTestsPlugin.getInstallURL();//getPluginLocation();
-    
-    // Set the WS-I preference to ignore so only WSDL errors will be tested.
-    WSUIPlugin wsui = WSUIPlugin.getInstance();
-    PersistentWSIContext wsicontext = wsui.getWSISSBPContext();
-    wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
-    wsicontext = wsui.getWSIAPContext();
-    wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
-  }
-  
-  /**
-   * Run a validator test. The test will run the validator, log the results and compare the results
-   * with the ideal results. The test will only pass if the two log files are the same.
-   * 
-   * @param testfile The file to run the validator test on.
-   * @param loglocation The location to create the log file.
-   * @param idealloglocation The location of the ideal log file.
-   */
-  public void runTest(String testfile, String loglocation, String idealloglocation)
-  {
-    IValidationReport valreport = validator.validate(testfile);
-    try
-    {
-      createLog(loglocation, valreport);
-      String generatedLog = getStringFromFile(loglocation);
-      String idealLog = getStringFromFile(idealloglocation);
-      assertEquals(idealLog, generatedLog);
-    } catch (Exception e)
-    {
-      fail("Could not compare log files");
-    }
-  }
-  
-  /**
-   * Get a string representation of a file.
-   * 
-   * @param filename the file name of the file to get the string representation.
-   * @return The string representation if successful.
-   * @throws Exception Thrown if unable to create a string representaion of the file.
-   */
-  private String getStringFromFile(String filename) throws Exception
-  {
-    if(filename.startsWith("file:"))
-  	{
-  	  filename = filename.substring(6);
-  	  while(filename.startsWith("\\") || filename.startsWith("/"))
-  	  {
-  	  	filename = filename.substring(1);
-  	  }
-  	}
-    StringBuffer filestring = new StringBuffer();
-    Reader reader = null;
-    BufferedReader bufreader = null;
-    try
-    {
-      File file = new File(filename);
-      reader = new FileReader(file);
-      bufreader = new BufferedReader(reader);
-      while (bufreader.ready())
-      {
-        filestring.append(bufreader.readLine() + "\n");
-      }
-    } catch (FileNotFoundException e)
-    {
-      throw new Exception();
-    } finally
-    {
-      bufreader.close();
-      reader.close();
-    }
-    return filestring.toString();
-  }
-  
-  /**
-   * Create a log file for an XSD test.
-   * 
-   * @param filename The name of the log file to create.
-   * @param valreport The validation report for this file.
-   * @return The file contents as a string if successful or null if not successful.
-   */
-  private String createLog(String filename, IValidationReport valreport)
-  {
-    if(filename.startsWith("file:"))
-  	{
-  	  filename = filename.substring(6);
-  	  while(filename.startsWith("\\") || filename.startsWith("/"))
-  	  {
-  	  	filename = filename.substring(1);
-  	  }
-  	}
-     IValidationMessage[] valmessages = valreport.getValidationMessages();
-     int nummessages = valmessages.length;//validator.getErrors().size() + validator.getWarnings().size();
-     StringBuffer errorsString = new StringBuffer();
-     StringBuffer warningsString = new StringBuffer();
-     int numerrors = 0;
-     int numwarnings = 0;
-     for(int i = 0; i < nummessages; i++)
-     {
-       IValidationMessage valmes = valmessages[i];
-       if(valmes.getSeverity() == IValidationMessage.SEV_WARNING)
-       {
-         numwarnings++;
-         // If the message contains any file references make them relative.
-         String message = valmes.getMessage();
-         message = message.replaceAll("'[^']*" + PLUGIN_NAME + "[^'/]*/", "'");
-         message = message.replaceAll("[(][^(]*" + PLUGIN_NAME + "[^'/]*/", "[(]");
-         warningsString.append(message + " [" + valmes.getLine() +", " + valmes.getColumn() +"]\n");
-         warningsString.append(createNestedMessageString(valmes.getNestedMessages()));
-       }
-       else
-       {
-         numerrors++;
-         // If the message contains any file references make them relative.
-         String message = valmes.getMessage();
-         message = message.replaceAll("'[^']*" + PLUGIN_NAME + "[^'/]*/", "'");
-         message = message.replaceAll("[(][^(]*" + PLUGIN_NAME + "[^'/]*/", "(");
-         errorsString.append(message + " [" + valmes.getLine() +", " + valmes.getColumn() +"]\n");
-         errorsString.append(createNestedMessageString(valmes.getNestedMessages()));
-       }
-     }
-     StringBuffer log = new StringBuffer();
-     log.append("number of errors      : " + numerrors + "\n");
-     log.append("number of warnings    : " + numwarnings + "\n\n");
-     log.append("------------error list-------------------------------------------\n");
-     if(numerrors == 0)
-     {
-       log.append("(none)\n");
-     }
-     else
-     {
-       log.append(errorsString.toString());
-     }
-     log.append("------------warning list-----------------------------------------\n");
-     if(numwarnings == 0)
-     {
-       log.append("(none)\n");
-     }
-     else
-     {
-       log.append(warningsString.toString());
-     }
-     log.append("-----------------------------------------------------------------\n");
-   
-     DataOutputStream outStream = null;
-    try
-    {
-      File logfile = new File(filename);
-      File parent = logfile.getParentFile();
-  	if (!parent.exists()) 
-  	{
-  	  parent.mkdirs();
-  	}
-      if(logfile.exists())
-      {
-        logfile.delete();
-      }
-      logfile.createNewFile();
-      
-      outStream = new DataOutputStream(new FileOutputStream(filename, true));
-      outStream.writeBytes(log.toString());
-      outStream.close();
-
-    } catch (IOException e)
-    {
-      // If we can't write the log then clear the log.
-      log.delete(0, log.length());
-    }
-    return log.toString();
-  }
-  
-  private String createNestedMessageString(List nestedMessages)
-  {
-    return createNestedMessageString(nestedMessages, 0);
-  }
-  
-  private String createNestedMessageString(List nestedMessages, int depth)
-  {
-    if(nestedMessages != null && nestedMessages.size() > 0)
-    {
-      String messageString = "";
-      Iterator nestedMesIter = nestedMessages.iterator();
-      while(nestedMesIter.hasNext())
-      {
-        IValidationMessage nesvalmes = (IValidationMessage)nestedMesIter.next();
-        for(int i = 0; i < depth; i++)
-        {
-          messageString += " ";
-        }
-        // If the message contains any file references make them relative.
-        String message = nesvalmes.getMessage();
-        message = message.replaceAll("'[^']*" + PLUGIN_NAME + "[^'/]*/", "'");
-        message = message.replaceAll("[(][^(]*" + PLUGIN_NAME + "[^'/]*/", "[(]");
-        messageString += ("-> " + message + " [" + nesvalmes.getLine() +", " + nesvalmes.getColumn() +"]\n");
-        messageString += createNestedMessageString(nesvalmes.getNestedMessages(), depth + 1);
-      }
-      return messageString;
-    }
-    else
-    {
-      return "";
-    }
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/PathsTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/PathsTest.java
deleted file mode 100644
index fe01032..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/PathsTest.java
+++ /dev/null

@@ -1,569 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Tests for file paths.
- */
-public class PathsTest extends BaseTestCase
-{
-  private String PATHS_DIR = "Paths/";
-  
-  /**
-   * Create a tests suite from this test class.
-   * 
-   * @return A test suite containing this test class.
-   */
-  public static Test suite()
-  {
-    return new TestSuite(PathsTest.class);
-  }
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp()
-  {
-    super.setUp();
-  }
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#tearDown()
-   */
-  protected void tearDown() throws Exception
-  {
-    // Delete the simple project for ImportedSchemaWithSchemaImport test
-    super.tearDown();
-  }
-
-  /**
-   * Test /Paths/Space InPath/SpaceInPathValid.wsdl
-   */
-  public void testSpaceInPathValid()
-  {
-    String testname = "SpaceInPathValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Space InPath/SpaceInPathInvalid.wsdl
-   */
-  public void testSpaceInPathInvalid()
-  {
-    String testname = "SpaceInPathInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/AngleHat^InPath/AngleHatInPathValid.wsdl
-   */
-  public void testAngleHatInPathValid()
-  {
-    String testname = "AngleHatInPathValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl
-   */
-  public void testAngleHatInPathInvalid()
-  {
-    String testname = "AngleHatInPathInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl
-   */
-  public void testAngleHatInFilenameValid()
-  {
-    String testname = "AngleHat^InFilenameValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl
-   */
-  public void testAngleHatInFilenameInvalid()
-  {
-    String testname = "AngleHat^InFilenameInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl
-   */
-  public void testCloseBracketInPathValid()
-  {
-    String testname = "CloseBracketInPathValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl
-   */
-  public void testCloseBracketInPathInvalid()
-  {
-    String testname = "CloseBracketInPathInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl
-   */
-  public void testCloseBracketInFilenameValid()
-  {
-    String testname = "CloseBracket)InFilenameValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl
-   */
-  public void testCloseBracketInFilenameInvalid()
-  {
-    String testname = "CloseBracket)InFilenameInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Dash-InPath/DashInPathValid.wsdl
-   */
-  public void testDashInPathValid()
-  {
-    String testname = "DashInPathValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Dash-InPath/DashInPathInvalid.wsdl
-   */
-  public void testDashInPathInvalid()
-  {
-    String testname = "DashInPathInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/DashInFilename/Dash-InFilenameValid.wsdl
-   */
-  public void testDashInFilenameValid()
-  {
-    String testname = "Dash-InFilenameValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/DashInFilename/Dash-InFilenameInvalid.wsdl
-   */
-  public void testDashInFilenameInvalid()
-  {
-    String testname = "Dash-InFilenameInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Exclamation!InPath/ExclamationInPathValid.wsdl
-   */
-  public void testExclamationInPathValid()
-  {
-    String testname = "ExclamationInPathValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl
-   */
-  public void testExclamationInPathInvalid()
-  {
-    String testname = "ExclamationInPathInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl
-   */
-  public void testExclamationInFilenameValid()
-  {
-    String testname = "Exclamation!InFilenameValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl
-   */
-  public void testExclamationInFilenameInvalid()
-  {
-    String testname = "Exclamation!InFilenameInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl
-   */
-  public void testOpenBracketInPathValid()
-  {
-    String testname = "OpenBracketInPathValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl
-   */
-  public void testOpenBracketInPathInvalid()
-  {
-    String testname = "OpenBracketInPathInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl
-   */
-  public void testOpenBracketInFilenameValid()
-  {
-    String testname = "OpenBracket(InFilenameValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl
-   */
-  public void testOpenBracketInFilenameInvalid()
-  {
-    String testname = "OpenBracket(InFilenameInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Period.InPath/PeriodInPathValid.wsdl
-   */
-  public void testPeriodInPathValid()
-  {
-    String testname = "PeriodInPathValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Period.InPath/PeriodInPathInvalid.wsdl
-   */
-  public void testPeriodInPathInvalid()
-  {
-    String testname = "PeriodInPathInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/PeriodInFilename/Period.InFilenameValid.wsdl
-   */
-  public void testPeriodInFilenameValid()
-  {
-    String testname = "Period.InFilenameValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl
-   */
-  public void testPeriodInFilenameInvalid()
-  {
-    String testname = "Period.InFilenameInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Quote'InPath/QuoteInPathValid.wsdl
-   */
-  public void testQuoteInPathValid()
-  {
-    String testname = "QuoteInPathValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Quote'InPath/QuoteInPathInvalid.wsdl
-   */
-  public void testQuoteInPathInvalid()
-  {
-    String testname = "QuoteInPathInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/QuoteInFilename/Quote'InFilenameValid.wsdl
-   */
-  public void testQuoteInFilenameValid()
-  {
-    String testname = "Quote'InFilenameValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl
-   */
-  public void testQuoteInFilenameInvalid()
-  {
-    String testname = "Quote'InFilenameInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/SpaceInFilename/Space InFilenameValid.wsdl
-   */
-  public void testSpaceInFilenameValid()
-  {
-    String testname = "Space InFilenameValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/SpaceInFilename/Space InFilenameInvalid.wsdl
-   */
-  public void testSpaceInFilenameInvalid()
-  {
-    String testname = "Space InFilenameInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Tilde~InPath/TildeInPathValid.wsdl
-   */
-  public void testTildeInPathValid()
-  {
-    String testname = "TildeInPathValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Tilde~InPath/TildeInPathInvalid.wsdl
-   */
-  public void testTildeInPathInvalid()
-  {
-    String testname = "TildeInPathInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/TildeInFilename/Tilde~InFilenameValid.wsdl
-   */
-  public void testTildeInFilenameValid()
-  {
-    String testname = "Tilde~InFilenameValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl
-   */
-  public void testTildeInFilenameInvalid()
-  {
-    String testname = "Tilde~InFilenameInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Underscore_InPath/UnderscoreInPathValid.wsdl
-   */
-  public void testUnderscoreInPathValid()
-  {
-    String testname = "UnderscoreInPathValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl
-   */
-  public void testUnderscoreInPathInvalid()
-  {
-    String testname = "UnderscoreInPathInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl
-   */
-  public void testUnderscoreInFilenameValid()
-  {
-    String testname = "Underscore_InFilenameValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl
-   */
-  public void testUnderscoreInFilenameInvalid()
-  {
-    String testname = "Underscore_InFilenameInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java
deleted file mode 100644
index f21a232..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java
+++ /dev/null

@@ -1,499 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * WSDL validation tests for the WSDL validator.
- */
-public class WSDLTest extends BaseTestCase
-{
-  private String WSDL_DIR = "WSDL/";
-  
-  /**
-   * Create a tests suite from this test class.
-   * 
-   * @return A test suite containing this test class.
-   */
-  public static Test suite()
-  {
-    return new TestSuite(WSDLTest.class);
-  }
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp()
-  {
-    super.setUp();
-  }
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#tearDown()
-   */
-  protected void tearDown() throws Exception
-  {
-    // Delete the simple project for ImportedSchemaWithSchemaImport test
-    super.tearDown();
-  }
-  
-  /**
-   * IMPORT TESTS
-   */
-  
-  /**
-   * Test /WSDL/Import/ImportSchemaWithWSDLImport.wsdl
-   */
-  public void testImportSchemaWithWSDLImport()
-  {
-    String testname = "ImportSchemaWithWSDLImport";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl
-   */
-  public void testImportSchemaWithWSDLImportInvalidNS()
-  {
-    String testname = "ImportSchemaWithWSDLImportInvalidNS";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportWSDLWithWSDL.wsdl
-   */
-  public void testImportWSDLWithWSDL()
-  {
-    String testname = "ImportWSDLWithWSDL";
-    String testfile = PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl
-   */
-  public void testImportWSDLWithWSDLInvalidNS()
-  {
-    String testname = "ImportWSDLWithWSDLInvalidNS";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl
-   */
-  public void testImportWSDLWithWSDLInvalidFilename()
-  {
-    String testname = "ImportWSDLWithWSDLInvalidFilename";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/WSDLImportingTypes.wsdl
-   */
-  public void testWSDLImportingTypes()
-  {
-    String testname = "WSDLImportingTypes";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportNonExistantFile.wsdl
-   */
-  public void testImportNonExistantFile()
-  {
-    String testname = "ImportNonExistantFile";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/WSDLNamespaceAAA.wsdl
-   */
-  public void testWSDLNamespaceAAA()
-  {
-    String testname = "WSDLNamespaceAAA";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportingWSDLWithImportedSchema.wsdl
-   */
-  public void testImportingWSDLWithImportedSchema()
-  {
-    String testname = "ImportingWSDLWithImportedSchema";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/WSDLImportingSchemaInmportingSchema.wsdl
-   */
-  public void testWSDLImportingSchemaInmportingSchema()
-  {
-    String testname = "WSDLImportingSchemaImportingSchema";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl
-   */
-  public void testImportXMLInvalidWSDL()
-  {
-    String testname = "ImportXMLInvalidWSDL";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportXMLInvalidWSDL/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportXMLInvalidWSDL/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportXMLInvalidWSDL/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl
-   */
-  public void testImportOneAndTwo()
-  {
-    String testname = "ImportOneAndTwo";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/AlphabeticalOrderOfImports/one.wsdl
-   */
-  public void testImportOneAndTwo_One()
-  {
-    String testname = "one";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/AlphabeticalOrderOfImports/two.wsdl
-   */
-  public void testImportOneAndTwo_Two()
-  {
-    String testname = "two";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl
-   */
-  public void testImportEmptyLocation()
-  {
-    String testname = "ImportEmptyLocation";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportEmptyLocation/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyLocation/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyLocation/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl
-   */
-  public void testImportEmptyNamespace()
-  {
-    String testname = "ImportEmptyNamespace";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportEmptyNamespace/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyNamespace/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyNamespace/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl
-   */
-  public void testImportEmptyNamespaceAndLocation()
-  {
-    String testname = "ImportEmptyNamespaceAndLocation";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportEmptyNamespaceAndLocation/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyNamespaceAndLocation/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyNamespaceAndLocation/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl
-   */
-  public void testImportNoLocationAttribute()
-  {
-    String testname = "ImportNoLocationAttribute";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportNoLocationAttribute/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportNoLocationAttribute/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportNoLocationAttribute/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Import/SimpleImport/test-1.0.wsdl
-   */
-  public void testSimpleImport()
-  {
-    String testname = "test-1.0";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/SimpleImport/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/SimpleImport/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/SimpleImport/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * CYCLIC TESTS
-   */
-  
-  /**
-   * Test /WSDL/Cyclic/PorttypeRefMessage1.wsdl
-   */
-  public void testPorttypeRefMessage1()
-  {
-    String testname = "PorttypeRefMessage1";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/Cyclic/PorttypeRefMessage2.wsdl
-   */
-  public void testPorttypeRefMessage2()
-  {
-    String testname = "PorttypeRefMessage2";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/SelfContained/ReferenceInlineTypes.wsdl
-   */
-  public void testReferenceInlineTypes()
-  {
-    String testname = "ReferenceInlineTypes";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/SelfContained/Empty.wsdl
-   */
-  public void testEmpty()
-  {
-    String testname = "Empty";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl
-   */
-  public void testSOAPBodyEncodedNoNamespace()
-  {
-    String testname = "SOAPBodyEncodedNoNamespace";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl
-   */
-  public void testSOAPBodyEncodedWithNamespace()
-  {
-    String testname = "SOAPBodyEncodedWithNamespace";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl
-   */
-  public void testNoDefaultNamespace()
-  {
-    String testname = "NoDefaultNamespace";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfContained/NoDefaultNamespace/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfContained/NoDefaultNamespace/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfContained/NoDefaultNamespace/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl
-   */
-  public void testBindingInvalidStyle()
-  {
-    String testname = "BindingInvalidStyle";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "BindingElement/InvalidStyle/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "BindingElement/InvalidStyle/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "BindingElement/InvalidStyle/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl
-   */
-  public void testBindingInvalidUse()
-  {
-    String testname = "BindingInvalidUse";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "BindingElement/InvalidUse/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "BindingElement/InvalidUse/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "BindingElement/InvalidUse/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl
-   */
-  public void testMessageInvalidElement()
-  {
-    String testname = "MessageInvalidElement";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "MessageElement/InvalidElement/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "MessageElement/InvalidElement/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "MessageElement/InvalidElement/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl
-   */
-  public void testMessageInvalidType()
-  {
-    String testname = "MessageInvalidType";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "MessageElement/InvalidType/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "MessageElement/InvalidType/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "MessageElement/InvalidType/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl
-   */
-  public void testPortTypeInvalidInput()
-  {
-    String testname = "PortTypeInvalidInput";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "PortTypeElement/InvalidInput/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "PortTypeElement/InvalidInput/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "PortTypeElement/InvalidInput/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl
-   */
-  public void testPortTypeInvalidOutput()
-  {
-    String testname = "PortTypeInvalidOutput";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "PortTypeElement/InvalidOutput/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "PortTypeElement/InvalidOutput/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "PortTypeElement/InvalidOutput/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl
-   */
-  public void testServiceInvalidBinding()
-  {
-    String testname = "ServiceInvalidBinding";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "ServiceElement/InvalidBinding/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "ServiceElement/InvalidBinding/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "ServiceElement/InvalidBinding/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl
-   */
-  public void testServiceNoAddress()
-  {
-    String testname = "ServiceNoAddress";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "ServiceElement/NoAddress/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "ServiceElement/NoAddress/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "ServiceElement/NoAddress/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLValidatorTestsPlugin.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLValidatorTestsPlugin.java
deleted file mode 100644
index 6ce707a..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLValidatorTestsPlugin.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.tests.internal;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSDLValidatorTestsPlugin extends AbstractUIPlugin
-{
-  //The shared instance.
-  private static WSDLValidatorTestsPlugin plugin;
-  private static Bundle pluginBundle = null;
-
-  /**
-   * The constructor.
-   */
-  public WSDLValidatorTestsPlugin()
-  {
-    super();
-    plugin = this;
-  }
-
-  /**
-   * This method is called upon plug-in activation
-   */
-  public void start(BundleContext context) throws Exception
-  {
-    super.start(context);
-	pluginBundle = context.getBundle();
-  }
-
-  /**
-   * This method is called when the plug-in is stopped
-   */
-  public void stop(BundleContext context) throws Exception
-  {
-    super.stop(context);
-  }
-
-  /**
-   * Returns the shared instance.
-   */
-  public static WSDLValidatorTestsPlugin getDefault()
-  {
-    return plugin;
-  }
-  
-  /**
-   * Get the install URL of this plugin.
-   * 
-   * @return the install url of this plugin
-   */
-  public static String getInstallURL()
-  {
-    try
-    {
-      return Platform.resolve(pluginBundle.getEntry("/")).getFile();
-    }
-    catch (IOException e)
-    {
-      return null;
-    }
-  }
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.java
deleted file mode 100644
index dbb2535..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.java
+++ /dev/null

@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * XSD validation tests for the WSDL validator.
- */
-public class XSDTest extends BaseTestCase
-{
-  private String XSD_DIR = "XSD/";
-  
-  /**
-   * Create a tests suite from this test class.
-   * 
-   * @return A test suite containing this test class.
-   */
-  public static Test suite()
-  {
-    return new TestSuite(XSDTest.class);
-  }
-  
-  /* (non-Javadoc)
-   * @see junit.framework.TestCase#setUp()
-   */
-  protected void setUp()
-  {
-    super.setUp();
-  }
-  
-  /**
-   * Test /XSD/Entities/normalizeEntitiesValid.wsdl
-   */
-  public void testNormalizeEntitiesValid()
-  {
-    String testname = "normalizeEntitiesValid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "Entities/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "Entities/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "Entities/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /XSD/Entities/normalizeEntitiesInvalid.wsdl
-   */
-  public void testNormalizeEntitiesInvalid()
-  {
-    String testname = "normalizeEntitiesInvalid";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "Entities/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "Entities/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "Entities/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl
-   */
-  public void testReferToAnotherInlineType()
-  {
-    String testname = "ReferToAnotherInlineType";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "ReferToAnotherInlineType/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "ReferToAnotherInlineType/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "ReferToAnotherInlineType/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl
-   */
-  public void testNoImportForUnprefixedAttribute()
-  {
-    String testname = "NoImportForUnprefixedAttribute";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "InlineSchemaGeneratedImports/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "InlineSchemaGeneratedImports/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "InlineSchemaGeneratedImports/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl
-   */
-  public void testOneErrorForInlineXSDRefInvalidInlineXSD()
-  {
-    String testname = "OneErrorForInlineXSDRefInvalidInlineXSD";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "OneErrorForInlineXSDRefInvalidInlineXSD/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "OneErrorForInlineXSDRefInvalidInlineXSD/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "OneErrorForInlineXSDRefInvalidInlineXSD/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl
-   */
-  public void testSchemaDocElemWithSourceAndSubElem()
-  {
-    String testname = "SchemaDocElemWithSourceAndSubElem";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "SchemaDocElemWithSourceAndSubElem/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "SchemaDocElemWithSourceAndSubElem/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "SchemaDocElemWithSourceAndSubElem/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl
-   */
-  public void testRestrictionPatternWithColon()
-  {
-    String testname = "RestrictionPatternWithColon";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "RestrictionPatternWithColon/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "RestrictionPatternWithColon/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "RestrictionPatternWithColon/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl
-   */
-  public void testImportInlineSchemaWithInclude()
-  {
-    String testname = "ImportInlineSchemaWithInclude";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "ImportInlineSchemaWithInclude/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "ImportInlineSchemaWithInclude/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "ImportInlineSchemaWithInclude/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-  
-  /**
-   * Test /XSD/ValueColon/ValueColon.wsdl
-   */
-  public void testValueColon()
-  {
-    String testname = "ValueColon";
-    String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "ValueColon/" + testname + ".wsdl";
-    String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "ValueColon/" + testname + ".wsdl-log";
-    String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "ValueColon/" + testname + ".wsdl-log";
-    
-    runTest(testfile, loglocation, idealloglocation);
-  }
-}

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/test.xml b/tests/org.eclipse.wst.wsdl.validation.tests/test.xml
deleted file mode 100644
index 6459ee3..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/test.xml
+++ /dev/null

@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
-  <!-- Configurable Properties -->
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.wst.wsdl.validation.tests"/>
-
-  <!-- End Configurable Properties -->
-
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-  <property name="bvtworkspace" value="${basedir}"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-  <property name="workspace-folder" value="${bvtworkspace}/${plugin-name}"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-     <delete>
-       <fileset dir="${eclipse-home}" includes="org.eclipse.wst.wsdl.validation.tests.*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-
-    <!-- Start with clean data workspace -->  
-    <delete dir="${workspace-folder}" quiet="true"/>
-
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.wsdl.validation.tests.internal.AllWSDLTests"/>
-    </ant>
-
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-    <delete dir="${workspace-folder}" quiet="true"/>
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org.eclipse.wst.wsdl.validation.tests*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/.cvsignore b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/.cvsignore
deleted file mode 100644
index bb53574..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-generatedResults

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.wsdl-log"
deleted file mode 100644
index f9465e4..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.wsdl-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.wsdl-log"
deleted file mode 100644
index f9465e4..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.wsdl-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.wsdl-log"
deleted file mode 100644
index f9465e4..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.wsdl-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.wsdl-log"
deleted file mode 100644
index f9465e4..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.wsdl-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.wsdl-log"
deleted file mode 100644
index f9465e4..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.wsdl-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.wsdl-log"
deleted file mode 100644
index f9465e4..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.wsdl-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.wsdl-log"
deleted file mode 100644
index f9465e4..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.wsdl-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.wsdl-log"
deleted file mode 100644
index f9465e4..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.wsdl-log" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.wsdl-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.wsdl-log"
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl-log
deleted file mode 100644
index f9465e4..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 192]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl-log
deleted file mode 100644
index 5e8ad54..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl-log
+++ /dev/null

@@ -1,9 +0,0 @@
-number of errors      : 2
-number of warnings    : 0
-
-------------error list-------------------------------------------
-cvc-enumeration-valid: Value 'InvalidStyle' is not facet-valid with respect to enumeration '[rpc, document]'. It must be a value from the enumeration. [22, 90]
-cvc-attribute.3: The value 'InvalidStyle' of attribute 'style' on element 'soap:binding' is not valid with respect to its type, 'tStyleChoice'. [22, 90]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl-log
deleted file mode 100644
index 6f582ae..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl-log
+++ /dev/null

@@ -1,9 +0,0 @@
-number of errors      : 2
-number of warnings    : 0
-
-------------error list-------------------------------------------
-cvc-enumeration-valid: Value 'InvalidUse' is not facet-valid with respect to enumeration '[literal, encoded]'. It must be a value from the enumeration. [29, 46]
-cvc-attribute.3: The value 'InvalidUse' of attribute 'use' on element 'soap:body' is not valid with respect to its type, 'useChoice'. [29, 46]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage1.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage1.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage1.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage2.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage2.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage2.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl-log
deleted file mode 100644
index 8fab638..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-The location attribute is empty. A location must be specified for the location attribute. [7, 56]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl-log
deleted file mode 100644
index 66060b6..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 1
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-The file cannot be imported because the namespace '' does not match the target namespace 'http://example.com/simple/' of the imported document. [7, 53]
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl-log
deleted file mode 100644
index 7a6ea05..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-The location attribute is empty. A location must be specified for the location attribute. [7, 42]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl-log
deleted file mode 100644
index 9ce4678..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-cvc-complex-type.4: Attribute 'location' must appear on element 'wsdl:import'. [7, 44]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNonExistantFile.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNonExistantFile.wsdl-log
deleted file mode 100644
index c0308f8..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNonExistantFile.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 1
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-The 'ThisFileDoesntExist.wsdl' document could not be imported. Check that the document exists and that the location is correct. [3, 86]
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImport.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImport.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImport.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl-log
deleted file mode 100644
index 9c15e43..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 1
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-The file cannot be imported because the namespace 'http://invalidnamespace' does not match the target namespace 'http://www.example.com' of the imported document. [3, 73]
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDL.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDL.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDL.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl-log
deleted file mode 100644
index 1fbca79..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 1
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-The 'SIMPLEWSDL.wsdl' document could not be imported. Check that the document exists and that the location is correct. [3, 78]
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl-log
deleted file mode 100644
index 6b62c45..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 1
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-The file cannot be imported because the namespace 'http://invalidnamespace' does not match the target namespace 'http://tempuri.org/simplewsdl/' of the imported document. [3, 78]
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl-log
deleted file mode 100644
index ac03dc9..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl-log
+++ /dev/null

@@ -1,137 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl).  [1, 0]
--> Element type "wsdl:definitions" must be followed by either attribute specifications, ">" or "/>". [4, 3]
--> Attribute name "targetNamespace" associated with an element type "wsdl:definitions" must be followed by the ' = ' character. [4, 3]
--> Attribute "targetNamespace" was already specified for element "wsdl:definitions". [4, 3]
--> Open quote is expected for attribute "targetNamespace" associated with an  element type  "wsdl:definitions". [4, 3]
--> Element type "wsdl:definitions" must be followed by either attribute specifications, ">" or "/>". [5, 7]
--> Attribute name "xsd:schema" associated with an element type "wsdl:definitions" must be followed by the ' = ' character. [5, 18]
--> Open quote is expected for attribute "xsd:schema" associated with an  element type  "wsdl:definitions". [5, 18]
--> Element type "wsdl:definitions" must be followed by either attribute specifications, ">" or "/>". [5, 24]
--> Attribute "xmlns:xsd" was already specified for element "wsdl:definitions". [5, 81]
--> cvc-elt.1: Cannot find the declaration of element 'wsdl:definitions'. [5, 116]
--> The element type "wsdl:definitions" must be terminated by the matching end-tag "</wsdl:definitions>". [8, 7]
--> The end-tag for element type "wsdl:definitions" must end with a '>' delimiter. [8, 7]
--> Content is not allowed in trailing section. [8, 7]
--> Content is not allowed in trailing section. [8, 8]
--> Content is not allowed in trailing section. [8, 9]
--> Content is not allowed in trailing section. [8, 10]
--> Content is not allowed in trailing section. [8, 11]
--> Content is not allowed in trailing section. [8, 12]
--> Content is not allowed in trailing section. [8, 13]
--> Content is not allowed in trailing section. [8, 14]
--> Content is not allowed in trailing section. [8, 15]
--> Content is not allowed in trailing section. [8, 16]
--> Content is not allowed in trailing section. [8, 17]
--> The markup in the document following the root element must be well-formed. [9, 5]
--> The markup in the document following the root element must be well-formed. [9, 5]
--> The prefix "wsdl" for element "wsdl:types" is not bound. [9, 16]
--> Content is not allowed in trailing section. [9, 16]
--> The markup in the document following the root element must be well-formed. [10, 5]
--> The prefix "wsdl" for element "wsdl:message" is not bound. [10, 46]
--> Content is not allowed in trailing section. [10, 46]
--> The markup in the document following the root element must be well-formed. [11, 7]
--> The prefix "wsdl" for element "wsdl:part" is not bound. [11, 81]
--> Content is not allowed in trailing section. [11, 81]
--> The markup in the document following the root element must be well-formed. [12, 6]
--> The markup in the document following the root element must be well-formed. [12, 6]
--> The prefix "wsdl" for element "wsdl:message" is not bound. [12, 19]
--> Content is not allowed in trailing section. [12, 19]
--> The markup in the document following the root element must be well-formed. [13, 5]
--> The prefix "wsdl" for element "wsdl:message" is not bound. [13, 45]
--> Content is not allowed in trailing section. [13, 45]
--> The markup in the document following the root element must be well-formed. [14, 7]
--> The prefix "wsdl" for element "wsdl:part" is not bound. [14, 79]
--> Content is not allowed in trailing section. [14, 79]
--> The markup in the document following the root element must be well-formed. [15, 6]
--> The markup in the document following the root element must be well-formed. [15, 6]
--> The prefix "wsdl" for element "wsdl:message" is not bound. [15, 19]
--> Content is not allowed in trailing section. [15, 19]
--> The markup in the document following the root element must be well-formed. [16, 5]
--> The prefix "wsdl" for element "wsdl:portType" is not bound. [16, 41]
--> Content is not allowed in trailing section. [16, 41]
--> The markup in the document following the root element must be well-formed. [17, 7]
--> The prefix "wsdl" for element "wsdl:operation" is not bound. [17, 42]
--> Content is not allowed in trailing section. [17, 42]
--> The markup in the document following the root element must be well-formed. [18, 9]
--> The prefix "wsdl" for element "wsdl:input" is not bound. [18, 55]
--> Content is not allowed in trailing section. [18, 55]
--> The markup in the document following the root element must be well-formed. [19, 9]
--> The prefix "wsdl" for element "wsdl:output" is not bound. [19, 57]
--> Content is not allowed in trailing section. [19, 57]
--> The markup in the document following the root element must be well-formed. [20, 8]
--> The markup in the document following the root element must be well-formed. [20, 8]
--> The prefix "wsdl" for element "wsdl:operation" is not bound. [20, 23]
--> Content is not allowed in trailing section. [20, 23]
--> The markup in the document following the root element must be well-formed. [21, 6]
--> The markup in the document following the root element must be well-formed. [21, 6]
--> The prefix "wsdl" for element "wsdl:portType" is not bound. [21, 20]
--> Content is not allowed in trailing section. [21, 20]
--> The markup in the document following the root element must be well-formed. [22, 5]
--> The prefix "wsdl" for element "wsdl:binding" is not bound. [22, 70]
--> Content is not allowed in trailing section. [22, 70]
--> The markup in the document following the root element must be well-formed. [23, 7]
--> The prefix "soap" for element "soap:binding" is not bound. [23, 87]
--> Content is not allowed in trailing section. [23, 87]
--> The markup in the document following the root element must be well-formed. [24, 7]
--> The prefix "wsdl" for element "wsdl:operation" is not bound. [24, 42]
--> Content is not allowed in trailing section. [24, 42]
--> The markup in the document following the root element must be well-formed. [25, 9]
--> The prefix "soap" for element "soap:operation" is not bound. [25, 85]
--> Content is not allowed in trailing section. [25, 85]
--> The markup in the document following the root element must be well-formed. [26, 9]
--> The prefix "wsdl" for element "wsdl:input" is not bound. [26, 20]
--> Content is not allowed in trailing section. [26, 20]
--> The markup in the document following the root element must be well-formed. [27, 11]
--> The prefix "soap" for element "soap:body" is not bound. [27, 36]
--> Content is not allowed in trailing section. [27, 36]
--> The markup in the document following the root element must be well-formed. [28, 10]
--> The markup in the document following the root element must be well-formed. [28, 10]
--> The prefix "wsdl" for element "wsdl:input" is not bound. [28, 21]
--> Content is not allowed in trailing section. [28, 21]
--> The markup in the document following the root element must be well-formed. [29, 9]
--> The prefix "wsdl" for element "wsdl:output" is not bound. [29, 21]
--> Content is not allowed in trailing section. [29, 21]
--> The markup in the document following the root element must be well-formed. [30, 11]
--> The prefix "soap" for element "soap:body" is not bound. [30, 36]
--> Content is not allowed in trailing section. [30, 36]
--> The markup in the document following the root element must be well-formed. [31, 10]
--> The markup in the document following the root element must be well-formed. [31, 10]
--> The prefix "wsdl" for element "wsdl:output" is not bound. [31, 22]
--> Content is not allowed in trailing section. [31, 22]
--> The markup in the document following the root element must be well-formed. [32, 8]
--> The markup in the document following the root element must be well-formed. [32, 8]
--> The prefix "wsdl" for element "wsdl:operation" is not bound. [32, 23]
--> Content is not allowed in trailing section. [32, 23]
--> The markup in the document following the root element must be well-formed. [33, 6]
--> The markup in the document following the root element must be well-formed. [33, 6]
--> The prefix "wsdl" for element "wsdl:binding" is not bound. [33, 19]
--> Content is not allowed in trailing section. [33, 19]
--> The markup in the document following the root element must be well-formed. [34, 5]
--> The prefix "wsdl" for element "wsdl:service" is not bound. [34, 40]
--> Content is not allowed in trailing section. [34, 40]
--> The markup in the document following the root element must be well-formed. [35, 7]
--> The prefix "wsdl" for element "wsdl:port" is not bound. [35, 76]
--> Content is not allowed in trailing section. [35, 76]
--> The markup in the document following the root element must be well-formed. [36, 9]
--> The prefix "soap" for element "soap:address" is not bound. [36, 57]
--> Content is not allowed in trailing section. [36, 57]
--> The markup in the document following the root element must be well-formed. [37, 8]
--> The markup in the document following the root element must be well-formed. [37, 8]
--> The prefix "wsdl" for element "wsdl:port" is not bound. [37, 18]
--> Content is not allowed in trailing section. [37, 18]
--> The markup in the document following the root element must be well-formed. [38, 6]
--> The markup in the document following the root element must be well-formed. [38, 6]
--> The prefix "wsdl" for element "wsdl:service" is not bound. [38, 19]
--> Content is not allowed in trailing section. [38, 19]
--> The markup in the document following the root element must be well-formed. [39, 4]
--> The markup in the document following the root element must be well-formed. [39, 4]
--> The prefix "wsdl" for element "wsdl:definitions" is not bound. [39, 21]
--> Content is not allowed in trailing section. [39, 21]
--> XML document structures must start and end within the same entity. [40, 2]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/SimpleImport/test-1.0.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/SimpleImport/test-1.0.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/SimpleImport/test-1.0.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingTypes.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingTypes.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingTypes.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLNamespaceAAA.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLNamespaceAAA.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLNamespaceAAA.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl-log
deleted file mode 100644
index 85e335f..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-The part 'NewOperationResponse' has an invalid value 'InvalidElement' defined for its element. Element declarations must refer to valid values defined in a schema. [10, 74]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl-log
deleted file mode 100644
index 789fe6c..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-The part 'NewOperationRequest' has an invalid value 'NewOperationRequest' defined for its type. Type declarations must refer to valid values defined in a schema. [13, 75]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl-log
deleted file mode 100644
index e6058d3..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-The input element is referencing an undefined message 'InvalidInput'. Check that the message name and namespace are correct and that the message has been defined. [17, 47]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl-log
deleted file mode 100644
index 991591b..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-The output element is referencing an undefined message 'InvalidOutput'. Check that the message name and namespace are correct and that the message has been defined. [18, 49]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/Empty.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/Empty.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/Empty.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/ReferenceInlineTypes.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/ReferenceInlineTypes.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/ReferenceInlineTypes.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl-log
deleted file mode 100644
index 0640e61..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-The 'ServiceInvalidBindingSOAP' port has an invalid binding - 'IncorrectBindingRef'. Check that the 'IncorrectBindingRef' binding is defined. [34, 83]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl-log
deleted file mode 100644
index 68eaa9b..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-The port 'ServiceNoAddressSOAP' has no address defined. Each port must define one address. [34, 79]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesInvalid.wsdl-log
deleted file mode 100644
index 7fdaf48..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesInvalid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-The value of attribute "value" associated with an element type "xsd:pattern" must not contain the '<' character. [11, 55]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesValid.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesValid.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl-log
deleted file mode 100644
index 741ad15..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 1
-number of warnings    : 0
-
-------------error list-------------------------------------------
-src-resolve.4.2: Error resolving component 'xsd:stringa'. It was detected that 'xsd:stringa' is in namespace 'http://www.w3.org/2001/XMLSchema', but components from this namespace are not referenceable from schema document 'testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl'. If this is the incorrect namespace, perhaps the prefix of 'xsd:stringa' needs to be changed. If this is the correct namespace, then an appropriate 'import' tag should be added to 'testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl'. [7, 61]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ValueColon/ValueColon.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ValueColon/ValueColon.wsdl-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ValueColon/ValueColon.wsdl-log
+++ /dev/null

@@ -1,8 +0,0 @@
-number of errors      : 0
-number of warnings    : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.wsdl"
deleted file mode 100644
index 56be368..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.wsdl"
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.wsdl"
deleted file mode 100644
index da27d70..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.wsdl"
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.wsdl"
deleted file mode 100644
index 56be368..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.wsdl"
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.wsdl"
deleted file mode 100644
index da27d70..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.wsdl"
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.wsdl"
deleted file mode 100644
index 56be368..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.wsdl"
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.wsdl"
deleted file mode 100644
index da27d70..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.wsdl"
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.wsdl"
deleted file mode 100644
index 56be368..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.wsdl"
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.wsdl"
deleted file mode 100644
index da27d70..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.wsdl"
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.wsdl"
deleted file mode 100644
index 56be368..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.wsdl"
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.wsdl"
deleted file mode 100644
index da27d70..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.wsdl"
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.wsdl"
deleted file mode 100644
index 56be368..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.wsdl"
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.wsdl"
deleted file mode 100644
index da27d70..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.wsdl"
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.wsdl"
deleted file mode 100644
index 56be368..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.wsdl"
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.wsdl"
deleted file mode 100644
index da27d70..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.wsdl"
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.wsdl"
deleted file mode 100644
index 56be368..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.wsdl"
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.wsdl" "b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.wsdl"
deleted file mode 100644
index da27d70..0000000
--- "a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.wsdl"
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl
deleted file mode 100644
index 56be368..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl
deleted file mode 100644
index da27d70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl
deleted file mode 100644
index e145d38..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="BindingInvalidStyle" targetNamespace="http://www.example.org/BindingInvalidStyle/" xmlns:tns="http://www.example.org/BindingInvalidStyle/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/BindingInvalidStyle/">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="BindingInvalidStyle">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="BindingInvalidStyleSOAP" type="tns:BindingInvalidStyle">
-    <soap:binding style="InvalidStyle" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://www.example.org/BindingInvalidStyle/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="BindingInvalidStyle">
-    <wsdl:port name="BindingInvalidStyleSOAP" binding="tns:BindingInvalidStyleSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl
deleted file mode 100644
index ae4c269..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="BindingInvalidUse" targetNamespace="http://www.example.org/BindingInvalidUse/" xmlns:tns="http://www.example.org/BindingInvalidUse/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/BindingInvalidUse/">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="BindingInvalidUse">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="BindingInvalidUseSOAP" type="tns:BindingInvalidUse">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="NewOperation">
-            <soap:operation soapAction="http://www.example.org/BindingInvalidUse/NewOperation"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-      <wsdl:output>
-                <soap:body use="InvalidUse"/>
-            </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="BindingInvalidUse">
-    <wsdl:port name="BindingInvalidUseSOAP" binding="tns:BindingInvalidUseSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage1.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage1.wsdl
deleted file mode 100644
index a3e4c57..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage1.wsdl
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/cyclic1/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="cyclic1" targetNamespace="http://tempuri.org/cyclic1/" xmlns:cyclic2="http://tempuri.org/cyclic2/">
-  <wsdl:import namespace="http://tempuri.org/cyclic2/" location="PorttypeRefMessage2.wsdl"></wsdl:import>
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://tempuri.org/cyclic1/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part element="tns:NewOperationRequest" name="NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="cyclic1">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="cyclic2:NewOperationRequest"/>
-      <wsdl:output message="cyclic2:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage2.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage2.wsdl
deleted file mode 100644
index 3135291..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage2.wsdl
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/cyclic2/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="cyclic2" targetNamespace="http://tempuri.org/cyclic2/" xmlns:cyclic1="http://tempuri.org/cyclic1/">
-  <wsdl:import namespace="http://tempuri.org/cyclic1/" location="PorttypeRefMessage1.wsdl"></wsdl:import>
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://tempuri.org/cyclic2/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part element="tns:NewOperationRequest" name="NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="cyclic2">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="cyclic1:NewOperationRequest"/>
-      <wsdl:output message="cyclic1:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl
deleted file mode 100644
index 9763af3..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	name="ImportOneAndTwo"
-	targetNamespace="http://ImportOneAndTwo" 
-	xmlns:wsdl1="http://tempuri.org/one.wsdl"
-	xmlns:wsdl2="http://atempuri.org/two.wsdl">
-
-	
-<wsdl:import namespace="http://tempuri.org/one.wsdl" location="one.wsdl"/>
-<wsdl:import namespace="http://atempuri.org/two.wsdl" location="two.wsdl"/>
-	
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl
deleted file mode 100644
index 320ff10..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/one.wsdl"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="one"
-	targetNamespace="http://tempuri.org/one.wsdl">
-	
-	<wsdl:message name="Message">
-		<wsdl:part name="Message" type="xsd:string"></wsdl:part>
-	</wsdl:message>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl
deleted file mode 100644
index 04f160c..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl
+++ /dev/null

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- It's important that the namespace of this document start with an a as it should
-     be imported first by ImportOneAndTwo.wsdl. The order of the imports is determined
-     by alphabetical order of the namespaces in this defect. -->
-<wsdl:definitions xmlns:tns="http://atempuri.org/two.wsdl"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="two"
-	targetNamespace="http://atempuri.org/two.wsdl"
-	xmlns:wsdl1="http://tempuri.org/one.wsdl" xmlns:wsdl2="http://atempuri.org/two.wsdl">
-	<wsdl:import namespace="http://tempuri.org/one.wsdl"
-		location="one.wsdl">
-	</wsdl:import>
-	<wsdl:portType name="PortType">
-		<wsdl:operation name="Operation">
-			<wsdl:input message="wsdl1:Message" name="Input"/>
-			<wsdl:output message="wsdl1:Message" name="Output"/>
-		</wsdl:operation>
-	</wsdl:portType>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl
deleted file mode 100644
index eab8960..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://example.com/ImportEmptyLocation/" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  name="ImportEmptyLocation" 
-                  targetNamespace="http://example.com/ImportEmptyLocation/">
-  <wsdl:import namespace="http://someuri" location=""/>
-  <wsdl:message name="message">
-		<wsdl:part name="message" type="xsd:string"></wsdl:part>
-	</wsdl:message>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl
deleted file mode 100644
index c9eaf70..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://example.com/ImportEmptyNamespace/" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                  name="ImportEmptyNamespace" 
-                  targetNamespace="http://example.com/ImportEmptyNamespace/">
-  <wsdl:import namespace="" location="simple.wsdl"/>
-  <wsdl:message name="message">
-		<wsdl:part name="message" type="xsd:string"></wsdl:part>
-	</wsdl:message>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/simple.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/simple.wsdl
deleted file mode 100644
index 100f098..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/simple.wsdl
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://example.com/simple/" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  name="simple" 
-                  targetNamespace="http://example.com/simple/">
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl
deleted file mode 100644
index 7135216..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://example.com/ImportEmptyNamespaceAndLocation/" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                  name="ImportEmptyNamespaceAndLocation" 
-                  targetNamespace="http://example.com/ImportEmptyNamespaceAndLocation/">
-  <wsdl:import namespace="" location=""/>
-  <wsdl:message name="message">
-		<wsdl:part name="message" type="xsd:string"></wsdl:part>
-	</wsdl:message>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl
deleted file mode 100644
index 5002278..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://example.com/ImportNoLocationAttribute/" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  name="ImportNoLocationAttribute" 
-                  targetNamespace="http://example.com/ImportNoLocationAttribute/">
-  <wsdl:import namespace="http://someuri"/>
-  <wsdl:message name="message">
-		<wsdl:part name="message" type="xsd:string"></wsdl:part>
-	</wsdl:message>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNonExistantFile.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNonExistantFile.wsdl
deleted file mode 100644
index 4776750..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNonExistantFile.wsdl
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportNonExistantFile/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportNonExistantFile" targetNamespace="http://tempuri.org/ImportNonExistantFile/">
-	<wsdl:import namespace="http://nonexistingfile" location="ThisFileDoesntExist.wsdl"></wsdl:import>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImport.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImport.wsdl
deleted file mode 100644
index efaeeb0..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImport.wsdl
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportSchemaWithWSDLImport/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportSchemaWithWSDLImport" targetNamespace="http://tempuri.org/ImportSchemaWithWSDLImport/" xmlns:schema="http://www.example.com">
-  <wsdl:import namespace="http://www.example.com" location="schema.xsd"></wsdl:import>    
-  <wsdl:message name="NewMessage">
-    	<wsdl:part name="NewMessage" element="schema:NewGlobalElement"></wsdl:part>
-    </wsdl:message>   
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl
deleted file mode 100644
index 241a024..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportSchemaWithWSDLImportInvalidNS/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportSchemaWithWSDLImportInvalidNS" targetNamespace="http://tempuri.org/ImportSchemaWithWSDLImportInvalidNS/">
-	<wsdl:import namespace="http://invalidnamespace" location="schema.xsd"></wsdl:import>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDL.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDL.wsdl
deleted file mode 100644
index 178e2f2..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDL.wsdl
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportWSDLWithWSDL/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportWSDLWithWSDL" targetNamespace="http://tempuri.org/ImportWSDLWithWSDL/">
-	<wsdl:import namespace="http://tempuri.org/simplewsdl/" location="simplewsdl.wsdl"></wsdl:import>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl
deleted file mode 100644
index 8ebb93a..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportWSDLWithWSDLInvalidFilename/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportWSDLWithWSDLInvalidFilename" targetNamespace="http://tempuri.org/ImportWSDLWithWSDLInvalidFilename/">
-	<wsdl:import namespace="http://invalidnamespace" location="SIMPLEWSDL.wsdl"></wsdl:import>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl
deleted file mode 100644
index ef82ea5..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportWSDLWithWSDLInvalidNS/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportWSDLWithWSDLInvalidNS" targetNamespace="http://tempuri.org/ImportWSDLWithWSDLInvalidNS/">
-	<wsdl:import namespace="http://invalidnamespace" location="simplewsdl.wsdl"></wsdl:import>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl
deleted file mode 100644
index 9ea7889..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportXMLInvalidWSDL/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportXMLInvalidWSDL" targetNamespace="http://tempuri.org/ImportXMLInvalidWSDL/">
-	<wsdl:import namespace="http://tempuri.org/XMLInvalidWSDL/" location="XMLInvalidWSDL.wsdl"></wsdl:import>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl
deleted file mode 100644
index 1192d81..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl
+++ /dev/null

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  The definitions element isn't closed. -->
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/XMLInvalidWSDL/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="XMLInvalidWSDL" targetNamespace="http://tempuri.org/XMLInvalidWSDL/"
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://tempuri.org/XMLInvalidWSDL/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part element="tns:NewOperationRequest" name="NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="XMLInvalidWSDL">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="XMLInvalidWSDLSOAP" type="tns:XMLInvalidWSDL">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://tempuri.org/XMLInvalidWSDL/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="XMLInvalidWSDL">
-    <wsdl:port binding="tns:XMLInvalidWSDLSOAP" name="XMLInvalidWSDLSOAP">
-      <soap:address location="http://www.example.com"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingSchemaNotInDir.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingSchemaNotInDir.xsd
deleted file mode 100644
index 76ffdcc..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingSchemaNotInDir.xsd
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ImportingSchemaNotInDir="http://www.example.com" xmlns:plainschema="http://plainschema">
-	<import namespace="http://plainschema" schemaLocation="subfolder/PlainSchema.xsd"></import>
-	<element name="NewGlobalElement" type="plainschema:NewSimpleType"></element>
-
-</schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl
deleted file mode 100644
index 269c7c0..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportingWSDLWithImportedSchema/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportingWSDLWithImportedSchema" targetNamespace="http://tempuri.org/ImportingWSDLWithImportedSchema/" xmlns:wsdl1="http://tempuri.org/ImportedImportingSchema/">
-	<wsdl:import namespace="http://tempuri.org/ImportedImportingSchema/" location="subfolder/ImportedImportingSchema.wsdl"></wsdl:import>
-	<wsdl:message name="NewMessage">
-		<wsdl:part name="NewMessage" element="wsdl1:NewGlobalElement"></wsdl:part>
-	</wsdl:message>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SchemaNamespaceAAA.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SchemaNamespaceAAA.xsd
deleted file mode 100644
index 8750d45..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SchemaNamespaceAAA.xsd
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://AAA" xmlns:SchemaNamespaceAAA="http://www.example.com">
-</schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/import-1.0.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/import-1.0.wsdl
deleted file mode 100644
index b673bac..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/import-1.0.wsdl
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions
-	xmlns:tns="http://www.example.com/wsdl/import-1.0.wsdl"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="import-1.0"
-	targetNamespace="http://www.example.com/wsdl/import-1.0.wsdl" />

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/test-1.0.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/test-1.0.wsdl
deleted file mode 100644
index b9e39b7..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/test-1.0.wsdl
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://www.example.com/wsdl/test-1.0.wsdl"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="test-1.0"
-	targetNamespace="http://www.example.com/wsdl/test-1.0.wsdl"
-	xmlns:wsdl1="http://www.example.com/wsdl/import-1.0.wsdl">
-	<wsdl:import namespace="http://www.example.com/wsdl/import-1.0.wsdl"
-		location="import-1.0.wsdl" />
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl
deleted file mode 100644
index 37be78f..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/WSDLImportingSchemaImportingSchema/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="WSDLImportingSchemaImportingSchema" targetNamespace="http://tempuri.org/WSDLImportingSchemaImportingSchema/">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:import namespace="http://www.example.com" schemaLocation="ImportingSchemaNotInDir.xsd"/>
-		</xsd:schema>
-	</wsdl:types>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingTypes.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingTypes.wsdl
deleted file mode 100644
index d4437fd..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingTypes.wsdl
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/WSDLImportingTypes/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="WSDLImportingTypes" targetNamespace="http://tempuri.org/WSDLImportingTypes/" xmlns:wsdl1="http://tempuri.org/WSDLOnlyTypes/">
-    <wsdl:import namespace="http://tempuri.org/WSDLOnlyTypes/" location="WSDLOnlyTypes.wsdl"></wsdl:import>    
-    <wsdl:message name="NewMessage">
-    	<wsdl:part name="NewMessage" element="wsdl1:NewGlobalElement"></wsdl:part>
-    </wsdl:message>
-    
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLNamespaceAAA.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLNamespaceAAA.wsdl
deleted file mode 100644
index d6c18dd..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLNamespaceAAA.wsdl
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://AAA" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="WSDLNamespaceAAA" targetNamespace="http://AAA">
-	<wsdl:import namespace="http://AAA" location="SchemaNamespaceAAA.xsd"></wsdl:import>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLOnlyTypes.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLOnlyTypes.wsdl
deleted file mode 100644
index faf4f64..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLOnlyTypes.wsdl
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/WSDLOnlyTypes/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="WSDLOnlyTypes" targetNamespace="http://tempuri.org/WSDLOnlyTypes/">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/WSDLOnlyTypes/">
-		<xsd:element name="NewGlobalElement" type="xsd:string"></xsd:element></xsd:schema>
-	</wsdl:types>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/schema.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/schema.xsd
deleted file mode 100644
index 83ee50a..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/schema.xsd
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:schema="http://www.example.com">
-	<element name="NewGlobalElement" type="string"></element>
-
-</schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/simplewsdl.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/simplewsdl.wsdl
deleted file mode 100644
index 59f37ad..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/simplewsdl.wsdl
+++ /dev/null

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/simplewsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="simplewsdl" targetNamespace="http://tempuri.org/simplewsdl/"/>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedImportingSchema.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedImportingSchema.wsdl
deleted file mode 100644
index 2c2fd2a..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedImportingSchema.wsdl
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ImportedImportingSchema/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportedImportingSchema" targetNamespace="http://tempuri.org/ImportedImportingSchema/">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/ImportedImportingSchema/"
-            xmlns:ImportedWSDLImportedSchema="http://ImportedWSDLImportedSchema">
-		<xsd:import namespace="http://ImportedWSDLImportedSchema" schemaLocation="ImportedWSDLImportedSchema.xsd"></xsd:import>
-		<xsd:element name="NewGlobalElement" type="ImportedWSDLImportedSchema:NewSimpleType"></xsd:element></xsd:schema>
-	</wsdl:types>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedWSDLImportedSchema.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedWSDLImportedSchema.xsd
deleted file mode 100644
index 1502c00..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedWSDLImportedSchema.xsd
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://ImportedWSDLImportedSchema" xmlns:ImportedWSDLImportedSchema="http://ImportedWSDLImportedSchema">
-  <simpleType name="NewSimpleType">
-    <restriction base="string">
-      <minLength value="1"/>
-    </restriction>
-  </simpleType>
-</schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/PlainSchema.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/PlainSchema.xsd
deleted file mode 100644
index 3ede758..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/PlainSchema.xsd
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://plainschema" xmlns:PlainSchema="http://www.example.com">
-	<simpleType name="NewSimpleType">
-    <restriction base="string">
-      <minLength value="1"/>
-    </restriction>
-  </simpleType>
-</schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl
deleted file mode 100644
index 90be23e..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="MessageInvalidElement" targetNamespace="http://www.example.org/MessageInvalidElement/" xmlns:tns="http://www.example.org/MessageInvalidElement/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/MessageInvalidElement/">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" element="tns:InvalidElement"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="MessageInvalidElement">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="MessageInvalidElementSOAP" type="tns:MessageInvalidElement">

-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="NewOperation">

-            <soap:operation soapAction="http://www.example.org/MessageInvalidElement/NewOperation"/>
-            <wsdl:input>

-                <soap:body use="literal"/>
-            </wsdl:input>
-      <wsdl:output>

-                <soap:body use="literal"/>
-            </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="MessageInvalidElement">
-    <wsdl:port name="MessageInvalidElementSOAP" binding="tns:MessageInvalidElementSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl
deleted file mode 100644
index fc4eded..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="NewWSDLFile" targetNamespace="http://www.example.org/NewWSDLFile/" xmlns:tns="http://www.example.org/NewWSDLFile/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NewWSDLFile/">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" type="tns:NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="NewWSDLFile">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="NewWSDLFileSOAP" type="tns:NewWSDLFile">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://www.example.org/NewWSDLFile/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="NewWSDLFile">
-    <wsdl:port name="NewWSDLFileSOAP" binding="tns:NewWSDLFileSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl
deleted file mode 100644
index 0f02b26..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="PortTypeInvalidInput" targetNamespace="http://www.example.org/PortTypeInvalidInput/" xmlns:tns="http://www.example.org/PortTypeInvalidInput/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/PortTypeInvalidInput/">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="PortTypeInvalidInput">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:InvalidInput"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="PortTypeInvalidInputSOAP" type="tns:PortTypeInvalidInput">

-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="NewOperation">

-            <soap:operation soapAction="http://www.example.org/PortTypeInvalidInput/NewOperation"/>
-            <wsdl:input>

-                <soap:body use="literal"/>
-            </wsdl:input>
-      <wsdl:output>

-                <soap:body use="literal"/>
-            </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="PortTypeInvalidInput">
-    <wsdl:port name="PortTypeInvalidInputSOAP" binding="tns:PortTypeInvalidInputSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl
deleted file mode 100644
index 2dd1b6c..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="PortTypeInvalidOutput" targetNamespace="http://www.example.org/PortTypeInvalidOutput/" xmlns:tns="http://www.example.org/PortTypeInvalidOutput/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/PortTypeInvalidOutput/">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="PortTypeInvalidOutput">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:InvalidOutput"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="PortTypeInvalidOutputSOAP" type="tns:PortTypeInvalidOutput">

-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="NewOperation">

-            <soap:operation soapAction="http://www.example.org/PortTypeInvalidOutput/NewOperation"/>
-            <wsdl:input>

-                <soap:body use="literal"/>
-            </wsdl:input>
-      <wsdl:output>

-                <soap:body use="literal"/>
-            </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="PortTypeInvalidOutput">
-    <wsdl:port name="PortTypeInvalidOutputSOAP" binding="tns:PortTypeInvalidOutputSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/Empty.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/Empty.wsdl
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/Empty.wsdl
+++ /dev/null


diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl
deleted file mode 100644
index e733e87..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/NoDefaultNamespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="NoDefaultNamespace" targetNamespace="http://tempuri.org/NoDefaultNamespace/">
-  <wsdl:documentation>
-    <elementNoNamespace/>
-  </wsdl:documentation>    
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/ReferenceInlineTypes.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/ReferenceInlineTypes.wsdl
deleted file mode 100644
index 6bc1331..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/ReferenceInlineTypes.wsdl
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ReferenceInlineTypes/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ReferenceInlineTypes" targetNamespace="http://tempuri.org/ReferenceInlineTypes/">
-    <wsdl:message name="NewMessage">
-    	<wsdl:part name="NewMessage" element="tns:NewGlobalElement"></wsdl:part>
-    </wsdl:message>
-    <wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/ReferenceInlineTypes/">
-		<xsd:element name="NewGlobalElement" type="xsd:string"></xsd:element></xsd:schema>
-	</wsdl:types>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl
deleted file mode 100644
index 94ebcd8..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/SOAPBodyEncodedNoNamespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="SOAPBodyEncodedNoNamespace" targetNamespace="http://tempuri.org/SOAPBodyEncodedNoNamespace/">
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:portType name="SOAPBodyEncodedNoNamespace">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="SOAPBodyEncodedNoNamespaceSOAP" type="tns:SOAPBodyEncodedNoNamespace">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://tempuri.org/SOAPBodyEncodedNoNamespace/NewOperation"/>
-      <wsdl:input>
-        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="SOAPBodyEncodedNoNamespace">
-    <wsdl:port binding="tns:SOAPBodyEncodedNoNamespaceSOAP" name="SOAPBodyEncodedNoNamespaceSOAP">
-      <soap:address location="http://www.example.com"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl
deleted file mode 100644
index e1413fb..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/SOAPBodyEncodedWithNamespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="SOAPBodyEncodedWithNamespace" targetNamespace="http://tempuri.org/SOAPBodyEncodedWithNamespace/">
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:portType name="SOAPBodyEncodedWithNamespace">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="SOAPBodyEncodedWithNamespaceSOAP" type="tns:SOAPBodyEncodedWithNamespace">
-    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://tempuri.org/SOAPBodyEncodedWithNamespace/NewOperation"/>
-      <wsdl:input>
-        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://tempuri.org/SOAPBodyEncodedWithNamespace/" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://tempuri.org/SOAPBodyEncodedWithNamespace/" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="SOAPBodyEncodedWithNamespace">
-    <wsdl:port binding="tns:SOAPBodyEncodedWithNamespaceSOAP" name="SOAPBodyEncodedWithNamespaceSOAP">
-      <soap:address location="http://www.example.com"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl
deleted file mode 100644
index 29376a5..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="ServiceInvalidBinding" targetNamespace="http://www.example.org/ServiceInvalidBinding/" xmlns:tns="http://www.example.org/ServiceInvalidBinding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/ServiceInvalidBinding/">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="ServiceInvalidBinding">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="ServiceInvalidBindingSOAP" type="tns:ServiceInvalidBinding">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="NewOperation">
-            <soap:operation soapAction="http://www.example.org/ServiceInvalidBinding/NewOperation"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-      <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="ServiceInvalidBinding">
-    <wsdl:port name="ServiceInvalidBindingSOAP" binding="tns:IncorrectBindingRef">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl
deleted file mode 100644
index c7a07ff..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl
+++ /dev/null

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="ServiceNoAddress" targetNamespace="http://www.example.org/ServiceNoAddress/" xmlns:tns="http://www.example.org/ServiceNoAddress/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/ServiceNoAddress/">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="ServiceNoAddress">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="ServiceNoAddressSOAP" type="tns:ServiceNoAddress">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="NewOperation">
-            <soap:operation soapAction="http://www.example.org/ServiceNoAddress/NewOperation"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-      <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="ServiceNoAddress">
-    <wsdl:port name="ServiceNoAddressSOAP" binding="tns:ServiceNoAddressSOAP">
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema1.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema1.xsd
deleted file mode 100644
index df7195a..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema1.xsd
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/schema1" xmlns:tns="http://www.example.org/schema1">
-</schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema2.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema2.xsd
deleted file mode 100644
index 554dfd7..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema2.xsd
+++ /dev/null

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/schema2" xmlns:tns="http://www.example.org/schema2">
-</schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesInvalid.wsdl
deleted file mode 100644
index 5f7229a..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesInvalid.wsdl
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Invalid test for Eclipse defect 70670. -->
-<wsdl:definitions xmlns:tns="http://tempuri.org/normalizeEntitiesInvalid/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="normalizeEntitiesInvalid" targetNamespace="http://tempuri.org/normalizeEntitiesInvalid/">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/normalizeEntitiesInvalid/">
-          <xsd:element name="aString"> 
-                <xsd:simpleType> 
-                        <xsd:restriction base="xsd:string"> 
-                                <xsd:pattern value="F|<|>|~|H|J|x"/> 
-                        </xsd:restriction> 
-                </xsd:simpleType> 
-          </xsd:element> 
-		</xsd:schema>
-	</wsdl:types>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesValid.wsdl
deleted file mode 100644
index e75ea4a..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesValid.wsdl
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Valid test for Eclipse defect 70670. -->
-<wsdl:definitions xmlns:tns="http://tempuri.org/normalizeEntitesValid/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="normalizeEntitesValid" targetNamespace="http://tempuri.org/normalizeEntitesValid/">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/normalizeEntitesValid/">
-          <xsd:element name="aString"> 
-                <xsd:simpleType> 
-                        <xsd:restriction base="xsd:string"> 
-                                <xsd:pattern value="F|&lt;|&gt;|~|H|J|x"/> 
-                        </xsd:restriction> 
-                </xsd:simpleType> 
-          </xsd:element> 
-		</xsd:schema>
-	</wsdl:types>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl
deleted file mode 100644
index 0387831..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl
+++ /dev/null

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="ImportInlineSchemaWithInclude"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	targetNamespace="http://test.com/ImportInlineSchemaWithInclude"
-	xmlns:tns="http://test.com/ImportInlineSchemaWithInclude"
-	xmlns:sch="http://test.com/schema"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	
-	<types>
-		<xsd:schema targetNamespace="http://test.com/schema">			
-			<xsd:include schemaLocation="schema.xsd"/>
-		</xsd:schema>
-			
-		<xsd:schema targetNamespace="http://test.com/ImportInlineSchemaWithInclude" xmlns:sch="http://test.com/schema">
-			<xsd:import namespace="http://test.com/schema"/>
-			<xsd:element name="Element" type="sch:MyType"/>
-		</xsd:schema>
-	</types>	
-	
-	<message name="request">
-		<part name="part" element="tns:Element"/>
-	</message>		
-	
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/schema.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/schema.xsd
deleted file mode 100644
index f506e7b..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/schema.xsd
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-	targetNamespace="http://test.com/schema" 
-	xmlns:tns="http://test.com/schema">
-	
-	<complexType name="MyType">
-		<attribute name="attone" type="string" use="required"/>
-		<attribute name="atttwo" type="string" use="required"/>
-	</complexType>
-	
-</schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl
deleted file mode 100644
index 10079cb..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl
+++ /dev/null

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://www.example.com/NoImportForUnprefixedAttribute/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" name="NoImportForUnprefixedAttribute" targetNamespace="http://www.example.com/NoImportForUnprefixedAttribute/">
-	<wsdl:types>
-		<xs:schema targetNamespace="http://www.example.com/NoImportForUnprefixedAttribute/" elementFormDefault="qualified" attributeFormDefault="unqualified">
-			<xs:complexType name="typeWithMinMaxOccurs">
-				<xs:sequence>
-					<xs:element minOccurs="1" maxOccurs="1" name="elem1" type="xs:string"/>
-					<xs:element minOccurs="1" maxOccurs="1" name="elem2" type="xs:string"/>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="typeWithRestriction">
-				<xs:sequence>
-					<xs:element name="elem3">
-						<xs:simpleType>
-							<xs:restriction base="xs:NMTOKEN">
-								<xs:enumeration value="something"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:schema>
-	</wsdl:types>
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl
deleted file mode 100644
index 54a54de..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="OneErrorForInlineXSDRefInvalidInlineXSD" targetNamespace="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/" xmlns:xsd1="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/1" xmlns:xsd2="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/1">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/1">
-		  <xsd:element name="NewGlobalElement" type="xsd:stringa"></xsd:element>
-        </xsd:schema>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/2">
-		  <xsd:complexType name="NewComplexType">
-            <xsd:sequence>
-              <xsd:element ref="xsd1:NewGlobalElement"></xsd:element>
-            </xsd:sequence>
-          </xsd:complexType>
-		</xsd:schema>
-	</wsdl:types>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl
deleted file mode 100644
index 9598fda..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ReferToAnotherInlineType/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ReferToAnotherInlineType" targetNamespace="http://tempuri.org/ReferToAnotherInlineType/">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/ReferToAnotherInlineType1/"
-            xmlns:two="http://tempuri.org/ReferToAnotherInlineType2/">
-          <xsd:simpleType name="NewSimpleType">
-            <xsd:restriction base="xsd:string">
-              <xsd:minLength value="1"/>
-            </xsd:restriction>
-          </xsd:simpleType>
-		  <xsd:element name="NewGlobalElement" type="two:NewSimpleType"></xsd:element>
-		</xsd:schema>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/ReferToAnotherInlineType2/"
-            xmlns:one="http://tempuri.org/ReferToAnotherInlineType1/">
-		  <xsd:simpleType name="NewSimpleType">
-            <xsd:restriction base="xsd:string">
-              <xsd:minLength value="1"/>
-            </xsd:restriction>
-          </xsd:simpleType>
-		  <xsd:element name="NewGlobalElement" type="one:NewSimpleType"></xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl
deleted file mode 100644
index 6b1437c..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/RestrictionPatternWithColon/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RestrictionPatternWithColon" targetNamespace="http://tempuri.org/RestrictionPatternWithColon/">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/RestrictionPatternWithColon/">
-            <xsd:simpleType name="time">                           
-                <xsd:restriction base="xsd:string">                     
-                    <xsd:pattern value="([0-9]{2}:[0-9]{2}:[0-9]{2})|(#empty value)"/>                   
-                </xsd:restriction>                                  
-            </xsd:simpleType>          
-		</xsd:schema>
-	</wsdl:types>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl
deleted file mode 100644
index 4ccf614..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions targetNamespace="http://sample/" 
-             xmlns:tns="http://sample/" 
-             xmlns:ex="http://www.example.com" 
-             xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<types>
-		<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.example.com" targetNamespace="http://www.example.com" elementFormDefault="qualified" attributeFormDefault="unqualified">
-			<xs:complexType name="Name">
-				<xs:annotation>
-					<xs:documentation source="http://www.example.com">
-						<choice />
-					</xs:documentation>
-				</xs:annotation>
-			</xs:complexType>
-		</xs:schema>
-	</types>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ValueColon/ValueColon.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ValueColon/ValueColon.wsdl
deleted file mode 100644
index 294339a..0000000
--- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ValueColon/ValueColon.wsdl
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/ValueColon/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ValueColon"
-	targetNamespace="http://tempuri.org/ValueColon/">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="http://tempuri.org/ValueColon/">
-			<xsd:element name="MyElement">
-				<xsd:annotation>
-					<xsd:appinfo source="http://sample.com">
-						<xsd:initialValue kind="string_value" value=":"/>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/.classpath b/tests/org.eclipse.wst.wsi.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.wsi.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/tests/org.eclipse.wst.wsi.tests/.cvsignore b/tests/org.eclipse.wst.wsi.tests/.cvsignore
deleted file mode 100644
index ff8300b..0000000
--- a/tests/org.eclipse.wst.wsi.tests/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-temp.folder
-wsi.tests.jar
-build.xml

diff --git a/tests/org.eclipse.wst.wsi.tests/.project b/tests/org.eclipse.wst.wsi.tests/.project
deleted file mode 100644
index 3d94a04..0000000
--- a/tests/org.eclipse.wst.wsi.tests/.project
+++ /dev/null

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsi.tests</name>
-	<comment></comment>
-	<projects>
-		<project>com.ibm.etools.wsdl</project>
-		<project>com.ibm.wsdl</project>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.emf.ecore</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.xsd</project>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 3d0e4cb..0000000
--- a/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WSI JUnit Test
-Bundle-SymbolicName: org.eclipse.wst.wsi.tests
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsi.tests.jar
-Bundle-Activator: org.eclipse.wst.wsi.tests.internal.WSITestsPlugin
-Bundle-Vendor: Eclipse
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.wst.wsi,
- org.eclipse.core.resources,
- org.junit,
- org.wsdl4j,
- org.eclipse.osgi,
- org.eclipse.core.runtime,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core
-Eclipse-AutoStart: true
-Export-Package: org.eclipse.wst.wsi.tests.internal

diff --git a/tests/org.eclipse.wst.wsi.tests/about.html b/tests/org.eclipse.wst.wsi.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.wsi.tests/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/build.properties b/tests/org.eclipse.wst.wsi.tests/build.properties
deleted file mode 100644
index 703ed84..0000000
--- a/tests/org.eclipse.wst.wsi.tests/build.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-source.wsi.tests.jar = src/
-output.wsi.tests.jar = bin/
-bin.includes = plugin.xml,\
-               wsi.tests.jar,\
-               testResources/,\
-               test.xml,\
-               runtests.bat,\
-               META-INF/,\
-               META-INF/,\
-               about.html

diff --git a/tests/org.eclipse.wst.wsi.tests/plugin.xml b/tests/org.eclipse.wst.wsi.tests/plugin.xml
deleted file mode 100644
index 7bf65fb..0000000
--- a/tests/org.eclipse.wst.wsi.tests/plugin.xml
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-</plugin>

diff --git a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreWSDLConformanceTest.java b/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreWSDLConformanceTest.java
deleted file mode 100644
index a97e9df..0000000
--- a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreWSDLConformanceTest.java
+++ /dev/null

@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002-2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsi.tests.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.wsi.internal.WSIPreferences;
-import org.eclipse.wst.wsi.internal.WSITestToolsProperties;
-import org.eclipse.wst.wsi.internal.analyzer.WSDLAnalyzer;
-import org.eclipse.wst.wsi.internal.core.wsdl.WSDLReaderImpl;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class CoreWSDLConformanceTest extends TestCase 
-{
-  public static final String WSDL_BASE_DIRECTORY = "testResources/samples/wsdl";
-  public static final String TEST_CASE_FILE = "testcase.xml";
-  public static final String WSDL_EXTENSION = ".wsdl";
-  
-  public static final String TAD_ID_AP = "AP10";
-  public static final String TAD_ID_SSBP = "SSBP10";
-  
-  protected String pluginURI = null;
-  protected String tadID = TAD_ID_AP;
-  
-  public CoreWSDLConformanceTest(String name) 
-  {
-      super(name);
-	  pluginURI = WSITestsPlugin.getInstallURL();
-  }
-
-  protected void setup()
-  {
-	  
-  }
-  
-  /**
-   * JUnit test: validate the wsdl document against the specified WS-I Profile.
-   * @param tad he WS-I Test Assertion Document
-   * @param testName the name of the test containing the wsdl document
-   */
-  protected void runTest(String category, String testName, String tadID)
-  {	
-	this.tadID = tadID;
-
-    assertNotNull("Problems determining base url", pluginURI);
-    String testDirectory  = pluginURI + WSDL_BASE_DIRECTORY + "/" + category + "/" + testName;
-    String wsdlFile = "file://" + testDirectory + "/" + testName + WSDL_EXTENSION;
-    String testcaseFile = testDirectory +  "/" + TEST_CASE_FILE;
-    
-	// validate the WSDL document
-    WSDLAnalyzer analyzer = validateConformance(wsdlFile, tadID);
-    assertNotNull("Unknown problems during validation", analyzer);
-    
-	// retrieve the expected assertion failures
-	List expectedErrors = getExpectedAssertionFailures(testcaseFile);
-	assertNotNull("Problems retrieving expected failures", expectedErrors);
-	
-	// compare the actual errors with the expected errors
-    analyzeResults(analyzer.getAssertionErrors(), expectedErrors);
-  }    
-
-  /**
-   * Validate the wsdl document against the specified WS-I Profile.
-   * @param tad  the WS-I Test Assertion Document
-   * @param filename the wsdl document
-   * @return the WSDLAnalyzer object containing the validation results
-   */  
-  protected WSDLAnalyzer validateConformance(String filename, String tadID)
-  {
-	WSDLAnalyzer analyzer = null;
-    try 
-    {
-   	  WSIPreferences preferences = new WSIPreferences();
-   	  preferences.setComplianceLevel( WSITestToolsProperties.STOP_NON_WSI);
-	  preferences.setTADFile(getTADURI(tadID));
-		
-	  analyzer = new WSDLAnalyzer(filename, preferences);
-	  setConfigurations(filename, analyzer);
-		
-	  // run the conformance check and add errors and warnings as needed
-	  analyzer.validateConformance();
-    }    
-    catch (Exception e)
-    {
-      return null;
-    }	
-	return analyzer;
-  }
-  
-  /**
-   * Retrieve the expected assertion failures.
-   * @param filename - the location of the testcase.xml file.
-   * @return the expected assertion failures.
-   */
-  protected List getExpectedAssertionFailures(String filename)
-  {
-	List assertionFailures = new ArrayList();
-    try
-	{
-	  DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-	  Document doc = builder.parse(filename);
-	  NodeList list = doc.getElementsByTagName("assertion");
-	  if (list != null)
-	  for (int i=0; i<list.getLength(); i++)
-	  {
-		Element element = (Element)list.item(i);
-		String tad = element.getAttribute("tadID");
-		if ((tad != null) && tad.equals(this.tadID))
-		   assertionFailures.add(element.getAttribute("id"));
-	  }
-	}
-	catch (Exception e)
-	{
-	  assertionFailures = null;
-	}
-	  return assertionFailures;
-  }
-  
-  /**
-   * Compare the actual errors with the expected errors.
-   * @param errors the actual assertion failures
-   * @param expectedErrors the expected assertion failures
-   */
-  protected void analyzeResults(List errors, List expectedErrors)
-  {
-	 List actualErrors = new ArrayList();
-	 if ((errors != null) && (expectedErrors != null))
-	 {
-       Iterator i = errors.iterator();
-       while (i.hasNext())
-	   {
-		 AssertionError e = (AssertionError)i.next();
-		 String assertionId = e.getAssertionID();
-		 actualErrors.add(assertionId);
-		 
-		 if (!expectedErrors.contains(assertionId))
-		 {
-			fail("Unexpected assertion failure: " + assertionId); 
-		 }
-	   }
-	   
-	   i = expectedErrors.iterator();
-       while (i.hasNext())
-	   {
-		 String assertionId = (String)i.next();
-		 
-		 if (!actualErrors.contains(assertionId))
-		 {
-			fail("Expected assertion failure: " + assertionId); 
-		 }
-	   }
-	   assertEquals(expectedErrors.size(), errors.size());
-	 }
-  }
-
-  /**
-   * Gather configuration information from the WSDL file.
-   * @param fileName the wsdl location.
-   * @param a WSDLAnalyzer object containg configuration info.
-   */
-  protected void setConfigurations(String filename, WSDLAnalyzer analyzer)
-  {
-    try
-    {
-      WSDLReader wsdlReader = new WSDLReaderImpl();
-
-      // Set features
-      wsdlReader.setFeature(com.ibm.wsdl.Constants.FEATURE_VERBOSE, false);
-      wsdlReader.setFeature(com.ibm.wsdl.Constants.FEATURE_IMPORT_DOCUMENTS, true);
-
-      // Parse the WSDL document
-      Document document = XMLUtils.parseXMLDocument(filename);
-	  Definition definition = wsdlReader.readWSDL(filename, document);
-      //Definition definition = reader.readWSDL(filename);
-
-	  String namespace = definition.getTargetNamespace();
-
-	  // get all the collections we may need to validate
-	  Collection services = definition.getServices().values();
-	  Collection bindings = definition.getBindings().values();
-	  Collection portTypes = definition.getPortTypes().values();
-	  Collection messages = definition.getMessages().values();
-
-	  // The WS-I conformance tools require that each service be analyzed separately.
-	  // Get all the services and analyze them.
-	  if (services != null && !services.isEmpty())
-	  {
-	    Iterator serviceIterator = services.iterator();
-
-	    while (serviceIterator.hasNext())
-	    {
-	      Service service = (Service) serviceIterator.next();
-
-	      String servicename = service.getQName().getLocalPart();
-
-	      Collection ports = service.getPorts().values();
-	      if (ports != null && !ports.isEmpty())
-	      {
-	        // The WS-I tools must be called once for each port within each service.
-	        Iterator portIterator = ports.iterator();
-	        while (portIterator.hasNext())
-	        {
-	          Port port = (Port) portIterator.next();
-			  analyzer.addConfigurationToTest(servicename, namespace, port.getName(), WSDLAnalyzer.PORT);
-	        }
-	      }
-	      // validate at the binding level - check for every binding
-	      else if (bindings != null && !bindings.isEmpty())
-	      {
-	        Iterator bindingIterator = bindings.iterator();
-
-	        while (bindingIterator.hasNext())
-	        {
-	          Binding binding = (Binding) bindingIterator.next();
-	          String bindingname = binding.getQName().getLocalPart();
-              analyzer.addConfigurationToTest(null, namespace, bindingname, WSDLAnalyzer.BINDING);
-	        }
-	      }
-	      // validate at the portType level - check for every portType
-	      else if (portTypes != null && !portTypes.isEmpty())
-	      {
-	        Iterator portTypeIterator = portTypes.iterator();
-	        while (portTypeIterator.hasNext())
-	        {
-	          PortType portType = (PortType) portTypeIterator.next();
-	          String portTypename = portType.getQName().getLocalPart();
-              analyzer.addConfigurationToTest(null, namespace, portTypename, WSDLAnalyzer.PORTTYPE);
-	        }
-	      }
-	      // validate at the message level - check for every message
-	      else if (messages != null && !messages.isEmpty())
-	      {
-	        Iterator messageIterator = messages.iterator();
-	        while (messageIterator.hasNext())
-	        {
-	          Message message = (Message) messageIterator.next();
-	          String messagename = message.getQName().getLocalPart();
-              analyzer.addConfigurationToTest(null, namespace, messagename, WSDLAnalyzer.MESSAGE);
-	        }
-	      }
-	    }
-	  }
-    }
-	catch (Exception e)
-	{
-      fail("Unexpected problems setting configurations");
-	}
-  }
-  
-  /**
-   * Return the location of the given tad.
-   * @param tid the tad id.
-   * @return the location of the tad.
-   */
-  protected String getTADURI(String tid)
-  {
-	  if (tid.equals(TAD_ID_AP))
-	     return WSITestToolsProperties.AP_ASSERTION_FILE;
-	  else
-		 return WSITestToolsProperties.SSBP_ASSERTION_FILE;
-  }
-}

diff --git a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/RegressionBucket.java b/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/RegressionBucket.java
deleted file mode 100644
index 07059b5..0000000
--- a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/RegressionBucket.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/* Copyright (c) 2001, 2004 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-* 
-* Contributors:
-*     IBM Corporation - initial API and implementation
-*******************************************************************************/
-package org.eclipse.wst.wsi.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-/**
- * JUnit tests that runs all of the tests implemented 
- * in this plugin.
- * 
- * @author lauzond
- */
-public class RegressionBucket extends TestSuite {
-
-	  public static Test suite() 
-	  {
-	    TestSuite suite= new TestSuite("Regression Bucket");
-	    suite.addTest(new TestSuite(WSDLConformanceSSBPTest.class));
-	    suite.addTest(new TestSuite(WSDLConformanceAPTest.class));
-	    
-	    return suite;
-	  }
-
-}

diff --git a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceAPTest.java b/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceAPTest.java
deleted file mode 100644
index 65103b4..0000000
--- a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceAPTest.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/* Copyright (c) 2001, 2004 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-* 
-* Contributors:
-*     IBM Corporation - initial API and implementation
-*******************************************************************************/
-package org.eclipse.wst.wsi.tests.internal;
-/**
- * JUnit tests that test wsdl documents against 
- * the WS-I Attachments profile.
- * 
- * @author lauzond
- */
-public class WSDLConformanceAPTest extends CoreWSDLConformanceTest 
-{
-  public WSDLConformanceAPTest(String name)
-  {
-    super(name);
-  }
-//ws-i wsdls
-  public void test_addressBook() { runTest("wsi", "addressBook", TAD_ID_AP); }
-  public void test_addressBook_rpc() { runTest("wsi", "addressBook-rpc", TAD_ID_AP); }
-  public void test_sampleAppCatalog() { runTest("wsi", "sampleAppCatalog", TAD_ID_AP); }  
-  public void test_sampleAppManufacturer() { runTest("wsi", "sampleAppManufacturer", TAD_ID_AP); }  
-  public void test_sampleAppWarehouse() { runTest("wsi", "sampleAppWarehouse", TAD_ID_AP); } 
-
-  // bp tests
-  public void test_2012_1() { runTest("bp", "2012-1", TAD_ID_AP); } 
-  public void test_2013_1() { runTest("bp", "2013-1", TAD_ID_AP); }
-  public void test_2014_1() { runTest("bp", "2014-1", TAD_ID_AP); }
-  public void test_2014_2() { runTest("bp", "2014-2", TAD_ID_AP); }
-  public void test_2014_3() { runTest("bp", "2014-3", TAD_ID_AP); }
-  public void test_2017_1() { runTest("bp", "2017-1", TAD_ID_AP); }
-  public void test_2017_2() { runTest("bp", "2017-2", TAD_ID_AP); }
-  public void test_2018_1() { runTest("bp", "2018-1", TAD_ID_AP); }
-  public void test_2018_2() { runTest("bp", "2018-2", TAD_ID_AP); }
-  public void test_2018_3() { runTest("bp", "2018-3", TAD_ID_AP); }
-  public void test_2018_4() { runTest("bp", "2018-4", TAD_ID_AP); }
-  public void test_2019_1() { runTest("bp", "2019-1", TAD_ID_AP); }
-  public void test_2019_2() { runTest("bp", "2019-2", TAD_ID_AP); }
-  public void test_2019_3() { runTest("bp", "2019-3", TAD_ID_AP); }
-  public void test_2019_4() { runTest("bp", "2019-4", TAD_ID_AP); }
-  public void test_2020_1() { runTest("bp", "2020-1", TAD_ID_AP); }
-  public void test_2020_2() { runTest("bp", "2020-2", TAD_ID_AP); }
-  public void test_2105_1() { runTest("bp", "2105-1", TAD_ID_AP); }
-  public void test_2105_2() { runTest("bp", "2105-2", TAD_ID_AP); }
-  public void test_2117_1() { runTest("bp", "2117-1", TAD_ID_AP); }
-  public void test_2117_2() { runTest("bp", "2117-2", TAD_ID_AP); }
-  public void test_2117_3() { runTest("bp", "2117-3", TAD_ID_AP); }
-  public void test_2406_1() { runTest("bp", "2406-1", TAD_ID_AP); }
-
-  // redundant tests -- assertions failures caught by base wsdl validator.
-  public void test_2010_1() { runTest("redundant", "2010-1", TAD_ID_AP); }
-  public void test_2011_1() { runTest("redundant", "2011-1", TAD_ID_AP); } 
-  public void test_2011_2() { runTest("redundant", "2011-2", TAD_ID_AP); } 
-  public void test_2011_3() { runTest("redundant", "2011-3", TAD_ID_AP); } 
-  public void test_2011_4() { runTest("redundant", "2011-4", TAD_ID_AP); } 
-  public void test_2011_5() { runTest("redundant", "2011-5", TAD_ID_AP); } 
-  public void test_2021_1() { runTest("redundant", "2021-1", TAD_ID_AP); } 
-  public void test_2021_2() { runTest("redundant", "2021-2", TAD_ID_AP); } 
-  public void test_2021_3() { runTest("redundant", "2021-3", TAD_ID_AP); } 
-  public void test_2021_4() { runTest("redundant", "2021-4", TAD_ID_AP); } 
-  public void test_2021_5() { runTest("redundant", "2021-5", TAD_ID_AP); } 
-  public void test_2021_6() { runTest("redundant", "2021-6", TAD_ID_AP); }
-  public void test_2022_1() { runTest("redundant", "2022-1", TAD_ID_AP); } 
-  public void test_2022_2() { runTest("redundant", "2022-2", TAD_ID_AP); }
-  public void test_2032_1() { runTest("redundant", "2032-1", TAD_ID_AP); } 
-  public void test_2032_2() { runTest("redundant", "2032-2", TAD_ID_AP); } 
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceSSBPTest.java b/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceSSBPTest.java
deleted file mode 100644
index fd57606..0000000
--- a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceSSBPTest.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/* Copyright (c) 2001, 2004 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-* 
-* Contributors:
-*     IBM Corporation - initial API and implementation
-*******************************************************************************/
-package org.eclipse.wst.wsi.tests.internal;
-/**
- * JUnit tests that test wsdl documents against 
- * the WS-I Simple Soap Binding profile.
- * 
- * @author lauzond
- */
-public class WSDLConformanceSSBPTest extends CoreWSDLConformanceTest 
-{
-  public WSDLConformanceSSBPTest(String name)
-  {
-    super(name);
-  }
-  // ws-i wsdls
-  public void test_addressBook() { runTest("wsi", "addressBook", TAD_ID_SSBP); }
-  public void test_addressBook_rpc() { runTest("wsi", "addressBook-rpc", TAD_ID_SSBP); }
-  public void test_sampleAppCatalog() { runTest("wsi", "sampleAppCatalog", TAD_ID_SSBP); }  
-  public void test_sampleAppManufacturer() { runTest("wsi", "sampleAppManufacturer", TAD_ID_SSBP); }  
-  public void test_sampleAppWarehouse() { runTest("wsi", "sampleAppWarehouse", TAD_ID_SSBP); } 
-
-  // bp tests
-  public void test_2012_1() { runTest("bp", "2012-1", TAD_ID_SSBP); } 
-  public void test_2013_1() { runTest("bp", "2013-1", TAD_ID_SSBP); }
-  public void test_2014_1() { runTest("bp", "2014-1", TAD_ID_SSBP); }
-  public void test_2014_2() { runTest("bp", "2014-2", TAD_ID_SSBP); }
-  public void test_2014_3() { runTest("bp", "2014-3", TAD_ID_SSBP); }
-  public void test_2017_1() { runTest("bp", "2017-1", TAD_ID_SSBP); }
-  public void test_2017_2() { runTest("bp", "2017-2", TAD_ID_SSBP); }
-  public void test_2018_1() { runTest("bp", "2018-1", TAD_ID_SSBP); }
-  public void test_2018_2() { runTest("bp", "2018-2", TAD_ID_SSBP); }
-  public void test_2018_3() { runTest("bp", "2018-3", TAD_ID_SSBP); }
-  public void test_2018_4() { runTest("bp", "2018-4", TAD_ID_SSBP); }
-  public void test_2019_1() { runTest("bp", "2019-1", TAD_ID_SSBP); }
-  public void test_2019_2() { runTest("bp", "2019-2", TAD_ID_SSBP); }
-  public void test_2019_3() { runTest("bp", "2019-3", TAD_ID_SSBP); }
-  public void test_2019_4() { runTest("bp", "2019-4", TAD_ID_SSBP); }
-  public void test_2020_1() { runTest("bp", "2020-1", TAD_ID_SSBP); }
-  public void test_2020_2() { runTest("bp", "2020-2", TAD_ID_SSBP); }
-  public void test_2105_1() { runTest("bp", "2105-1", TAD_ID_SSBP); }
-  public void test_2105_2() { runTest("bp", "2105-2", TAD_ID_SSBP); }
-  public void test_2117_1() { runTest("bp", "2117-1", TAD_ID_SSBP); }
-  public void test_2117_2() { runTest("bp", "2117-2", TAD_ID_SSBP); }
-  public void test_2117_3() { runTest("bp", "2117-3", TAD_ID_SSBP); }
-  public void test_2406_1() { runTest("bp", "2406-1", TAD_ID_SSBP); }
-
-  // redundant tests -- assertions failures caught by base wsdl validator.
-  public void test_2010_1() { runTest("redundant", "2010-1", TAD_ID_SSBP); }
-  public void test_2011_1() { runTest("redundant", "2011-1", TAD_ID_SSBP); } 
-  public void test_2011_2() { runTest("redundant", "2011-2", TAD_ID_SSBP); } 
-  public void test_2011_3() { runTest("redundant", "2011-3", TAD_ID_SSBP); } 
-  public void test_2011_4() { runTest("redundant", "2011-4", TAD_ID_SSBP); } 
-  public void test_2011_5() { runTest("redundant", "2011-5", TAD_ID_SSBP); } 
-  public void test_2021_1() { runTest("redundant", "2021-1", TAD_ID_SSBP); } 
-  public void test_2021_2() { runTest("redundant", "2021-2", TAD_ID_SSBP); } 
-  public void test_2021_3() { runTest("redundant", "2021-3", TAD_ID_SSBP); } 
-  public void test_2021_4() { runTest("redundant", "2021-4", TAD_ID_SSBP); } 
-  public void test_2021_5() { runTest("redundant", "2021-5", TAD_ID_SSBP); } 
-  public void test_2021_6() { runTest("redundant", "2021-6", TAD_ID_SSBP); }
-  public void test_2022_1() { runTest("redundant", "2022-1", TAD_ID_SSBP); } 
-  public void test_2022_2() { runTest("redundant", "2022-2", TAD_ID_SSBP); }
-  public void test_2032_1() { runTest("redundant", "2032-1", TAD_ID_SSBP); } 
-  public void test_2032_2() { runTest("redundant", "2032-2", TAD_ID_SSBP); } 
-
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSITestsPlugin.java b/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSITestsPlugin.java
deleted file mode 100644
index b0b975c..0000000
--- a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSITestsPlugin.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/* Copyright (c) 2001, 2004 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-* 
-* Contributors:
-*     IBM Corporation - initial API and implementation
-*******************************************************************************/
-package org.eclipse.wst.wsi.tests.internal;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
-* The main plugin class to be used in the desktop.
-*/
-public class WSITestsPlugin extends Plugin
-{
- //The shared instance.
- private static WSITestsPlugin plugin;
- private static Bundle pluginBundle = null;
-
- /**
-  * The constructor.
-  */
- public WSITestsPlugin()
- {
-   super();
-   plugin = this;
- }
-
- /**
-  * This method is called upon plug-in activation
-  */
- public void start(BundleContext context) throws Exception
- {
-   super.start(context);
-	pluginBundle = context.getBundle();
- }
-
- /**
-  * This method is called when the plug-in is stopped
-  */
- public void stop(BundleContext context) throws Exception
- {
-   super.stop(context);
- }
-
- /**
-  * Returns the shared instance.
-  */
- public static WSITestsPlugin getDefault()
- {
-   return plugin;
- }
- 
- /**
-  * Get the install URL of this plugin.
-  * 
-  * @return the install url of this plugin
-  */
- public static String getInstallURL()
- {
-   try
-   {
-     return Platform.resolve(pluginBundle.getEntry("/")).getFile();
-   }
-   catch (IOException e)
-   {
-     return null;
-   }
- }
-}

diff --git a/tests/org.eclipse.wst.wsi.tests/test.xml b/tests/org.eclipse.wst.wsi.tests/test.xml
deleted file mode 100644
index 5be8ad9..0000000
--- a/tests/org.eclipse.wst.wsi.tests/test.xml
+++ /dev/null

@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-	<!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-		
-		<echo message="basedir ${basedir}" />
-		<echo message="eclipse place ${eclipse-home}" />
-	
-	<!-- sets the properties plugin-name, and library-file -->
-	<property name="plugin-name" value="org.eclipse.wst.wsi.tests" />
-	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<tstamp/>
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org.eclipse.wst.wsi.tests.*xml" />
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-		<property name="wst-folder" value="${eclipse-home}/wst_folder"/>
-		<delete dir="${wst-folder}" quiet="true"/>
-    	<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      		<property name="data-dir" value="${wst-folder}"/>
-      		<property name="plugin-name" value="${plugin-name}"/>
-      		<property name="classname" value="org.eclipse.wst.wsi.tests.internal.RegressionBucket" />
-   			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-    	</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-		<!--<delete dir="${workspace}" quiet="true" />-->
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init,suite,cleanup">
-		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-			<property name="includes" value="org.eclipse.wst.wsi.tests.*xml" />
-			<property name="output-file" value="${plugin-name}.xml" />
-		</ant>
-	</target>
-
-</project>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/2012-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/2012-1.wsdl
deleted file mode 100644
index 0db92bf..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/2012-1.wsdl
+++ /dev/null

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Name" targetNamespace="http://tempuri.org/" xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://tempuri.org/">
-			<xsd:element name="Report">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element ref="tns:Name" />
-						<xsd:element ref="tns:Specimen" />
-						<xsd:element ref="tns:Lot" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="SampleList">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element maxOccurs="unbounded" minOccurs="1" ref="tns:Report" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="Count" type="xsd:string" />
-			<xsd:element name="LastModified" type="xsd:string" />
-			<xsd:element name="Lot" type="xsd:string" />
-			<xsd:element name="Name" type="xsd:string" />
-			<xsd:element name="Number" type="xsd:string" />
-			<xsd:element name="Specimen" type="xsd:string" />
-			<xsd:element name="Sample">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element ref="tns:SampleName" />
-						<xsd:element ref="tns:Count" />
-						<xsd:element ref="tns:LastModified" />
-						<xsd:element maxOccurs="unbounded" minOccurs="0" ref="tns:SampleProvider" />
-					</xsd:sequence>
-					<xsd:attribute name="id" type="xsd:string" use="optional" />
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="SampleName" type="xsd:string" />
-			<xsd:element name="SampleProvider">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element ref="tns:Name" />
-						<xsd:element ref="tns:Number" />
-						<xsd:element ref="tns:SampleList" />
-					</xsd:sequence>
-					<xsd:attribute name="id" type="xsd:string" use="optional" />
-				</xsd:complexType>
-			</xsd:element>
-
-
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="getSampleRequest">
-		<wsdl:part name="sampleId" type="xsd:string"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getSampleResponse">
-		<wsdl:part name="report" element="tns:Sample"></wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="SamplePortType">
-		<wsdl:operation name="getSample">
-			<wsdl:input message="tns:getSampleRequest"></wsdl:input>
-			<wsdl:output message="tns:getSampleResponse"></wsdl:output>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="SampleBinding" type="tns:SamplePortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getSample">
-			<soap:operation soapAction="http://tempuri.org/getSample" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="SampleService">
-		<wsdl:port name="SamplePort" binding="tns:SampleBinding">
-			<soap:address location="http://tempuri.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/testcase.xml
deleted file mode 100644
index 119b7b0..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/testcase.xml
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2012-1">
-  <description>
-    This is an example of a non-conformant wsdl that fails test assertion BP2012.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2012" tadID="SSBP10"/>
-	<assertion id="BP2012" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/2012-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/2012-2.wsdl
deleted file mode 100644
index 9161080..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/2012-2.wsdl
+++ /dev/null

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="intf:PhoneNumber"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/testcase.xml
deleted file mode 100644
index ee8ad5c..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2012-2">
-  <description>
-    This is an example of a non-conformant wsdl that fails test assertion BP2012.
-    
-  </description>
-  <expectedFailures>
-	<assertion id="BP2012" tadID="SSBP10"/>
-	<assertion id="BP2012" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/2013-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/2013-1.wsdl
deleted file mode 100644
index a59124e..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/2013-1.wsdl
+++ /dev/null

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/testcase.xml
deleted file mode 100644
index 1c388d7..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/testcase.xml
+++ /dev/null

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2013-1">
-  <description>
-    This is an example of a conformant wsdl used in the WS-I 
-    interoperability demo.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2013" tadID="SSBP10"/>
-	<assertion id="BP2013" tadID="AP10"/>
-	<assertion id="BP2112" tadID="SSBP10"/>
-	<assertion id="BP2112" tadID="AP10"/>
-   </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/2014-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/2014-1.wsdl
deleted file mode 100644
index b600258..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/2014-1.wsdl
+++ /dev/null

@@ -1,42 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-  <message name="echoStringIn">
-    <part name="parameters" type="s:string"/>
-  </message>
-  <message name="echoStringOut">
-    <part name="parameters" type="s:string" />
-    <part name="parameters1" type="s:string"/>
-    <part name="parameters2" type="s:string"/>
-  </message>
-  <portType name="EchoPortType">
-    <operation name="echoString" parameterOrder="parameters parameters1 parameters2">
-      <input message="s0:echoStringIn" />
-      <output message="s0:echoStringOut" />
-    </operation>
-   </portType>
-  <binding name="EchoBinding" type="s0:EchoPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" />
-      <input>
-        <soap:body use="literal" namespace="htp://org.org"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="htp://org.org" />
-      </output>
-    </operation>
- </binding>
-  <service name="EchoService">
-    <port name="EchoPort" binding="s0:EchoBinding">
-      <soap:address location="http://tempuri.org/"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/testcase.xml
deleted file mode 100644
index d6675f9..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/testcase.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2014-1">
-  <description>
-    This is an example of a conformant wsdl containing a wsdl:operation 
-    with a parameterOrder attribute.
-  </description>
-  <expectedFailures/>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/2014-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/2014-2.wsdl
deleted file mode 100644
index 0653069..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/2014-2.wsdl
+++ /dev/null

@@ -1,42 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-  <message name="echoStringIn">
-    <part name="parameters" type="s:string"/>
-  </message>
-  <message name="echoStringOut">
-    <part name="parameters" type="s:string" />
-    <part name="parameters1" type="s:string"/>
-    <part name="parameters2" type="s:string"/>
-  </message>
-  <portType name="EchoPortType">
-    <operation name="echoString" parameterOrder="parameters parameters1">
-      <input message="s0:echoStringIn" />
-      <output message="s0:echoStringOut" />
-    </operation>
-   </portType>
-  <binding name="EchoBinding" type="s0:EchoPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" />
-      <input>
-        <soap:body use="literal" namespace="htp://org.org"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="htp://org.org" />
-      </output>
-    </operation>
- </binding>
-  <service name="EchoService">
-    <port name="EchoPort" binding="s0:EchoBinding">
-      <soap:address location="http://tempuri.org/"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/testcase.xml
deleted file mode 100644
index 755b404..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/testcase.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2014-2">
-  <description>
-    This is an example of a conformant wsdl containing a wsdl:operation 
-    with a parameterOrder attribute.
-  </description>
-  <expectedFailures/>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/2014-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/2014-3.wsdl
deleted file mode 100644
index abe792a..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/2014-3.wsdl
+++ /dev/null

@@ -1,42 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-  <message name="echoStringIn">
-    <part name="parameters" type="s:string"/>
-  </message>
-  <message name="echoStringOut">
-    <part name="parameters" type="s:string" />
-    <part name="parameters1" type="s:string"/>
-    <part name="parameters2" type="s:string"/>
-  </message>
-  <portType name="EchoPortType">
-    <operation name="echoString" parameterOrder="parameters">
-      <input message="s0:echoStringIn" />
-      <output message="s0:echoStringOut" />
-    </operation>
-   </portType>
-  <binding name="EchoBinding" type="s0:EchoPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" />
-      <input>
-        <soap:body use="literal" namespace="htp://org.org"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="htp://org.org" />
-      </output>
-    </operation>
- </binding>
-  <service name="EchoService">
-    <port name="EchoPort" binding="s0:EchoBinding">
-      <soap:address location="http://tempuri.org/"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/testcase.xml
deleted file mode 100644
index 3c72c73..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2014-1">
-  <description>
-    This is an example of a conformant wsdl containing a wsdl:operation 
-    with a parameterOrder attribute.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2014" tadID="SSBP10"/>
-	<assertion id="BP2014" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/2017-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/2017-1.wsdl
deleted file mode 100644
index 76c5d75..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/2017-1.wsdl
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation style="document" soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation style="rpc" soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/testcase.xml
deleted file mode 100644
index 65da940..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2017-1">
-  <description>
-    This is an example of a non-conformant wsdl containing 
-    multiple style values within the same binding.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2017" tadID="SSBP10"/>
-	<assertion id="BP2017" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/2017-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/2017-2.wsdl
deleted file mode 100644
index ab90ed5..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/2017-2.wsdl
+++ /dev/null

@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="AddressBook2">
-     <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-       <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation style="document" soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="AddressBookSoapBinding2" type="intf:AddressBook2">
-    <wsdlsoap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation style="rpc" soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/testcase.xml
deleted file mode 100644
index d26e30b..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/testcase.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2017-2">
-  <description>
-    This is an example of a conformant wsdl containing 
-    multiple style values but in different bindings.
-  </description>
-  <expectedFailures/>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/2018-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/2018-1.wsdl
deleted file mode 100644
index 4f2af9b..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/2018-1.wsdl
+++ /dev/null

@@ -1,42 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <documentation>
-  </documentation>
-  <types/>
-  <message name="echoStringIn">
-    <part name="parameters" type="s:string"/>
-  </message>
-  <message name="echoStringOut">
-    <part name="parameters" type="s:string" />
-  </message>
-  <portType name="EchoPortType">
-    <operation name="echoString" parameterOrder="parameters">
-      <input message="s0:echoStringIn" />
-      <output message="s0:echoStringOut" />
-    </operation>
-   </portType>
-  <binding name="EchoBinding" type="s0:EchoPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" />
-      <input>
-        <soap:body use="literal" namespace="htp://org.org"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="htp://org.org" />
-      </output>
-    </operation>
- </binding>
-  <service name="EchoService">
-    <port name="EchoPort" binding="s0:EchoBinding">
-      <soap:address location="http://tempuri.org/"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/testcase.xml
deleted file mode 100644
index b4f6536..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/testcase.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2018-1">
-  <description>
-    This is an example of a conformant wsdl containing a documentation
-    element preceding the types element. 
-  </description>
-  <expectedFailures/>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018-2.wsdl
deleted file mode 100644
index e47b966..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018-2.wsdl
+++ /dev/null

@@ -1,45 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <documentation>
-  </documentation>
-  <import namespace="http://tempuri.org/2018a" location="2018a.wsdl"/>
-  <import namespace="http://tempuri.org/2018b" location="2018b.wsdl"/>
-  <types/>
-  
-  <message name="echoStringIn">
-    <part name="parameters" type="s:string"/>
-  </message>
-  <message name="echoStringOut">
-    <part name="parameters" type="s:string" />
-  </message>
-  <portType name="EchoPortType">
-    <operation name="echoString" parameterOrder="parameters">
-      <input message="s0:echoStringIn" />
-      <output message="s0:echoStringOut" />
-    </operation>
-   </portType>
-  <binding name="EchoBinding" type="s0:EchoPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" />
-      <input>
-        <soap:body use="literal" namespace="htp://org.org"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="htp://org.org" />
-      </output>
-    </operation>
- </binding>
-  <service name="EchoService">
-    <port name="EchoPort" binding="s0:EchoBinding">
-      <soap:address location="http://tempuri.org/"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018a.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018a.wsdl
deleted file mode 100644
index 558d96b..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018a.wsdl
+++ /dev/null

@@ -1,10 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/2018a" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/2018a" xmlns="http://schemas.xmlsoap.org/wsdl/">
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018b.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018b.wsdl
deleted file mode 100644
index 7432ec4..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018b.wsdl
+++ /dev/null

@@ -1,10 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/2018b" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/2018b" xmlns="http://schemas.xmlsoap.org/wsdl/">
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/testcase.xml
deleted file mode 100644
index 666c545..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/testcase.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2018-1">
-  <description>
-    This is an example of a conformant wsdl containing a documentation
-    element and 2 import elements preceding the types element. 
-  </description>
-  <expectedFailures/>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/2018-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/2018-3.wsdl
deleted file mode 100644
index 340d85b..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/2018-3.wsdl
+++ /dev/null

@@ -1,42 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <documentation>
-  </documentation>
-  <message name="echoStringIn">
-    <part name="parameters" type="s:string"/>
-  </message>
-  <types/>
-  <message name="echoStringOut">
-    <part name="parameters" type="s:string" />
-  </message>
-  <portType name="EchoPortType">
-    <operation name="echoString" parameterOrder="parameters">
-      <input message="s0:echoStringIn" />
-      <output message="s0:echoStringOut" />
-    </operation>
-   </portType>
-  <binding name="EchoBinding" type="s0:EchoPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" />
-      <input>
-        <soap:body use="literal" namespace="htp://org.org"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="htp://org.org" />
-      </output>
-    </operation>
- </binding>
-  <service name="EchoService">
-    <port name="EchoPort" binding="s0:EchoBinding">
-      <soap:address location="http://tempuri.org/"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/testcase.xml
deleted file mode 100644
index b53464f..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2018-3">
-  <description>
-    This is an example of a non conformant wsdl containing a message
-    element preceding the types element. 
-  </description>
-  <expectedFailures>
-    <assertion id="BP2018" tadID="SSBP10"/>
-    <assertion id="BP2018" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018-4.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018-4.wsdl
deleted file mode 100644
index b405891..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018-4.wsdl
+++ /dev/null

@@ -1,44 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <documentation>
-  </documentation>
-  <import namespace="http://tempuri.org/2018a" location="2018a.wsdl"/>
-  <import namespace="http://tempuri.org/2018b" location="2018b.wsdl"/>
-  <message name="echoStringIn">
-    <part name="parameters" type="s:string"/>
-  </message>
-  <types/>
-  <message name="echoStringOut">
-    <part name="parameters" type="s:string" />
-  </message>
-  <portType name="EchoPortType">
-    <operation name="echoString" parameterOrder="parameters">
-      <input message="s0:echoStringIn" />
-      <output message="s0:echoStringOut" />
-    </operation>
-   </portType>
-  <binding name="EchoBinding" type="s0:EchoPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" />
-      <input>
-        <soap:body use="literal" namespace="htp://org.org"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="htp://org.org" />
-      </output>
-    </operation>
- </binding>
-  <service name="EchoService">
-    <port name="EchoPort" binding="s0:EchoBinding">
-      <soap:address location="http://tempuri.org/"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018a.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018a.wsdl
deleted file mode 100644
index 558d96b..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018a.wsdl
+++ /dev/null

@@ -1,10 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/2018a" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/2018a" xmlns="http://schemas.xmlsoap.org/wsdl/">
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018b.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018b.wsdl
deleted file mode 100644
index 7432ec4..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018b.wsdl
+++ /dev/null

@@ -1,10 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/2018b" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/2018b" xmlns="http://schemas.xmlsoap.org/wsdl/">
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/testcase.xml
deleted file mode 100644
index 853591b..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2018-4">
-  <description>
-    This is an example of a non conformant wsdl containing a message
-    element preceding the types element. 
-  </description>
-  <expectedFailures>
-    <assertion id="BP2018" tadID="SSBP10"/>
-    <assertion id="BP2018" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018-5.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018-5.wsdl
deleted file mode 100644
index 81b9a63..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018-5.wsdl
+++ /dev/null

@@ -1,13 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <documentation>
-  </documentation>
-  <import namespace="http://tempuri.org/2018a" location="2018a.wsdl"/>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018a.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018a.wsdl
deleted file mode 100644
index adaf55a..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018a.wsdl
+++ /dev/null

@@ -1,43 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/2018a" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/2018a" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <documentation>
-  </documentation>
-  <import namespace="http://tempuri.org/2018b" location="2018b.wsdl"/>
-  <message name="echoStringIn">
-    <part name="parameters" type="s:string"/>
-  </message>
-  <types/>
-  <message name="echoStringOut">
-    <part name="parameters" type="s:string" />
-  </message>
-  <portType name="EchoPortType">
-    <operation name="echoString" parameterOrder="parameters">
-      <input message="s0:echoStringIn" />
-      <output message="s0:echoStringOut" />
-    </operation>
-   </portType>
-  <binding name="EchoBinding" type="s0:EchoPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" />
-      <input>
-        <soap:body use="literal" namespace="htp://org.org"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="htp://org.org" />
-      </output>
-    </operation>
- </binding>
-  <service name="EchoService">
-    <port name="EchoPort" binding="s0:EchoBinding">
-      <soap:address location="http://tempuri.org/"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018b.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018b.wsdl
deleted file mode 100644
index 7432ec4..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018b.wsdl
+++ /dev/null

@@ -1,10 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/2018b" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/2018b" xmlns="http://schemas.xmlsoap.org/wsdl/">
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/testcase.xml
deleted file mode 100644
index 853591b..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2018-4">
-  <description>
-    This is an example of a non conformant wsdl containing a message
-    element preceding the types element. 
-  </description>
-  <expectedFailures>
-    <assertion id="BP2018" tadID="SSBP10"/>
-    <assertion id="BP2018" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/2019-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/2019-1.wsdl
deleted file mode 100644
index 40752df..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/2019-1.wsdl
+++ /dev/null

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal" namespace="http://tempuri.org/nowhere">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/testcase.xml
deleted file mode 100644
index 8bad607..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2019-1">
-  <description>
-    This is an example of a non conformant wsdl containing a document literal binding
-    wih a nampace attribute specified the soapbind:header element.
-  </description>
-  <expectedFailures>
-    <assertion id="BP2019" tadID="SSBP10"/>
-    <assertion id="BP2019" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/2019-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/2019-2.wsdl
deleted file mode 100644
index ef200e2..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/2019-2.wsdl
+++ /dev/null

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/nowhere"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/testcase.xml
deleted file mode 100644
index 5e9ae01..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2019-2">
-  <description>
-    This is an example of a non conformant wsdl containing a document literal binding
-    wih a nampace attribute specified the soapbind:body element.
-  </description>
-  <expectedFailures>
-    <assertion id="BP2019" tadID="SSBP10"/>
-    <assertion id="BP2019" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/2019-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/2019-3.wsdl
deleted file mode 100644
index 6a63994..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/2019-3.wsdl
+++ /dev/null

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:findAddress" />
-   </wsdl:message> 
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal" name="f1" namespace="http://tempuri.org/nowhere"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/testcase.xml
deleted file mode 100644
index 53ec03d..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2019-3">
-  <description>
-    This is an example of a non conformant wsdl containing a document literal binding
-    wih a nampace attribute specified the soapbind:fault element.
-  </description>
-  <expectedFailures>
-    <assertion id="BP2019" tadID="SSBP10"/>
-    <assertion id="BP2019" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/2019-4.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/2019-4.wsdl
deleted file mode 100644
index 78281e2..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/2019-4.wsdl
+++ /dev/null

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:findAddress" />
-   </wsdl:message> 
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-           <wsdlsoap:headerfault message="intf:findAddressRequest"  part="AddressHeader" use="literal" namespace="http://tempuri.org/"/>
-         </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal" name="f1" namespace="http://tempuri.org/nowhere"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/testcase.xml
deleted file mode 100644
index 1949a53..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2019-4">
-  <description>
-    This is an example of a non conformant wsdl containing a document literal binding
-    wih a nampace attribute specified the soapbind:headerfault element.
-  </description>
-  <expectedFailures>
-    <assertion id="BP2019" tadID="SSBP10"/>
-    <assertion id="BP2019" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/2020-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/2020-1.wsdl
deleted file mode 100644
index 0290459..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/2020-1.wsdl
+++ /dev/null

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/testcase.xml
deleted file mode 100644
index 6bcccb3..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/testcase.xml
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2020-1">
-  <description>
-    This is an example of a non conformant wsdl containing a rpc literal binding
-    wih a nampace attribute missing from a soapbind:body element.
-  </description>
-  <expectedFailures>
-    <assertion id="BP2020" tadID="SSBP10"/>
-    <assertion id="BP2020" tadID="AP10"/>
-  </expectedFailures>
-
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/2020-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/2020-2.wsdl
deleted file mode 100644
index 93ff637..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/2020-2.wsdl
+++ /dev/null

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="2020.xsd"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/testcase.xml
deleted file mode 100644
index 0974180..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/testcase.xml
+++ /dev/null

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2020-2">
-  <description>
-    This is an example of a non conformant wsdl containing a rpc literal binding
-    wih a nampace attribute specified in the soapbind:body element that has a 
-    value that is not an absolute URI.
-  </description>
-  <expectedFailures>
-    <assertion id="BP2020" tadID="SSBP10"/>
-    <assertion id="BP2020" tadID="AP10"/>
-  </expectedFailures>
-
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105-1.wsdl
deleted file mode 100644
index d4415cb..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105-1.wsdl
+++ /dev/null

@@ -1,45 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <documentation>
-  </documentation>
-  <types/>
-  <import namespace="http://tempuri.org/2105a" location="2105a.wsdl"/>
-  <import namespace="http://tempuri.org/2105b" location="2105b.wsdl"/>
-
-  <message name="echoStringIn">
-    <part name="parameters" type="s:string"/>
-  </message>
-  <message name="echoStringOut">
-    <part name="parameters" type="s:string" />
-  </message>
-  <portType name="EchoPortType">
-    <operation name="echoString" parameterOrder="parameters">
-      <input message="s0:echoStringIn" />
-      <output message="s0:echoStringOut" />
-    </operation>
-   </portType>
-  <binding name="EchoBinding" type="s0:EchoPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" />
-      <input>
-        <soap:body use="literal" namespace="htp://org.org"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="htp://org.org" />
-      </output>
-    </operation>
- </binding>
-  <service name="EchoService">
-    <port name="EchoPort" binding="s0:EchoBinding">
-      <soap:address location="http://tempuri.org/"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105a.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105a.wsdl
deleted file mode 100644
index 831e79a..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105a.wsdl
+++ /dev/null

@@ -1,10 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/2105a" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/2105a" xmlns="http://schemas.xmlsoap.org/wsdl/">
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105b.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105b.wsdl
deleted file mode 100644
index 27079b3..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105b.wsdl
+++ /dev/null

@@ -1,10 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/2105b" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/2105b" xmlns="http://schemas.xmlsoap.org/wsdl/">
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/testcase.xml
deleted file mode 100644
index 267fc0b..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2105-1">
-  <description>
-    This is an example of a non conformant wsdl containing a types
-    element preceding the 2 import elements. 
-  </description>
-  <expectedFailures>
-    <assertion id="BP2105" tadID="SSBP10"/>
-    <assertion id="BP2105" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105-2.wsdl
deleted file mode 100644
index d41147f..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105-2.wsdl
+++ /dev/null

@@ -1,45 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <documentation>
-  </documentation>
-  <import namespace="http://tempuri.org/2105a" location="2105a.wsdl"/>
-  <types/>
-  <import namespace="http://tempuri.org/2105b" location="2105b.wsdl"/>
-
-  <message name="echoStringIn">
-    <part name="parameters" type="s:string"/>
-  </message>
-  <message name="echoStringOut">
-    <part name="parameters" type="s:string" />
-  </message>
-  <portType name="EchoPortType">
-    <operation name="echoString" parameterOrder="parameters">
-      <input message="s0:echoStringIn" />
-      <output message="s0:echoStringOut" />
-    </operation>
-   </portType>
-  <binding name="EchoBinding" type="s0:EchoPortType">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
-    <operation name="echoString">
-      <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" />
-      <input>
-        <soap:body use="literal" namespace="htp://org.org"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="htp://org.org" />
-      </output>
-    </operation>
- </binding>
-  <service name="EchoService">
-    <port name="EchoPort" binding="s0:EchoBinding">
-      <soap:address location="http://tempuri.org/"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105a.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105a.wsdl
deleted file mode 100644
index 831e79a..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105a.wsdl
+++ /dev/null

@@ -1,10 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/2105a" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/2105a" xmlns="http://schemas.xmlsoap.org/wsdl/">
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105b.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105b.wsdl
deleted file mode 100644
index 27079b3..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105b.wsdl
+++ /dev/null

@@ -1,10 +0,0 @@
-<definitions 
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-        xmlns:s="http://www.w3.org/2001/XMLSchema" 
-        xmlns:s0="http://tempuri.org/2105b" 
-        xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
-        xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
-        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-        targetNamespace="http://tempuri.org/2105b" xmlns="http://schemas.xmlsoap.org/wsdl/">
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/testcase.xml
deleted file mode 100644
index 9a599f9..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2105-2">
-  <description>
-    This is an example of a non conformant wsdl containing a types
-    element between the 2 import elements. 
-  </description>
-  <expectedFailures>
-    <assertion id="BP2105" tadID="SSBP10"/>
-    <assertion id="BP2105" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/2117-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/2117-1.wsdl
deleted file mode 100644
index 6cb8fef..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/2117-1.wsdl
+++ /dev/null

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal" namespace="http://tempuri.org/">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/testcase.xml
deleted file mode 100644
index 6137ac3..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/testcase.xml
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2117-1">
-  <description>
-    This is an example of a non conformant wsdl containing a rpc literal binding
-    wih a nampace attribute specified the soapbind:fault element.
-  </description>
-  <expectedFailures>
-    <assertion id="BP2117" tadID="SSBP10"/>
-    <assertion id="BP2117" tadID="AP10"/>
-  </expectedFailures>
-
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/2117-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/2117-2.wsdl
deleted file mode 100644
index 1f822a7..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/2117-2.wsdl
+++ /dev/null

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" type="xsd:string" />
-  </wsdl:message>  
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal" name="f1" namespace="http://tempuri.org/"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/testcase.xml
deleted file mode 100644
index 11401e2..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/testcase.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2117-2">
-  <description>
-    This is an example of a non conformant wsdl containing a rpc literal binding
-    wih a nampace attribute specified the soapbind:fault element.
-  </description>
-  <expectedFailures>
-    <assertion id="BP2117" tadID="SSBP10"/>
-    <assertion id="BP2117" tadID="AP10"/>
-    <assertion id="BP2113" tadID="SSBP10"/>
-    <assertion id="BP2113" tadID="AP10"/>
-  </expectedFailures>
-
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/2117-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/2117-3.wsdl
deleted file mode 100644
index 0288f60..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/2117-3.wsdl
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" type="xsd:string" />
-  </wsdl:message>  
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-          <wsdlsoap:headerfault message="intf:findAddressRequest"  part="AddressHeader" use="literal" namespace="http://tempuri.org/"/>
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal" name="f1"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/testcase.xml
deleted file mode 100644
index b7d072e..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/testcase.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2117-3">
-  <description>
-    This is an example of a non conformant wsdl containing a rpc literal binding
-    wih a nampace attribute specified the soapbind:headerfault element.
-  </description>
-  <expectedFailures>
-    <assertion id="BP2117" tadID="SSBP10"/>
-    <assertion id="BP2117" tadID="AP10"/>
-    <assertion id="BP2113" tadID="SSBP10"/>
-    <assertion id="BP2113" tadID="AP10"/>
-  </expectedFailures>
-
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/2406-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/2406-1.wsdl
deleted file mode 100644
index ae24860..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/2406-1.wsdl
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<definitions name="SampleService" targetNamespace="http://tempuri.org/"  xmlns:tns="http://tempuri.org/"   xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<message name="getSampleRequest">
-		<part name="zipcode" type="xsd:string"/>
-	</message>
-	<message name="getSampleResponse">
-		<part name="return" type="xsd:float"/>
-	</message>
-	<portType name="SamplePortType">
-		<operation name="getSample">
-			<input message="tns:getSampleRequest"/>
-			<output message="tns:getSampleResponse"/>
-		</operation>
-	</portType>
-	<binding name="SampleBinding" type="tns:SamplePortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="getSample">
-			<soap:operation soapAction=""/>
-			<input>
-				<soap:body use="encoded" namespace="http://tempuri.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output>
-				<soap:body use="encoded" namespace="http://tempuri.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="SampleService">
-		<documentation></documentation>
-		<port name="SamplePort" binding="tns:SampleBinding">
-			<soap:address location="http://tempuri.org/"/>
-		</port>
-	</service>
-</definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/testcase.xml
deleted file mode 100644
index 73a287d..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/testcase.xml
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2406-1">
-  <description>
-    This is an example of a non-conformant wsdl that fails test assertion BP2406.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2406" tadID="SSBP10"/>
-	<assertion id="BP2406" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bugzilla/emptySoapBody/emptySoapBody.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bugzilla/emptySoapBody/emptySoapBody.wsdl
deleted file mode 100644
index 4020296..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bugzilla/emptySoapBody/emptySoapBody.wsdl
+++ /dev/null

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s0="http://tempuri.org/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/">
-      <s:element name="echoString">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="arg" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-    </s:schema>
-  </types>
-  <message name="setMessageRequest">
-    <part name="parameters" element="s0:echoString" />
-  </message>
-  <message name="setMessageResponse"/>
-
-  <portType name="Service1Soap">
-    <operation name="setMessage">
-      <input message="s0:setMessageRequest" />
-      <output message="s0:setMessageResponse" />
-    </operation>
-  </portType>
-
-  <binding name="Service1Soap" type="s0:Service1Soap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-    <operation name="setMessage">
-      <soap:operation soapAction="" style="document" />
-      <input>
-        <soap:body use="literal" />
-      </input>
-      <output>
-        <soap:body use="literal" />
-      </output>
-    </operation>
-  </binding>
-
-  <service name="Service1">
-    <port name="Service1Soap" binding="s0:Service1Soap">
-      <soap:address location="http://localhost/WSIService/Service1.asmx" />
-    </port>
-  </service>
-</definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/2010-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/2010-1.wsdl
deleted file mode 100644
index 8b13da0..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/2010-1.wsdl
+++ /dev/null

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-   <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:service name="AddressBookService">
- </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/testcase.xml
deleted file mode 100644
index 359bafc..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/testcase.xml
+++ /dev/null

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2010-1">
-  <description>
-    This is an example of a non-conformant wsdl that fails test assertion BP2010.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2010" tadID="SSBP10"/>
-	<assertion id="BP2010" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011-1.wsdl
deleted file mode 100644
index c4308cd..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011-1.wsdl
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-   <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-     <import namespace="2011.xsd" schemaLocation="2011.xsd"/>
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:service name="AddressBookService">
- </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011.xsd
deleted file mode 100644
index 8857f7c..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011.xsd
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <schema elementFormDefault="qualified" 
-         targetNamespace="2011.xsd" 
-         xmlns="http://www.w3.org/2001/XMLSchema" 
-         xmlns:apachesoap="http://xml.apache.org/xml-soap" 
-         xmlns:intf="2011-1.xsd" 
-         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <import namespace="next.xsd" schemaLocation="next.xsd"/>
-  </schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/next.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/next.xsd
deleted file mode 100644
index 1a68421..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/next.xsd
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema 
-  targetNamespace="next.xsd"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" 
-  elementFormDefault="qualified">
-	<xs:annotation>
-	  <xs:documentation>
-   	  </xs:documentation>
-	</xs:annotation>
-</xs:schema>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/testcase.xml
deleted file mode 100644
index 1fb670c..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/testcase.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2011-1">
-  <description>
-    This is an example of a onformant wsdl.
-  </description>
-  <expectedFailures/>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011-2.wsdl
deleted file mode 100644
index c4308cd..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011-2.wsdl
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-   <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-     <import namespace="2011.xsd" schemaLocation="2011.xsd"/>
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:service name="AddressBookService">
- </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011.xsd
deleted file mode 100644
index 33216d7..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011.xsd
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.1" encoding="UTF-8"?>
- <schema elementFormDefault="qualified" 
-         targetNamespace="2011.xsd" 
-         xmlns="http://www.w3.org/2001/XMLSchema" 
-         xmlns:apachesoap="http://xml.apache.org/xml-soap" 
-         xmlns:intf="2011-1.xsd" 
-         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  </schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/testcase.xml
deleted file mode 100644
index 0fb70d5..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/testcase.xml
+++ /dev/null

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2011-2">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2011.
-    However the prerequisite BP2102 fails before we actually can execute the test assertion.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2102" tadID="SSBP10"/>
-	<assertion id="BP2122" tadID="SSBP10"/>
-	<assertion id="BP2202" tadID="SSBP10"/>
-	<assertion id="BP2102" tadID="AP10"/>
-	<assertion id="BP2122" tadID="AP10"/>
-	<assertion id="BP2202" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011-3.wsdl
deleted file mode 100644
index c4308cd..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011-3.wsdl
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-   <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-     <import namespace="2011.xsd" schemaLocation="2011.xsd"/>
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:service name="AddressBookService">
- </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011.xsd
deleted file mode 100644
index 8857f7c..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011.xsd
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <schema elementFormDefault="qualified" 
-         targetNamespace="2011.xsd" 
-         xmlns="http://www.w3.org/2001/XMLSchema" 
-         xmlns:apachesoap="http://xml.apache.org/xml-soap" 
-         xmlns:intf="2011-1.xsd" 
-         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <import namespace="next.xsd" schemaLocation="next.xsd"/>
-  </schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/next.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/next.xsd
deleted file mode 100644
index 960a77f..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/next.xsd
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.1" encoding="utf-8"?>
-<xs:schema 
-  targetNamespace="next.xsd"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" 
-  elementFormDefault="qualified">
-	<xs:annotation>
-	  <xs:documentation>
-   	  </xs:documentation>
-	</xs:annotation>
-</xs:schema>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/testcase.xml
deleted file mode 100644
index 5fca1e4..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/testcase.xml
+++ /dev/null

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2011-3">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2011.
-    However the prerequisite BP2102 fails before we actually can execute the test assertion.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2102" tadID="SSBP10"/>
-	<assertion id="BP2122" tadID="SSBP10"/>
-	<assertion id="BP2202" tadID="SSBP10"/>
-	<assertion id="BP2102" tadID="AP10"/>
-	<assertion id="BP2122" tadID="AP10"/>
-	<assertion id="BP2202" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011-4.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011-4.wsdl
deleted file mode 100644
index c4308cd..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011-4.wsdl
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-   <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-     <import namespace="2011.xsd" schemaLocation="2011.xsd"/>
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:service name="AddressBookService">
- </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011.xsd
deleted file mode 100644
index 12c87bf..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011.xsd
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <schema elementFormDefault="qualified" 
-         targetNamespace="2011.xsd" 
-         xmlns="http://www.w3.org/2001/XMLSchema" 
-         xmlns:apachesoap="http://xml.apache.org/xml-soap" 
-         xmlns:intf="2011-1.xsd" 
-         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <xs:annotation>
-  </schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/testcase.xml
deleted file mode 100644
index 926b2a9..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/testcase.xml
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2011-4">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2011.
-    However the prerequisite BP2102 fails before we actually can execute the test assertion.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2102" tadID="SSBP10"/>
-	<assertion id="BP2122" tadID="SSBP10"/>
-	<assertion id="BP2102" tadID="AP10"/>
-	<assertion id="BP2122" tadID="AP10"/>
-  </expectedFailures>
-
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011-5.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011-5.wsdl
deleted file mode 100644
index 3b45837..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011-5.wsdl
+++ /dev/null

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-   <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-     <import namespace="2011-1.xsd" schemaLocation="2011-1.xsd"/>
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:service name="AddressBookService">
- </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011.xsd
deleted file mode 100644
index 8857f7c..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011.xsd
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <schema elementFormDefault="qualified" 
-         targetNamespace="2011.xsd" 
-         xmlns="http://www.w3.org/2001/XMLSchema" 
-         xmlns:apachesoap="http://xml.apache.org/xml-soap" 
-         xmlns:intf="2011-1.xsd" 
-         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <import namespace="next.xsd" schemaLocation="next.xsd"/>
-  </schema>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/next.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/next.xsd
deleted file mode 100644
index 543c455..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/next.xsd
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema 
-  targetNamespace="next.xsd"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" 
-  elementFormDefault="qualified">
-	<xs:annotation>
-</xs:schema>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/testcase.xml
deleted file mode 100644
index a49cb27..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/testcase.xml
+++ /dev/null

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2011-5">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2011.
-    However the prerequisite BP2102 fails before we actually can execute the test assertion.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2102" tadID="SSBP10"/>
-	<assertion id="BP2122" tadID="SSBP10"/>
-	<assertion id="BP2202" tadID="SSBP10"/>
-	<assertion id="BP2102" tadID="AP10"/>
-	<assertion id="BP2122" tadID="AP10"/>
-	<assertion id="BP2202" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/2021-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/2021-1.wsdl
deleted file mode 100644
index 5d3684d..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/2021-1.wsdl
+++ /dev/null

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-    <element name="Address" type="string"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:Address" />
-  </wsdl:message>  
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" parts="AddressHeader" use="literal">
-          <wsdlsoap:headerfault message="intf:findAddressRequest"  part="AddressHeader" use="literal"/>
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal" name="f1"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/testcase.xml
deleted file mode 100644
index 50667b4..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/testcase.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2021-1">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2021.
-    Soapbind:header element uses parts attribute.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2021" tadID="SSBP10"/>
-	<assertion id="BP2021" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/2021-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/2021-2.wsdl
deleted file mode 100644
index 664f523..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/2021-2.wsdl
+++ /dev/null

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-    <element name="Address" type="string"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:Address" />
-  </wsdl:message>  
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" use="literal">
-          <wsdlsoap:headerfault message="intf:findAddressRequest"  part="AddressHeader" use="literal"/>
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal" name="f1"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/testcase.xml
deleted file mode 100644
index 867b6af..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/testcase.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2021-2">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2021.
-    Soapbind:header element does not have a part attribute.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2021" tadID="SSBP10"/>
-	<assertion id="BP2021" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/2021-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/2021-3.wsdl
deleted file mode 100644
index 1f7cedf..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/2021-3.wsdl
+++ /dev/null

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-    <element name="Address" type="string"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:Address" />
-  </wsdl:message>  
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-          <wsdlsoap:headerfault message="intf:findAddressRequest"  use="literal"/>
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal" name="f1"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/testcase.xml
deleted file mode 100644
index f9b015f..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/testcase.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2021-3">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2021.
-    Soapbind:headerfault element does not have a part attribute.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2021" tadID="SSBP10"/>
-	<assertion id="BP2021" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/2021-4.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/2021-4.wsdl
deleted file mode 100644
index d44ab7b..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/2021-4.wsdl
+++ /dev/null

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:findAddress" />
-   </wsdl:message> 
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" parts="AddressHeader" use="literal">
-           <wsdlsoap:headerfault message="intf:findAddressRequest"  part="AddressHeader" use="literal"/>
-         </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal" name="f1"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/testcase.xml
deleted file mode 100644
index 8d5cc43..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/testcase.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2021-4">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2021.
-    Soapbind:header element uses parts attribute.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2021" tadID="SSBP10"/>
-	<assertion id="BP2021" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/2021-5.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/2021-5.wsdl
deleted file mode 100644
index 7b5d7f3..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/2021-5.wsdl
+++ /dev/null

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:findAddress" />
-   </wsdl:message> 
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" use="literal">
-           <wsdlsoap:headerfault message="intf:findAddressRequest"  part="AddressHeader" use="literal"/>
-         </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal" name="f1"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/testcase.xml
deleted file mode 100644
index f7c928c..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/testcase.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2021-5">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2021.
-    Soapbind:header element does not have a part attribute.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2021" tadID="SSBP10"/>
-	<assertion id="BP2021" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/2021-6.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/2021-6.wsdl
deleted file mode 100644
index 87a8553..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/2021-6.wsdl
+++ /dev/null

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:findAddress" />
-   </wsdl:message> 
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-           <wsdlsoap:headerfault message="intf:findAddressRequest" use="literal"/>
-         </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal" name="f1"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/testcase.xml
deleted file mode 100644
index d7f1509..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/testcase.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2021-6">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2021.
-    Soapbind:headerfault element does not have a part attribute.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2021" tadID="SSBP10"/>
-	<assertion id="BP2021" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/2022-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/2022-1.wsdl
deleted file mode 100644
index 0a380c0..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/2022-1.wsdl
+++ /dev/null

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-    <element name="Address" type="string"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:Address" />
-  </wsdl:message>  
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-          <wsdlsoap:headerfault message="intf:findAddressRequest"  part="AddressHeader" use="literal"/>
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/testcase.xml
deleted file mode 100644
index facc02c..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/testcase.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2022-1">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2022.
-    Soapbind:fault element does not have a name attribute.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2022" tadID="SSBP10"/>
-	<assertion id="BP2022" tadID="AP10"/>
-	<assertion id="BP2032" tadID="SSBP10"/>
-	<assertion id="BP2032" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/2022-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/2022-2.wsdl
deleted file mode 100644
index c2de1df..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/2022-2.wsdl
+++ /dev/null

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:findAddress" />
-   </wsdl:message> 
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-           <wsdlsoap:headerfault message="intf:findAddressRequest"  part="AddressHeader" use="literal"/>
-         </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/testcase.xml
deleted file mode 100644
index 0ba892a..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/testcase.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2022-2">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2022.
-    Soapbind:fault element does not have a name attribute.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2022" tadID="SSBP10"/>
-	<assertion id="BP2022" tadID="AP10"/>
-	<assertion id="BP2032" tadID="SSBP10"/>
-	<assertion id="BP2032" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/2032-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/2032-1.wsdl
deleted file mode 100644
index aa2235e..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/2032-1.wsdl
+++ /dev/null

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-    <element name="Address" type="string"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:Address" />
-  </wsdl:message>  
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-          <wsdlsoap:headerfault message="intf:findAddressRequest"  part="AddressHeader" use="literal"/>
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault name="fault1" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/testcase.xml
deleted file mode 100644
index 218b327..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/testcase.xml
+++ /dev/null

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2032-1">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2022.
-    The name attribute value on the Soapbind:fault element does not match the name 
-    attribute value specified on the parent element wsdl:fault element.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2032" tadID="SSBP10"/>
-	<assertion id="BP2032" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/2032-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/2032-2.wsdl
deleted file mode 100644
index 852fadf..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/2032-2.wsdl
+++ /dev/null

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="parameterfault">
-    <part name="part3" element="intf:findAddress" />
-   </wsdl:message> 
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-      <wsdl:fault name="f1" message="intf:parameterfault"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-           <wsdlsoap:headerfault message="intf:findAddressRequest"  part="AddressHeader" use="literal"/>
-         </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="f1">
-        <wsdlsoap:fault name="fault1" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/testcase.xml
deleted file mode 100644
index dc34593..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/testcase.xml
+++ /dev/null

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="2032-2">
-  <description>
-    This is an example of a non-conformant wsdl that should fail test assertion BP2022.
-    The name attribute value on the Soapbind:fault element does not match the name 
-    attribute value specified on the parent element wsdl:fault element.
-    Note this assertion is caught by the base WSDL validator.
-    So this assertion should be disabled when running in conjunction with the
-    base validator.
-  </description>
-  <expectedFailures>
-	<assertion id="BP2032" tadID="SSBP10"/>
-	<assertion id="BP2032" tadID="AP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/addressBook-rpc.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/addressBook-rpc.wsdl
deleted file mode 100644
index 6777c12..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/addressBook-rpc.wsdl
+++ /dev/null

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- 
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <complexType name="findAddressResponse">
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddress">
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-   </complexType>
-   <complexType name="saveAddressResponse">
-     <sequence/>
-   </complexType>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" type="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" type="xsd:string"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" type="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" type="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/testcase.xml
deleted file mode 100644
index 15a2f8d..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/testcase.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="addressBook-rpc">
-  <description>
-    This is an example of a conformant wsdl used in the WS-I 
-    interoperability demo.
-  </description>
-  <expectedFailures/>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/addressBook.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/addressBook.wsdl
deleted file mode 100644
index 01482d8..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/addressBook.wsdl
+++ /dev/null

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-   <element name="findAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-     </sequence>
-    </complexType>
-   </element>
-   <complexType name="Address">
-    <sequence>
-     <element name="province" nillable="true" type="xsd:string"/>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="street" nillable="true" type="xsd:string"/>
-     <element name="postalCode" nillable="true" type="xsd:string"/>
-     <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/>
-    </sequence>
-   </complexType>
-   <complexType name="PhoneNumber">
-    <sequence>
-     <element name="area" type="xsd:int"/>
-     <element name="prefix" type="xsd:int"/>
-     <element name="number" type="xsd:int"/>
-    </sequence>
-   </complexType>
-   <element name="findAddressResponse">
-    <complexType>
-     <sequence>
-      <element name="findAddressReturn" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddress">
-    <complexType>
-     <sequence>
-      <element name="name" nillable="true" type="xsd:string"/>
-      <element name="address" nillable="true" type="impl:Address"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="saveAddressResponse">
-    <complexType>
-     <sequence/>
-    </complexType>
-   </element>
-   <complexType name="AddressHeaderType">
-	<all>
-	 <element name="a" type="int"/>
-	 <element name="b" type="boolean"/>
-	 <element name="s" nillable="true" type="string"/>
-	</all>
-   </complexType>
-   <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/>
-  </schema>
-  </wsdl:types>
-  <wsdl:message name="saveAddressRequest">
-    <wsdl:part name="parameters" element="intf:saveAddress"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressRequest">
-    <wsdl:part name="parameters" element="intf:findAddress"/>
-    <wsdl:part name="AddressHeader" element="intf:AddressHeader"/>
-  </wsdl:message>
-  <wsdl:message name="findAddressResponse">
-    <wsdl:part name="parameters" element="intf:findAddressResponse"/>
-  </wsdl:message>
-  <wsdl:message name="saveAddressResponse">
-    <wsdl:part name="parameters" element="intf:saveAddressResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="AddressBook">
-    <wsdl:operation name="findAddress">
-      <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/>
-      <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/>
-      <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="findAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="findAddressRequest">
-        <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal">
-        </wsdlsoap:header>
-        <wsdlsoap:body parts="parameters" use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="findAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="saveAddress">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="saveAddressRequest">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="saveAddressResponse">
-        <wsdlsoap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AddressBookService">
-    <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/AddressBook"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/testcase.xml
deleted file mode 100644
index e4c68a7..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/testcase.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="addressBook">
-  <description>
-    This is an example of a conformant wsdl used in the WS-I 
-    interoperability demo.
-  </description>
-  <expectedFailures/>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/sampleAppCatalog.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/sampleAppCatalog.wsdl
deleted file mode 100644
index 8dc2973..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/sampleAppCatalog.wsdl
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://tempuri.org/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:intf="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog.wsdl"
- xmlns:impl="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog_Impl.wsdl"
- xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog.wsdl" 
-	location="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog.wsdl"/>
-  <wsdl:service name="CatalogService">
-    <wsdl:port name="Catalog" binding="intf:CatalogSoapBinding">
-      <wsdlsoap:address location="http://tempuri.org/CatalogService"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/testcase.xml
deleted file mode 100644
index 7c053a2..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/testcase.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="sampleAppCatalog">
-  <description>
-    This is the WS-I Sample Application demonstrating attachment support.
-    This should validate against the WS-I Attachments Profile.
-    However, this should fail to conform to the WS-I Simple Soap Binding Profile.
-  </description>
-  <expectedFailures>
-	<assertion id="SSBP2403" tadID="SSBP10"/>
-  </expectedFailures>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/sampleAppManufacturer.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/sampleAppManufacturer.wsdl
deleted file mode 100644
index fed0679..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/sampleAppManufacturer.wsdl
+++ /dev/null

@@ -1,26 +0,0 @@
-<wsdl:definitions 
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
-	xmlns:impl="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer_Impl.wsdl" 
-	xmlns:intf="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl" 
-	xmlns:ct="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd" 
-	xmlns:cfg="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl"
-	xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-	xmlns:tns="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl"
-	targetNamespace="http://tempuri.org/">
-
-   <wsdl:import location="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl" 
-   		namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl"/>
-   <wsdl:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl"
-		location="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl"/>
-
-   <wsdl:service name="TestService">
-      <wsdl:port binding="intf:ManufacturerSoapBinding" name="TestPort">
-         <wsdlsoap:address location="http://tempuri.org/TestService"/>
-      </wsdl:port>
-   </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/testcase.xml
deleted file mode 100644
index f5c9f06..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/testcase.xml
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="sampleAppManufacturer">
-  <description>
-    This is the WS-I Sample Application exercising the  Manufacturer wsdl 
-    in the WS-I Basic Profile.
-    This should validate against the WS-I Simple Soap Binding Profile.
-    This should also validate against the WS-I Attachments Profile.
-  </description>
-  <expectedFailures/>
-</testcase>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/sampleAppWarehouse.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/sampleAppWarehouse.wsdl
deleted file mode 100644
index ebe0d22..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/sampleAppWarehouse.wsdl
+++ /dev/null

@@ -1,20 +0,0 @@
-<wsdl:definitions 
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:intf="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl" 
-	xmlns:man="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl"
-	xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
-	targetNamespace="http://tempuri.org/">
-
-   <wsdl:import location="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl" 
-   		namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl"/>
-   <wsdl:import location="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl" 
-   		namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"/>
-
-   <wsdl:service name="TestService">
-      <wsdl:port binding="intf:WarehouseSoapBinding" name="TestPort">
-         <wsdlsoap:address location="http://tempuri.org/TestService"/>
-      </wsdl:port>
-   </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/testcase.xml
deleted file mode 100644
index bc0dc51..0000000
--- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/testcase.xml
+++ /dev/null

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<testcase name="sampleAppWarehouse">
-  <description>
-    This is the WS-I Sample Application exercising the  Warehouse wsdl 
-    in the WS-I Basic Profile.
-    This should validate against the WS-I Simple Soap Binding Profile.
-    This should also validate against the WS-I Attachments Profile.
-  </description>
-  <expectedFailures/>
-</testcase>
\ No newline at end of file
commit	fa36f04a22387ce07db219930815a95af8d66a1f	[log] [tgz]
author	kchong <kchong>	Sat Oct 29 04:55:55 2005 +0000
committer	kchong <kchong>	Sat Oct 29 04:55:55 2005 +0000
tree	a75afd27d1c1d52cf1eb527074684fc61b0e5ea7
parent	4bfa64fb98ce2a8d1486f656dc4a23051623b92b [diff]